@replit/river 0.13.9 → 0.14.0

package/README.md

@@ -1,4 +1,6 @@
-# river - Long-lived Streaming Remote Procedure Calls
+# River
+
+## Long-lived Streaming Remote Procedure Calls
 
 It's like tRPC/gRPC but with
 
@@ -23,6 +25,9 @@ npm i @replit/river @sinclair/typebox
 npm i ws isomorphic-ws
 ```
 
+If you are planning on using River with React, also check out [`@replit/river-react`](https://npmjs.com/package/@replit/river-react)
+which provides some handy hooks and contexts for playing nicely with the React lifecycle.
+
 ## Writing Services
 
 ### Concepts
@@ -103,10 +108,13 @@ const websocketUrl = `ws://localhost:3000`;
 const transport = new WebSocketClientTransport(
   async () => new WebSocket(websocketUrl),
   'my-client-id',
-  'SERVER',
 );
 
-const client = createClient<ServiceSurface>(transport, 'SERVER');
+const client = createClient<ServiceSurface>(
+  transport,
+  'SERVER', // transport id of the server in the previous step
+  true, // whether to eagerly connect to the server on creation (optional argument)
+);
 
 // we get full type safety on `client`
 // client.<service name>.<procedure name>.<procedure type>()

package/dist/{builder-4bc0351d.d.ts → builder-0547e840.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, d as Session, C as Connection } from './index-56a709fc.js';
+import { b as TransportClientId, d as Session, C as Connection } from './index-d1452d8f.js';
 
 /**
  * The context for services/procedures. This is used only on

package/dist/{chunk-ZIGZKCDJ.js → chunk-NJ25LQPI.js}

@@ -80,11 +80,11 @@ var Session = class {
    */
   debugId;
   /**
-   * Number of messages we've sent along this session (excluding handshake)
+   * Number of messages we've sent along this session (excluding handshake and acks)
    */
   seq = 0;
   /**
-   * Number of unique messages we've received this session (excluding handshake)
+   * Number of unique messages we've received this session (excluding handshake and acks)
    */
   ack = 0;
   /**
@@ -148,21 +148,13 @@ var Session = class {
       }
       return;
     }
-    if (!this.connection)
-      return;
-    const heartbeatBuff = {
-      id: unsafeId(),
-      to: this.to,
-      from: this.from,
-      seq: this.seq,
-      ack: this.ack,
+    this.send({
       streamId: "heartbeat",
       controlFlags: 1 /* AckBit */,
       payload: {
         type: "ACK"
       }
-    };
-    this.connection.send(this.codec.toBuffer(heartbeatBuff));
+    });
     this.heartbeatMisses++;
   }
   resetBufferedMessages() {
@@ -538,10 +530,8 @@ var ClientTransport = class extends Transport {
    */
   inflightConnectionPromises;
   tryReconnecting = true;
-  connectedTo;
-  constructor(clientId, connectedTo, providedOptions) {
+  constructor(clientId, providedOptions) {
     super(clientId, providedOptions);
-    this.connectedTo = connectedTo;
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
   }
   handleConnection(conn, to) {
@@ -620,12 +610,14 @@ var ClientTransport = class extends Transport {
     }
     let reconnectPromise = this.inflightConnectionPromises.get(to);
     if (!reconnectPromise) {
-      reconnectPromise = this.createNewOutgoingConnection(to);
+      reconnectPromise = this.createNewOutgoingConnection(to).then((conn) => {
+        this.sendHandshake(to, conn);
+        return conn;
+      });
       this.inflightConnectionPromises.set(to, reconnectPromise);
     }
     try {
-      const conn = await reconnectPromise;
-      this.sendHandshake(to, conn);
+      await reconnectPromise;
     } catch (error) {
       const errStr = coerceErrorString(error);
       this.inflightConnectionPromises.delete(to);

package/dist/{chunk-KUQ4OT4D.js → chunk-TVRCTAL2.js}

@@ -428,56 +428,60 @@ function _createRecursiveProxy(callback, path) {
   });
   return proxy;
 }
-var createClient = (transport) => _createRecursiveProxy(async (opts) => {
-  const serverId = transport.connectedTo;
-  const [serviceName, procName, procType] = [...opts.path];
-  if (!(serviceName && procName && procType)) {
-    throw new Error(
-      "invalid river call, ensure the service and procedure you are calling exists"
-    );
+var createClient = (transport, serverId, eagerlyConnect = true) => {
+  if (eagerlyConnect) {
+    void transport.connect(serverId);
   }
-  const [input] = opts.args;
-  log?.info(
-    `${transport.clientId} -- invoked ${procType}: ${serviceName}.${procName} with args: ${JSON.stringify(
-      input
-    )}`
-  );
-  if (procType === "rpc") {
-    return handleRpc(
-      transport,
-      serverId,
-      input,
-      serviceName,
-      procName
-    );
-  } else if (procType === "stream") {
-    return handleStream(
-      transport,
-      serverId,
-      input,
-      serviceName,
-      procName
-    );
-  } else if (procType === "subscribe") {
-    return handleSubscribe(
-      transport,
-      serverId,
-      input,
-      serviceName,
-      procName
-    );
-  } else if (procType === "upload") {
-    return handleUpload(
-      transport,
-      serverId,
-      input,
-      serviceName,
-      procName
+  return _createRecursiveProxy(async (opts) => {
+    const [serviceName, procName, procType] = [...opts.path];
+    if (!(serviceName && procName && procType)) {
+      throw new Error(
+        "invalid river call, ensure the service and procedure you are calling exists"
+      );
+    }
+    const [input] = opts.args;
+    log?.info(
+      `${transport.clientId} -- invoked ${procType}: ${serviceName}.${procName} with args: ${JSON.stringify(
+        input
+      )}`
     );
-  } else {
-    throw new Error(`invalid river call, unknown procedure type ${procType}`);
-  }
-}, []);
+    if (procType === "rpc") {
+      return handleRpc(
+        transport,
+        serverId,
+        input,
+        serviceName,
+        procName
+      );
+    } else if (procType === "stream") {
+      return handleStream(
+        transport,
+        serverId,
+        input,
+        serviceName,
+        procName
+      );
+    } else if (procType === "subscribe") {
+      return handleSubscribe(
+        transport,
+        serverId,
+        input,
+        serviceName,
+        procName
+      );
+    } else if (procType === "upload") {
+      return handleUpload(
+        transport,
+        serverId,
+        input,
+        serviceName,
+        procName
+      );
+    } else {
+      throw new Error(`invalid river call, unknown procedure type ${procType}`);
+    }
+  }, []);
+};
 function createSessionDisconnectHandler(from, cb) {
   return (evt) => {
     if (evt.status === "disconnect" && evt.session.to === from) {

package/dist/{chunk-L62HCTWX.js → chunk-WYUFVZC3.js}

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

package/dist/{chunk-65O4MCJZ.js → chunk-ZD5NJJXR.js}

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

package/dist/{connection-ba6a843a.d.ts → connection-6c569569.d.ts}

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

package/dist/{connection-ede51542.d.ts → connection-ec72fdb0.d.ts}

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

package/dist/{index-56a709fc.d.ts → index-d1452d8f.d.ts}

@@ -159,11 +159,11 @@ declare class Session<ConnType extends Connection> {
      */
     debugId: string;
     /**
-     * Number of messages we've sent along this session (excluding handshake)
+     * Number of messages we've sent along this session (excluding handshake and acks)
      */
     private seq;
     /**
-     * Number of unique messages we've received this session (excluding handshake)
+     * Number of unique messages we've received this session (excluding handshake and acks)
      */
     private ack;
     /**
@@ -386,8 +386,7 @@ declare abstract class ClientTransport<ConnType extends Connection> extends Tran
      */
     inflightConnectionPromises: Map<TransportClientId, Promise<ConnType>>;
     tryReconnecting: boolean;
-    connectedTo: TransportClientId;
-    constructor(clientId: TransportClientId, connectedTo: TransportClientId, providedOptions?: Partial<TransportOptions>);
+    constructor(clientId: TransportClientId, providedOptions?: Partial<TransportOptions>);
     protected handleConnection(conn: ConnType, to: TransportClientId): void;
     receiveHandshakeResponseMessage(data: Uint8Array): false | {
         instanceId: string;

package/dist/router/index.cjs

@@ -514,56 +514,60 @@ function _createRecursiveProxy(callback, path) {
   });
   return proxy;
 }
-var createClient = (transport) => _createRecursiveProxy(async (opts) => {
-  const serverId = transport.connectedTo;
-  const [serviceName, procName, procType] = [...opts.path];
-  if (!(serviceName && procName && procType)) {
-    throw new Error(
-      "invalid river call, ensure the service and procedure you are calling exists"
-    );
+var createClient = (transport, serverId, eagerlyConnect = true) => {
+  if (eagerlyConnect) {
+    void transport.connect(serverId);
   }
-  const [input] = opts.args;
-  log?.info(
-    `${transport.clientId} -- invoked ${procType}: ${serviceName}.${procName} with args: ${JSON.stringify(
-      input
-    )}`
-  );
-  if (procType === "rpc") {
-    return handleRpc(
-      transport,
-      serverId,
-      input,
-      serviceName,
-      procName
-    );
-  } else if (procType === "stream") {
-    return handleStream(
-      transport,
-      serverId,
-      input,
-      serviceName,
-      procName
-    );
-  } else if (procType === "subscribe") {
-    return handleSubscribe(
-      transport,
-      serverId,
-      input,
-      serviceName,
-      procName
-    );
-  } else if (procType === "upload") {
-    return handleUpload(
-      transport,
-      serverId,
-      input,
-      serviceName,
-      procName
+  return _createRecursiveProxy(async (opts) => {
+    const [serviceName, procName, procType] = [...opts.path];
+    if (!(serviceName && procName && procType)) {
+      throw new Error(
+        "invalid river call, ensure the service and procedure you are calling exists"
+      );
+    }
+    const [input] = opts.args;
+    log?.info(
+      `${transport.clientId} -- invoked ${procType}: ${serviceName}.${procName} with args: ${JSON.stringify(
+        input
+      )}`
     );
-  } else {
-    throw new Error(`invalid river call, unknown procedure type ${procType}`);
-  }
-}, []);
+    if (procType === "rpc") {
+      return handleRpc(
+        transport,
+        serverId,
+        input,
+        serviceName,
+        procName
+      );
+    } else if (procType === "stream") {
+      return handleStream(
+        transport,
+        serverId,
+        input,
+        serviceName,
+        procName
+      );
+    } else if (procType === "subscribe") {
+      return handleSubscribe(
+        transport,
+        serverId,
+        input,
+        serviceName,
+        procName
+      );
+    } else if (procType === "upload") {
+      return handleUpload(
+        transport,
+        serverId,
+        input,
+        serviceName,
+        procName
+      );
+    } else {
+      throw new Error(`invalid river call, unknown procedure type ${procType}`);
+    }
+  }, []);
+};
 function createSessionDisconnectHandler(from, cb) {
   return (evt) => {
     if (evt.status === "disconnect" && evt.session.to === from) {

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-4bc0351d.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-4bc0351d.js';
-import { S as ServerTransport, C as Connection, a as ClientTransport } from '../index-56a709fc.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-0547e840.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-0547e840.js';
+import { S as ServerTransport, C as Connection, a as ClientTransport, b as TransportClientId } from '../index-d1452d8f.js';
 import { Pushable } from 'it-pushable';
 import { Static } from '@sinclair/typebox';
 import '../types-3e5768ec.js';
@@ -110,6 +110,6 @@ type ServerClient<Srv extends Server<ServiceDefs>> = {
  * @param {Transport} transport - The transport to use for communication.
  * @returns The client for the server.
  */
-declare const createClient: <Srv extends Server<ServiceDefs>>(transport: ClientTransport<Connection>) => ServerClient<Srv>;
+declare const createClient: <Srv extends Server<ServiceDefs>>(transport: ClientTransport<Connection>, serverId: TransportClientId, eagerlyConnect?: boolean) => ServerClient<Srv>;
 
 export { PayloadType, ProcInput, ProcOutput, ProcType, Result, RiverError, Server, ServerClient, ServiceContext, ServiceDefs, buildServiceDefs, createClient, createServer };

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-4bc0351d.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-4bc0351d.js';
-import { S as ServerTransport, C as Connection, a as ClientTransport } from '../index-56a709fc.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-0547e840.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-0547e840.js';
+import { S as ServerTransport, C as Connection, a as ClientTransport, b as TransportClientId } from '../index-d1452d8f.js';
 import { Pushable } from 'it-pushable';
 import { Static } from '@sinclair/typebox';
 import '../types-3e5768ec.js';
@@ -110,6 +110,6 @@ type ServerClient<Srv extends Server<ServiceDefs>> = {
  * @param {Transport} transport - The transport to use for communication.
  * @returns The client for the server.
  */
-declare const createClient: <Srv extends Server<ServiceDefs>>(transport: ClientTransport<Connection>) => ServerClient<Srv>;
+declare const createClient: <Srv extends Server<ServiceDefs>>(transport: ClientTransport<Connection>, serverId: TransportClientId, eagerlyConnect?: boolean) => ServerClient<Srv>;
 
 export { PayloadType, ProcInput, ProcOutput, ProcType, Result, RiverError, Server, ServerClient, ServiceContext, ServiceDefs, buildServiceDefs, createClient, createServer };

package/dist/router/index.js

@@ -8,7 +8,7 @@ import {
   createClient,
   createServer,
   serializeService
-} from "../chunk-KUQ4OT4D.js";
+} from "../chunk-TVRCTAL2.js";
 import "../chunk-GFRAOY75.js";
 import "../chunk-H4BYJELI.js";
 export {

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

@@ -188,11 +188,11 @@ var Session = class {
    */
   debugId;
   /**
-   * Number of messages we've sent along this session (excluding handshake)
+   * Number of messages we've sent along this session (excluding handshake and acks)
    */
   seq = 0;
   /**
-   * Number of unique messages we've received this session (excluding handshake)
+   * Number of unique messages we've received this session (excluding handshake and acks)
    */
   ack = 0;
   /**
@@ -256,21 +256,13 @@ var Session = class {
       }
       return;
     }
-    if (!this.connection)
-      return;
-    const heartbeatBuff = {
-      id: unsafeId(),
-      to: this.to,
-      from: this.from,
-      seq: this.seq,
-      ack: this.ack,
+    this.send({
       streamId: "heartbeat",
       controlFlags: 1 /* AckBit */,
       payload: {
         type: "ACK"
       }
-    };
-    this.connection.send(this.codec.toBuffer(heartbeatBuff));
+    });
     this.heartbeatMisses++;
   }
   resetBufferedMessages() {
@@ -779,10 +771,8 @@ var ClientTransport = class extends Transport {
    */
   inflightConnectionPromises;
   tryReconnecting = true;
-  connectedTo;
-  constructor(clientId, connectedTo, providedOptions) {
+  constructor(clientId, providedOptions) {
     super(clientId, providedOptions);
-    this.connectedTo = connectedTo;
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
   }
   handleConnection(conn, to) {
@@ -861,12 +851,14 @@ var ClientTransport = class extends Transport {
     }
     let reconnectPromise = this.inflightConnectionPromises.get(to);
     if (!reconnectPromise) {
-      reconnectPromise = this.createNewOutgoingConnection(to);
+      reconnectPromise = this.createNewOutgoingConnection(to).then((conn) => {
+        this.sendHandshake(to, conn);
+        return conn;
+      });
       this.inflightConnectionPromises.set(to, reconnectPromise);
     }
     try {
-      const conn = await reconnectPromise;
-      this.sendHandshake(to, conn);
+      await reconnectPromise;
     } catch (error) {
       const errStr = coerceErrorString(error);
       this.inflightConnectionPromises.delete(to);
@@ -905,12 +897,9 @@ var ClientTransport = class extends Transport {
 // transport/impls/uds/client.ts
 var UnixDomainSocketClientTransport = class extends ClientTransport {
   path;
-  serverId;
-  constructor(socketPath, clientId, serverId, providedOptions) {
-    super(clientId, serverId, providedOptions);
+  constructor(socketPath, clientId, providedOptions) {
+    super(clientId, providedOptions);
     this.path = socketPath;
-    this.serverId = serverId;
-    void this.connect(serverId);
   }
   async createNewOutgoingConnection(to) {
     const oldConnection = this.connections.get(to);

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

@@ -1,5 +1,5 @@
-import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-56a709fc.js';
-import { U as UdsConnection } from '../../../connection-ba6a843a.js';
+import { a as ClientTransport, c as TransportOptions, b as TransportClientId } from '../../../index-d1452d8f.js';
+import { U as UdsConnection } from '../../../connection-6c569569.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:net';
@@ -7,8 +7,7 @@ import 'node:stream';
 
 declare class UnixDomainSocketClientTransport extends ClientTransport<UdsConnection> {
     path: string;
-    serverId: TransportClientId;
-    constructor(socketPath: string, clientId: string, serverId: TransportClientId, providedOptions?: Partial<TransportOptions>);
+    constructor(socketPath: string, clientId: string, providedOptions?: Partial<TransportOptions>);
     createNewOutgoingConnection(to: TransportClientId): Promise<UdsConnection>;
 }
 

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

@@ -1,5 +1,5 @@
-import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-56a709fc.js';
-import { U as UdsConnection } from '../../../connection-ba6a843a.js';
+import { a as ClientTransport, c as TransportOptions, b as TransportClientId } from '../../../index-d1452d8f.js';
+import { U as UdsConnection } from '../../../connection-6c569569.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:net';
@@ -7,8 +7,7 @@ import 'node:stream';
 
 declare class UnixDomainSocketClientTransport extends ClientTransport<UdsConnection> {
     path: string;
-    serverId: TransportClientId;
-    constructor(socketPath: string, clientId: string, serverId: TransportClientId, providedOptions?: Partial<TransportOptions>);
+    constructor(socketPath: string, clientId: string, providedOptions?: Partial<TransportOptions>);
     createNewOutgoingConnection(to: TransportClientId): Promise<UdsConnection>;
 }
 

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

@@ -1,9 +1,9 @@
 import {
   UdsConnection
-} from "../../../chunk-65O4MCJZ.js";
+} from "../../../chunk-ZD5NJJXR.js";
 import {
   ClientTransport
-} from "../../../chunk-ZIGZKCDJ.js";
+} from "../../../chunk-NJ25LQPI.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log
@@ -14,12 +14,9 @@ import "../../../chunk-GZ7HCLLM.js";
 import { Socket } from "node:net";
 var UnixDomainSocketClientTransport = class extends ClientTransport {
   path;
-  serverId;
-  constructor(socketPath, clientId, serverId, providedOptions) {
-    super(clientId, serverId, providedOptions);
+  constructor(socketPath, clientId, providedOptions) {
+    super(clientId, providedOptions);
     this.path = socketPath;
-    this.serverId = serverId;
-    void this.connect(serverId);
   }
   async createNewOutgoingConnection(to) {
     const oldConnection = this.connections.get(to);

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

@@ -226,11 +226,11 @@ var Session = class {
    */
   debugId;
   /**
-   * Number of messages we've sent along this session (excluding handshake)
+   * Number of messages we've sent along this session (excluding handshake and acks)
    */
   seq = 0;
   /**
-   * Number of unique messages we've received this session (excluding handshake)
+   * Number of unique messages we've received this session (excluding handshake and acks)
    */
   ack = 0;
   /**
@@ -294,21 +294,13 @@ var Session = class {
       }
       return;
     }
-    if (!this.connection)
-      return;
-    const heartbeatBuff = {
-      id: unsafeId(),
-      to: this.to,
-      from: this.from,
-      seq: this.seq,
-      ack: this.ack,
+    this.send({
       streamId: "heartbeat",
       controlFlags: 1 /* AckBit */,
       payload: {
         type: "ACK"
       }
-    };
-    this.connection.send(this.codec.toBuffer(heartbeatBuff));
+    });
     this.heartbeatMisses++;
   }
   resetBufferedMessages() {

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, c as TransportOptions } from '../../../index-56a709fc.js';
-import { U as UdsConnection } from '../../../connection-ba6a843a.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-d1452d8f.js';
+import { U as UdsConnection } from '../../../connection-6c569569.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, c as TransportOptions } from '../../../index-56a709fc.js';
-import { U as UdsConnection } from '../../../connection-ba6a843a.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-d1452d8f.js';
+import { U as UdsConnection } from '../../../connection-6c569569.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-65O4MCJZ.js";
+} from "../../../chunk-ZD5NJJXR.js";
 import {
   ServerTransport
-} from "../../../chunk-ZIGZKCDJ.js";
+} from "../../../chunk-NJ25LQPI.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log

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

@@ -218,11 +218,11 @@ var Session = class {
    */
   debugId;
   /**
-   * Number of messages we've sent along this session (excluding handshake)
+   * Number of messages we've sent along this session (excluding handshake and acks)
    */
   seq = 0;
   /**
-   * Number of unique messages we've received this session (excluding handshake)
+   * Number of unique messages we've received this session (excluding handshake and acks)
    */
   ack = 0;
   /**
@@ -286,21 +286,13 @@ var Session = class {
       }
       return;
     }
-    if (!this.connection)
-      return;
-    const heartbeatBuff = {
-      id: unsafeId(),
-      to: this.to,
-      from: this.from,
-      seq: this.seq,
-      ack: this.ack,
+    this.send({
       streamId: "heartbeat",
       controlFlags: 1 /* AckBit */,
       payload: {
         type: "ACK"
       }
-    };
-    this.connection.send(this.codec.toBuffer(heartbeatBuff));
+    });
     this.heartbeatMisses++;
   }
   resetBufferedMessages() {
@@ -685,10 +677,8 @@ var ClientTransport = class extends Transport {
    */
   inflightConnectionPromises;
   tryReconnecting = true;
-  connectedTo;
-  constructor(clientId, connectedTo, providedOptions) {
+  constructor(clientId, providedOptions) {
     super(clientId, providedOptions);
-    this.connectedTo = connectedTo;
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
   }
   handleConnection(conn, to) {
@@ -767,12 +757,14 @@ var ClientTransport = class extends Transport {
     }
     let reconnectPromise = this.inflightConnectionPromises.get(to);
     if (!reconnectPromise) {
-      reconnectPromise = this.createNewOutgoingConnection(to);
+      reconnectPromise = this.createNewOutgoingConnection(to).then((conn) => {
+        this.sendHandshake(to, conn);
+        return conn;
+      });
       this.inflightConnectionPromises.set(to, reconnectPromise);
     }
     try {
-      const conn = await reconnectPromise;
-      this.sendHandshake(to, conn);
+      await reconnectPromise;
     } catch (error) {
       const errStr = coerceErrorString(error);
       this.inflightConnectionPromises.delete(to);
@@ -847,7 +839,6 @@ var WebSocketClientTransport = class extends ClientTransport {
    * A function that returns a Promise that resolves to a WebSocket instance.
    */
   wsGetter;
-  serverId;
   /**
    * Creates a new WebSocketClientTransport instance.
    * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.
@@ -855,18 +846,9 @@ var WebSocketClientTransport = class extends ClientTransport {
    * @param serverId The ID of the server this transport is connecting to.
    * @param providedOptions An optional object containing configuration options for the transport.
    */
-  constructor(wsGetter, clientId, serverId, providedOptions) {
-    super(clientId, serverId, providedOptions);
+  constructor(wsGetter, clientId, providedOptions) {
+    super(clientId, providedOptions);
     this.wsGetter = wsGetter;
-    this.serverId = serverId;
-    void this.connect(this.serverId);
-  }
-  reopen() {
-    if (this.state === "destroyed") {
-      throw new Error("cant reopen a destroyed connection");
-    }
-    this.state = "open";
-    void this.connect(this.serverId);
   }
   async createNewOutgoingConnection(to) {
     const wsRes = await new Promise((resolve) => {

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 TransportOptions } from '../../../index-56a709fc.js';
-import { W as WebSocketConnection } from '../../../connection-ede51542.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-d1452d8f.js';
+import { W as WebSocketConnection } from '../../../connection-ec72fdb0.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 
@@ -14,7 +14,6 @@ declare class WebSocketClientTransport extends ClientTransport<WebSocketConnecti
      * A function that returns a Promise that resolves to a WebSocket instance.
      */
     wsGetter: (to: TransportClientId) => Promise<WebSocket>;
-    serverId: TransportClientId;
     /**
      * Creates a new WebSocketClientTransport instance.
      * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.
@@ -22,8 +21,7 @@ declare class WebSocketClientTransport extends ClientTransport<WebSocketConnecti
      * @param serverId The ID of the server this transport is connecting to.
      * @param providedOptions An optional object containing configuration options for the transport.
      */
-    constructor(wsGetter: () => Promise<WebSocket>, clientId: TransportClientId, serverId: TransportClientId, providedOptions?: Partial<TransportOptions>);
-    reopen(): void;
+    constructor(wsGetter: () => Promise<WebSocket>, clientId: TransportClientId, providedOptions?: Partial<TransportOptions>);
     createNewOutgoingConnection(to: string): Promise<WebSocketConnection>;
 }
 

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 TransportOptions } from '../../../index-56a709fc.js';
-import { W as WebSocketConnection } from '../../../connection-ede51542.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-d1452d8f.js';
+import { W as WebSocketConnection } from '../../../connection-ec72fdb0.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 
@@ -14,7 +14,6 @@ declare class WebSocketClientTransport extends ClientTransport<WebSocketConnecti
      * A function that returns a Promise that resolves to a WebSocket instance.
      */
     wsGetter: (to: TransportClientId) => Promise<WebSocket>;
-    serverId: TransportClientId;
     /**
      * Creates a new WebSocketClientTransport instance.
      * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.
@@ -22,8 +21,7 @@ declare class WebSocketClientTransport extends ClientTransport<WebSocketConnecti
      * @param serverId The ID of the server this transport is connecting to.
      * @param providedOptions An optional object containing configuration options for the transport.
      */
-    constructor(wsGetter: () => Promise<WebSocket>, clientId: TransportClientId, serverId: TransportClientId, providedOptions?: Partial<TransportOptions>);
-    reopen(): void;
+    constructor(wsGetter: () => Promise<WebSocket>, clientId: TransportClientId, providedOptions?: Partial<TransportOptions>);
     createNewOutgoingConnection(to: string): Promise<WebSocketConnection>;
 }
 

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

@@ -1,9 +1,9 @@
 import {
   WebSocketConnection
-} from "../../../chunk-L62HCTWX.js";
+} from "../../../chunk-WYUFVZC3.js";
 import {
   ClientTransport
-} from "../../../chunk-ZIGZKCDJ.js";
+} from "../../../chunk-NJ25LQPI.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log
@@ -16,7 +16,6 @@ var WebSocketClientTransport = class extends ClientTransport {
    * A function that returns a Promise that resolves to a WebSocket instance.
    */
   wsGetter;
-  serverId;
   /**
    * Creates a new WebSocketClientTransport instance.
    * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.
@@ -24,18 +23,9 @@ var WebSocketClientTransport = class extends ClientTransport {
    * @param serverId The ID of the server this transport is connecting to.
    * @param providedOptions An optional object containing configuration options for the transport.
    */
-  constructor(wsGetter, clientId, serverId, providedOptions) {
-    super(clientId, serverId, providedOptions);
+  constructor(wsGetter, clientId, providedOptions) {
+    super(clientId, providedOptions);
     this.wsGetter = wsGetter;
-    this.serverId = serverId;
-    void this.connect(this.serverId);
-  }
-  reopen() {
-    if (this.state === "destroyed") {
-      throw new Error("cant reopen a destroyed connection");
-    }
-    this.state = "open";
-    void this.connect(this.serverId);
   }
   async createNewOutgoingConnection(to) {
     const wsRes = await new Promise((resolve) => {

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

@@ -226,11 +226,11 @@ var Session = class {
    */
   debugId;
   /**
-   * Number of messages we've sent along this session (excluding handshake)
+   * Number of messages we've sent along this session (excluding handshake and acks)
    */
   seq = 0;
   /**
-   * Number of unique messages we've received this session (excluding handshake)
+   * Number of unique messages we've received this session (excluding handshake and acks)
    */
   ack = 0;
   /**
@@ -294,21 +294,13 @@ var Session = class {
       }
       return;
     }
-    if (!this.connection)
-      return;
-    const heartbeatBuff = {
-      id: unsafeId(),
-      to: this.to,
-      from: this.from,
-      seq: this.seq,
-      ack: this.ack,
+    this.send({
       streamId: "heartbeat",
       controlFlags: 1 /* AckBit */,
       payload: {
         type: "ACK"
       }
-    };
-    this.connection.send(this.codec.toBuffer(heartbeatBuff));
+    });
     this.heartbeatMisses++;
   }
   resetBufferedMessages() {

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

@@ -1,7 +1,7 @@
-import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-56a709fc.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-d1452d8f.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-ede51542.js';
+import { W as WebSocketConnection } from '../../../connection-ec72fdb0.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, c as TransportOptions } from '../../../index-56a709fc.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-d1452d8f.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-ede51542.js';
+import { W as WebSocketConnection } from '../../../connection-ec72fdb0.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

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

@@ -1,9 +1,9 @@
 import {
   WebSocketConnection
-} from "../../../chunk-L62HCTWX.js";
+} from "../../../chunk-WYUFVZC3.js";
 import {
   ServerTransport
-} from "../../../chunk-ZIGZKCDJ.js";
+} from "../../../chunk-NJ25LQPI.js";
 import "../../../chunk-GFRAOY75.js";
 import "../../../chunk-H4BYJELI.js";
 import "../../../chunk-GZ7HCLLM.js";

package/dist/transport/index.cjs

@@ -248,11 +248,11 @@ var Session = class {
    */
   debugId;
   /**
-   * Number of messages we've sent along this session (excluding handshake)
+   * Number of messages we've sent along this session (excluding handshake and acks)
    */
   seq = 0;
   /**
-   * Number of unique messages we've received this session (excluding handshake)
+   * Number of unique messages we've received this session (excluding handshake and acks)
    */
   ack = 0;
   /**
@@ -316,21 +316,13 @@ var Session = class {
       }
       return;
     }
-    if (!this.connection)
-      return;
-    const heartbeatBuff = {
-      id: unsafeId(),
-      to: this.to,
-      from: this.from,
-      seq: this.seq,
-      ack: this.ack,
+    this.send({
       streamId: "heartbeat",
       controlFlags: 1 /* AckBit */,
       payload: {
         type: "ACK"
       }
-    };
-    this.connection.send(this.codec.toBuffer(heartbeatBuff));
+    });
     this.heartbeatMisses++;
   }
   resetBufferedMessages() {
@@ -715,10 +707,8 @@ var ClientTransport = class extends Transport {
    */
   inflightConnectionPromises;
   tryReconnecting = true;
-  connectedTo;
-  constructor(clientId, connectedTo, providedOptions) {
+  constructor(clientId, providedOptions) {
     super(clientId, providedOptions);
-    this.connectedTo = connectedTo;
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
   }
   handleConnection(conn, to) {
@@ -797,12 +787,14 @@ var ClientTransport = class extends Transport {
     }
     let reconnectPromise = this.inflightConnectionPromises.get(to);
     if (!reconnectPromise) {
-      reconnectPromise = this.createNewOutgoingConnection(to);
+      reconnectPromise = this.createNewOutgoingConnection(to).then((conn) => {
+        this.sendHandshake(to, conn);
+        return conn;
+      });
       this.inflightConnectionPromises.set(to, reconnectPromise);
     }
     try {
-      const conn = await reconnectPromise;
-      this.sendHandshake(to, conn);
+      await reconnectPromise;
     } catch (error) {
       const errStr = coerceErrorString(error);
       this.inflightConnectionPromises.delete(to);

package/dist/transport/index.d.cts

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

package/dist/transport/index.d.ts

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

package/dist/transport/index.js

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

package/dist/util/testHelpers.cjs

@@ -136,11 +136,11 @@ var Session = class {
    */
   debugId;
   /**
-   * Number of messages we've sent along this session (excluding handshake)
+   * Number of messages we've sent along this session (excluding handshake and acks)
    */
   seq = 0;
   /**
-   * Number of unique messages we've received this session (excluding handshake)
+   * Number of unique messages we've received this session (excluding handshake and acks)
    */
   ack = 0;
   /**
@@ -204,21 +204,13 @@ var Session = class {
       }
       return;
     }
-    if (!this.connection)
-      return;
-    const heartbeatBuff = {
-      id: unsafeId(),
-      to: this.to,
-      from: this.from,
-      seq: this.seq,
-      ack: this.ack,
+    this.send({
       streamId: "heartbeat",
       controlFlags: 1 /* AckBit */,
       payload: {
         type: "ACK"
       }
-    };
-    this.connection.send(this.codec.toBuffer(heartbeatBuff));
+    });
     this.heartbeatMisses++;
   }
   resetBufferedMessages() {

package/dist/util/testHelpers.d.cts

@@ -1,8 +1,8 @@
 import * as it_pushable from 'it-pushable';
 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-56a709fc.js';
-import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-4bc0351d.js';
+import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-d1452d8f.js';
+import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-0547e840.js';
 import { Static } from '@sinclair/typebox';
 import net from 'node:net';
 import '../types-3e5768ec.js';

package/dist/util/testHelpers.d.ts

@@ -1,8 +1,8 @@
 import * as it_pushable from 'it-pushable';
 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-56a709fc.js';
-import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-4bc0351d.js';
+import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-d1452d8f.js';
+import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-0547e840.js';
 import { Static } from '@sinclair/typebox';
 import net from 'node:net';
 import '../types-3e5768ec.js';

package/dist/util/testHelpers.js

@@ -1,12 +1,12 @@
 import {
   UNCAUGHT_ERROR,
   pushable
-} from "../chunk-KUQ4OT4D.js";
+} from "../chunk-TVRCTAL2.js";
 import "../chunk-5IZ2UHWV.js";
 import {
   Session,
   defaultSessionOptions
-} from "../chunk-ZIGZKCDJ.js";
+} from "../chunk-NJ25LQPI.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.13.9",
+  "version": "0.14.0",
   "type": "module",
   "exports": {
     ".": {