@replit/river 0.12.2 → 0.12.4

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

@@ -296,17 +296,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;
   }
@@ -325,16 +335,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();
-    clearInterval(this.heartbeat);
-  }
   inspectSendBuffer() {
     return this.sendBuffer;
   }
@@ -486,19 +486,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) {
+    if (oldSession && lastInstanceId !== void 0 && lastInstanceId !== instanceId) {
       log?.warn(
-        `${this.clientId} -- handshake from ${connectedTo} has different server instance (got: ${instanceId}, last connected to: ${lastInstanceId}), starting a new session`
+        `${this.clientId} -- handshake from ${connectedTo} is a different instance (got: ${instanceId}, last connected to: ${lastInstanceId}), starting a new session`
       );
-      session.resetBufferedMessages();
-      session.closeStaleConnection(conn);
-      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}`
@@ -506,11 +505,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(
@@ -539,13 +538,14 @@ var Transport = class {
   /**
    * 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(
@@ -588,6 +588,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)}`);
@@ -664,10 +666,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`);
   }
   /**
@@ -676,10 +679,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`);
   }
 };

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

@@ -1,7 +1,7 @@
-import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-0c0a69f6.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-1afc5580.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-eb10d250.js';
+import { W as WebSocketConnection } from '../../../connection-4a839b9a.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-0c0a69f6.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-1afc5580.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-eb10d250.js';
+import { W as WebSocketConnection } from '../../../connection-4a839b9a.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

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

@@ -1,9 +1,9 @@
 import {
   WebSocketConnection
-} from "../../../chunk-NHSJ4RDY.js";
+} from "../../../chunk-6OAKPO5R.js";
 import {
   ServerTransport
-} from "../../../chunk-CT57CKBS.js";
+} from "../../../chunk-2PKONGC3.js";
 import "../../../chunk-GZ7HCLLM.js";
 import "../../../chunk-XFFS4UOD.js";
 import {

package/dist/transport/index.cjs

@@ -318,17 +318,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;
   }
@@ -347,16 +357,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();
-    clearInterval(this.heartbeat);
-  }
   inspectSendBuffer() {
     return this.sendBuffer;
   }
@@ -508,19 +508,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) {
+    if (oldSession && lastInstanceId !== void 0 && lastInstanceId !== instanceId) {
       log?.warn(
-        `${this.clientId} -- handshake from ${connectedTo} has different server instance (got: ${instanceId}, last connected to: ${lastInstanceId}), starting a new session`
+        `${this.clientId} -- handshake from ${connectedTo} is a different instance (got: ${instanceId}, last connected to: ${lastInstanceId}), starting a new session`
       );
-      session.resetBufferedMessages();
-      session.closeStaleConnection(conn);
-      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}`
@@ -528,11 +527,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(
@@ -561,13 +560,14 @@ var Transport = class {
   /**
    * 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(
@@ -610,6 +610,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)}`);
@@ -686,10 +688,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`);
   }
   /**
@@ -698,10 +701,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`);
   }
 };
@@ -807,8 +811,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/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-0c0a69f6.js';
+export { a as ClientTransport, C as Connection, k as EventHandler, E as EventMap, j as EventTypes, O as OpaqueTransportMessage, f as OpaqueTransportMessageSchema, S as ServerTransport, d as Session, T as Transport, b as TransportClientId, g as TransportMessage, e as TransportMessageSchema, h as isStreamClose, i as isStreamOpen } from '../index-1afc5580.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-0c0a69f6.js';
+export { a as ClientTransport, C as Connection, k as EventHandler, E as EventMap, j as EventTypes, O as OpaqueTransportMessage, f as OpaqueTransportMessageSchema, S as ServerTransport, d as Session, T as Transport, b as TransportClientId, g as TransportMessage, e as TransportMessageSchema, h as isStreamClose, i as isStreamOpen } from '../index-1afc5580.js';
 import '../types-3e5768ec.js';
 import '@sinclair/typebox';

package/dist/transport/index.js

@@ -5,7 +5,7 @@ import {
   ServerTransport,
   Session,
   Transport
-} from "../chunk-CT57CKBS.js";
+} from "../chunk-2PKONGC3.js";
 import "../chunk-GZ7HCLLM.js";
 import {
   OpaqueTransportMessageSchema,

package/dist/util/testHelpers.d.cts

@@ -1,7 +1,7 @@
 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-0c0a69f6.js';
+import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-1afc5580.js';
 import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-c593de11.js';
 import { Static } from '@sinclair/typebox';
 import net from 'node:net';

package/dist/util/testHelpers.d.ts

@@ -1,7 +1,7 @@
 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-0c0a69f6.js';
+import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-1afc5580.js';
 import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-c593de11.js';
 import { Static } from '@sinclair/typebox';
 import net from 'node:net';

package/dist/util/testHelpers.js

@@ -1,7 +1,7 @@
 import {
   UNCAUGHT_ERROR,
   pushable
-} from "../chunk-55XUAPC6.js";
+} from "../chunk-AFLZ6INU.js";
 import {
   coerceErrorString
 } from "../chunk-XFFS4UOD.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.12.2",
+  "version": "0.12.4",
   "type": "module",
   "exports": {
     ".": {