@actuallab/rpc 15.0.17 → 15.1.6

package/dist/index.d.cts

@@ -1213,7 +1213,8 @@ declare class RpcClientPeer extends RpcPeer {
     /**
      * Ask the server which call IDs in `eligible` it no longer recognizes
      * via `$sys.Reconnect:3`. Returns the set of call IDs that need to be
-     * resent. On any failure, falls back to "resend everything".
+     * resent, or `null` if the reconciliation failed: the caller then
+     * resends everything that allows it.
      *
      * Wire format of the `completedStages` argument is chosen per wire format:
      *   - JSON (json5np): plain object `{"<stage>": "<base64-of-bytes>"}` —

package/dist/index.d.ts

@@ -1213,7 +1213,8 @@ declare class RpcClientPeer extends RpcPeer {
     /**
      * Ask the server which call IDs in `eligible` it no longer recognizes
      * via `$sys.Reconnect:3`. Returns the set of call IDs that need to be
-     * resent. On any failure, falls back to "resend everything".
+     * resent, or `null` if the reconciliation failed: the caller then
+     * resends everything that allows it.
      *
      * Wire format of the `completedStages` argument is chosen per wire format:
      *   - JSON (json5np): plain object `{"<stage>": "<base64-of-bytes>"}` —

package/dist/index.js

@@ -900,6 +900,14 @@ var RpcError = class extends Error {
       this.typeName = typeName;
   }
 };
+var CANCELLATION_TYPE_NAMES = /* @__PURE__ */ new Set([
+  "System.OperationCanceledException",
+  "System.Threading.Tasks.TaskCanceledException",
+  "ActualLab.Rpc.RpcRerouteException"
+]);
+function isCancellationTypeName(typeName) {
+  return typeName !== void 0 && CANCELLATION_TYPE_NAMES.has(typeName);
+}
 var REMOTE_EXCEPTION_TYPE_REF = "ActualLab.Serialization.RemoteException, ActualLab.Core";
 var genericErrorFilter = () => ({
   TypeRef: REMOTE_EXCEPTION_TYPE_REF,
@@ -1059,15 +1067,21 @@ var RpcSystemCallHandler = class {
         const call = peer.outboundCalls.get(relatedId);
         if (call !== void 0) {
           call.completedStage |= RpcCallStage.ResultReady;
-          if (call.removeOnOk) {
+          const errorInfo = args[0];
+          const typeName = extractTypeName(errorInfo?.TypeRef ?? errorInfo?.typeRef);
+          const isCancelled = !call.removeOnOk && isCancellationTypeName(typeName);
+          if (call.removeOnOk || isCancelled) {
             peer.outboundCalls.remove(relatedId);
           }
-          const errorInfo = args[0];
           const msg = errorInfo?.Message ?? errorInfo?.message ?? "RPC error";
-          const typeName = extractTypeName(errorInfo?.TypeRef ?? errorInfo?.typeRef);
           if (typeName === "ActualLab.Rpc.RpcRerouteException")
             warnLog4?.log("Got RpcRerouteException from remote peer:", msg);
-          call.result.reject(new RpcError(msg, typeName));
+          const error = new RpcError(msg, typeName);
+          if (isCancelled)
+            error.name = "AbortError";
+          call.result.reject(error);
+          if (isCancelled)
+            call.onDisconnect();
         }
         break;
       }
@@ -3493,8 +3507,10 @@ var RpcClientPeer = class extends RpcPeer {
       call.sentAt = Date.now();
     }
     let unknownIds = null;
+    let isReconciled = false;
     if (!isPeerChanged && eligible.length > 0) {
       unknownIds = await this._reconcileReconnect(eligible, closedSignal);
+      isReconciled = unknownIds !== null;
     }
     const YIELD_BATCH = 20;
     let resentSinceYield = 0;
@@ -3507,6 +3523,17 @@ var RpcClientPeer = class extends RpcPeer {
       if (unknownIds !== null && !unknownIds.has(call.callId)) {
         continue;
       }
+      if (!(call.remoteExecutionMode & 4)) {
+        if (!isReconciled)
+          continue;
+        if (!call.result.isCompleted)
+          call.result.reject(new Error(
+            "Outbound call failed: the peer does not know the call after reconnect and AllowResend is not set."
+          ));
+        call.onDisconnect();
+        this.outboundCalls.remove(call.callId);
+        continue;
+      }
       call.sentAt = Date.now();
       this._sendWireData(call.serializedWireData);
       resentSinceYield++;
@@ -3519,7 +3546,8 @@ var RpcClientPeer = class extends RpcPeer {
   /**
    * Ask the server which call IDs in `eligible` it no longer recognizes
    * via `$sys.Reconnect:3`. Returns the set of call IDs that need to be
-   * resent. On any failure, falls back to "resend everything".
+   * resent, or `null` if the reconciliation failed: the caller then
+   * resends everything that allows it.
    *
    * Wire format of the `completedStages` argument is chosen per wire format:
    *   - JSON (json5np): plain object `{"<stage>": "<base64-of-bytes>"}` —
@@ -3543,7 +3571,7 @@ var RpcClientPeer = class extends RpcPeer {
         arr.push(call.callId);
       }
       if (byStage.size === 0) {
-        return new Set(eligible.map((c) => c.callId));
+        return null;
       }
       const isBinary = this.serializationFormat.isBinary;
       const stagesArg = isBinary ? /* @__PURE__ */ new Map() : {};
@@ -3567,10 +3595,10 @@ var RpcClientPeer = class extends RpcPeer {
       );
       const result = await reconnectCall.result;
       const bytes = _toBytes2(result);
-      if (bytes === null) return new Set(eligible.map((c) => c.callId));
+      if (bytes === null) return null;
       return new Set(IncreasingSeqCompressor.deserialize(bytes));
     } catch {
-      return new Set(eligible.map((c) => c.callId));
+      return null;
     }
   }
   /** Detects a server-peer identity change by comparing the incoming