@replit/river 0.15.3 → 0.15.5

package/dist/{chunk-MXHIHC3U.js → chunk-EVH5D43D.js}

@@ -1,6 +1,6 @@
 import {
   Connection
-} from "./chunk-5XMMDOLH.js";
+} from "./chunk-EZQFVTBL.js";
 
 // transport/transforms/messageFraming.ts
 import { Transform } from "node:stream";

package/dist/{chunk-5XMMDOLH.js → chunk-EZQFVTBL.js}

@@ -520,6 +520,8 @@ var Transport = class {
     session.updateBookkeeping(msg.ack, msg.seq);
     if (!isAck(msg.controlFlags)) {
       this.eventDispatcher.dispatchEvent("message", msg);
+    } else {
+      log?.debug(`${this.clientId} -- discarding msg ${msg.id} (ack bit set)`);
     }
   }
   /**
@@ -706,6 +708,7 @@ var ClientTransport = class extends Transport {
     log?.debug(
       `${this.clientId} -- handshake from ${parsed.from} ok (instance: ${instanceId})`
     );
+    this.retryBudget.startRestoringBudget(parsed.from);
     return { instanceId, from: parsed.from };
   }
   /**
@@ -722,10 +725,9 @@ var ClientTransport = class extends Transport {
     }
     let reconnectPromise = this.inflightConnectionPromises.get(to);
     if (!reconnectPromise) {
-      log?.info(`${this.clientId} -- attempting connection to ${to}`);
       const budgetConsumed = this.retryBudget.getBudgetConsumed(to);
       if (!this.retryBudget.hasBudget(to)) {
-        const errMsg = `not attempting to connect to ${to}, retry budget exceeded (more than ${budgetConsumed} attempts in the last ${this.retryBudget.totalBudgetRestoreTime}ms)`;
+        const errMsg = `tried to connect to ${to} but retry budget exceeded (more than ${budgetConsumed} attempts in the last ${this.retryBudget.totalBudgetRestoreTime}ms)`;
         log?.warn(`${this.clientId} -- ${errMsg}`);
         this.protocolError(ProtocolError.RetriesExceeded, errMsg);
         return;
@@ -735,6 +737,9 @@ var ClientTransport = class extends Transport {
       if (backoffMs > 0) {
         sleep = new Promise((resolve) => setTimeout(resolve, backoffMs));
       }
+      log?.info(
+        `${this.clientId} -- attempting connection to ${to} (${backoffMs}ms backoff)`
+      );
       this.retryBudget.consumeBudget(to);
       reconnectPromise = sleep.then(() => {
         if (!canProceedWithConnection()) {
@@ -748,7 +753,6 @@ var ClientTransport = class extends Transport {
           conn.close();
           throw new Error("transport state is no longer open");
         }
-        this.retryBudget.startRestoringBudget(to);
         this.sendHandshake(to, conn);
         return conn;
       });

package/dist/{chunk-NSJVTNVQ.js → chunk-PTRHVS6L.js}

@@ -1,6 +1,6 @@
 import {
   Connection
-} from "./chunk-5XMMDOLH.js";
+} from "./chunk-EZQFVTBL.js";
 
 // transport/impls/ws/connection.ts
 var WebSocketConnection = class extends Connection {

package/dist/transport/impls/uds/client.cjs

@@ -759,6 +759,8 @@ var Transport = class {
     session.updateBookkeeping(msg.ack, msg.seq);
     if (!isAck(msg.controlFlags)) {
       this.eventDispatcher.dispatchEvent("message", msg);
+    } else {
+      log?.debug(`${this.clientId} -- discarding msg ${msg.id} (ack bit set)`);
     }
   }
   /**
@@ -945,6 +947,7 @@ var ClientTransport = class extends Transport {
     log?.debug(
       `${this.clientId} -- handshake from ${parsed.from} ok (instance: ${instanceId})`
     );
+    this.retryBudget.startRestoringBudget(parsed.from);
     return { instanceId, from: parsed.from };
   }
   /**
@@ -961,10 +964,9 @@ var ClientTransport = class extends Transport {
     }
     let reconnectPromise = this.inflightConnectionPromises.get(to);
     if (!reconnectPromise) {
-      log?.info(`${this.clientId} -- attempting connection to ${to}`);
       const budgetConsumed = this.retryBudget.getBudgetConsumed(to);
       if (!this.retryBudget.hasBudget(to)) {
-        const errMsg = `not attempting to connect to ${to}, retry budget exceeded (more than ${budgetConsumed} attempts in the last ${this.retryBudget.totalBudgetRestoreTime}ms)`;
+        const errMsg = `tried to connect to ${to} but retry budget exceeded (more than ${budgetConsumed} attempts in the last ${this.retryBudget.totalBudgetRestoreTime}ms)`;
         log?.warn(`${this.clientId} -- ${errMsg}`);
         this.protocolError(ProtocolError.RetriesExceeded, errMsg);
         return;
@@ -974,6 +976,9 @@ var ClientTransport = class extends Transport {
       if (backoffMs > 0) {
         sleep = new Promise((resolve) => setTimeout(resolve, backoffMs));
       }
+      log?.info(
+        `${this.clientId} -- attempting connection to ${to} (${backoffMs}ms backoff)`
+      );
       this.retryBudget.consumeBudget(to);
       reconnectPromise = sleep.then(() => {
         if (!canProceedWithConnection()) {
@@ -987,7 +992,6 @@ var ClientTransport = class extends Transport {
           conn.close();
           throw new Error("transport state is no longer open");
         }
-        this.retryBudget.startRestoringBudget(to);
         this.sendHandshake(to, conn);
         return conn;
       });

package/dist/transport/impls/uds/client.js

@@ -1,9 +1,9 @@
 import {
   UdsConnection
-} from "../../../chunk-MXHIHC3U.js";
+} from "../../../chunk-EVH5D43D.js";
 import {
   ClientTransport
-} from "../../../chunk-5XMMDOLH.js";
+} from "../../../chunk-EZQFVTBL.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log

package/dist/transport/impls/uds/server.cjs

@@ -599,6 +599,8 @@ var Transport = class {
     session.updateBookkeeping(msg.ack, msg.seq);
     if (!isAck(msg.controlFlags)) {
       this.eventDispatcher.dispatchEvent("message", msg);
+    } else {
+      log?.debug(`${this.clientId} -- discarding msg ${msg.id} (ack bit set)`);
     }
   }
   /**

package/dist/transport/impls/uds/server.js

@@ -1,9 +1,9 @@
 import {
   UdsConnection
-} from "../../../chunk-MXHIHC3U.js";
+} from "../../../chunk-EVH5D43D.js";
 import {
   ServerTransport
-} from "../../../chunk-5XMMDOLH.js";
+} from "../../../chunk-EZQFVTBL.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log

package/dist/transport/impls/ws/client.cjs

@@ -663,6 +663,8 @@ var Transport = class {
     session.updateBookkeeping(msg.ack, msg.seq);
     if (!isAck(msg.controlFlags)) {
       this.eventDispatcher.dispatchEvent("message", msg);
+    } else {
+      log?.debug(`${this.clientId} -- discarding msg ${msg.id} (ack bit set)`);
     }
   }
   /**
@@ -849,6 +851,7 @@ var ClientTransport = class extends Transport {
     log?.debug(
       `${this.clientId} -- handshake from ${parsed.from} ok (instance: ${instanceId})`
     );
+    this.retryBudget.startRestoringBudget(parsed.from);
     return { instanceId, from: parsed.from };
   }
   /**
@@ -865,10 +868,9 @@ var ClientTransport = class extends Transport {
     }
     let reconnectPromise = this.inflightConnectionPromises.get(to);
     if (!reconnectPromise) {
-      log?.info(`${this.clientId} -- attempting connection to ${to}`);
       const budgetConsumed = this.retryBudget.getBudgetConsumed(to);
       if (!this.retryBudget.hasBudget(to)) {
-        const errMsg = `not attempting to connect to ${to}, retry budget exceeded (more than ${budgetConsumed} attempts in the last ${this.retryBudget.totalBudgetRestoreTime}ms)`;
+        const errMsg = `tried to connect to ${to} but retry budget exceeded (more than ${budgetConsumed} attempts in the last ${this.retryBudget.totalBudgetRestoreTime}ms)`;
         log?.warn(`${this.clientId} -- ${errMsg}`);
         this.protocolError(ProtocolError.RetriesExceeded, errMsg);
         return;
@@ -878,6 +880,9 @@ var ClientTransport = class extends Transport {
       if (backoffMs > 0) {
         sleep = new Promise((resolve) => setTimeout(resolve, backoffMs));
       }
+      log?.info(
+        `${this.clientId} -- attempting connection to ${to} (${backoffMs}ms backoff)`
+      );
       this.retryBudget.consumeBudget(to);
       reconnectPromise = sleep.then(() => {
         if (!canProceedWithConnection()) {
@@ -891,7 +896,6 @@ var ClientTransport = class extends Transport {
           conn.close();
           throw new Error("transport state is no longer open");
         }
-        this.retryBudget.startRestoringBudget(to);
         this.sendHandshake(to, conn);
         return conn;
       });

package/dist/transport/impls/ws/client.js

@@ -1,9 +1,9 @@
 import {
   WebSocketConnection
-} from "../../../chunk-NSJVTNVQ.js";
+} from "../../../chunk-PTRHVS6L.js";
 import {
   ClientTransport
-} from "../../../chunk-5XMMDOLH.js";
+} from "../../../chunk-EZQFVTBL.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log

package/dist/transport/impls/ws/server.cjs

@@ -599,6 +599,8 @@ var Transport = class {
     session.updateBookkeeping(msg.ack, msg.seq);
     if (!isAck(msg.controlFlags)) {
       this.eventDispatcher.dispatchEvent("message", msg);
+    } else {
+      log?.debug(`${this.clientId} -- discarding msg ${msg.id} (ack bit set)`);
     }
   }
   /**

package/dist/transport/impls/ws/server.js

@@ -1,9 +1,9 @@
 import {
   WebSocketConnection
-} from "../../../chunk-NSJVTNVQ.js";
+} from "../../../chunk-PTRHVS6L.js";
 import {
   ServerTransport
-} from "../../../chunk-5XMMDOLH.js";
+} from "../../../chunk-EZQFVTBL.js";
 import "../../../chunk-GFRAOY75.js";
 import "../../../chunk-H4BYJELI.js";
 import "../../../chunk-GZ7HCLLM.js";

package/dist/transport/index.cjs

@@ -694,6 +694,8 @@ var Transport = class {
     session.updateBookkeeping(msg.ack, msg.seq);
     if (!isAck(msg.controlFlags)) {
       this.eventDispatcher.dispatchEvent("message", msg);
+    } else {
+      log?.debug(`${this.clientId} -- discarding msg ${msg.id} (ack bit set)`);
     }
   }
   /**
@@ -880,6 +882,7 @@ var ClientTransport = class extends Transport {
     log?.debug(
       `${this.clientId} -- handshake from ${parsed.from} ok (instance: ${instanceId})`
     );
+    this.retryBudget.startRestoringBudget(parsed.from);
     return { instanceId, from: parsed.from };
   }
   /**
@@ -896,10 +899,9 @@ var ClientTransport = class extends Transport {
     }
     let reconnectPromise = this.inflightConnectionPromises.get(to);
     if (!reconnectPromise) {
-      log?.info(`${this.clientId} -- attempting connection to ${to}`);
       const budgetConsumed = this.retryBudget.getBudgetConsumed(to);
       if (!this.retryBudget.hasBudget(to)) {
-        const errMsg = `not attempting to connect to ${to}, retry budget exceeded (more than ${budgetConsumed} attempts in the last ${this.retryBudget.totalBudgetRestoreTime}ms)`;
+        const errMsg = `tried to connect to ${to} but retry budget exceeded (more than ${budgetConsumed} attempts in the last ${this.retryBudget.totalBudgetRestoreTime}ms)`;
         log?.warn(`${this.clientId} -- ${errMsg}`);
         this.protocolError(ProtocolError.RetriesExceeded, errMsg);
         return;
@@ -909,6 +911,9 @@ var ClientTransport = class extends Transport {
       if (backoffMs > 0) {
         sleep = new Promise((resolve) => setTimeout(resolve, backoffMs));
       }
+      log?.info(
+        `${this.clientId} -- attempting connection to ${to} (${backoffMs}ms backoff)`
+      );
       this.retryBudget.consumeBudget(to);
       reconnectPromise = sleep.then(() => {
         if (!canProceedWithConnection()) {
@@ -922,7 +927,6 @@ var ClientTransport = class extends Transport {
           conn.close();
           throw new Error("transport state is no longer open");
         }
-        this.retryBudget.startRestoringBudget(to);
         this.sendHandshake(to, conn);
         return conn;
       });

package/dist/transport/index.js

@@ -6,7 +6,7 @@ import {
   ServerTransport,
   Session,
   Transport
-} from "../chunk-5XMMDOLH.js";
+} from "../chunk-EZQFVTBL.js";
 import {
   OpaqueTransportMessageSchema,
   TransportMessageSchema

package/dist/util/testHelpers.js

@@ -5,7 +5,7 @@ import {
 import "../chunk-RPIDSIQG.js";
 import {
   Session
-} from "../chunk-5XMMDOLH.js";
+} from "../chunk-EZQFVTBL.js";
 import {
   coerceErrorString
 } from "../chunk-GFRAOY75.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@replit/river",
   "description": "It's like tRPC but... with JSON Schema Support, duplex streaming and support for service multiplexing. Transport agnostic!",
-  "version": "0.15.3",
+  "version": "0.15.5",
   "type": "module",
   "exports": {
     ".": {