export-runtime 0.0.20 → 0.0.21

package/handler.js

@@ -323,6 +323,7 @@ export const createHandler = (moduleMap, generatedTypes, minifiedCore, coreId, m
     // Track session state and connection state for this WebSocket connection
     const wsSession = { token: null };
     let isClosed = false;
+    const pendingOps = new Set();
 
     // Safe send that ignores errors when connection is closed
     const safeSend = (data) => {
@@ -334,37 +335,51 @@ export const createHandler = (moduleMap, generatedTypes, minifiedCore, coreId, m
       }
     };
 
-    server.addEventListener("message", async (event) => {
-      if (isClosed) return;
-      let id;
+    // Wrap async operations to track them
+    const trackOp = async (op) => {
+      const promise = op();
+      pendingOps.add(promise);
       try {
-        const msg = parse(event.data);
-        id = msg.id;
-
-        // Handle auth token updates (on reconnect or explicit setToken)
-        if (msg.type === "auth" && msg.token && !msg.method) {
-          // Direct token send on reconnect - just update session
-          wsSession.token = msg.token;
-          safeSend(stringify({ type: "auth-result", id, success: true }));
-          return;
-        }
+        return await promise;
+      } finally {
+        pendingOps.delete(promise);
+      }
+    };
 
-        const result = await dispatchMessage(dispatcher, msg, env, wsSession);
+    server.addEventListener("message", (event) => {
+      if (isClosed) return;
 
-        // Don't send if connection closed during dispatch
-        if (isClosed) return;
+      // Handle message asynchronously but don't await it
+      trackOp(async () => {
+        let id;
+        try {
+          if (isClosed) return;
+          const msg = parse(event.data);
+          id = msg.id;
+
+          // Handle auth token updates (on reconnect or explicit setToken)
+          if (msg.type === "auth" && msg.token && !msg.method) {
+            wsSession.token = msg.token;
+            safeSend(stringify({ type: "auth-result", id, success: true }));
+            return;
+          }
 
-        // Extract token from auth responses
-        if (result?.value?.token && msg.type === "auth") {
-          wsSession.token = result.value.token;
-        }
+          if (isClosed) return;
+          const result = await dispatchMessage(dispatcher, msg, env, wsSession);
 
-        if (result) safeSend(stringify({ ...result, id }));
-      } catch (err) {
-        // Don't send errors if connection is closed or error is about closed connection
-        if (isClosed || String(err).includes("Connection closed")) return;
-        if (id !== undefined) safeSend(stringify({ type: "error", id, error: String(err) }));
-      }
+          if (isClosed) return;
+
+          // Extract token from auth responses
+          if (result?.value?.token && msg.type === "auth") {
+            wsSession.token = result.value.token;
+          }
+
+          if (result) safeSend(stringify({ ...result, id }));
+        } catch (err) {
+          if (isClosed || String(err).includes("Connection closed")) return;
+          if (id !== undefined) safeSend(stringify({ type: "error", id, error: String(err) }));
+        }
+      });
     });
 
     server.addEventListener("close", () => {
@@ -374,6 +389,7 @@ export const createHandler = (moduleMap, generatedTypes, minifiedCore, coreId, m
 
     server.addEventListener("error", () => {
       isClosed = true;
+      if (onClose) onClose();
     });
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "export-runtime",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "description": "Cloudflare Workers ESM Export Framework Runtime",
   "keywords": [
     "cloudflare",