@replit/river 0.12.6 → 0.13.0

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

@@ -39,8 +39,8 @@ var TransportMessageSchema = (t) => import_typebox.Type.Object({
   to: import_typebox.Type.String(),
   seq: import_typebox.Type.Integer(),
   ack: import_typebox.Type.Integer(),
-  serviceName: import_typebox.Type.Optional(import_typebox.Type.Union([import_typebox.Type.String(), import_typebox.Type.Null()])),
-  procedureName: import_typebox.Type.Optional(import_typebox.Type.Union([import_typebox.Type.String(), import_typebox.Type.Null()])),
+  serviceName: import_typebox.Type.Optional(import_typebox.Type.String()),
+  procedureName: import_typebox.Type.Optional(import_typebox.Type.String()),
   streamId: import_typebox.Type.String(),
   controlFlags: import_typebox.Type.Integer(),
   payload: t
@@ -54,7 +54,7 @@ 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.String(),
   instanceId: import_typebox.Type.String()
 });
 var ControlMessageHandshakeResponseSchema = import_typebox.Type.Object({
@@ -79,7 +79,7 @@ var ControlMessagePayloadSchema = import_typebox.Type.Union([
 var OpaqueTransportMessageSchema = TransportMessageSchema(
   import_typebox.Type.Unknown()
 );
-function bootResponseMessage(from, instanceId, to, ok) {
+function handshakeResponseMessage(from, instanceId, to, ok) {
   return {
     id: (0, import_nanoid.nanoid)(),
     from,
@@ -137,6 +137,60 @@ var EventDispatcher = class {
 
 // transport/session.ts
 var import_nanoid2 = require("nanoid");
+
+// codec/json.ts
+var encoder = new TextEncoder();
+var decoder = new TextDecoder();
+function uint8ArrayToBase64(uint8Array) {
+  let binary = "";
+  uint8Array.forEach((byte) => {
+    binary += String.fromCharCode(byte);
+  });
+  return btoa(binary);
+}
+function base64ToUint8Array(base64) {
+  const binaryString = atob(base64);
+  const uint8Array = new Uint8Array(binaryString.length);
+  for (let i = 0; i < binaryString.length; i++) {
+    uint8Array[i] = binaryString.charCodeAt(i);
+  }
+  return uint8Array;
+}
+var NaiveJsonCodec = {
+  toBuffer: (obj) => {
+    return encoder.encode(
+      JSON.stringify(obj, function replacer(key) {
+        const val = this[key];
+        if (val instanceof Uint8Array) {
+          return { $t: uint8ArrayToBase64(val) };
+        } else {
+          return val;
+        }
+      })
+    );
+  },
+  fromBuffer: (buff) => {
+    try {
+      const parsed = JSON.parse(
+        decoder.decode(buff),
+        function reviver(_key, val) {
+          if (val?.$t) {
+            return base64ToUint8Array(val.$t);
+          } else {
+            return val;
+          }
+        }
+      );
+      if (typeof parsed === "object")
+        return parsed;
+      return null;
+    } catch {
+      return null;
+    }
+  }
+};
+
+// transport/session.ts
 var nanoid2 = (0, import_nanoid2.customAlphabet)("1234567890abcdefghijklmnopqrstuvxyz", 6);
 var unsafeId = () => nanoid2();
 var Connection = class {
@@ -148,8 +202,15 @@ var Connection = class {
 var HEARTBEAT_INTERVAL_MS = 1e3;
 var HEARTBEATS_TILL_DEAD = 2;
 var SESSION_DISCONNECT_GRACE_MS = 5e3;
+var defaultSessionOptions = {
+  heartbeatIntervalMs: HEARTBEAT_INTERVAL_MS,
+  heartbeatsUntilDead: HEARTBEATS_TILL_DEAD,
+  sessionDisconnectGraceMs: SESSION_DISCONNECT_GRACE_MS,
+  codec: NaiveJsonCodec
+};
 var Session = class {
   codec;
+  options;
   /**
    * The buffer of messages that have been sent but not yet acknowledged.
    */
@@ -185,16 +246,17 @@ var Session = class {
    * The interval for sending heartbeats.
    */
   heartbeat;
-  constructor(codec, from, connectedTo, conn) {
+  constructor(from, connectedTo, conn, options) {
+    this.options = options;
     this.debugId = `sess-${unsafeId()}`;
     this.from = from;
     this.to = connectedTo;
     this.connection = conn;
-    this.codec = codec;
+    this.codec = options.codec;
     this.heartbeatMisses = 0;
     this.heartbeat = setInterval(
       () => this.sendHeartbeat(),
-      HEARTBEAT_INTERVAL_MS
+      options.heartbeatIntervalMs
     );
   }
   /**
@@ -230,7 +292,7 @@ var Session = class {
     return fullMsg.id;
   }
   sendHeartbeat() {
-    if (this.heartbeatMisses >= HEARTBEATS_TILL_DEAD) {
+    if (this.heartbeatMisses >= this.options.heartbeatsUntilDead) {
       if (this.connection) {
         log?.info(
           `${this.from} -- closing connection (id: ${this.connection.debugId}) to ${this.to} due to inactivity`
@@ -300,7 +362,7 @@ var Session = class {
     this.disconnectionGrace = setTimeout(() => {
       this.close();
       cb();
-    }, SESSION_DISCONNECT_GRACE_MS);
+    }, this.options.sessionDisconnectGraceMs);
   }
   // called on reconnect of the underlying session
   cancelGrace() {
@@ -338,58 +400,6 @@ var Session = class {
   }
 };
 
-// codec/json.ts
-var encoder = new TextEncoder();
-var decoder = new TextDecoder();
-function uint8ArrayToBase64(uint8Array) {
-  let binary = "";
-  uint8Array.forEach((byte) => {
-    binary += String.fromCharCode(byte);
-  });
-  return btoa(binary);
-}
-function base64ToUint8Array(base64) {
-  const binaryString = atob(base64);
-  const uint8Array = new Uint8Array(binaryString.length);
-  for (let i = 0; i < binaryString.length; i++) {
-    uint8Array[i] = binaryString.charCodeAt(i);
-  }
-  return uint8Array;
-}
-var NaiveJsonCodec = {
-  toBuffer: (obj) => {
-    return encoder.encode(
-      JSON.stringify(obj, function replacer(key) {
-        const val = this[key];
-        if (val instanceof Uint8Array) {
-          return { $t: uint8ArrayToBase64(val) };
-        } else {
-          return val;
-        }
-      })
-    );
-  },
-  fromBuffer: (buff) => {
-    try {
-      const parsed = JSON.parse(
-        decoder.decode(buff),
-        function reviver(_key, val) {
-          if (val?.$t) {
-            return base64ToUint8Array(val.$t);
-          } else {
-            return val;
-          }
-        }
-      );
-      if (typeof parsed === "object")
-        return parsed;
-      return null;
-    } catch {
-      return null;
-    }
-  }
-};
-
 // transport/transport.ts
 var import_nanoid3 = require("nanoid");
 
@@ -402,13 +412,13 @@ function coerceErrorString(err) {
 }
 
 // transport/transport.ts
-var DEFAULT_RECONNECT_JITTER_MAX_MS = 500;
-var DEFAULT_RECONNECT_INTERVAL_MS = 250;
+var RECONNECT_JITTER_MAX_MS = 500;
+var RECONNECT_INTERVAL_MS = 250;
 var defaultTransportOptions = {
-  retryIntervalMs: DEFAULT_RECONNECT_INTERVAL_MS,
-  retryJitterMs: DEFAULT_RECONNECT_JITTER_MAX_MS,
+  retryIntervalMs: RECONNECT_INTERVAL_MS,
+  retryJitterMs: RECONNECT_JITTER_MAX_MS,
   retryAttemptsMax: 5,
-  codec: NaiveJsonCodec
+  ...defaultSessionOptions
 };
 var Transport = class {
   /**
@@ -479,7 +489,7 @@ var Transport = class {
     const lastInstanceId = this.connectedInstanceIds.get(connectedTo);
     if (oldSession && lastInstanceId !== void 0 && lastInstanceId !== instanceId) {
       log?.warn(
-        `${this.clientId} -- handshake from ${connectedTo} is a different instance (got: ${instanceId}, last connected to: ${lastInstanceId}), starting a new session`
+        `${this.clientId} -- connection from ${connectedTo} is a different instance (got: ${instanceId}, last connected to: ${lastInstanceId}), starting a new session`
       );
       oldSession.close();
       this.deleteSession(oldSession);
@@ -502,10 +512,10 @@ var Transport = class {
   }
   createSession(connectedTo, conn) {
     const session = new Session(
-      this.codec,
       this.clientId,
       connectedTo,
-      conn
+      conn,
+      this.options
     );
     this.sessions.set(session.to, session);
     this.eventDispatcher.dispatchEvent("sessionStatus", {
@@ -548,7 +558,7 @@ var Transport = class {
   parseMsg(msg) {
     const parsedMsg = this.codec.fromBuffer(msg);
     if (parsedMsg === null) {
-      const decodedBuffer = new TextDecoder().decode(msg);
+      const decodedBuffer = new TextDecoder().decode(Buffer.from(msg));
       log?.error(
         `${this.clientId} -- received malformed msg, killing conn: ${decodedBuffer}`
       );
@@ -562,11 +572,7 @@ var Transport = class {
       );
       return null;
     }
-    return {
-      ...parsedMsg,
-      serviceName: parsedMsg.serviceName === null ? void 0 : parsedMsg.serviceName,
-      procedureName: parsedMsg.procedureName === null ? void 0 : parsedMsg.procedureName
-    };
+    return parsedMsg;
   }
   /**
    * Called when a message is received by this transport.
@@ -585,11 +591,18 @@ var Transport = class {
     session.cancelGrace();
     log?.debug(`${this.clientId} -- received msg: ${JSON.stringify(msg)}`);
     if (msg.seq !== session.nextExpectedSeq) {
-      log?.warn(
-        `${this.clientId} -- received out-of-order msg (got: ${msg.seq}, wanted: ${session.nextExpectedSeq}), discarding: ${JSON.stringify(
-          msg
-        )}`
-      );
+      if (msg.seq < session.nextExpectedSeq) {
+        log?.debug(
+          `${this.clientId} -- received duplicate msg (got: ${msg.seq}, wanted: ${session.nextExpectedSeq}), discarding: ${JSON.stringify(
+            msg
+          )}`
+        );
+      } else {
+        log?.error(
+          `${this.clientId} -- received out-of-order msg (got: ${msg.seq}, wanted: ${session.nextExpectedSeq}), marking connection as dead: ${JSON.stringify(msg)}`
+        );
+        session.closeStaleConnection(session.connection);
+      }
       return;
     }
     if (!isAck(msg.controlFlags)) {
@@ -607,7 +620,7 @@ var Transport = class {
   }
   /**
    * Removes a listener from this transport.
-   * @param the type of event to unlisten on
+   * @param the type of event to un-listen on
    * @param handler The message handler to remove.
    */
   removeEventListener(type, handler) {
@@ -688,22 +701,24 @@ var ServerTransport = class extends Transport {
   handleConnection(conn) {
     let session = void 0;
     const client = () => session?.to ?? "unknown";
-    const bootHandler = this.receiveWithBootSequence(
-      conn,
-      (establishedSession) => {
-        session = establishedSession;
-        conn.removeDataListener(bootHandler);
-        conn.addDataListener((data) => {
-          const parsed = this.parseMsg(data);
-          if (!parsed) {
-            conn.close();
-            return;
-          }
-          this.handleMsg(parsed);
-        });
+    const handshakeHandler = (data) => {
+      const handshake = this.receiveHandshakeRequestMessage(data, conn);
+      if (!handshake) {
+        conn.close();
+        return;
       }
-    );
-    conn.addDataListener(bootHandler);
+      session = this.onConnect(conn, handshake.from, handshake.instanceId);
+      conn.removeDataListener(handshakeHandler);
+      conn.addDataListener((data2) => {
+        const parsed = this.parseMsg(data2);
+        if (!parsed) {
+          conn.close();
+          return;
+        }
+        this.handleMsg(parsed);
+      });
+    };
+    conn.addDataListener(handshakeHandler);
     conn.addCloseListener(() => {
       if (!session)
         return;
@@ -720,42 +735,51 @@ var ServerTransport = class extends Transport {
       );
     });
   }
-  receiveWithBootSequence(conn, sessionCb) {
-    const bootHandler = (data) => {
-      const parsed = this.parseMsg(data);
-      if (!parsed) {
-        conn.close();
-        return;
-      }
-      if (!import_value.Value.Check(ControlMessageHandshakeRequestSchema, parsed.payload)) {
-        const responseMsg2 = bootResponseMessage(
-          this.clientId,
-          this.instanceId,
-          parsed.from,
-          false
-        );
-        conn.send(this.codec.toBuffer(responseMsg2));
-        log?.warn(
-          `${this.clientId} -- received invalid handshake msg: ${JSON.stringify(
-            parsed
-          )}`
-        );
-        return;
-      }
-      const instanceId = parsed.payload.instanceId;
-      log?.debug(
-        `${this.clientId} -- handshake from ${parsed.from} ok (instance id: ${instanceId}), responding with handshake success`
+  receiveHandshakeRequestMessage(data, conn) {
+    const parsed = this.parseMsg(data);
+    if (!parsed)
+      return false;
+    if (!import_value.Value.Check(ControlMessageHandshakeRequestSchema, parsed.payload)) {
+      const responseMsg2 = handshakeResponseMessage(
+        this.clientId,
+        this.instanceId,
+        parsed.from,
+        false
+      );
+      conn.send(this.codec.toBuffer(responseMsg2));
+      log?.warn(
+        `${this.clientId} -- received invalid handshake msg: ${JSON.stringify(
+          parsed
+        )}`
       );
-      const responseMsg = bootResponseMessage(
+      return false;
+    }
+    const gotVersion = parsed.payload.protocolVersion;
+    if (gotVersion !== PROTOCOL_VERSION) {
+      const responseMsg2 = handshakeResponseMessage(
         this.clientId,
         this.instanceId,
         parsed.from,
-        true
+        false
       );
-      conn.send(this.codec.toBuffer(responseMsg));
-      sessionCb(this.onConnect(conn, parsed.from, instanceId));
-    };
-    return bootHandler;
+      conn.send(this.codec.toBuffer(responseMsg2));
+      log?.warn(
+        `${this.clientId} -- received handshake msg with incompatible protocol version (got: ${gotVersion}, expected: ${PROTOCOL_VERSION})`
+      );
+      return false;
+    }
+    const instanceId = parsed.payload.instanceId;
+    log?.debug(
+      `${this.clientId} -- handshake from ${parsed.from} ok (instance id: ${instanceId}), responding with handshake success`
+    );
+    const responseMsg = handshakeResponseMessage(
+      this.clientId,
+      this.instanceId,
+      parsed.from,
+      true
+    );
+    conn.send(this.codec.toBuffer(responseMsg));
+    return { instanceId, from: parsed.from };
   }
 };
 

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

@@ -1,7 +1,7 @@
-import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-54e0f99c.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-21c1b21d.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-ba37d174.js';
+import { W as WebSocketConnection } from '../../../connection-ab681c08.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-54e0f99c.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-21c1b21d.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-ba37d174.js';
+import { W as WebSocketConnection } from '../../../connection-ab681c08.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

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

@@ -1,14 +1,14 @@
 import {
   WebSocketConnection
-} from "../../../chunk-VLBVQX5H.js";
+} from "../../../chunk-NPXAAD7M.js";
 import {
   ServerTransport
-} from "../../../chunk-4SDJ5VN4.js";
-import "../../../chunk-GZ7HCLLM.js";
-import "../../../chunk-XFFS4UOD.js";
+} from "../../../chunk-R2IMXRVU.js";
+import "../../../chunk-MGGIUH5O.js";
 import {
   log
 } from "../../../chunk-H4BYJELI.js";
+import "../../../chunk-GZ7HCLLM.js";
 
 // transport/impls/ws/server.ts
 var WebSocketServerTransport = class extends ServerTransport {