@replit/river 0.18.0 → 0.18.2

package/dist/{chunk-TIFNW5GQ.js → chunk-D3CC5GL7.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-VH3NGOXQ.js";
 import {
   log
-} from "./chunk-YITXOAPA.js";
+} from "./chunk-WER2DWCP.js";
 
 // router/services.ts
 import { Type } from "@sinclair/typebox";

package/dist/{chunk-UEKU6XRG.js → chunk-K7CUSLWL.js}

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

package/dist/{chunk-ZPPKYJI7.js → chunk-PUX3U2SZ.js}

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

package/dist/{chunk-CLY7AQ25.js → chunk-UABIFWM7.js}

@@ -10,7 +10,7 @@ import {
 } from "./chunk-VH3NGOXQ.js";
 import {
   log
-} from "./chunk-YITXOAPA.js";
+} from "./chunk-WER2DWCP.js";
 import {
   NaiveJsonCodec
 } from "./chunk-GZ7HCLLM.js";
@@ -688,6 +688,15 @@ var ClientTransport = class extends Transport {
     if (this.state !== "open")
       return;
     let session = void 0;
+    const handshakeTimeout = setTimeout(() => {
+      if (!session) {
+        log?.warn(
+          `connection to ${to} timed out waiting for handshake, closing`,
+          { clientId: this.clientId, connectedTo: to, connId: conn.debugId }
+        );
+        conn.close();
+      }
+    }, this.options.sessionDisconnectGraceMs);
     const handshakeHandler = (data) => {
       const maybeSession = this.receiveHandshakeResponseMessage(data, conn);
       if (!maybeSession) {
@@ -695,6 +704,7 @@ var ClientTransport = class extends Transport {
         return;
       } else {
         session = maybeSession;
+        clearTimeout(handshakeTimeout);
       }
       conn.removeDataListener(handshakeHandler);
       conn.addDataListener((data2) => {
@@ -888,6 +898,19 @@ var ServerTransport = class extends Transport {
     });
     let session = void 0;
     const client = () => session?.to ?? "unknown";
+    const handshakeTimeout = setTimeout(() => {
+      if (!session) {
+        log?.warn(
+          `connection to ${client()} timed out waiting for handshake, closing`,
+          {
+            clientId: this.clientId,
+            connectedTo: client(),
+            connId: conn.debugId
+          }
+        );
+        conn.close();
+      }
+    }, this.options.sessionDisconnectGraceMs);
     const handshakeHandler = (data) => {
       const maybeSession = this.receiveHandshakeRequestMessage(data, conn);
       if (!maybeSession) {
@@ -895,6 +918,7 @@ var ServerTransport = class extends Transport {
         return;
       } else {
         session = maybeSession;
+        clearTimeout(handshakeTimeout);
       }
       conn.removeDataListener(handshakeHandler);
       conn.addDataListener((data2) => {

package/dist/{chunk-YITXOAPA.js → chunk-WER2DWCP.js}

@@ -33,7 +33,7 @@ var BaseLogger = class {
     }
   }
 };
-var stringLogger = (msg, _ctx, level) => {
+var stringLogger = (msg, _ctx, level = "info") => {
   console.log(`[river:${level}] ${msg}`);
 };
 var colorMap = {
@@ -42,7 +42,7 @@ var colorMap = {
   warn: "\x1B[33m",
   error: "\x1B[31m"
 };
-var coloredStringLogger = (msg, _ctx, level) => {
+var coloredStringLogger = (msg, _ctx, level = "info") => {
   const color = colorMap[level];
   console.log(`[river:${color}${level}\x1B[0m] ${msg}`);
 };
@@ -55,12 +55,12 @@ function bindLogger(fn, level) {
     log = void 0;
     return;
   }
-  if (fn instanceof BaseLogger) {
-    log = fn;
-    return fn;
+  if (typeof fn === "function") {
+    log = new BaseLogger(fn, level);
+    return log;
   }
-  log = new BaseLogger(fn, level);
-  return log;
+  log = fn;
+  return fn;
 }
 
 export {

package/dist/{connection-df5f32ee.d.ts → connection-893bd769.d.ts}

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

package/dist/{connection-32bf6608.d.ts → connection-89918b74.d.ts}

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

package/dist/{index-6118cd48.d.ts → index-46ed19d8.d.ts}

@@ -90,7 +90,10 @@ declare const LoggingLevels: {
     readonly error: 2;
 };
 type LoggingLevel = keyof typeof LoggingLevels;
-type LogFn = (msg: string, ctx: MessageMetadata, level: LoggingLevel) => void;
+type LogFn = (msg: string, ctx?: MessageMetadata, level?: LoggingLevel) => void;
+type Logger = {
+    [key in LoggingLevel]: LogFn;
+};
 type MessageMetadata = Record<string, unknown> & Partial<{
     protocolVersion: string;
     clientId: string;
@@ -100,18 +103,9 @@ type MessageMetadata = Record<string, unknown> & Partial<{
     fullTransportMessage: OpaqueTransportMessage;
     partialTransportMessage: Partial<PartialTransportMessage>;
 }>;
-declare class BaseLogger {
-    minLevel: LoggingLevel;
-    private output;
-    constructor(output: LogFn, minLevel?: LoggingLevel);
-    debug(msg: string, metadata?: MessageMetadata): void;
-    info(msg: string, metadata?: MessageMetadata): void;
-    warn(msg: string, metadata?: MessageMetadata): void;
-    error(msg: string, metadata?: MessageMetadata): void;
-}
 declare const stringLogger: LogFn;
 declare const coloredStringLogger: LogFn;
 declare const jsonLogger: LogFn;
-declare function bindLogger(fn: LogFn | BaseLogger | undefined, level?: LoggingLevel): BaseLogger | undefined;
+declare function bindLogger(fn: LogFn | Logger | undefined, level?: LoggingLevel): Logger | undefined;
 
-export { LogFn as L, MessageMetadata as M, OpaqueTransportMessage as O, PartialTransportMessage as P, TransportClientId as T, TransportMessage as a, TransportMessageSchema as b, OpaqueTransportMessageSchema as c, isStreamClose as d, coloredStringLogger as e, bindLogger as f, isStreamOpen as i, jsonLogger as j, stringLogger as s };
+export { Logger as L, MessageMetadata as M, OpaqueTransportMessage as O, PartialTransportMessage as P, TransportClientId as T, TransportMessage as a, TransportMessageSchema as b, OpaqueTransportMessageSchema as c, isStreamClose as d, coloredStringLogger as e, bindLogger as f, LogFn as g, isStreamOpen as i, jsonLogger as j, stringLogger as s };

package/dist/{index-314e676a.d.ts → index-d412ca83.d.ts}

@@ -1,5 +1,5 @@
 import { C as Codec } from './types-3e5768ec.js';
-import { T as TransportClientId, M as MessageMetadata, P as PartialTransportMessage, a as TransportMessage, O as OpaqueTransportMessage } from './index-6118cd48.js';
+import { T as TransportClientId, M as MessageMetadata, P as PartialTransportMessage, a as TransportMessage, O as OpaqueTransportMessage } from './index-46ed19d8.js';
 
 /**
  * A connection is the actual raw underlying transport connection.

package/dist/logging/index.cjs

@@ -62,7 +62,7 @@ var BaseLogger = class {
     }
   }
 };
-var stringLogger = (msg, _ctx, level) => {
+var stringLogger = (msg, _ctx, level = "info") => {
   console.log(`[river:${level}] ${msg}`);
 };
 var colorMap = {
@@ -71,7 +71,7 @@ var colorMap = {
   warn: "\x1B[33m",
   error: "\x1B[31m"
 };
-var coloredStringLogger = (msg, _ctx, level) => {
+var coloredStringLogger = (msg, _ctx, level = "info") => {
   const color = colorMap[level];
   console.log(`[river:${color}${level}\x1B[0m] ${msg}`);
 };
@@ -84,12 +84,12 @@ function bindLogger(fn, level) {
     log = void 0;
     return;
   }
-  if (fn instanceof BaseLogger) {
-    log = fn;
-    return fn;
+  if (typeof fn === "function") {
+    log = new BaseLogger(fn, level);
+    return log;
   }
-  log = new BaseLogger(fn, level);
-  return log;
+  log = fn;
+  return fn;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/logging/index.d.cts

@@ -1,2 +1,2 @@
-export { L as LogFn, M as MessageMetadata, f as bindLogger, e as coloredStringLogger, j as jsonLogger, s as stringLogger } from '../index-6118cd48.js';
+export { g as LogFn, L as Logger, M as MessageMetadata, f as bindLogger, e as coloredStringLogger, j as jsonLogger, s as stringLogger } from '../index-46ed19d8.js';
 import '@sinclair/typebox';

package/dist/logging/index.d.ts

@@ -1,2 +1,2 @@
-export { L as LogFn, M as MessageMetadata, f as bindLogger, e as coloredStringLogger, j as jsonLogger, s as stringLogger } from '../index-6118cd48.js';
+export { g as LogFn, L as Logger, M as MessageMetadata, f as bindLogger, e as coloredStringLogger, j as jsonLogger, s as stringLogger } from '../index-46ed19d8.js';
 import '@sinclair/typebox';

package/dist/logging/index.js

@@ -3,7 +3,7 @@ import {
   coloredStringLogger,
   jsonLogger,
   stringLogger
-} from "../chunk-YITXOAPA.js";
+} from "../chunk-WER2DWCP.js";
 export {
   bindLogger,
   coloredStringLogger,

package/dist/{procedures-74a10937.d.ts → procedures-85e52b9c.d.ts}

@@ -1,7 +1,7 @@
 import { TObject, TUnion, TString, TSchema, TNever, TLiteral, Static } from '@sinclair/typebox';
 import { Pushable } from 'it-pushable';
-import { T as TransportClientId } from './index-6118cd48.js';
-import { a as Session, C as Connection } from './index-314e676a.js';
+import { T as TransportClientId } from './index-46ed19d8.js';
+import { a as Session, C as Connection } from './index-d412ca83.js';
 
 type TLiteralString = TLiteral<string>;
 type RiverErrorSchema = TObject<{

package/dist/router/index.d.cts

@@ -1,9 +1,9 @@
 import { TUnion, Static } from '@sinclair/typebox';
-import { e as ProcedureMap, P as PayloadType, c as RiverUncaughtSchema, U as Unbranded, B as Branded, A as AnyProcedure, R as RiverError, b as Result, S as ServiceContext } from '../procedures-74a10937.js';
-export { E as Err, O as Ok, a as Procedure, d as ProcedureResult, f as RPCProcedure, m as RiverErrorSchema, j as ServiceContextWithState, k as ServiceContextWithTransportInfo, i as StreamProcedure, h as SubscriptionProcedure, l as UNCAUGHT_ERROR, g as UploadProcedure, V as ValidProcType } from '../procedures-74a10937.js';
-import { b as ClientTransport, C as Connection, c as ServerTransport } from '../index-314e676a.js';
+import { e as ProcedureMap, P as PayloadType, c as RiverUncaughtSchema, U as Unbranded, B as Branded, A as AnyProcedure, R as RiverError, b as Result, S as ServiceContext } from '../procedures-85e52b9c.js';
+export { E as Err, O as Ok, a as Procedure, d as ProcedureResult, f as RPCProcedure, m as RiverErrorSchema, j as ServiceContextWithState, k as ServiceContextWithTransportInfo, i as StreamProcedure, h as SubscriptionProcedure, l as UNCAUGHT_ERROR, g as UploadProcedure, V as ValidProcType } from '../procedures-85e52b9c.js';
+import { b as ClientTransport, C as Connection, c as ServerTransport } from '../index-d412ca83.js';
 import { Pushable } from 'it-pushable';
-import { T as TransportClientId } from '../index-6118cd48.js';
+import { T as TransportClientId } from '../index-46ed19d8.js';
 import '../types-3e5768ec.js';
 
 /**

package/dist/router/index.d.ts

@@ -1,9 +1,9 @@
 import { TUnion, Static } from '@sinclair/typebox';
-import { e as ProcedureMap, P as PayloadType, c as RiverUncaughtSchema, U as Unbranded, B as Branded, A as AnyProcedure, R as RiverError, b as Result, S as ServiceContext } from '../procedures-74a10937.js';
-export { E as Err, O as Ok, a as Procedure, d as ProcedureResult, f as RPCProcedure, m as RiverErrorSchema, j as ServiceContextWithState, k as ServiceContextWithTransportInfo, i as StreamProcedure, h as SubscriptionProcedure, l as UNCAUGHT_ERROR, g as UploadProcedure, V as ValidProcType } from '../procedures-74a10937.js';
-import { b as ClientTransport, C as Connection, c as ServerTransport } from '../index-314e676a.js';
+import { e as ProcedureMap, P as PayloadType, c as RiverUncaughtSchema, U as Unbranded, B as Branded, A as AnyProcedure, R as RiverError, b as Result, S as ServiceContext } from '../procedures-85e52b9c.js';
+export { E as Err, O as Ok, a as Procedure, d as ProcedureResult, f as RPCProcedure, m as RiverErrorSchema, j as ServiceContextWithState, k as ServiceContextWithTransportInfo, i as StreamProcedure, h as SubscriptionProcedure, l as UNCAUGHT_ERROR, g as UploadProcedure, V as ValidProcType } from '../procedures-85e52b9c.js';
+import { b as ClientTransport, C as Connection, c as ServerTransport } from '../index-d412ca83.js';
 import { Pushable } from 'it-pushable';
-import { T as TransportClientId } from '../index-6118cd48.js';
+import { T as TransportClientId } from '../index-46ed19d8.js';
 import '../types-3e5768ec.js';
 
 /**

package/dist/router/index.js

@@ -7,9 +7,9 @@ import {
   UNCAUGHT_ERROR,
   createClient,
   createServer
-} from "../chunk-TIFNW5GQ.js";
+} from "../chunk-D3CC5GL7.js";
 import "../chunk-VH3NGOXQ.js";
-import "../chunk-YITXOAPA.js";
+import "../chunk-WER2DWCP.js";
 export {
   Err,
   Ok,

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

@@ -925,6 +925,15 @@ var ClientTransport = class extends Transport {
     if (this.state !== "open")
       return;
     let session = void 0;
+    const handshakeTimeout = setTimeout(() => {
+      if (!session) {
+        log?.warn(
+          `connection to ${to} timed out waiting for handshake, closing`,
+          { clientId: this.clientId, connectedTo: to, connId: conn.debugId }
+        );
+        conn.close();
+      }
+    }, this.options.sessionDisconnectGraceMs);
     const handshakeHandler = (data) => {
       const maybeSession = this.receiveHandshakeResponseMessage(data, conn);
       if (!maybeSession) {
@@ -932,6 +941,7 @@ var ClientTransport = class extends Transport {
         return;
       } else {
         session = maybeSession;
+        clearTimeout(handshakeTimeout);
       }
       conn.removeDataListener(handshakeHandler);
       conn.addDataListener((data2) => {

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

@@ -1,6 +1,6 @@
-import { b as ClientTransport, P as ProvidedClientTransportOptions } from '../../../index-314e676a.js';
-import { T as TransportClientId } from '../../../index-6118cd48.js';
-import { U as UdsConnection } from '../../../connection-32bf6608.js';
+import { b as ClientTransport, P as ProvidedClientTransportOptions } from '../../../index-d412ca83.js';
+import { T as TransportClientId } from '../../../index-46ed19d8.js';
+import { U as UdsConnection } from '../../../connection-89918b74.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:net';

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

@@ -1,6 +1,6 @@
-import { b as ClientTransport, P as ProvidedClientTransportOptions } from '../../../index-314e676a.js';
-import { T as TransportClientId } from '../../../index-6118cd48.js';
-import { U as UdsConnection } from '../../../connection-32bf6608.js';
+import { b as ClientTransport, P as ProvidedClientTransportOptions } from '../../../index-d412ca83.js';
+import { T as TransportClientId } from '../../../index-46ed19d8.js';
+import { U as UdsConnection } from '../../../connection-89918b74.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:net';

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

@@ -1,13 +1,13 @@
 import {
   UdsConnection
-} from "../../../chunk-ZPPKYJI7.js";
+} from "../../../chunk-PUX3U2SZ.js";
 import {
   ClientTransport
-} from "../../../chunk-CLY7AQ25.js";
+} from "../../../chunk-UABIFWM7.js";
 import "../../../chunk-VH3NGOXQ.js";
 import {
   log
-} from "../../../chunk-YITXOAPA.js";
+} from "../../../chunk-WER2DWCP.js";
 import "../../../chunk-GZ7HCLLM.js";
 
 // transport/impls/uds/client.ts

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

@@ -744,6 +744,19 @@ var ServerTransport = class extends Transport {
     });
     let session = void 0;
     const client = () => session?.to ?? "unknown";
+    const handshakeTimeout = setTimeout(() => {
+      if (!session) {
+        log?.warn(
+          `connection to ${client()} timed out waiting for handshake, closing`,
+          {
+            clientId: this.clientId,
+            connectedTo: client(),
+            connId: conn.debugId
+          }
+        );
+        conn.close();
+      }
+    }, this.options.sessionDisconnectGraceMs);
     const handshakeHandler = (data) => {
       const maybeSession = this.receiveHandshakeRequestMessage(data, conn);
       if (!maybeSession) {
@@ -751,6 +764,7 @@ var ServerTransport = class extends Transport {
         return;
       } else {
         session = maybeSession;
+        clearTimeout(handshakeTimeout);
       }
       conn.removeDataListener(handshakeHandler);
       conn.addDataListener((data2) => {

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

@@ -1,7 +1,7 @@
 import { Server, Socket } from 'node:net';
-import { c as ServerTransport, d as ProvidedTransportOptions } from '../../../index-314e676a.js';
-import { T as TransportClientId } from '../../../index-6118cd48.js';
-import { U as UdsConnection } from '../../../connection-32bf6608.js';
+import { c as ServerTransport, d as ProvidedTransportOptions } from '../../../index-d412ca83.js';
+import { T as TransportClientId } from '../../../index-46ed19d8.js';
+import { U as UdsConnection } from '../../../connection-89918b74.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:stream';

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

@@ -1,7 +1,7 @@
 import { Server, Socket } from 'node:net';
-import { c as ServerTransport, d as ProvidedTransportOptions } from '../../../index-314e676a.js';
-import { T as TransportClientId } from '../../../index-6118cd48.js';
-import { U as UdsConnection } from '../../../connection-32bf6608.js';
+import { c as ServerTransport, d as ProvidedTransportOptions } from '../../../index-d412ca83.js';
+import { T as TransportClientId } from '../../../index-46ed19d8.js';
+import { U as UdsConnection } from '../../../connection-89918b74.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:stream';

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

@@ -1,11 +1,11 @@
 import {
   UdsConnection
-} from "../../../chunk-ZPPKYJI7.js";
+} from "../../../chunk-PUX3U2SZ.js";
 import {
   ServerTransport
-} from "../../../chunk-CLY7AQ25.js";
+} from "../../../chunk-UABIFWM7.js";
 import "../../../chunk-VH3NGOXQ.js";
-import "../../../chunk-YITXOAPA.js";
+import "../../../chunk-WER2DWCP.js";
 import "../../../chunk-GZ7HCLLM.js";
 
 // transport/impls/uds/server.ts

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

@@ -829,6 +829,15 @@ var ClientTransport = class extends Transport {
     if (this.state !== "open")
       return;
     let session = void 0;
+    const handshakeTimeout = setTimeout(() => {
+      if (!session) {
+        log?.warn(
+          `connection to ${to} timed out waiting for handshake, closing`,
+          { clientId: this.clientId, connectedTo: to, connId: conn.debugId }
+        );
+        conn.close();
+      }
+    }, this.options.sessionDisconnectGraceMs);
     const handshakeHandler = (data) => {
       const maybeSession = this.receiveHandshakeResponseMessage(data, conn);
       if (!maybeSession) {
@@ -836,6 +845,7 @@ var ClientTransport = class extends Transport {
         return;
       } else {
         session = maybeSession;
+        clearTimeout(handshakeTimeout);
       }
       conn.removeDataListener(handshakeHandler);
       conn.addDataListener((data2) => {

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

@@ -1,7 +1,7 @@
 import WebSocket from 'isomorphic-ws';
-import { b as ClientTransport, P as ProvidedClientTransportOptions } from '../../../index-314e676a.js';
-import { T as TransportClientId } from '../../../index-6118cd48.js';
-import { W as WebSocketConnection } from '../../../connection-df5f32ee.js';
+import { b as ClientTransport, P as ProvidedClientTransportOptions } from '../../../index-d412ca83.js';
+import { T as TransportClientId } from '../../../index-46ed19d8.js';
+import { W as WebSocketConnection } from '../../../connection-893bd769.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

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

@@ -1,7 +1,7 @@
 import WebSocket from 'isomorphic-ws';
-import { b as ClientTransport, P as ProvidedClientTransportOptions } from '../../../index-314e676a.js';
-import { T as TransportClientId } from '../../../index-6118cd48.js';
-import { W as WebSocketConnection } from '../../../connection-df5f32ee.js';
+import { b as ClientTransport, P as ProvidedClientTransportOptions } from '../../../index-d412ca83.js';
+import { T as TransportClientId } from '../../../index-46ed19d8.js';
+import { W as WebSocketConnection } from '../../../connection-893bd769.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

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

@@ -1,13 +1,13 @@
 import {
   WebSocketConnection
-} from "../../../chunk-UEKU6XRG.js";
+} from "../../../chunk-K7CUSLWL.js";
 import {
   ClientTransport
-} from "../../../chunk-CLY7AQ25.js";
+} from "../../../chunk-UABIFWM7.js";
 import "../../../chunk-VH3NGOXQ.js";
 import {
   log
-} from "../../../chunk-YITXOAPA.js";
+} from "../../../chunk-WER2DWCP.js";
 import "../../../chunk-GZ7HCLLM.js";
 
 // transport/impls/ws/client.ts

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

@@ -744,6 +744,19 @@ var ServerTransport = class extends Transport {
     });
     let session = void 0;
     const client = () => session?.to ?? "unknown";
+    const handshakeTimeout = setTimeout(() => {
+      if (!session) {
+        log?.warn(
+          `connection to ${client()} timed out waiting for handshake, closing`,
+          {
+            clientId: this.clientId,
+            connectedTo: client(),
+            connId: conn.debugId
+          }
+        );
+        conn.close();
+      }
+    }, this.options.sessionDisconnectGraceMs);
     const handshakeHandler = (data) => {
       const maybeSession = this.receiveHandshakeRequestMessage(data, conn);
       if (!maybeSession) {
@@ -751,6 +764,7 @@ var ServerTransport = class extends Transport {
         return;
       } else {
         session = maybeSession;
+        clearTimeout(handshakeTimeout);
       }
       conn.removeDataListener(handshakeHandler);
       conn.addDataListener((data2) => {

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

@@ -1,8 +1,8 @@
-import { T as TransportClientId } from '../../../index-6118cd48.js';
-import { c as ServerTransport, d as ProvidedTransportOptions } from '../../../index-314e676a.js';
+import { T as TransportClientId } from '../../../index-46ed19d8.js';
+import { c as ServerTransport, d as ProvidedTransportOptions } from '../../../index-d412ca83.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-df5f32ee.js';
+import { W as WebSocketConnection } from '../../../connection-893bd769.js';
 import '@sinclair/typebox';
 import '../../../types-3e5768ec.js';
 

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

@@ -1,8 +1,8 @@
-import { T as TransportClientId } from '../../../index-6118cd48.js';
-import { c as ServerTransport, d as ProvidedTransportOptions } from '../../../index-314e676a.js';
+import { T as TransportClientId } from '../../../index-46ed19d8.js';
+import { c as ServerTransport, d as ProvidedTransportOptions } from '../../../index-d412ca83.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-df5f32ee.js';
+import { W as WebSocketConnection } from '../../../connection-893bd769.js';
 import '@sinclair/typebox';
 import '../../../types-3e5768ec.js';
 

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

@@ -1,11 +1,11 @@
 import {
   WebSocketConnection
-} from "../../../chunk-UEKU6XRG.js";
+} from "../../../chunk-K7CUSLWL.js";
 import {
   ServerTransport
-} from "../../../chunk-CLY7AQ25.js";
+} from "../../../chunk-UABIFWM7.js";
 import "../../../chunk-VH3NGOXQ.js";
-import "../../../chunk-YITXOAPA.js";
+import "../../../chunk-WER2DWCP.js";
 import "../../../chunk-GZ7HCLLM.js";
 
 // transport/impls/ws/server.ts

package/dist/transport/index.cjs

@@ -851,6 +851,15 @@ var ClientTransport = class extends Transport {
     if (this.state !== "open")
       return;
     let session = void 0;
+    const handshakeTimeout = setTimeout(() => {
+      if (!session) {
+        log?.warn(
+          `connection to ${to} timed out waiting for handshake, closing`,
+          { clientId: this.clientId, connectedTo: to, connId: conn.debugId }
+        );
+        conn.close();
+      }
+    }, this.options.sessionDisconnectGraceMs);
     const handshakeHandler = (data) => {
       const maybeSession = this.receiveHandshakeResponseMessage(data, conn);
       if (!maybeSession) {
@@ -858,6 +867,7 @@ var ClientTransport = class extends Transport {
         return;
       } else {
         session = maybeSession;
+        clearTimeout(handshakeTimeout);
       }
       conn.removeDataListener(handshakeHandler);
       conn.addDataListener((data2) => {
@@ -1051,6 +1061,19 @@ var ServerTransport = class extends Transport {
     });
     let session = void 0;
     const client = () => session?.to ?? "unknown";
+    const handshakeTimeout = setTimeout(() => {
+      if (!session) {
+        log?.warn(
+          `connection to ${client()} timed out waiting for handshake, closing`,
+          {
+            clientId: this.clientId,
+            connectedTo: client(),
+            connId: conn.debugId
+          }
+        );
+        conn.close();
+      }
+    }, this.options.sessionDisconnectGraceMs);
     const handshakeHandler = (data) => {
       const maybeSession = this.receiveHandshakeRequestMessage(data, conn);
       if (!maybeSession) {
@@ -1058,6 +1081,7 @@ var ServerTransport = class extends Transport {
         return;
       } else {
         session = maybeSession;
+        clearTimeout(handshakeTimeout);
       }
       conn.removeDataListener(handshakeHandler);
       conn.addDataListener((data2) => {

package/dist/transport/index.d.cts

@@ -1,4 +1,4 @@
-export { b as ClientTransport, P as ClientTransportOptions, C as Connection, g as EventHandler, E as EventMap, f as EventTypes, h as ProtocolError, i as ProtocolErrorType, c as ServerTransport, a as Session, T as Transport, d as TransportOptions, e as TransportStatus } from '../index-314e676a.js';
-export { O as OpaqueTransportMessage, c as OpaqueTransportMessageSchema, T as TransportClientId, a as TransportMessage, b as TransportMessageSchema, d as isStreamClose, i as isStreamOpen } from '../index-6118cd48.js';
+export { b as ClientTransport, P as ClientTransportOptions, C as Connection, g as EventHandler, E as EventMap, f as EventTypes, h as ProtocolError, i as ProtocolErrorType, c as ServerTransport, a as Session, T as Transport, d as TransportOptions, e as TransportStatus } from '../index-d412ca83.js';
+export { O as OpaqueTransportMessage, c as OpaqueTransportMessageSchema, T as TransportClientId, a as TransportMessage, b as TransportMessageSchema, d as isStreamClose, i as isStreamOpen } from '../index-46ed19d8.js';
 import '../types-3e5768ec.js';
 import '@sinclair/typebox';

package/dist/transport/index.d.ts

@@ -1,4 +1,4 @@
-export { b as ClientTransport, P as ClientTransportOptions, C as Connection, g as EventHandler, E as EventMap, f as EventTypes, h as ProtocolError, i as ProtocolErrorType, c as ServerTransport, a as Session, T as Transport, d as TransportOptions, e as TransportStatus } from '../index-314e676a.js';
-export { O as OpaqueTransportMessage, c as OpaqueTransportMessageSchema, T as TransportClientId, a as TransportMessage, b as TransportMessageSchema, d as isStreamClose, i as isStreamOpen } from '../index-6118cd48.js';
+export { b as ClientTransport, P as ClientTransportOptions, C as Connection, g as EventHandler, E as EventMap, f as EventTypes, h as ProtocolError, i as ProtocolErrorType, c as ServerTransport, a as Session, T as Transport, d as TransportOptions, e as TransportStatus } from '../index-d412ca83.js';
+export { O as OpaqueTransportMessage, c as OpaqueTransportMessageSchema, T as TransportClientId, a as TransportMessage, b as TransportMessageSchema, d as isStreamClose, i as isStreamOpen } from '../index-46ed19d8.js';
 import '../types-3e5768ec.js';
 import '@sinclair/typebox';

package/dist/transport/index.js

@@ -6,12 +6,12 @@ import {
   ServerTransport,
   Session,
   Transport
-} from "../chunk-CLY7AQ25.js";
+} from "../chunk-UABIFWM7.js";
 import {
   OpaqueTransportMessageSchema,
   TransportMessageSchema
 } from "../chunk-VH3NGOXQ.js";
-import "../chunk-YITXOAPA.js";
+import "../chunk-WER2DWCP.js";
 import "../chunk-GZ7HCLLM.js";
 export {
   ClientTransport,

package/dist/util/testHelpers.d.cts

@@ -1,8 +1,8 @@
 import { Static } from '@sinclair/typebox';
-import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema, d as ProcedureResult } from '../procedures-74a10937.js';
-import { T as Transport, C as Connection, S as SessionOptions, a as Session } from '../index-314e676a.js';
+import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema, d as ProcedureResult } from '../procedures-85e52b9c.js';
+import { T as Transport, C as Connection, S as SessionOptions, a as Session } from '../index-d412ca83.js';
 import * as it_pushable from 'it-pushable';
-import { P as PartialTransportMessage, O as OpaqueTransportMessage } from '../index-6118cd48.js';
+import { P as PartialTransportMessage, O as OpaqueTransportMessage } from '../index-46ed19d8.js';
 import WebSocket from 'isomorphic-ws';
 import http from 'node:http';
 import net from 'node:net';

package/dist/util/testHelpers.d.ts

@@ -1,8 +1,8 @@
 import { Static } from '@sinclair/typebox';
-import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema, d as ProcedureResult } from '../procedures-74a10937.js';
-import { T as Transport, C as Connection, S as SessionOptions, a as Session } from '../index-314e676a.js';
+import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema, d as ProcedureResult } from '../procedures-85e52b9c.js';
+import { T as Transport, C as Connection, S as SessionOptions, a as Session } from '../index-d412ca83.js';
 import * as it_pushable from 'it-pushable';
-import { P as PartialTransportMessage, O as OpaqueTransportMessage } from '../index-6118cd48.js';
+import { P as PartialTransportMessage, O as OpaqueTransportMessage } from '../index-46ed19d8.js';
 import WebSocket from 'isomorphic-ws';
 import http from 'node:http';
 import net from 'node:net';

package/dist/util/testHelpers.js

@@ -1,16 +1,16 @@
 import {
   UNCAUGHT_ERROR,
   pushable
-} from "../chunk-TIFNW5GQ.js";
+} from "../chunk-D3CC5GL7.js";
 import "../chunk-RPIDSIQG.js";
 import {
   Session,
   defaultTransportOptions
-} from "../chunk-CLY7AQ25.js";
+} from "../chunk-UABIFWM7.js";
 import {
   coerceErrorString
 } from "../chunk-VH3NGOXQ.js";
-import "../chunk-YITXOAPA.js";
+import "../chunk-WER2DWCP.js";
 import "../chunk-GZ7HCLLM.js";
 
 // util/testHelpers.ts

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