@replit/river 0.12.2 → 0.12.4

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

@@ -260,17 +260,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;
   }
@@ -289,16 +299,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;
   }
@@ -574,19 +574,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}`
@@ -594,11 +593,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(
@@ -627,13 +626,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(
@@ -676,6 +676,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)}`);
@@ -752,10 +754,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`);
   }
   /**
@@ -764,10 +767,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`);
   }
 };
@@ -873,8 +877,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/uds/client.d.cts

@@ -1,5 +1,5 @@
-import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-0c0a69f6.js';
-import { U as UdsConnection } from '../../../connection-d880aa4a.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-1afc5580.js';
+import { U as UdsConnection } from '../../../connection-a6cc48e8.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-0c0a69f6.js';
-import { U as UdsConnection } from '../../../connection-d880aa4a.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-1afc5580.js';
+import { U as UdsConnection } from '../../../connection-a6cc48e8.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:net';

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

@@ -1,10 +1,10 @@
 import {
   UdsConnection
-} from "../../../chunk-PIF32FUL.js";
+} from "../../../chunk-7J66WOIC.js";
 import "../../../chunk-IIBVKYDB.js";
 import {
   ClientTransport
-} from "../../../chunk-CT57CKBS.js";
+} from "../../../chunk-2PKONGC3.js";
 import "../../../chunk-GZ7HCLLM.js";
 import "../../../chunk-XFFS4UOD.js";
 import {

package/dist/transport/impls/uds/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/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-0c0a69f6.js';
-import { U as UdsConnection } from '../../../connection-d880aa4a.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-1afc5580.js';
+import { U as UdsConnection } from '../../../connection-a6cc48e8.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import '../../../messageFraming-b200ef25.js';

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-0c0a69f6.js';
-import { U as UdsConnection } from '../../../connection-d880aa4a.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-1afc5580.js';
+import { U as UdsConnection } from '../../../connection-a6cc48e8.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import '../../../messageFraming-b200ef25.js';

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

@@ -1,10 +1,10 @@
 import {
   UdsConnection
-} from "../../../chunk-PIF32FUL.js";
+} from "../../../chunk-7J66WOIC.js";
 import "../../../chunk-IIBVKYDB.js";
 import {
   ServerTransport
-} from "../../../chunk-CT57CKBS.js";
+} from "../../../chunk-2PKONGC3.js";
 import "../../../chunk-GZ7HCLLM.js";
 import "../../../chunk-XFFS4UOD.js";
 import {

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

@@ -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,16 +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();
-    clearInterval(this.heartbeat);
-  }
   inspectSendBuffer() {
     return this.sendBuffer;
   }
@@ -478,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) {
+    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}`
@@ -498,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(
@@ -531,13 +530,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(
@@ -580,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)}`);
@@ -656,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`);
   }
   /**
@@ -668,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`);
   }
 };
@@ -777,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);
   }
 };
@@ -864,9 +867,12 @@ var WebSocketClientTransport = class extends ClientTransport {
           resolve({ err: evt.reason });
         };
         const onError = (evt) => {
+          const err = evt.error;
           ws.removeEventListener("error", onError);
           ws.removeEventListener("close", onClose);
-          resolve({ err: evt.message });
+          resolve({
+            err: err?.code ?? coerceErrorString(err)
+          });
         };
         ws.addEventListener("open", onOpen);
         ws.addEventListener("close", onClose);

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

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

@@ -1,11 +1,13 @@
 import {
   WebSocketConnection
-} from "../../../chunk-NHSJ4RDY.js";
+} from "../../../chunk-6OAKPO5R.js";
 import {
   ClientTransport
-} from "../../../chunk-CT57CKBS.js";
+} from "../../../chunk-2PKONGC3.js";
 import "../../../chunk-GZ7HCLLM.js";
-import "../../../chunk-XFFS4UOD.js";
+import {
+  coerceErrorString
+} from "../../../chunk-XFFS4UOD.js";
 import {
   log
 } from "../../../chunk-H4BYJELI.js";
@@ -58,9 +60,12 @@ var WebSocketClientTransport = class extends ClientTransport {
           resolve({ err: evt.reason });
         };
         const onError = (evt) => {
+          const err = evt.error;
           ws.removeEventListener("error", onError);
           ws.removeEventListener("close", onClose);
-          resolve({ err: evt.message });
+          resolve({
+            err: err?.code ?? coerceErrorString(err)
+          });
         };
         ws.addEventListener("open", onOpen);
         ws.addEventListener("close", onClose);