mirror of
https://github.com/LuanRT/YouTube.js.git
synced 2026-06-19 12:31:17 +00:00
* refactor: remove dependancies removes node-forge and uuid in favor of Web APIs * refactor!: commonjs to es6 To aid with #93 I will make all my changes in TypeScript instead. This is the first step into making that happen. Used: https://github.com/wessberg/cjstoesm * refactor!: NToken and Signature TS files Bring this PR up to speed with #93 * feat: cross platform cache (WIP) this is untested! should remove idb as dependecy. * feat: EventEmitter polyfill * refactor: remove events * feat: HTTPClient based on Fetch API (WIP) * refactor!: parsers refactor (WIP) Initial TS support for parsers as per #93 This adds several type safety checks to the parser which'll help to ensure valid data is returned by the parser. * refactor!: parsers refactor (WIP) Bring more in line with the existing implementations & make less verbose * refactor!: parser refactor I was overcomplicating things, this is much simpler and compatible with the existing JS API * fix: some missed parsers while refactoring * fix: better type inferance for parseResponse * feat(TS): typesafe YTNode casts * feat: more type safety in YTNode and Parser * refactor: VideoInfo download with fetch & TS (WIP) Again, this also does some work for #93 * fix: LiveChat in VideoInfo * refactor!: more typesafety in parser * refactor!: VideoInfo almost completed * refactor!: player and session refactors - Remove the Player class' dependance on Session. - Add additional context to the Session. * refactor!: move auth logic to Session (WIP) * refactor: TS port for Actions and Innertube My fingers hurt from typing out all those types :-P * refactor: NavigationEndpoint TS this is still a WIP and should be improved. NavigationEndpoint should probably be refactored further. * refactor!: VideoInfo compiles without errors * chore: delete old player * fix: import errors It compiles and runs!! * fix: Utils import fixes * fix: several runtime errors * fix: video streaming * chore: remove console.log debugging Whoops, forgot to remove these before I pushed the previous commit * chore: remove old unused dependencies * fix: typescript errors Now emitting declarations and source maps * refactor: TS feed * chore: delete old Feed * refactor: move streamToIterable into Utils * refactor: AccountManager TS * refactor: FilterableFeed to TS * refactor: InteractionManager to TS * refactor: PlaylistManager to TS * refactor: TabbedFeed to TS * refactor: Music to TS (WIP) more work to be done, see TODO comments * fix: getting the tests to pass (6/12) YouTube.js Tests Search ✓ Should search on YouTube (1152 ms) ✕ Should search on YouTube Music (705 ms) ✕ Should retrieve YouTube search suggestions (722 ms) ✓ Should retrieve YouTube Music search suggestions (233 ms) Comments ✓ Should retrieve comments (585 ms) ✕ Should retrieve next batch of comments (221 ms) ✕ Should retrieve comment replies (1 ms) General ✕ Should retrieve playlist with YouTube (732 ms) ✓ Should retrieve home feed (838 ms) ✓ Should retrieve trending content (543 ms) ✓ Should retrieve video info (639 ms) ✕ Should download video (5 ms) * fix: tests (7/12) YouTube.js Tests Search ✓ Should search on YouTube (1984 ms) ✕ Should search on YouTube Music (1139 ms) ✕ Should retrieve YouTube search suggestions (1433 ms) ✓ Should retrieve YouTube Music search suggestions (529 ms) Comments ✓ Should retrieve comments (324 ms) ✓ Should retrieve next batch of comments (395 ms) ✕ Should retrieve comment replies General ✕ Should retrieve playlist with YouTube (653 ms) ✓ Should retrieve home feed (1085 ms) ✓ Should retrieve trending content (513 ms) ✓ Should retrieve video info (921 ms) ✕ Should download video (3 ms) * fix: download tests (8/12) YouTube.js Tests Search ✓ Should search on YouTube (1293 ms) ✕ Should search on YouTube Music (927 ms) ✕ Should retrieve YouTube search suggestions (1250 ms) ✓ Should retrieve YouTube Music search suggestions (258 ms) Comments ✓ Should retrieve comments (803 ms) ✓ Should retrieve next batch of comments (511 ms) ✕ Should retrieve comment replies General ✕ Should retrieve playlist with YouTube (528 ms) ✓ Should retrieve home feed (1047 ms) ✓ Should retrieve trending content (548 ms) ✓ Should retrieve video info (825 ms) ✓ Should download video (1779 ms) * fix: tests (9/12) YouTube.js Tests Search ✓ Should search on YouTube (1276 ms) ✕ Should search on YouTube Music (955 ms) ✓ Should retrieve YouTube search suggestions (661 ms) ✓ Should retrieve YouTube Music search suggestions (491 ms) Comments ✓ Should retrieve comments (624 ms) ✓ Should retrieve next batch of comments (353 ms) ✕ Should retrieve comment replies General ✕ Should retrieve playlist with YouTube (672 ms) ✓ Should retrieve home feed (1277 ms) ✓ Should retrieve trending content (999 ms) ✓ Should retrieve video info (1106 ms) ✓ Should download video (2514 ms) * feat: key based type validation for parsers * fix: comments tests pass (10/12) YouTube.js Tests Search ✓ Should search on YouTube (938 ms) ✕ Should search on YouTube Music (850 ms) ✓ Should retrieve YouTube search suggestions (528 ms) ✓ Should retrieve YouTube Music search suggestions (224 ms) Comments ✓ Should retrieve comments (518 ms) ✓ Should retrieve next batch of comments (337 ms) ✓ Should retrieve comment replies (358 ms) General ✕ Should retrieve playlist with YouTube (466 ms) ✓ Should retrieve home feed (1051 ms) ✓ Should retrieve trending content (623 ms) ✓ Should retrieve video info (863 ms) ✓ Should download video (2656 ms) * refactor: type safety checks removing @ts-ignore * fix: playlist tests pass (11/12) YouTube.js Tests Search ✓ Should search on YouTube (991 ms) ✕ Should search on YouTube Music (924 ms) ✓ Should retrieve YouTube search suggestions (606 ms) ✓ Should retrieve YouTube Music search suggestions (225 ms) Comments ✓ Should retrieve comments (393 ms) ✓ Should retrieve next batch of comments (284 ms) ✓ Should retrieve comment replies (252 ms) General ✓ Should retrieve playlist with YouTube (578 ms) ✓ Should retrieve home feed (1148 ms) ✓ Should retrieve trending content (541 ms) ✓ Should retrieve video info (799 ms) ✓ Should download video (1419 ms) * fix: all tests pass for node 🎉 YouTube.js Tests Search ✓ Should search on YouTube (1053 ms) ✓ Should search on YouTube Music (761 ms) ✓ Should retrieve YouTube search suggestions (453 ms) ✓ Should retrieve YouTube Music search suggestions (221 ms) Comments ✓ Should retrieve comments (627 ms) ✓ Should retrieve next batch of comments (412 ms) ✓ Should retrieve comment replies (268 ms) General ✓ Should retrieve playlist with YouTube (565 ms) ✓ Should retrieve home feed (775 ms) ✓ Should retrieve trending content (498 ms) ✓ Should retrieve video info (875 ms) ✓ Should download video (1364 ms) * build: working Deno bundle Still need to test whether this bundle works in the browser * docs: update deno example to download video * refactor: MusicResponsiveListItem to TS * docs: TSDoc for Parser helpers * docs: Parser documentation for TS * docs: add note about parseItem and parseArray * test: remove browser tests since they're identical * feat: browser support and proxy example * fix: PlaylistManager TS after merge * feat: in-browser video streaming * refactor: cleanup the Dash example * feat: allow custom fetch implementations * feat: fetch debugger * fix: OAuth login * refactor: remove file extensions from imports * refactor: build scripts * fix: CustomEvent on node * fix: LiveChat * fix: linting * fix: liniting in build-parser-json * chore: update test workflow * fix: NToken errors after lint fixes * fix: codacy complaints * docs: update to reflect changes Definitly needs more work but its a start * refactor: cleanup imports/exports * fix: browser example - Remove user-agent before making request. - Fix cache on browsers * fix: cache on node * fix: stupid mistake * refactor: Session#signIn to wait untill success This also splits the 'auth' event up into 3 distinct events: - 'auth' -> fired on success - 'auth-pending' -> fired when pending authentication - 'auth-error' -> fired when an error occurred * refactor: freeze Constants * refactor: cleanup HTTPClient Request * refactor: debugFetch readability * chore: lint * refactor: replace jsdoc with tsdoc eslint plugin remove @param annotations without descriptions * fix: bunch of liniting warnings * refactor: better inference on YTNode#is As suggested by @MasterOfBob777 * fix: linting warnings * revert: undici import * refactor: rename `list_type` to `item_type`
134 lines
4.6 KiB
TypeScript
134 lines
4.6 KiB
TypeScript
import Session, { Context } from '../core/Session';
|
|
import Constants from './Constants';
|
|
import { generateSidAuth, getRandomUserAgent, getStringBetweenStrings, InnertubeError, isServer } from './Utils';
|
|
|
|
export type FetchFunction = typeof fetch;
|
|
|
|
export interface HTTPClientInit {
|
|
baseURL?: string;
|
|
}
|
|
|
|
export default class HTTPClient {
|
|
#session: Session;
|
|
#cookie?: string;
|
|
#fetch: FetchFunction;
|
|
constructor(session: Session, cookie?: string, fetch?: FetchFunction) {
|
|
this.#session = session;
|
|
this.#cookie = cookie;
|
|
this.#fetch = fetch || globalThis.fetch;
|
|
}
|
|
|
|
get fetch_function() {
|
|
return this.#fetch;
|
|
}
|
|
|
|
async fetch(
|
|
input: URL | Request | string,
|
|
init?: RequestInit & HTTPClientInit
|
|
) {
|
|
const innertube_url = Constants.URLS.API.PRODUCTION + this.#session.api_version;
|
|
const baseURL = init?.baseURL || innertube_url;
|
|
|
|
const request_url =
|
|
typeof input === 'string' ?
|
|
(!baseURL.endsWith('/') && !input.startsWith('/')) ?
|
|
new URL(`${baseURL}/${input}`) :
|
|
new URL(baseURL + input) :
|
|
input instanceof URL ?
|
|
input :
|
|
new URL(input.url, baseURL);
|
|
|
|
const headers =
|
|
init?.headers ||
|
|
(input instanceof Request ? input.headers : new Headers()) ||
|
|
new Headers();
|
|
|
|
const body =
|
|
init?.body || (input instanceof Request ? input.body : undefined);
|
|
|
|
const request_headers = new Headers(headers);
|
|
|
|
request_headers.set('Accept', '*/*');
|
|
request_headers.set('Accept-Language', `en-${this.#session.context.client.gl || 'US'}`);
|
|
request_headers.set('x-goog-visitor-id', this.#session.context.client.visitorData || '');
|
|
request_headers.set('x-origin', request_url.origin);
|
|
request_headers.set('x-youtube-client-version', this.#session.context.client.clientVersion || '');
|
|
|
|
if (isServer()) {
|
|
request_headers.set('User-Agent', getRandomUserAgent('desktop').userAgent);
|
|
request_headers.set('origin', request_url.origin);
|
|
}
|
|
|
|
request_url.searchParams.set('key', this.#session.key);
|
|
request_url.searchParams.set('prettyPrint', 'false');
|
|
|
|
const contentType = request_headers.get('Content-Type');
|
|
|
|
let request_body = body;
|
|
|
|
const is_innertube_req = baseURL === innertube_url;
|
|
|
|
// Copy context into payload when possible
|
|
if (contentType === 'application/json' && is_innertube_req && (typeof body === 'string')) {
|
|
const json = JSON.parse(body);
|
|
const n_body = {
|
|
...json,
|
|
// Deep copy since we're gonna be modifying it
|
|
context: JSON.parse(JSON.stringify(this.#session.context))
|
|
};
|
|
this.#adjustContext(n_body.context, n_body.client);
|
|
request_headers.set('x-youtube-client-version', n_body.context.client.clientVersion);
|
|
delete n_body.client;
|
|
request_body = JSON.stringify(n_body);
|
|
}
|
|
|
|
// Authenticate
|
|
if (this.#session.logged_in && is_innertube_req) {
|
|
const oauth = this.#session.oauth;
|
|
if (oauth.validateCredentials()) {
|
|
// Check if the access token is valid to avoid authorization errors.
|
|
await oauth.checkAccessTokenValidity();
|
|
request_headers.set('authorization', `Bearer ${oauth.credentials.access_token}`);
|
|
// Remove API key as it is not required when using oauth.
|
|
request_url.searchParams.delete('key');
|
|
}
|
|
if (this.#cookie) {
|
|
const papisid = getStringBetweenStrings(this.#cookie, 'PAPISID=', ';');
|
|
if (papisid) {
|
|
request_headers.set('authorization', await generateSidAuth(papisid));
|
|
}
|
|
request_headers.set('cookie', this.#cookie);
|
|
}
|
|
}
|
|
|
|
const request = new Request(request_url, input instanceof Request ? input : init);
|
|
|
|
const response = await this.#fetch(request, {
|
|
body: request_body,
|
|
headers: request_headers,
|
|
credentials: 'include',
|
|
redirect: input instanceof Request ? input.redirect : init?.redirect || 'follow'
|
|
});
|
|
|
|
// Check if 2xx
|
|
if (response.ok) {
|
|
return response;
|
|
} throw new InnertubeError(`Request to ${response.url} failed with status ${response.status}`, response);
|
|
}
|
|
|
|
#adjustContext(ctx: Context, client: string) {
|
|
switch (client) {
|
|
case 'YTMUSIC':
|
|
ctx.client.clientVersion = Constants.CLIENTS.YTMUSIC.VERSION;
|
|
ctx.client.clientName = Constants.CLIENTS.YTMUSIC.NAME;
|
|
break;
|
|
case 'ANDROID':
|
|
ctx.client.clientVersion = Constants.CLIENTS.ANDROID.VERSION;
|
|
ctx.client.clientFormFactor = 'SMALL_FORM_FACTOR';
|
|
ctx.client.clientName = Constants.CLIENTS.ANDROID.NAME;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
} |