@vastblast/capnweb 0.7.1 → 0.7.4

package/dist/index.js

@@ -2042,9 +2042,6 @@ var RpcSessionImpl = class {
     this.options = options;
     this.exports.push({ hook: mainHook, refcount: 1 });
     this.imports.push(new ImportTableEntry(this, 0, false));
-    this.cancelReadLoop = (error) => {
-      this.activeReadAbort?.reject(error);
-    };
     this.readLoop().catch((err) => this.abort(err));
   }
   exports = [];
@@ -2052,7 +2049,6 @@ var RpcSessionImpl = class {
   imports = [];
   abortReason;
   cancelReadLoop;
-  activeReadAbort;
   // We assign positive numbers to imports we initiate, and negative numbers to exports we
   // initiate. So the next import ID is just `imports.length`, but the next export ID needs
   // to be tracked explicitly.
@@ -2330,7 +2326,8 @@ var RpcSessionImpl = class {
   }
   abort(error, trySendAbortMessage = true) {
     if (this.abortReason !== void 0) return;
-    this.cancelReadLoop(error);
+    this.cancelReadLoop?.(error);
+    this.cancelReadLoop = void 0;
     if (trySendAbortMessage) {
       try {
         this.transport.send(JSON.stringify(["abort", Devaluator.devaluate(error, void 0, this)])).catch((err) => {
@@ -2368,17 +2365,7 @@ var RpcSessionImpl = class {
   }
   async readLoop() {
     while (!this.abortReason) {
-      let readAbort = Promise.withResolvers();
-      this.activeReadAbort = readAbort;
-      let msgText;
-      try {
-        msgText = await Promise.race([this.transport.receive(), readAbort.promise]);
-      } finally {
-        if (this.activeReadAbort === readAbort) {
-          this.activeReadAbort = void 0;
-        }
-      }
-      let msg = JSON.parse(msgText);
+      let msg = JSON.parse(await this.receiveOrAbort());
       if (this.abortReason) break;
       if (msg instanceof Array) {
         switch (msg[0]) {
@@ -2460,6 +2447,24 @@ var RpcSessionImpl = class {
       throw new Error(`bad RPC message: ${JSON.stringify(msg)}`);
     }
   }
+  // Use a fresh cancellation promise for each read. Reusing one session-long promise here causes
+  // Promise.race() to accumulate reactions until the session is shut down.
+  receiveOrAbort() {
+    let readCanceled = Promise.withResolvers();
+    this.cancelReadLoop = readCanceled.reject;
+    let receivePromise;
+    try {
+      receivePromise = this.transport.receive();
+    } catch (err) {
+      this.cancelReadLoop = void 0;
+      return Promise.reject(err);
+    }
+    return Promise.race([receivePromise, readCanceled.promise]).finally(() => {
+      if (this.cancelReadLoop === readCanceled.reject) {
+        this.cancelReadLoop = void 0;
+      }
+    });
+  }
   async drain() {
     if (this.abortReason) {
       throw this.abortReason;