fix(repl): don't crash from extension messages

QwikDev · Nov 14, 2024 · 84cdc36 · 84cdc36
1 parent edaa75e
commit 84cdc36
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/packages/docs/src/repl/worker/repl-messenger.ts b/packages/docs/src/repl/worker/repl-messenger.ts
@@ -3,9 +3,13 @@ import { appUpdate } from './app-update';
 
 export const receiveMessageFromMain = (ev: MessageEvent) => {
   if (ev.data) {
-    const msg: ReplMessage = JSON.parse(ev.data);
-    if (msg.type === 'update') {
-      appUpdate(ev.source as any as WindowClient, msg.clientId, msg.options);
+    try {
+      const msg: ReplMessage = JSON.parse(ev.data);
+      if (msg.type === 'update') {
+        appUpdate(ev.source as any as WindowClient, msg.clientId, msg.options);
+      }
+    } catch {
+      // ignore, probably some extension sending non-JSON data
     }
   }
 };

diff --git a/packages/docs/src/repl/worker/repl-server.ts b/packages/docs/src/repl/worker/repl-server.ts
@@ -82,9 +82,13 @@ export const initReplServer = (win: Window, doc: Document, nav: Navigator) => {
       return;
     }
     if (ev.data) {
-      const msg: ReplMessage = JSON.parse(ev.data);
-      if (msg?.type === 'event') {
-        sendMessageToMain(msg);
+      try {
+        const msg: ReplMessage = JSON.parse(ev.data);
+        if (msg?.type === 'event') {
+          sendMessageToMain(msg);
+        }
+      } catch {
+        // ignore, probably some extension sending non-JSON data
       }
     }
   };