@actuallab/rpc 12.1.69 → 12.1.115

package/dist/index.cjs

@@ -24,6 +24,7 @@ __export(index_exports, {
   DEFAULT_SERIALIZATION_FORMAT: () => DEFAULT_SERIALIZATION_FORMAT,
   ENVELOPE_DELIMITER: () => ENVELOPE_DELIMITER,
   FRAME_DELIMITER: () => FRAME_DELIMITER,
+  RPC_CLOSE_CODE_UNSUPPORTED_FORMAT: () => RPC_CLOSE_CODE_UNSUPPORTED_FORMAT,
   RpcCallTypeId: () => RpcCallTypeId,
   RpcClientPeer: () => RpcClientPeer,
   RpcClientPeerReconnectDelayer: () => RpcClientPeerReconnectDelayer,
@@ -383,17 +384,19 @@ var RpcObjectKind = { Local: 0, Remote: 1 };
 function parseStreamRef(value) {
   if (typeof value !== "string") return null;
   const parts = value.split(",");
-  if (parts.length !== 4) return null;
+  if (parts.length < 4 || parts.length > 5) return null;
   const hostId = parts[0];
   const localId = parseInt(parts[1], 10);
   const ackPeriod = parseInt(parts[2], 10);
   const ackAdvance = parseInt(parts[3], 10);
   if (isNaN(localId) || isNaN(ackPeriod) || isNaN(ackAdvance)) return null;
-  return { hostId, localId, ackPeriod, ackAdvance };
+  const allowReconnect = parts.length < 5 || parts[4] !== "0";
+  return { hostId, localId, ackPeriod, ackAdvance, allowReconnect };
 }
 var RpcStream = class {
   id;
   kind = RpcObjectKind.Remote;
+  allowReconnect;
   peer;
   ackPeriod;
   ackAdvance;
@@ -408,6 +411,7 @@ var RpcStream = class {
   _ackSentUpTo = 0;
   constructor(ref, peer) {
     this.id = { hostId: ref.hostId, localId: ref.localId };
+    this.allowReconnect = ref.allowReconnect;
     this.peer = peer;
     this.ackPeriod = ref.ackPeriod;
     this.ackAdvance = ref.ackAdvance;
@@ -453,7 +457,11 @@ var RpcStream = class {
   }
   // -- IRpcObject --
   reconnect() {
-    this._sendAck(this._nextExpectedIndex, true);
+    if (this.allowReconnect) {
+      this._sendAck(this._nextExpectedIndex, true);
+    } else {
+      this.disconnect();
+    }
   }
   disconnect() {
     if (this._completed) return;
@@ -706,22 +714,24 @@ var DEFAULT_ACK_ADVANCE = 128;
 var RpcStreamSender = class {
   id;
   kind = RpcObjectKind.Local;
+  allowReconnect;
   peer;
   ackPeriod;
   ackAdvance;
   _nextIndex = 0;
   _ended = false;
   _started = new import_core5.PromiseSource();
-  constructor(peer, ackPeriod = DEFAULT_ACK_PERIOD, ackAdvance = DEFAULT_ACK_ADVANCE) {
+  constructor(peer, ackPeriod = DEFAULT_ACK_PERIOD, ackAdvance = DEFAULT_ACK_ADVANCE, allowReconnect = true) {
     const localId = peer.sharedObjects.nextId();
     this.id = { hostId: peer.hub.hubId, localId };
+    this.allowReconnect = allowReconnect;
     this.peer = peer;
     this.ackPeriod = ackPeriod;
     this.ackAdvance = ackAdvance;
   }
   /** Returns the stream reference string for the $sys.Ok response. */
   toRef() {
-    return `${this.id.hostId},${this.id.localId},${this.ackPeriod},${this.ackAdvance}`;
+    return `${this.id.hostId},${this.id.localId},${this.ackPeriod},${this.ackAdvance},${this.allowReconnect ? "1" : "0"}`;
   }
   /** Called by system call handler when $sys.Ack is received from the client. */
   onAck(_nextIndex, _hostId) {
@@ -811,7 +821,10 @@ var RpcRemoteObjectTracker = class {
   }
   reconnectAll() {
     for (const obj of this._objects.values()) {
-      obj.reconnect();
+      if (obj.allowReconnect)
+        obj.reconnect();
+      else
+        obj.disconnect();
     }
   }
 };
@@ -854,6 +867,7 @@ var RpcClientPeerReconnectDelayer = class extends import_core6.RetryDelayer {
 
 // src/rpc-peer.ts
 var DEFAULT_SERIALIZATION_FORMAT = "json5np";
+var RPC_CLOSE_CODE_UNSUPPORTED_FORMAT = 4001;
 var defaultConnectionUrlResolver = (peer) => {
   const sep = peer.ref.includes("?") ? "&" : "?";
   return peer.ref + sep + `clientId=${peer.clientId}&f=${peer.serializationFormat}`;
@@ -1059,6 +1073,8 @@ var RpcClientPeer = class extends RpcPeer {
   /** Builds the WebSocket URL for this peer. Replace to customize URL construction. */
   connectionUrlResolver = defaultConnectionUrlResolver;
   peerChanged = new import_core7.EventHandlerSet();
+  /** Fired when the server rejects the connection due to an unsupported serialization format (close code 4010). */
+  unsupportedFormat = new import_core7.EventHandlerSet();
   reconnectDelayer = new RpcClientPeerReconnectDelayer();
   reconnectsAtChanged = new import_core7.EventHandlerSet();
   get reconnectsAt() {
@@ -1086,10 +1102,16 @@ var RpcClientPeer = class extends RpcPeer {
   async run(wsFactory) {
     const connUrl = this.connectionUrlResolver(this);
     while (!this._disposed) {
+      let lastCloseCode = 0;
+      let lastCloseReason = "";
       try {
         const ws = wsFactory?.(connUrl) ?? new WebSocket(connUrl);
         const conn = new RpcWebSocketConnection(ws);
         this._connectionKind = 1 /* Connecting */;
+        conn.closed.add((ev) => {
+          lastCloseCode = ev.code;
+          lastCloseReason = ev.reason;
+        });
         this._pendingHandshake = new import_core7.PromiseSource();
         this.setupConnection(conn);
         this._connection = void 0;
@@ -1122,6 +1144,11 @@ var RpcClientPeer = class extends RpcPeer {
       }
       this._connectionKind = 0 /* Disconnected */;
       if (this._disposed) break;
+      if (lastCloseCode === RPC_CLOSE_CODE_UNSUPPORTED_FORMAT) {
+        this.unsupportedFormat.trigger({ reason: lastCloseReason });
+        this._disposed = true;
+        break;
+      }
       this._tryIndex++;
       const delay = this.reconnectDelayer.getDelay(this._tryIndex);
       if (delay.isLimitExceeded) {
@@ -1593,6 +1620,7 @@ var RpcPeerStateMonitor = class {
   DEFAULT_SERIALIZATION_FORMAT,
   ENVELOPE_DELIMITER,
   FRAME_DELIMITER,
+  RPC_CLOSE_CODE_UNSUPPORTED_FORMAT,
   RpcCallTypeId,
   RpcClientPeer,
   RpcClientPeerReconnectDelayer,