fix: show SyntaxError line/column in alert

j4k0xb · Sep 24, 2024 · 36079c2 · 36079c2
1 parent 0ff80b6
commit 36079c2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/apps/playground/src/context/DeobfuscateContext.tsx b/apps/playground/src/context/DeobfuscateContext.tsx
@@ -62,8 +62,7 @@ function useProviderValue(props: Props) {
         props.onResult(data);
       } else if (data.type === 'error') {
         setDeobfuscating(false);
-        setAlert(data.error.toString());
-        console.error(data.error);
+        setAlert(data.error.name + ': ' + data.error.message);
       }
     };
   }

diff --git a/apps/playground/src/webcrack.worker.ts b/apps/playground/src/webcrack.worker.ts
@@ -59,7 +59,20 @@ self.onmessage = async ({ data }: MessageEvent<WorkerRequest>) => {
 
     postMessage({ type: 'result', code: result.code, files });
   } catch (error) {
-    postMessage({ type: 'error', error: error as Error });
+    console.error(error);
+    // It has to be manually cloned because postMessage/structuredClone
+    // doesn't retain additional properties like `.loc` in babel SyntaxErrors
+    postMessage({
+      type: 'error',
+      error:
+        error instanceof Error
+          ? {
+              ...error,
+              name: error.name,
+              message: error.message,
+            }
+          : (error as Error),
+    });
   }
 };