@replit/river 0.14.0 → 0.15.0

package/README.md

@@ -25,9 +25,6 @@ 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

package/dist/{builder-0547e840.d.ts → builder-ca6c4259.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-d1452d8f.js';
+import { b as TransportClientId, d as Session, C as Connection } from './index-f922ec84.js';
 
 /**
  * The context for services/procedures. This is used only on
@@ -173,7 +173,7 @@ type Procedure<State, Ty extends ValidProcType, I extends PayloadType, O extends
     input: I;
     output: O;
     errors: E;
-    handler: (context: ServiceContextWithTransportInfo<State>, input: Static<I>, output: Pushable<Result<Static<O>, Static<E>>>) => Promise<void>;
+    handler: (context: ServiceContextWithTransportInfo<State>, input: Static<I>, output: Pushable<Result<Static<O>, Static<E>>>) => Promise<(() => void) | void>;
     type: Ty;
 } : never : Ty extends 'stream' ? Init extends PayloadType ? {
     init: Init;

package/dist/{chunk-ZD5NJJXR.js → chunk-BSAIT634.js}

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

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

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

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

@@ -16,6 +16,12 @@ import {
 } from "./chunk-GZ7HCLLM.js";
 
 // transport/events.ts
+var ProtocolErrorType = /* @__PURE__ */ ((ProtocolErrorType2) => {
+  ProtocolErrorType2["RetriesExceeded"] = "conn_retry_exceeded";
+  ProtocolErrorType2["HandshakeFailed"] = "handshake_failed";
+  ProtocolErrorType2["UseAfterDestroy"] = "use_after_destroy";
+  return ProtocolErrorType2;
+})(ProtocolErrorType || {});
 var EventDispatcher = class {
   eventListeners = {};
   numberOfListeners(eventType) {
@@ -469,7 +475,8 @@ var Transport = class {
     if (this.state === "destroyed") {
       const err = "transport is destroyed, cant send";
       log?.error(`${this.clientId} -- ` + err + `: ${JSON.stringify(msg)}`);
-      throw new Error(err);
+      this.protocolError("use_after_destroy" /* UseAfterDestroy */, err);
+      return void 0;
     } else if (this.state === "closed") {
       log?.info(
         `${this.clientId} -- transport closed when sending, discarding : ${JSON.stringify(
@@ -497,6 +504,9 @@ var Transport = class {
       }
     });
   }
+  protocolError(type, message) {
+    this.eventDispatcher.dispatchEvent("protocolError", { type, message });
+  }
   /**
    * Default close implementation for transports. You should override this in the downstream
    * implementation if you need to do any additional cleanup and call super.close() at the end.
@@ -573,14 +583,23 @@ var ClientTransport = class extends Transport {
   }
   receiveHandshakeResponseMessage(data) {
     const parsed = this.parseMsg(data);
-    if (!parsed)
+    if (!parsed) {
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        "received non-transport message"
+      );
       return false;
+    }
     if (!Value.Check(ControlMessageHandshakeResponseSchema, parsed.payload)) {
       log?.warn(
         `${this.clientId} -- received invalid handshake resp: ${JSON.stringify(
           parsed
         )}`
       );
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        "invalid handshake resp"
+      );
       return false;
     }
     if (!parsed.payload.status.ok) {
@@ -589,6 +608,10 @@ var ClientTransport = class extends Transport {
           parsed
         )}`
       );
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        parsed.payload.status.reason
+      );
       return false;
     }
     const instanceId = parsed.payload.status.instanceId;
@@ -627,7 +650,8 @@ var ClientTransport = class extends Transport {
       if (attempt >= this.options.retryAttemptsMax) {
         const errMsg = `connection to ${to} failed after ${attempt} attempts (${errStr}), giving up`;
         log?.error(`${this.clientId} -- ${errMsg}`);
-        throw new Error(errMsg);
+        this.protocolError("conn_retry_exceeded" /* RetriesExceeded */, errMsg);
+        return;
       } else {
         const jitter = Math.floor(Math.random() * this.options.retryJitterMs);
         const backoffMs = this.options.retryIntervalMs * 2 ** attempt + jitter;
@@ -703,8 +727,13 @@ var ServerTransport = class extends Transport {
   }
   receiveHandshakeRequestMessage(data, conn) {
     const parsed = this.parseMsg(data);
-    if (!parsed)
+    if (!parsed) {
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        "received non-transport message"
+      );
       return false;
+    }
     if (!Value.Check(ControlMessageHandshakeRequestSchema, parsed.payload)) {
       const responseMsg2 = handshakeResponseMessage(
         this.clientId,
@@ -718,6 +747,10 @@ var ServerTransport = class extends Transport {
           parsed
         )}`
       );
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        "invalid handshake request"
+      );
       return false;
     }
     const gotVersion = parsed.payload.protocolVersion;
@@ -732,6 +765,10 @@ var ServerTransport = class extends Transport {
       log?.warn(
         `${this.clientId} -- received handshake msg with incompatible protocol version (got: ${gotVersion}, expected: ${PROTOCOL_VERSION})`
       );
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        `incorrect version (got: ${gotVersion} wanted ${PROTOCOL_VERSION})`
+      );
       return false;
     }
     const instanceId = parsed.payload.instanceId;
@@ -750,6 +787,7 @@ var ServerTransport = class extends Transport {
 };
 
 export {
+  ProtocolErrorType,
   Connection,
   defaultSessionOptions,
   Session,

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

@@ -812,6 +812,7 @@ var RiverServer = class {
     const incoming = pushable({ objectMode: true });
     const outgoing = pushable({ objectMode: true });
     const needsClose = procedure.type === "subscription" || procedure.type === "stream";
+    const disposables = [];
     const outputHandler = (
       // sending outgoing messages back to client
       needsClose ? (
@@ -827,6 +828,7 @@ var RiverServer = class {
           if (!this.disconnectedSessions.has(message.from)) {
             this.transport.sendCloseStream(session.to, message.streamId);
           }
+          disposables.forEach((d) => d());
         })()
       ) : (
         // rpc and upload case, we just send the response back with close bit
@@ -838,6 +840,7 @@ var RiverServer = class {
               controlFlags: 4 /* StreamClosedBit */,
               payload: response
             });
+            disposables.forEach((d) => d());
           }
         })()
       )
@@ -906,11 +909,14 @@ var RiverServer = class {
             return;
           }
           try {
-            await procedure.handler(
+            const dispose = await procedure.handler(
               serviceContextWithTransportInfo,
               inputMessage.value,
               outgoing
             );
+            if (dispose) {
+              disposables.push(dispose);
+            }
           } catch (err) {
             errorHandler(err);
           }

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

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

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

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

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

@@ -205,6 +205,11 @@ declare class Session<ConnType extends Connection> {
 }
 
 type ConnectionStatus = 'connect' | 'disconnect';
+declare const enum ProtocolErrorType {
+    RetriesExceeded = "conn_retry_exceeded",
+    HandshakeFailed = "handshake_failed",
+    UseAfterDestroy = "use_after_destroy"
+}
 interface EventMap {
     message: OpaqueTransportMessage;
     connectionStatus: {
@@ -215,6 +220,10 @@ interface EventMap {
         status: ConnectionStatus;
         session: Session<Connection>;
     };
+    protocolError: {
+        type: ProtocolErrorType;
+        message: string;
+    };
 }
 type EventTypes = keyof EventMap;
 type EventHandler<K extends EventTypes> = (event: EventMap[K]) => unknown;
@@ -367,6 +376,7 @@ declare abstract class Transport<ConnType extends Connection> {
      */
     send(to: TransportClientId, msg: PartialTransportMessage): string | undefined;
     sendCloseStream(to: TransportClientId, streamId: string): string | undefined;
+    protected protocolError(type: ProtocolErrorType, message: string): void;
     /**
      * Default close implementation for transports. You should override this in the downstream
      * implementation if you need to do any additional cleanup and call super.close() at the end.
@@ -418,4 +428,4 @@ declare abstract class ServerTransport<ConnType extends Connection> extends Tran
     };
 }
 
-export { Connection as C, EventMap as E, OpaqueTransportMessage as O, PartialTransportMessage as P, ServerTransport as S, Transport as T, ClientTransport as a, TransportClientId as b, TransportOptions as c, Session as d, TransportStatus as e, TransportMessageSchema as f, OpaqueTransportMessageSchema as g, TransportMessage as h, isStreamOpen as i, isStreamClose as j, EventTypes as k, EventHandler as l };
+export { Connection as C, EventMap as E, OpaqueTransportMessage as O, PartialTransportMessage as P, ServerTransport as S, Transport as T, ClientTransport as a, TransportClientId as b, TransportOptions as c, Session as d, TransportStatus as e, TransportMessageSchema as f, OpaqueTransportMessageSchema as g, TransportMessage as h, isStreamOpen as i, isStreamClose as j, EventTypes as k, EventHandler as l, ProtocolErrorType as m };

package/dist/router/index.cjs

@@ -908,6 +908,7 @@ var RiverServer = class {
     const incoming = pushable({ objectMode: true });
     const outgoing = pushable({ objectMode: true });
     const needsClose = procedure.type === "subscription" || procedure.type === "stream";
+    const disposables = [];
     const outputHandler = (
       // sending outgoing messages back to client
       needsClose ? (
@@ -923,6 +924,7 @@ var RiverServer = class {
           if (!this.disconnectedSessions.has(message.from)) {
             this.transport.sendCloseStream(session.to, message.streamId);
           }
+          disposables.forEach((d) => d());
         })()
       ) : (
         // rpc and upload case, we just send the response back with close bit
@@ -934,6 +936,7 @@ var RiverServer = class {
               controlFlags: 4 /* StreamClosedBit */,
               payload: response
             });
+            disposables.forEach((d) => d());
           }
         })()
       )
@@ -1002,11 +1005,14 @@ var RiverServer = class {
             return;
           }
           try {
-            await procedure.handler(
+            const dispose = await procedure.handler(
               serviceContextWithTransportInfo,
               inputMessage.value,
               outgoing
             );
+            if (dispose) {
+              disposables.push(dispose);
+            }
           } catch (err) {
             errorHandler(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-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 { 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-ca6c4259.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-ca6c4259.js';
+import { S as ServerTransport, C as Connection, a as ClientTransport, b as TransportClientId } from '../index-f922ec84.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-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 { 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-ca6c4259.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-ca6c4259.js';
+import { S as ServerTransport, C as Connection, a as ClientTransport, b as TransportClientId } from '../index-f922ec84.js';
 import { Pushable } from 'it-pushable';
 import { Static } from '@sinclair/typebox';
 import '../types-3e5768ec.js';

package/dist/router/index.js

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

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

@@ -710,7 +710,8 @@ var Transport = class {
     if (this.state === "destroyed") {
       const err = "transport is destroyed, cant send";
       log?.error(`${this.clientId} -- ` + err + `: ${JSON.stringify(msg)}`);
-      throw new Error(err);
+      this.protocolError("use_after_destroy" /* UseAfterDestroy */, err);
+      return void 0;
     } else if (this.state === "closed") {
       log?.info(
         `${this.clientId} -- transport closed when sending, discarding : ${JSON.stringify(
@@ -738,6 +739,9 @@ var Transport = class {
       }
     });
   }
+  protocolError(type, message) {
+    this.eventDispatcher.dispatchEvent("protocolError", { type, message });
+  }
   /**
    * Default close implementation for transports. You should override this in the downstream
    * implementation if you need to do any additional cleanup and call super.close() at the end.
@@ -814,14 +818,23 @@ var ClientTransport = class extends Transport {
   }
   receiveHandshakeResponseMessage(data) {
     const parsed = this.parseMsg(data);
-    if (!parsed)
+    if (!parsed) {
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        "received non-transport message"
+      );
       return false;
+    }
     if (!import_value.Value.Check(ControlMessageHandshakeResponseSchema, parsed.payload)) {
       log?.warn(
         `${this.clientId} -- received invalid handshake resp: ${JSON.stringify(
           parsed
         )}`
       );
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        "invalid handshake resp"
+      );
       return false;
     }
     if (!parsed.payload.status.ok) {
@@ -830,6 +843,10 @@ var ClientTransport = class extends Transport {
           parsed
         )}`
       );
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        parsed.payload.status.reason
+      );
       return false;
     }
     const instanceId = parsed.payload.status.instanceId;
@@ -868,7 +885,8 @@ var ClientTransport = class extends Transport {
       if (attempt >= this.options.retryAttemptsMax) {
         const errMsg = `connection to ${to} failed after ${attempt} attempts (${errStr}), giving up`;
         log?.error(`${this.clientId} -- ${errMsg}`);
-        throw new Error(errMsg);
+        this.protocolError("conn_retry_exceeded" /* RetriesExceeded */, errMsg);
+        return;
       } else {
         const jitter = Math.floor(Math.random() * this.options.retryJitterMs);
         const backoffMs = this.options.retryIntervalMs * 2 ** attempt + jitter;

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

@@ -1,5 +1,5 @@
-import { a as ClientTransport, c as TransportOptions, b as TransportClientId } from '../../../index-d1452d8f.js';
-import { U as UdsConnection } from '../../../connection-6c569569.js';
+import { a as ClientTransport, c as TransportOptions, b as TransportClientId } from '../../../index-f922ec84.js';
+import { U as UdsConnection } from '../../../connection-0c5eeb14.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 TransportOptions, b as TransportClientId } from '../../../index-d1452d8f.js';
-import { U as UdsConnection } from '../../../connection-6c569569.js';
+import { a as ClientTransport, c as TransportOptions, b as TransportClientId } from '../../../index-f922ec84.js';
+import { U as UdsConnection } from '../../../connection-0c5eeb14.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-ZD5NJJXR.js";
+} from "../../../chunk-BSAIT634.js";
 import {
   ClientTransport
-} from "../../../chunk-NJ25LQPI.js";
+} from "../../../chunk-IVNV5HBI.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log

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

@@ -624,7 +624,8 @@ var Transport = class {
     if (this.state === "destroyed") {
       const err = "transport is destroyed, cant send";
       log?.error(`${this.clientId} -- ` + err + `: ${JSON.stringify(msg)}`);
-      throw new Error(err);
+      this.protocolError("use_after_destroy" /* UseAfterDestroy */, err);
+      return void 0;
     } else if (this.state === "closed") {
       log?.info(
         `${this.clientId} -- transport closed when sending, discarding : ${JSON.stringify(
@@ -652,6 +653,9 @@ var Transport = class {
       }
     });
   }
+  protocolError(type, message) {
+    this.eventDispatcher.dispatchEvent("protocolError", { type, message });
+  }
   /**
    * Default close implementation for transports. You should override this in the downstream
    * implementation if you need to do any additional cleanup and call super.close() at the end.
@@ -730,8 +734,13 @@ var ServerTransport = class extends Transport {
   }
   receiveHandshakeRequestMessage(data, conn) {
     const parsed = this.parseMsg(data);
-    if (!parsed)
+    if (!parsed) {
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        "received non-transport message"
+      );
       return false;
+    }
     if (!import_value.Value.Check(ControlMessageHandshakeRequestSchema, parsed.payload)) {
       const responseMsg2 = handshakeResponseMessage(
         this.clientId,
@@ -745,6 +754,10 @@ var ServerTransport = class extends Transport {
           parsed
         )}`
       );
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        "invalid handshake request"
+      );
       return false;
     }
     const gotVersion = parsed.payload.protocolVersion;
@@ -759,6 +772,10 @@ var ServerTransport = class extends Transport {
       log?.warn(
         `${this.clientId} -- received handshake msg with incompatible protocol version (got: ${gotVersion}, expected: ${PROTOCOL_VERSION})`
       );
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        `incorrect version (got: ${gotVersion} wanted ${PROTOCOL_VERSION})`
+      );
       return false;
     }
     const instanceId = parsed.payload.instanceId;

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-d1452d8f.js';
-import { U as UdsConnection } from '../../../connection-6c569569.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-f922ec84.js';
+import { U as UdsConnection } from '../../../connection-0c5eeb14.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-d1452d8f.js';
-import { U as UdsConnection } from '../../../connection-6c569569.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-f922ec84.js';
+import { U as UdsConnection } from '../../../connection-0c5eeb14.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-ZD5NJJXR.js";
+} from "../../../chunk-BSAIT634.js";
 import {
   ServerTransport
-} from "../../../chunk-NJ25LQPI.js";
+} from "../../../chunk-IVNV5HBI.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log

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

@@ -616,7 +616,8 @@ var Transport = class {
     if (this.state === "destroyed") {
       const err = "transport is destroyed, cant send";
       log?.error(`${this.clientId} -- ` + err + `: ${JSON.stringify(msg)}`);
-      throw new Error(err);
+      this.protocolError("use_after_destroy" /* UseAfterDestroy */, err);
+      return void 0;
     } else if (this.state === "closed") {
       log?.info(
         `${this.clientId} -- transport closed when sending, discarding : ${JSON.stringify(
@@ -644,6 +645,9 @@ var Transport = class {
       }
     });
   }
+  protocolError(type, message) {
+    this.eventDispatcher.dispatchEvent("protocolError", { type, message });
+  }
   /**
    * Default close implementation for transports. You should override this in the downstream
    * implementation if you need to do any additional cleanup and call super.close() at the end.
@@ -720,14 +724,23 @@ var ClientTransport = class extends Transport {
   }
   receiveHandshakeResponseMessage(data) {
     const parsed = this.parseMsg(data);
-    if (!parsed)
+    if (!parsed) {
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        "received non-transport message"
+      );
       return false;
+    }
     if (!import_value.Value.Check(ControlMessageHandshakeResponseSchema, parsed.payload)) {
       log?.warn(
         `${this.clientId} -- received invalid handshake resp: ${JSON.stringify(
           parsed
         )}`
       );
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        "invalid handshake resp"
+      );
       return false;
     }
     if (!parsed.payload.status.ok) {
@@ -736,6 +749,10 @@ var ClientTransport = class extends Transport {
           parsed
         )}`
       );
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        parsed.payload.status.reason
+      );
       return false;
     }
     const instanceId = parsed.payload.status.instanceId;
@@ -774,7 +791,8 @@ var ClientTransport = class extends Transport {
       if (attempt >= this.options.retryAttemptsMax) {
         const errMsg = `connection to ${to} failed after ${attempt} attempts (${errStr}), giving up`;
         log?.error(`${this.clientId} -- ${errMsg}`);
-        throw new Error(errMsg);
+        this.protocolError("conn_retry_exceeded" /* RetriesExceeded */, errMsg);
+        return;
       } else {
         const jitter = Math.floor(Math.random() * this.options.retryJitterMs);
         const backoffMs = this.options.retryIntervalMs * 2 ** attempt + jitter;

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-d1452d8f.js';
-import { W as WebSocketConnection } from '../../../connection-ec72fdb0.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-f922ec84.js';
+import { W as WebSocketConnection } from '../../../connection-14675d77.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-d1452d8f.js';
-import { W as WebSocketConnection } from '../../../connection-ec72fdb0.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-f922ec84.js';
+import { W as WebSocketConnection } from '../../../connection-14675d77.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

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

@@ -1,9 +1,9 @@
 import {
   WebSocketConnection
-} from "../../../chunk-WYUFVZC3.js";
+} from "../../../chunk-FFT7PSUV.js";
 import {
   ClientTransport
-} from "../../../chunk-NJ25LQPI.js";
+} from "../../../chunk-IVNV5HBI.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log

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

@@ -624,7 +624,8 @@ var Transport = class {
     if (this.state === "destroyed") {
       const err = "transport is destroyed, cant send";
       log?.error(`${this.clientId} -- ` + err + `: ${JSON.stringify(msg)}`);
-      throw new Error(err);
+      this.protocolError("use_after_destroy" /* UseAfterDestroy */, err);
+      return void 0;
     } else if (this.state === "closed") {
       log?.info(
         `${this.clientId} -- transport closed when sending, discarding : ${JSON.stringify(
@@ -652,6 +653,9 @@ var Transport = class {
       }
     });
   }
+  protocolError(type, message) {
+    this.eventDispatcher.dispatchEvent("protocolError", { type, message });
+  }
   /**
    * Default close implementation for transports. You should override this in the downstream
    * implementation if you need to do any additional cleanup and call super.close() at the end.
@@ -730,8 +734,13 @@ var ServerTransport = class extends Transport {
   }
   receiveHandshakeRequestMessage(data, conn) {
     const parsed = this.parseMsg(data);
-    if (!parsed)
+    if (!parsed) {
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        "received non-transport message"
+      );
       return false;
+    }
     if (!import_value.Value.Check(ControlMessageHandshakeRequestSchema, parsed.payload)) {
       const responseMsg2 = handshakeResponseMessage(
         this.clientId,
@@ -745,6 +754,10 @@ var ServerTransport = class extends Transport {
           parsed
         )}`
       );
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        "invalid handshake request"
+      );
       return false;
     }
     const gotVersion = parsed.payload.protocolVersion;
@@ -759,6 +772,10 @@ var ServerTransport = class extends Transport {
       log?.warn(
         `${this.clientId} -- received handshake msg with incompatible protocol version (got: ${gotVersion}, expected: ${PROTOCOL_VERSION})`
       );
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        `incorrect version (got: ${gotVersion} wanted ${PROTOCOL_VERSION})`
+      );
       return false;
     }
     const instanceId = parsed.payload.instanceId;

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

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

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

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

package/dist/transport/index.cjs

@@ -23,6 +23,7 @@ __export(transport_exports, {
   ClientTransport: () => ClientTransport,
   Connection: () => Connection,
   OpaqueTransportMessageSchema: () => OpaqueTransportMessageSchema,
+  ProtocolErrorType: () => ProtocolErrorType,
   ServerTransport: () => ServerTransport,
   Session: () => Session,
   Transport: () => Transport,
@@ -130,6 +131,12 @@ function isAck(controlFlag) {
 var log;
 
 // transport/events.ts
+var ProtocolErrorType = /* @__PURE__ */ ((ProtocolErrorType2) => {
+  ProtocolErrorType2["RetriesExceeded"] = "conn_retry_exceeded";
+  ProtocolErrorType2["HandshakeFailed"] = "handshake_failed";
+  ProtocolErrorType2["UseAfterDestroy"] = "use_after_destroy";
+  return ProtocolErrorType2;
+})(ProtocolErrorType || {});
 var EventDispatcher = class {
   eventListeners = {};
   numberOfListeners(eventType) {
@@ -646,7 +653,8 @@ var Transport = class {
     if (this.state === "destroyed") {
       const err = "transport is destroyed, cant send";
       log?.error(`${this.clientId} -- ` + err + `: ${JSON.stringify(msg)}`);
-      throw new Error(err);
+      this.protocolError("use_after_destroy" /* UseAfterDestroy */, err);
+      return void 0;
     } else if (this.state === "closed") {
       log?.info(
         `${this.clientId} -- transport closed when sending, discarding : ${JSON.stringify(
@@ -674,6 +682,9 @@ var Transport = class {
       }
     });
   }
+  protocolError(type, message) {
+    this.eventDispatcher.dispatchEvent("protocolError", { type, message });
+  }
   /**
    * Default close implementation for transports. You should override this in the downstream
    * implementation if you need to do any additional cleanup and call super.close() at the end.
@@ -750,14 +761,23 @@ var ClientTransport = class extends Transport {
   }
   receiveHandshakeResponseMessage(data) {
     const parsed = this.parseMsg(data);
-    if (!parsed)
+    if (!parsed) {
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        "received non-transport message"
+      );
       return false;
+    }
     if (!import_value.Value.Check(ControlMessageHandshakeResponseSchema, parsed.payload)) {
       log?.warn(
         `${this.clientId} -- received invalid handshake resp: ${JSON.stringify(
           parsed
         )}`
       );
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        "invalid handshake resp"
+      );
       return false;
     }
     if (!parsed.payload.status.ok) {
@@ -766,6 +786,10 @@ var ClientTransport = class extends Transport {
           parsed
         )}`
       );
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        parsed.payload.status.reason
+      );
       return false;
     }
     const instanceId = parsed.payload.status.instanceId;
@@ -804,7 +828,8 @@ var ClientTransport = class extends Transport {
       if (attempt >= this.options.retryAttemptsMax) {
         const errMsg = `connection to ${to} failed after ${attempt} attempts (${errStr}), giving up`;
         log?.error(`${this.clientId} -- ${errMsg}`);
-        throw new Error(errMsg);
+        this.protocolError("conn_retry_exceeded" /* RetriesExceeded */, errMsg);
+        return;
       } else {
         const jitter = Math.floor(Math.random() * this.options.retryJitterMs);
         const backoffMs = this.options.retryIntervalMs * 2 ** attempt + jitter;
@@ -880,8 +905,13 @@ var ServerTransport = class extends Transport {
   }
   receiveHandshakeRequestMessage(data, conn) {
     const parsed = this.parseMsg(data);
-    if (!parsed)
+    if (!parsed) {
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        "received non-transport message"
+      );
       return false;
+    }
     if (!import_value.Value.Check(ControlMessageHandshakeRequestSchema, parsed.payload)) {
       const responseMsg2 = handshakeResponseMessage(
         this.clientId,
@@ -895,6 +925,10 @@ var ServerTransport = class extends Transport {
           parsed
         )}`
       );
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        "invalid handshake request"
+      );
       return false;
     }
     const gotVersion = parsed.payload.protocolVersion;
@@ -909,6 +943,10 @@ var ServerTransport = class extends Transport {
       log?.warn(
         `${this.clientId} -- received handshake msg with incompatible protocol version (got: ${gotVersion}, expected: ${PROTOCOL_VERSION})`
       );
+      this.protocolError(
+        "handshake_failed" /* HandshakeFailed */,
+        `incorrect version (got: ${gotVersion} wanted ${PROTOCOL_VERSION})`
+      );
       return false;
     }
     const instanceId = parsed.payload.instanceId;
@@ -930,6 +968,7 @@ var ServerTransport = class extends Transport {
   ClientTransport,
   Connection,
   OpaqueTransportMessageSchema,
+  ProtocolErrorType,
   ServerTransport,
   Session,
   Transport,

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-d1452d8f.js';
+export { a as ClientTransport, C as Connection, l as EventHandler, E as EventMap, k as EventTypes, O as OpaqueTransportMessage, g as OpaqueTransportMessageSchema, m as ProtocolErrorType, 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-f922ec84.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-d1452d8f.js';
+export { a as ClientTransport, C as Connection, l as EventHandler, E as EventMap, k as EventTypes, O as OpaqueTransportMessage, g as OpaqueTransportMessageSchema, m as ProtocolErrorType, 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-f922ec84.js';
 import '../types-3e5768ec.js';
 import '@sinclair/typebox';

package/dist/transport/index.js

@@ -1,11 +1,12 @@
-import "../chunk-5IZ2UHWV.js";
+import "../chunk-RPIDSIQG.js";
 import {
   ClientTransport,
   Connection,
+  ProtocolErrorType,
   ServerTransport,
   Session,
   Transport
-} from "../chunk-NJ25LQPI.js";
+} from "../chunk-IVNV5HBI.js";
 import {
   OpaqueTransportMessageSchema,
   TransportMessageSchema
@@ -16,6 +17,7 @@ export {
   ClientTransport,
   Connection,
   OpaqueTransportMessageSchema,
+  ProtocolErrorType,
   ServerTransport,
   Session,
   Transport,

package/dist/util/testHelpers.cjs

@@ -656,6 +656,7 @@ async function waitForMessage(t, filter, rejectMismatch) {
         cleanup();
         resolve(msg.payload);
       } else if (rejectMismatch) {
+        cleanup();
         reject(new Error("message didnt match the filter"));
       }
     }

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-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 { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-f922ec84.js';
+import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-ca6c4259.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-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 { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-f922ec84.js';
+import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-ca6c4259.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-TVRCTAL2.js";
-import "../chunk-5IZ2UHWV.js";
+} from "../chunk-KWXQLQAF.js";
+import "../chunk-RPIDSIQG.js";
 import {
   Session,
   defaultSessionOptions
-} from "../chunk-NJ25LQPI.js";
+} from "../chunk-IVNV5HBI.js";
 import {
   coerceErrorString
 } from "../chunk-GFRAOY75.js";
@@ -68,6 +68,7 @@ async function waitForMessage(t, filter, rejectMismatch) {
         cleanup();
         resolve(msg.payload);
       } else if (rejectMismatch) {
+        cleanup();
         reject(new Error("message didnt match the filter"));
       }
     }

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.14.0",
+  "version": "0.15.0",
   "type": "module",
   "exports": {
     ".": {