@vastblast/capnweb 0.7.5 → 0.7.6

package/dist/index-workers.cjs

@@ -2395,7 +2395,17 @@ var RpcSessionImpl = class {
   }
   async readLoop() {
     while (!this.abortReason) {
-      let msg = JSON.parse(await this.receiveOrAbort());
+      let readCanceled = Promise.withResolvers();
+      this.cancelReadLoop = readCanceled.reject;
+      let msgText;
+      try {
+        msgText = await Promise.race([this.transport.receive(), readCanceled.promise]);
+      } finally {
+        if (this.cancelReadLoop === readCanceled.reject) {
+          this.cancelReadLoop = void 0;
+        }
+      }
+      let msg = JSON.parse(msgText);
       if (this.abortReason) break;
       if (msg instanceof Array) {
         switch (msg[0]) {
@@ -2481,24 +2491,6 @@ 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;