From 1484e3c2aa8892a5ad07bb01584dac308f4bd59b Mon Sep 17 00:00:00 2001 From: LuanRT Date: Thu, 16 Jun 2022 20:52:00 -0300 Subject: [PATCH] dev: always use InnerTube prod url --- lib/core/SessionBuilder.js | 2 +- lib/utils/Constants.js | 13 +++++++------ lib/utils/Request.js | 9 ++------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/lib/core/SessionBuilder.js b/lib/core/SessionBuilder.js index e6316b57..b3638cb3 100644 --- a/lib/core/SessionBuilder.js +++ b/lib/core/SessionBuilder.js @@ -80,7 +80,7 @@ class SessionBuilder { userAgent: user_agent.toString(), clientName: this.#client_name, clientVersion: this.#client_version, - originalUrl: Constants.URLS.YT_BASE + originalUrl: Constants.URLS.API.BASE }, user: { lockedSafetyMode: false }, request: { useSsl: true } diff --git a/lib/utils/Constants.js b/lib/utils/Constants.js index ed668d3c..dc79531c 100644 --- a/lib/utils/Constants.js +++ b/lib/utils/Constants.js @@ -9,12 +9,13 @@ module.exports = { YT_MUSIC: 'https://music.youtube.com', YT_MUSIC_BASE_API: 'https://music.youtube.com/youtubei/', API: { - PRODUCTION: 'https://youtubei.googleapis.com', - STAGING: 'https://green-youtubei.sandbox.googleapis.com', - RELEASE: 'https://release-youtubei.sandbox.googleapis.com', - TEST: 'https://test-youtubei.sandbox.googleapis.com', - CAMI: 'http://cami-youtubei.sandbox.googleapis.com', - UYTFE: 'https://uytfe.sandbox.google.com' + BASE: 'https://youtubei.googleapis.com', + PRODUCTION: 'https://youtubei.googleapis.com/youtubei/', + STAGING: 'https://green-youtubei.sandbox.googleapis.com/youtubei/', + RELEASE: 'https://release-youtubei.sandbox.googleapis.com/youtubei/', + TEST: 'https://test-youtubei.sandbox.googleapis.com/youtubei/', + CAMI: 'http://cami-youtubei.sandbox.googleapis.com/youtubei/', + UYTFE: 'https://uytfe.sandbox.google.com/youtubei/' } }, OAUTH: { diff --git a/lib/utils/Request.js b/lib/utils/Request.js index 5960f504..7cd4bf6f 100644 --- a/lib/utils/Request.js +++ b/lib/utils/Request.js @@ -14,7 +14,7 @@ class Request { this.instance = Axios.create({ ...session.axios.defaults, - baseURL: Constants.URLS.YT_BASE_API + session.version, + baseURL: Constants.URLS.API.PRODUCTION + session.version, headers: Constants.INNERTUBE_HEADERS_BASE, params: { key: session.key, prettyPrint: false }, validateStatus: () => true, @@ -46,10 +46,7 @@ class Request { config.headers['x-youtube-client-version'] = config.data.context.client.clientVersion; config.headers['x-origin'] = config.data.context.client.originalUrl; config.headers['origin'] = config.data.context.client.originalUrl; - - config.data.client == 'YTMUSIC' && - (config.baseURL = Constants.URLS.YT_MUSIC_BASE_API + this.session.version); - + delete config.data.client; } @@ -107,12 +104,10 @@ class Request { #adjustContext(ctx, client) { switch (client) { case 'YTMUSIC': - ctx.client.originalUrl = Constants.URLS.YT_MUSIC; ctx.client.clientVersion = Constants.CLIENTS.YTMUSIC.VERSION; ctx.client.clientName = Constants.CLIENTS.YTMUSIC.NAME; break; case 'ANDROID': - ctx.client.originalUrl = Constants.URLS.YT_BASE; ctx.client.clientVersion = Constants.CLIENTS.ANDROID.VERSION; ctx.client.clientFormFactor = 'SMALL_FORM_FACTOR'; ctx.client.clientName = Constants.CLIENTS.ANDROID.NAME;