feat: Make youtubeHls configurable per-instance

tskau · Nov 26, 2024 · 3363697 · 3363697
1 parent 7fe0f4d
commit 3363697
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/src/core/data/cobalt.ts b/src/core/data/cobalt.ts
@@ -60,23 +60,34 @@ const cobaltErrors = new Map([
     ["content.post.age", "error-media-unavailable"],
 ].map(([k, v]) => [`error.api.${k}`, v]))
 
-export async function fetchMedia({ url, lang, apiBaseUrl, downloadMode = "auto", auth }: {
+const stackHeaders = (...headers: ([string, string] | null | false | undefined)[]) => headers.filter((h): h is [string, string] => !!h)
+
+const stackObjects = <T>(...objs: (T | null | false | undefined)[]) => objs.reduce(
+    (p, c) => c ? ({ ...p, ...c }) : p,
+    {},
+)
+
+export async function fetchMedia({ url, lang, apiBaseUrl, downloadMode = "auto", auth, youtubeHls }: {
     url: string,
     lang?: string,
     downloadMode?: string,
     apiBaseUrl: string,
     auth?: string,
+    youtubeHls?: boolean,
 }): Promise<Result<SuccessfulCobaltMediaResponse, Text>> {
     const res = await fetch(`${apiBaseUrl}`, {
         method: "POST",
-        headers: [
+        headers: stackHeaders(
             ["Accept", "application/json"],
             ["Content-Type", "application/json"],
             ["User-Agent", "cobold (+https://github.com/tskau/cobold)"],
-            ...auth ? [["Authorization", auth] satisfies [string, string]] : [],
-            ...lang ? [["Accept-Language", lang] satisfies [string, string]] : [],
-        ],
-        body: JSON.stringify({ url, downloadMode, filenameStyle: "basic", youtubeHLS: true }),
+            !!auth && ["Authorization", auth],
+            !!lang && ["Accept-Language", lang],
+        ),
+        body: JSON.stringify(stackObjects(
+            { url, downloadMode, filenameStyle: "basic" },
+            youtubeHls && { youtubeHLS: true },
+        )),
     }).catch(() => null)
 
     if (!res)

diff --git a/src/core/data/request.ts b/src/core/data/request.ts
@@ -17,11 +17,13 @@ export const apiServerSchema = z.object({
     name: z.string().optional(),
     url: z.string().url(),
     auth: z.string().optional(),
+    youtubeHls: z.boolean().optional(),
 }).or(
     z.string().url().transform(data => ({
         name: undefined,
         url: data,
         auth: undefined,
+        youtubeHls: undefined,
     })),
 ).transform(data => ({
     ...data,
@@ -120,6 +122,7 @@ async function tryDownload(outputType: string, request: MediaRequest, apiPool: A
         lang,
         apiBaseUrl: currentApi.url,
         auth: currentApi.auth,
+        youtubeHls: currentApi.youtubeHls,
     })
 
     if (!res.success) {