@replit/river 0.12.0 → 0.12.2

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

@@ -54,7 +54,8 @@ var ControlMessageCloseSchema = import_typebox.Type.Object({
 var PROTOCOL_VERSION = "v1";
 var ControlMessageHandshakeRequestSchema = import_typebox.Type.Object({
   type: import_typebox.Type.Literal("HANDSHAKE_REQ"),
-  protocolVersion: import_typebox.Type.Literal(PROTOCOL_VERSION)
+  protocolVersion: import_typebox.Type.Literal(PROTOCOL_VERSION),
+  instanceId: import_typebox.Type.String()
 });
 var ControlMessageHandshakeResponseSchema = import_typebox.Type.Object({
   type: import_typebox.Type.Literal("HANDSHAKE_RESP"),
@@ -78,7 +79,7 @@ var ControlMessagePayloadSchema = import_typebox.Type.Union([
 var OpaqueTransportMessageSchema = TransportMessageSchema(
   import_typebox.Type.Unknown()
 );
-function bootRequestMessage(from, to) {
+function bootRequestMessage(from, to, instanceId) {
   return {
     id: (0, import_nanoid.nanoid)(),
     from,
@@ -89,7 +90,8 @@ function bootRequestMessage(from, to) {
     controlFlags: 0,
     payload: {
       type: "HANDSHAKE_REQ",
-      protocolVersion: PROTOCOL_VERSION
+      protocolVersion: PROTOCOL_VERSION,
+      instanceId
     }
   };
 }
@@ -135,9 +137,9 @@ var Connection = class {
     this.debugId = `conn-${unsafeId()}`;
   }
 };
-var HEARTBEAT_INTERVAL_MS = 250;
-var HEARTBEATS_TILL_DEAD = 4;
-var SESSION_DISCONNECT_GRACE_MS = 3e3;
+var HEARTBEAT_INTERVAL_MS = 1e3;
+var HEARTBEATS_TILL_DEAD = 2;
+var SESSION_DISCONNECT_GRACE_MS = 5e3;
 var Session = class {
   codec;
   /**
@@ -220,11 +222,13 @@ var Session = class {
     return fullMsg.id;
   }
   sendHeartbeat() {
-    if (this.heartbeatMisses >= HEARTBEATS_TILL_DEAD && this.connection) {
-      log?.info(
-        `${this.from} -- closing connection (id: ${this.connection.debugId}) to ${this.to} due to inactivity`
-      );
-      this.halfCloseConnection();
+    if (this.heartbeatMisses >= HEARTBEATS_TILL_DEAD) {
+      if (this.connection) {
+        log?.info(
+          `${this.from} -- closing connection (id: ${this.connection.debugId}) to ${this.to} due to inactivity`
+        );
+        this.closeStaleConnection(this.connection);
+      }
       return;
     }
     this.send(
@@ -261,7 +265,6 @@ var Session = class {
     }
   }
   updateBookkeeping(ack, seq) {
-    this.heartbeatMisses = 0;
     this.sendBuffer = this.sendBuffer.filter((unacked) => unacked.seq > ack);
     this.ack = seq + 1;
   }
@@ -293,6 +296,7 @@ var Session = class {
     }, SESSION_DISCONNECT_GRACE_MS);
   }
   cancelGrace() {
+    this.heartbeatMisses = 0;
     clearTimeout(this.disconnectionGrace);
   }
   get connected() {
@@ -321,6 +325,7 @@ var Session = class {
    */
   halfCloseConnection() {
     this.connection?.close();
+    clearInterval(this.heartbeat);
   }
   inspectSendBuffer() {
     return this.sendBuffer;
@@ -400,6 +405,13 @@ var defaultTransportOptions = {
   codec: NaiveJsonCodec
 };
 var Transport = class {
+  /**
+   * Unique per instance of the transport.
+   * This allows us to distinguish reconnects to different
+   * transports.
+   */
+  instanceId = (0, import_nanoid3.nanoid)();
+  connectedInstanceIds = /* @__PURE__ */ new Map();
   /**
    * A flag indicating whether the transport has been destroyed.
    * A destroyed transport will not attempt to reconnect and cannot be used again.
@@ -461,12 +473,23 @@ var Transport = class {
    * and we know the identity of the connected client.
    * @param conn The connection object.
    */
-  onConnect(conn, connectedTo) {
+  onConnect(conn, connectedTo, instanceId) {
     this.eventDispatcher.dispatchEvent("connectionStatus", {
       status: "connect",
       conn
     });
-    const session = this.sessions.get(connectedTo);
+    let session = this.sessions.get(connectedTo);
+    const lastInstanceId = this.connectedInstanceIds.get(connectedTo);
+    if (session && lastInstanceId !== instanceId && lastInstanceId !== void 0) {
+      log?.warn(
+        `${this.clientId} -- handshake from ${connectedTo} has different server instance (got: ${instanceId}, last connected to: ${lastInstanceId}), starting a new session`
+      );
+      session.resetBufferedMessages();
+      session.closeStaleConnection(conn);
+      this.deleteSession(session);
+      session = void 0;
+    }
+    this.connectedInstanceIds.set(connectedTo, instanceId);
     if (session === void 0) {
       const newSession = this.createSession(connectedTo, conn);
       log?.info(
@@ -497,13 +520,13 @@ 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.
@@ -532,11 +555,13 @@ var Transport = class {
     const parsedMsg = this.codec.fromBuffer(msg);
     if (parsedMsg === null) {
       const decodedBuffer = new TextDecoder().decode(msg);
-      log?.warn(`${this.clientId} -- received malformed msg: ${decodedBuffer}`);
+      log?.error(
+        `${this.clientId} -- received malformed msg, killing conn: ${decodedBuffer}`
+      );
       return null;
     }
     if (!import_value.Value.Check(OpaqueTransportMessageSchema, parsedMsg)) {
-      log?.warn(
+      log?.error(
         `${this.clientId} -- received invalid msg: ${JSON.stringify(
           parsedMsg
         )}`
@@ -555,9 +580,6 @@ var Transport = class {
    * @param msg The received message.
    */
   handleMsg(msg) {
-    if (!msg) {
-      return;
-    }
     const session = this.sessionByClientId(msg.from);
     session.cancelGrace();
     log?.debug(`${this.clientId} -- received msg: ${JSON.stringify(msg)}`);
@@ -659,7 +681,6 @@ var ClientTransport = class extends Transport {
    */
   inflightConnectionPromises;
   tryReconnecting = true;
-  serverInstanceIds = /* @__PURE__ */ new Map();
   constructor(clientId, providedOptions) {
     super(clientId, providedOptions);
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
@@ -667,7 +688,14 @@ var ClientTransport = class extends Transport {
   handleConnection(conn, to) {
     const bootHandler = this.receiveWithBootSequence(conn, () => {
       conn.removeDataListener(bootHandler);
-      conn.addDataListener((data) => this.handleMsg(this.parseMsg(data)));
+      conn.addDataListener((data) => {
+        const parsed = this.parseMsg(data);
+        if (!parsed) {
+          conn.close();
+          return;
+        }
+        this.handleMsg(parsed);
+      });
     });
     conn.addDataListener(bootHandler);
     conn.addCloseListener(() => {
@@ -699,7 +727,7 @@ var ClientTransport = class extends Transport {
     try {
       const conn = await reconnectPromise;
       this.state = "open";
-      const requestMsg = bootRequestMessage(this.clientId, to);
+      const requestMsg = bootRequestMessage(this.clientId, to, this.instanceId);
       log?.debug(`${this.clientId} -- sending boot handshake to ${to}`);
       conn.send(this.codec.toBuffer(requestMsg));
     } catch (error) {
@@ -722,8 +750,10 @@ var ClientTransport = class extends Transport {
   receiveWithBootSequence(conn, sessionCb) {
     const bootHandler = (data) => {
       const parsed = this.parseMsg(data);
-      if (!parsed)
+      if (!parsed) {
+        conn.close();
         return;
+      }
       if (!import_value.Value.Check(ControlMessageHandshakeResponseSchema, parsed.payload)) {
         log?.warn(
           `${this.clientId} -- received invalid handshake resp: ${JSON.stringify(parsed)}`
@@ -738,22 +768,11 @@ var ClientTransport = class extends Transport {
         );
         return;
       }
-      const oldSession = this.sessions.get(parsed.from);
       const serverInstanceId = parsed.payload.status.instanceId;
-      const lastServerInstanceId = this.serverInstanceIds.get(parsed.from);
-      if (oldSession && lastServerInstanceId !== serverInstanceId && lastServerInstanceId !== void 0) {
-        log?.debug(
-          `${this.clientId} -- handshake from ${parsed.from} has different server instance (got: ${serverInstanceId}, last connected to: ${lastServerInstanceId}), starting a new session`
-        );
-        oldSession.resetBufferedMessages();
-        oldSession.closeStaleConnection();
-        this.deleteSession(oldSession);
-      }
       log?.debug(
         `${this.clientId} -- handshake from ${parsed.from} ok (server instance: ${serverInstanceId})`
       );
-      this.serverInstanceIds.set(parsed.from, serverInstanceId);
-      sessionCb(this.onConnect(conn, parsed.from));
+      sessionCb(this.onConnect(conn, parsed.from, serverInstanceId));
     };
     return bootHandler;
   }

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

@@ -1,5 +1,5 @@
-import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-d91775d9.js';
-import { S as StreamConnection } from '../../../connection-2956a1c5.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-0c0a69f6.js';
+import { S as StreamConnection } from '../../../connection-bf7811aa.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-d91775d9.js';
-import { S as StreamConnection } from '../../../connection-2956a1c5.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-0c0a69f6.js';
+import { S as StreamConnection } from '../../../connection-bf7811aa.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import '../../../messageFraming-b200ef25.js';

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

@@ -1,13 +1,13 @@
 import {
   StreamConnection
-} from "../../../chunk-IUDKWAOK.js";
+} from "../../../chunk-R6YJHJV7.js";
 import "../../../chunk-5IZ2UHWV.js";
 import "../../../chunk-IIBVKYDB.js";
 import {
   ClientTransport
-} from "../../../chunk-ANGOKBE5.js";
+} from "../../../chunk-CT57CKBS.js";
 import "../../../chunk-GZ7HCLLM.js";
-import "../../../chunk-WTOIOXB7.js";
+import "../../../chunk-XFFS4UOD.js";
 import {
   log
 } from "../../../chunk-H4BYJELI.js";

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

@@ -51,7 +51,8 @@ var ControlMessageCloseSchema = import_typebox.Type.Object({
 var PROTOCOL_VERSION = "v1";
 var ControlMessageHandshakeRequestSchema = import_typebox.Type.Object({
   type: import_typebox.Type.Literal("HANDSHAKE_REQ"),
-  protocolVersion: import_typebox.Type.Literal(PROTOCOL_VERSION)
+  protocolVersion: import_typebox.Type.Literal(PROTOCOL_VERSION),
+  instanceId: import_typebox.Type.String()
 });
 var ControlMessageHandshakeResponseSchema = import_typebox.Type.Object({
   type: import_typebox.Type.Literal("HANDSHAKE_RESP"),
@@ -144,9 +145,9 @@ var Connection = class {
     this.debugId = `conn-${unsafeId()}`;
   }
 };
-var HEARTBEAT_INTERVAL_MS = 250;
-var HEARTBEATS_TILL_DEAD = 4;
-var SESSION_DISCONNECT_GRACE_MS = 3e3;
+var HEARTBEAT_INTERVAL_MS = 1e3;
+var HEARTBEATS_TILL_DEAD = 2;
+var SESSION_DISCONNECT_GRACE_MS = 5e3;
 var Session = class {
   codec;
   /**
@@ -229,11 +230,13 @@ var Session = class {
     return fullMsg.id;
   }
   sendHeartbeat() {
-    if (this.heartbeatMisses >= HEARTBEATS_TILL_DEAD && this.connection) {
-      log?.info(
-        `${this.from} -- closing connection (id: ${this.connection.debugId}) to ${this.to} due to inactivity`
-      );
-      this.halfCloseConnection();
+    if (this.heartbeatMisses >= HEARTBEATS_TILL_DEAD) {
+      if (this.connection) {
+        log?.info(
+          `${this.from} -- closing connection (id: ${this.connection.debugId}) to ${this.to} due to inactivity`
+        );
+        this.closeStaleConnection(this.connection);
+      }
       return;
     }
     this.send(
@@ -270,7 +273,6 @@ var Session = class {
     }
   }
   updateBookkeeping(ack, seq) {
-    this.heartbeatMisses = 0;
     this.sendBuffer = this.sendBuffer.filter((unacked) => unacked.seq > ack);
     this.ack = seq + 1;
   }
@@ -302,6 +304,7 @@ var Session = class {
     }, SESSION_DISCONNECT_GRACE_MS);
   }
   cancelGrace() {
+    this.heartbeatMisses = 0;
     clearTimeout(this.disconnectionGrace);
   }
   get connected() {
@@ -330,6 +333,7 @@ var Session = class {
    */
   halfCloseConnection() {
     this.connection?.close();
+    clearInterval(this.heartbeat);
   }
   inspectSendBuffer() {
     return this.sendBuffer;
@@ -409,6 +413,13 @@ var defaultTransportOptions = {
   codec: NaiveJsonCodec
 };
 var Transport = class {
+  /**
+   * Unique per instance of the transport.
+   * This allows us to distinguish reconnects to different
+   * transports.
+   */
+  instanceId = (0, import_nanoid3.nanoid)();
+  connectedInstanceIds = /* @__PURE__ */ new Map();
   /**
    * A flag indicating whether the transport has been destroyed.
    * A destroyed transport will not attempt to reconnect and cannot be used again.
@@ -470,12 +481,23 @@ var Transport = class {
    * and we know the identity of the connected client.
    * @param conn The connection object.
    */
-  onConnect(conn, connectedTo) {
+  onConnect(conn, connectedTo, instanceId) {
     this.eventDispatcher.dispatchEvent("connectionStatus", {
       status: "connect",
       conn
     });
-    const session = this.sessions.get(connectedTo);
+    let session = this.sessions.get(connectedTo);
+    const lastInstanceId = this.connectedInstanceIds.get(connectedTo);
+    if (session && lastInstanceId !== instanceId && lastInstanceId !== void 0) {
+      log?.warn(
+        `${this.clientId} -- handshake from ${connectedTo} has different server instance (got: ${instanceId}, last connected to: ${lastInstanceId}), starting a new session`
+      );
+      session.resetBufferedMessages();
+      session.closeStaleConnection(conn);
+      this.deleteSession(session);
+      session = void 0;
+    }
+    this.connectedInstanceIds.set(connectedTo, instanceId);
     if (session === void 0) {
       const newSession = this.createSession(connectedTo, conn);
       log?.info(
@@ -506,13 +528,13 @@ 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.
@@ -541,11 +563,13 @@ var Transport = class {
     const parsedMsg = this.codec.fromBuffer(msg);
     if (parsedMsg === null) {
       const decodedBuffer = new TextDecoder().decode(msg);
-      log?.warn(`${this.clientId} -- received malformed msg: ${decodedBuffer}`);
+      log?.error(
+        `${this.clientId} -- received malformed msg, killing conn: ${decodedBuffer}`
+      );
       return null;
     }
     if (!import_value.Value.Check(OpaqueTransportMessageSchema, parsedMsg)) {
-      log?.warn(
+      log?.error(
         `${this.clientId} -- received invalid msg: ${JSON.stringify(
           parsedMsg
         )}`
@@ -564,9 +588,6 @@ var Transport = class {
    * @param msg The received message.
    */
   handleMsg(msg) {
-    if (!msg) {
-      return;
-    }
     const session = this.sessionByClientId(msg.from);
     session.cancelGrace();
     log?.debug(`${this.clientId} -- received msg: ${JSON.stringify(msg)}`);
@@ -663,14 +684,6 @@ var Transport = class {
   }
 };
 var ServerTransport = class extends Transport {
-  /**
-   * Unique per instance of server transport.
-   * This allows us to distinguish reconnects to different
-   * server transports at the same reachable address and signal
-   * the appropriate session disconnect back to the client at the
-   * boot stage.
-   */
-  instanceId = (0, import_nanoid3.nanoid)();
   constructor(clientId, providedOptions) {
     super(clientId, providedOptions);
     log?.info(
@@ -685,7 +698,14 @@ var ServerTransport = class extends Transport {
       (establishedSession) => {
         session = establishedSession;
         conn.removeDataListener(bootHandler);
-        conn.addDataListener((data) => this.handleMsg(this.parseMsg(data)));
+        conn.addDataListener((data) => {
+          const parsed = this.parseMsg(data);
+          if (!parsed) {
+            conn.close();
+            return;
+          }
+          this.handleMsg(parsed);
+        });
       }
     );
     conn.addDataListener(bootHandler);
@@ -708,8 +728,10 @@ var ServerTransport = class extends Transport {
   receiveWithBootSequence(conn, sessionCb) {
     const bootHandler = (data) => {
       const parsed = this.parseMsg(data);
-      if (!parsed)
+      if (!parsed) {
+        conn.close();
         return;
+      }
       if (!import_value.Value.Check(ControlMessageHandshakeRequestSchema, parsed.payload)) {
         const responseMsg2 = bootResponseMessage(
           this.clientId,
@@ -725,8 +747,9 @@ var ServerTransport = class extends Transport {
         );
         return;
       }
+      const instanceId = parsed.payload.instanceId;
       log?.debug(
-        `${this.clientId} -- handshake from ${parsed.from} ok, responding with handshake success`
+        `${this.clientId} -- handshake from ${parsed.from} ok (instance id: ${instanceId}), responding with handshake success`
       );
       const responseMsg = bootResponseMessage(
         this.clientId,
@@ -735,7 +758,7 @@ var ServerTransport = class extends Transport {
         true
       );
       conn.send(this.codec.toBuffer(responseMsg));
-      sessionCb(this.onConnect(conn, parsed.from));
+      sessionCb(this.onConnect(conn, parsed.from, instanceId));
     };
     return bootHandler;
   }

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

@@ -1,5 +1,5 @@
-import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-d91775d9.js';
-import { S as StreamConnection } from '../../../connection-2956a1c5.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-0c0a69f6.js';
+import { S as StreamConnection } from '../../../connection-bf7811aa.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import '../../../messageFraming-b200ef25.js';

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

@@ -1,5 +1,5 @@
-import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-d91775d9.js';
-import { S as StreamConnection } from '../../../connection-2956a1c5.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-0c0a69f6.js';
+import { S as StreamConnection } from '../../../connection-bf7811aa.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import '../../../messageFraming-b200ef25.js';

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

@@ -1,13 +1,13 @@
 import {
   StreamConnection
-} from "../../../chunk-IUDKWAOK.js";
+} from "../../../chunk-R6YJHJV7.js";
 import "../../../chunk-5IZ2UHWV.js";
 import "../../../chunk-IIBVKYDB.js";
 import {
   ServerTransport
-} from "../../../chunk-ANGOKBE5.js";
+} from "../../../chunk-CT57CKBS.js";
 import "../../../chunk-GZ7HCLLM.js";
-import "../../../chunk-WTOIOXB7.js";
+import "../../../chunk-XFFS4UOD.js";
 import "../../../chunk-H4BYJELI.js";
 
 // transport/impls/stdio/server.ts