@replit/river 0.15.2 → 0.15.4

package/dist/{builder-ebd945c0.d.ts → builder-4d392f6c.d.ts}

@@ -1,6 +1,6 @@
 import { TObject, TUnion, TString, TSchema, TNever, TLiteral, Static } from '@sinclair/typebox';
 import { Pushable } from 'it-pushable';
-import { b as TransportClientId, e as Session, C as Connection } from './index-bbccacef.js';
+import { b as TransportClientId, e as Session, C as Connection } from './index-2e402bb8.js';
 
 /**
  * The context for services/procedures. This is used only on

package/dist/{chunk-B7VTDQR7.js → chunk-5TYDJKOP.js}

@@ -324,14 +324,15 @@ var defaultTransportOptions = {
   sessionDisconnectGraceMs: 5e3,
   codec: NaiveJsonCodec
 };
+var defaultConnectionRetryOptions = {
+  baseIntervalMs: 250,
+  maxJitterMs: 200,
+  maxBackoffMs: 32e3,
+  attemptBudgetCapacity: 15,
+  budgetRestoreIntervalMs: 200
+};
 var defaultClientTransportOptions = {
-  connectionRetryOptions: {
-    baseIntervalMs: 250,
-    maxJitterMs: 200,
-    maxBackoffMs: 32e3,
-    attemptBudgetCapacity: 15,
-    budgetRestoreIntervalMs: 200
-  },
+  connectionRetryOptions: defaultConnectionRetryOptions,
   ...defaultTransportOptions
 };
 var Transport = class {
@@ -705,6 +706,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 };
   }
   /**
@@ -721,10 +723,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;
@@ -734,6 +735,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} backoff)`
+      );
       this.retryBudget.consumeBudget(to);
       reconnectPromise = sleep.then(() => {
         if (!canProceedWithConnection()) {
@@ -747,7 +751,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-ZRB6IKPV.js → chunk-DEYIG5LG.js}

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

package/dist/{chunk-UJHTHOTT.js → chunk-QF3XH65C.js}

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

package/dist/{connection-10a24478.d.ts → connection-94896f3b.d.ts}

@@ -1,4 +1,4 @@
-import { C as Connection } from './index-bbccacef.js';
+import { C as Connection } from './index-2e402bb8.js';
 import { Socket } from 'node:net';
 import stream, { Transform, TransformCallback, TransformOptions } from 'node:stream';
 

package/dist/{connection-f4492948.d.ts → connection-99346822.d.ts}

@@ -1,5 +1,5 @@
 import WebSocket from 'isomorphic-ws';
-import { C as Connection } from './index-bbccacef.js';
+import { C as Connection } from './index-2e402bb8.js';
 
 declare class WebSocketConnection extends Connection {
     ws: WebSocket;

package/dist/{index-bbccacef.d.ts → index-2e402bb8.d.ts}

@@ -310,12 +310,12 @@ declare class LeakyBucketRateLimit {
 type TransportStatus = 'open' | 'closed' | 'destroyed';
 type ProvidedTransportOptions = Partial<SessionOptions>;
 type TransportOptions = Required<ProvidedTransportOptions>;
-interface ProvidedClientTransportOptions extends ProvidedTransportOptions {
+type ProvidedClientTransportOptions = {
     connectionRetryOptions?: Partial<ConnectionRetryOptions>;
-}
-interface ClientTransportOptions extends Required<ProvidedClientTransportOptions> {
+} & ProvidedTransportOptions;
+type ClientTransportOptions = SessionOptions & {
     connectionRetryOptions: ConnectionRetryOptions;
-}
+};
 /**
  * Transports manage the lifecycle (creation/deletion) of sessions and connections. Its responsibilities include:
  *
@@ -494,7 +494,7 @@ declare abstract class ClientTransport<ConnType extends Connection> extends Tran
     close(): void;
 }
 declare abstract class ServerTransport<ConnType extends Connection> extends Transport<ConnType> {
-    constructor(clientId: TransportClientId, providedOptions?: Omit<Partial<ProvidedTransportOptions>, 'connectionRetryOptions'>);
+    constructor(clientId: TransportClientId, providedOptions?: ProvidedTransportOptions);
     protected handleConnection(conn: ConnType): void;
     receiveHandshakeRequestMessage(data: Uint8Array, conn: ConnType): false | {
         instanceId: string;

package/dist/router/index.d.cts

@@ -1,6 +1,6 @@
-import { A as AnyService, P as PayloadType, b as Result, R as RiverError, S as ServiceContext, d as ProcType, e as ProcInput, f as ProcOutput, g as ProcErrors, h as ProcHasInit, i as ProcInit } from '../builder-ebd945c0.js';
-export { E as Err, O as Ok, m as ProcHandler, k as ProcListing, a as Procedure, p as RiverErrorSchema, c as RiverUncaughtSchema, l as Service, j as ServiceBuilder, n as ServiceContextWithState, o as ServiceContextWithTransportInfo, U as UNCAUGHT_ERROR, V as ValidProcType, s as serializeService } from '../builder-ebd945c0.js';
-import { S as ServerTransport, C as Connection, a as ClientTransport, b as TransportClientId } from '../index-bbccacef.js';
+import { A as AnyService, P as PayloadType, b as Result, R as RiverError, S as ServiceContext, d as ProcType, e as ProcInput, f as ProcOutput, g as ProcErrors, h as ProcHasInit, i as ProcInit } from '../builder-4d392f6c.js';
+export { E as Err, O as Ok, m as ProcHandler, k as ProcListing, a as Procedure, p as RiverErrorSchema, c as RiverUncaughtSchema, l as Service, j as ServiceBuilder, n as ServiceContextWithState, o as ServiceContextWithTransportInfo, U as UNCAUGHT_ERROR, V as ValidProcType, s as serializeService } from '../builder-4d392f6c.js';
+import { S as ServerTransport, C as Connection, a as ClientTransport, b as TransportClientId } from '../index-2e402bb8.js';
 import { Pushable } from 'it-pushable';
 import { Static } from '@sinclair/typebox';
 import '../types-3e5768ec.js';

package/dist/router/index.d.ts

@@ -1,6 +1,6 @@
-import { A as AnyService, P as PayloadType, b as Result, R as RiverError, S as ServiceContext, d as ProcType, e as ProcInput, f as ProcOutput, g as ProcErrors, h as ProcHasInit, i as ProcInit } from '../builder-ebd945c0.js';
-export { E as Err, O as Ok, m as ProcHandler, k as ProcListing, a as Procedure, p as RiverErrorSchema, c as RiverUncaughtSchema, l as Service, j as ServiceBuilder, n as ServiceContextWithState, o as ServiceContextWithTransportInfo, U as UNCAUGHT_ERROR, V as ValidProcType, s as serializeService } from '../builder-ebd945c0.js';
-import { S as ServerTransport, C as Connection, a as ClientTransport, b as TransportClientId } from '../index-bbccacef.js';
+import { A as AnyService, P as PayloadType, b as Result, R as RiverError, S as ServiceContext, d as ProcType, e as ProcInput, f as ProcOutput, g as ProcErrors, h as ProcHasInit, i as ProcInit } from '../builder-4d392f6c.js';
+export { E as Err, O as Ok, m as ProcHandler, k as ProcListing, a as Procedure, p as RiverErrorSchema, c as RiverUncaughtSchema, l as Service, j as ServiceBuilder, n as ServiceContextWithState, o as ServiceContextWithTransportInfo, U as UNCAUGHT_ERROR, V as ValidProcType, s as serializeService } from '../builder-4d392f6c.js';
+import { S as ServerTransport, C as Connection, a as ClientTransport, b as TransportClientId } from '../index-2e402bb8.js';
 import { Pushable } from 'it-pushable';
 import { Static } from '@sinclair/typebox';
 import '../types-3e5768ec.js';

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

@@ -563,14 +563,15 @@ var defaultTransportOptions = {
   sessionDisconnectGraceMs: 5e3,
   codec: NaiveJsonCodec
 };
+var defaultConnectionRetryOptions = {
+  baseIntervalMs: 250,
+  maxJitterMs: 200,
+  maxBackoffMs: 32e3,
+  attemptBudgetCapacity: 15,
+  budgetRestoreIntervalMs: 200
+};
 var defaultClientTransportOptions = {
-  connectionRetryOptions: {
-    baseIntervalMs: 250,
-    maxJitterMs: 200,
-    maxBackoffMs: 32e3,
-    attemptBudgetCapacity: 15,
-    budgetRestoreIntervalMs: 200
-  },
+  connectionRetryOptions: defaultConnectionRetryOptions,
   ...defaultTransportOptions
 };
 var Transport = class {
@@ -944,6 +945,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 };
   }
   /**
@@ -960,10 +962,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;
@@ -973,6 +974,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} backoff)`
+      );
       this.retryBudget.consumeBudget(to);
       reconnectPromise = sleep.then(() => {
         if (!canProceedWithConnection()) {
@@ -986,7 +990,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.d.cts

@@ -1,5 +1,5 @@
-import { a as ClientTransport, c as ProvidedClientTransportOptions, b as TransportClientId } from '../../../index-bbccacef.js';
-import { U as UdsConnection } from '../../../connection-10a24478.js';
+import { a as ClientTransport, c as ProvidedClientTransportOptions, b as TransportClientId } from '../../../index-2e402bb8.js';
+import { U as UdsConnection } from '../../../connection-94896f3b.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:net';

package/dist/transport/impls/uds/client.d.ts

@@ -1,5 +1,5 @@
-import { a as ClientTransport, c as ProvidedClientTransportOptions, b as TransportClientId } from '../../../index-bbccacef.js';
-import { U as UdsConnection } from '../../../connection-10a24478.js';
+import { a as ClientTransport, c as ProvidedClientTransportOptions, b as TransportClientId } from '../../../index-2e402bb8.js';
+import { U as UdsConnection } from '../../../connection-94896f3b.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:net';

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

@@ -1,9 +1,9 @@
 import {
   UdsConnection
-} from "../../../chunk-UJHTHOTT.js";
+} from "../../../chunk-QF3XH65C.js";
 import {
   ClientTransport
-} from "../../../chunk-B7VTDQR7.js";
+} from "../../../chunk-5TYDJKOP.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log

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

@@ -403,14 +403,15 @@ var defaultTransportOptions = {
   sessionDisconnectGraceMs: 5e3,
   codec: NaiveJsonCodec
 };
+var defaultConnectionRetryOptions = {
+  baseIntervalMs: 250,
+  maxJitterMs: 200,
+  maxBackoffMs: 32e3,
+  attemptBudgetCapacity: 15,
+  budgetRestoreIntervalMs: 200
+};
 var defaultClientTransportOptions = {
-  connectionRetryOptions: {
-    baseIntervalMs: 250,
-    maxJitterMs: 200,
-    maxBackoffMs: 32e3,
-    attemptBudgetCapacity: 15,
-    budgetRestoreIntervalMs: 200
-  },
+  connectionRetryOptions: defaultConnectionRetryOptions,
   ...defaultTransportOptions
 };
 var Transport = class {

package/dist/transport/impls/uds/server.d.cts

@@ -1,6 +1,6 @@
 import { Server, Socket } from 'node:net';
-import { S as ServerTransport, b as TransportClientId, d as ProvidedTransportOptions } from '../../../index-bbccacef.js';
-import { U as UdsConnection } from '../../../connection-10a24478.js';
+import { S as ServerTransport, b as TransportClientId, d as ProvidedTransportOptions } from '../../../index-2e402bb8.js';
+import { U as UdsConnection } from '../../../connection-94896f3b.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:stream';

package/dist/transport/impls/uds/server.d.ts

@@ -1,6 +1,6 @@
 import { Server, Socket } from 'node:net';
-import { S as ServerTransport, b as TransportClientId, d as ProvidedTransportOptions } from '../../../index-bbccacef.js';
-import { U as UdsConnection } from '../../../connection-10a24478.js';
+import { S as ServerTransport, b as TransportClientId, d as ProvidedTransportOptions } from '../../../index-2e402bb8.js';
+import { U as UdsConnection } from '../../../connection-94896f3b.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:stream';

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

@@ -1,9 +1,9 @@
 import {
   UdsConnection
-} from "../../../chunk-UJHTHOTT.js";
+} from "../../../chunk-QF3XH65C.js";
 import {
   ServerTransport
-} from "../../../chunk-B7VTDQR7.js";
+} from "../../../chunk-5TYDJKOP.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log

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

@@ -467,14 +467,15 @@ var defaultTransportOptions = {
   sessionDisconnectGraceMs: 5e3,
   codec: NaiveJsonCodec
 };
+var defaultConnectionRetryOptions = {
+  baseIntervalMs: 250,
+  maxJitterMs: 200,
+  maxBackoffMs: 32e3,
+  attemptBudgetCapacity: 15,
+  budgetRestoreIntervalMs: 200
+};
 var defaultClientTransportOptions = {
-  connectionRetryOptions: {
-    baseIntervalMs: 250,
-    maxJitterMs: 200,
-    maxBackoffMs: 32e3,
-    attemptBudgetCapacity: 15,
-    budgetRestoreIntervalMs: 200
-  },
+  connectionRetryOptions: defaultConnectionRetryOptions,
   ...defaultTransportOptions
 };
 var Transport = class {
@@ -848,6 +849,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 };
   }
   /**
@@ -864,10 +866,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;
@@ -877,6 +878,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} backoff)`
+      );
       this.retryBudget.consumeBudget(to);
       reconnectPromise = sleep.then(() => {
         if (!canProceedWithConnection()) {
@@ -890,7 +894,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.d.cts

@@ -1,6 +1,6 @@
 import WebSocket from 'isomorphic-ws';
-import { a as ClientTransport, b as TransportClientId, c as ProvidedClientTransportOptions } from '../../../index-bbccacef.js';
-import { W as WebSocketConnection } from '../../../connection-f4492948.js';
+import { a as ClientTransport, b as TransportClientId, c as ProvidedClientTransportOptions } from '../../../index-2e402bb8.js';
+import { W as WebSocketConnection } from '../../../connection-99346822.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

package/dist/transport/impls/ws/client.d.ts

@@ -1,6 +1,6 @@
 import WebSocket from 'isomorphic-ws';
-import { a as ClientTransport, b as TransportClientId, c as ProvidedClientTransportOptions } from '../../../index-bbccacef.js';
-import { W as WebSocketConnection } from '../../../connection-f4492948.js';
+import { a as ClientTransport, b as TransportClientId, c as ProvidedClientTransportOptions } from '../../../index-2e402bb8.js';
+import { W as WebSocketConnection } from '../../../connection-99346822.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

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

@@ -1,9 +1,9 @@
 import {
   WebSocketConnection
-} from "../../../chunk-ZRB6IKPV.js";
+} from "../../../chunk-DEYIG5LG.js";
 import {
   ClientTransport
-} from "../../../chunk-B7VTDQR7.js";
+} from "../../../chunk-5TYDJKOP.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log

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

@@ -403,14 +403,15 @@ var defaultTransportOptions = {
   sessionDisconnectGraceMs: 5e3,
   codec: NaiveJsonCodec
 };
+var defaultConnectionRetryOptions = {
+  baseIntervalMs: 250,
+  maxJitterMs: 200,
+  maxBackoffMs: 32e3,
+  attemptBudgetCapacity: 15,
+  budgetRestoreIntervalMs: 200
+};
 var defaultClientTransportOptions = {
-  connectionRetryOptions: {
-    baseIntervalMs: 250,
-    maxJitterMs: 200,
-    maxBackoffMs: 32e3,
-    attemptBudgetCapacity: 15,
-    budgetRestoreIntervalMs: 200
-  },
+  connectionRetryOptions: defaultConnectionRetryOptions,
   ...defaultTransportOptions
 };
 var Transport = class {

package/dist/transport/impls/ws/server.d.cts

@@ -1,13 +1,13 @@
-import { S as ServerTransport, b as TransportClientId, d as ProvidedTransportOptions } from '../../../index-bbccacef.js';
+import { S as ServerTransport, b as TransportClientId, d as ProvidedTransportOptions } from '../../../index-2e402bb8.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-f4492948.js';
+import { W as WebSocketConnection } from '../../../connection-99346822.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 
 declare class WebSocketServerTransport extends ServerTransport<WebSocketConnection> {
     wss: WebSocketServer;
-    constructor(wss: WebSocketServer, clientId: TransportClientId, providedOptions?: Partial<ProvidedTransportOptions>);
+    constructor(wss: WebSocketServer, clientId: TransportClientId, providedOptions?: ProvidedTransportOptions);
     connectionHandler: (ws: WebSocket) => void;
     close(): void;
 }

package/dist/transport/impls/ws/server.d.ts

@@ -1,13 +1,13 @@
-import { S as ServerTransport, b as TransportClientId, d as ProvidedTransportOptions } from '../../../index-bbccacef.js';
+import { S as ServerTransport, b as TransportClientId, d as ProvidedTransportOptions } from '../../../index-2e402bb8.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-f4492948.js';
+import { W as WebSocketConnection } from '../../../connection-99346822.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 
 declare class WebSocketServerTransport extends ServerTransport<WebSocketConnection> {
     wss: WebSocketServer;
-    constructor(wss: WebSocketServer, clientId: TransportClientId, providedOptions?: Partial<ProvidedTransportOptions>);
+    constructor(wss: WebSocketServer, clientId: TransportClientId, providedOptions?: ProvidedTransportOptions);
     connectionHandler: (ws: WebSocket) => void;
     close(): void;
 }

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

@@ -1,9 +1,9 @@
 import {
   WebSocketConnection
-} from "../../../chunk-ZRB6IKPV.js";
+} from "../../../chunk-DEYIG5LG.js";
 import {
   ServerTransport
-} from "../../../chunk-B7VTDQR7.js";
+} from "../../../chunk-5TYDJKOP.js";
 import "../../../chunk-GFRAOY75.js";
 import "../../../chunk-H4BYJELI.js";
 import "../../../chunk-GZ7HCLLM.js";

package/dist/transport/index.cjs

@@ -498,14 +498,15 @@ var defaultTransportOptions = {
   sessionDisconnectGraceMs: 5e3,
   codec: NaiveJsonCodec
 };
+var defaultConnectionRetryOptions = {
+  baseIntervalMs: 250,
+  maxJitterMs: 200,
+  maxBackoffMs: 32e3,
+  attemptBudgetCapacity: 15,
+  budgetRestoreIntervalMs: 200
+};
 var defaultClientTransportOptions = {
-  connectionRetryOptions: {
-    baseIntervalMs: 250,
-    maxJitterMs: 200,
-    maxBackoffMs: 32e3,
-    attemptBudgetCapacity: 15,
-    budgetRestoreIntervalMs: 200
-  },
+  connectionRetryOptions: defaultConnectionRetryOptions,
   ...defaultTransportOptions
 };
 var Transport = class {
@@ -879,6 +880,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 };
   }
   /**
@@ -895,10 +897,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;
@@ -908,6 +909,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} backoff)`
+      );
       this.retryBudget.consumeBudget(to);
       reconnectPromise = sleep.then(() => {
         if (!canProceedWithConnection()) {
@@ -921,7 +925,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.d.cts

@@ -1,3 +1,3 @@
-export { a as ClientTransport, c as ClientTransportOptions, C as Connection, m as EventHandler, E as EventMap, l as EventTypes, O as OpaqueTransportMessage, h as OpaqueTransportMessageSchema, n as ProtocolError, o as ProtocolErrorType, d as ServerTransporOptions, S as ServerTransport, e as Session, T as Transport, b as TransportClientId, i as TransportMessage, g as TransportMessageSchema, f as TransportStatus, k as isStreamClose, j as isStreamOpen } from '../index-bbccacef.js';
+export { a as ClientTransport, c as ClientTransportOptions, C as Connection, m as EventHandler, E as EventMap, l as EventTypes, O as OpaqueTransportMessage, h as OpaqueTransportMessageSchema, n as ProtocolError, o as ProtocolErrorType, S as ServerTransport, e as Session, T as Transport, b as TransportClientId, i as TransportMessage, g as TransportMessageSchema, d as TransportOptions, f as TransportStatus, k as isStreamClose, j as isStreamOpen } from '../index-2e402bb8.js';
 import '../types-3e5768ec.js';
 import '@sinclair/typebox';

package/dist/transport/index.d.ts

@@ -1,3 +1,3 @@
-export { a as ClientTransport, c as ClientTransportOptions, C as Connection, m as EventHandler, E as EventMap, l as EventTypes, O as OpaqueTransportMessage, h as OpaqueTransportMessageSchema, n as ProtocolError, o as ProtocolErrorType, d as ServerTransporOptions, S as ServerTransport, e as Session, T as Transport, b as TransportClientId, i as TransportMessage, g as TransportMessageSchema, f as TransportStatus, k as isStreamClose, j as isStreamOpen } from '../index-bbccacef.js';
+export { a as ClientTransport, c as ClientTransportOptions, C as Connection, m as EventHandler, E as EventMap, l as EventTypes, O as OpaqueTransportMessage, h as OpaqueTransportMessageSchema, n as ProtocolError, o as ProtocolErrorType, S as ServerTransport, e as Session, T as Transport, b as TransportClientId, i as TransportMessage, g as TransportMessageSchema, d as TransportOptions, f as TransportStatus, k as isStreamClose, j as isStreamOpen } from '../index-2e402bb8.js';
 import '../types-3e5768ec.js';
 import '@sinclair/typebox';

package/dist/transport/index.js

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

package/dist/util/testHelpers.d.cts

@@ -2,8 +2,8 @@ import * as it_pushable from 'it-pushable';
 import { C as Codec } from '../types-3e5768ec.js';
 import WebSocket from 'isomorphic-ws';
 import http from 'node:http';
-import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-bbccacef.js';
-import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-ebd945c0.js';
+import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-2e402bb8.js';
+import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-4d392f6c.js';
 import { Static } from '@sinclair/typebox';
 import net from 'node:net';
 

package/dist/util/testHelpers.d.ts

@@ -2,8 +2,8 @@ import * as it_pushable from 'it-pushable';
 import { C as Codec } from '../types-3e5768ec.js';
 import WebSocket from 'isomorphic-ws';
 import http from 'node:http';
-import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-bbccacef.js';
-import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-ebd945c0.js';
+import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-2e402bb8.js';
+import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-4d392f6c.js';
 import { Static } from '@sinclair/typebox';
 import net from 'node:net';
 

package/dist/util/testHelpers.js

@@ -5,7 +5,7 @@ import {
 import "../chunk-RPIDSIQG.js";
 import {
   Session
-} from "../chunk-B7VTDQR7.js";
+} from "../chunk-5TYDJKOP.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.2",
+  "version": "0.15.4",
   "type": "module",
   "exports": {
     ".": {