@replit/river 0.13.2 → 0.13.4

package/dist/{builder-eef3b061.d.ts → builder-6f4630d0.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-9aa0aabb.js';
+import { b as TransportClientId, d as Session, C as Connection } from './index-5c55c0d3.js';
 
 /**
  * The context for services/procedures. This is used only on
@@ -200,9 +200,8 @@ declare class ServiceBuilder<T extends Service<string, object, ProcListing>> {
     private constructor();
     /**
      * Finalizes the schema for the service.
-     * @returns {T} The finalized schema for the service.
      */
-    finalize(): T;
+    finalize(): Readonly<T>;
     /**
      * Sets the initial state for the service.
      * @template InitState The type of the initial state.

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

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

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

@@ -41,10 +41,9 @@ var ServiceBuilder = class _ServiceBuilder {
   }
   /**
    * Finalizes the schema for the service.
-   * @returns {T} The finalized schema for the service.
    */
   finalize() {
-    return this.schema;
+    return Object.freeze(this.schema);
   }
   /**
    * Sets the initial state for the service.

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

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

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

@@ -213,6 +213,9 @@ var Session = class {
     this.connection = newConn;
   }
   beginGrace(cb) {
+    log?.info(
+      `${this.from} -- starting ${this.options.sessionDisconnectGraceMs}ms grace period until session (id: ${this.debugId}) to ${this.to} is closed`
+    );
     this.disconnectionGrace = setTimeout(() => {
       this.close();
       cb();
@@ -384,14 +387,11 @@ var Transport = class {
    * @param conn The connection object.
    * @param connectedTo The peer we are connected to.
    */
-  onDisconnect(conn, connectedTo) {
+  onDisconnect(conn, session) {
     this.eventDispatcher.dispatchEvent("connectionStatus", {
       status: "disconnect",
       conn
     });
-    const session = this.sessions.get(connectedTo);
-    if (!session)
-      return;
     session.connection = void 0;
     session.beginGrace(() => this.deleteSession(session));
   }
@@ -549,13 +549,14 @@ var ClientTransport = class extends Transport {
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
   }
   handleConnection(conn, to) {
+    let session = void 0;
     const handshakeHandler = (data) => {
       const handshake = this.receiveHandshakeResponseMessage(data);
       if (!handshake) {
         conn.close();
         return;
       }
-      this.onConnect(conn, handshake.from, handshake.instanceId);
+      session = this.onConnect(conn, handshake.from, handshake.instanceId);
       conn.removeDataListener(handshakeHandler);
       conn.addDataListener((data2) => {
         const parsed = this.parseMsg(data2);
@@ -568,7 +569,9 @@ var ClientTransport = class extends Transport {
     };
     conn.addDataListener(handshakeHandler);
     conn.addCloseListener(() => {
-      this.onDisconnect(conn, to);
+      if (session) {
+        this.onDisconnect(conn, session);
+      }
       void this.connect(to);
     });
     conn.addErrorListener((err) => {
@@ -651,9 +654,9 @@ var ClientTransport = class extends Transport {
     log?.debug(`${this.clientId} -- sending handshake request to ${to}`);
     conn.send(this.codec.toBuffer(requestMsg));
   }
-  onDisconnect(conn, connectedTo) {
-    this.inflightConnectionPromises.delete(connectedTo);
-    super.onDisconnect(conn, connectedTo);
+  onDisconnect(conn, session) {
+    this.inflightConnectionPromises.delete(session.to);
+    super.onDisconnect(conn, session);
   }
 };
 var ServerTransport = class extends Transport {
@@ -690,7 +693,7 @@ var ServerTransport = class extends Transport {
       log?.info(
         `${this.clientId} -- connection (id: ${conn.debugId}) to ${client()} disconnected`
       );
-      this.onDisconnect(conn, session.to);
+      this.onDisconnect(conn, session);
     });
     conn.addErrorListener((err) => {
       if (!session)

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

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

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

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

package/dist/{index-9aa0aabb.d.ts → index-5c55c0d3.d.ts}

@@ -336,7 +336,7 @@ declare abstract class Transport<ConnType extends Connection> {
      * @param conn The connection object.
      * @param connectedTo The peer we are connected to.
      */
-    protected onDisconnect(conn: ConnType, connectedTo: TransportClientId): void;
+    protected onDisconnect(conn: ConnType, session: Session<ConnType>): void;
     /**
      * Parses a message from a Uint8Array into a {@link OpaqueTransportMessage}.
      * @param msg The message to parse.
@@ -410,7 +410,7 @@ declare abstract class ClientTransport<ConnType extends Connection> extends Tran
      */
     connect(to: TransportClientId, attempt?: number): Promise<void>;
     protected sendHandshake(to: TransportClientId, conn: ConnType): void;
-    protected onDisconnect(conn: ConnType, connectedTo: string): void;
+    protected onDisconnect(conn: ConnType, session: Session<ConnType>): void;
 }
 declare abstract class ServerTransport<ConnType extends Connection> extends Transport<ConnType> {
     constructor(clientId: TransportClientId, providedOptions?: Partial<TransportOptions>);
@@ -421,4 +421,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, TransportMessageSchema as e, OpaqueTransportMessageSchema as f, TransportMessage as g, isStreamClose as h, isStreamOpen as i, EventTypes as j, EventHandler as k };
+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 };

package/dist/router/index.cjs

@@ -65,10 +65,9 @@ var ServiceBuilder = class _ServiceBuilder {
   }
   /**
    * Finalizes the schema for the service.
-   * @returns {T} The finalized schema for the service.
    */
   finalize() {
-    return this.schema;
+    return Object.freeze(this.schema);
   }
   /**
    * Sets the initial state for the service.

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-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 { 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-6f4630d0.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-6f4630d0.js';
+import { S as ServerTransport, C as Connection, a as ClientTransport } from '../index-5c55c0d3.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-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 { 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-6f4630d0.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-6f4630d0.js';
+import { S as ServerTransport, C as Connection, a as ClientTransport } from '../index-5c55c0d3.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-67M47YPQ.js";
+} from "../chunk-ASZ3VDCS.js";
 import "../chunk-GFRAOY75.js";
 import "../chunk-H4BYJELI.js";
 export {

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

@@ -321,6 +321,9 @@ var Session = class {
     this.connection = newConn;
   }
   beginGrace(cb) {
+    log?.info(
+      `${this.from} -- starting ${this.options.sessionDisconnectGraceMs}ms grace period until session (id: ${this.debugId}) to ${this.to} is closed`
+    );
     this.disconnectionGrace = setTimeout(() => {
       this.close();
       cb();
@@ -625,14 +628,11 @@ var Transport = class {
    * @param conn The connection object.
    * @param connectedTo The peer we are connected to.
    */
-  onDisconnect(conn, connectedTo) {
+  onDisconnect(conn, session) {
     this.eventDispatcher.dispatchEvent("connectionStatus", {
       status: "disconnect",
       conn
     });
-    const session = this.sessions.get(connectedTo);
-    if (!session)
-      return;
     session.connection = void 0;
     session.beginGrace(() => this.deleteSession(session));
   }
@@ -790,13 +790,14 @@ var ClientTransport = class extends Transport {
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
   }
   handleConnection(conn, to) {
+    let session = void 0;
     const handshakeHandler = (data) => {
       const handshake = this.receiveHandshakeResponseMessage(data);
       if (!handshake) {
         conn.close();
         return;
       }
-      this.onConnect(conn, handshake.from, handshake.instanceId);
+      session = this.onConnect(conn, handshake.from, handshake.instanceId);
       conn.removeDataListener(handshakeHandler);
       conn.addDataListener((data2) => {
         const parsed = this.parseMsg(data2);
@@ -809,7 +810,9 @@ var ClientTransport = class extends Transport {
     };
     conn.addDataListener(handshakeHandler);
     conn.addCloseListener(() => {
-      this.onDisconnect(conn, to);
+      if (session) {
+        this.onDisconnect(conn, session);
+      }
       void this.connect(to);
     });
     conn.addErrorListener((err) => {
@@ -892,9 +895,9 @@ var ClientTransport = class extends Transport {
     log?.debug(`${this.clientId} -- sending handshake request to ${to}`);
     conn.send(this.codec.toBuffer(requestMsg));
   }
-  onDisconnect(conn, connectedTo) {
-    this.inflightConnectionPromises.delete(connectedTo);
-    super.onDisconnect(conn, connectedTo);
+  onDisconnect(conn, session) {
+    this.inflightConnectionPromises.delete(session.to);
+    super.onDisconnect(conn, session);
   }
 };
 

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

@@ -1,5 +1,5 @@
-import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-9aa0aabb.js';
-import { U as UdsConnection } from '../../../connection-03e650c8.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-5c55c0d3.js';
+import { U as UdsConnection } from '../../../connection-8d0efae0.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-9aa0aabb.js';
-import { U as UdsConnection } from '../../../connection-03e650c8.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-5c55c0d3.js';
+import { U as UdsConnection } from '../../../connection-8d0efae0.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-23MWJLVJ.js";
+} from "../../../chunk-FIX2F6VT.js";
 import {
   ClientTransport
-} from "../../../chunk-NLWRMDT6.js";
+} from "../../../chunk-MCTB3NYK.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log

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

@@ -359,6 +359,9 @@ var Session = class {
     this.connection = newConn;
   }
   beginGrace(cb) {
+    log?.info(
+      `${this.from} -- starting ${this.options.sessionDisconnectGraceMs}ms grace period until session (id: ${this.debugId}) to ${this.to} is closed`
+    );
     this.disconnectionGrace = setTimeout(() => {
       this.close();
       cb();
@@ -539,14 +542,11 @@ var Transport = class {
    * @param conn The connection object.
    * @param connectedTo The peer we are connected to.
    */
-  onDisconnect(conn, connectedTo) {
+  onDisconnect(conn, session) {
     this.eventDispatcher.dispatchEvent("connectionStatus", {
       status: "disconnect",
       conn
     });
-    const session = this.sessions.get(connectedTo);
-    if (!session)
-      return;
     session.connection = void 0;
     session.beginGrace(() => this.deleteSession(session));
   }
@@ -725,7 +725,7 @@ var ServerTransport = class extends Transport {
       log?.info(
         `${this.clientId} -- connection (id: ${conn.debugId}) to ${client()} disconnected`
       );
-      this.onDisconnect(conn, session.to);
+      this.onDisconnect(conn, session);
     });
     conn.addErrorListener((err) => {
       if (!session)

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-9aa0aabb.js';
-import { U as UdsConnection } from '../../../connection-03e650c8.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-5c55c0d3.js';
+import { U as UdsConnection } from '../../../connection-8d0efae0.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-9aa0aabb.js';
-import { U as UdsConnection } from '../../../connection-03e650c8.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-5c55c0d3.js';
+import { U as UdsConnection } from '../../../connection-8d0efae0.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-23MWJLVJ.js";
+} from "../../../chunk-FIX2F6VT.js";
 import {
   ServerTransport
-} from "../../../chunk-NLWRMDT6.js";
+} from "../../../chunk-MCTB3NYK.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log

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

@@ -351,6 +351,9 @@ var Session = class {
     this.connection = newConn;
   }
   beginGrace(cb) {
+    log?.info(
+      `${this.from} -- starting ${this.options.sessionDisconnectGraceMs}ms grace period until session (id: ${this.debugId}) to ${this.to} is closed`
+    );
     this.disconnectionGrace = setTimeout(() => {
       this.close();
       cb();
@@ -531,14 +534,11 @@ var Transport = class {
    * @param conn The connection object.
    * @param connectedTo The peer we are connected to.
    */
-  onDisconnect(conn, connectedTo) {
+  onDisconnect(conn, session) {
     this.eventDispatcher.dispatchEvent("connectionStatus", {
       status: "disconnect",
       conn
     });
-    const session = this.sessions.get(connectedTo);
-    if (!session)
-      return;
     session.connection = void 0;
     session.beginGrace(() => this.deleteSession(session));
   }
@@ -696,13 +696,14 @@ var ClientTransport = class extends Transport {
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
   }
   handleConnection(conn, to) {
+    let session = void 0;
     const handshakeHandler = (data) => {
       const handshake = this.receiveHandshakeResponseMessage(data);
       if (!handshake) {
         conn.close();
         return;
       }
-      this.onConnect(conn, handshake.from, handshake.instanceId);
+      session = this.onConnect(conn, handshake.from, handshake.instanceId);
       conn.removeDataListener(handshakeHandler);
       conn.addDataListener((data2) => {
         const parsed = this.parseMsg(data2);
@@ -715,7 +716,9 @@ var ClientTransport = class extends Transport {
     };
     conn.addDataListener(handshakeHandler);
     conn.addCloseListener(() => {
-      this.onDisconnect(conn, to);
+      if (session) {
+        this.onDisconnect(conn, session);
+      }
       void this.connect(to);
     });
     conn.addErrorListener((err) => {
@@ -798,9 +801,9 @@ var ClientTransport = class extends Transport {
     log?.debug(`${this.clientId} -- sending handshake request to ${to}`);
     conn.send(this.codec.toBuffer(requestMsg));
   }
-  onDisconnect(conn, connectedTo) {
-    this.inflightConnectionPromises.delete(connectedTo);
-    super.onDisconnect(conn, connectedTo);
+  onDisconnect(conn, session) {
+    this.inflightConnectionPromises.delete(session.to);
+    super.onDisconnect(conn, session);
   }
 };
 

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

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

@@ -1,9 +1,9 @@
 import {
   WebSocketConnection
-} from "../../../chunk-3Y2K543F.js";
+} from "../../../chunk-5V6B7TM3.js";
 import {
   ClientTransport
-} from "../../../chunk-NLWRMDT6.js";
+} from "../../../chunk-MCTB3NYK.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log

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

@@ -359,6 +359,9 @@ var Session = class {
     this.connection = newConn;
   }
   beginGrace(cb) {
+    log?.info(
+      `${this.from} -- starting ${this.options.sessionDisconnectGraceMs}ms grace period until session (id: ${this.debugId}) to ${this.to} is closed`
+    );
     this.disconnectionGrace = setTimeout(() => {
       this.close();
       cb();
@@ -539,14 +542,11 @@ var Transport = class {
    * @param conn The connection object.
    * @param connectedTo The peer we are connected to.
    */
-  onDisconnect(conn, connectedTo) {
+  onDisconnect(conn, session) {
     this.eventDispatcher.dispatchEvent("connectionStatus", {
       status: "disconnect",
       conn
     });
-    const session = this.sessions.get(connectedTo);
-    if (!session)
-      return;
     session.connection = void 0;
     session.beginGrace(() => this.deleteSession(session));
   }
@@ -725,7 +725,7 @@ var ServerTransport = class extends Transport {
       log?.info(
         `${this.clientId} -- connection (id: ${conn.debugId}) to ${client()} disconnected`
       );
-      this.onDisconnect(conn, session.to);
+      this.onDisconnect(conn, session);
     });
     conn.addErrorListener((err) => {
       if (!session)

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

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

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

@@ -1,9 +1,9 @@
 import {
   WebSocketConnection
-} from "../../../chunk-3Y2K543F.js";
+} from "../../../chunk-5V6B7TM3.js";
 import {
   ServerTransport
-} from "../../../chunk-NLWRMDT6.js";
+} from "../../../chunk-MCTB3NYK.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log

package/dist/transport/index.cjs

@@ -381,6 +381,9 @@ var Session = class {
     this.connection = newConn;
   }
   beginGrace(cb) {
+    log?.info(
+      `${this.from} -- starting ${this.options.sessionDisconnectGraceMs}ms grace period until session (id: ${this.debugId}) to ${this.to} is closed`
+    );
     this.disconnectionGrace = setTimeout(() => {
       this.close();
       cb();
@@ -561,14 +564,11 @@ var Transport = class {
    * @param conn The connection object.
    * @param connectedTo The peer we are connected to.
    */
-  onDisconnect(conn, connectedTo) {
+  onDisconnect(conn, session) {
     this.eventDispatcher.dispatchEvent("connectionStatus", {
       status: "disconnect",
       conn
     });
-    const session = this.sessions.get(connectedTo);
-    if (!session)
-      return;
     session.connection = void 0;
     session.beginGrace(() => this.deleteSession(session));
   }
@@ -726,13 +726,14 @@ var ClientTransport = class extends Transport {
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
   }
   handleConnection(conn, to) {
+    let session = void 0;
     const handshakeHandler = (data) => {
       const handshake = this.receiveHandshakeResponseMessage(data);
       if (!handshake) {
         conn.close();
         return;
       }
-      this.onConnect(conn, handshake.from, handshake.instanceId);
+      session = this.onConnect(conn, handshake.from, handshake.instanceId);
       conn.removeDataListener(handshakeHandler);
       conn.addDataListener((data2) => {
         const parsed = this.parseMsg(data2);
@@ -745,7 +746,9 @@ var ClientTransport = class extends Transport {
     };
     conn.addDataListener(handshakeHandler);
     conn.addCloseListener(() => {
-      this.onDisconnect(conn, to);
+      if (session) {
+        this.onDisconnect(conn, session);
+      }
       void this.connect(to);
     });
     conn.addErrorListener((err) => {
@@ -828,9 +831,9 @@ var ClientTransport = class extends Transport {
     log?.debug(`${this.clientId} -- sending handshake request to ${to}`);
     conn.send(this.codec.toBuffer(requestMsg));
   }
-  onDisconnect(conn, connectedTo) {
-    this.inflightConnectionPromises.delete(connectedTo);
-    super.onDisconnect(conn, connectedTo);
+  onDisconnect(conn, session) {
+    this.inflightConnectionPromises.delete(session.to);
+    super.onDisconnect(conn, session);
   }
 };
 var ServerTransport = class extends Transport {
@@ -867,7 +870,7 @@ var ServerTransport = class extends Transport {
       log?.info(
         `${this.clientId} -- connection (id: ${conn.debugId}) to ${client()} disconnected`
       );
-      this.onDisconnect(conn, session.to);
+      this.onDisconnect(conn, session);
     });
     conn.addErrorListener((err) => {
       if (!session)

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

package/dist/transport/index.js

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

package/dist/util/testHelpers.cjs

@@ -269,6 +269,9 @@ var Session = class {
     this.connection = newConn;
   }
   beginGrace(cb) {
+    log?.info(
+      `${this.from} -- starting ${this.options.sessionDisconnectGraceMs}ms grace period until session (id: ${this.debugId}) to ${this.to} is closed`
+    );
     this.disconnectionGrace = setTimeout(() => {
       this.close();
       cb();

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-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 { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-5c55c0d3.js';
+import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-6f4630d0.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-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 { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-5c55c0d3.js';
+import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-6f4630d0.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-67M47YPQ.js";
+} from "../chunk-ASZ3VDCS.js";
 import "../chunk-5IZ2UHWV.js";
 import {
   Session,
   defaultSessionOptions
-} from "../chunk-NLWRMDT6.js";
+} from "../chunk-MCTB3NYK.js";
 import {
   coerceErrorString
 } from "../chunk-GFRAOY75.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@replit/river",
   "description": "It's like tRPC but... with JSON Schema Support, duplex streaming and support for service multiplexing. Transport agnostic!",
-  "version": "0.13.2",
+  "version": "0.13.4",
   "type": "module",
   "exports": {
     ".": {