Add error handling to the deciphering code (FreeTubeApp#8139)

absidue · efb4f5ff-1298-471a-8973-3d47447115dc · commit 0931180dde05 · 2025-10-16T00:27:46.000+02:00
diff --git a/src/index.ejs b/src/index.ejs
@@ -13,7 +13,7 @@
 
   <body>
     <div id="app"></div>
-    <% if (process.env.SUPPORTS_LOCAL_API) { %>
+    <% if (process.env.IS_ELECTRON) { %>
     <iframe
       id="sigFrame"
       src="<%= sigFrameSrc %>"
@@ -24,8 +24,7 @@
       style="display: none; pointer-events: none"
       tabindex="-1"
     ></iframe>
-    <% } %>
-    <% if (!process.env.IS_ELECTRON) { %>
+    <% } else { %>
     <script>
     // This is the service worker with the Advanced caching
 
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
@@ -22,7 +22,7 @@ const TRACKING_PARAM_NAMES = [
 
 if (process.env.SUPPORTS_LOCAL_API) {
   Platform.shim.eval = (data, env) => {
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
       const properties = []
 
       if (env.n) {
@@ -43,23 +43,31 @@ if (process.env.SUPPORTS_LOCAL_API) {
         ? crypto.randomUUID()
         : `${Date.now()}-${Math.floor(Math.random() * 10000)}`
 
-      const iframe = document.getElementById('sigFrame')
+      if (process.env.IS_ELECTRON) {
+        const iframe = document.getElementById('sigFrame')
 
-      /** @param {MessageEvent} event */
-      const listener = (event) => {
-        if (event.source === iframe.contentWindow && typeof event.data === 'string') {
-          const data = JSON.parse(event.data)
+        /** @param {MessageEvent} event */
+        const listener = (event) => {
+          if (event.source === iframe.contentWindow && typeof event.data === 'string') {
+            const data = JSON.parse(event.data)
 
-          if (data.id === messageId) {
-            window.removeEventListener('message', listener)
+            if (data.id === messageId) {
+              window.removeEventListener('message', listener)
 
-            resolve(data.result)
+              if (data.error) {
+                reject(data.error)
+              } else {
+                resolve(data.result)
+              }
+            }
           }
         }
-      }
 
-      window.addEventListener('message', listener)
-      iframe.contentWindow.postMessage(JSON.stringify({ id: messageId, code }), '*')
+        window.addEventListener('message', listener)
+        iframe.contentWindow.postMessage(JSON.stringify({ id: messageId, code }), '*')
+      } else {
+        reject(new Error('Please setup the eval function for the n/sig deciphering'))
+      }
     })
   }
 }
diff --git a/src/renderer/sigFrameScript.js b/src/renderer/sigFrameScript.js
@@ -4,9 +4,16 @@ window.addEventListener('message', (event) => {
   // eslint-disable-next-line @stylistic/semi
   const data = JSON.parse(event.data);
 
-  window.parent.postMessage(JSON.stringify({
-    id: data.id,
-    // eslint-disable-next-line no-new-func
-    result: new Function(data.code)()
-  }), '*')
+  try {
+    window.parent.postMessage(JSON.stringify({
+      id: data.id,
+      // eslint-disable-next-line no-new-func
+      result: new Function(data.code)()
+    }), '*')
+  } catch (error) {
+    window.parent.postMessage(JSON.stringify({
+      id: data.id,
+      error
+    }), '*')
+  }
 })
