@replit/river 0.12.1 → 0.12.3

package/dist/{chunk-QEYN2Z6O.js → chunk-2PKONGC3.js}

@@ -143,7 +143,7 @@ var Session = class {
         log?.info(
           `${this.from} -- closing connection (id: ${this.connection.debugId}) to ${this.to} due to inactivity`
         );
-        this.halfCloseConnection();
+        this.closeStaleConnection(this.connection);
       }
       return;
     }
@@ -204,17 +204,27 @@ var Session = class {
     this.cancelGrace();
     this.connection = newConn;
   }
+  graceCb;
   beginGrace(cb) {
+    this.graceCb = cb;
     this.disconnectionGrace = setTimeout(() => {
-      this.resetBufferedMessages();
-      clearInterval(this.heartbeat);
+      this.close();
       cb();
     }, SESSION_DISCONNECT_GRACE_MS);
   }
+  // called on reconnect of the underlying session
   cancelGrace() {
     this.heartbeatMisses = 0;
     clearTimeout(this.disconnectionGrace);
   }
+  // closed when we want to discard the whole session
+  // (i.e. shutdown or session disconnect)
+  close() {
+    this.closeStaleConnection(this.connection);
+    this.cancelGrace();
+    clearInterval(this.heartbeat);
+    this.resetBufferedMessages();
+  }
   get connected() {
     return this.connection !== void 0;
   }
@@ -233,15 +243,6 @@ var Session = class {
     this.seq++;
     return msg;
   }
-  /**
-   * Closes the out-going connection but doesn't remove the listeners
-   * for incoming messages. The connection will eventually call onClose
-   * when it is ready to be cleaned up and only then will {@link connection} be set back
-   * to undefined
-   */
-  halfCloseConnection() {
-    this.connection?.close();
-  }
   inspectSendBuffer() {
     return this.sendBuffer;
   }
@@ -332,19 +333,18 @@ var Transport = class {
       status: "connect",
       conn
     });
-    let session = this.sessions.get(connectedTo);
+    let oldSession = this.sessions.get(connectedTo);
     const lastInstanceId = this.connectedInstanceIds.get(connectedTo);
-    if (session && lastInstanceId !== instanceId && lastInstanceId !== void 0) {
-      log?.debug(
-        `${this.clientId} -- handshake from ${connectedTo} has different server instance (got: ${instanceId}, last connected to: ${lastInstanceId}), starting a new session`
+    if (oldSession && lastInstanceId !== void 0 && lastInstanceId !== instanceId) {
+      log?.warn(
+        `${this.clientId} -- handshake from ${connectedTo} is a different instance (got: ${instanceId}, last connected to: ${lastInstanceId}), starting a new session`
       );
-      session.resetBufferedMessages();
-      session.closeStaleConnection();
-      this.deleteSession(session);
-      session = void 0;
+      oldSession.close();
+      this.deleteSession(oldSession);
+      oldSession = void 0;
     }
     this.connectedInstanceIds.set(connectedTo, instanceId);
-    if (session === void 0) {
+    if (oldSession === void 0) {
       const newSession = this.createSession(connectedTo, conn);
       log?.info(
         `${this.clientId} -- new connection (id: ${conn.debugId}) for new session (id: ${newSession.debugId}) to ${connectedTo}`
@@ -352,11 +352,11 @@ var Transport = class {
       return newSession;
     }
     log?.info(
-      `${this.clientId} -- new connection (id: ${conn.debugId}) for existing session (id: ${session.debugId}) to ${connectedTo}`
+      `${this.clientId} -- new connection (id: ${conn.debugId}) for existing session (id: ${oldSession.debugId}) to ${connectedTo}`
     );
-    session.replaceWithNewConnection(conn);
-    session.sendBufferedMessages();
-    return session;
+    oldSession.replaceWithNewConnection(conn);
+    oldSession.sendBufferedMessages();
+    return oldSession;
   }
   createSession(connectedTo, conn) {
     const session = new Session(
@@ -374,24 +374,25 @@ var Transport = class {
   }
   deleteSession(session) {
     this.sessions.delete(session.to);
+    log?.info(
+      `${this.clientId} -- session ${session.debugId} disconnect from ${session.to}`
+    );
     this.eventDispatcher.dispatchEvent("sessionStatus", {
       status: "disconnect",
       session
     });
-    log?.info(
-      `${this.clientId} -- session ${session.debugId} disconnect from ${session.to}`
-    );
   }
   /**
    * The downstream implementation needs to call this when a connection is closed.
    * @param conn The connection object.
+   * @param connectedTo The peer we are connected to.
    */
   onDisconnect(conn, connectedTo) {
     this.eventDispatcher.dispatchEvent("connectionStatus", {
       status: "disconnect",
       conn
     });
-    if (!connectedTo)
+    if (this.state !== "open")
       return;
     const session = this.sessionByClientId(connectedTo);
     log?.info(
@@ -434,6 +435,8 @@ var Transport = class {
    * @param msg The received message.
    */
   handleMsg(msg) {
+    if (this.state !== "open")
+      return;
     const session = this.sessionByClientId(msg.from);
     session.cancelGrace();
     log?.debug(`${this.clientId} -- received msg: ${JSON.stringify(msg)}`);
@@ -510,10 +513,11 @@ var Transport = class {
    * Closes the transport. Any messages sent while the transport is closed will be silently discarded.
    */
   close() {
+    this.state = "closed";
     for (const session of this.sessions.values()) {
-      session.halfCloseConnection();
+      session.close();
+      this.deleteSession(session);
     }
-    this.state = "closed";
     log?.info(`${this.clientId} -- manually closed transport`);
   }
   /**
@@ -522,10 +526,11 @@ var Transport = class {
    * Destroys the transport. Any messages sent while the transport is destroyed will throw an error.
    */
   destroy() {
+    this.state = "destroyed";
     for (const session of this.sessions.values()) {
-      session.closeStaleConnection(session.connection);
+      session.close();
+      this.deleteSession(session);
     }
-    this.state = "destroyed";
     log?.info(`${this.clientId} -- manually destroyed transport`);
   }
 };
@@ -631,8 +636,7 @@ var ClientTransport = class extends Transport {
     return bootHandler;
   }
   onDisconnect(conn, connectedTo) {
-    if (connectedTo)
-      this.inflightConnectionPromises.delete(connectedTo);
+    this.inflightConnectionPromises.delete(connectedTo);
     super.onDisconnect(conn, connectedTo);
   }
 };

package/dist/{chunk-RDTTKCGV.js → chunk-6OAKPO5R.js}

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

package/dist/{chunk-TKINU53F.js → chunk-7J66WOIC.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-IIBVKYDB.js";
 import {
   Connection
-} from "./chunk-QEYN2Z6O.js";
+} from "./chunk-2PKONGC3.js";
 
 // transport/impls/uds/connection.ts
 var UdsConnection = class extends Connection {

package/dist/{chunk-55XUAPC6.js → chunk-AFLZ6INU.js}

@@ -756,7 +756,7 @@ var RiverServer = class {
     }
     const disconnectedClientId = evt.session.to;
     log?.info(
-      `${this.transport.clientId} -- got unexpected disconnect from ${disconnectedClientId}, cleaning up streams`
+      `${this.transport.clientId} -- got session disconnect from ${disconnectedClientId}, cleaning up streams`
     );
     const streamsFromThisClient = this.clientStreams.get(disconnectedClientId);
     if (!streamsFromThisClient) {

package/dist/{chunk-M6LY25P2.js → chunk-H4QR2K3T.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-IIBVKYDB.js";
 import {
   Connection
-} from "./chunk-QEYN2Z6O.js";
+} from "./chunk-2PKONGC3.js";
 
 // transport/impls/stdio/connection.ts
 var StreamConnection = class extends Connection {

package/dist/{connection-eb10d250.d.ts → connection-4a839b9a.d.ts}

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

package/dist/{connection-bf7811aa.d.ts → connection-64b9e0ff.d.ts}

@@ -1,4 +1,4 @@
-import { C as Connection } from './index-0c0a69f6.js';
+import { C as Connection } from './index-1afc5580.js';
 import { U as Uint32LengthPrefixFraming } from './messageFraming-b200ef25.js';
 
 declare class StreamConnection extends Connection {

package/dist/{connection-d880aa4a.d.ts → connection-a6cc48e8.d.ts}

@@ -1,4 +1,4 @@
-import { C as Connection } from './index-0c0a69f6.js';
+import { C as Connection } from './index-1afc5580.js';
 import { Socket } from 'node:net';
 import { U as Uint32LengthPrefixFraming } from './messageFraming-b200ef25.js';
 

package/dist/{index-0c0a69f6.d.ts → index-1afc5580.d.ts}

@@ -214,18 +214,13 @@ declare class Session<ConnType extends Connection> {
     addToSendBuff(msg: TransportMessage): void;
     closeStaleConnection(conn?: ConnType): void;
     replaceWithNewConnection(newConn: ConnType): void;
+    graceCb?: () => unknown;
     beginGrace(cb: () => void): void;
     cancelGrace(): void;
+    close(): void;
     get connected(): boolean;
     get nextExpectedSeq(): number;
     constructMsg<Payload extends Record<string, unknown>>(partialMsg: PartialTransportMessage<Payload>): TransportMessage<Payload>;
-    /**
-     * Closes the out-going connection but doesn't remove the listeners
-     * for incoming messages. The connection will eventually call onClose
-     * when it is ready to be cleaned up and only then will {@link connection} be set back
-     * to undefined
-     */
-    halfCloseConnection(): void;
     inspectSendBuffer(): ReadonlyArray<OpaqueTransportMessage>;
 }
 
@@ -359,8 +354,9 @@ declare abstract class Transport<ConnType extends Connection> {
     /**
      * The downstream implementation needs to call this when a connection is closed.
      * @param conn The connection object.
+     * @param connectedTo The peer we are connected to.
      */
-    onDisconnect(conn: ConnType, connectedTo: TransportClientId | undefined): void;
+    onDisconnect(conn: ConnType, connectedTo: TransportClientId): void;
     /**
      * Parses a message from a Uint8Array into a {@link OpaqueTransportMessage}.
      * @param msg The message to parse.
@@ -429,7 +425,7 @@ declare abstract class ClientTransport<ConnType extends Connection> extends Tran
      */
     connect(to: TransportClientId, attempt?: number): Promise<void>;
     receiveWithBootSequence(conn: ConnType, sessionCb: (sess: Session<ConnType>) => void): (data: Uint8Array) => void;
-    onDisconnect(conn: ConnType, connectedTo: string | undefined): void;
+    onDisconnect(conn: ConnType, connectedTo: string): void;
 }
 declare abstract class ServerTransport<ConnType extends Connection> extends Transport<ConnType> {
     constructor(clientId: TransportClientId, providedOptions?: Partial<TransportOptions>);

package/dist/router/index.cjs

@@ -853,7 +853,7 @@ var RiverServer = class {
     }
     const disconnectedClientId = evt.session.to;
     log?.info(
-      `${this.transport.clientId} -- got unexpected disconnect from ${disconnectedClientId}, cleaning up streams`
+      `${this.transport.clientId} -- got session disconnect from ${disconnectedClientId}, cleaning up streams`
     );
     const streamsFromThisClient = this.clientStreams.get(disconnectedClientId);
     if (!streamsFromThisClient) {

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-c593de11.js';
 export { E as Err, O as Ok, m as ProcHandler, k as ProcListing, a as Procedure, o as RiverErrorSchema, c as RiverUncaughtSchema, l as Service, j as ServiceBuilder, n as ServiceContextWithState, U as UNCAUGHT_ERROR, V as ValidProcType, s as serializeService } from '../builder-c593de11.js';
-import { T as Transport, C as Connection, b as TransportClientId } from '../index-0c0a69f6.js';
+import { T as Transport, C as Connection, b as TransportClientId } from '../index-1afc5580.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-c593de11.js';
 export { E as Err, O as Ok, m as ProcHandler, k as ProcListing, a as Procedure, o as RiverErrorSchema, c as RiverUncaughtSchema, l as Service, j as ServiceBuilder, n as ServiceContextWithState, U as UNCAUGHT_ERROR, V as ValidProcType, s as serializeService } from '../builder-c593de11.js';
-import { T as Transport, C as Connection, b as TransportClientId } from '../index-0c0a69f6.js';
+import { T as Transport, C as Connection, b as TransportClientId } from '../index-1afc5580.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-55XUAPC6.js";
+} from "../chunk-AFLZ6INU.js";
 import "../chunk-XFFS4UOD.js";
 import "../chunk-H4BYJELI.js";
 export {

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

@@ -227,7 +227,7 @@ var Session = class {
         log?.info(
           `${this.from} -- closing connection (id: ${this.connection.debugId}) to ${this.to} due to inactivity`
         );
-        this.halfCloseConnection();
+        this.closeStaleConnection(this.connection);
       }
       return;
     }
@@ -288,17 +288,27 @@ var Session = class {
     this.cancelGrace();
     this.connection = newConn;
   }
+  graceCb;
   beginGrace(cb) {
+    this.graceCb = cb;
     this.disconnectionGrace = setTimeout(() => {
-      this.resetBufferedMessages();
-      clearInterval(this.heartbeat);
+      this.close();
       cb();
     }, SESSION_DISCONNECT_GRACE_MS);
   }
+  // called on reconnect of the underlying session
   cancelGrace() {
     this.heartbeatMisses = 0;
     clearTimeout(this.disconnectionGrace);
   }
+  // closed when we want to discard the whole session
+  // (i.e. shutdown or session disconnect)
+  close() {
+    this.closeStaleConnection(this.connection);
+    this.cancelGrace();
+    clearInterval(this.heartbeat);
+    this.resetBufferedMessages();
+  }
   get connected() {
     return this.connection !== void 0;
   }
@@ -317,15 +327,6 @@ var Session = class {
     this.seq++;
     return msg;
   }
-  /**
-   * Closes the out-going connection but doesn't remove the listeners
-   * for incoming messages. The connection will eventually call onClose
-   * when it is ready to be cleaned up and only then will {@link connection} be set back
-   * to undefined
-   */
-  halfCloseConnection() {
-    this.connection?.close();
-  }
   inspectSendBuffer() {
     return this.sendBuffer;
   }
@@ -477,19 +478,18 @@ var Transport = class {
       status: "connect",
       conn
     });
-    let session = this.sessions.get(connectedTo);
+    let oldSession = this.sessions.get(connectedTo);
     const lastInstanceId = this.connectedInstanceIds.get(connectedTo);
-    if (session && lastInstanceId !== instanceId && lastInstanceId !== void 0) {
-      log?.debug(
-        `${this.clientId} -- handshake from ${connectedTo} has different server instance (got: ${instanceId}, last connected to: ${lastInstanceId}), starting a new session`
+    if (oldSession && lastInstanceId !== void 0 && lastInstanceId !== instanceId) {
+      log?.warn(
+        `${this.clientId} -- handshake from ${connectedTo} is a different instance (got: ${instanceId}, last connected to: ${lastInstanceId}), starting a new session`
       );
-      session.resetBufferedMessages();
-      session.closeStaleConnection();
-      this.deleteSession(session);
-      session = void 0;
+      oldSession.close();
+      this.deleteSession(oldSession);
+      oldSession = void 0;
     }
     this.connectedInstanceIds.set(connectedTo, instanceId);
-    if (session === void 0) {
+    if (oldSession === void 0) {
       const newSession = this.createSession(connectedTo, conn);
       log?.info(
         `${this.clientId} -- new connection (id: ${conn.debugId}) for new session (id: ${newSession.debugId}) to ${connectedTo}`
@@ -497,11 +497,11 @@ var Transport = class {
       return newSession;
     }
     log?.info(
-      `${this.clientId} -- new connection (id: ${conn.debugId}) for existing session (id: ${session.debugId}) to ${connectedTo}`
+      `${this.clientId} -- new connection (id: ${conn.debugId}) for existing session (id: ${oldSession.debugId}) to ${connectedTo}`
     );
-    session.replaceWithNewConnection(conn);
-    session.sendBufferedMessages();
-    return session;
+    oldSession.replaceWithNewConnection(conn);
+    oldSession.sendBufferedMessages();
+    return oldSession;
   }
   createSession(connectedTo, conn) {
     const session = new Session(
@@ -519,24 +519,25 @@ var Transport = class {
   }
   deleteSession(session) {
     this.sessions.delete(session.to);
+    log?.info(
+      `${this.clientId} -- session ${session.debugId} disconnect from ${session.to}`
+    );
     this.eventDispatcher.dispatchEvent("sessionStatus", {
       status: "disconnect",
       session
     });
-    log?.info(
-      `${this.clientId} -- session ${session.debugId} disconnect from ${session.to}`
-    );
   }
   /**
    * The downstream implementation needs to call this when a connection is closed.
    * @param conn The connection object.
+   * @param connectedTo The peer we are connected to.
    */
   onDisconnect(conn, connectedTo) {
     this.eventDispatcher.dispatchEvent("connectionStatus", {
       status: "disconnect",
       conn
     });
-    if (!connectedTo)
+    if (this.state !== "open")
       return;
     const session = this.sessionByClientId(connectedTo);
     log?.info(
@@ -579,6 +580,8 @@ var Transport = class {
    * @param msg The received message.
    */
   handleMsg(msg) {
+    if (this.state !== "open")
+      return;
     const session = this.sessionByClientId(msg.from);
     session.cancelGrace();
     log?.debug(`${this.clientId} -- received msg: ${JSON.stringify(msg)}`);
@@ -655,10 +658,11 @@ var Transport = class {
    * Closes the transport. Any messages sent while the transport is closed will be silently discarded.
    */
   close() {
+    this.state = "closed";
     for (const session of this.sessions.values()) {
-      session.halfCloseConnection();
+      session.close();
+      this.deleteSession(session);
     }
-    this.state = "closed";
     log?.info(`${this.clientId} -- manually closed transport`);
   }
   /**
@@ -667,10 +671,11 @@ var Transport = class {
    * Destroys the transport. Any messages sent while the transport is destroyed will throw an error.
    */
   destroy() {
+    this.state = "destroyed";
     for (const session of this.sessions.values()) {
-      session.closeStaleConnection(session.connection);
+      session.close();
+      this.deleteSession(session);
     }
-    this.state = "destroyed";
     log?.info(`${this.clientId} -- manually destroyed transport`);
   }
 };
@@ -776,8 +781,7 @@ var ClientTransport = class extends Transport {
     return bootHandler;
   }
   onDisconnect(conn, connectedTo) {
-    if (connectedTo)
-      this.inflightConnectionPromises.delete(connectedTo);
+    this.inflightConnectionPromises.delete(connectedTo);
     super.onDisconnect(conn, connectedTo);
   }
 };

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

@@ -1,5 +1,5 @@
-import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-0c0a69f6.js';
-import { S as StreamConnection } from '../../../connection-bf7811aa.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-1afc5580.js';
+import { S as StreamConnection } from '../../../connection-64b9e0ff.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import '../../../messageFraming-b200ef25.js';

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

@@ -1,5 +1,5 @@
-import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-0c0a69f6.js';
-import { S as StreamConnection } from '../../../connection-bf7811aa.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-1afc5580.js';
+import { S as StreamConnection } from '../../../connection-64b9e0ff.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import '../../../messageFraming-b200ef25.js';

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

@@ -1,11 +1,11 @@
 import {
   StreamConnection
-} from "../../../chunk-M6LY25P2.js";
+} from "../../../chunk-H4QR2K3T.js";
 import "../../../chunk-5IZ2UHWV.js";
 import "../../../chunk-IIBVKYDB.js";
 import {
   ClientTransport
-} from "../../../chunk-QEYN2Z6O.js";
+} from "../../../chunk-2PKONGC3.js";
 import "../../../chunk-GZ7HCLLM.js";
 import "../../../chunk-XFFS4UOD.js";
 import {