youtubei 1.6.6 → 1.7.0

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

@@ -33,6 +33,7 @@ class HTTP {
             "accept-encoding": "gzip, deflate, br",
         };
         this.oauth = Object.assign({ enabled: false, token: null, expiresAt: null }, options.oauth);
+        this.pot = options.pot;
         this.authorizationPromise = null;
         this.defaultFetchOptions = options.fetchOptions || {};
         this.defaultClientOptions = options.youtubeClientOptions || {};
@@ -43,10 +44,11 @@ class HTTP {
         });
     }
     post(path, options) {
+        var _a;
         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 }, this.defaultClientOptions),
-                    } }, options === null || options === void 0 ? void 0 : options.data) }));
+                        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) }));
         });
     }
     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/music/MusicClient/MusicClient.js

@@ -17,8 +17,8 @@ const constants_1 = require("../constants");
 /** Youtube Music Client */
 class MusicClient {
     constructor(options = {}) {
-        const fullOptions = Object.assign(Object.assign({ initialCookie: "", fetchOptions: {} }, options), { youtubeClientOptions: Object.assign({ hl: "en", gl: "US" }, options.youtubeClientOptions) });
-        this.http = new common_1.HTTP(Object.assign({ apiKey: constants_1.INNERTUBE_API_KEY, baseUrl: constants_1.BASE_URL, clientName: "WEB_REMIX", clientVersion: constants_1.INNERTUBE_CLIENT_VERSION }, fullOptions));
+        const fullOptions = Object.assign(Object.assign({ initialCookie: "", oauth: { enabled: false }, fetchOptions: {} }, options), { youtubeClientOptions: Object.assign({ hl: "en", gl: "US" }, options.youtubeClientOptions), apiKey: options.apiKey || constants_1.INNERTUBE_API_KEY, baseUrl: options.baseUrl || constants_1.BASE_URL, clientName: options.clientName || constants_1.INNERTUBE_CLIENT_NAME, clientVersion: options.clientVersion || constants_1.INNERTUBE_CLIENT_VERSION });
+        this.http = new common_1.HTTP(fullOptions);
     }
     search(query, type) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/cjs/music/constants.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.I_END_POINT = exports.BASE_URL = exports.INNERTUBE_API_KEY = exports.INNERTUBE_CLIENT_VERSION = void 0;
+exports.I_END_POINT = exports.BASE_URL = exports.INNERTUBE_API_KEY = exports.INNERTUBE_CLIENT_NAME = exports.INNERTUBE_CLIENT_VERSION = void 0;
 exports.INNERTUBE_CLIENT_VERSION = "1.20221219.01.00";
+exports.INNERTUBE_CLIENT_NAME = "WEB_REMIX";
 exports.INNERTUBE_API_KEY = "AIzaSyC9XL3ZjWddXya6X74dJoCTL-WEYFDNX30";
 exports.BASE_URL = "music.youtube.com";
 exports.I_END_POINT = "/youtubei/v1";

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/BaseVideo/VideoCaptions.js

@@ -52,18 +52,19 @@ class VideoCaptions extends Base_1.Base {
      * Get captions of a specific language or a translation of a specific language
      */
     get(languageCode, translationLanguageCode) {
-        var _a, _b;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!languageCode)
+            if (!languageCode && ((_a = this.client.options.youtubeClientOptions) === null || _a === void 0 ? void 0 : _a.hl)) {
                 languageCode = this.client.options.youtubeClientOptions.hl;
-            const url = (_a = this.languages.find((l) => l.code.toUpperCase() === (languageCode === null || languageCode === void 0 ? void 0 : languageCode.toUpperCase()))) === null || _a === void 0 ? void 0 : _a.url;
+            }
+            const url = (_b = this.languages.find((l) => l.code.toUpperCase() === (languageCode === null || languageCode === void 0 ? void 0 : languageCode.toUpperCase()))) === null || _b === void 0 ? void 0 : _b.url;
             if (!url)
                 return undefined;
             const params = { fmt: "json3" };
             if (translationLanguageCode)
                 params["tlang"] = translationLanguageCode;
             const response = yield this.client.http.get(url, { params });
-            const captions = (_b = response.data.events) === null || _b === void 0 ? void 0 : _b.reduce((curr, e) => {
+            const captions = (_c = response.data.events) === null || _c === void 0 ? void 0 : _c.reduce((curr, e) => {
                 var _a;
                 if (e.segs === undefined)
                     return curr;

package/dist/cjs/youtube/Client/Client.js

@@ -21,8 +21,8 @@ const constants_1 = require("../constants");
 /** Youtube Client */
 class Client {
     constructor(options = {}) {
-        this.options = Object.assign(Object.assign({ initialCookie: "", oauth: { enabled: false }, fetchOptions: {} }, options), { youtubeClientOptions: Object.assign({ hl: "en", gl: "US" }, options.youtubeClientOptions) });
-        this.http = new common_1.HTTP(Object.assign({ apiKey: constants_1.INNERTUBE_API_KEY, baseUrl: constants_1.BASE_URL, clientName: constants_1.INNERTUBE_CLIENT_NAME, clientVersion: constants_1.INNERTUBE_CLIENT_VERSION }, this.options));
+        this.options = Object.assign(Object.assign({ initialCookie: "", oauth: { enabled: false }, fetchOptions: {} }, options), { youtubeClientOptions: Object.assign({ hl: "en", gl: "US" }, options.youtubeClientOptions), apiKey: options.apiKey || constants_1.INNERTUBE_API_KEY, baseUrl: options.baseUrl || constants_1.BASE_URL, clientName: options.clientName || constants_1.INNERTUBE_CLIENT_NAME, clientVersion: options.clientVersion || constants_1.INNERTUBE_CLIENT_VERSION });
+        this.http = new common_1.HTTP(this.options);
     }
     get oauth() {
         return {

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/SearchResult/proto/index.js

@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.optionsToProto = exports.SearchProto = void 0;
 const protobufjs_1 = __importDefault(require("protobufjs"));
 // TODO move this to .proto file
-exports.SearchProto = protobufjs_1.default.parse(`
+exports.SearchProto = protobufjs_1.default
+    .parse(`
 	message SearchOptions {
 		message Options {
 			optional int32 uploadDate = 1;
@@ -26,7 +27,8 @@ exports.SearchProto = protobufjs_1.default.parse(`
 		optional int32 sortBy = 1;
 		optional Options options = 2;
 	}
-`).root.lookupType("SearchOptions");
+`)
+    .root.lookupType("SearchOptions");
 const searchUploadDateProto = {
     all: 0,
     hour: 1,

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

@@ -5,7 +5,7 @@ const common_1 = require("../../common");
 const BaseChannel_1 = require("../BaseChannel");
 class VideoCompactParser {
     static loadVideoCompact(target, data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const { videoId, title, headline, lengthText, thumbnail, ownerText, shortBylineText, publishedTimeText, viewCountText, badges, thumbnailOverlays, channelThumbnailSupportedRenderers, detailedMetadataSnippets, } = data;
         target.id = videoId;
         target.title = headline
@@ -21,8 +21,10 @@ class VideoCompactParser {
         target.isLive =
             !!((badges === null || badges === void 0 ? void 0 : badges[0].metadataBadgeRenderer.style) === "BADGE_STYLE_TYPE_LIVE_NOW") ||
                 ((_e = thumbnailOverlays === null || thumbnailOverlays === void 0 ? void 0 : thumbnailOverlays[0].thumbnailOverlayTimeStatusRenderer) === null || _e === void 0 ? void 0 : _e.style) === "LIVE";
+        target.isShort =
+            ((_f = thumbnailOverlays === null || thumbnailOverlays === void 0 ? void 0 : thumbnailOverlays[0].thumbnailOverlayTimeStatusRenderer) === null || _f === void 0 ? void 0 : _f.style) === "SHORTS" || false;
         // Channel
-        const browseEndpoint = (_h = (_g = (_f = (ownerText || shortBylineText)) === null || _f === void 0 ? void 0 : _f.runs[0]) === null || _g === void 0 ? void 0 : _g.navigationEndpoint) === null || _h === void 0 ? void 0 : _h.browseEndpoint;
+        const browseEndpoint = (_j = (_h = (_g = (ownerText || shortBylineText)) === null || _g === void 0 ? void 0 : _g.runs[0]) === null || _h === void 0 ? void 0 : _h.navigationEndpoint) === null || _j === void 0 ? void 0 : _j.browseEndpoint;
         if (browseEndpoint) {
             const id = browseEndpoint.browseId;
             const thumbnails = channelThumbnailSupportedRenderers === null || channelThumbnailSupportedRenderers === void 0 ? void 0 : channelThumbnailSupportedRenderers.channelThumbnailWithLinkRenderer.thumbnail.thumbnails;
@@ -36,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

@@ -92,6 +92,7 @@ var HTTP = /** @class */ (function () {
             "accept-encoding": "gzip, deflate, br",
         };
         this.oauth = __assign({ enabled: false, token: null, expiresAt: null }, options.oauth);
+        this.pot = options.pot;
         this.authorizationPromise = null;
         this.defaultFetchOptions = options.fetchOptions || {};
         this.defaultClientOptions = options.youtubeClientOptions || {};
@@ -107,13 +108,14 @@ var HTTP = /** @class */ (function () {
         });
     };
     HTTP.prototype.post = function (path, options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                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 }, this.defaultClientOptions),
-                                } }, options === null || options === void 0 ? void 0 : options.data) }))];
-                    case 1: return [2 /*return*/, _a.sent()];
+                                    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) }))];
+                    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/music/MusicClient/MusicClient.js

@@ -48,13 +48,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 import { HTTP } from "../../common";
 import { MusicLyrics } from "../MusicLyrics";
 import { MusicAllSearchResultParser, MusicSearchResult, } from "../MusicSearchResult";
-import { BASE_URL, INNERTUBE_API_KEY, INNERTUBE_CLIENT_VERSION, I_END_POINT } from "../constants";
+import { BASE_URL, INNERTUBE_API_KEY, INNERTUBE_CLIENT_NAME, INNERTUBE_CLIENT_VERSION, I_END_POINT, } from "../constants";
 /** Youtube Music Client */
 var MusicClient = /** @class */ (function () {
     function MusicClient(options) {
         if (options === void 0) { options = {}; }
-        var fullOptions = __assign(__assign({ initialCookie: "", fetchOptions: {} }, options), { youtubeClientOptions: __assign({ hl: "en", gl: "US" }, options.youtubeClientOptions) });
-        this.http = new HTTP(__assign({ apiKey: INNERTUBE_API_KEY, baseUrl: BASE_URL, clientName: "WEB_REMIX", clientVersion: INNERTUBE_CLIENT_VERSION }, fullOptions));
+        var fullOptions = __assign(__assign({ initialCookie: "", oauth: { enabled: false }, fetchOptions: {} }, options), { youtubeClientOptions: __assign({ hl: "en", gl: "US" }, options.youtubeClientOptions), apiKey: options.apiKey || INNERTUBE_API_KEY, baseUrl: options.baseUrl || BASE_URL, clientName: options.clientName || INNERTUBE_CLIENT_NAME, clientVersion: options.clientVersion || INNERTUBE_CLIENT_VERSION });
+        this.http = new HTTP(fullOptions);
     }
     MusicClient.prototype.search = function (query, type) {
         return __awaiter(this, void 0, void 0, function () {

package/dist/esm/music/constants.js

@@ -1,4 +1,5 @@
 export var INNERTUBE_CLIENT_VERSION = "1.20221219.01.00";
+export var INNERTUBE_CLIENT_NAME = "WEB_REMIX";
 export var INNERTUBE_API_KEY = "AIzaSyC9XL3ZjWddXya6X74dJoCTL-WEYFDNX30";
 export var BASE_URL = "music.youtube.com";
 export var I_END_POINT = "/youtubei/v1";

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/BaseVideo/VideoCaptions.js

@@ -95,15 +95,16 @@ var VideoCaptions = /** @class */ (function (_super) {
      * Get captions of a specific language or a translation of a specific language
      */
     VideoCaptions.prototype.get = function (languageCode, translationLanguageCode) {
-        var _a, _b;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function () {
             var url, params, response, captions;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        if (!languageCode)
+                        if (!languageCode && ((_a = this.client.options.youtubeClientOptions) === null || _a === void 0 ? void 0 : _a.hl)) {
                             languageCode = this.client.options.youtubeClientOptions.hl;
-                        url = (_a = this.languages.find(function (l) { return l.code.toUpperCase() === (languageCode === null || languageCode === void 0 ? void 0 : languageCode.toUpperCase()); })) === null || _a === void 0 ? void 0 : _a.url;
+                        }
+                        url = (_b = this.languages.find(function (l) { return l.code.toUpperCase() === (languageCode === null || languageCode === void 0 ? void 0 : languageCode.toUpperCase()); })) === null || _b === void 0 ? void 0 : _b.url;
                         if (!url)
                             return [2 /*return*/, undefined];
                         params = { fmt: "json3" };
@@ -111,8 +112,8 @@ var VideoCaptions = /** @class */ (function (_super) {
                             params["tlang"] = translationLanguageCode;
                         return [4 /*yield*/, this.client.http.get(url, { params: params })];
                     case 1:
-                        response = _c.sent();
-                        captions = (_b = response.data.events) === null || _b === void 0 ? void 0 : _b.reduce(function (curr, e) {
+                        response = _d.sent();
+                        captions = (_c = response.data.events) === null || _c === void 0 ? void 0 : _c.reduce(function (curr, e) {
                             var _a;
                             if (e.segs === undefined)
                                 return curr;

package/dist/esm/youtube/Client/Client.js

@@ -73,8 +73,8 @@ import { BASE_URL, INNERTUBE_API_KEY, INNERTUBE_CLIENT_NAME, INNERTUBE_CLIENT_VE
 var Client = /** @class */ (function () {
     function Client(options) {
         if (options === void 0) { options = {}; }
-        this.options = __assign(__assign({ initialCookie: "", oauth: { enabled: false }, fetchOptions: {} }, options), { youtubeClientOptions: __assign({ hl: "en", gl: "US" }, options.youtubeClientOptions) });
-        this.http = new HTTP(__assign({ apiKey: INNERTUBE_API_KEY, baseUrl: BASE_URL, clientName: INNERTUBE_CLIENT_NAME, clientVersion: INNERTUBE_CLIENT_VERSION }, this.options));
+        this.options = __assign(__assign({ initialCookie: "", oauth: { enabled: false }, fetchOptions: {} }, options), { youtubeClientOptions: __assign({ hl: "en", gl: "US" }, options.youtubeClientOptions), apiKey: options.apiKey || INNERTUBE_API_KEY, baseUrl: options.baseUrl || BASE_URL, clientName: options.clientName || INNERTUBE_CLIENT_NAME, clientVersion: options.clientVersion || INNERTUBE_CLIENT_VERSION });
+        this.http = new HTTP(this.options);
     }
     Object.defineProperty(Client.prototype, "oauth", {
         get: function () {

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/SearchResult/proto/index.js

@@ -11,7 +11,9 @@ var __assign = (this && this.__assign) || function () {
 };
 import protobuf from "protobufjs";
 // TODO move this to .proto file
-export var SearchProto = protobuf.parse("\n\tmessage SearchOptions {\n\t\tmessage Options {\n\t\t\toptional int32 uploadDate = 1;\n\t\t\toptional int32 type = 2;\n\t\t\toptional int32 duration = 3;\n\t\t\toptional int32 hd = 4;\n\t\t\toptional int32 subtitles = 5;\n\t\t\toptional int32 creativeCommons = 6;\n\t\t\toptional int32 live = 8;\n\t\t\toptional int32 _4k = 14;\n\t\t\toptional int32 _360 = 15;\n\t\t\toptional int32 location = 23;\n\t\t\toptional int32 hdr = 25;\n\t\t\toptional int32 vr180 = 26;\n\t\t}\n\n\t\toptional int32 sortBy = 1;\n\t\toptional Options options = 2;\n\t}\n").root.lookupType("SearchOptions");
+export var SearchProto = protobuf
+    .parse("\n\tmessage SearchOptions {\n\t\tmessage Options {\n\t\t\toptional int32 uploadDate = 1;\n\t\t\toptional int32 type = 2;\n\t\t\toptional int32 duration = 3;\n\t\t\toptional int32 hd = 4;\n\t\t\toptional int32 subtitles = 5;\n\t\t\toptional int32 creativeCommons = 6;\n\t\t\toptional int32 live = 8;\n\t\t\toptional int32 _4k = 14;\n\t\t\toptional int32 _360 = 15;\n\t\t\toptional int32 location = 23;\n\t\t\toptional int32 hdr = 25;\n\t\t\toptional int32 vr180 = 26;\n\t\t}\n\n\t\toptional int32 sortBy = 1;\n\t\toptional Options options = 2;\n\t}\n")
+    .root.lookupType("SearchOptions");
 var searchUploadDateProto = {
     all: 0,
     hour: 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

@@ -4,7 +4,7 @@ var VideoCompactParser = /** @class */ (function () {
     function VideoCompactParser() {
     }
     VideoCompactParser.loadVideoCompact = function (target, data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         var videoId = data.videoId, title = data.title, headline = data.headline, lengthText = data.lengthText, thumbnail = data.thumbnail, ownerText = data.ownerText, shortBylineText = data.shortBylineText, publishedTimeText = data.publishedTimeText, viewCountText = data.viewCountText, badges = data.badges, thumbnailOverlays = data.thumbnailOverlays, channelThumbnailSupportedRenderers = data.channelThumbnailSupportedRenderers, detailedMetadataSnippets = data.detailedMetadataSnippets;
         target.id = videoId;
         target.title = headline
@@ -20,8 +20,10 @@ var VideoCompactParser = /** @class */ (function () {
         target.isLive =
             !!((badges === null || badges === void 0 ? void 0 : badges[0].metadataBadgeRenderer.style) === "BADGE_STYLE_TYPE_LIVE_NOW") ||
                 ((_e = thumbnailOverlays === null || thumbnailOverlays === void 0 ? void 0 : thumbnailOverlays[0].thumbnailOverlayTimeStatusRenderer) === null || _e === void 0 ? void 0 : _e.style) === "LIVE";
+        target.isShort =
+            ((_f = thumbnailOverlays === null || thumbnailOverlays === void 0 ? void 0 : thumbnailOverlays[0].thumbnailOverlayTimeStatusRenderer) === null || _f === void 0 ? void 0 : _f.style) === "SHORTS" || false;
         // Channel
-        var browseEndpoint = (_h = (_g = (_f = (ownerText || shortBylineText)) === null || _f === void 0 ? void 0 : _f.runs[0]) === null || _g === void 0 ? void 0 : _g.navigationEndpoint) === null || _h === void 0 ? void 0 : _h.browseEndpoint;
+        var browseEndpoint = (_j = (_h = (_g = (ownerText || shortBylineText)) === null || _g === void 0 ? void 0 : _g.runs[0]) === null || _h === void 0 ? void 0 : _h.navigationEndpoint) === null || _j === void 0 ? void 0 : _j.browseEndpoint;
         if (browseEndpoint) {
             var id = browseEndpoint.browseId;
             var thumbnails = channelThumbnailSupportedRenderers === null || channelThumbnailSupportedRenderers === void 0 ? void 0 : channelThumbnailSupportedRenderers.channelThumbnailWithLinkRenderer.thumbnail.thumbnails;
@@ -35,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/common/shared/HTTP/HTTP.d.ts

@@ -8,7 +8,11 @@ export declare type OAuthProps = {
     expiresAt: Date | null;
     refreshToken?: string;
 };
-declare type HTTPOptions = {
+export declare type PotOptions = {
+    token: string;
+    visitorData: string;
+};
+export declare type HTTPOptions = {
     apiKey: string;
     baseUrl: string;
     clientName: string;
@@ -17,6 +21,7 @@ declare type HTTPOptions = {
     youtubeClientOptions?: Record<string, unknown>;
     initialCookie?: string;
     oauth?: OAuthOptions;
+    pot?: PotOptions;
 };
 declare type Response<T = any> = {
     data: T;
@@ -38,6 +43,7 @@ export declare class HTTP {
     private defaultFetchOptions;
     private defaultClientOptions;
     private authorizationPromise;
+    private pot?;
     oauth: OAuthOptions & OAuthProps;
     constructor(options: HTTPOptions);
     get(path: string, options?: Partial<Options>): Promise<Response>;

package/dist/typings/music/MusicClient/MusicClient.d.ts

@@ -1,5 +1,4 @@
-import { RequestInit } from "node-fetch";
-import { HTTP, Shelf } from "../../common";
+import { HTTP, HTTPOptions, Shelf } from "../../common";
 import { MusicAlbumCompact } from "../MusicAlbumCompact";
 import { MusicArtistCompact } from "../MusicArtistCompact";
 import { MusicLyrics } from "../MusicLyrics";
@@ -10,13 +9,7 @@ export declare type MusicTopShelf = {
     item?: MusicVideoCompact | MusicAlbumCompact | MusicPlaylistCompact | MusicArtistCompact;
     more?: (MusicVideoCompact | MusicAlbumCompact | MusicPlaylistCompact | MusicArtistCompact)[];
 };
-export declare type MusicClientOptions = {
-    initialCookie: string;
-    /** Optional options for http client */
-    fetchOptions: Partial<RequestInit>;
-    /** Optional options passed when sending a request to youtube (context.client) */
-    youtubeClientOptions: Record<string, unknown>;
-};
+export declare type MusicClientOptions = HTTPOptions;
 /** Youtube Music Client */
 export declare class MusicClient {
     /** @hidden */

package/dist/typings/music/constants.d.ts

@@ -1,4 +1,5 @@
 export declare const INNERTUBE_CLIENT_VERSION = "1.20221219.01.00";
+export declare const INNERTUBE_CLIENT_NAME = "WEB_REMIX";
 export declare const INNERTUBE_API_KEY = "AIzaSyC9XL3ZjWddXya6X74dJoCTL-WEYFDNX30";
 export declare const BASE_URL = "music.youtube.com";
 export declare const I_END_POINT = "/youtubei/v1";

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

@@ -1,5 +1,4 @@
-import { RequestInit } from "node-fetch";
-import { HTTP, OAuthOptions, OAuthProps } from "../../common";
+import { HTTP, HTTPOptions, OAuthProps } from "../../common";
 import { Caption } from "../Caption";
 import { Channel } from "../Channel";
 import { LiveVideo } from "../LiveVideo";
@@ -7,20 +6,13 @@ import { MixPlaylist } from "../MixPlaylist";
 import { Playlist } from "../Playlist";
 import { SearchOptions, SearchResult, SearchResultItem } from "../SearchResult";
 import { Video } from "../Video";
-export declare type ClientOptions = {
-    initialCookie: string;
-    oauth: OAuthOptions;
-    /** Optional options for http client */
-    fetchOptions: Partial<RequestInit>;
-    /** Optional options passed when sending a request to youtube (context.client) */
-    youtubeClientOptions: Record<string, string>;
-};
+export declare type ClientOptions = HTTPOptions;
 /** Youtube Client */
 export declare class Client {
     /** @hidden */
     http: HTTP;
     /** @hidden */
-    options: ClientOptions;
+    options: HTTPOptions;
     constructor(options?: Partial<ClientOptions>);
     get oauth(): OAuthProps;
     /**

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

@@ -28,6 +28,8 @@ export declare class VideoCompact extends Base implements VideoCompactProperties
     duration: number | null;
     /** Whether this video is a live now or not */
     isLive: boolean;
+    /** Whether this video is a shorts or not */
+    isShort: boolean;
     /** The channel who uploads this video */
     channel?: BaseChannel;
     /** The date this video is uploaded at */
@@ -44,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.6",
+	"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",