@actuallab/rpc 12.3.76 → 12.3.81

package/dist/index.cjs

@@ -41,6 +41,7 @@ __export(index_exports, {
   RpcClientPeer: () => RpcClientPeer,
   RpcClientPeerReconnectDelayer: () => RpcClientPeerReconnectDelayer,
   RpcConnectionState: () => RpcConnectionState,
+  RpcError: () => RpcError,
   RpcHub: () => RpcHub,
   RpcInboundCall: () => RpcInboundCall,
   RpcInboundCallTracker: () => RpcInboundCallTracker,
@@ -862,6 +863,17 @@ var RpcInboundCallTracker = class {
   }
 };
 
+// src/rpc-error.ts
+var RpcError = class extends Error {
+  typeName;
+  constructor(message, typeName) {
+    super(message);
+    this.name = "RpcError";
+    if (typeName !== void 0)
+      this.typeName = typeName;
+  }
+};
+
 // src/increasing-seq-compressor.ts
 var IncreasingSeqCompressor = {
   /**
@@ -1788,12 +1800,17 @@ var RpcSystemCallHandler = class {
           const errorInfo = args[0];
           const msg = errorInfo?.Message ?? errorInfo?.message ?? "RPC error";
           const errorType = errorInfo?.TypeRef ?? errorInfo?.typeRef;
-          if (errorType !== null && typeof errorType === "object") {
+          let typeName;
+          if (typeof errorType === "string") {
+            const commaIdx = errorType.indexOf(",");
+            typeName = commaIdx >= 0 ? errorType.slice(0, commaIdx) : errorType;
+          } else if (errorType !== null && typeof errorType === "object") {
             const t = errorType;
-            if (t.TypeName === "RpcRerouteException" || t.typeName === "RpcRerouteException")
-              warnLog5?.log("Got RpcRerouteException from remote peer:", msg);
+            typeName = t.TypeName ?? t.typeName;
           }
-          call.result.reject(new Error(msg));
+          if (typeName === "ActualLab.Rpc.RpcRerouteException")
+            warnLog5?.log("Got RpcRerouteException from remote peer:", msg);
+          call.result.reject(new RpcError(msg, typeName));
         }
         break;
       }
@@ -2364,6 +2381,7 @@ var RpcPeer = class {
     this._connection = conn;
     conn.messageReceived.add((raw) => this._handleMessage(raw));
     conn.closed.add((ev) => {
+      if (this._connection !== conn) return;
       this._connection = void 0;
       this._isConnected = false;
       if (ev.reason)
@@ -2982,6 +3000,7 @@ var RpcServerPeer = class extends RpcPeer {
     this._setConnectionState(1 /* Connecting */);
     this.setupConnection(conn);
     conn.closed.add(() => {
+      if (this._connection !== conn && this._connection !== void 0) return;
       this.sharedObjects.disconnectAll();
     });
   }
@@ -4096,6 +4115,7 @@ var RpcPeerStateMonitor = class {
   RpcClientPeer,
   RpcClientPeerReconnectDelayer,
   RpcConnectionState,
+  RpcError,
   RpcHub,
   RpcInboundCall,
   RpcInboundCallTracker,