@actuallab/rpc 14.4.14 → 15.0.21

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;
       }
@@ -2365,6 +2379,7 @@ function toRpcStream(value, peer) {
 }
 
 // src/rpc-remote-object-tracker.ts
+var { warnLog: warnLog7 } = getLogs("RpcRemoteObjectTracker");
 var RpcRemoteObjectTracker = class {
   _objects = /* @__PURE__ */ new Map();
   register(obj) {
@@ -2395,8 +2410,17 @@ var RpcRemoteObjectTracker = class {
   }
   reconnectAll() {
     for (const obj of this._objects.values()) {
-      if (obj.allowReconnect) obj.reconnect();
-      else obj.disconnect();
+      try {
+        if (obj.allowReconnect) obj.reconnect();
+        else obj.disconnect();
+      } catch (e) {
+        warnLog7?.log(`Failed to reconnect ${obj.id.localId}, disconnecting it`, e);
+        try {
+          obj.disconnect();
+        } catch (e2) {
+          warnLog7?.log(`Failed to disconnect ${obj.id.localId}`, e2);
+        }
+      }
     }
   }
 };
@@ -2621,7 +2645,7 @@ function yieldToEventLoop() {
   return new Promise((resolve) => setTimeout(resolve, 0));
 }
 var RPC_CLOSE_CODE_UNSUPPORTED_FORMAT = 4001;
-var { debugLog: debugLog2, infoLog, warnLog: warnLog7, errorLog: errorLog2 } = getLogs("RpcPeer");
+var { debugLog: debugLog2, infoLog, warnLog: warnLog8, errorLog: errorLog2 } = getLogs("RpcPeer");
 var defaultConnectionUrlResolver = async (peer) => {
   const formatKey = peer.serializationFormat.key;
   const proof = await peer.computeReconnectProof();
@@ -3093,9 +3117,13 @@ var RpcPeer = class {
     this._keepAliveTimer ??= setInterval(() => {
       const conn = this.wireConnection;
       if (conn !== void 0) {
-        this.hub.systemCallSender.keepAlive(conn, this.serializationFormat, [
-          ...this.remoteObjects.keys()
-        ]);
+        try {
+          this.hub.systemCallSender.keepAlive(conn, this.serializationFormat, [
+            ...this.remoteObjects.keys()
+          ]);
+        } catch (e) {
+          warnLog8?.log(`'${this.ref}': Failed to send keep-alive`, e);
+        }
       }
     }, this.keepAlivePeriodMs);
     if (this._keepAliveWatchdog !== void 0)
@@ -3103,7 +3131,7 @@ var RpcPeer = class {
     this._keepAliveWatchdog = setTimeout(() => {
       this._keepAliveWatchdog = void 0;
       if (this._connection === void 0) return;
-      warnLog7?.log(
+      warnLog8?.log(
         `'${this.ref}': no keep-alive for ${this.keepAliveTimeoutMs}ms \u2014 force-closing connection`
       );
       this._connection.close();
@@ -3304,7 +3332,7 @@ var RpcClientPeer = class extends RpcPeer {
         this._setConnectionState(1 /* Connecting */);
         const retryDelay = this.hub.reconnectDelayer.getDelay(this._tryIndex, this._stopController.signal);
         if (retryDelay.isLimitExceeded) {
-          warnLog7?.log(`'${this.ref}': Reconnect limit exceeded - shutting down`);
+          warnLog8?.log(`'${this.ref}': Reconnect limit exceeded - shutting down`);
           this._disposed = true;
           break;
         }
@@ -3353,7 +3381,7 @@ var RpcClientPeer = class extends RpcPeer {
             );
           } catch (e) {
             if (e instanceof TimeoutError) {
-              warnLog7?.log(`'${this.ref}': Connect timed out after ${connectTimeoutMs}ms`);
+              warnLog8?.log(`'${this.ref}': Connect timed out after ${connectTimeoutMs}ms`);
               conn.close();
             }
             throw e;
@@ -3368,7 +3396,7 @@ var RpcClientPeer = class extends RpcPeer {
               this.nextOwnHandshakeIndex()
             );
           } catch (e) {
-            warnLog7?.log(`'${this.ref}': Failed to send handshake`, e);
+            warnLog8?.log(`'${this.ref}': Failed to send handshake`, e);
             throw e;
           }
           const handshakeTimeoutMs = this.handshakeTimeoutMs;
@@ -3381,7 +3409,7 @@ var RpcClientPeer = class extends RpcPeer {
             );
           } catch (e) {
             if (e instanceof TimeoutError) {
-              warnLog7?.log(`'${this.ref}': Handshake timed out after ${handshakeTimeoutMs}ms`);
+              warnLog8?.log(`'${this.ref}': Handshake timed out after ${handshakeTimeoutMs}ms`);
               conn.close();
             }
             throw e;
@@ -3411,7 +3439,7 @@ var RpcClientPeer = class extends RpcPeer {
         this._setConnectionState(0 /* Disconnected */);
         if (this._disposed) break;
         if (lastCloseCode === RPC_CLOSE_CODE_UNSUPPORTED_FORMAT) {
-          warnLog7?.log(`'${this.ref}': Unsupported serialization format - shutting down`);
+          warnLog8?.log(`'${this.ref}': Unsupported serialization format - shutting down`);
           this.unsupportedFormat.trigger({ reason: lastCloseReason });
           this._disposed = true;
           break;
@@ -3479,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;
@@ -3493,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++;
@@ -3505,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>"}` —
@@ -3529,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() : {};
@@ -3553,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
@@ -3666,7 +3708,7 @@ function warnReconnectProofUnavailable(ref, reason) {
   if (isReconnectProofUnavailableWarned)
     return;
   isReconnectProofUnavailableWarned = true;
-  warnLog7?.log(
+  warnLog8?.log(
     `'${ref}': ${reason} - connecting without a reconnect proof. This fails if the server requires one (RequireReconnectProof).`
   );
 }
@@ -3747,7 +3789,7 @@ var RpcClientPeerReconnectDelayer = class extends RetryDelayer {
 };
 
 // src/rpc-service-host.ts
-var { warnLog: warnLog8 } = getLogs("RpcServiceHost");
+var { warnLog: warnLog9 } = getLogs("RpcServiceHost");
 var RpcServiceHost = class {
   _methods = /* @__PURE__ */ new Map();
   register(def, impl, receiver = impl) {
@@ -3764,7 +3806,7 @@ var RpcServiceHost = class {
   async dispatch(wireMethod, args, context) {
     const entry = this._methods.get(wireMethod);
     if (entry === void 0) {
-      warnLog8?.log(`Method not found: ${wireMethod}`);
+      warnLog9?.log(`Method not found: ${wireMethod}`);
       throw new Error(`Method not found: ${wireMethod}`);
     }
     if (context !== void 0 && entry.def.callTypeId !== 0) {
@@ -4297,7 +4339,7 @@ function computeMethodHash(methodName) {
 }
 
 // src/rpc-method-registry.ts
-var { warnLog: warnLog9 } = getLogs("RpcMethodRegistry");
+var { warnLog: warnLog10 } = getLogs("RpcMethodRegistry");
 var RpcMethodRegistry = class {
   _nameToHash = /* @__PURE__ */ new Map();
   _hashToName = /* @__PURE__ */ new Map();
@@ -4307,7 +4349,7 @@ var RpcMethodRegistry = class {
     const hash = computeMethodHash(methodName);
     const existing = this._hashToName.get(hash);
     if (existing !== void 0 && existing !== methodName) {
-      warnLog9?.log(`hash collision: "${methodName}" and "${existing}" both hash to ${hash}`);
+      warnLog10?.log(`hash collision: "${methodName}" and "${existing}" both hash to ${hash}`);
       return;
     }
     this._nameToHash.set(methodName, hash);
@@ -4340,7 +4382,7 @@ var RpcMethodRegistry = class {
 };
 
 // src/rpc-hub.ts
-var { warnLog: warnLog10 } = getLogs("RpcHub");
+var { warnLog: warnLog11 } = getLogs("RpcHub");
 var RpcHub = class {
   hubId;
   peers = /* @__PURE__ */ new Map();
@@ -4405,7 +4447,7 @@ var RpcHub = class {
     if (peer !== void 0) {
       peer.close();
       this.peers.delete(ref);
-      warnLog10?.log(`'${ref}': peer is removed from RpcHub`);
+      warnLog11?.log(`'${ref}': peer is removed from RpcHub`);
     }
   }
   /** Get or create a peer by ref. If the peer does not exist: