@replit/river 0.13.0 → 0.13.2

package/README.md

@@ -10,6 +10,8 @@ It's like tRPC/gRPC but with
 - transparent reconnect support for long-lived sessions
 - over any transport (WebSockets and Unix Domain Socket out of the box)
 
+See [PROTOCOL.md](./PROTOCOL.md) for more information on the protocol.
+
 ## Installation
 
 To use River, you must be on least Typescript 5 with `"moduleResolution": "bundler"`.

package/dist/{builder-169fbf7f.d.ts → builder-eef3b061.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-21c1b21d.js';
+import { b as TransportClientId, d as Session, C as Connection } from './index-9aa0aabb.js';
 
 /**
  * The context for services/procedures. This is used only on

package/dist/{chunk-CDH7QSB4.js → chunk-23MWJLVJ.js}

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

package/dist/{chunk-NPXAAD7M.js → chunk-3Y2K543F.js}

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

package/dist/{chunk-CBRQM65K.js → chunk-67M47YPQ.js}

@@ -3,7 +3,7 @@ import {
   coerceErrorString,
   isStreamClose,
   isStreamOpen
-} from "./chunk-MGGIUH5O.js";
+} from "./chunk-GFRAOY75.js";
 import {
   log
 } from "./chunk-H4BYJELI.js";
@@ -438,6 +438,11 @@ var createClient = (transport) => _createRecursiveProxy(async (opts) => {
     );
   }
   const [input] = opts.args;
+  log?.info(
+    `${transport.clientId} -- invoked ${procType}: ${serviceName}.${procName} with args: ${JSON.stringify(
+      input
+    )}`
+  );
   if (procType === "rpc") {
     return handleRpc(
       transport,
@@ -505,16 +510,12 @@ function handleRpc(transport, serverId, input, serviceName, procedureName) {
       transport.removeEventListener("sessionStatus", onSessionStatus);
     }
     function onMessage(msg) {
-      if (msg.streamId !== streamId) {
+      if (msg.streamId !== streamId)
         return;
-      }
-      if (msg.to !== transport.clientId) {
+      if (msg.to !== transport.clientId)
         return;
-      }
-      if (msg.streamId === streamId) {
-        cleanup();
-        resolve(msg.payload);
-      }
+      cleanup();
+      resolve(msg.payload);
     }
     transport.addEventListener("message", onMessage);
     transport.addEventListener("sessionStatus", onSessionStatus);
@@ -558,12 +559,10 @@ function handleStream(transport, serverId, init, serviceName, procedureName) {
   };
   void pipeInputToTransport();
   function onMessage(msg) {
-    if (msg.streamId !== streamId) {
+    if (msg.streamId !== streamId)
       return;
-    }
-    if (msg.to !== transport.clientId) {
+    if (msg.to !== transport.clientId)
       return;
-    }
     if (isStreamClose(msg.controlFlags)) {
       cleanup();
     } else {
@@ -602,12 +601,10 @@ function handleSubscribe(transport, serverId, input, serviceName, procedureName)
   let healthyClose = true;
   const outputStream = pushable({ objectMode: true });
   function onMessage(msg) {
-    if (msg.streamId !== streamId) {
+    if (msg.streamId !== streamId)
       return;
-    }
-    if (msg.to !== transport.clientId) {
+    if (msg.to !== transport.clientId)
       return;
-    }
     if (isStreamClose(msg.controlFlags)) {
       cleanup();
     } else {
@@ -691,13 +688,12 @@ function handleUpload(transport, serverId, init, serviceName, procedureName) {
       transport.removeEventListener("sessionStatus", onSessionStatus);
     }
     function onMessage(msg) {
-      if (msg.to !== transport.clientId) {
+      if (msg.streamId !== streamId)
         return;
-      }
-      if (msg.streamId === streamId) {
-        cleanup();
-        resolve(msg.payload);
-      }
+      if (msg.to !== transport.clientId)
+        return;
+      cleanup();
+      resolve(msg.payload);
     }
     transport.addEventListener("message", onMessage);
     transport.addEventListener("sessionStatus", onSessionStatus);
@@ -752,17 +748,15 @@ var RiverServer = class {
   };
   // cleanup streams on session close
   onSessionStatus = async (evt) => {
-    if (evt.status !== "disconnect") {
+    if (evt.status !== "disconnect")
       return;
-    }
     const disconnectedClientId = evt.session.to;
     log?.info(
       `${this.transport.clientId} -- got session disconnect from ${disconnectedClientId}, cleaning up streams`
     );
     const streamsFromThisClient = this.clientStreams.get(disconnectedClientId);
-    if (!streamsFromThisClient) {
+    if (!streamsFromThisClient)
       return;
-    }
     this.disconnectedSessions.add(disconnectedClientId);
     await Promise.all(
       Array.from(streamsFromThisClient).map(this.cleanupStream)
@@ -812,21 +806,36 @@ var RiverServer = class {
     const procedure = service.procedures[message.procedureName];
     const incoming = pushable({ objectMode: true });
     const outgoing = pushable({ objectMode: true });
+    const needsClose = procedure.type === "subscription" || procedure.type === "stream";
     const outputHandler = (
       // sending outgoing messages back to client
-      (async () => {
-        for await (const response of outgoing) {
-          this.transport.send(session.to, {
-            streamId: message.streamId,
-            controlFlags: 0,
-            payload: response
-          });
-        }
-        const needsClose = procedure.type === "subscription" || procedure.type === "stream";
-        if (needsClose && !this.disconnectedSessions.has(message.from)) {
-          this.transport.sendCloseStream(session.to, message.streamId);
-        }
-      })()
+      needsClose ? (
+        // subscription and stream case, we need to send a close bit after the response stream
+        (async () => {
+          for await (const response of outgoing) {
+            this.transport.send(session.to, {
+              streamId: message.streamId,
+              controlFlags: 0,
+              payload: response
+            });
+          }
+          if (!this.disconnectedSessions.has(message.from)) {
+            this.transport.sendCloseStream(session.to, message.streamId);
+          }
+        })()
+      ) : (
+        // rpc and upload case, we just send the response back with close bit
+        (async () => {
+          const response = await outgoing.next().then((res) => res.value);
+          if (response) {
+            this.transport.send(session.to, {
+              streamId: message.streamId,
+              controlFlags: 4 /* StreamClosedBit */,
+              payload: response
+            });
+          }
+        })()
+      )
     );
     const errorHandler = (err) => {
       const errorMsg = coerceErrorString(err);

package/dist/{chunk-MGGIUH5O.js → chunk-GFRAOY75.js}

@@ -34,7 +34,7 @@ var ControlMessageHandshakeResponseSchema = Type.Object({
     }),
     Type.Object({
       ok: Type.Literal(false),
-      reason: Type.Union([Type.Literal("VERSION_MISMATCH")])
+      reason: Type.String()
     })
   ])
 });
@@ -63,7 +63,7 @@ function handshakeRequestMessage(from, to, instanceId) {
     }
   };
 }
-function handshakeResponseMessage(from, instanceId, to, ok) {
+function handshakeResponseMessage(from, instanceId, to, ok, reason) {
   return {
     id: nanoid(),
     from,
@@ -82,7 +82,7 @@ function handshakeResponseMessage(from, instanceId, to, ok) {
       type: "HANDSHAKE_RESP",
       status: {
         ok: false,
-        reason: "VERSION_MISMATCH"
+        reason: reason ?? "Unknown reason"
       }
     }
   };
@@ -106,7 +106,7 @@ function isStreamClose(controlFlag) {
 // util/stringify.ts
 function coerceErrorString(err) {
   if (err instanceof Error) {
-    return err.message;
+    return err.message || "unknown reason";
   }
   return `[coerced to error] ${String(err)}`;
 }

package/dist/{chunk-R2IMXRVU.js → chunk-NLWRMDT6.js}

@@ -7,7 +7,7 @@ import {
   handshakeRequestMessage,
   handshakeResponseMessage,
   isAck
-} from "./chunk-MGGIUH5O.js";
+} from "./chunk-GFRAOY75.js";
 import {
   log
 } from "./chunk-H4BYJELI.js";
@@ -625,6 +625,9 @@ var ClientTransport = class extends Transport {
     } catch (error) {
       const errStr = coerceErrorString(error);
       this.inflightConnectionPromises.delete(to);
+      const shouldRetry = this.state === "open" && this.tryReconnecting;
+      if (!shouldRetry)
+        return;
       if (attempt >= this.options.retryAttemptsMax) {
         const errMsg = `connection to ${to} failed after ${attempt} attempts (${errStr}), giving up`;
         log?.error(`${this.clientId} -- ${errMsg}`);

package/dist/{connection-dd789651.d.ts → connection-03e650c8.d.ts}

@@ -1,4 +1,4 @@
-import { C as Connection } from './index-21c1b21d.js';
+import { C as Connection } from './index-9aa0aabb.js';
 import { Socket } from 'node:net';
 import stream, { Transform, TransformCallback, TransformOptions } from 'node:stream';
 

package/dist/{connection-ab681c08.d.ts → connection-d052d027.d.ts}

@@ -1,5 +1,5 @@
 import WebSocket from 'isomorphic-ws';
-import { C as Connection } from './index-21c1b21d.js';
+import { C as Connection } from './index-9aa0aabb.js';
 
 declare class WebSocketConnection extends Connection {
     ws: WebSocket;

package/dist/{index-21c1b21d.d.ts → index-9aa0aabb.d.ts}

@@ -140,32 +140,6 @@ interface SessionOptions {
  * - This will only be considered disconnected if
  *    - the server tells the client that we’ve reconnected but it doesn’t recognize us anymore (server definitely died) or
  *    - we hit a grace period after a connection disconnect
- *
- * Here's a legend for what each of the numbers means. A '-' indicates the
- * session/connection is connected and ' ' means it is disconnected.
- *
- * 1. connectionStatus :: connect
- * 2. sessionStatus    :: connect
- * 3. connectionStatus :: disconnect
- * 4. sessionStatus    :: disconnect
- *
- * From the server's perspective:
- * ```plaintext
- * session         2-----------------------4
- * connection  ----1---------3   1-------3
- *                                       ^-^ grace period
- *             ^---^ connection is created
- *                   before connectionStatus event is fired
- * ```
- *
- * From the client's perspective:
- * ```plaintext
- * session     2---------------------------4
- * connection      1---------3   1-------3
- *                                       ^-^ grace period
- *             ^---^ session is created as soon
- *                   as we send an outgoing message
- * ```
  */
 declare class Session<ConnType extends Connection> {
     private codec;

package/dist/router/index.cjs

@@ -438,7 +438,7 @@ var ControlMessageHandshakeResponseSchema = import_typebox2.Type.Object({
     }),
     import_typebox2.Type.Object({
       ok: import_typebox2.Type.Literal(false),
-      reason: import_typebox2.Type.Union([import_typebox2.Type.Literal("VERSION_MISMATCH")])
+      reason: import_typebox2.Type.String()
     })
   ])
 });
@@ -491,6 +491,9 @@ function Err(error) {
   };
 }
 
+// logging/index.ts
+var log;
+
 // router/client.ts
 var noop = () => {
 };
@@ -521,6 +524,11 @@ var createClient = (transport) => _createRecursiveProxy(async (opts) => {
     );
   }
   const [input] = opts.args;
+  log?.info(
+    `${transport.clientId} -- invoked ${procType}: ${serviceName}.${procName} with args: ${JSON.stringify(
+      input
+    )}`
+  );
   if (procType === "rpc") {
     return handleRpc(
       transport,
@@ -588,16 +596,12 @@ function handleRpc(transport, serverId, input, serviceName, procedureName) {
       transport.removeEventListener("sessionStatus", onSessionStatus);
     }
     function onMessage(msg) {
-      if (msg.streamId !== streamId) {
+      if (msg.streamId !== streamId)
         return;
-      }
-      if (msg.to !== transport.clientId) {
+      if (msg.to !== transport.clientId)
         return;
-      }
-      if (msg.streamId === streamId) {
-        cleanup();
-        resolve(msg.payload);
-      }
+      cleanup();
+      resolve(msg.payload);
     }
     transport.addEventListener("message", onMessage);
     transport.addEventListener("sessionStatus", onSessionStatus);
@@ -641,12 +645,10 @@ function handleStream(transport, serverId, init, serviceName, procedureName) {
   };
   void pipeInputToTransport();
   function onMessage(msg) {
-    if (msg.streamId !== streamId) {
+    if (msg.streamId !== streamId)
       return;
-    }
-    if (msg.to !== transport.clientId) {
+    if (msg.to !== transport.clientId)
       return;
-    }
     if (isStreamClose(msg.controlFlags)) {
       cleanup();
     } else {
@@ -685,12 +687,10 @@ function handleSubscribe(transport, serverId, input, serviceName, procedureName)
   let healthyClose = true;
   const outputStream = pushable({ objectMode: true });
   function onMessage(msg) {
-    if (msg.streamId !== streamId) {
+    if (msg.streamId !== streamId)
       return;
-    }
-    if (msg.to !== transport.clientId) {
+    if (msg.to !== transport.clientId)
       return;
-    }
     if (isStreamClose(msg.controlFlags)) {
       cleanup();
     } else {
@@ -774,13 +774,12 @@ function handleUpload(transport, serverId, init, serviceName, procedureName) {
       transport.removeEventListener("sessionStatus", onSessionStatus);
     }
     function onMessage(msg) {
-      if (msg.to !== transport.clientId) {
+      if (msg.streamId !== streamId)
         return;
-      }
-      if (msg.streamId === streamId) {
-        cleanup();
-        resolve(msg.payload);
-      }
+      if (msg.to !== transport.clientId)
+        return;
+      cleanup();
+      resolve(msg.payload);
     }
     transport.addEventListener("message", onMessage);
     transport.addEventListener("sessionStatus", onSessionStatus);
@@ -788,16 +787,13 @@ function handleUpload(transport, serverId, init, serviceName, procedureName) {
   return [inputStream, responsePromise];
 }
 
-// logging/index.ts
-var log;
-
 // router/server.ts
 var import_value = require("@sinclair/typebox/value");
 
 // util/stringify.ts
 function coerceErrorString(err) {
   if (err instanceof Error) {
-    return err.message;
+    return err.message || "unknown reason";
   }
   return `[coerced to error] ${String(err)}`;
 }
@@ -848,17 +844,15 @@ var RiverServer = class {
   };
   // cleanup streams on session close
   onSessionStatus = async (evt) => {
-    if (evt.status !== "disconnect") {
+    if (evt.status !== "disconnect")
       return;
-    }
     const disconnectedClientId = evt.session.to;
     log?.info(
       `${this.transport.clientId} -- got session disconnect from ${disconnectedClientId}, cleaning up streams`
     );
     const streamsFromThisClient = this.clientStreams.get(disconnectedClientId);
-    if (!streamsFromThisClient) {
+    if (!streamsFromThisClient)
       return;
-    }
     this.disconnectedSessions.add(disconnectedClientId);
     await Promise.all(
       Array.from(streamsFromThisClient).map(this.cleanupStream)
@@ -908,21 +902,36 @@ var RiverServer = class {
     const procedure = service.procedures[message.procedureName];
     const incoming = pushable({ objectMode: true });
     const outgoing = pushable({ objectMode: true });
+    const needsClose = procedure.type === "subscription" || procedure.type === "stream";
     const outputHandler = (
       // sending outgoing messages back to client
-      (async () => {
-        for await (const response of outgoing) {
-          this.transport.send(session.to, {
-            streamId: message.streamId,
-            controlFlags: 0,
-            payload: response
-          });
-        }
-        const needsClose = procedure.type === "subscription" || procedure.type === "stream";
-        if (needsClose && !this.disconnectedSessions.has(message.from)) {
-          this.transport.sendCloseStream(session.to, message.streamId);
-        }
-      })()
+      needsClose ? (
+        // subscription and stream case, we need to send a close bit after the response stream
+        (async () => {
+          for await (const response of outgoing) {
+            this.transport.send(session.to, {
+              streamId: message.streamId,
+              controlFlags: 0,
+              payload: response
+            });
+          }
+          if (!this.disconnectedSessions.has(message.from)) {
+            this.transport.sendCloseStream(session.to, message.streamId);
+          }
+        })()
+      ) : (
+        // rpc and upload case, we just send the response back with close bit
+        (async () => {
+          const response = await outgoing.next().then((res) => res.value);
+          if (response) {
+            this.transport.send(session.to, {
+              streamId: message.streamId,
+              controlFlags: 4 /* StreamClosedBit */,
+              payload: response
+            });
+          }
+        })()
+      )
     );
     const errorHandler = (err) => {
       const errorMsg = coerceErrorString(err);

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-169fbf7f.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-169fbf7f.js';
-import { S as ServerTransport, C as Connection, a as ClientTransport } from '../index-21c1b21d.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-eef3b061.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-eef3b061.js';
+import { S as ServerTransport, C as Connection, a as ClientTransport } from '../index-9aa0aabb.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-169fbf7f.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-169fbf7f.js';
-import { S as ServerTransport, C as Connection, a as ClientTransport } from '../index-21c1b21d.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-eef3b061.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-eef3b061.js';
+import { S as ServerTransport, C as Connection, a as ClientTransport } from '../index-9aa0aabb.js';
 import { Pushable } from 'it-pushable';
 import { Static } from '@sinclair/typebox';
 import '../types-3e5768ec.js';

package/dist/router/index.js

@@ -8,8 +8,8 @@ import {
   createClient,
   createServer,
   serializeService
-} from "../chunk-CBRQM65K.js";
-import "../chunk-MGGIUH5O.js";
+} from "../chunk-67M47YPQ.js";
+import "../chunk-GFRAOY75.js";
 import "../chunk-H4BYJELI.js";
 export {
   Err,

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

@@ -67,7 +67,7 @@ var ControlMessageHandshakeResponseSchema = import_typebox.Type.Object({
     }),
     import_typebox.Type.Object({
       ok: import_typebox.Type.Literal(false),
-      reason: import_typebox.Type.Union([import_typebox.Type.Literal("VERSION_MISMATCH")])
+      reason: import_typebox.Type.String()
     })
   ])
 });
@@ -492,7 +492,7 @@ var import_nanoid3 = require("nanoid");
 // util/stringify.ts
 function coerceErrorString(err) {
   if (err instanceof Error) {
-    return err.message;
+    return err.message || "unknown reason";
   }
   return `[coerced to error] ${String(err)}`;
 }
@@ -866,6 +866,9 @@ var ClientTransport = class extends Transport {
     } catch (error) {
       const errStr = coerceErrorString(error);
       this.inflightConnectionPromises.delete(to);
+      const shouldRetry = this.state === "open" && this.tryReconnecting;
+      if (!shouldRetry)
+        return;
       if (attempt >= this.options.retryAttemptsMax) {
         const errMsg = `connection to ${to} failed after ${attempt} attempts (${errStr}), giving up`;
         log?.error(`${this.clientId} -- ${errMsg}`);

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

@@ -1,5 +1,5 @@
-import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-21c1b21d.js';
-import { U as UdsConnection } from '../../../connection-dd789651.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-9aa0aabb.js';
+import { U as UdsConnection } from '../../../connection-03e650c8.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, b as TransportClientId, c as TransportOptions } from '../../../index-21c1b21d.js';
-import { U as UdsConnection } from '../../../connection-dd789651.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-9aa0aabb.js';
+import { U as UdsConnection } from '../../../connection-03e650c8.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:net';

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

@@ -1,10 +1,10 @@
 import {
   UdsConnection
-} from "../../../chunk-CDH7QSB4.js";
+} from "../../../chunk-23MWJLVJ.js";
 import {
   ClientTransport
-} from "../../../chunk-R2IMXRVU.js";
-import "../../../chunk-MGGIUH5O.js";
+} from "../../../chunk-NLWRMDT6.js";
+import "../../../chunk-GFRAOY75.js";
 import {
   log
 } from "../../../chunk-H4BYJELI.js";

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

@@ -66,7 +66,7 @@ var ControlMessageHandshakeResponseSchema = import_typebox.Type.Object({
     }),
     import_typebox.Type.Object({
       ok: import_typebox.Type.Literal(false),
-      reason: import_typebox.Type.Union([import_typebox.Type.Literal("VERSION_MISMATCH")])
+      reason: import_typebox.Type.String()
     })
   ])
 });
@@ -79,7 +79,7 @@ var ControlMessagePayloadSchema = import_typebox.Type.Union([
 var OpaqueTransportMessageSchema = TransportMessageSchema(
   import_typebox.Type.Unknown()
 );
-function handshakeResponseMessage(from, instanceId, to, ok) {
+function handshakeResponseMessage(from, instanceId, to, ok, reason) {
   return {
     id: (0, import_nanoid.nanoid)(),
     from,
@@ -98,7 +98,7 @@ function handshakeResponseMessage(from, instanceId, to, ok) {
       type: "HANDSHAKE_RESP",
       status: {
         ok: false,
-        reason: "VERSION_MISMATCH"
+        reason: reason ?? "Unknown reason"
       }
     }
   };
@@ -406,7 +406,7 @@ var import_nanoid3 = require("nanoid");
 // util/stringify.ts
 function coerceErrorString(err) {
   if (err instanceof Error) {
-    return err.message;
+    return err.message || "unknown reason";
   }
   return `[coerced to error] ${String(err)}`;
 }

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-21c1b21d.js';
-import { U as UdsConnection } from '../../../connection-dd789651.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-9aa0aabb.js';
+import { U as UdsConnection } from '../../../connection-03e650c8.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-21c1b21d.js';
-import { U as UdsConnection } from '../../../connection-dd789651.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-9aa0aabb.js';
+import { U as UdsConnection } from '../../../connection-03e650c8.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:stream';

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

@@ -1,10 +1,10 @@
 import {
   UdsConnection
-} from "../../../chunk-CDH7QSB4.js";
+} from "../../../chunk-23MWJLVJ.js";
 import {
   ServerTransport
-} from "../../../chunk-R2IMXRVU.js";
-import "../../../chunk-MGGIUH5O.js";
+} from "../../../chunk-NLWRMDT6.js";
+import "../../../chunk-GFRAOY75.js";
 import {
   log
 } from "../../../chunk-H4BYJELI.js";

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

@@ -63,7 +63,7 @@ var ControlMessageHandshakeResponseSchema = import_typebox.Type.Object({
     }),
     import_typebox.Type.Object({
       ok: import_typebox.Type.Literal(false),
-      reason: import_typebox.Type.Union([import_typebox.Type.Literal("VERSION_MISMATCH")])
+      reason: import_typebox.Type.String()
     })
   ])
 });
@@ -398,7 +398,7 @@ var import_nanoid3 = require("nanoid");
 // util/stringify.ts
 function coerceErrorString(err) {
   if (err instanceof Error) {
-    return err.message;
+    return err.message || "unknown reason";
   }
   return `[coerced to error] ${String(err)}`;
 }
@@ -772,6 +772,9 @@ var ClientTransport = class extends Transport {
     } catch (error) {
       const errStr = coerceErrorString(error);
       this.inflightConnectionPromises.delete(to);
+      const shouldRetry = this.state === "open" && this.tryReconnecting;
+      if (!shouldRetry)
+        return;
       if (attempt >= this.options.retryAttemptsMax) {
         const errMsg = `connection to ${to} failed after ${attempt} attempts (${errStr}), giving up`;
         log?.error(`${this.clientId} -- ${errMsg}`);
@@ -873,25 +876,18 @@ var WebSocketClientTransport = class extends ClientTransport {
           resolve({ err: "ws is closing or closed" });
           return;
         }
-        const onOpen = () => {
-          ws.removeEventListener("open", onOpen);
+        ws.onopen = () => {
           resolve({ ws });
         };
-        const onClose = (evt) => {
-          ws.removeEventListener("close", onClose);
+        ws.onclose = (evt) => {
           resolve({ err: evt.reason });
         };
-        const onError = (evt) => {
+        ws.onerror = (evt) => {
           const err = evt.error;
-          ws.removeEventListener("error", onError);
-          ws.removeEventListener("close", onClose);
           resolve({
             err: err?.code ?? "unexpected disconnect"
           });
         };
-        ws.addEventListener("open", onOpen);
-        ws.addEventListener("close", onClose);
-        ws.addEventListener("error", onError);
       }).catch((e) => {
         const reason = e instanceof Error ? e.message : "unknown reason";
         resolve({ err: `couldn't get a new websocket: ${reason}` });

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-21c1b21d.js';
-import { W as WebSocketConnection } from '../../../connection-ab681c08.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-9aa0aabb.js';
+import { W as WebSocketConnection } from '../../../connection-d052d027.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 TransportOptions } from '../../../index-21c1b21d.js';
-import { W as WebSocketConnection } from '../../../connection-ab681c08.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-9aa0aabb.js';
+import { W as WebSocketConnection } from '../../../connection-d052d027.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

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

@@ -1,10 +1,10 @@
 import {
   WebSocketConnection
-} from "../../../chunk-NPXAAD7M.js";
+} from "../../../chunk-3Y2K543F.js";
 import {
   ClientTransport
-} from "../../../chunk-R2IMXRVU.js";
-import "../../../chunk-MGGIUH5O.js";
+} from "../../../chunk-NLWRMDT6.js";
+import "../../../chunk-GFRAOY75.js";
 import {
   log
 } from "../../../chunk-H4BYJELI.js";
@@ -49,25 +49,18 @@ var WebSocketClientTransport = class extends ClientTransport {
           resolve({ err: "ws is closing or closed" });
           return;
         }
-        const onOpen = () => {
-          ws.removeEventListener("open", onOpen);
+        ws.onopen = () => {
           resolve({ ws });
         };
-        const onClose = (evt) => {
-          ws.removeEventListener("close", onClose);
+        ws.onclose = (evt) => {
           resolve({ err: evt.reason });
         };
-        const onError = (evt) => {
+        ws.onerror = (evt) => {
           const err = evt.error;
-          ws.removeEventListener("error", onError);
-          ws.removeEventListener("close", onClose);
           resolve({
             err: err?.code ?? "unexpected disconnect"
           });
         };
-        ws.addEventListener("open", onOpen);
-        ws.addEventListener("close", onClose);
-        ws.addEventListener("error", onError);
       }).catch((e) => {
         const reason = e instanceof Error ? e.message : "unknown reason";
         resolve({ err: `couldn't get a new websocket: ${reason}` });

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

@@ -66,7 +66,7 @@ var ControlMessageHandshakeResponseSchema = import_typebox.Type.Object({
     }),
     import_typebox.Type.Object({
       ok: import_typebox.Type.Literal(false),
-      reason: import_typebox.Type.Union([import_typebox.Type.Literal("VERSION_MISMATCH")])
+      reason: import_typebox.Type.String()
     })
   ])
 });
@@ -79,7 +79,7 @@ var ControlMessagePayloadSchema = import_typebox.Type.Union([
 var OpaqueTransportMessageSchema = TransportMessageSchema(
   import_typebox.Type.Unknown()
 );
-function handshakeResponseMessage(from, instanceId, to, ok) {
+function handshakeResponseMessage(from, instanceId, to, ok, reason) {
   return {
     id: (0, import_nanoid.nanoid)(),
     from,
@@ -98,7 +98,7 @@ function handshakeResponseMessage(from, instanceId, to, ok) {
       type: "HANDSHAKE_RESP",
       status: {
         ok: false,
-        reason: "VERSION_MISMATCH"
+        reason: reason ?? "Unknown reason"
       }
     }
   };
@@ -406,7 +406,7 @@ var import_nanoid3 = require("nanoid");
 // util/stringify.ts
 function coerceErrorString(err) {
   if (err instanceof Error) {
-    return err.message;
+    return err.message || "unknown reason";
   }
   return `[coerced to error] ${String(err)}`;
 }

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

@@ -1,7 +1,7 @@
-import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-21c1b21d.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-9aa0aabb.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-ab681c08.js';
+import { W as WebSocketConnection } from '../../../connection-d052d027.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-21c1b21d.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-9aa0aabb.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-ab681c08.js';
+import { W as WebSocketConnection } from '../../../connection-d052d027.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

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

@@ -1,10 +1,10 @@
 import {
   WebSocketConnection
-} from "../../../chunk-NPXAAD7M.js";
+} from "../../../chunk-3Y2K543F.js";
 import {
   ServerTransport
-} from "../../../chunk-R2IMXRVU.js";
-import "../../../chunk-MGGIUH5O.js";
+} from "../../../chunk-NLWRMDT6.js";
+import "../../../chunk-GFRAOY75.js";
 import {
   log
 } from "../../../chunk-H4BYJELI.js";

package/dist/transport/index.cjs

@@ -69,7 +69,7 @@ var ControlMessageHandshakeResponseSchema = import_typebox.Type.Object({
     }),
     import_typebox.Type.Object({
       ok: import_typebox.Type.Literal(false),
-      reason: import_typebox.Type.Union([import_typebox.Type.Literal("VERSION_MISMATCH")])
+      reason: import_typebox.Type.String()
     })
   ])
 });
@@ -98,7 +98,7 @@ function handshakeRequestMessage(from, to, instanceId) {
     }
   };
 }
-function handshakeResponseMessage(from, instanceId, to, ok) {
+function handshakeResponseMessage(from, instanceId, to, ok, reason) {
   return {
     id: (0, import_nanoid.nanoid)(),
     from,
@@ -117,7 +117,7 @@ function handshakeResponseMessage(from, instanceId, to, ok) {
       type: "HANDSHAKE_RESP",
       status: {
         ok: false,
-        reason: "VERSION_MISMATCH"
+        reason: reason ?? "Unknown reason"
       }
     }
   };
@@ -428,7 +428,7 @@ var import_nanoid3 = require("nanoid");
 // util/stringify.ts
 function coerceErrorString(err) {
   if (err instanceof Error) {
-    return err.message;
+    return err.message || "unknown reason";
   }
   return `[coerced to error] ${String(err)}`;
 }
@@ -802,6 +802,9 @@ var ClientTransport = class extends Transport {
     } catch (error) {
       const errStr = coerceErrorString(error);
       this.inflightConnectionPromises.delete(to);
+      const shouldRetry = this.state === "open" && this.tryReconnecting;
+      if (!shouldRetry)
+        return;
       if (attempt >= this.options.retryAttemptsMax) {
         const errMsg = `connection to ${to} failed after ${attempt} attempts (${errStr}), giving up`;
         log?.error(`${this.clientId} -- ${errMsg}`);

package/dist/transport/index.d.cts

@@ -1,3 +1,3 @@
-export { a as ClientTransport, C as Connection, k as EventHandler, E as EventMap, j as EventTypes, O as OpaqueTransportMessage, f as OpaqueTransportMessageSchema, S as ServerTransport, d as Session, T as Transport, b as TransportClientId, g as TransportMessage, e as TransportMessageSchema, h as isStreamClose, i as isStreamOpen } from '../index-21c1b21d.js';
+export { a as ClientTransport, C as Connection, k as EventHandler, E as EventMap, j as EventTypes, O as OpaqueTransportMessage, f as OpaqueTransportMessageSchema, S as ServerTransport, d as Session, T as Transport, b as TransportClientId, g as TransportMessage, e as TransportMessageSchema, h as isStreamClose, i as isStreamOpen } from '../index-9aa0aabb.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, k as EventHandler, E as EventMap, j as EventTypes, O as OpaqueTransportMessage, f as OpaqueTransportMessageSchema, S as ServerTransport, d as Session, T as Transport, b as TransportClientId, g as TransportMessage, e as TransportMessageSchema, h as isStreamClose, i as isStreamOpen } from '../index-21c1b21d.js';
+export { a as ClientTransport, C as Connection, k as EventHandler, E as EventMap, j as EventTypes, O as OpaqueTransportMessage, f as OpaqueTransportMessageSchema, S as ServerTransport, d as Session, T as Transport, b as TransportClientId, g as TransportMessage, e as TransportMessageSchema, h as isStreamClose, i as isStreamOpen } from '../index-9aa0aabb.js';
 import '../types-3e5768ec.js';
 import '@sinclair/typebox';

package/dist/transport/index.js

@@ -5,11 +5,11 @@ import {
   ServerTransport,
   Session,
   Transport
-} from "../chunk-R2IMXRVU.js";
+} from "../chunk-NLWRMDT6.js";
 import {
   OpaqueTransportMessageSchema,
   TransportMessageSchema
-} from "../chunk-MGGIUH5O.js";
+} from "../chunk-GFRAOY75.js";
 import "../chunk-H4BYJELI.js";
 import "../chunk-GZ7HCLLM.js";
 export {

package/dist/util/testHelpers.cjs

@@ -313,7 +313,7 @@ var Session = class {
 // util/stringify.ts
 function coerceErrorString(err) {
   if (err instanceof Error) {
-    return err.message;
+    return err.message || "unknown reason";
   }
   return `[coerced to error] ${String(err)}`;
 }

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-21c1b21d.js';
-import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-169fbf7f.js';
+import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-9aa0aabb.js';
+import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-eef3b061.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-21c1b21d.js';
-import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-169fbf7f.js';
+import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-9aa0aabb.js';
+import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-eef3b061.js';
 import { Static } from '@sinclair/typebox';
 import net from 'node:net';
 import '../types-3e5768ec.js';

package/dist/util/testHelpers.js

@@ -1,15 +1,15 @@
 import {
   UNCAUGHT_ERROR,
   pushable
-} from "../chunk-CBRQM65K.js";
+} from "../chunk-67M47YPQ.js";
 import "../chunk-5IZ2UHWV.js";
 import {
   Session,
   defaultSessionOptions
-} from "../chunk-R2IMXRVU.js";
+} from "../chunk-NLWRMDT6.js";
 import {
   coerceErrorString
-} from "../chunk-MGGIUH5O.js";
+} from "../chunk-GFRAOY75.js";
 import "../chunk-H4BYJELI.js";
 import "../chunk-GZ7HCLLM.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.0",
+  "version": "0.13.2",
   "type": "module",
   "exports": {
     ".": {