@vastblast/capnweb 0.7.4 → 0.7.6

package/dist/index.js

@@ -2246,6 +2246,11 @@ var RpcSessionImpl = class {
     this.transport.send(msgText).catch((err) => this.abort(err, false));
     return msgText.length;
   }
+  isDirectFunctionCall(expression) {
+    if (!(expression instanceof Array)) return false;
+    let [kind, _id, path, args] = expression;
+    return kind === "pipeline" && expression.length === 4 && path instanceof Array && path.length === 0 && args instanceof Array;
+  }
   sendCall(id, path, args) {
     if (this.abortReason) throw this.abortReason;
     let value = ["pipeline", id, path];
@@ -2365,7 +2370,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]) {
@@ -2374,7 +2389,11 @@ var RpcSessionImpl = class {
               let payload = new Evaluator(this).evaluate(msg[1]);
               let hook = new PayloadStubHook(payload);
               hook.ignoreUnhandledRejections();
+              let exportId = this.exports.length;
               this.exports.push({ hook, refcount: 1 });
+              if (this.isDirectFunctionCall(msg[1])) {
+                this.ensureResolvingExport(exportId);
+              }
               continue;
             }
             break;
@@ -2447,24 +2466,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;