@replit/river 0.10.0 → 0.10.1

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

@@ -0,0 +1,505 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// transport/impls/ws/client.ts
+var client_exports = {};
+__export(client_exports, {
+  WebSocketClientTransport: () => WebSocketClientTransport
+});
+module.exports = __toCommonJS(client_exports);
+
+// transport/transport.ts
+var import_value = require("@sinclair/typebox/value");
+
+// transport/message.ts
+var import_typebox = require("@sinclair/typebox");
+var import_nanoid = require("nanoid");
+var TransportMessageSchema = (t) => import_typebox.Type.Object({
+  id: import_typebox.Type.String(),
+  from: import_typebox.Type.String(),
+  to: import_typebox.Type.String(),
+  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()])),
+  streamId: import_typebox.Type.String(),
+  controlFlags: import_typebox.Type.Integer(),
+  payload: t
+});
+var TransportAckSchema = TransportMessageSchema(
+  import_typebox.Type.Object({
+    ack: import_typebox.Type.String()
+  })
+);
+var ControlMessagePayloadSchema = import_typebox.Type.Object({
+  type: import_typebox.Type.Literal("CLOSE")
+});
+var OpaqueTransportMessageSchema = TransportMessageSchema(
+  import_typebox.Type.Unknown()
+);
+function reply(msg, response) {
+  return {
+    id: (0, import_nanoid.nanoid)(),
+    streamId: msg.streamId,
+    controlFlags: 0,
+    to: msg.from,
+    from: msg.to,
+    payload: response
+  };
+}
+function isAck(controlFlag) {
+  return (controlFlag & 1 /* AckBit */) === 1 /* AckBit */;
+}
+
+// logging/index.ts
+var log;
+
+// transport/events.ts
+var EventDispatcher = class {
+  eventListeners = {};
+  numberOfListeners(eventType) {
+    return this.eventListeners[eventType]?.size ?? 0;
+  }
+  addEventListener(eventType, handler) {
+    if (!this.eventListeners[eventType]) {
+      this.eventListeners[eventType] = /* @__PURE__ */ new Set();
+    }
+    this.eventListeners[eventType]?.add(handler);
+  }
+  removeEventListener(eventType, handler) {
+    const handlers = this.eventListeners[eventType];
+    if (handlers) {
+      this.eventListeners[eventType]?.delete(handler);
+    }
+  }
+  dispatchEvent(eventType, event) {
+    const handlers = this.eventListeners[eventType];
+    if (handlers) {
+      for (const handler of handlers) {
+        handler(event);
+      }
+    }
+  }
+};
+
+// transport/transport.ts
+var Connection = class {
+  connectedTo;
+  transport;
+  constructor(transport, connectedTo) {
+    this.connectedTo = connectedTo;
+    this.transport = transport;
+  }
+};
+var Transport = class {
+  /**
+   * A flag indicating whether the transport has been destroyed.
+   * A destroyed transport will not attempt to reconnect and cannot be used again.
+   */
+  state;
+  /**
+   * The {@link Codec} used to encode and decode messages.
+   */
+  codec;
+  /**
+   * The client ID of this transport.
+   */
+  clientId;
+  /**
+   * An array of message IDs that are waiting to be sent over the WebSocket connection.
+   * This builds up if the WebSocket is down for a period of time.
+   */
+  sendQueue;
+  /**
+   * The buffer of messages that have been sent but not yet acknowledged.
+   */
+  sendBuffer;
+  /**
+   * The map of {@link Connection}s managed by this transport.
+   */
+  connections;
+  /**
+   * The event dispatcher for handling events of type EventTypes.
+   */
+  eventDispatcher;
+  /**
+   * Creates a new Transport instance.
+   * @param codec The codec used to encode and decode messages.
+   * @param clientId The client ID of this transport.
+   */
+  constructor(codec, clientId) {
+    this.eventDispatcher = new EventDispatcher();
+    this.sendBuffer = /* @__PURE__ */ new Map();
+    this.sendQueue = /* @__PURE__ */ new Map();
+    this.connections = /* @__PURE__ */ new Map();
+    this.codec = codec;
+    this.clientId = clientId;
+    this.state = "open";
+  }
+  /**
+   * The downstream implementation needs to call this when a new connection is established.
+   * @param conn The connection object.
+   */
+  onConnect(conn) {
+    log?.info(`${this.clientId} -- new connection to ${conn.connectedTo}`);
+    this.connections.set(conn.connectedTo, conn);
+    this.eventDispatcher.dispatchEvent("connectionStatus", {
+      status: "connect",
+      conn
+    });
+    const outstanding = this.sendQueue.get(conn.connectedTo);
+    if (!outstanding) {
+      return;
+    }
+    for (const id of outstanding) {
+      const msg = this.sendBuffer.get(id);
+      if (!msg) {
+        log?.warn(
+          `${this.clientId} -- tried to resend a message we received an ack for`
+        );
+        continue;
+      }
+      this.send(msg);
+    }
+    this.sendQueue.delete(conn.connectedTo);
+  }
+  /**
+   * The downstream implementation needs to call this when a connection is closed.
+   * @param conn The connection object.
+   */
+  onDisconnect(conn) {
+    log?.info(`${this.clientId} -- disconnect from ${conn.connectedTo}`);
+    conn.close();
+    this.connections.delete(conn.connectedTo);
+    this.eventDispatcher.dispatchEvent("connectionStatus", {
+      status: "disconnect",
+      conn
+    });
+  }
+  /**
+   * Handles a message received by this transport. Thin wrapper around {@link handleMsg} and {@link parseMsg}.
+   * @param msg The message to handle.
+   */
+  onMessage(msg) {
+    return this.handleMsg(this.parseMsg(msg));
+  }
+  /**
+   * Parses a message from a Uint8Array into a {@link OpaqueTransportMessage}.
+   * @param msg The message to parse.
+   * @returns The parsed message, or null if the message is malformed or invalid.
+   */
+  parseMsg(msg) {
+    const parsedMsg = this.codec.fromBuffer(msg);
+    if (parsedMsg === null) {
+      const decodedBuffer = new TextDecoder().decode(msg);
+      log?.warn(`${this.clientId} -- received malformed msg: ${decodedBuffer}`);
+      return null;
+    }
+    if (import_value.Value.Check(OpaqueTransportMessageSchema, parsedMsg)) {
+      return {
+        ...parsedMsg,
+        serviceName: parsedMsg.serviceName === null ? void 0 : parsedMsg.serviceName,
+        procedureName: parsedMsg.procedureName === null ? void 0 : parsedMsg.procedureName
+      };
+    } else {
+      log?.warn(
+        `${this.clientId} -- received invalid msg: ${JSON.stringify(
+          parsedMsg
+        )}`
+      );
+      return null;
+    }
+  }
+  /**
+   * Called when a message is received by this transport.
+   * You generally shouldn't need to override this in downstream transport implementations.
+   * @param msg The received message.
+   */
+  handleMsg(msg) {
+    if (!msg) {
+      return;
+    }
+    if (isAck(msg.controlFlags) && import_value.Value.Check(TransportAckSchema, msg)) {
+      log?.info(`${this.clientId} -- received ack: ${JSON.stringify(msg)}`);
+      if (this.sendBuffer.has(msg.payload.ack)) {
+        this.sendBuffer.delete(msg.payload.ack);
+      }
+    } else {
+      log?.info(`${this.clientId} -- received msg: ${JSON.stringify(msg)}`);
+      if (msg.to !== this.clientId) {
+        return;
+      }
+      this.eventDispatcher.dispatchEvent("message", msg);
+      if (!isAck(msg.controlFlags)) {
+        const ackMsg = reply(msg, { ack: msg.id });
+        ackMsg.controlFlags = 1 /* AckBit */;
+        ackMsg.from = this.clientId;
+        this.send(ackMsg);
+      }
+    }
+  }
+  /**
+   * Adds a listener to this transport.
+   * @param the type of event to listen for
+   * @param handler The message handler to add.
+   */
+  addEventListener(type, handler) {
+    this.eventDispatcher.addEventListener(type, handler);
+  }
+  /**
+   * Removes a listener from this transport.
+   * @param the type of event to unlisten on
+   * @param handler The message handler to remove.
+   */
+  removeEventListener(type, handler) {
+    this.eventDispatcher.removeEventListener(type, handler);
+  }
+  /**
+   * Sends a message over this transport, delegating to the appropriate connection to actually
+   * send the message.
+   * @param msg The message to send.
+   * @returns The ID of the sent message.
+   */
+  send(msg) {
+    if (this.state === "destroyed") {
+      const err = "transport is destroyed, cant send";
+      log?.error(`${this.clientId} -- ` + err + `: ${JSON.stringify(msg)}`);
+      throw new Error(err);
+    } else if (this.state === "closed") {
+      log?.info(
+        `${this.clientId} -- transport closed when sending, discarding : ${JSON.stringify(
+          msg
+        )}`
+      );
+      return msg.id;
+    }
+    let conn = this.connections.get(msg.to);
+    if (!isAck(msg.controlFlags)) {
+      this.sendBuffer.set(msg.id, msg);
+    }
+    if (conn) {
+      log?.info(`${this.clientId} -- sending ${JSON.stringify(msg)}`);
+      const ok = conn.send(this.codec.toBuffer(msg));
+      if (ok) {
+        return msg.id;
+      }
+    }
+    log?.info(
+      `${this.clientId} -- connection to ${msg.to} not ready, attempting reconnect and queuing ${JSON.stringify(msg)}`
+    );
+    const outstanding = this.sendQueue.get(msg.to) || [];
+    outstanding.push(msg.id);
+    this.sendQueue.set(msg.to, outstanding);
+    this.createNewConnection(msg.to);
+    return msg.id;
+  }
+  /**
+   * Default close implementation for transports. You should override this in the downstream
+   * implementation if you need to do any additional cleanup and call super.close() at the end.
+   * Closes the transport. Any messages sent while the transport is closed will be silently discarded.
+   */
+  async close() {
+    for (const conn of this.connections.values()) {
+      conn.close();
+    }
+    this.connections.clear();
+    this.state = "closed";
+    log?.info(`${this.clientId} -- closed transport`);
+  }
+  /**
+   * Default destroy implementation for transports. You should override this in the downstream
+   * implementation if you need to do any additional cleanup and call super.destroy() at the end.
+   * Destroys the transport. Any messages sent while the transport is destroyed will throw an error.
+   */
+  async destroy() {
+    for (const conn of this.connections.values()) {
+      conn.close();
+    }
+    this.connections.clear();
+    this.state = "destroyed";
+    log?.info(`${this.clientId} -- destroyed transport`);
+  }
+};
+
+// 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) {
+        let val = this[key];
+        if (val instanceof Uint8Array) {
+          return { $t: uint8ArrayToBase64(val) };
+        } else {
+          return val;
+        }
+      })
+    );
+  },
+  fromBuffer: (buff) => {
+    try {
+      return JSON.parse(decoder.decode(buff), function reviver(_key, val) {
+        if (val?.$t) {
+          return base64ToUint8Array(val.$t);
+        } else {
+          return val;
+        }
+      });
+    } catch {
+      return null;
+    }
+  }
+};
+
+// transport/impls/ws/connection.ts
+var WebSocketConnection = class extends Connection {
+  ws;
+  constructor(transport, connectedTo, ws) {
+    super(transport, connectedTo);
+    this.ws = ws;
+    ws.binaryType = "arraybuffer";
+    this.ws.onmessage = (msg) => transport.onMessage(msg.data);
+  }
+  send(payload) {
+    if (this.ws.readyState === this.ws.OPEN) {
+      this.ws.send(payload);
+      return true;
+    } else {
+      return false;
+    }
+  }
+  async close() {
+    this.ws.close();
+  }
+};
+
+// transport/impls/ws/client.ts
+var defaultOptions = {
+  retryIntervalMs: 250,
+  retryAttemptsMax: 5,
+  codec: NaiveJsonCodec
+};
+var WebSocketClientTransport = class extends Transport {
+  /**
+   * A function that returns a Promise that resolves to a WebSocket instance.
+   */
+  wsGetter;
+  options;
+  serverId;
+  reconnectPromises;
+  tryReconnecting = true;
+  /**
+   * Creates a new WebSocketTransport instance.
+   * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.
+   * @param clientId The ID of the client using the transport.
+   * @param providedOptions An optional object containing configuration options for the transport.
+   */
+  constructor(wsGetter, clientId, serverId, providedOptions) {
+    const options = { ...defaultOptions, ...providedOptions };
+    super(options.codec, clientId);
+    this.wsGetter = wsGetter;
+    this.serverId = serverId;
+    this.options = options;
+    this.reconnectPromises = /* @__PURE__ */ new Map();
+    this.setupConnectionStatusListeners();
+  }
+  setupConnectionStatusListeners() {
+    this.createNewConnection(this.serverId);
+  }
+  async createNewConnection(to, attempt = 0) {
+    if (this.state === "destroyed") {
+      throw new Error("cant reopen a destroyed connection");
+    }
+    let reconnectPromise = this.reconnectPromises.get(to);
+    if (!reconnectPromise) {
+      if (!this.tryReconnecting) {
+        log?.info(
+          `${this.clientId} -- tryReconnecting is false, not attempting reconnect`
+        );
+        return;
+      }
+      reconnectPromise = new Promise(async (resolve) => {
+        log?.info(`${this.clientId} -- establishing a new websocket to ${to}`);
+        const ws = await this.wsGetter(to);
+        if (ws.readyState === ws.OPEN) {
+          return resolve({ ws });
+        }
+        if (ws.readyState === ws.CLOSING || ws.readyState === ws.CLOSED) {
+          return resolve({ err: "ws is closing or closed" });
+        }
+        ws.addEventListener("open", function onOpen() {
+          ws.removeEventListener("open", onOpen);
+          resolve({ ws });
+        });
+        ws.addEventListener("close", function onClose(evt) {
+          ws.removeEventListener("close", onClose);
+          resolve({ err: evt.reason });
+        });
+      });
+      this.reconnectPromises.set(to, reconnectPromise);
+    }
+    const res = await reconnectPromise;
+    if ("ws" in res && res.ws.readyState === res.ws.OPEN) {
+      if (res.ws === this.connections.get(to)?.ws) {
+        return;
+      }
+      log?.info(`${this.clientId} -- websocket ok`);
+      const conn = new WebSocketConnection(this, to, res.ws);
+      this.onConnect(conn);
+      res.ws.onclose = () => {
+        this.reconnectPromises.delete(to);
+        this.onDisconnect(conn);
+      };
+      this.state = "open";
+      return;
+    }
+    this.reconnectPromises.delete(to);
+    if (attempt >= this.options.retryAttemptsMax) {
+      throw new Error(
+        `${this.clientId} -- websocket to ${to} failed after ${attempt} attempts, giving up`
+      );
+    } else {
+      log?.warn(
+        `${this.clientId} -- websocket to ${to} failed, trying again in ${this.options.retryIntervalMs * attempt}ms`
+      );
+      setTimeout(
+        () => this.createNewConnection(to, attempt + 1),
+        this.options.retryIntervalMs * attempt
+      );
+    }
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  WebSocketClientTransport
+});

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

@@ -0,0 +1,42 @@
+import WebSocket from 'isomorphic-ws';
+import { Transport, TransportClientId } from '../../index.cjs';
+import { C as Codec } from '../../../types-3e5768ec.js';
+import { W as WebSocketConnection } from '../../../connection-f7688cc1.js';
+import '@sinclair/typebox';
+
+interface Options {
+    retryIntervalMs: number;
+    retryAttemptsMax: number;
+    codec: Codec;
+}
+type WebSocketResult = {
+    ws: WebSocket;
+} | {
+    err: string;
+};
+/**
+ * A transport implementation that uses a WebSocket connection with automatic reconnection.
+ * @class
+ * @extends Transport
+ */
+declare class WebSocketClientTransport extends Transport<WebSocketConnection> {
+    /**
+     * A function that returns a Promise that resolves to a WebSocket instance.
+     */
+    wsGetter: (to: TransportClientId) => Promise<WebSocket>;
+    options: Options;
+    serverId: TransportClientId;
+    reconnectPromises: Map<TransportClientId, Promise<WebSocketResult>>;
+    tryReconnecting: boolean;
+    /**
+     * Creates a new WebSocketTransport instance.
+     * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.
+     * @param clientId The ID of the client using the transport.
+     * @param providedOptions An optional object containing configuration options for the transport.
+     */
+    constructor(wsGetter: () => Promise<WebSocket>, clientId: TransportClientId, serverId: TransportClientId, providedOptions?: Partial<Options>);
+    setupConnectionStatusListeners(): void;
+    createNewConnection(to: string, attempt?: number): Promise<void>;
+}
+
+export { WebSocketClientTransport };

package/dist/transport/impls/ws/client.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="ws" />
 import WebSocket from 'isomorphic-ws';
-import { Transport } from '../../transport';
-import { TransportClientId } from '../../message';
-import { type Codec } from '../../../codec';
-import { WebSocketConnection } from './connection';
+import { Transport, TransportClientId } from '../../index.js';
+import { C as Codec } from '../../../types-3e5768ec.js';
+import { W as WebSocketConnection } from '../../../connection-8e19874c.js';
+import '@sinclair/typebox';
+
 interface Options {
     retryIntervalMs: number;
     retryAttemptsMax: number;
@@ -19,7 +19,7 @@ type WebSocketResult = {
  * @class
  * @extends Transport
  */
-export declare class WebSocketClientTransport extends Transport<WebSocketConnection> {
+declare class WebSocketClientTransport extends Transport<WebSocketConnection> {
     /**
      * A function that returns a Promise that resolves to a WebSocket instance.
      */
@@ -38,5 +38,5 @@ export declare class WebSocketClientTransport extends Transport<WebSocketConnect
     setupConnectionStatusListeners(): void;
     createNewConnection(to: string, attempt?: number): Promise<void>;
 }
-export {};
-//# sourceMappingURL=client.d.ts.map
+
+export { WebSocketClientTransport };

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

@@ -1,101 +1,11 @@
-import { Transport } from '../../transport';
-import { NaiveJsonCodec } from '../../../codec/json';
-import { log } from '../../../logging';
-import { WebSocketConnection } from './connection';
-const defaultOptions = {
-    retryIntervalMs: 250,
-    retryAttemptsMax: 5,
-    codec: NaiveJsonCodec,
+import {
+  WebSocketClientTransport
+} from "../../../chunk-UU2Z7LDR.js";
+import "../../../chunk-PC65ZFWJ.js";
+import "../../../chunk-R6H2BIMC.js";
+import "../../../chunk-AJQU4AZG.js";
+import "../../../chunk-ZE4MX7DF.js";
+import "../../../chunk-SLUSVGQH.js";
+export {
+  WebSocketClientTransport
 };
-/**
- * A transport implementation that uses a WebSocket connection with automatic reconnection.
- * @class
- * @extends Transport
- */
-export class WebSocketClientTransport extends Transport {
-    /**
-     * A function that returns a Promise that resolves to a WebSocket instance.
-     */
-    wsGetter;
-    options;
-    serverId;
-    reconnectPromises;
-    tryReconnecting = true;
-    /**
-     * Creates a new WebSocketTransport instance.
-     * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.
-     * @param clientId The ID of the client using the transport.
-     * @param providedOptions An optional object containing configuration options for the transport.
-     */
-    constructor(wsGetter, clientId, serverId, providedOptions) {
-        const options = { ...defaultOptions, ...providedOptions };
-        super(options.codec, clientId);
-        this.wsGetter = wsGetter;
-        this.serverId = serverId;
-        this.options = options;
-        this.reconnectPromises = new Map();
-        this.setupConnectionStatusListeners();
-    }
-    setupConnectionStatusListeners() {
-        this.createNewConnection(this.serverId);
-    }
-    async createNewConnection(to, attempt = 0) {
-        if (this.state === 'destroyed') {
-            throw new Error('cant reopen a destroyed connection');
-        }
-        let reconnectPromise = this.reconnectPromises.get(to);
-        if (!reconnectPromise) {
-            if (!this.tryReconnecting) {
-                log?.info(`${this.clientId} -- tryReconnecting is false, not attempting reconnect`);
-                return;
-            }
-            reconnectPromise = new Promise(async (resolve) => {
-                log?.info(`${this.clientId} -- establishing a new websocket to ${to}`);
-                const ws = await this.wsGetter(to);
-                if (ws.readyState === ws.OPEN) {
-                    return resolve({ ws });
-                }
-                if (ws.readyState === ws.CLOSING || ws.readyState === ws.CLOSED) {
-                    return resolve({ err: 'ws is closing or closed' });
-                }
-                ws.addEventListener('open', function onOpen() {
-                    ws.removeEventListener('open', onOpen);
-                    resolve({ ws });
-                });
-                ws.addEventListener('close', function onClose(evt) {
-                    ws.removeEventListener('close', onClose);
-                    resolve({ err: evt.reason });
-                });
-            });
-            this.reconnectPromises.set(to, reconnectPromise);
-        }
-        const res = await reconnectPromise;
-        if ('ws' in res && res.ws.readyState === res.ws.OPEN) {
-            if (res.ws === this.connections.get(to)?.ws) {
-                // this is our current connection
-                // we reach this state when createNewConnection is called multiple times
-                // concurrently
-                return;
-            }
-            log?.info(`${this.clientId} -- websocket ok`);
-            const conn = new WebSocketConnection(this, to, res.ws);
-            this.onConnect(conn);
-            res.ws.onclose = () => {
-                this.reconnectPromises.delete(to);
-                this.onDisconnect(conn);
-            };
-            this.state = 'open';
-            return;
-        }
-        // otherwise try and reconnect again
-        this.reconnectPromises.delete(to);
-        if (attempt >= this.options.retryAttemptsMax) {
-            throw new Error(`${this.clientId} -- websocket to ${to} failed after ${attempt} attempts, giving up`);
-        }
-        else {
-            // linear backoff
-            log?.warn(`${this.clientId} -- websocket to ${to} failed, trying again in ${this.options.retryIntervalMs * attempt}ms`);
-            setTimeout(() => this.createNewConnection(to, attempt + 1), this.options.retryIntervalMs * attempt);
-        }
-    }
-}