From 4791b767b58655c8f9e66297f1051f94aca186f0 Mon Sep 17 00:00:00 2001
From: "Samuel EF. Tinnerholm" <samuel.tinnerholm@gmail.com>
Date: Sun, 24 May 2026 20:24:53 +0300
Subject: [PATCH] fix: catch JSON.parse in ws-client onmessage

Fixes #276
---
 sdks/typescript/pmxt/ws-client.ts | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/sdks/typescript/pmxt/ws-client.ts b/sdks/typescript/pmxt/ws-client.ts
index 65d8974d..565c3f44 100644
--- a/sdks/typescript/pmxt/ws-client.ts
+++ b/sdks/typescript/pmxt/ws-client.ts
@@ -129,8 +129,19 @@ export class SidecarWsClient {
                 const raw = typeof event.data === "string"
                     ? event.data
                     : event.data.toString();
-                const msg: WsMessage = JSON.parse(raw);
-                this.dispatch(msg);
+                let msg: WsMessage;
+                try {
+                    msg = JSON.parse(raw);
+                } catch {
+                    // Non-JSON control frame -- ignore.
+                    return;
+                }
+                try {
+                    this.dispatch(msg);
+                } catch (err) {
+                    // Dispatch bug -- log and continue; don't kill the connection.
+                    console.error('[SidecarWsClient] dispatch error:', err);
+                }
             };
         });
     }