export-runtime 0.0.21 → 0.0.22

package/handler.js

@@ -387,14 +387,15 @@ export const createHandler = (moduleMap, generatedTypes, minifiedCore, coreId, m
       if (onClose) onClose();
     });
 
-    server.addEventListener("error", () => {
+    server.addEventListener("error", (err) => {
       isClosed = true;
       if (onClose) onClose();
+      try { server.close(); } catch {}
     });
   };
 
   return {
-    async fetch(request, env) {
+    async fetch(request, env, ctx) {
       const url = new URL(request.url);
       const isShared = url.searchParams.has("shared");
       const origin = request.headers.get("Origin");
@@ -417,6 +418,13 @@ 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) {
@@ -429,6 +437,11 @@ 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.21",
+  "version": "0.0.22",
   "description": "Cloudflare Workers ESM Export Framework Runtime",
   "keywords": [
     "cloudflare",

package/rpc.js

@@ -155,25 +155,20 @@ export function createRpcDispatcher(moduleMap) {
 
     clearAll() {
       closed = true;
-      // Cancel all active iterators
-      for (const iter of iterators.values()) {
-        try {
-          if (iter?.return) iter.return(undefined);
-        } catch {}
-      }
-      // Cancel all active streams
-      for (const entry of streams.values()) {
-        try {
-          if (entry.reader) {
-            entry.reader.cancel();
-          } else if (entry.stream) {
-            entry.stream.cancel();
-          }
-        } catch {}
-      }
+      // Synchronously clear all maps to prevent further access
+      const iters = [...iterators.values()];
+      const strms = [...streams.values()];
       instances.clear();
       iterators.clear();
       streams.clear();
+
+      // Cancel iterators and streams without awaiting (fire and forget)
+      for (const iter of iters) {
+        try { iter?.return?.(); } catch {}
+      }
+      for (const entry of strms) {
+        try { (entry.reader || entry.stream)?.cancel?.(); } catch {}
+      }
     },
   };
 }