@replit/river 0.11.0 → 0.12.1

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

@@ -1,33 +1,20 @@
 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 { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-0c0a69f6.js';
+import { W as WebSocketConnection } from '../../../connection-eb10d250.js';
+import '../../../types-3e5768ec.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> {
+declare class WebSocketClientTransport extends ClientTransport<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 WebSocketClientTransport instance.
      * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.
@@ -35,11 +22,9 @@ declare class WebSocketClientTransport extends Transport<WebSocketConnection> {
      * @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<Options>);
+    constructor(wsGetter: () => Promise<WebSocket>, sessionId: TransportClientId, serverId: TransportClientId, providedOptions?: Partial<TransportOptions>);
     reopen(): void;
-    createNewConnection(to: string, attempt?: number): Promise<void>;
-    close(): Promise<void>;
-    destroy(): Promise<void>;
+    createNewOutgoingConnection(to: string): Promise<WebSocketConnection>;
 }
 
 export { WebSocketClientTransport };

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

@@ -1,33 +1,20 @@
 import WebSocket from 'isomorphic-ws';
-import { Transport, TransportClientId } from '../../index.js';
-import { C as Codec } from '../../../types-3e5768ec.js';
-import { W as WebSocketConnection } from '../../../connection-8e19874c.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-0c0a69f6.js';
+import { W as WebSocketConnection } from '../../../connection-eb10d250.js';
+import '../../../types-3e5768ec.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> {
+declare class WebSocketClientTransport extends ClientTransport<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 WebSocketClientTransport instance.
      * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.
@@ -35,11 +22,9 @@ declare class WebSocketClientTransport extends Transport<WebSocketConnection> {
      * @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<Options>);
+    constructor(wsGetter: () => Promise<WebSocket>, sessionId: TransportClientId, serverId: TransportClientId, providedOptions?: Partial<TransportOptions>);
     reopen(): void;
-    createNewConnection(to: string, attempt?: number): Promise<void>;
-    close(): Promise<void>;
-    destroy(): Promise<void>;
+    createNewOutgoingConnection(to: string): Promise<WebSocketConnection>;
 }
 
 export { WebSocketClientTransport };

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

@@ -1,11 +1,87 @@
 import {
-  WebSocketClientTransport
-} from "../../../chunk-5IC5XMWK.js";
-import "../../../chunk-L7D75G4K.js";
-import "../../../chunk-R6H2BIMC.js";
-import "../../../chunk-LQXPKF3A.js";
-import "../../../chunk-ZE4MX7DF.js";
-import "../../../chunk-T7M7OKPE.js";
+  WebSocketConnection
+} from "../../../chunk-RDTTKCGV.js";
+import {
+  ClientTransport
+} from "../../../chunk-QEYN2Z6O.js";
+import "../../../chunk-GZ7HCLLM.js";
+import "../../../chunk-XFFS4UOD.js";
+import {
+  log
+} from "../../../chunk-H4BYJELI.js";
+
+// transport/impls/ws/client.ts
+var WebSocketClientTransport = class extends ClientTransport {
+  /**
+   * A function that returns a Promise that resolves to a WebSocket instance.
+   */
+  wsGetter;
+  serverId;
+  /**
+   * 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 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);
+    this.wsGetter = wsGetter;
+    this.serverId = serverId;
+    void this.connect(this.serverId);
+  }
+  reopen() {
+    if (this.state === "destroyed") {
+      throw new Error("cant reopen a destroyed connection");
+    }
+    this.state = "open";
+    void this.connect(this.serverId);
+  }
+  async createNewOutgoingConnection(to) {
+    const wsRes = await new Promise((resolve) => {
+      log?.info(`${this.clientId} -- establishing a new websocket to ${to}`);
+      this.wsGetter(to).then((ws) => {
+        if (ws.readyState === ws.OPEN) {
+          resolve({ ws });
+          return;
+        }
+        if (ws.readyState === ws.CLOSING || ws.readyState === ws.CLOSED) {
+          resolve({ err: "ws is closing or closed" });
+          return;
+        }
+        const onOpen = () => {
+          ws.removeEventListener("open", onOpen);
+          resolve({ ws });
+        };
+        const onClose = (evt) => {
+          ws.removeEventListener("close", onClose);
+          resolve({ err: evt.reason });
+        };
+        const onError = (evt) => {
+          ws.removeEventListener("error", onError);
+          ws.removeEventListener("close", onClose);
+          resolve({ err: evt.message });
+        };
+        ws.addEventListener("open", onOpen);
+        ws.addEventListener("close", onClose);
+        ws.addEventListener("error", onError);
+      }).catch((e) => {
+        const reason = e instanceof Error ? e.message : "unknown reason";
+        resolve({ err: `couldn't get a new websocket: ${reason}` });
+      });
+    });
+    if ("ws" in wsRes) {
+      const conn = new WebSocketConnection(wsRes.ws);
+      log?.info(
+        `${this.clientId} -- websocket (id: ${conn.debugId}) to ${to} ok`
+      );
+      this.handleConnection(conn, to);
+      return conn;
+    } else {
+      throw new Error(wsRes.err);
+    }
+  }
+};
 export {
   WebSocketClientTransport
 };