@replit/river 0.12.5 → 0.13.0

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

@@ -36,8 +36,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
@@ -51,7 +51,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({
@@ -76,7 +76,7 @@ var ControlMessagePayloadSchema = import_typebox.Type.Union([
 var OpaqueTransportMessageSchema = TransportMessageSchema(
   import_typebox.Type.Unknown()
 );
-function bootRequestMessage(from, to, instanceId) {
+function handshakeRequestMessage(from, to, instanceId) {
   return {
     id: (0, import_nanoid.nanoid)(),
     from,
@@ -129,6 +129,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 {
@@ -140,8 +194,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.
    */
@@ -177,16 +238,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
     );
   }
   /**
@@ -222,7 +284,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`
@@ -288,13 +350,11 @@ var Session = class {
     this.cancelGrace();
     this.connection = newConn;
   }
-  graceCb;
   beginGrace(cb) {
-    this.graceCb = cb;
     this.disconnectionGrace = setTimeout(() => {
       this.close();
       cb();
-    }, SESSION_DISCONNECT_GRACE_MS);
+    }, this.options.sessionDisconnectGraceMs);
   }
   // called on reconnect of the underlying session
   cancelGrace() {
@@ -306,8 +366,8 @@ var Session = class {
   close() {
     this.closeStaleConnection(this.connection);
     this.cancelGrace();
-    clearInterval(this.heartbeat);
     this.resetBufferedMessages();
+    clearInterval(this.heartbeat);
   }
   get connected() {
     return this.connection !== void 0;
@@ -332,58 +392,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");
 
@@ -396,13 +404,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 {
   /**
@@ -459,15 +467,6 @@ var Transport = class {
     this.clientId = clientId;
     this.state = "open";
   }
-  sessionByClientId(clientId) {
-    const session = this.sessions.get(clientId);
-    if (!session) {
-      const err = `${this.clientId} -- (invariant violation) no existing session for ${clientId}`;
-      log?.error(err);
-      throw new Error(err);
-    }
-    return session;
-  }
   /**
    * Called when a new connection is established
    * and we know the identity of the connected client.
@@ -482,7 +481,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);
@@ -505,10 +504,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", {
@@ -537,13 +536,10 @@ var Transport = class {
       status: "disconnect",
       conn
     });
-    if (this.state !== "open")
+    const session = this.sessions.get(connectedTo);
+    if (!session)
       return;
-    const session = this.sessionByClientId(connectedTo);
-    log?.info(
-      `${this.clientId} -- connection (id: ${conn.debugId}) disconnect from ${connectedTo}, ${SESSION_DISCONNECT_GRACE_MS}ms until session (id: ${session.debugId}) disconnect`
-    );
-    session.closeStaleConnection(conn);
+    session.connection = void 0;
     session.beginGrace(() => this.deleteSession(session));
   }
   /**
@@ -554,7 +550,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}`
       );
@@ -568,11 +564,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.
@@ -582,15 +574,27 @@ var Transport = class {
   handleMsg(msg) {
     if (this.state !== "open")
       return;
-    const session = this.sessionByClientId(msg.from);
+    const session = this.sessions.get(msg.from);
+    if (!session) {
+      const err = `${this.clientId} -- (invariant violation) no existing session for ${msg.from}`;
+      log?.error(err);
+      return;
+    }
     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)) {
@@ -608,7 +612,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) {
@@ -685,23 +689,31 @@ var ClientTransport = class extends Transport {
    */
   inflightConnectionPromises;
   tryReconnecting = true;
-  constructor(clientId, providedOptions) {
+  connectedTo;
+  constructor(clientId, connectedTo, providedOptions) {
     super(clientId, providedOptions);
+    this.connectedTo = connectedTo;
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
   }
   handleConnection(conn, to) {
-    const bootHandler = this.receiveWithBootSequence(conn, () => {
-      conn.removeDataListener(bootHandler);
-      conn.addDataListener((data) => {
-        const parsed = this.parseMsg(data);
+    const handshakeHandler = (data) => {
+      const handshake = this.receiveHandshakeResponseMessage(data);
+      if (!handshake) {
+        conn.close();
+        return;
+      }
+      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(bootHandler);
+    };
+    conn.addDataListener(handshakeHandler);
     conn.addCloseListener(() => {
       this.onDisconnect(conn, to);
       void this.connect(to);
@@ -712,6 +724,32 @@ var ClientTransport = class extends Transport {
       );
     });
   }
+  receiveHandshakeResponseMessage(data) {
+    const parsed = this.parseMsg(data);
+    if (!parsed)
+      return false;
+    if (!import_value.Value.Check(ControlMessageHandshakeResponseSchema, parsed.payload)) {
+      log?.warn(
+        `${this.clientId} -- received invalid handshake resp: ${JSON.stringify(
+          parsed
+        )}`
+      );
+      return false;
+    }
+    if (!parsed.payload.status.ok) {
+      log?.warn(
+        `${this.clientId} -- received failed handshake resp: ${JSON.stringify(
+          parsed
+        )}`
+      );
+      return false;
+    }
+    const instanceId = parsed.payload.status.instanceId;
+    log?.debug(
+      `${this.clientId} -- handshake from ${parsed.from} ok (instance: ${instanceId})`
+    );
+    return { instanceId, from: parsed.from };
+  }
   /**
    * Manually attempts to connect to a client.
    * @param to The client ID of the node to connect to.
@@ -730,10 +768,7 @@ var ClientTransport = class extends Transport {
     }
     try {
       const conn = await reconnectPromise;
-      this.state = "open";
-      const requestMsg = bootRequestMessage(this.clientId, to, this.instanceId);
-      log?.debug(`${this.clientId} -- sending boot handshake to ${to}`);
-      conn.send(this.codec.toBuffer(requestMsg));
+      this.sendHandshake(to, conn);
     } catch (error) {
       const errStr = coerceErrorString(error);
       this.inflightConnectionPromises.delete(to);
@@ -751,34 +786,14 @@ var ClientTransport = class extends Transport {
       }
     }
   }
-  receiveWithBootSequence(conn, sessionCb) {
-    const bootHandler = (data) => {
-      const parsed = this.parseMsg(data);
-      if (!parsed) {
-        conn.close();
-        return;
-      }
-      if (!import_value.Value.Check(ControlMessageHandshakeResponseSchema, parsed.payload)) {
-        log?.warn(
-          `${this.clientId} -- received invalid handshake resp: ${JSON.stringify(parsed)}`
-        );
-        return;
-      }
-      if (!parsed.payload.status.ok) {
-        log?.warn(
-          `${this.clientId} -- received failed handshake resp: ${JSON.stringify(
-            parsed
-          )}`
-        );
-        return;
-      }
-      const serverInstanceId = parsed.payload.status.instanceId;
-      log?.debug(
-        `${this.clientId} -- handshake from ${parsed.from} ok (server instance: ${serverInstanceId})`
-      );
-      sessionCb(this.onConnect(conn, parsed.from, serverInstanceId));
-    };
-    return bootHandler;
+  sendHandshake(to, conn) {
+    const requestMsg = handshakeRequestMessage(
+      this.clientId,
+      to,
+      this.instanceId
+    );
+    log?.debug(`${this.clientId} -- sending handshake request to ${to}`);
+    conn.send(this.codec.toBuffer(requestMsg));
   }
   onDisconnect(conn, connectedTo) {
     this.inflightConnectionPromises.delete(connectedTo);
@@ -829,12 +844,12 @@ var WebSocketClientTransport = class extends ClientTransport {
   /**
    * Creates a new WebSocketClientTransport instance.
    * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.
-   * @param sessionId The ID of the client using the transport. This should be unique per session.
+   * @param clientId The ID of the client using the transport. This should be unique per session.
    * @param serverId The ID of the server this transport is connecting to.
    * @param providedOptions An optional object containing configuration options for the transport.
    */
-  constructor(wsGetter, sessionId, serverId, providedOptions) {
-    super(sessionId, providedOptions);
+  constructor(wsGetter, clientId, serverId, providedOptions) {
+    super(clientId, serverId, providedOptions);
     this.wsGetter = wsGetter;
     this.serverId = serverId;
     void this.connect(this.serverId);

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-1afc5580.js';
-import { W as WebSocketConnection } from '../../../connection-4a839b9a.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-21c1b21d.js';
+import { W as WebSocketConnection } from '../../../connection-ab681c08.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 
@@ -18,11 +18,11 @@ declare class WebSocketClientTransport extends ClientTransport<WebSocketConnecti
     /**
      * Creates a new WebSocketClientTransport instance.
      * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.
-     * @param sessionId The ID of the client using the transport. This should be unique per session.
+     * @param clientId The ID of the client using the transport. This should be unique per session.
      * @param serverId The ID of the server this transport is connecting to.
      * @param providedOptions An optional object containing configuration options for the transport.
      */
-    constructor(wsGetter: () => Promise<WebSocket>, sessionId: TransportClientId, serverId: TransportClientId, providedOptions?: Partial<TransportOptions>);
+    constructor(wsGetter: () => Promise<WebSocket>, clientId: TransportClientId, serverId: TransportClientId, providedOptions?: Partial<TransportOptions>);
     reopen(): void;
     createNewOutgoingConnection(to: string): Promise<WebSocketConnection>;
 }

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-1afc5580.js';
-import { W as WebSocketConnection } from '../../../connection-4a839b9a.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-21c1b21d.js';
+import { W as WebSocketConnection } from '../../../connection-ab681c08.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 
@@ -18,11 +18,11 @@ declare class WebSocketClientTransport extends ClientTransport<WebSocketConnecti
     /**
      * Creates a new WebSocketClientTransport instance.
      * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.
-     * @param sessionId The ID of the client using the transport. This should be unique per session.
+     * @param clientId The ID of the client using the transport. This should be unique per session.
      * @param serverId The ID of the server this transport is connecting to.
      * @param providedOptions An optional object containing configuration options for the transport.
      */
-    constructor(wsGetter: () => Promise<WebSocket>, sessionId: TransportClientId, serverId: TransportClientId, providedOptions?: Partial<TransportOptions>);
+    constructor(wsGetter: () => Promise<WebSocket>, clientId: TransportClientId, serverId: TransportClientId, providedOptions?: Partial<TransportOptions>);
     reopen(): void;
     createNewOutgoingConnection(to: string): Promise<WebSocketConnection>;
 }

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

@@ -1,14 +1,14 @@
 import {
   WebSocketConnection
-} from "../../../chunk-6OAKPO5R.js";
+} from "../../../chunk-NPXAAD7M.js";
 import {
   ClientTransport
-} from "../../../chunk-2PKONGC3.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/client.ts
 var WebSocketClientTransport = class extends ClientTransport {
@@ -20,12 +20,12 @@ var WebSocketClientTransport = class extends ClientTransport {
   /**
    * Creates a new WebSocketClientTransport instance.
    * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.
-   * @param sessionId The ID of the client using the transport. This should be unique per session.
+   * @param clientId The ID of the client using the transport. This should be unique per session.
    * @param serverId The ID of the server this transport is connecting to.
    * @param providedOptions An optional object containing configuration options for the transport.
    */
-  constructor(wsGetter, sessionId, serverId, providedOptions) {
-    super(sessionId, providedOptions);
+  constructor(wsGetter, clientId, serverId, providedOptions) {
+    super(clientId, serverId, providedOptions);
     this.wsGetter = wsGetter;
     this.serverId = serverId;
     void this.connect(this.serverId);