Merge remote-tracking branch 'origin/master' into update-packages

Brainicism · Dec 26, 2024 · e2504b3 · e2504b3
2 parents 80fa62d + 76f7a08
commit e2504b3
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -45,8 +45,8 @@ docker run --name bgutil-provider -d -p 4416:4416 brainicism/bgutil-ytdlp-pot-pr
 **Native:**
 
 ```shell
-# Replace 0.6.0 with the latest version or the one that matches the plugin
-git clone --single-branch --branch 0.6.0 https://github.com/Brainicism/bgutil-ytdlp-pot-provider.git
+# Replace 0.7.0 with the latest version or the one that matches the plugin
+git clone --single-branch --branch 0.7.0 https://github.com/Brainicism/bgutil-ytdlp-pot-provider.git
 cd bgutil-ytdlp-pot-provider/server/
 yarn install --frozen-lockfile
 npx tsc
@@ -80,8 +80,8 @@ node build/main.js
 # on each yt-dlp invocation, clone/extract the source code into your home directory.
 # Replace `~` with `%USERPROFILE%` if using Windows
 cd ~
-# Replace 0.6.0 with the latest version or the one that matches the plugin
-git clone --single-branch --branch 0.6.0 https://github.com/Brainicism/bgutil-ytdlp-pot-provider.git
+# Replace 0.7.0 with the latest version or the one that matches the plugin
+git clone --single-branch --branch 0.7.0 https://github.com/Brainicism/bgutil-ytdlp-pot-provider.git
 cd bgutil-ytdlp-pot-provider/server/
 yarn install --frozen-lockfile
 npx tsc

diff --git a/plugin/yt_dlp_plugins/extractor/getpot_bgutil.py b/plugin/yt_dlp_plugins/extractor/getpot_bgutil.py
@@ -1 +1 @@
-__version__ = '0.6.1'
+__version__ = '0.7.0'
diff --git a/server/package.json b/server/package.json
@@ -11,7 +11,7 @@
             "name": "grqz"
         }
     ],
-    "version": "0.6.1",
+    "version": "0.7.0",
     "scripts": {
         "lint": "npx eslint --max-warnings=0 src/",
         "lint-fix": "npx eslint --fix --max-warnings=0 src/",

diff --git a/server/src/generate_once.ts b/server/src/generate_once.ts
@@ -59,20 +59,32 @@ const options = program.opts();
         visitIdentifier = generatedVisitorData;
     }
 
-    const sessionData = await sessionManager.generatePoToken(
-        visitIdentifier,
-        proxy,
-    );
-
     try {
-        fs.writeFileSync(
-            CACHE_PATH,
-            JSON.stringify(sessionManager.getYoutubeSessionDataCaches(true)),
-            "utf8",
+        const sessionData = await sessionManager.generatePoToken(
+            visitIdentifier,
+            proxy,
         );
+
+        try {
+            fs.writeFileSync(
+                CACHE_PATH,
+                JSON.stringify(
+                    sessionManager.getYoutubeSessionDataCaches(true),
+                ),
+                "utf8",
+            );
+        } catch (e) {
+            console.warn(
+                `Error writing cache. err.name = ${e.name}. err.message = ${e.message}. err.stack = ${e.stack}`,
+            );
+        } finally {
+            console.log(JSON.stringify(sessionData));
+        }
     } catch (e) {
-        console.warn(`Error writing cache. e = ${e}`);
-    } finally {
-        console.log(JSON.stringify(sessionData));
+        console.error(
+            `Failed while generating POT. err.name = ${e.name}. err.message = ${e.message}. err.stack = ${e.stack}`,
+        );
+        console.log(JSON.stringify({}));
+        process.exit(1);
     }
 })();
diff --git a/server/src/main.ts b/server/src/main.ts
@@ -51,14 +51,22 @@ httpServer.post("/get_pot", async (request, response) => {
         visitIdentifier = generatedVisitorData;
     }
 
-    const sessionData = await sessionManager.generatePoToken(
-        visitIdentifier,
-        proxy,
-    );
-    response.send({
-        po_token: sessionData.poToken,
-        visit_identifier: sessionData.visitIdentifier,
-    });
+    try {
+        const sessionData = await sessionManager.generatePoToken(
+            visitIdentifier,
+            proxy,
+        );
+
+        response.send({
+            po_token: sessionData.poToken,
+            visit_identifier: sessionData.visitIdentifier,
+        });
+    } catch (e) {
+        console.error(
+            `Failed while generating POT. err.name = ${e.name}. err.message = ${e.message}. err.stack = ${e.stack}`,
+        );
+        response.status(500).send({ error: JSON.stringify(e) });
+    }
 });
 
 httpServer.post("/invalidate_caches", async (request, response) => {

diff --git a/server/src/session_manager.ts b/server/src/session_manager.ts
@@ -167,7 +167,11 @@ export class SessionManager {
             fetch: async (url: any, options: any): Promise<any> => {
                 try {
                     const response = await axios.post(url, options.body, {
-                        headers: options.headers,
+                        headers: {
+                            ...options.headers,
+                            "User-Agent":
+                                "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
+                        },
                         httpsAgent: dispatcher,
                     });
 
@@ -177,13 +181,13 @@ export class SessionManager {
                             return response.data;
                         },
                     };
-                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
                 } catch (e) {
                     return {
                         ok: false,
                         json: async () => {
                             return null;
                         },
+                        status: e.response?.status || e.code,
                     };
                 }
             },
@@ -197,7 +201,8 @@ export class SessionManager {
             challenge = await BG.Challenge.create(bgConfig);
         } catch (e) {
             throw new Error(
-                `Error while attempting to retrieve BG challenge. err = ${e}`,
+                `Error while attempting to retrieve BG challenge. err = ${JSON.stringify(e)}`,
+                { cause: e },
             );
         }
         if (!challenge) throw new Error("Could not get Botguard challenge");
@@ -221,7 +226,8 @@ export class SessionManager {
             poToken = poTokenResult.poToken;
         } catch (e) {
             throw new Error(
-                `Error while trying to generate PO token. e = ${e}`,
+                `Error while trying to generate PO token. err.name = ${e.name}. err.message = ${e.message}. err.stack = ${e.stack}`,
+                { cause: e },
             );
         }