diff --git a/lib/Innertube.js b/lib/Innertube.js index c19bf927..0fbbfd07 100644 --- a/lib/Innertube.js +++ b/lib/Innertube.js @@ -24,7 +24,7 @@ class Innertube extends EventEmitter { async init() { const response = await Axios.get(Constants.urls.YT_BASE_URL, Constants.default_headers(this)).catch((error) => error); if (response instanceof Error) throw new Error(`Could not extract Innertube data: ${response.message}`); - + try { const innertube_data = JSON.parse(`{${Utils.getStringBetweenStrings(response.data, 'ytcfg.set({', '});')}}`); if (innertube_data.INNERTUBE_CONTEXT) { @@ -96,7 +96,7 @@ class Innertube extends EventEmitter { async search(query, options = { period: 'any', order: 'relevance', duration: 'any' }) { if (!query) throw new Error('No query was provided'); - + const response = await Axios.post(`${Constants.urls.YT_BASE_URL}/youtubei/v1/search${this.logged_in && this.cookie.length < 1 ? '' : `?key=${this.key}`}`, JSON.stringify({ context: this.context, params: Constants.filters(options.period + ',' + options.duration + ',' + options.order), query }), Constants.innertube_request_opts({ session: this })).catch((error) => error); if (response instanceof Error) throw new Error(`Could not search on YouTube: ${response.message}`); @@ -151,7 +151,7 @@ class Innertube extends EventEmitter { } else { video_data.getLivechat = () => {}; } - + video_data.like = () => Actions.engage(this, 'like/like', { video_id: id }); video_data.dislike = () => Actions.engage(this, 'like/dislike', { video_id: id }); video_data.removeLike = () => Actions.engage(this, 'like/removelike', { video_id: id }); @@ -163,32 +163,32 @@ class Innertube extends EventEmitter { return video_data; } - + async getComments(video_id, token) { let comment_section_token; - + if (!token) { const data_continuation = await Actions.getContinuation(this, { video_id }); const item_section_renderer = data_continuation.data.contents.twoColumnWatchNextResults.results.results.contents.find((item) => item.itemSectionRenderer); comment_section_token = item_section_renderer.itemSectionRenderer.contents[0].continuationItemRenderer.continuationEndpoint.continuationCommand.token; } - + const response = await Actions.getContinuation(this, { continuation_token: comment_section_token || token }); if (!response.success) throw new Error('Could not fetch comments section'); - + const comments_section = { comments: [] }; !token && (comments_section.comment_count = response.data.onResponseReceivedEndpoints[0].reloadContinuationItemsCommand.continuationItems && response.data.onResponseReceivedEndpoints[0].reloadContinuationItemsCommand.continuationItems[0].commentsHeaderRenderer.countText.runs[0].text || 'N/A'); - + let continuation_token; - !token && (continuation_token = response.data.onResponseReceivedEndpoints[1].reloadContinuationItemsCommand.continuationItems.find((item) => item.continuationItemRenderer).continuationItemRenderer.continuationEndpoint.continuationCommand.token) - || (continuation_token = response.data.onResponseReceivedEndpoints[0].appendContinuationItemsAction.continuationItems.find((item) => item.continuationItemRenderer).continuationItemRenderer.continuationEndpoint.continuationCommand.token); - + !token && (continuation_token = response.data.onResponseReceivedEndpoints[1].reloadContinuationItemsCommand.continuationItems.find((item) => item.continuationItemRenderer).continuationItemRenderer.continuationEndpoint.continuationCommand.token) || + (continuation_token = response.data.onResponseReceivedEndpoints[0].appendContinuationItemsAction.continuationItems.find((item) => item.continuationItemRenderer).continuationItemRenderer.continuationEndpoint.continuationCommand.token); + comments_section.getContinuation = () => this.getComments(video_id, continuation_token); - + let contents; - !token && (contents = response.data.onResponseReceivedEndpoints[1].reloadContinuationItemsCommand.continuationItems) - || (contents = response.data.onResponseReceivedEndpoints[0].appendContinuationItemsAction.continuationItems); - + !token && (contents = response.data.onResponseReceivedEndpoints[1].reloadContinuationItemsCommand.continuationItems) || + (contents = response.data.onResponseReceivedEndpoints[0].appendContinuationItemsAction.continuationItems); + contents.forEach((thread) => { if (!thread.commentThreadRenderer) return; const comment = { @@ -209,26 +209,26 @@ class Innertube extends EventEmitter { }; comments_section.comments.push(comment); }); - + return comments_section; } - + async getSubscriptionsFeed() { const response = await Actions.browse(this, 'subscriptions_feed'); if (!response.success) throw new Error('Could not fetch subscriptions feed'); - + const contents = response.data.contents.twoColumnBrowseResultsRenderer.tabs[0].tabRenderer.content.sectionListRenderer.contents; const subscriptions_feed = {}; - + contents.forEach((section) => { if (!section.itemSectionRenderer) return; - + const section_contents = section.itemSectionRenderer.contents[0]; const section_items = section_contents.shelfRenderer.content.gridRenderer.items; - + const key = section_contents.shelfRenderer.title.runs[0].text; subscriptions_feed[key.toLowerCase().replace(/ +/g, '_')] = []; - + section_items.forEach((item) => { const content = { title: item.gridVideoRenderer.title.runs.map((run) => run.text).join(' '), @@ -242,18 +242,18 @@ class Innertube extends EventEmitter { owner_badges: item.gridVideoRenderer.ownerBadges && item.gridVideoRenderer.ownerBadges.map((badge) => badge.metadataBadgeRenderer.tooltip) || 'N/A' } }; - + subscriptions_feed[key.toLowerCase().replace(/ +/g, '_')].push(content); }); }); - + return subscriptions_feed; } async getNotifications() { const response = await Actions.notifications(this, 'get_notification_menu'); if (!response.success) throw new Error('Could not fetch notifications'); - + const contents = response.data.actions[0].openPopupAction.popup.multiPageMenuRenderer.sections[0]; if (!contents.multiPageMenuNotificationSectionRenderer) return { error: 'You don\'t have any notification.' }; return contents.multiPageMenuNotificationSectionRenderer.items.map((notification) => { @@ -280,8 +280,8 @@ class Innertube extends EventEmitter { async requestVideoInfo(id, desktop) { let response; - !desktop && (response = await Axios.get(`${Constants.urls.YT_WATCH_PAGE}?v=${id}&t=8s&pbj=1`, Constants.innertube_request_opts({ session: this, id, desktop: false })).catch((error) => error)) - || (response = await Axios.post(`${Constants.urls.YT_BASE_URL}/youtubei/v1/player${this.logged_in && this.cookie.length < 1 ? '' : `?key=${this.key}`}`, JSON.stringify(Constants.video_details_reqbody(id, this.sts, this.context)), Constants.innertube_request_opts({ session: this, id, desktop: true })).catch((error) => error)); + !desktop && (response = await Axios.get(`${Constants.urls.YT_WATCH_PAGE}?v=${id}&t=8s&pbj=1`, Constants.innertube_request_opts({ session: this, id, desktop: false })).catch((error) => error)) || + (response = await Axios.post(`${Constants.urls.YT_BASE_URL}/youtubei/v1/player${this.logged_in && this.cookie.length < 1 ? '' : `?key=${this.key}`}`, JSON.stringify(Constants.video_details_reqbody(id, this.sts, this.context)), Constants.innertube_request_opts({ session: this, id, desktop: true })).catch((error) => error)); if (response instanceof Error) throw new Error('Could not retrieve watch page info: ' + response.message); return response.data; } @@ -350,10 +350,10 @@ class Innertube extends EventEmitter { if (options.type != 'videoandaudio') { let streams; - - options.type != 'audio' && (streams = filtered_streams.filter((format) => format.mimeType.includes(options.format || 'mp4') && format.qualityLabel == options.quality)) - || (streams = filtered_streams.filter((format) => format.mimeType.includes(options.format || 'mp4'))); - + + options.type != 'audio' && (streams = filtered_streams.filter((format) => format.mimeType.includes(options.format || 'mp4') && format.qualityLabel == options.quality)) || + (streams = filtered_streams.filter((format) => format.mimeType.includes(options.format || 'mp4'))); + streams == undefined || streams.length == 0 && (streams = filtered_streams.filter((format) => format.quality == 'medium')); bitrates = streams.map((format) => format.bitrate);