export-runtime 0.0.19 → 0.0.20

package/handler.js

@@ -351,6 +351,9 @@ export const createHandler = (moduleMap, generatedTypes, minifiedCore, coreId, m
 
         const result = await dispatchMessage(dispatcher, msg, env, wsSession);
 
+        // Don't send if connection closed during dispatch
+        if (isClosed) return;
+
         // Extract token from auth responses
         if (result?.value?.token && msg.type === "auth") {
           wsSession.token = result.value.token;
@@ -358,6 +361,8 @@ export const createHandler = (moduleMap, generatedTypes, minifiedCore, coreId, m
 
         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) }));
       }
     });

package/package.json

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

package/rpc.js

@@ -38,6 +38,7 @@ export function createRpcDispatcher(moduleMap) {
   const iterators = new Map();
   const streams = new Map();
   let nextId = 1;
+  let closed = false;
 
   const requireInstance = (id) => {
     const inst = instances.get(id);
@@ -115,9 +116,11 @@ export function createRpcDispatcher(moduleMap) {
     },
 
     async rpcIterateNext(iteratorId) {
+      if (closed) throw new Error("Connection closed");
       const iter = iterators.get(iteratorId);
       if (!iter) throw new Error("Iterator not found");
       const { value, done } = await iter.next();
+      if (closed) throw new Error("Connection closed");
       if (done) iterators.delete(iteratorId);
       return { type: "iterate-result", value, done: !!done };
     },
@@ -130,10 +133,12 @@ export function createRpcDispatcher(moduleMap) {
     },
 
     async rpcStreamRead(streamId) {
+      if (closed) throw new Error("Connection closed");
       const entry = streams.get(streamId);
       if (!entry) throw new Error("Stream not found");
       if (!entry.reader) entry.reader = entry.stream.getReader();
       const { value, done } = await entry.reader.read();
+      if (closed) throw new Error("Connection closed");
       if (done) streams.delete(streamId);
       const v = value instanceof Uint8Array ? Array.from(value) : value;
       return { type: "stream-result", value: v, done: !!done };
@@ -149,6 +154,23 @@ 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 {}
+      }
       instances.clear();
       iterators.clear();
       streams.clear();