@replit/river 0.21.1 → 0.23.0

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

@@ -1,22 +1,21 @@
 import {
   WebSocketConnection
-} from "../../../chunk-3Y7AB5EB.js";
+} from "../../../chunk-ZF2UFTNN.js";
 import {
   ClientTransport
-} from "../../../chunk-JMXO5L2X.js";
-import "../../../chunk-5WFL722S.js";
+} from "../../../chunk-MJUFKPBT.js";
+import "../../../chunk-PCKHBAVP.js";
 import {
   log
 } from "../../../chunk-OTQNCLFH.js";
 import "../../../chunk-3AW3IXVD.js";
 
 // transport/impls/ws/client.ts
-import WebSocket from "agnostic-ws";
 var WebSocketClientTransport = class extends ClientTransport {
   /**
    * A function that returns a Promise that resolves to a websocket URL.
    */
-  urlGetter;
+  wsGetter;
   /**
    * Creates a new WebSocketClientTransport instance.
    * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.
@@ -24,53 +23,39 @@ var WebSocketClientTransport = class extends ClientTransport {
    * @param serverId The ID of the server this transport is connecting to.
    * @param providedOptions An optional object containing configuration options for the transport.
    */
-  constructor(urlGetter, clientId, providedOptions) {
+  constructor(wsGetter, clientId, providedOptions) {
     super(clientId, providedOptions);
-    this.urlGetter = urlGetter;
+    this.wsGetter = wsGetter;
   }
   async createNewOutgoingConnection(to) {
-    const wsRes = await new Promise((resolve) => {
-      log?.info(`establishing a new websocket to ${to}`, {
-        clientId: this.clientId,
-        connectedTo: to
-      });
-      Promise.resolve(this.urlGetter(to)).then((url) => new WebSocket(url)).then((ws) => {
-        if (ws.readyState === WebSocket.OPEN) {
-          resolve({ ws });
-          return;
-        }
-        if (ws.readyState === WebSocket.CLOSING || ws.readyState === WebSocket.CLOSED) {
-          resolve({ err: "ws is closing or closed" });
-          return;
-        }
-        ws.onopen = () => {
-          resolve({ ws });
-        };
-        ws.onclose = (evt) => {
-          resolve({ err: evt.reason });
-        };
-        ws.onerror = (evt) => {
-          const err = evt.error;
-          resolve({
-            err: `${err.name}: ${err.message}`
-          });
-        };
-      }).catch((e) => {
-        const reason = e instanceof Error ? e.message : "unknown reason";
-        resolve({ err: `couldn't get a new websocket: ${reason}` });
-      });
+    log?.info(`establishing a new websocket to ${to}`, {
+      clientId: this.clientId,
+      connectedTo: to
     });
-    if ("ws" in wsRes) {
-      const conn = new WebSocketConnection(wsRes.ws);
-      log?.info(`raw websocket to ${to} ok, starting handshake`, {
-        clientId: this.clientId,
-        connectedTo: to
-      });
-      this.handleConnection(conn, to);
-      return conn;
-    } else {
-      throw new Error(wsRes.err);
-    }
+    const ws = await this.wsGetter(to);
+    await new Promise((resolve, reject) => {
+      if (ws.readyState === ws.OPEN) {
+        resolve();
+        return;
+      }
+      if (ws.readyState === ws.CLOSING || ws.readyState === ws.CLOSED) {
+        reject(new Error("ws is closing or closed"));
+        return;
+      }
+      ws.onopen = () => {
+        resolve();
+      };
+      ws.onclose = (evt) => {
+        reject(new Error(evt.reason));
+      };
+    });
+    const conn = new WebSocketConnection(ws);
+    log?.info(`raw websocket to ${to} ok, starting handshake`, {
+      clientId: this.clientId,
+      connectedTo: to
+    });
+    this.handleConnection(conn, to);
+    return conn;
   }
 };
 export {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../transport/impls/ws/client.ts"],"sourcesContent":["import WebSocket, { CloseEvent, ErrorEvent } from 'agnostic-ws';\nimport {\n  ClientTransport,\n  ProvidedClientTransportOptions,\n} from '../../transport';\nimport { TransportClientId } from '../../message';\nimport { log } from '../../../logging/log';\nimport { WebSocketConnection } from './connection';\n\ntype WebSocketResult = { ws: WebSocket } | { err: string };\ntype UrlGetter = (to: TransportClientId) => Promise<string> | string;\n\n/**\n * A transport implementation that uses a WebSocket connection with automatic reconnection.\n * @class\n * @extends Transport\n */\nexport class WebSocketClientTransport extends ClientTransport<WebSocketConnection> {\n  /**\n   * A function that returns a Promise that resolves to a websocket URL.\n   */\n  urlGetter: (to: TransportClientId) => Promise<string> | string;\n\n  /**\n   * Creates a new WebSocketClientTransport instance.\n   * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.\n   * @param clientId The ID of the client using the transport. This should be unique per session.\n   * @param serverId The ID of the server this transport is connecting to.\n   * @param providedOptions An optional object containing configuration options for the transport.\n   */\n  constructor(\n    urlGetter: UrlGetter,\n    clientId: TransportClientId,\n    providedOptions?: ProvidedClientTransportOptions,\n  ) {\n    super(clientId, providedOptions);\n    this.urlGetter = urlGetter;\n  }\n\n  async createNewOutgoingConnection(to: string) {\n    // get a promise to an actual websocket that's ready\n    const wsRes = await new Promise<WebSocketResult>((resolve) => {\n      log?.info(`establishing a new websocket to ${to}`, {\n        clientId: this.clientId,\n        connectedTo: to,\n      });\n\n      Promise.resolve(this.urlGetter(to))\n        .then((url) => new WebSocket(url))\n        .then((ws) => {\n          if (ws.readyState === WebSocket.OPEN) {\n            resolve({ ws });\n            return;\n          }\n\n          if (\n            ws.readyState === WebSocket.CLOSING ||\n            ws.readyState === WebSocket.CLOSED\n          ) {\n            resolve({ err: 'ws is closing or closed' });\n            return;\n          }\n\n          ws.onopen = () => {\n            resolve({ ws });\n          };\n\n          ws.onclose = (evt: CloseEvent) => {\n            resolve({ err: evt.reason });\n          };\n\n          ws.onerror = (evt: ErrorEvent) => {\n            const err = evt.error;\n            resolve({\n              err: `${err.name}: ${err.message}`,\n            });\n          };\n        })\n        .catch((e) => {\n          const reason = e instanceof Error ? e.message : 'unknown reason';\n          resolve({ err: `couldn't get a new websocket: ${reason}` });\n        });\n    });\n\n    if ('ws' in wsRes) {\n      const conn = new WebSocketConnection(wsRes.ws);\n      log?.info(`raw websocket to ${to} ok, starting handshake`, {\n        clientId: this.clientId,\n        connectedTo: to,\n      });\n\n      this.handleConnection(conn, to);\n      return conn;\n    } else {\n      throw new Error(wsRes.err);\n    }\n  }\n}\n"],"mappings":";;;;;;;;;;;;;AAAA,OAAO,eAA2C;AAiB3C,IAAM,2BAAN,cAAuC,gBAAqC;AAAA;AAAA;AAAA;AAAA,EAIjF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,YACE,WACA,UACA,iBACA;AACA,UAAM,UAAU,eAAe;AAC/B,SAAK,YAAY;AAAA,EACnB;AAAA,EAEA,MAAM,4BAA4B,IAAY;AAE5C,UAAM,QAAQ,MAAM,IAAI,QAAyB,CAAC,YAAY;AAC5D,WAAK,KAAK,mCAAmC,EAAE,IAAI;AAAA,QACjD,UAAU,KAAK;AAAA,QACf,aAAa;AAAA,MACf,CAAC;AAED,cAAQ,QAAQ,KAAK,UAAU,EAAE,CAAC,EAC/B,KAAK,CAAC,QAAQ,IAAI,UAAU,GAAG,CAAC,EAChC,KAAK,CAAC,OAAO;AACZ,YAAI,GAAG,eAAe,UAAU,MAAM;AACpC,kBAAQ,EAAE,GAAG,CAAC;AACd;AAAA,QACF;AAEA,YACE,GAAG,eAAe,UAAU,WAC5B,GAAG,eAAe,UAAU,QAC5B;AACA,kBAAQ,EAAE,KAAK,0BAA0B,CAAC;AAC1C;AAAA,QACF;AAEA,WAAG,SAAS,MAAM;AAChB,kBAAQ,EAAE,GAAG,CAAC;AAAA,QAChB;AAEA,WAAG,UAAU,CAAC,QAAoB;AAChC,kBAAQ,EAAE,KAAK,IAAI,OAAO,CAAC;AAAA,QAC7B;AAEA,WAAG,UAAU,CAAC,QAAoB;AAChC,gBAAM,MAAM,IAAI;AAChB,kBAAQ;AAAA,YACN,KAAK,GAAG,IAAI,IAAI,KAAK,IAAI,OAAO;AAAA,UAClC,CAAC;AAAA,QACH;AAAA,MACF,CAAC,EACA,MAAM,CAAC,MAAM;AACZ,cAAM,SAAS,aAAa,QAAQ,EAAE,UAAU;AAChD,gBAAQ,EAAE,KAAK,iCAAiC,MAAM,GAAG,CAAC;AAAA,MAC5D,CAAC;AAAA,IACL,CAAC;AAED,QAAI,QAAQ,OAAO;AACjB,YAAM,OAAO,IAAI,oBAAoB,MAAM,EAAE;AAC7C,WAAK,KAAK,oBAAoB,EAAE,2BAA2B;AAAA,QACzD,UAAU,KAAK;AAAA,QACf,aAAa;AAAA,MACf,CAAC;AAED,WAAK,iBAAiB,MAAM,EAAE;AAC9B,aAAO;AAAA,IACT,OAAO;AACL,YAAM,IAAI,MAAM,MAAM,GAAG;AAAA,IAC3B;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../../../transport/impls/ws/client.ts"],"sourcesContent":["import {\n  ClientTransport,\n  ProvidedClientTransportOptions,\n} from '../../transport';\nimport { TransportClientId } from '../../message';\nimport { log } from '../../../logging/log';\nimport { WebSocketConnection } from './connection';\nimport { WsLike } from './wslike';\n\n/**\n * A transport implementation that uses a WebSocket connection with automatic reconnection.\n * @class\n * @extends Transport\n */\nexport class WebSocketClientTransport extends ClientTransport<WebSocketConnection> {\n  /**\n   * A function that returns a Promise that resolves to a websocket URL.\n   */\n  wsGetter: (to: TransportClientId) => Promise<WsLike> | WsLike;\n\n  /**\n   * Creates a new WebSocketClientTransport instance.\n   * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.\n   * @param clientId The ID of the client using the transport. This should be unique per session.\n   * @param serverId The ID of the server this transport is connecting to.\n   * @param providedOptions An optional object containing configuration options for the transport.\n   */\n  constructor(\n    wsGetter: (to: TransportClientId) => Promise<WsLike> | WsLike,\n    clientId: TransportClientId,\n    providedOptions?: ProvidedClientTransportOptions,\n  ) {\n    super(clientId, providedOptions);\n    this.wsGetter = wsGetter;\n  }\n\n  async createNewOutgoingConnection(to: string) {\n    log?.info(`establishing a new websocket to ${to}`, {\n      clientId: this.clientId,\n      connectedTo: to,\n    });\n\n    const ws = await this.wsGetter(to);\n\n    await new Promise<void>((resolve, reject) => {\n      if (ws.readyState === ws.OPEN) {\n        resolve();\n        return;\n      }\n\n      if (ws.readyState === ws.CLOSING || ws.readyState === ws.CLOSED) {\n        reject(new Error('ws is closing or closed'));\n        return;\n      }\n\n      ws.onopen = () => {\n        resolve();\n      };\n\n      ws.onclose = (evt) => {\n        reject(new Error(evt.reason));\n      };\n    });\n\n    const conn = new WebSocketConnection(ws);\n    log?.info(`raw websocket to ${to} ok, starting handshake`, {\n      clientId: this.clientId,\n      connectedTo: to,\n    });\n\n    this.handleConnection(conn, to);\n    return conn;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;AAcO,IAAM,2BAAN,cAAuC,gBAAqC;AAAA;AAAA;AAAA;AAAA,EAIjF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,YACE,UACA,UACA,iBACA;AACA,UAAM,UAAU,eAAe;AAC/B,SAAK,WAAW;AAAA,EAClB;AAAA,EAEA,MAAM,4BAA4B,IAAY;AAC5C,SAAK,KAAK,mCAAmC,EAAE,IAAI;AAAA,MACjD,UAAU,KAAK;AAAA,MACf,aAAa;AAAA,IACf,CAAC;AAED,UAAM,KAAK,MAAM,KAAK,SAAS,EAAE;AAEjC,UAAM,IAAI,QAAc,CAAC,SAAS,WAAW;AAC3C,UAAI,GAAG,eAAe,GAAG,MAAM;AAC7B,gBAAQ;AACR;AAAA,MACF;AAEA,UAAI,GAAG,eAAe,GAAG,WAAW,GAAG,eAAe,GAAG,QAAQ;AAC/D,eAAO,IAAI,MAAM,yBAAyB,CAAC;AAC3C;AAAA,MACF;AAEA,SAAG,SAAS,MAAM;AAChB,gBAAQ;AAAA,MACV;AAEA,SAAG,UAAU,CAAC,QAAQ;AACpB,eAAO,IAAI,MAAM,IAAI,MAAM,CAAC;AAAA,MAC9B;AAAA,IACF,CAAC;AAED,UAAM,OAAO,IAAI,oBAAoB,EAAE;AACvC,SAAK,KAAK,oBAAoB,EAAE,2BAA2B;AAAA,MACzD,UAAU,KAAK;AAAA,MACf,aAAa;AAAA,IACf,CAAC;AAED,SAAK,iBAAiB,MAAM,EAAE;AAC9B,WAAO;AAAA,EACT;AACF;","names":[]}