@replit/river 0.16.1 → 0.16.2

package/README.md

@@ -22,32 +22,46 @@ See [PROTOCOL.md](./PROTOCOL.md) for more information on the protocol.
 
 Before proceeding, ensure you have TypeScript 5 installed and configured appropriately:
 
-1. **Ensure `"moduleResolution": "bundler"` in tsconfig.json**:
+1. **Ensure your `tsconfig.json` is configured correctly**:
 
-   ```json
+   You must verify that:
+
+   - `compilerOptions.moduleResolution` is set to `"bundler"`
+   - `compilerOptions.strictFunctionTypes` is set to `true`
+   - `compilerOptions.strictNullChecks` is set to `true`
+
+   or, preferably, that:
+
+   - `compilerOptions.moduleResolution` is set to `"bundler"`
+   - `compilerOptions.strict` is set to `true`
+
+   Like so:
+
+   ```jsonc
    {
      "compilerOptions": {
-       "moduleResolution": "bundler"
+       "moduleResolution": "bundler",
+       "strict": true
        // Other compiler options...
      }
    }
    ```
 
-   If it exists but is set to a different value, modify it to `"bundler"`.
+   If these options already exist in your `tsconfig.json` and don't match what is shown above, modify them. River is designed for `"strict": true`, but technically only `strictFunctionTypes` and `strictNullChecks` being set to `true` is required. Failing to set these will cause unresolvable type errors when defining services.
 
 2. Install River and Dependencies:
 
-To use River, install the required packages using npm:
+   To use River, install the required packages using npm:
 
-```bash
-  npm i @replit/river @sinclair/typebox
-```
+   ```bash
+   npm i @replit/river @sinclair/typebox
+   ```
 
 3. If you plan on using WebSocket for the underlying transport, also install
 
-```bash
-npm i ws isomorphic-ws
-```
+   ```bash
+   npm i ws isomorphic-ws
+   ```
 
 ## Writing services
 

package/dist/{chunk-7SPCAA6Q.js → chunk-CJGD7CNG.js}

@@ -19,7 +19,8 @@ import {
 var ProtocolError = {
   RetriesExceeded: "conn_retry_exceeded",
   HandshakeFailed: "handshake_failed",
-  UseAfterDestroy: "use_after_destroy"
+  UseAfterDestroy: "use_after_destroy",
+  MessageOrderingViolated: "message_ordering_violated"
 };
 var EventDispatcher = class {
   eventListeners = {};
@@ -331,8 +332,8 @@ var defaultConnectionRetryOptions = {
   budgetRestoreIntervalMs: 200
 };
 var defaultClientTransportOptions = {
-  connectionRetryOptions: defaultConnectionRetryOptions,
-  ...defaultTransportOptions
+  ...defaultTransportOptions,
+  ...defaultConnectionRetryOptions
 };
 var Transport = class {
   /**
@@ -509,11 +510,11 @@ var Transport = class {
           )}`
         );
       } else {
+        const errMsg = `received out-of-order msg (got seq: ${msg.seq}, wanted seq: ${session.nextExpectedSeq})`;
         log?.error(
-          `${this.clientId} -- received out-of-order msg (got: ${msg.seq}, wanted: ${session.nextExpectedSeq}), marking connection as dead: ${JSON.stringify(msg)}`
+          `${this.clientId} -- ${errMsg}, marking connection as dead: ${JSON.stringify(msg)}`
         );
-        session.close();
-        this.deleteSession(session);
+        this.protocolError(ProtocolError.MessageOrderingViolated, errMsg);
       }
       return;
     }
@@ -619,7 +620,13 @@ var ClientTransport = class extends Transport {
    */
   inflightConnectionPromises;
   retryBudget;
-  tryReconnecting = true;
+  /**
+   * A flag indicating whether the transport should automatically reconnect
+   * when a connection is dropped.
+   * Realistically, this should always be true for clients unless you are writing
+   * tests or a special case where you don't want to reconnect.
+   */
+  reconnectOnConnectionDrop = true;
   constructor(clientId, providedOptions) {
     super(clientId, providedOptions);
     this.options = {
@@ -627,9 +634,7 @@ var ClientTransport = class extends Transport {
       ...providedOptions
     };
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
-    this.retryBudget = new LeakyBucketRateLimit(
-      this.options.connectionRetryOptions
-    );
+    this.retryBudget = new LeakyBucketRateLimit(this.options);
   }
   handleConnection(conn, to) {
     if (this.state !== "open")
@@ -661,7 +666,7 @@ var ClientTransport = class extends Transport {
         `${this.clientId} -- connection (id: ${conn.debugId}) to ${to} disconnected`
       );
       this.inflightConnectionPromises.delete(to);
-      if (this.tryReconnecting) {
+      if (this.reconnectOnConnectionDrop) {
         void this.connect(to);
       }
     });
@@ -767,7 +772,7 @@ var ClientTransport = class extends Transport {
     } catch (error) {
       this.inflightConnectionPromises.delete(to);
       const errStr = coerceErrorString(error);
-      if (!this.tryReconnecting || !canProceedWithConnection()) {
+      if (!this.reconnectOnConnectionDrop || !canProceedWithConnection()) {
         log?.warn(`${this.clientId} -- connection to ${to} failed (${errStr})`);
       } else {
         log?.warn(

package/dist/{chunk-XLJGKNV2.js → chunk-HKVP6XEL.js}

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

package/dist/{chunk-L65XWBX2.js → chunk-HZWCU4ZI.js}

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

package/dist/{chunk-Q6WPGM3K.js → chunk-SKH3JYHN.js}

@@ -570,8 +570,13 @@ function _createRecursiveProxy(callback, path) {
   });
   return proxy;
 }
-var createClient = (transport, serverId, eagerlyConnect = true) => {
-  if (eagerlyConnect) {
+var defaultClientOptions = {
+  connectOnInvoke: true,
+  eagerlyConnect: true
+};
+var createClient = (transport, serverId, providedClientOptions = {}) => {
+  const options = { ...defaultClientOptions, ...providedClientOptions };
+  if (options.eagerlyConnect) {
     void transport.connect(serverId);
   }
   return _createRecursiveProxy(async (opts) => {
@@ -587,6 +592,9 @@ var createClient = (transport, serverId, eagerlyConnect = true) => {
         input
       )}`
     );
+    if (options.connectOnInvoke && !transport.connections.has(serverId)) {
+      void transport.connect(serverId);
+    }
     if (procType === "rpc") {
       return handleRpc(
         transport,

package/dist/{connection-94896f3b.d.ts → connection-2db95d74.d.ts}

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

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

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

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

@@ -222,6 +222,7 @@ declare const ProtocolError: {
     readonly RetriesExceeded: "conn_retry_exceeded";
     readonly HandshakeFailed: "handshake_failed";
     readonly UseAfterDestroy: "use_after_destroy";
+    readonly MessageOrderingViolated: "message_ordering_violated";
 };
 type ProtocolErrorType = (typeof ProtocolError)[keyof typeof ProtocolError];
 interface EventMap {
@@ -308,14 +309,10 @@ declare class LeakyBucketRateLimit {
  * @property {'destroyed'} destroyed - The transport is permanently destroyed and cannot be reopened.
  */
 type TransportStatus = 'open' | 'closed' | 'destroyed';
-type ProvidedTransportOptions = Partial<SessionOptions>;
-type TransportOptions = Required<ProvidedTransportOptions>;
-type ProvidedClientTransportOptions = {
-    connectionRetryOptions?: Partial<ConnectionRetryOptions>;
-} & ProvidedTransportOptions;
-type ClientTransportOptions = SessionOptions & {
-    connectionRetryOptions: ConnectionRetryOptions;
-};
+type TransportOptions = SessionOptions;
+type ProvidedTransportOptions = Partial<TransportOptions>;
+type ProvidedClientTransportOptions = Partial<ClientTransportOptions>;
+type ClientTransportOptions = SessionOptions & ConnectionRetryOptions;
 /**
  * Transports manage the lifecycle (creation/deletion) of sessions and connections. Its responsibilities include:
  *
@@ -469,8 +466,14 @@ declare abstract class ClientTransport<ConnType extends Connection> extends Tran
      */
     inflightConnectionPromises: Map<TransportClientId, Promise<ConnType>>;
     retryBudget: LeakyBucketRateLimit;
-    tryReconnecting: boolean;
-    constructor(clientId: TransportClientId, providedOptions?: ProvidedTransportOptions);
+    /**
+     * A flag indicating whether the transport should automatically reconnect
+     * when a connection is dropped.
+     * Realistically, this should always be true for clients unless you are writing
+     * tests or a special case where you don't want to reconnect.
+     */
+    reconnectOnConnectionDrop: boolean;
+    constructor(clientId: TransportClientId, providedOptions?: ProvidedClientTransportOptions);
     protected handleConnection(conn: ConnType, to: TransportClientId): void;
     receiveHandshakeResponseMessage(data: Uint8Array): false | {
         instanceId: string;

package/dist/{procedures-f0226890.d.ts → procedures-d295c1a5.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-2e402bb8.js';
+import { b as TransportClientId, e as Session, C as Connection } from './index-c9e9977f.js';
 
 type TLiteralString = TLiteral<string>;
 type RiverErrorSchema = TObject<{

package/dist/router/index.cjs

@@ -655,8 +655,13 @@ function _createRecursiveProxy(callback, path) {
   });
   return proxy;
 }
-var createClient = (transport, serverId, eagerlyConnect = true) => {
-  if (eagerlyConnect) {
+var defaultClientOptions = {
+  connectOnInvoke: true,
+  eagerlyConnect: true
+};
+var createClient = (transport, serverId, providedClientOptions = {}) => {
+  const options = { ...defaultClientOptions, ...providedClientOptions };
+  if (options.eagerlyConnect) {
     void transport.connect(serverId);
   }
   return _createRecursiveProxy(async (opts) => {
@@ -672,6 +677,9 @@ var createClient = (transport, serverId, eagerlyConnect = true) => {
         input
       )}`
     );
+    if (options.connectOnInvoke && !transport.connections.has(serverId)) {
+      void transport.connect(serverId);
+    }
     if (procType === "rpc") {
       return handleRpc(
         transport,

package/dist/router/index.d.cts

@@ -1,7 +1,7 @@
 import { TObject, TUnion, Static } from '@sinclair/typebox';
-import { e as ProcedureMap, c as RiverUncaughtSchema, U as Unbranded, B as Branded, A as AnyProcedure, P as PayloadType, b as Result, R as RiverError, S as ServiceContext } from '../procedures-f0226890.js';
-export { E as Err, O as Ok, a as Procedure, d as ProcedureResult, f as RPCProcedure, m as RiverErrorSchema, j as ServiceContextWithState, k as ServiceContextWithTransportInfo, i as StreamProcedure, h as SubscriptionProcedure, l as UNCAUGHT_ERROR, g as UploadProcedure, V as ValidProcType } from '../procedures-f0226890.js';
-import { S as ServerTransport, C as Connection, a as ClientTransport, b as TransportClientId } from '../index-2e402bb8.js';
+import { e as ProcedureMap, c as RiverUncaughtSchema, U as Unbranded, B as Branded, A as AnyProcedure, P as PayloadType, b as Result, R as RiverError, S as ServiceContext } from '../procedures-d295c1a5.js';
+export { E as Err, O as Ok, a as Procedure, d as ProcedureResult, f as RPCProcedure, m as RiverErrorSchema, j as ServiceContextWithState, k as ServiceContextWithTransportInfo, i as StreamProcedure, h as SubscriptionProcedure, l as UNCAUGHT_ERROR, g as UploadProcedure, V as ValidProcType } from '../procedures-d295c1a5.js';
+import { S as ServerTransport, C as Connection, a as ClientTransport, b as TransportClientId } from '../index-c9e9977f.js';
 import { Pushable } from 'it-pushable';
 import '../types-3e5768ec.js';
 
@@ -381,6 +381,10 @@ type ServiceClient<Router extends AnyService> = {
 type ServerClient<Srv extends Server<ServiceSchemaMap>> = {
     [SvcName in keyof Srv['services']]: ServiceClient<Srv['services'][SvcName]>;
 };
+interface ClientOptions {
+    connectOnInvoke: boolean;
+    eagerlyConnect: boolean;
+}
 /**
  * Creates a client for a given server using the provided transport.
  * Note that the client only needs the type of the server, not the actual
@@ -394,6 +398,6 @@ type ServerClient<Srv extends Server<ServiceSchemaMap>> = {
  * @param {Transport} transport - The transport to use for communication.
  * @returns The client for the server.
  */
-declare const createClient: <Srv extends Server<ServiceSchemaMap>>(transport: ClientTransport<Connection>, serverId: TransportClientId, eagerlyConnect?: boolean) => ServerClient<Srv>;
+declare const createClient: <Srv extends Server<ServiceSchemaMap>>(transport: ClientTransport<Connection>, serverId: TransportClientId, providedClientOptions?: Partial<ClientOptions>) => ServerClient<Srv>;
 
 export { PayloadType, ProcErrors, ProcHandler, ProcInit, ProcInput, ProcOutput, ProcType, ProcedureMap, Result, RiverError, RiverUncaughtSchema, Server, ServerClient, Service, ServiceConfiguration, ServiceContext, ServiceSchema, createClient, createServer };

package/dist/router/index.d.ts

@@ -1,7 +1,7 @@
 import { TObject, TUnion, Static } from '@sinclair/typebox';
-import { e as ProcedureMap, c as RiverUncaughtSchema, U as Unbranded, B as Branded, A as AnyProcedure, P as PayloadType, b as Result, R as RiverError, S as ServiceContext } from '../procedures-f0226890.js';
-export { E as Err, O as Ok, a as Procedure, d as ProcedureResult, f as RPCProcedure, m as RiverErrorSchema, j as ServiceContextWithState, k as ServiceContextWithTransportInfo, i as StreamProcedure, h as SubscriptionProcedure, l as UNCAUGHT_ERROR, g as UploadProcedure, V as ValidProcType } from '../procedures-f0226890.js';
-import { S as ServerTransport, C as Connection, a as ClientTransport, b as TransportClientId } from '../index-2e402bb8.js';
+import { e as ProcedureMap, c as RiverUncaughtSchema, U as Unbranded, B as Branded, A as AnyProcedure, P as PayloadType, b as Result, R as RiverError, S as ServiceContext } from '../procedures-d295c1a5.js';
+export { E as Err, O as Ok, a as Procedure, d as ProcedureResult, f as RPCProcedure, m as RiverErrorSchema, j as ServiceContextWithState, k as ServiceContextWithTransportInfo, i as StreamProcedure, h as SubscriptionProcedure, l as UNCAUGHT_ERROR, g as UploadProcedure, V as ValidProcType } from '../procedures-d295c1a5.js';
+import { S as ServerTransport, C as Connection, a as ClientTransport, b as TransportClientId } from '../index-c9e9977f.js';
 import { Pushable } from 'it-pushable';
 import '../types-3e5768ec.js';
 
@@ -381,6 +381,10 @@ type ServiceClient<Router extends AnyService> = {
 type ServerClient<Srv extends Server<ServiceSchemaMap>> = {
     [SvcName in keyof Srv['services']]: ServiceClient<Srv['services'][SvcName]>;
 };
+interface ClientOptions {
+    connectOnInvoke: boolean;
+    eagerlyConnect: boolean;
+}
 /**
  * Creates a client for a given server using the provided transport.
  * Note that the client only needs the type of the server, not the actual
@@ -394,6 +398,6 @@ type ServerClient<Srv extends Server<ServiceSchemaMap>> = {
  * @param {Transport} transport - The transport to use for communication.
  * @returns The client for the server.
  */
-declare const createClient: <Srv extends Server<ServiceSchemaMap>>(transport: ClientTransport<Connection>, serverId: TransportClientId, eagerlyConnect?: boolean) => ServerClient<Srv>;
+declare const createClient: <Srv extends Server<ServiceSchemaMap>>(transport: ClientTransport<Connection>, serverId: TransportClientId, providedClientOptions?: Partial<ClientOptions>) => ServerClient<Srv>;
 
 export { PayloadType, ProcErrors, ProcHandler, ProcInit, ProcInput, ProcOutput, ProcType, ProcedureMap, Result, RiverError, RiverUncaughtSchema, Server, ServerClient, Service, ServiceConfiguration, ServiceContext, ServiceSchema, createClient, createServer };

package/dist/router/index.js

@@ -7,7 +7,7 @@ import {
   UNCAUGHT_ERROR,
   createClient,
   createServer
-} from "../chunk-Q6WPGM3K.js";
+} from "../chunk-SKH3JYHN.js";
 import "../chunk-GFRAOY75.js";
 import "../chunk-H4BYJELI.js";
 export {

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

@@ -392,7 +392,8 @@ var import_value = require("@sinclair/typebox/value");
 var ProtocolError = {
   RetriesExceeded: "conn_retry_exceeded",
   HandshakeFailed: "handshake_failed",
-  UseAfterDestroy: "use_after_destroy"
+  UseAfterDestroy: "use_after_destroy",
+  MessageOrderingViolated: "message_ordering_violated"
 };
 var EventDispatcher = class {
   eventListeners = {};
@@ -570,8 +571,8 @@ var defaultConnectionRetryOptions = {
   budgetRestoreIntervalMs: 200
 };
 var defaultClientTransportOptions = {
-  connectionRetryOptions: defaultConnectionRetryOptions,
-  ...defaultTransportOptions
+  ...defaultTransportOptions,
+  ...defaultConnectionRetryOptions
 };
 var Transport = class {
   /**
@@ -748,11 +749,11 @@ var Transport = class {
           )}`
         );
       } else {
+        const errMsg = `received out-of-order msg (got seq: ${msg.seq}, wanted seq: ${session.nextExpectedSeq})`;
         log?.error(
-          `${this.clientId} -- received out-of-order msg (got: ${msg.seq}, wanted: ${session.nextExpectedSeq}), marking connection as dead: ${JSON.stringify(msg)}`
+          `${this.clientId} -- ${errMsg}, marking connection as dead: ${JSON.stringify(msg)}`
         );
-        session.close();
-        this.deleteSession(session);
+        this.protocolError(ProtocolError.MessageOrderingViolated, errMsg);
       }
       return;
     }
@@ -858,7 +859,13 @@ var ClientTransport = class extends Transport {
    */
   inflightConnectionPromises;
   retryBudget;
-  tryReconnecting = true;
+  /**
+   * A flag indicating whether the transport should automatically reconnect
+   * when a connection is dropped.
+   * Realistically, this should always be true for clients unless you are writing
+   * tests or a special case where you don't want to reconnect.
+   */
+  reconnectOnConnectionDrop = true;
   constructor(clientId, providedOptions) {
     super(clientId, providedOptions);
     this.options = {
@@ -866,9 +873,7 @@ var ClientTransport = class extends Transport {
       ...providedOptions
     };
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
-    this.retryBudget = new LeakyBucketRateLimit(
-      this.options.connectionRetryOptions
-    );
+    this.retryBudget = new LeakyBucketRateLimit(this.options);
   }
   handleConnection(conn, to) {
     if (this.state !== "open")
@@ -900,7 +905,7 @@ var ClientTransport = class extends Transport {
         `${this.clientId} -- connection (id: ${conn.debugId}) to ${to} disconnected`
       );
       this.inflightConnectionPromises.delete(to);
-      if (this.tryReconnecting) {
+      if (this.reconnectOnConnectionDrop) {
         void this.connect(to);
       }
     });
@@ -1006,7 +1011,7 @@ var ClientTransport = class extends Transport {
     } catch (error) {
       this.inflightConnectionPromises.delete(to);
       const errStr = coerceErrorString(error);
-      if (!this.tryReconnecting || !canProceedWithConnection()) {
+      if (!this.reconnectOnConnectionDrop || !canProceedWithConnection()) {
         log?.warn(`${this.clientId} -- connection to ${to} failed (${errStr})`);
       } else {
         log?.warn(

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

@@ -1,5 +1,5 @@
-import { a as ClientTransport, c as ProvidedClientTransportOptions, b as TransportClientId } from '../../../index-2e402bb8.js';
-import { U as UdsConnection } from '../../../connection-94896f3b.js';
+import { a as ClientTransport, c as ProvidedClientTransportOptions, b as TransportClientId } from '../../../index-c9e9977f.js';
+import { U as UdsConnection } from '../../../connection-2db95d74.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-2e402bb8.js';
-import { U as UdsConnection } from '../../../connection-94896f3b.js';
+import { a as ClientTransport, c as ProvidedClientTransportOptions, b as TransportClientId } from '../../../index-c9e9977f.js';
+import { U as UdsConnection } from '../../../connection-2db95d74.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-L65XWBX2.js";
+} from "../../../chunk-HZWCU4ZI.js";
 import {
   ClientTransport
-} from "../../../chunk-7SPCAA6Q.js";
+} from "../../../chunk-CJGD7CNG.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log

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

@@ -111,7 +111,8 @@ function isAck(controlFlag) {
 var ProtocolError = {
   RetriesExceeded: "conn_retry_exceeded",
   HandshakeFailed: "handshake_failed",
-  UseAfterDestroy: "use_after_destroy"
+  UseAfterDestroy: "use_after_destroy",
+  MessageOrderingViolated: "message_ordering_violated"
 };
 var EventDispatcher = class {
   eventListeners = {};
@@ -411,8 +412,8 @@ var defaultConnectionRetryOptions = {
   budgetRestoreIntervalMs: 200
 };
 var defaultClientTransportOptions = {
-  connectionRetryOptions: defaultConnectionRetryOptions,
-  ...defaultTransportOptions
+  ...defaultTransportOptions,
+  ...defaultConnectionRetryOptions
 };
 var Transport = class {
   /**
@@ -589,11 +590,11 @@ var Transport = class {
           )}`
         );
       } else {
+        const errMsg = `received out-of-order msg (got seq: ${msg.seq}, wanted seq: ${session.nextExpectedSeq})`;
         log?.error(
-          `${this.clientId} -- received out-of-order msg (got: ${msg.seq}, wanted: ${session.nextExpectedSeq}), marking connection as dead: ${JSON.stringify(msg)}`
+          `${this.clientId} -- ${errMsg}, marking connection as dead: ${JSON.stringify(msg)}`
         );
-        session.close();
-        this.deleteSession(session);
+        this.protocolError(ProtocolError.MessageOrderingViolated, errMsg);
       }
       return;
     }

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-2e402bb8.js';
-import { U as UdsConnection } from '../../../connection-94896f3b.js';
+import { S as ServerTransport, b as TransportClientId, d as ProvidedTransportOptions } from '../../../index-c9e9977f.js';
+import { U as UdsConnection } from '../../../connection-2db95d74.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-2e402bb8.js';
-import { U as UdsConnection } from '../../../connection-94896f3b.js';
+import { S as ServerTransport, b as TransportClientId, d as ProvidedTransportOptions } from '../../../index-c9e9977f.js';
+import { U as UdsConnection } from '../../../connection-2db95d74.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-L65XWBX2.js";
+} from "../../../chunk-HZWCU4ZI.js";
 import {
   ServerTransport
-} from "../../../chunk-7SPCAA6Q.js";
+} from "../../../chunk-CJGD7CNG.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log

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

@@ -103,7 +103,8 @@ var log;
 var ProtocolError = {
   RetriesExceeded: "conn_retry_exceeded",
   HandshakeFailed: "handshake_failed",
-  UseAfterDestroy: "use_after_destroy"
+  UseAfterDestroy: "use_after_destroy",
+  MessageOrderingViolated: "message_ordering_violated"
 };
 var EventDispatcher = class {
   eventListeners = {};
@@ -474,8 +475,8 @@ var defaultConnectionRetryOptions = {
   budgetRestoreIntervalMs: 200
 };
 var defaultClientTransportOptions = {
-  connectionRetryOptions: defaultConnectionRetryOptions,
-  ...defaultTransportOptions
+  ...defaultTransportOptions,
+  ...defaultConnectionRetryOptions
 };
 var Transport = class {
   /**
@@ -652,11 +653,11 @@ var Transport = class {
           )}`
         );
       } else {
+        const errMsg = `received out-of-order msg (got seq: ${msg.seq}, wanted seq: ${session.nextExpectedSeq})`;
         log?.error(
-          `${this.clientId} -- received out-of-order msg (got: ${msg.seq}, wanted: ${session.nextExpectedSeq}), marking connection as dead: ${JSON.stringify(msg)}`
+          `${this.clientId} -- ${errMsg}, marking connection as dead: ${JSON.stringify(msg)}`
         );
-        session.close();
-        this.deleteSession(session);
+        this.protocolError(ProtocolError.MessageOrderingViolated, errMsg);
       }
       return;
     }
@@ -762,7 +763,13 @@ var ClientTransport = class extends Transport {
    */
   inflightConnectionPromises;
   retryBudget;
-  tryReconnecting = true;
+  /**
+   * A flag indicating whether the transport should automatically reconnect
+   * when a connection is dropped.
+   * Realistically, this should always be true for clients unless you are writing
+   * tests or a special case where you don't want to reconnect.
+   */
+  reconnectOnConnectionDrop = true;
   constructor(clientId, providedOptions) {
     super(clientId, providedOptions);
     this.options = {
@@ -770,9 +777,7 @@ var ClientTransport = class extends Transport {
       ...providedOptions
     };
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
-    this.retryBudget = new LeakyBucketRateLimit(
-      this.options.connectionRetryOptions
-    );
+    this.retryBudget = new LeakyBucketRateLimit(this.options);
   }
   handleConnection(conn, to) {
     if (this.state !== "open")
@@ -804,7 +809,7 @@ var ClientTransport = class extends Transport {
         `${this.clientId} -- connection (id: ${conn.debugId}) to ${to} disconnected`
       );
       this.inflightConnectionPromises.delete(to);
-      if (this.tryReconnecting) {
+      if (this.reconnectOnConnectionDrop) {
         void this.connect(to);
       }
     });
@@ -910,7 +915,7 @@ var ClientTransport = class extends Transport {
     } catch (error) {
       this.inflightConnectionPromises.delete(to);
       const errStr = coerceErrorString(error);
-      if (!this.tryReconnecting || !canProceedWithConnection()) {
+      if (!this.reconnectOnConnectionDrop || !canProceedWithConnection()) {
         log?.warn(`${this.clientId} -- connection to ${to} failed (${errStr})`);
       } else {
         log?.warn(

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-2e402bb8.js';
-import { W as WebSocketConnection } from '../../../connection-99346822.js';
+import { a as ClientTransport, b as TransportClientId, c as ProvidedClientTransportOptions } from '../../../index-c9e9977f.js';
+import { W as WebSocketConnection } from '../../../connection-c97da681.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-2e402bb8.js';
-import { W as WebSocketConnection } from '../../../connection-99346822.js';
+import { a as ClientTransport, b as TransportClientId, c as ProvidedClientTransportOptions } from '../../../index-c9e9977f.js';
+import { W as WebSocketConnection } from '../../../connection-c97da681.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

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

@@ -1,9 +1,9 @@
 import {
   WebSocketConnection
-} from "../../../chunk-XLJGKNV2.js";
+} from "../../../chunk-HKVP6XEL.js";
 import {
   ClientTransport
-} from "../../../chunk-7SPCAA6Q.js";
+} from "../../../chunk-CJGD7CNG.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log

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

@@ -111,7 +111,8 @@ var log;
 var ProtocolError = {
   RetriesExceeded: "conn_retry_exceeded",
   HandshakeFailed: "handshake_failed",
-  UseAfterDestroy: "use_after_destroy"
+  UseAfterDestroy: "use_after_destroy",
+  MessageOrderingViolated: "message_ordering_violated"
 };
 var EventDispatcher = class {
   eventListeners = {};
@@ -411,8 +412,8 @@ var defaultConnectionRetryOptions = {
   budgetRestoreIntervalMs: 200
 };
 var defaultClientTransportOptions = {
-  connectionRetryOptions: defaultConnectionRetryOptions,
-  ...defaultTransportOptions
+  ...defaultTransportOptions,
+  ...defaultConnectionRetryOptions
 };
 var Transport = class {
   /**
@@ -589,11 +590,11 @@ var Transport = class {
           )}`
         );
       } else {
+        const errMsg = `received out-of-order msg (got seq: ${msg.seq}, wanted seq: ${session.nextExpectedSeq})`;
         log?.error(
-          `${this.clientId} -- received out-of-order msg (got: ${msg.seq}, wanted: ${session.nextExpectedSeq}), marking connection as dead: ${JSON.stringify(msg)}`
+          `${this.clientId} -- ${errMsg}, marking connection as dead: ${JSON.stringify(msg)}`
         );
-        session.close();
-        this.deleteSession(session);
+        this.protocolError(ProtocolError.MessageOrderingViolated, errMsg);
       }
       return;
     }

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

@@ -1,7 +1,7 @@
-import { S as ServerTransport, b as TransportClientId, d as ProvidedTransportOptions } from '../../../index-2e402bb8.js';
+import { S as ServerTransport, b as TransportClientId, d as ProvidedTransportOptions } from '../../../index-c9e9977f.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-99346822.js';
+import { W as WebSocketConnection } from '../../../connection-c97da681.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

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

@@ -1,7 +1,7 @@
-import { S as ServerTransport, b as TransportClientId, d as ProvidedTransportOptions } from '../../../index-2e402bb8.js';
+import { S as ServerTransport, b as TransportClientId, d as ProvidedTransportOptions } from '../../../index-c9e9977f.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-99346822.js';
+import { W as WebSocketConnection } from '../../../connection-c97da681.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

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

@@ -1,9 +1,9 @@
 import {
   WebSocketConnection
-} from "../../../chunk-XLJGKNV2.js";
+} from "../../../chunk-HKVP6XEL.js";
 import {
   ServerTransport
-} from "../../../chunk-7SPCAA6Q.js";
+} from "../../../chunk-CJGD7CNG.js";
 import "../../../chunk-GFRAOY75.js";
 import "../../../chunk-H4BYJELI.js";
 import "../../../chunk-GZ7HCLLM.js";

package/dist/transport/index.cjs

@@ -134,7 +134,8 @@ var log;
 var ProtocolError = {
   RetriesExceeded: "conn_retry_exceeded",
   HandshakeFailed: "handshake_failed",
-  UseAfterDestroy: "use_after_destroy"
+  UseAfterDestroy: "use_after_destroy",
+  MessageOrderingViolated: "message_ordering_violated"
 };
 var EventDispatcher = class {
   eventListeners = {};
@@ -505,8 +506,8 @@ var defaultConnectionRetryOptions = {
   budgetRestoreIntervalMs: 200
 };
 var defaultClientTransportOptions = {
-  connectionRetryOptions: defaultConnectionRetryOptions,
-  ...defaultTransportOptions
+  ...defaultTransportOptions,
+  ...defaultConnectionRetryOptions
 };
 var Transport = class {
   /**
@@ -683,11 +684,11 @@ var Transport = class {
           )}`
         );
       } else {
+        const errMsg = `received out-of-order msg (got seq: ${msg.seq}, wanted seq: ${session.nextExpectedSeq})`;
         log?.error(
-          `${this.clientId} -- received out-of-order msg (got: ${msg.seq}, wanted: ${session.nextExpectedSeq}), marking connection as dead: ${JSON.stringify(msg)}`
+          `${this.clientId} -- ${errMsg}, marking connection as dead: ${JSON.stringify(msg)}`
         );
-        session.close();
-        this.deleteSession(session);
+        this.protocolError(ProtocolError.MessageOrderingViolated, errMsg);
       }
       return;
     }
@@ -793,7 +794,13 @@ var ClientTransport = class extends Transport {
    */
   inflightConnectionPromises;
   retryBudget;
-  tryReconnecting = true;
+  /**
+   * A flag indicating whether the transport should automatically reconnect
+   * when a connection is dropped.
+   * Realistically, this should always be true for clients unless you are writing
+   * tests or a special case where you don't want to reconnect.
+   */
+  reconnectOnConnectionDrop = true;
   constructor(clientId, providedOptions) {
     super(clientId, providedOptions);
     this.options = {
@@ -801,9 +808,7 @@ var ClientTransport = class extends Transport {
       ...providedOptions
     };
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
-    this.retryBudget = new LeakyBucketRateLimit(
-      this.options.connectionRetryOptions
-    );
+    this.retryBudget = new LeakyBucketRateLimit(this.options);
   }
   handleConnection(conn, to) {
     if (this.state !== "open")
@@ -835,7 +840,7 @@ var ClientTransport = class extends Transport {
         `${this.clientId} -- connection (id: ${conn.debugId}) to ${to} disconnected`
       );
       this.inflightConnectionPromises.delete(to);
-      if (this.tryReconnecting) {
+      if (this.reconnectOnConnectionDrop) {
         void this.connect(to);
       }
     });
@@ -941,7 +946,7 @@ var ClientTransport = class extends Transport {
     } catch (error) {
       this.inflightConnectionPromises.delete(to);
       const errStr = coerceErrorString(error);
-      if (!this.tryReconnecting || !canProceedWithConnection()) {
+      if (!this.reconnectOnConnectionDrop || !canProceedWithConnection()) {
         log?.warn(`${this.clientId} -- connection to ${to} failed (${errStr})`);
       } else {
         log?.warn(

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, 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';
+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-c9e9977f.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, 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';
+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-c9e9977f.js';
 import '../types-3e5768ec.js';
 import '@sinclair/typebox';

package/dist/transport/index.js

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

package/dist/util/testHelpers.d.cts

@@ -1,6 +1,6 @@
 import { Static } from '@sinclair/typebox';
-import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema, d as ProcedureResult } from '../procedures-f0226890.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, d as ProcedureResult } from '../procedures-d295c1a5.js';
+import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-c9e9977f.js';
 import * as it_pushable from 'it-pushable';
 import { C as Codec } from '../types-3e5768ec.js';
 import WebSocket from 'isomorphic-ws';

package/dist/util/testHelpers.d.ts

@@ -1,6 +1,6 @@
 import { Static } from '@sinclair/typebox';
-import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema, d as ProcedureResult } from '../procedures-f0226890.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, d as ProcedureResult } from '../procedures-d295c1a5.js';
+import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-c9e9977f.js';
 import * as it_pushable from 'it-pushable';
 import { C as Codec } from '../types-3e5768ec.js';
 import WebSocket from 'isomorphic-ws';

package/dist/util/testHelpers.js

@@ -1,11 +1,11 @@
 import {
   UNCAUGHT_ERROR,
   pushable
-} from "../chunk-Q6WPGM3K.js";
+} from "../chunk-SKH3JYHN.js";
 import "../chunk-RPIDSIQG.js";
 import {
   Session
-} from "../chunk-7SPCAA6Q.js";
+} from "../chunk-CJGD7CNG.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.16.1",
+  "version": "0.16.2",
   "type": "module",
   "exports": {
     ".": {