Handle and log BG challenge errors (#41)

* Properly log BG creation error * Handle exceptions from generatePoToken * Fix logging more * lint fix * Pass error code to fetch * Add error cause
Brainicism · Dec 26, 2024 · 8166ea8 · 8166ea8
1 parent 9237eec
commit 8166ea8
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 23 deletions.
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
@@ -181,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,
                     };
                 }
             },
@@ -201,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 +222,8 @@ export class SessionManager {
             });
         } 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 },
             );
         }