From 4114d6857545637c56da942229bd37db3e480f62 Mon Sep 17 00:00:00 2001
From: Nathan Flurry <developer@nathanflurry.com>
Date: Tue, 7 Oct 2025 16:06:18 -0700
Subject: [PATCH] chore(core): handle errors inside message handlers

---
 packages/rivetkit/src/client/actor-conn.ts | 27 +++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/packages/rivetkit/src/client/actor-conn.ts b/packages/rivetkit/src/client/actor-conn.ts
index a89283dc4..76167df24 100644
--- a/packages/rivetkit/src/client/actor-conn.ts
+++ b/packages/rivetkit/src/client/actor-conn.ts
@@ -315,13 +315,34 @@ enc
 			});
 		});
 		ws.addEventListener("message", async (ev) => {
-			this.#handleOnMessage(ev.data);
+			try {
+				await this.#handleOnMessage(ev.data);
+			} catch (err) {
+				logger().error({
+					msg: "error in websocket message handler",
+					error: stringifyError(err),
+				});
+			}
 		});
 		ws.addEventListener("close", (ev) => {
-			this.#handleOnClose(ev);
+			try {
+				this.#handleOnClose(ev);
+			} catch (err) {
+				logger().error({
+					msg: "error in websocket close handler",
+					error: stringifyError(err),
+				});
+			}
 		});
 		ws.addEventListener("error", (_ev) => {
-			this.#handleOnError();
+			try {
+				this.#handleOnError();
+			} catch (err) {
+				logger().error({
+					msg: "error in websocket error handler",
+					error: stringifyError(err),
+				});
+			}
 		});
 	}