@vastblast/capnweb 0.7.0 → 0.7.1

package/dist/index.cjs

@@ -2044,14 +2044,17 @@ 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 = [];
   reverseExports = /* @__PURE__ */ new Map();
   imports = [];
   abortReason;
-  cancelReadLoop = () => {
-  };
+  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.
@@ -2367,17 +2370,15 @@ var RpcSessionImpl = class {
   }
   async readLoop() {
     while (!this.abortReason) {
-      let rejectFunc;
-      let abortPromise = new Promise((resolve, reject) => {
-        rejectFunc = reject;
-      });
-      this.cancelReadLoop = rejectFunc;
+      let readAbort = Promise.withResolvers();
+      this.activeReadAbort = readAbort;
       let msgText;
       try {
-        msgText = await Promise.race([this.transport.receive(), abortPromise]);
+        msgText = await Promise.race([this.transport.receive(), readAbort.promise]);
       } finally {
-        this.cancelReadLoop = () => {
-        };
+        if (this.activeReadAbort === readAbort) {
+          this.activeReadAbort = void 0;
+        }
       }
       let msg = JSON.parse(msgText);
       if (this.abortReason) break;