export-runtime 0.0.21 → 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,25 +372,20 @@ 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", () => {
-      isClosed = true;
-      if (onClose) onClose();
-    });
+    server.addEventListener("close", handleClose);
+    server.addEventListener("error", handleClose);
   };
 
   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 +408,7 @@ export const createHandler = (moduleMap, generatedTypes, minifiedCore, coreId, m
 
         const pair = new WebSocketPair();
         const [client, server] = Object.values(pair);
+
         server.accept();
 
         if (isShared && env?.SHARED_EXPORT) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "export-runtime",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "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 {}
+      }
     },
   };
 }