@replit/river 0.12.0 → 0.12.2

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

@@ -3,7 +3,7 @@ import {
   coerceErrorString,
   isStreamClose,
   isStreamOpen
-} from "./chunk-WTOIOXB7.js";
+} from "./chunk-XFFS4UOD.js";
 import {
   log
 } from "./chunk-H4BYJELI.js";

package/dist/{chunk-ANGOKBE5.js → chunk-CT57CKBS.js}

@@ -10,7 +10,7 @@ import {
   bootResponseMessage,
   coerceErrorString,
   isAck
-} from "./chunk-WTOIOXB7.js";
+} from "./chunk-XFFS4UOD.js";
 import {
   log
 } from "./chunk-H4BYJELI.js";
@@ -53,9 +53,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;
   /**
@@ -138,11 +138,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(
@@ -179,7 +181,6 @@ var Session = class {
     }
   }
   updateBookkeeping(ack, seq) {
-    this.heartbeatMisses = 0;
     this.sendBuffer = this.sendBuffer.filter((unacked) => unacked.seq > ack);
     this.ack = seq + 1;
   }
@@ -211,6 +212,7 @@ var Session = class {
     }, SESSION_DISCONNECT_GRACE_MS);
   }
   cancelGrace() {
+    this.heartbeatMisses = 0;
     clearTimeout(this.disconnectionGrace);
   }
   get connected() {
@@ -239,6 +241,7 @@ var Session = class {
    */
   halfCloseConnection() {
     this.connection?.close();
+    clearInterval(this.heartbeat);
   }
   inspectSendBuffer() {
     return this.sendBuffer;
@@ -257,6 +260,13 @@ var defaultTransportOptions = {
   codec: NaiveJsonCodec
 };
 var Transport = class {
+  /**
+   * Unique per instance of the transport.
+   * This allows us to distinguish reconnects to different
+   * transports.
+   */
+  instanceId = nanoid2();
+  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.
@@ -318,12 +328,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(
@@ -354,13 +375,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.
@@ -389,11 +410,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 (!Value.Check(OpaqueTransportMessageSchema, parsedMsg)) {
-      log?.warn(
+      log?.error(
         `${this.clientId} -- received invalid msg: ${JSON.stringify(
           parsedMsg
         )}`
@@ -412,9 +435,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)}`);
@@ -516,7 +536,6 @@ var ClientTransport = class extends Transport {
    */
   inflightConnectionPromises;
   tryReconnecting = true;
-  serverInstanceIds = /* @__PURE__ */ new Map();
   constructor(clientId, providedOptions) {
     super(clientId, providedOptions);
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
@@ -524,7 +543,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(() => {
@@ -556,7 +582,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) {
@@ -579,8 +605,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 (!Value.Check(ControlMessageHandshakeResponseSchema, parsed.payload)) {
         log?.warn(
           `${this.clientId} -- received invalid handshake resp: ${JSON.stringify(parsed)}`
@@ -595,22 +623,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;
   }
@@ -621,14 +638,6 @@ var ClientTransport = class extends Transport {
   }
 };
 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 = nanoid2();
   constructor(clientId, providedOptions) {
     super(clientId, providedOptions);
     log?.info(
@@ -643,7 +652,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);
@@ -666,8 +682,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 (!Value.Check(ControlMessageHandshakeRequestSchema, parsed.payload)) {
         const responseMsg2 = bootResponseMessage(
           this.clientId,
@@ -683,8 +701,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,
@@ -693,7 +712,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/{chunk-4HOR4NUO.js → chunk-NHSJ4RDY.js}

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

package/dist/{chunk-XOTIAXAH.js → chunk-PIF32FUL.js}

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

package/dist/{chunk-IUDKWAOK.js → chunk-R6YJHJV7.js}

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

package/dist/{chunk-WTOIOXB7.js → chunk-XFFS4UOD.js}

@@ -22,7 +22,8 @@ var ControlMessageCloseSchema = Type.Object({
 var PROTOCOL_VERSION = "v1";
 var ControlMessageHandshakeRequestSchema = Type.Object({
   type: Type.Literal("HANDSHAKE_REQ"),
-  protocolVersion: Type.Literal(PROTOCOL_VERSION)
+  protocolVersion: Type.Literal(PROTOCOL_VERSION),
+  instanceId: Type.String()
 });
 var ControlMessageHandshakeResponseSchema = Type.Object({
   type: Type.Literal("HANDSHAKE_RESP"),
@@ -46,7 +47,7 @@ var ControlMessagePayloadSchema = Type.Union([
 var OpaqueTransportMessageSchema = TransportMessageSchema(
   Type.Unknown()
 );
-function bootRequestMessage(from, to) {
+function bootRequestMessage(from, to, instanceId) {
   return {
     id: nanoid(),
     from,
@@ -57,7 +58,8 @@ function bootRequestMessage(from, to) {
     controlFlags: 0,
     payload: {
       type: "HANDSHAKE_REQ",
-      protocolVersion: PROTOCOL_VERSION
+      protocolVersion: PROTOCOL_VERSION,
+      instanceId
     }
   };
 }

package/dist/{connection-2956a1c5.d.ts → connection-bf7811aa.d.ts}

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

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

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

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

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

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

@@ -295,6 +295,13 @@ interface TransportOptions {
  * @abstract
  */
 declare abstract class Transport<ConnType extends Connection> {
+    /**
+     * Unique per instance of the transport.
+     * This allows us to distinguish reconnects to different
+     * transports.
+     */
+    instanceId: string;
+    connectedInstanceIds: Map<string, string>;
     /**
      * A flag indicating whether the transport has been destroyed.
      * A destroyed transport will not attempt to reconnect and cannot be used again.
@@ -346,7 +353,7 @@ declare abstract class Transport<ConnType extends Connection> {
      * and we know the identity of the connected client.
      * @param conn The connection object.
      */
-    protected onConnect(conn: ConnType, connectedTo: TransportClientId): Session<ConnType>;
+    protected onConnect(conn: ConnType, connectedTo: TransportClientId, instanceId: string): Session<ConnType>;
     private createSession;
     protected deleteSession(session: Session<ConnType>): void;
     /**
@@ -365,7 +372,7 @@ declare abstract class Transport<ConnType extends Connection> {
      * You generally shouldn't need to override this in downstream transport implementations.
      * @param msg The received message.
      */
-    handleMsg(msg: OpaqueTransportMessage | null): void;
+    handleMsg(msg: OpaqueTransportMessage): void;
     /**
      * Adds a listener to this transport.
      * @param the type of event to listen for
@@ -405,7 +412,6 @@ declare abstract class ClientTransport<ConnType extends Connection> extends Tran
      */
     inflightConnectionPromises: Map<TransportClientId, Promise<ConnType>>;
     tryReconnecting: boolean;
-    serverInstanceIds: Map<string, string>;
     constructor(clientId: TransportClientId, providedOptions?: Partial<TransportOptions>);
     protected handleConnection(conn: ConnType, to: TransportClientId): void;
     /**
@@ -426,14 +432,6 @@ declare abstract class ClientTransport<ConnType extends Connection> extends Tran
     onDisconnect(conn: ConnType, connectedTo: string | undefined): void;
 }
 declare abstract class ServerTransport<ConnType extends Connection> extends Transport<ConnType> {
-    /**
-     * 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: string;
     constructor(clientId: TransportClientId, providedOptions?: Partial<TransportOptions>);
     protected handleConnection(conn: ConnType): void;
     receiveWithBootSequence(conn: ConnType, sessionCb: (sess: Session<ConnType>) => void): (data: Uint8Array) => void;

package/dist/router/index.cjs

@@ -427,7 +427,8 @@ var ControlMessageCloseSchema = import_typebox2.Type.Object({
 var PROTOCOL_VERSION = "v1";
 var ControlMessageHandshakeRequestSchema = import_typebox2.Type.Object({
   type: import_typebox2.Type.Literal("HANDSHAKE_REQ"),
-  protocolVersion: import_typebox2.Type.Literal(PROTOCOL_VERSION)
+  protocolVersion: import_typebox2.Type.Literal(PROTOCOL_VERSION),
+  instanceId: import_typebox2.Type.String()
 });
 var ControlMessageHandshakeResponseSchema = import_typebox2.Type.Object({
   type: import_typebox2.Type.Literal("HANDSHAKE_RESP"),

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-d91775d9.js';
+import { T as Transport, C as Connection, b as TransportClientId } from '../index-0c0a69f6.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-d91775d9.js';
+import { T as Transport, C as Connection, b as TransportClientId } from '../index-0c0a69f6.js';
 import { Pushable } from 'it-pushable';
 import { Static } from '@sinclair/typebox';
 import '../types-3e5768ec.js';

package/dist/router/index.js

@@ -8,8 +8,8 @@ import {
   createClient,
   createServer,
   serializeService
-} from "../chunk-24O3BKZA.js";
-import "../chunk-WTOIOXB7.js";
+} from "../chunk-55XUAPC6.js";
+import "../chunk-XFFS4UOD.js";
 import "../chunk-H4BYJELI.js";
 export {
   Err,