youtubei 1.6.7 → 1.7.0

package/dist/cjs/common/shared/HTTP/HTTP.js

@@ -48,9 +48,7 @@ class HTTP {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this.request(path, Object.assign(Object.assign({}, options), { method: "POST", params: Object.assign({ key: this.apiKey, prettyPrint: "false" }, options === null || options === void 0 ? void 0 : options.params), data: Object.assign({ context: {
                         client: Object.assign({ clientName: this.clientName, clientVersion: this.clientVersion, visitorData: (_a = this.pot) === null || _a === void 0 ? void 0 : _a.visitorData }, this.defaultClientOptions),
-                    }, serviceIntegrityDimensions: this.pot
-                        ? { poToken: this.pot.token, }
-                        : undefined }, options === null || options === void 0 ? void 0 : options.data) }));
+                    }, serviceIntegrityDimensions: this.pot ? { poToken: this.pot.token } : undefined }, options === null || options === void 0 ? void 0 : options.data) }));
         });
     }
     request(path, partialOptions) {

package/dist/cjs/common/utils/helper.js

@@ -26,6 +26,7 @@ const stripToInt = (string) => {
 };
 exports.stripToInt = stripToInt;
 const getContinuationFromItems = (items, accessors = ["continuationEndpoint"]) => {
+    var _a, _b, _c;
     const continuation = items[items.length - 1];
     const renderer = continuation === null || continuation === void 0 ? void 0 : continuation.continuationItemRenderer;
     if (!renderer)
@@ -34,7 +35,10 @@ const getContinuationFromItems = (items, accessors = ["continuationEndpoint"]) =
     for (const accessor of accessors) {
         current = current[accessor];
     }
-    return current.continuationCommand.token;
+    if ((_b = (_a = current === null || current === void 0 ? void 0 : current.commandExecutorCommand) === null || _a === void 0 ? void 0 : _a.commands) === null || _b === void 0 ? void 0 : _b.length) {
+        current = current.commandExecutorCommand.commands.find((cmd) => "continuationCommand" in cmd);
+    }
+    return (_c = current === null || current === void 0 ? void 0 : current.continuationCommand) === null || _c === void 0 ? void 0 : _c.token;
 };
 exports.getContinuationFromItems = getContinuationFromItems;
 const mapFilter = (items, key) => {

package/dist/cjs/youtube/BaseVideo/BaseVideoParser.js

@@ -28,7 +28,9 @@ class BaseVideoParser {
         });
         // Like Count and Dislike Count
         const topLevelButtons = videoInfo.videoActions.menuRenderer.topLevelButtons;
-        target.likeCount = common_1.stripToInt(BaseVideoParser.parseButtonRenderer(topLevelButtons[0]));
+        target.likeCount = topLevelButtons
+            ? common_1.stripToInt(BaseVideoParser.parseButtonRenderer(topLevelButtons[0]))
+            : null;
         // Tags and description
         target.tags =
             ((_b = (_a = videoInfo.superTitleLink) === null || _a === void 0 ? void 0 : _a.runs) === null || _b === void 0 ? void 0 : _b.map((r) => r.text.trim()).filter((t) => t)) || [];
@@ -73,6 +75,16 @@ class BaseVideoParser {
         else if ("compactRadioRenderer" in data) {
             return new PlaylistCompact_1.PlaylistCompact({ client }).load(data.compactRadioRenderer);
         }
+        else if ("lockupViewModel" in data) {
+            // new data structure for related contents
+            const type = data.lockupViewModel.contentType;
+            if (type === "LOCKUP_CONTENT_TYPE_VIDEO") {
+                return new VideoCompact_1.VideoCompact({ client }).loadLockup(data.lockupViewModel);
+            }
+            else if (type === "LOCKUP_CONTENT_TYPE_PLAYLIST") {
+                return new PlaylistCompact_1.PlaylistCompact({ client }).loadLockup(data.lockupViewModel);
+            }
+        }
     }
     static parseRelatedFromSecondaryContent(secondaryContents, client) {
         return secondaryContents

package/dist/cjs/youtube/PlaylistCompact/PlaylistCompact.js

@@ -28,6 +28,15 @@ class PlaylistCompact extends Base_1.Base {
         PlaylistCompactParser_1.PlaylistCompactParser.loadPlaylistCompact(this, data);
         return this;
     }
+    /**
+     * Load this instance with raw lockup data from Youtube
+     *
+     * @hidden
+     */
+    loadLockup(data) {
+        PlaylistCompactParser_1.PlaylistCompactParser.loadLockupPlaylistCompact(this, data);
+        return this;
+    }
     /**
      * Get {@link Playlist} object based on current playlist id
      *

package/dist/cjs/youtube/PlaylistCompact/PlaylistCompactParser.js

@@ -23,5 +23,28 @@ class PlaylistCompactParser {
         }
         return target;
     }
+    static loadLockupPlaylistCompact(target, data) {
+        const lockupMetadataViewModel = data.metadata.lockupMetadataViewModel;
+        const channelMetadata = lockupMetadataViewModel.metadata.contentMetadataViewModel.metadataRows[0]
+            .metadataParts[0];
+        const thumbnailViewModel = data.contentImage.collectionThumbnailViewModel.primaryThumbnail.thumbnailViewModel;
+        if (channelMetadata.text.commandRuns) {
+            // not a mix
+            const channel = new BaseChannel_1.BaseChannel({
+                client: target.client,
+                name: channelMetadata.text.content,
+                id: channelMetadata.text.commandRuns[0].onTap.innertubeCommand.browseEndpoint
+                    .browseId,
+            });
+            target.channel = channel;
+        }
+        target.id = data.contentId;
+        target.title = lockupMetadataViewModel.title.content;
+        target.videoCount =
+            common_1.stripToInt(thumbnailViewModel.overlays[0].thumbnailOverlayBadgeViewModel.thumbnailBadges[0]
+                .thumbnailBadgeViewModel.text) || 0;
+        target.thumbnails = new common_1.Thumbnails().load(thumbnailViewModel.image.sources);
+        return target;
+    }
 }
 exports.PlaylistCompactParser = PlaylistCompactParser;

package/dist/cjs/youtube/SearchResult/SearchResultParser.js

@@ -33,6 +33,16 @@ class SearchResultParser {
                 contents.push(new VideoCompact_1.VideoCompact({ client }).load(c.videoRenderer));
             else if ("channelRenderer" in c)
                 contents.push(new BaseChannel_1.BaseChannel({ client }).load(c.channelRenderer));
+            else if ("lockupViewModel" in c) {
+                // new data structure for search result
+                const type = c.lockupViewModel.contentType;
+                if (type === "LOCKUP_CONTENT_TYPE_VIDEO") {
+                    contents.push(new VideoCompact_1.VideoCompact({ client }).loadLockup(c.lockupViewModel));
+                }
+                else if (type === "LOCKUP_CONTENT_TYPE_PLAYLIST") {
+                    contents.push(new PlaylistCompact_1.PlaylistCompact({ client }).loadLockup(c.lockupViewModel));
+                }
+            }
         }
         return contents;
     }

package/dist/cjs/youtube/VideoCompact/VideoCompact.js

@@ -32,6 +32,15 @@ class VideoCompact extends Base_1.Base {
         VideoCompactParser_1.VideoCompactParser.loadVideoCompact(this, data);
         return this;
     }
+    /**
+     * Load this instance with raw lockup data from Youtube
+     *
+     * @hidden
+     */
+    loadLockup(data) {
+        VideoCompactParser_1.VideoCompactParser.loadLockupVideoCompact(this, data);
+        return this;
+    }
     /**
      * Get {@link Video} object based on current video id
      *

package/dist/cjs/youtube/VideoCompact/VideoCompactParser.js

@@ -38,5 +38,32 @@ class VideoCompactParser {
         target.viewCount = common_1.stripToInt((viewCountText === null || viewCountText === void 0 ? void 0 : viewCountText.simpleText) || (viewCountText === null || viewCountText === void 0 ? void 0 : viewCountText.runs[0].text));
         return target;
     }
+    static loadLockupVideoCompact(target, data) {
+        var _a, _b;
+        const lockupMetadataViewModel = data.metadata.lockupMetadataViewModel;
+        const decoratedAvatarViewModel = lockupMetadataViewModel.image.decoratedAvatarViewModel;
+        const thumbnailBadge = data.contentImage.thumbnailViewModel.overlays[0].thumbnailOverlayBadgeViewModel
+            .thumbnailBadges[0].thumbnailBadgeViewModel;
+        const metadataRows = lockupMetadataViewModel.metadata.contentMetadataViewModel.metadataRows;
+        const channel = new BaseChannel_1.BaseChannel({
+            client: target.client,
+            name: metadataRows[0].metadataParts[0].text.content,
+            id: decoratedAvatarViewModel.rendererContext.commandContext.onTap.innertubeCommand
+                .browseEndpoint.browseId,
+            thumbnails: new common_1.Thumbnails().load(decoratedAvatarViewModel.avatar.avatarViewModel.image.sources),
+        });
+        const isLive = ((_a = thumbnailBadge.icon) === null || _a === void 0 ? void 0 : _a.sources[0].clientResource.imageName) === "LIVE";
+        target.channel = channel;
+        target.id = data.contentId;
+        target.title = lockupMetadataViewModel.title.content;
+        target.isLive = ((_b = thumbnailBadge.icon) === null || _b === void 0 ? void 0 : _b.sources[0].clientResource.imageName) === "LIVE";
+        target.duration = !isLive ? common_1.getDuration(thumbnailBadge.text) : null;
+        target.thumbnails = new common_1.Thumbnails().load(data.contentImage.thumbnailViewModel.image.sources);
+        target.viewCount = common_1.stripToInt(metadataRows[1].metadataParts[0].text.content);
+        target.uploadDate = !isLive
+            ? metadataRows[1].metadataParts[metadataRows[1].metadataParts.length - 1].text.content
+            : undefined;
+        return target;
+    }
 }
 exports.VideoCompactParser = VideoCompactParser;

package/dist/esm/common/shared/HTTP/HTTP.js

@@ -114,9 +114,7 @@ var HTTP = /** @class */ (function () {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, this.request(path, __assign(__assign({}, options), { method: "POST", params: __assign({ key: this.apiKey, prettyPrint: "false" }, options === null || options === void 0 ? void 0 : options.params), data: __assign({ context: {
                                     client: __assign({ clientName: this.clientName, clientVersion: this.clientVersion, visitorData: (_a = this.pot) === null || _a === void 0 ? void 0 : _a.visitorData }, this.defaultClientOptions),
-                                }, serviceIntegrityDimensions: this.pot
-                                    ? { poToken: this.pot.token, }
-                                    : undefined }, options === null || options === void 0 ? void 0 : options.data) }))];
+                                }, serviceIntegrityDimensions: this.pot ? { poToken: this.pot.token } : undefined }, options === null || options === void 0 ? void 0 : options.data) }))];
                     case 1: return [2 /*return*/, _b.sent()];
                 }
             });

package/dist/esm/common/utils/helper.js

@@ -33,6 +33,7 @@ export var stripToInt = function (string) {
 };
 export var getContinuationFromItems = function (items, accessors) {
     var e_1, _a;
+    var _b, _c, _d;
     if (accessors === void 0) { accessors = ["continuationEndpoint"]; }
     var continuation = items[items.length - 1];
     var renderer = continuation === null || continuation === void 0 ? void 0 : continuation.continuationItemRenderer;
@@ -52,7 +53,10 @@ export var getContinuationFromItems = function (items, accessors) {
         }
         finally { if (e_1) throw e_1.error; }
     }
-    return current.continuationCommand.token;
+    if ((_c = (_b = current === null || current === void 0 ? void 0 : current.commandExecutorCommand) === null || _b === void 0 ? void 0 : _b.commands) === null || _c === void 0 ? void 0 : _c.length) {
+        current = current.commandExecutorCommand.commands.find(function (cmd) { return "continuationCommand" in cmd; });
+    }
+    return (_d = current === null || current === void 0 ? void 0 : current.continuationCommand) === null || _d === void 0 ? void 0 : _d.token;
 };
 export var mapFilter = function (items, key) {
     return items

package/dist/esm/youtube/BaseVideo/BaseVideoParser.js

@@ -38,7 +38,9 @@ var BaseVideoParser = /** @class */ (function () {
         });
         // Like Count and Dislike Count
         var topLevelButtons = videoInfo.videoActions.menuRenderer.topLevelButtons;
-        target.likeCount = stripToInt(BaseVideoParser.parseButtonRenderer(topLevelButtons[0]));
+        target.likeCount = topLevelButtons
+            ? stripToInt(BaseVideoParser.parseButtonRenderer(topLevelButtons[0]))
+            : null;
         // Tags and description
         target.tags =
             ((_b = (_a = videoInfo.superTitleLink) === null || _a === void 0 ? void 0 : _a.runs) === null || _b === void 0 ? void 0 : _b.map(function (r) { return r.text.trim(); }).filter(function (t) { return t; })) || [];
@@ -83,6 +85,16 @@ var BaseVideoParser = /** @class */ (function () {
         else if ("compactRadioRenderer" in data) {
             return new PlaylistCompact({ client: client }).load(data.compactRadioRenderer);
         }
+        else if ("lockupViewModel" in data) {
+            // new data structure for related contents
+            var type = data.lockupViewModel.contentType;
+            if (type === "LOCKUP_CONTENT_TYPE_VIDEO") {
+                return new VideoCompact({ client: client }).loadLockup(data.lockupViewModel);
+            }
+            else if (type === "LOCKUP_CONTENT_TYPE_PLAYLIST") {
+                return new PlaylistCompact({ client: client }).loadLockup(data.lockupViewModel);
+            }
+        }
     };
     BaseVideoParser.parseRelatedFromSecondaryContent = function (secondaryContents, client) {
         return secondaryContents

package/dist/esm/youtube/PlaylistCompact/PlaylistCompact.js

@@ -67,6 +67,15 @@ var PlaylistCompact = /** @class */ (function (_super) {
         PlaylistCompactParser.loadPlaylistCompact(this, data);
         return this;
     };
+    /**
+     * Load this instance with raw lockup data from Youtube
+     *
+     * @hidden
+     */
+    PlaylistCompact.prototype.loadLockup = function (data) {
+        PlaylistCompactParser.loadLockupPlaylistCompact(this, data);
+        return this;
+    };
     /**
      * Get {@link Playlist} object based on current playlist id
      *

package/dist/esm/youtube/PlaylistCompact/PlaylistCompactParser.js

@@ -22,6 +22,29 @@ var PlaylistCompactParser = /** @class */ (function () {
         }
         return target;
     };
+    PlaylistCompactParser.loadLockupPlaylistCompact = function (target, data) {
+        var lockupMetadataViewModel = data.metadata.lockupMetadataViewModel;
+        var channelMetadata = lockupMetadataViewModel.metadata.contentMetadataViewModel.metadataRows[0]
+            .metadataParts[0];
+        var thumbnailViewModel = data.contentImage.collectionThumbnailViewModel.primaryThumbnail.thumbnailViewModel;
+        if (channelMetadata.text.commandRuns) {
+            // not a mix
+            var channel = new BaseChannel({
+                client: target.client,
+                name: channelMetadata.text.content,
+                id: channelMetadata.text.commandRuns[0].onTap.innertubeCommand.browseEndpoint
+                    .browseId,
+            });
+            target.channel = channel;
+        }
+        target.id = data.contentId;
+        target.title = lockupMetadataViewModel.title.content;
+        target.videoCount =
+            stripToInt(thumbnailViewModel.overlays[0].thumbnailOverlayBadgeViewModel.thumbnailBadges[0]
+                .thumbnailBadgeViewModel.text) || 0;
+        target.thumbnails = new Thumbnails().load(thumbnailViewModel.image.sources);
+        return target;
+    };
     return PlaylistCompactParser;
 }());
 export { PlaylistCompactParser };

package/dist/esm/youtube/SearchResult/SearchResultParser.js

@@ -46,6 +46,16 @@ var SearchResultParser = /** @class */ (function () {
                     contents.push(new VideoCompact({ client: client }).load(c.videoRenderer));
                 else if ("channelRenderer" in c)
                     contents.push(new BaseChannel({ client: client }).load(c.channelRenderer));
+                else if ("lockupViewModel" in c) {
+                    // new data structure for search result
+                    var type = c.lockupViewModel.contentType;
+                    if (type === "LOCKUP_CONTENT_TYPE_VIDEO") {
+                        contents.push(new VideoCompact({ client: client }).loadLockup(c.lockupViewModel));
+                    }
+                    else if (type === "LOCKUP_CONTENT_TYPE_PLAYLIST") {
+                        contents.push(new PlaylistCompact({ client: client }).loadLockup(c.lockupViewModel));
+                    }
+                }
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }

package/dist/esm/youtube/VideoCompact/VideoCompact.js

@@ -75,6 +75,15 @@ var VideoCompact = /** @class */ (function (_super) {
         VideoCompactParser.loadVideoCompact(this, data);
         return this;
     };
+    /**
+     * Load this instance with raw lockup data from Youtube
+     *
+     * @hidden
+     */
+    VideoCompact.prototype.loadLockup = function (data) {
+        VideoCompactParser.loadLockupVideoCompact(this, data);
+        return this;
+    };
     /**
      * Get {@link Video} object based on current video id
      *

package/dist/esm/youtube/VideoCompact/VideoCompactParser.js

@@ -37,6 +37,33 @@ var VideoCompactParser = /** @class */ (function () {
         target.viewCount = stripToInt((viewCountText === null || viewCountText === void 0 ? void 0 : viewCountText.simpleText) || (viewCountText === null || viewCountText === void 0 ? void 0 : viewCountText.runs[0].text));
         return target;
     };
+    VideoCompactParser.loadLockupVideoCompact = function (target, data) {
+        var _a, _b;
+        var lockupMetadataViewModel = data.metadata.lockupMetadataViewModel;
+        var decoratedAvatarViewModel = lockupMetadataViewModel.image.decoratedAvatarViewModel;
+        var thumbnailBadge = data.contentImage.thumbnailViewModel.overlays[0].thumbnailOverlayBadgeViewModel
+            .thumbnailBadges[0].thumbnailBadgeViewModel;
+        var metadataRows = lockupMetadataViewModel.metadata.contentMetadataViewModel.metadataRows;
+        var channel = new BaseChannel({
+            client: target.client,
+            name: metadataRows[0].metadataParts[0].text.content,
+            id: decoratedAvatarViewModel.rendererContext.commandContext.onTap.innertubeCommand
+                .browseEndpoint.browseId,
+            thumbnails: new Thumbnails().load(decoratedAvatarViewModel.avatar.avatarViewModel.image.sources),
+        });
+        var isLive = ((_a = thumbnailBadge.icon) === null || _a === void 0 ? void 0 : _a.sources[0].clientResource.imageName) === "LIVE";
+        target.channel = channel;
+        target.id = data.contentId;
+        target.title = lockupMetadataViewModel.title.content;
+        target.isLive = ((_b = thumbnailBadge.icon) === null || _b === void 0 ? void 0 : _b.sources[0].clientResource.imageName) === "LIVE";
+        target.duration = !isLive ? getDuration(thumbnailBadge.text) : null;
+        target.thumbnails = new Thumbnails().load(data.contentImage.thumbnailViewModel.image.sources);
+        target.viewCount = stripToInt(metadataRows[1].metadataParts[0].text.content);
+        target.uploadDate = !isLive
+            ? metadataRows[1].metadataParts[metadataRows[1].metadataParts.length - 1].text.content
+            : undefined;
+        return target;
+    };
     return VideoCompactParser;
 }());
 export { VideoCompactParser };

package/dist/typings/youtube/PlaylistCompact/PlaylistCompact.d.ts

@@ -29,6 +29,12 @@ export declare class PlaylistCompact extends Base implements PlaylistCompactProp
      * @hidden
      */
     load(data: YoutubeRawData): PlaylistCompact;
+    /**
+     * Load this instance with raw lockup data from Youtube
+     *
+     * @hidden
+     */
+    loadLockup(data: YoutubeRawData): PlaylistCompact;
     /**
      * Get {@link Playlist} object based on current playlist id
      *

package/dist/typings/youtube/PlaylistCompact/PlaylistCompactParser.d.ts

@@ -2,4 +2,5 @@ import { YoutubeRawData } from "../../common";
 import { PlaylistCompact } from "./PlaylistCompact";
 export declare class PlaylistCompactParser {
     static loadPlaylistCompact(target: PlaylistCompact, data: YoutubeRawData): PlaylistCompact;
+    static loadLockupPlaylistCompact(target: PlaylistCompact, data: YoutubeRawData): PlaylistCompact;
 }

package/dist/typings/youtube/VideoCompact/VideoCompact.d.ts

@@ -46,6 +46,12 @@ export declare class VideoCompact extends Base implements VideoCompactProperties
      * @hidden
      */
     load(data: YoutubeRawData): VideoCompact;
+    /**
+     * Load this instance with raw lockup data from Youtube
+     *
+     * @hidden
+     */
+    loadLockup(data: YoutubeRawData): VideoCompact;
     /**
      * Get {@link Video} object based on current video id
      *

package/dist/typings/youtube/VideoCompact/VideoCompactParser.d.ts

@@ -2,4 +2,5 @@ import { YoutubeRawData } from "../../common";
 import { VideoCompact } from "./VideoCompact";
 export declare class VideoCompactParser {
     static loadVideoCompact(target: VideoCompact, data: YoutubeRawData): VideoCompact;
+    static loadLockupVideoCompact(target: VideoCompact, data: YoutubeRawData): VideoCompact;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "youtubei",
-	"version": "1.6.7",
+	"version": "1.7.0",
 	"description": "Simple package to get information from youtube such as videos, playlists, channels, video information & comments, related videos, up next video, and more!",
 	"main": "dist/cjs/index.js",
 	"module": "dist/esm/index.js",