Merge branch 'develop' into bug/tumblr

Author: abishek77s

api/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@imput/cobalt-api",
     "description": "save what you love",
-    "version": "11.4.3",
+    "version": "11.5",
     "author": "imput",
     "exports": "./src/cobalt.js",
     "type": "module",
@@ -39,7 +39,7 @@
         "set-cookie-parser": "2.6.0",
         "undici": "^6.21.3",
         "url-pattern": "1.0.3",
-        "youtubei.js": "15.0.1",
+        "youtubei.js": "16.0.0",
         "zod": "^3.23.8"
     },
     "optionalDependencies": {

api/src/processing/cookie/manager.js

@@ -13,6 +13,7 @@ const VALID_SERVICES = new Set([
     'reddit',
     'twitter',
     'youtube',
+    'vimeo_bearer',
 ]);
 
 const invalidCookies = {};

api/src/processing/helpers/youtube-session.js

@@ -9,6 +9,10 @@ const defaultAgent = new Agent();
 let session;
 
 const validateSession = (sessionResponse) => {
+    sessionResponse.visitor_data ??= sessionResponse.contentBinding;
+    sessionResponse.potoken ??= sessionResponse.poToken;
+    sessionResponse.updated ??= new Date().getTime();
+
     if (!sessionResponse.potoken) {
         throw "no poToken in session response";
     }
@@ -33,11 +37,11 @@ const updateSession = (newSession) => {
 
 const loadSession = async () => {
     const sessionServerUrl = new URL(env.ytSessionServer);
-    sessionServerUrl.pathname = "/token";
+    sessionServerUrl.pathname = "/get_pot";
 
     const newSession = await fetch(
         sessionServerUrl,
-        { dispatcher: defaultAgent }
+        { method: 'POST', dispatcher: defaultAgent }
     ).then(a => a.json());
 
     validateSession(newSession);

api/src/processing/services/vimeo.js

@@ -1,6 +1,7 @@
 import HLS from "hls-parser";
 import { env } from "../../config.js";
 import { merge } from '../../misc/utils.js';
+import { getCookie } from "../cookie/manager.js";
 
 const resolutionMatch = {
     "3840": 2160,
@@ -25,7 +26,8 @@ const genericHeaders = {
 let bearer = '';
 
 const getBearer = async (refresh = false) => {
-    if (bearer && !refresh) return bearer;
+    const cookie = getCookie('vimeo_bearer')?.values?.()?.access_token;
+    if ((bearer || cookie) && !refresh) return bearer || cookie;
 
     const oauthResponse = await fetch(
         'https://api.vimeo.com/oauth/authorize/client',

api/src/processing/services/youtube.js

@@ -1,12 +1,29 @@
 import HLS from "hls-parser";
 
-import { fetch } from "undici";
-import { Innertube, Session } from "youtubei.js";
+import { fetch, Request } from "undici";
+import { Innertube, Platform, Session } from "youtubei.js";
 
 import { env } from "../../config.js";
 import { getCookie } from "../cookie/manager.js";
 import { getYouTubeSession } from "../helpers/youtube-session.js";
 
+// https://github.com/LuanRT/YouTube.js/pull/1052
+Platform.shim.eval = async (data, env) => {
+  const properties = [];
+
+  if (env.n) {
+    properties.push(`n: exportedVars.nFunction("${env.n}")`)
+  }
+
+  if (env.sig) {
+    properties.push(`sig: exportedVars.sigFunction("${env.sig}")`)
+  }
+
+  const code = `${data.output}\nreturn { ${properties.join(', ')} }`;
+
+  return new Function(code)();
+}
+
 const PLAYER_REFRESH_PERIOD = 1000 * 60 * 15; // ms
 
 let innertube, lastRefreshedAt;
@@ -206,10 +223,24 @@ export default async function (o) {
     let yt;
     try {
         yt = await cloneInnertube(
-            (input, init) => fetch(input, {
-                ...init,
-                dispatcher: o.dispatcher
-            }),
+            (input, init) => {
+                const url = typeof input === 'string'
+                          ? new URL(input)
+                          : input instanceof URL
+                            ? input
+                            : new URL(input.url);
+
+                const request = new Request(
+                    url,
+                    input instanceof Platform.shim.Request
+                    ? input : undefined
+                );
+
+                return fetch(request, {
+                    ...init,
+                    dispatcher: o.dispatcher
+                });
+            },
             useSession
         );
     } catch (e) {
@@ -529,7 +560,7 @@ export default async function (o) {
         }
 
         if (!clientsWithNoCipher.includes(innertubeClient) && innertube) {
-            urls = audio.decipher(innertube.session.player);
+            urls = await audio.decipher(innertube.session.player);
         }
 
         let cover = `https://i.ytimg.com/vi/${o.id}/maxresdefault.jpg`;
@@ -576,8 +607,8 @@ export default async function (o) {
             filenameAttributes.extension = o.container === "auto" ? codecList[codec].container : o.container;
 
             if (!clientsWithNoCipher.includes(innertubeClient) && innertube) {
-                video = video.decipher(innertube.session.player);
-                audio = audio.decipher(innertube.session.player);
+                video = await video.decipher(innertube.session.player);
+                audio = await audio.decipher(innertube.session.player);
             } else {
                 video = video.url;
                 audio = audio.url;

docs/examples/cookies.example.json

@@ -13,5 +13,8 @@
     ],
     "youtube": [
         "cookie=<replace_this>; b=<replace_this>"
+    ],
+    "vimeo": [
+        "access_token=<replace_this>"
     ]
 }