youtubei 1.6.4 → 1.6.6

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

@@ -15,8 +15,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuth = void 0;
 const crypto_1 = require("crypto");
 const node_fetch_1 = __importDefault(require("node-fetch"));
+/** OAuth Helper Class */
 class OAuth {
-    static authorize() {
+    static authorize(manual) {
         return __awaiter(this, void 0, void 0, function* () {
             const body = {
                 client_id: this.CLIENT_ID,
@@ -34,6 +35,15 @@ class OAuth {
             });
             if (response.ok) {
                 const data = yield response.json();
+                if (manual) {
+                    return {
+                        deviceCode: data.device_code,
+                        userCode: data.user_code,
+                        expiresIn: data.expires_in,
+                        interval: data.interval,
+                        verificationUrl: data.verification_url,
+                    };
+                }
                 console.log(`[youtubei] Open ${data.verification_url} and enter ${data.user_code}`);
                 let authenticateResponse = null;
                 while (!authenticateResponse) {
@@ -58,6 +68,11 @@ class OAuth {
             throw new Error("Authorization failed");
         });
     }
+    /**
+     * Authenticate to obtain a token and refresh token using the code from the authorize method
+     *
+     * @param code code obtained from the authorize method
+     */
     static authenticate(code) {
         return __awaiter(this, void 0, void 0, function* () {
             const body = {

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

@@ -11,3 +11,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./HTTP"), exports);
+__exportStar(require("./OAuth"), exports);

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

@@ -7,8 +7,8 @@ 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, _j;
-        let channelId, title, avatar, subscriberCountText, videoCountText, tvBanner, mobileBanner, banner;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        let channelId, title, handle, description, avatar, subscriberCountText, videoCountText, tvBanner, mobileBanner, banner;
         const { c4TabbedHeaderRenderer, pageHeaderRenderer } = data.header;
         if (c4TabbedHeaderRenderer) {
             channelId = c4TabbedHeaderRenderer.channelId;
@@ -25,15 +25,20 @@ class ChannelParser {
                 data.contents.twoColumnBrowseResultsRenderer.tabs[0].tabRenderer.endpoint
                     .browseEndpoint.browseId;
             title = pageHeaderRenderer.pageTitle;
-            const { metadata, image: imageModel, banner: bannerModel, } = pageHeaderRenderer.content.pageHeaderViewModel;
-            const metadataRow = metadata.contentMetadataViewModel.metadataRows.find((m) => m.metadataParts);
-            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;
+            const { metadata, image: imageModel, banner: bannerModel, description: descriptionModel, } = pageHeaderRenderer.content.pageHeaderViewModel;
+            const metadataRow = metadata.contentMetadataViewModel.metadataRows.find((m) => m.metadataParts && m.metadataParts.length == 2);
+            const handleRow = metadata.contentMetadataViewModel.metadataRows.find((m) => m.metadataParts && m.metadataParts.length == 1);
+            handle = (_j = handleRow === null || handleRow === void 0 ? void 0 : handleRow.metadataParts[0].text) === null || _j === void 0 ? void 0 : _j.content;
+            videoCountText = (_k = metadataRow.metadataParts.find((m) => m.text.styleRuns)) === null || _k === void 0 ? void 0 : _k.text.content;
+            subscriberCountText = (_l = metadataRow.metadataParts.find((m) => !m.text.styleRuns)) === null || _l === void 0 ? void 0 : _l.text.content;
             avatar = imageModel.decoratedAvatarViewModel.avatar.avatarViewModel.image.sources;
             banner = bannerModel === null || bannerModel === void 0 ? void 0 : bannerModel.imageBannerViewModel.image.sources;
+            description = descriptionModel === null || descriptionModel === void 0 ? void 0 : descriptionModel.descriptionPreviewViewModel.description.content;
         }
         target.id = channelId;
         target.name = title;
+        target.handle = handle;
+        target.description = description;
         target.thumbnails = new common_1.Thumbnails().load(avatar);
         target.videoCount = videoCountText;
         target.subscriberCount = subscriberCountText;

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

@@ -24,6 +24,13 @@ class Client {
         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));
     }
+    get oauth() {
+        return {
+            token: this.http.oauth.token,
+            expiresAt: this.http.oauth.expiresAt,
+            refreshToken: this.http.oauth.refreshToken,
+        };
+    }
     /**
      * Searches for videos / playlists / channels
      *

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

@@ -36,10 +36,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { randomBytes } from "crypto";
 import fetch from "node-fetch";
+/** OAuth Helper Class */
 var OAuth = /** @class */ (function () {
     function OAuth() {
     }
-    OAuth.authorize = function () {
+    OAuth.authorize = function (manual) {
         return __awaiter(this, void 0, void 0, function () {
             var body, response, data_1, authenticateResponse, err_1, message;
             return __generator(this, function (_a) {
@@ -65,6 +66,15 @@ var OAuth = /** @class */ (function () {
                         return [4 /*yield*/, response.json()];
                     case 2:
                         data_1 = _a.sent();
+                        if (manual) {
+                            return [2 /*return*/, {
+                                    deviceCode: data_1.device_code,
+                                    userCode: data_1.user_code,
+                                    expiresIn: data_1.expires_in,
+                                    interval: data_1.interval,
+                                    verificationUrl: data_1.verification_url,
+                                }];
+                        }
                         console.log("[youtubei] Open " + data_1.verification_url + " and enter " + data_1.user_code);
                         authenticateResponse = null;
                         _a.label = 3;
@@ -101,6 +111,11 @@ var OAuth = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Authenticate to obtain a token and refresh token using the code from the authorize method
+     *
+     * @param code code obtained from the authorize method
+     */
     OAuth.authenticate = function (code) {
         return __awaiter(this, void 0, void 0, function () {
             var body, response, data;

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

@@ -1 +1,2 @@
 export * from "./HTTP";
+export * from "./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, _j;
-        var channelId, title, avatar, subscriberCountText, videoCountText, tvBanner, mobileBanner, banner;
-        var _k = data.header, c4TabbedHeaderRenderer = _k.c4TabbedHeaderRenderer, pageHeaderRenderer = _k.pageHeaderRenderer;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var channelId, title, handle, description, avatar, subscriberCountText, videoCountText, tvBanner, mobileBanner, banner;
+        var _m = data.header, c4TabbedHeaderRenderer = _m.c4TabbedHeaderRenderer, pageHeaderRenderer = _m.pageHeaderRenderer;
         if (c4TabbedHeaderRenderer) {
             channelId = c4TabbedHeaderRenderer.channelId;
             title = c4TabbedHeaderRenderer.title;
@@ -35,15 +35,20 @@ var ChannelParser = /** @class */ (function () {
                 data.contents.twoColumnBrowseResultsRenderer.tabs[0].tabRenderer.endpoint
                     .browseEndpoint.browseId;
             title = pageHeaderRenderer.pageTitle;
-            var _l = pageHeaderRenderer.content.pageHeaderViewModel, metadata = _l.metadata, imageModel = _l.image, bannerModel = _l.banner;
-            var metadataRow = metadata.contentMetadataViewModel.metadataRows.find(function (m) { return m.metadataParts; });
-            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;
+            var _o = pageHeaderRenderer.content.pageHeaderViewModel, metadata = _o.metadata, imageModel = _o.image, bannerModel = _o.banner, descriptionModel = _o.description;
+            var metadataRow = metadata.contentMetadataViewModel.metadataRows.find(function (m) { return m.metadataParts && m.metadataParts.length == 2; });
+            var handleRow = metadata.contentMetadataViewModel.metadataRows.find(function (m) { return m.metadataParts && m.metadataParts.length == 1; });
+            handle = (_j = handleRow === null || handleRow === void 0 ? void 0 : handleRow.metadataParts[0].text) === null || _j === void 0 ? void 0 : _j.content;
+            videoCountText = (_k = metadataRow.metadataParts.find(function (m) { return m.text.styleRuns; })) === null || _k === void 0 ? void 0 : _k.text.content;
+            subscriberCountText = (_l = metadataRow.metadataParts.find(function (m) { return !m.text.styleRuns; })) === null || _l === void 0 ? void 0 : _l.text.content;
             avatar = imageModel.decoratedAvatarViewModel.avatar.avatarViewModel.image.sources;
             banner = bannerModel === null || bannerModel === void 0 ? void 0 : bannerModel.imageBannerViewModel.image.sources;
+            description = descriptionModel === null || descriptionModel === void 0 ? void 0 : descriptionModel.descriptionPreviewViewModel.description.content;
         }
         target.id = channelId;
         target.name = title;
+        target.handle = handle;
+        target.description = description;
         target.thumbnails = new Thumbnails().load(avatar);
         target.videoCount = videoCountText;
         target.subscriberCount = subscriberCountText;

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

@@ -76,6 +76,17 @@ var Client = /** @class */ (function () {
         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));
     }
+    Object.defineProperty(Client.prototype, "oauth", {
+        get: function () {
+            return {
+                token: this.http.oauth.token,
+                expiresAt: this.http.oauth.expiresAt,
+                refreshToken: this.http.oauth.refreshToken,
+            };
+        },
+        enumerable: false,
+        configurable: true
+    });
     /**
      * Searches for videos / playlists / channels
      *

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

@@ -3,9 +3,10 @@ export declare type OAuthOptions = {
     enabled: boolean;
     refreshToken?: string;
 };
-declare type OAuthProps = {
+export declare type OAuthProps = {
     token: string | null;
     expiresAt: Date | null;
+    refreshToken?: string;
 };
 declare type HTTPOptions = {
     apiKey: string;

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

@@ -1,3 +1,10 @@
+export interface AuthorizeResponse {
+    deviceCode: string;
+    userCode: string;
+    expiresIn: number;
+    interval: number;
+    verificationUrl: string;
+}
 export interface RefreshResponse {
     accessToken: string;
     expiresIn: number;
@@ -11,11 +18,23 @@ export interface AuthenticateResponse {
     scope: string;
     tokenType: string;
 }
+/** OAuth Helper Class */
 export declare class OAuth {
     private static CLIENT_ID;
     private static CLIENT_SECRET;
     private static SCOPE;
+    /**
+     * Start the authorization process
+     *
+     * @param manual If true, returns the raw response instead of printing out the code and automatically do a authentication pooling
+     */
     static authorize(): Promise<AuthenticateResponse>;
-    private static authenticate;
+    static authorize(manual: true): Promise<AuthorizeResponse>;
+    /**
+     * Authenticate to obtain a token and refresh token using the code from the authorize method
+     *
+     * @param code code obtained from the authorize method
+     */
+    static authenticate(code: string): Promise<AuthenticateResponse>;
     static refreshToken(refreshToken: string): Promise<RefreshResponse>;
 }

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

@@ -1 +1,2 @@
 export * from "./HTTP";
+export * from "./OAuth";

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

@@ -16,6 +16,10 @@ export declare class BaseChannel extends Base implements BaseChannelProperties {
     id: string;
     /** The channel's name */
     name: string;
+    /** The channel's handle start with @ */
+    handle: string;
+    /** The channel's description */
+    description?: string;
     /** Thumbnails of this Channel */
     thumbnails?: Thumbnails;
     /**

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

@@ -1,5 +1,5 @@
 import { RequestInit } from "node-fetch";
-import { HTTP, OAuthOptions } from "../../common";
+import { HTTP, OAuthOptions, OAuthProps } from "../../common";
 import { Caption } from "../Caption";
 import { Channel } from "../Channel";
 import { LiveVideo } from "../LiveVideo";
@@ -22,6 +22,7 @@ export declare class Client {
     /** @hidden */
     options: ClientOptions;
     constructor(options?: Partial<ClientOptions>);
+    get oauth(): OAuthProps;
     /**
      * Searches for videos / playlists / channels
      *

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "youtubei",
-	"version": "1.6.4",
+	"version": "1.6.6",
 	"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",