@actuallab/rpc 12.3.81 → 12.3.85

package/dist/index.d.cts

@@ -748,7 +748,7 @@ declare const RPC_CLOSE_CODE_UNSUPPORTED_FORMAT = 4001;
 /** Maximum time to wait for the server's handshake response after opening the socket. */
 declare const HANDSHAKE_TIMEOUT_MS = 10000;
 /** Builds the WebSocket connection URL for an RpcClientPeer. */
-type RpcConnectionUrlResolver = (peer: RpcClientPeer) => string;
+type RpcConnectionUrlResolver = (peer: RpcClientPeer) => string | Promise<string>;
 /** Default connection URL provider — sets `clientId` and `f` query parameters,
  *  replacing any existing values to keep the wire format consistent with the
  *  peer's actual `serializationFormat`. */
@@ -1062,6 +1062,7 @@ declare class RpcStream<T> implements AsyncIterable<T>, IRpcObject {
     private _started;
     private _iterating;
     private _ackSentUpTo;
+    private _nextConsumedIndex;
     /** Create a local (origin-side) stream wrapping an async iterable or source factory with optional configuration. */
     constructor(source: RpcStreamSource<T>, options?: RpcStreamOptions<T>);
     /** Create a remote (target-side) stream from a parsed stream reference and peer. */

package/dist/index.d.ts

@@ -748,7 +748,7 @@ declare const RPC_CLOSE_CODE_UNSUPPORTED_FORMAT = 4001;
 /** Maximum time to wait for the server's handshake response after opening the socket. */
 declare const HANDSHAKE_TIMEOUT_MS = 10000;
 /** Builds the WebSocket connection URL for an RpcClientPeer. */
-type RpcConnectionUrlResolver = (peer: RpcClientPeer) => string;
+type RpcConnectionUrlResolver = (peer: RpcClientPeer) => string | Promise<string>;
 /** Default connection URL provider — sets `clientId` and `f` query parameters,
  *  replacing any existing values to keep the wire format consistent with the
  *  peer's actual `serializationFormat`. */
@@ -1062,6 +1062,7 @@ declare class RpcStream<T> implements AsyncIterable<T>, IRpcObject {
     private _started;
     private _iterating;
     private _ackSentUpTo;
+    private _nextConsumedIndex;
     /** Create a local (origin-side) stream wrapping an async iterable or source factory with optional configuration. */
     constructor(source: RpcStreamSource<T>, options?: RpcStreamOptions<T>);
     /** Create a remote (target-side) stream from a parsed stream reference and peer. */

package/dist/index.js

@@ -1377,6 +1377,7 @@ var RpcStream = class _RpcStream {
   _started = false;
   _iterating = false;
   _ackSentUpTo = 0;
+  _nextConsumedIndex = 0;
   constructor(sourceOrRef, optionsOrPeer) {
     if (_isStreamSource(sourceOrRef)) {
       const options = optionsOrPeer ?? {};
@@ -1468,12 +1469,11 @@ var RpcStream = class _RpcStream {
       return;
     }
     if (index < this._nextExpectedIndex) {
-      this._maybeSendAck(index + 1);
+      this._maybeSendAck(Math.min(index + 1, this._nextConsumedIndex));
       return;
     }
     this._buffer.push(item);
     this._nextExpectedIndex = index + 1;
-    this._maybeSendAck(this._nextExpectedIndex);
     this._notifyConsumer();
   }
   /** Called by system call handler when a batch arrives ($sys.B). */
@@ -1493,12 +1493,11 @@ var RpcStream = class _RpcStream {
       return;
     }
     if (index < this._nextExpectedIndex) {
-      this._maybeSendAck(index + items.length);
+      this._maybeSendAck(Math.min(index + items.length, this._nextConsumedIndex));
       return;
     }
     for (const item of items) this._buffer.push(item);
     this._nextExpectedIndex = index + items.length;
-    this._maybeSendAck(this._nextExpectedIndex);
     this._notifyConsumer();
   }
   /** Called by system call handler when the stream ends ($sys.End). */
@@ -1542,9 +1541,11 @@ var RpcStream = class _RpcStream {
           this._started = true;
           this._sendAck(0, true);
         }
+        this._maybeSendAck(this._nextConsumedIndex);
         for (; ; ) {
           if (!this._buffer.isEmpty()) {
             const value = this._buffer.shift();
+            this._nextConsumedIndex++;
             return { value, done: false };
           }
           if (this._completed) {
@@ -2187,6 +2188,17 @@ var defaultConnectionUrlResolver = (peer) => {
     return peer.ref + sep + `clientId=${peer.clientId}&f=${formatKey}`;
   }
 };
+var sanitizeUrl = (url) => {
+  try {
+    const parsed = new URL(url);
+    if (!parsed.searchParams.has("session"))
+      return url;
+    parsed.searchParams.set("session", "<redacted>");
+    return parsed.toString();
+  } catch {
+    return url.replace(/([?&]session=)[^&]*/i, "$1<redacted>");
+  }
+};
 function parseFormatFromUrl(url) {
   try {
     const f = new URL(url).searchParams.get("f");
@@ -2634,7 +2646,6 @@ var RpcClientPeer = class extends RpcPeer {
   }
   async _runImpl() {
     if (this._disposed) return;
-    const connUrl = this.connectionUrlResolver(this);
     infoLog?.log(`'${this.ref}': Started (Client)`);
     try {
       while (!this._disposed) {
@@ -2655,7 +2666,8 @@ var RpcClientPeer = class extends RpcPeer {
         let lastCloseCode = 0;
         let lastCloseReason = "";
         try {
-          infoLog?.log(`'${this.ref}': Connecting to ${connUrl}`);
+          const connUrl = await this.connectionUrlResolver(this);
+          infoLog?.log(`'${this.ref}': Connecting to ${sanitizeUrl(connUrl)}`);
           const ws = this.webSocketFactory?.(connUrl) ?? new WebSocket(connUrl);
           const conn = new RpcWebSocketConnection(
             ws,