@actuallab/rpc 12.3.81 → 12.3.85

package/dist/index.cjs

@@ -1483,6 +1483,7 @@ var RpcStream = class _RpcStream {
   _started = false;
   _iterating = false;
   _ackSentUpTo = 0;
+  _nextConsumedIndex = 0;
   constructor(sourceOrRef, optionsOrPeer) {
     if (_isStreamSource(sourceOrRef)) {
       const options = optionsOrPeer ?? {};
@@ -1574,12 +1575,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). */
@@ -1599,12 +1599,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). */
@@ -1648,9 +1647,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) {
@@ -2293,6 +2294,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");
@@ -2740,7 +2752,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) {
@@ -2761,7 +2772,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,