export-runtime 0.0.22 → 0.0.23

package/handler.js

@@ -323,7 +323,6 @@ 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) => {
@@ -335,22 +334,19 @@ export const createHandler = (moduleMap, generatedTypes, minifiedCore, coreId, m
       }
     };
 
-    // Wrap async operations to track them
-    const trackOp = async (op) => {
-      const promise = op();
-      pendingOps.add(promise);
-      try {
-        return await promise;
-      } finally {
-        pendingOps.delete(promise);
+    const handleClose = () => {
+      if (isClosed) return;
+      isClosed = true;
+      if (onClose) {
+        try { onClose(); } catch {}
       }
     };
 
     server.addEventListener("message", (event) => {
       if (isClosed) return;
 
-      // Handle message asynchronously but don't await it
-      trackOp(async () => {
+      // Handle message asynchronously - fire and forget
+      (async () => {
         let id;
         try {
           if (isClosed) return;
@@ -376,22 +372,16 @@ export const createHandler = (moduleMap, generatedTypes, minifiedCore, coreId, m
 
           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) }));
+          if (isClosed) return;
+          const errStr = String(err);
+          if (errStr.includes("Connection closed") || errStr.includes("WebSocket")) return;
+          if (id !== undefined) safeSend(stringify({ type: "error", id, error: errStr }));
         }
-      });
-    });
-
-    server.addEventListener("close", () => {
-      isClosed = true;
-      if (onClose) onClose();
+      })();
     });
 
-    server.addEventListener("error", (err) => {
-      isClosed = true;
-      if (onClose) onClose();
-      try { server.close(); } catch {}
-    });
+    server.addEventListener("close", handleClose);
+    server.addEventListener("error", handleClose);
   };
 
   return {
@@ -419,12 +409,6 @@ export const createHandler = (moduleMap, generatedTypes, minifiedCore, coreId, m
         const pair = new WebSocketPair();
         const [client, server] = Object.values(pair);
 
-        // Create a promise that resolves when the WebSocket closes
-        const wsLifetime = new Promise((resolve) => {
-          server.addEventListener("close", resolve, { once: true });
-          server.addEventListener("error", resolve, { once: true });
-        });
-
         server.accept();
 
         if (isShared && env?.SHARED_EXPORT) {
@@ -437,11 +421,6 @@ export const createHandler = (moduleMap, generatedTypes, minifiedCore, coreId, m
           wireWebSocket(server, dispatcher, env, () => dispatcher.clearAll());
         }
 
-        // Keep worker alive for the WebSocket lifetime
-        if (ctx?.waitUntil) {
-          ctx.waitUntil(wsLifetime);
-        }
-
         return new Response(null, { status: 101, webSocket: client });
       }
 

package/package.json

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