From 44ecfeeea7963c61deb3946f874bcb2856c7d465 Mon Sep 17 00:00:00 2001
From: jj <log@riseup.net>
Date: Wed, 29 May 2024 10:26:17 +0200
Subject: [PATCH] youtube: don't block api startup waiting for innertube to
 activate (#532)

cobalt api has been getting blocked for several seconds
during startup, and also crashing when unable to connect
to youtube (e.g. when it's blocked); this should fix both
those things
---
 src/modules/processing/services/youtube.js | 25 +++++++++++++---------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/modules/processing/services/youtube.js b/src/modules/processing/services/youtube.js
index 64f6d18f..c97d8c24 100644
--- a/src/modules/processing/services/youtube.js
+++ b/src/modules/processing/services/youtube.js
@@ -3,7 +3,7 @@ import { env } from '../../config.js';
 import { cleanString } from '../../sub/utils.js';
 import { fetch } from 'undici'
 
-const ytBase = await Innertube.create();
+const ytBase = Innertube.create().catch(e => e);
 
 const codecMatch = {
     h264: {
@@ -23,16 +23,21 @@ const codecMatch = {
     }
 }
 
-const cloneInnertube = (customFetch) => {
+const cloneInnertube = async (customFetch) => {
+    const innertube = await ytBase;
+    if (innertube instanceof Error) {
+        throw innertube;
+    }
+
     const session = new Session(
-        ytBase.session.context,
-        ytBase.session.key,
-        ytBase.session.api_version,
-        ytBase.session.account_index,
-        ytBase.session.player,
+        innertube.session.context,
+        innertube.session.key,
+        innertube.session.api_version,
+        innertube.session.account_index,
+        innertube.session.player,
         undefined,
-        customFetch ?? ytBase.session.http.fetch,
-        ytBase.session.cache
+        customFetch ?? innertube.session.http.fetch,
+        innertube.session.cache
     );
 
     const yt = new Innertube(session);
@@ -40,7 +45,7 @@ const cloneInnertube = (customFetch) => {
 }
 
 export default async function(o) {
-    const yt = cloneInnertube(
+    const yt = await cloneInnertube(
         (input, init) => fetch(input, { ...init, dispatcher: o.dispatcher })
     );