Fix uncaught exceptions

Signed-off-by: Marcos Candeia <[email protected]>
deco-cx · May 29, 2024 · d4a91f0 · d4a91f0
1 parent 66185cb
commit d4a91f0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/deno.json b/deno.json
@@ -1,6 +1,6 @@
 {
   "name": "@deco/warp",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "exports": "./mod.ts",
   "tasks": {
     "start": "deno run -A main.ts"

diff --git a/handlers.server.ts b/handlers.server.ts
@@ -126,11 +126,21 @@ const onWsOpened: ClientMessageHandler<DataEndMessage> = async (state, message)
         const socketChan = await makeWebSocket<ArrayBuffer, ArrayBuffer>(socket, false);
         request.socketChan = socketChan.out;
         (async () => {
-            for await (const msg of socketChan.in.recv()) {
-                await state.ch.out.send({ type: "ws-message", id: message.id, data: msg });
+            try {
+                for await (const msg of socketChan.in.recv()) {
+                    await state.ch.out.send({ type: "ws-message", id: message.id, data: msg });
+                }
+                await state.ch.out.send({ type: "ws-closed", id: message.id })
+                socket.close();
+            } catch (error) {
+                console.log("sending through a closed channel error", error, message);
+            } finally {
+                try {
+                    socket.close();
+                } catch (_err) {
+                    // ignore
+                }
             }
-            await state.ch.out.send({ type: "ws-closed", id: message.id })
-            socket.close();
         })()
     }
     catch (err) {