youtubei 1.5.3 → 1.6.0

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

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HTTP = void 0;
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const url_1 = require("url");
+const OAuth_1 = require("./OAuth");
 /**
  * @hidden
  */
@@ -31,6 +32,8 @@ class HTTP {
             "content-type": "application/json",
             "accept-encoding": "gzip, deflate, br",
         };
+        this.oauth = Object.assign({ enabled: false, token: null, expiresAt: null }, options.oauth);
+        this.authorizationPromise = null;
         this.defaultFetchOptions = options.fetchOptions || {};
         this.defaultClientOptions = options.youtubeClientOptions || {};
     }
@@ -48,7 +51,18 @@ class HTTP {
     }
     request(path, partialOptions) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.authorizationPromise)
+                yield this.authorizationPromise;
             const options = Object.assign(Object.assign(Object.assign({}, partialOptions), this.defaultFetchOptions), { headers: Object.assign(Object.assign(Object.assign(Object.assign({}, this.defaultHeaders), { cookie: this.cookie, referer: `https://${this.baseUrl}/` }), partialOptions.headers), this.defaultFetchOptions.headers), body: partialOptions.data ? JSON.stringify(partialOptions.data) : undefined });
+            if (this.oauth.enabled) {
+                this.authorizationPromise = this.authorize();
+                yield this.authorizationPromise;
+                if (this.oauth.token) {
+                    options.headers = {
+                        Authorization: `Bearer ${this.oauth.token}`,
+                    };
+                }
+            }
             // if URL is a full URL, ignore baseUrl
             let urlString;
             if (path.startsWith("http")) {
@@ -72,5 +86,21 @@ class HTTP {
         if (cookie)
             this.cookie = cookie;
     }
+    authorize() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const isExpired = !this.oauth.expiresAt || this.oauth.expiresAt.getTime() - 5 * 60 * 1000 < Date.now();
+            if (this.oauth.refreshToken && (isExpired || !this.oauth.token)) {
+                const response = yield OAuth_1.OAuth.refreshToken(this.oauth.refreshToken);
+                this.oauth.token = response.accessToken;
+                this.oauth.expiresAt = new Date(Date.now() + response.expiresIn * 1000);
+            }
+            else if (isExpired || !this.oauth.token) {
+                const response = yield OAuth_1.OAuth.authorize();
+                this.oauth.token = response.accessToken;
+                this.oauth.refreshToken = response.refreshToken;
+                this.oauth.expiresAt = new Date(Date.now() + response.expiresIn * 1000);
+            }
+        });
+    }
 }
 exports.HTTP = HTTP;

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

@@ -0,0 +1,133 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OAuth = void 0;
+const crypto_1 = require("crypto");
+const node_fetch_1 = __importDefault(require("node-fetch"));
+class OAuth {
+    static authorize() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const body = {
+                client_id: this.CLIENT_ID,
+                scope: this.SCOPE,
+                device_id: crypto_1.randomBytes(20).toString("hex"),
+                device_model: "ytlr::",
+            };
+            const response = yield node_fetch_1.default("https://www.youtube.com/o/oauth2/device/code", {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                    __youtube_oauth__: "True",
+                },
+                body: JSON.stringify(body),
+            });
+            if (response.ok) {
+                const data = yield response.json();
+                console.log(`[youtubei] Open ${data.verification_url} and enter ${data.user_code}`);
+                let authenticateResponse = null;
+                while (!authenticateResponse) {
+                    try {
+                        authenticateResponse = yield this.authenticate(data.device_code);
+                    }
+                    catch (err) {
+                        const message = err.message;
+                        if (message === "authorization_pending") {
+                            yield new Promise((r) => setTimeout(r, data.interval * 1000));
+                        }
+                        else if (message === "expired_token") {
+                            return this.authorize();
+                        }
+                        else {
+                            throw err;
+                        }
+                    }
+                }
+                return authenticateResponse;
+            }
+            throw new Error("Authorization failed");
+        });
+    }
+    static authenticate(code) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const body = {
+                client_id: this.CLIENT_ID,
+                client_secret: this.CLIENT_SECRET,
+                code,
+                grant_type: "http://oauth.net/grant_type/device/1.0",
+            };
+            const response = yield node_fetch_1.default("https://www.youtube.com/o/oauth2/token", {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                    __youtube_oauth__: "True",
+                },
+                body: JSON.stringify(body),
+            });
+            if (response.ok) {
+                const data = yield response.json();
+                if ("error" in data) {
+                    throw new Error(data.error);
+                }
+                else {
+                    return {
+                        accessToken: data.access_token,
+                        expiresIn: data.expires_in,
+                        refreshToken: data.refresh_token,
+                        scope: data.scope,
+                        tokenType: data.token_type,
+                    };
+                }
+            }
+            else {
+                throw new Error("Authentication failed");
+            }
+        });
+    }
+    static refreshToken(refreshToken) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const body = {
+                client_id: this.CLIENT_ID,
+                client_secret: this.CLIENT_SECRET,
+                refresh_token: refreshToken,
+                grant_type: "refresh_token",
+            };
+            const response = yield node_fetch_1.default("https://www.youtube.com/o/oauth2/token", {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                    __youtube_oauth__: "True",
+                },
+                body: JSON.stringify(body),
+            });
+            if (response.ok) {
+                const data = yield response.json();
+                if ("error" in data)
+                    return this.authorize();
+                return {
+                    accessToken: data.access_token,
+                    expiresIn: data.expires_in,
+                    scope: data.scope,
+                    tokenType: data.token_type,
+                };
+            }
+            else {
+                return this.authorize();
+            }
+        });
+    }
+}
+exports.OAuth = OAuth;
+OAuth.CLIENT_ID = "861556708454-d6dlm3lh05idd8npek18k6be8ba3oc68.apps.googleusercontent.com";
+OAuth.CLIENT_SECRET = "SboVhoG9s0rNafixCSGGKXAT";
+OAuth.SCOPE = "http://gdata.youtube.com https://www.googleapis.com/auth/youtube";

package/dist/cjs/youtube/Channel/ChannelParser.js

@@ -7,7 +7,7 @@ const PlaylistCompact_1 = require("../PlaylistCompact");
 const VideoCompact_1 = require("../VideoCompact");
 class ChannelParser {
     static loadChannel(target, data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         let channelId, title, avatar, subscriberCountText, videoCountText, tvBanner, mobileBanner, banner;
         const { c4TabbedHeaderRenderer, pageHeaderRenderer } = data.header;
         if (c4TabbedHeaderRenderer) {
@@ -27,8 +27,8 @@ class ChannelParser {
             title = pageHeaderRenderer.pageTitle;
             const { metadata, image: imageModel, banner: bannerModel, } = pageHeaderRenderer.content.pageHeaderViewModel;
             const metadataRow = metadata.contentMetadataViewModel.metadataRows[1];
-            subscriberCountText = metadataRow.metadataParts[0].text.content;
-            videoCountText = metadataRow.metadataParts[1].text.content;
+            subscriberCountText = metadataRow.metadataParts.find((m) => !m.text.styeRuns).text.content;
+            videoCountText = (_j = metadataRow.metadataParts.find((m) => m.text.styeRuns)) === null || _j === void 0 ? void 0 : _j.text.content;
             avatar = imageModel.decoratedAvatarViewModel.avatar.avatarViewModel.image.sources;
             banner = bannerModel === null || bannerModel === void 0 ? void 0 : bannerModel.imageBannerViewModel.image.sources;
         }

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

@@ -21,7 +21,7 @@ const constants_1 = require("../constants");
 /** Youtube Client */
 class Client {
     constructor(options = {}) {
-        this.options = Object.assign(Object.assign({ initialCookie: "", fetchOptions: {} }, options), { youtubeClientOptions: Object.assign({ hl: "en", gl: "US" }, options.youtubeClientOptions) });
+        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));
     }
     /**
@@ -75,12 +75,10 @@ class Client {
     getVideo(videoId) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.http.get(`${constants_1.WATCH_END_POINT}`, {
-                params: { v: videoId, pbj: "1" },
-            });
-            const data = Array.isArray(response.data)
-                ? response.data.reduce((prev, curr) => (Object.assign(Object.assign({}, prev), curr)), {})
-                : response.data;
+            const nextPromise = this.http.post(`${constants_1.I_END_POINT}/next`, { data: { videoId } });
+            const playerPromise = this.http.post(`${constants_1.I_END_POINT}/player`, { data: { videoId } });
+            const [nextResponse, playerResponse] = yield Promise.all([nextPromise, playerPromise]);
+            const data = { response: nextResponse.data, playerResponse: playerResponse.data };
             if (!((_b = (_a = data.response) === null || _a === void 0 ? void 0 : _a.contents) === null || _b === void 0 ? void 0 : _b.twoColumnWatchNextResults.results.results.contents) ||
                 data.playerResponse.playabilityStatus.status === "ERROR") {
                 return undefined;

package/dist/cjs/youtube/constants.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COMMENT_END_POINT = exports.WATCH_END_POINT = exports.LIVE_CHAT_END_POINT = exports.I_END_POINT = exports.BASE_URL = exports.INNERTUBE_API_KEY = exports.INNERTUBE_CLIENT_VERSION = exports.INNERTUBE_CLIENT_NAME = void 0;
+exports.COMMENT_END_POINT = exports.LIVE_CHAT_END_POINT = exports.I_END_POINT = exports.BASE_URL = exports.INNERTUBE_API_KEY = exports.INNERTUBE_CLIENT_VERSION = exports.INNERTUBE_CLIENT_NAME = void 0;
 exports.INNERTUBE_CLIENT_NAME = "WEB";
 exports.INNERTUBE_CLIENT_VERSION = "2.20201209.01.00";
 exports.INNERTUBE_API_KEY = "AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8";
 exports.BASE_URL = "www.youtube.com";
 exports.I_END_POINT = "/youtubei/v1";
 exports.LIVE_CHAT_END_POINT = `${exports.I_END_POINT}/live_chat/get_live_chat`;
-exports.WATCH_END_POINT = "/watch";
 exports.COMMENT_END_POINT = "/comment_service_ajax";

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

@@ -74,6 +74,7 @@ var __read = (this && this.__read) || function (o, n) {
 };
 import fetch from "node-fetch";
 import { URLSearchParams } from "url";
+import { OAuth } from "./OAuth";
 /**
  * @hidden
  */
@@ -90,6 +91,8 @@ var HTTP = /** @class */ (function () {
             "content-type": "application/json",
             "accept-encoding": "gzip, deflate, br",
         };
+        this.oauth = __assign({ enabled: false, token: null, expiresAt: null }, options.oauth);
+        this.authorizationPromise = null;
         this.defaultFetchOptions = options.fetchOptions || {};
         this.defaultClientOptions = options.youtubeClientOptions || {};
     }
@@ -122,7 +125,25 @@ var HTTP = /** @class */ (function () {
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
+                        if (!this.authorizationPromise) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.authorizationPromise];
+                    case 1:
+                        _e.sent();
+                        _e.label = 2;
+                    case 2:
                         options = __assign(__assign(__assign({}, partialOptions), this.defaultFetchOptions), { headers: __assign(__assign(__assign(__assign({}, this.defaultHeaders), { cookie: this.cookie, referer: "https://" + this.baseUrl + "/" }), partialOptions.headers), this.defaultFetchOptions.headers), body: partialOptions.data ? JSON.stringify(partialOptions.data) : undefined });
+                        if (!this.oauth.enabled) return [3 /*break*/, 4];
+                        this.authorizationPromise = this.authorize();
+                        return [4 /*yield*/, this.authorizationPromise];
+                    case 3:
+                        _e.sent();
+                        if (this.oauth.token) {
+                            options.headers = {
+                                Authorization: "Bearer " + this.oauth.token,
+                            };
+                        }
+                        _e.label = 4;
+                    case 4:
                         if (path.startsWith("http")) {
                             url = new URL(path);
                             try {
@@ -144,10 +165,10 @@ var HTTP = /** @class */ (function () {
                             urlString = "https://" + this.baseUrl + "/" + path + "?" + new URLSearchParams(partialOptions.params);
                         }
                         return [4 /*yield*/, fetch(urlString, options)];
-                    case 1:
+                    case 5:
                         response = _e.sent();
                         return [4 /*yield*/, response.json()];
-                    case 2:
+                    case 6:
                         data = _e.sent();
                         this.parseCookie(response);
                         return [2 /*return*/, { data: data }];
@@ -160,6 +181,34 @@ var HTTP = /** @class */ (function () {
         if (cookie)
             this.cookie = cookie;
     };
+    HTTP.prototype.authorize = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var isExpired, response, response;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        isExpired = !this.oauth.expiresAt || this.oauth.expiresAt.getTime() - 5 * 60 * 1000 < Date.now();
+                        if (!(this.oauth.refreshToken && (isExpired || !this.oauth.token))) return [3 /*break*/, 2];
+                        return [4 /*yield*/, OAuth.refreshToken(this.oauth.refreshToken)];
+                    case 1:
+                        response = _a.sent();
+                        this.oauth.token = response.accessToken;
+                        this.oauth.expiresAt = new Date(Date.now() + response.expiresIn * 1000);
+                        return [3 /*break*/, 4];
+                    case 2:
+                        if (!(isExpired || !this.oauth.token)) return [3 /*break*/, 4];
+                        return [4 /*yield*/, OAuth.authorize()];
+                    case 3:
+                        response = _a.sent();
+                        this.oauth.token = response.accessToken;
+                        this.oauth.refreshToken = response.refreshToken;
+                        this.oauth.expiresAt = new Date(Date.now() + response.expiresIn * 1000);
+                        _a.label = 4;
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
     return HTTP;
 }());
 export { HTTP };

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

@@ -0,0 +1,193 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import { randomBytes } from "crypto";
+import fetch from "node-fetch";
+var OAuth = /** @class */ (function () {
+    function OAuth() {
+    }
+    OAuth.authorize = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var body, response, data_1, authenticateResponse, err_1, message;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        body = {
+                            client_id: this.CLIENT_ID,
+                            scope: this.SCOPE,
+                            device_id: randomBytes(20).toString("hex"),
+                            device_model: "ytlr::",
+                        };
+                        return [4 /*yield*/, fetch("https://www.youtube.com/o/oauth2/device/code", {
+                                method: "POST",
+                                headers: {
+                                    "Content-Type": "application/json",
+                                    __youtube_oauth__: "True",
+                                },
+                                body: JSON.stringify(body),
+                            })];
+                    case 1:
+                        response = _a.sent();
+                        if (!response.ok) return [3 /*break*/, 12];
+                        return [4 /*yield*/, response.json()];
+                    case 2:
+                        data_1 = _a.sent();
+                        console.log("[youtubei] Open " + data_1.verification_url + " and enter " + data_1.user_code);
+                        authenticateResponse = null;
+                        _a.label = 3;
+                    case 3:
+                        if (!!authenticateResponse) return [3 /*break*/, 11];
+                        _a.label = 4;
+                    case 4:
+                        _a.trys.push([4, 6, , 10]);
+                        return [4 /*yield*/, this.authenticate(data_1.device_code)];
+                    case 5:
+                        authenticateResponse = _a.sent();
+                        return [3 /*break*/, 10];
+                    case 6:
+                        err_1 = _a.sent();
+                        message = err_1.message;
+                        if (!(message === "authorization_pending")) return [3 /*break*/, 8];
+                        return [4 /*yield*/, new Promise(function (r) { return setTimeout(r, data_1.interval * 1000); })];
+                    case 7:
+                        _a.sent();
+                        return [3 /*break*/, 9];
+                    case 8:
+                        if (message === "expired_token") {
+                            return [2 /*return*/, this.authorize()];
+                        }
+                        else {
+                            throw err_1;
+                        }
+                        _a.label = 9;
+                    case 9: return [3 /*break*/, 10];
+                    case 10: return [3 /*break*/, 3];
+                    case 11: return [2 /*return*/, authenticateResponse];
+                    case 12: throw new Error("Authorization failed");
+                }
+            });
+        });
+    };
+    OAuth.authenticate = function (code) {
+        return __awaiter(this, void 0, void 0, function () {
+            var body, response, data;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        body = {
+                            client_id: this.CLIENT_ID,
+                            client_secret: this.CLIENT_SECRET,
+                            code: code,
+                            grant_type: "http://oauth.net/grant_type/device/1.0",
+                        };
+                        return [4 /*yield*/, fetch("https://www.youtube.com/o/oauth2/token", {
+                                method: "POST",
+                                headers: {
+                                    "Content-Type": "application/json",
+                                    __youtube_oauth__: "True",
+                                },
+                                body: JSON.stringify(body),
+                            })];
+                    case 1:
+                        response = _a.sent();
+                        if (!response.ok) return [3 /*break*/, 3];
+                        return [4 /*yield*/, response.json()];
+                    case 2:
+                        data = _a.sent();
+                        if ("error" in data) {
+                            throw new Error(data.error);
+                        }
+                        else {
+                            return [2 /*return*/, {
+                                    accessToken: data.access_token,
+                                    expiresIn: data.expires_in,
+                                    refreshToken: data.refresh_token,
+                                    scope: data.scope,
+                                    tokenType: data.token_type,
+                                }];
+                        }
+                        return [3 /*break*/, 4];
+                    case 3: throw new Error("Authentication failed");
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    OAuth.refreshToken = function (refreshToken) {
+        return __awaiter(this, void 0, void 0, function () {
+            var body, response, data;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        body = {
+                            client_id: this.CLIENT_ID,
+                            client_secret: this.CLIENT_SECRET,
+                            refresh_token: refreshToken,
+                            grant_type: "refresh_token",
+                        };
+                        return [4 /*yield*/, fetch("https://www.youtube.com/o/oauth2/token", {
+                                method: "POST",
+                                headers: {
+                                    "Content-Type": "application/json",
+                                    __youtube_oauth__: "True",
+                                },
+                                body: JSON.stringify(body),
+                            })];
+                    case 1:
+                        response = _a.sent();
+                        if (!response.ok) return [3 /*break*/, 3];
+                        return [4 /*yield*/, response.json()];
+                    case 2:
+                        data = _a.sent();
+                        if ("error" in data)
+                            return [2 /*return*/, this.authorize()];
+                        return [2 /*return*/, {
+                                accessToken: data.access_token,
+                                expiresIn: data.expires_in,
+                                scope: data.scope,
+                                tokenType: data.token_type,
+                            }];
+                    case 3: return [2 /*return*/, this.authorize()];
+                }
+            });
+        });
+    };
+    OAuth.CLIENT_ID = "861556708454-d6dlm3lh05idd8npek18k6be8ba3oc68.apps.googleusercontent.com";
+    OAuth.CLIENT_SECRET = "SboVhoG9s0rNafixCSGGKXAT";
+    OAuth.SCOPE = "http://gdata.youtube.com https://www.googleapis.com/auth/youtube";
+    return OAuth;
+}());
+export { OAuth };

package/dist/esm/youtube/Channel/ChannelParser.js

@@ -17,9 +17,9 @@ var ChannelParser = /** @class */ (function () {
     function ChannelParser() {
     }
     ChannelParser.loadChannel = function (target, data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         var channelId, title, avatar, subscriberCountText, videoCountText, tvBanner, mobileBanner, banner;
-        var _j = data.header, c4TabbedHeaderRenderer = _j.c4TabbedHeaderRenderer, pageHeaderRenderer = _j.pageHeaderRenderer;
+        var _k = data.header, c4TabbedHeaderRenderer = _k.c4TabbedHeaderRenderer, pageHeaderRenderer = _k.pageHeaderRenderer;
         if (c4TabbedHeaderRenderer) {
             channelId = c4TabbedHeaderRenderer.channelId;
             title = c4TabbedHeaderRenderer.title;
@@ -35,10 +35,10 @@ var ChannelParser = /** @class */ (function () {
                 data.contents.twoColumnBrowseResultsRenderer.tabs[0].tabRenderer.endpoint
                     .browseEndpoint.browseId;
             title = pageHeaderRenderer.pageTitle;
-            var _k = pageHeaderRenderer.content.pageHeaderViewModel, metadata = _k.metadata, imageModel = _k.image, bannerModel = _k.banner;
+            var _l = pageHeaderRenderer.content.pageHeaderViewModel, metadata = _l.metadata, imageModel = _l.image, bannerModel = _l.banner;
             var metadataRow = metadata.contentMetadataViewModel.metadataRows[1];
-            subscriberCountText = metadataRow.metadataParts[0].text.content;
-            videoCountText = metadataRow.metadataParts[1].text.content;
+            subscriberCountText = metadataRow.metadataParts.find(function (m) { return !m.text.styeRuns; }).text.content;
+            videoCountText = (_j = metadataRow.metadataParts.find(function (m) { return m.text.styeRuns; })) === null || _j === void 0 ? void 0 : _j.text.content;
             avatar = imageModel.decoratedAvatarViewModel.avatar.avatarViewModel.image.sources;
             banner = bannerModel === null || bannerModel === void 0 ? void 0 : bannerModel.imageBannerViewModel.image.sources;
         }

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

@@ -45,6 +45,22 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
 import { HTTP } from "../../common";
 import { Channel } from "../Channel";
 import { LiveVideo } from "../LiveVideo";
@@ -52,12 +68,12 @@ import { MixPlaylist } from "../MixPlaylist";
 import { Playlist } from "../Playlist";
 import { SearchResult } from "../SearchResult";
 import { Video } from "../Video";
-import { BASE_URL, INNERTUBE_API_KEY, INNERTUBE_CLIENT_NAME, INNERTUBE_CLIENT_VERSION, I_END_POINT, WATCH_END_POINT, } from "../constants";
+import { BASE_URL, INNERTUBE_API_KEY, INNERTUBE_CLIENT_NAME, INNERTUBE_CLIENT_VERSION, I_END_POINT, } from "../constants";
 /** Youtube Client */
 var Client = /** @class */ (function () {
     function Client(options) {
         if (options === void 0) { options = {}; }
-        this.options = __assign(__assign({ initialCookie: "", fetchOptions: {} }, options), { youtubeClientOptions: __assign({ hl: "en", gl: "US" }, options.youtubeClientOptions) });
+        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));
     }
     /**
@@ -135,17 +151,16 @@ var Client = /** @class */ (function () {
     Client.prototype.getVideo = function (videoId) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var response, data;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.http.get("" + WATCH_END_POINT, {
-                            params: { v: videoId, pbj: "1" },
-                        })];
+            var nextPromise, playerPromise, _c, nextResponse, playerResponse, data;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        nextPromise = this.http.post(I_END_POINT + "/next", { data: { videoId: videoId } });
+                        playerPromise = this.http.post(I_END_POINT + "/player", { data: { videoId: videoId } });
+                        return [4 /*yield*/, Promise.all([nextPromise, playerPromise])];
                     case 1:
-                        response = _c.sent();
-                        data = Array.isArray(response.data)
-                            ? response.data.reduce(function (prev, curr) { return (__assign(__assign({}, prev), curr)); }, {})
-                            : response.data;
+                        _c = __read.apply(void 0, [_d.sent(), 2]), nextResponse = _c[0], playerResponse = _c[1];
+                        data = { response: nextResponse.data, playerResponse: playerResponse.data };
                         if (!((_b = (_a = data.response) === null || _a === void 0 ? void 0 : _a.contents) === null || _b === void 0 ? void 0 : _b.twoColumnWatchNextResults.results.results.contents) ||
                             data.playerResponse.playabilityStatus.status === "ERROR") {
                             return [2 /*return*/, undefined];

package/dist/esm/youtube/constants.js

@@ -4,5 +4,4 @@ export var INNERTUBE_API_KEY = "AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8";
 export var BASE_URL = "www.youtube.com";
 export var I_END_POINT = "/youtubei/v1";
 export var LIVE_CHAT_END_POINT = I_END_POINT + "/live_chat/get_live_chat";
-export var WATCH_END_POINT = "/watch";
 export var COMMENT_END_POINT = "/comment_service_ajax";

package/dist/typings/common/shared/HTTP/HTTP.d.ts

@@ -1,4 +1,12 @@
 import { RequestInit } from "node-fetch";
+export declare type OAuthOptions = {
+    enabled: boolean;
+    refreshToken?: string;
+};
+declare type OAuthProps = {
+    token: string | null;
+    expiresAt: Date | null;
+};
 declare type HTTPOptions = {
     apiKey: string;
     baseUrl: string;
@@ -7,6 +15,7 @@ declare type HTTPOptions = {
     fetchOptions?: Partial<RequestInit>;
     youtubeClientOptions?: Record<string, unknown>;
     initialCookie?: string;
+    oauth?: OAuthOptions;
 };
 declare type Response<T = any> = {
     data: T;
@@ -27,10 +36,13 @@ export declare class HTTP {
     private defaultHeaders;
     private defaultFetchOptions;
     private defaultClientOptions;
+    private authorizationPromise;
+    oauth: OAuthOptions & OAuthProps;
     constructor(options: HTTPOptions);
     get(path: string, options?: Partial<Options>): Promise<Response>;
     post(path: string, options?: Partial<Options>): Promise<Response>;
     private request;
     private parseCookie;
+    private authorize;
 }
 export {};

package/dist/typings/common/shared/HTTP/OAuth.d.ts

@@ -0,0 +1,21 @@
+export interface RefreshResponse {
+    accessToken: string;
+    expiresIn: number;
+    scope: string;
+    tokenType: string;
+}
+export interface AuthenticateResponse {
+    accessToken: string;
+    expiresIn: number;
+    refreshToken: string;
+    scope: string;
+    tokenType: string;
+}
+export declare class OAuth {
+    private static CLIENT_ID;
+    private static CLIENT_SECRET;
+    private static SCOPE;
+    static authorize(): Promise<AuthenticateResponse>;
+    private static authenticate;
+    static refreshToken(refreshToken: string): Promise<RefreshResponse>;
+}

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

@@ -1,5 +1,5 @@
 import { RequestInit } from "node-fetch";
-import { HTTP } from "../../common";
+import { HTTP, OAuthOptions } from "../../common";
 import { Caption } from "../Caption";
 import { Channel } from "../Channel";
 import { LiveVideo } from "../LiveVideo";
@@ -9,6 +9,7 @@ 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) */

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

@@ -4,5 +4,4 @@ export declare const INNERTUBE_API_KEY = "AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW
 export declare const BASE_URL = "www.youtube.com";
 export declare const I_END_POINT = "/youtubei/v1";
 export declare const LIVE_CHAT_END_POINT: string;
-export declare const WATCH_END_POINT = "/watch";
 export declare const COMMENT_END_POINT = "/comment_service_ajax";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "youtubei",
-	"version": "1.5.3",
+	"version": "1.6.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",