@replit/river 0.12.0 → 0.12.1

package/dist/transport/index.cjs

@@ -57,7 +57,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"),
@@ -81,7 +82,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,
@@ -92,7 +93,8 @@ function bootRequestMessage(from, to) {
     controlFlags: 0,
     payload: {
       type: "HANDSHAKE_REQ",
-      protocolVersion: PROTOCOL_VERSION
+      protocolVersion: PROTOCOL_VERSION,
+      instanceId
     }
   };
 }
@@ -165,9 +167,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;
   /**
@@ -250,11 +252,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.halfCloseConnection();
+      }
       return;
     }
     this.send(
@@ -291,7 +295,6 @@ var Session = class {
     }
   }
   updateBookkeeping(ack, seq) {
-    this.heartbeatMisses = 0;
     this.sendBuffer = this.sendBuffer.filter((unacked) => unacked.seq > ack);
     this.ack = seq + 1;
   }
@@ -323,6 +326,7 @@ var Session = class {
     }, SESSION_DISCONNECT_GRACE_MS);
   }
   cancelGrace() {
+    this.heartbeatMisses = 0;
     clearTimeout(this.disconnectionGrace);
   }
   get connected() {
@@ -430,6 +434,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.
@@ -491,12 +502,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?.debug(
+        `${this.clientId} -- handshake from ${connectedTo} has different server instance (got: ${instanceId}, last connected to: ${lastInstanceId}), starting a new session`
+      );
+      session.resetBufferedMessages();
+      session.closeStaleConnection();
+      this.deleteSession(session);
+      session = void 0;
+    }
+    this.connectedInstanceIds.set(connectedTo, instanceId);
     if (session === void 0) {
       const newSession = this.createSession(connectedTo, conn);
       log?.info(
@@ -562,11 +584,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
         )}`
@@ -585,9 +609,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)}`);
@@ -689,7 +710,6 @@ var ClientTransport = class extends Transport {
    */
   inflightConnectionPromises;
   tryReconnecting = true;
-  serverInstanceIds = /* @__PURE__ */ new Map();
   constructor(clientId, providedOptions) {
     super(clientId, providedOptions);
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
@@ -697,7 +717,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(() => {
@@ -729,7 +756,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) {
@@ -752,8 +779,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)}`
@@ -768,22 +797,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;
   }
@@ -794,14 +812,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 = (0, import_nanoid3.nanoid)();
   constructor(clientId, providedOptions) {
     super(clientId, providedOptions);
     log?.info(
@@ -816,7 +826,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);
@@ -839,8 +856,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,
@@ -856,8 +875,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,
@@ -866,7 +886,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/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-d91775d9.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-0c0a69f6.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-d91775d9.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-0c0a69f6.js';
 import '../types-3e5768ec.js';
 import '@sinclair/typebox';

package/dist/transport/index.js

@@ -5,12 +5,12 @@ import {
   ServerTransport,
   Session,
   Transport
-} from "../chunk-ANGOKBE5.js";
+} from "../chunk-QEYN2Z6O.js";
 import "../chunk-GZ7HCLLM.js";
 import {
   OpaqueTransportMessageSchema,
   TransportMessageSchema
-} from "../chunk-WTOIOXB7.js";
+} from "../chunk-XFFS4UOD.js";
 import "../chunk-H4BYJELI.js";
 export {
   ClientTransport,

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-d91775d9.js';
+import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-0c0a69f6.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-d91775d9.js';
+import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-0c0a69f6.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,10 +1,10 @@
 import {
   UNCAUGHT_ERROR,
   pushable
-} from "../chunk-24O3BKZA.js";
+} from "../chunk-55XUAPC6.js";
 import {
   coerceErrorString
-} from "../chunk-WTOIOXB7.js";
+} from "../chunk-XFFS4UOD.js";
 import "../chunk-H4BYJELI.js";
 
 // util/testHelpers.ts

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.0",
+  "version": "0.12.1",
   "type": "module",
   "exports": {
     ".": {