@replit/river 0.20.1 → 0.21.0

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

@@ -1,10 +1,11 @@
-import WebSocket from 'isomorphic-ws';
 import { ClientTransport, ClientTransportOptions as ProvidedClientTransportOptions } from '../../index.cjs';
 import { T as TransportClientId } from '../../../index-3ac92295.js';
-import { W as WebSocketConnection } from '../../../connection-dba95bc8.js';
+import { W as WebSocketConnection } from '../../../connection-8a71dbe2.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
+import 'agnostic-ws';
 
+type UrlGetter = (to: TransportClientId) => Promise<string> | string;
 /**
  * A transport implementation that uses a WebSocket connection with automatic reconnection.
  * @class
@@ -12,9 +13,9 @@ import '@sinclair/typebox';
  */
 declare class WebSocketClientTransport extends ClientTransport<WebSocketConnection> {
     /**
-     * A function that returns a Promise that resolves to a WebSocket instance.
+     * A function that returns a Promise that resolves to a websocket URL.
      */
-    wsGetter: (to: TransportClientId) => Promise<WebSocket>;
+    urlGetter: (to: TransportClientId) => Promise<string> | string;
     /**
      * Creates a new WebSocketClientTransport instance.
      * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.
@@ -22,7 +23,7 @@ declare class WebSocketClientTransport extends ClientTransport<WebSocketConnecti
      * @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>, clientId: TransportClientId, providedOptions?: ProvidedClientTransportOptions);
+    constructor(urlGetter: UrlGetter, clientId: TransportClientId, providedOptions?: ProvidedClientTransportOptions);
     createNewOutgoingConnection(to: string): Promise<WebSocketConnection>;
 }
 

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

@@ -1,10 +1,11 @@
-import WebSocket from 'isomorphic-ws';
 import { ClientTransport, ClientTransportOptions as ProvidedClientTransportOptions } from '../../index.js';
 import { T as TransportClientId } from '../../../index-3ac92295.js';
-import { W as WebSocketConnection } from '../../../connection-dba95bc8.js';
+import { W as WebSocketConnection } from '../../../connection-8a71dbe2.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
+import 'agnostic-ws';
 
+type UrlGetter = (to: TransportClientId) => Promise<string> | string;
 /**
  * A transport implementation that uses a WebSocket connection with automatic reconnection.
  * @class
@@ -12,9 +13,9 @@ import '@sinclair/typebox';
  */
 declare class WebSocketClientTransport extends ClientTransport<WebSocketConnection> {
     /**
-     * A function that returns a Promise that resolves to a WebSocket instance.
+     * A function that returns a Promise that resolves to a websocket URL.
      */
-    wsGetter: (to: TransportClientId) => Promise<WebSocket>;
+    urlGetter: (to: TransportClientId) => Promise<string> | string;
     /**
      * Creates a new WebSocketClientTransport instance.
      * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.
@@ -22,7 +23,7 @@ declare class WebSocketClientTransport extends ClientTransport<WebSocketConnecti
      * @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>, clientId: TransportClientId, providedOptions?: ProvidedClientTransportOptions);
+    constructor(urlGetter: UrlGetter, clientId: TransportClientId, providedOptions?: ProvidedClientTransportOptions);
     createNewOutgoingConnection(to: string): Promise<WebSocketConnection>;
 }
 

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

@@ -1,6 +1,6 @@
 import {
   WebSocketConnection
-} from "../../../chunk-FNK44ZN3.js";
+} from "../../../chunk-2ERP6FUE.js";
 import {
   ClientTransport
 } from "../../../chunk-QU2EE6YU.js";
@@ -11,11 +11,12 @@ import {
 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 instance.
+   * A function that returns a Promise that resolves to a websocket URL.
    */
-  wsGetter;
+  urlGetter;
   /**
    * Creates a new WebSocketClientTransport instance.
    * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.
@@ -23,9 +24,9 @@ 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(wsGetter, clientId, providedOptions) {
+  constructor(urlGetter, clientId, providedOptions) {
     super(clientId, providedOptions);
-    this.wsGetter = wsGetter;
+    this.urlGetter = urlGetter;
   }
   async createNewOutgoingConnection(to) {
     const wsRes = await new Promise((resolve) => {
@@ -33,12 +34,12 @@ var WebSocketClientTransport = class extends ClientTransport {
         clientId: this.clientId,
         connectedTo: to
       });
-      this.wsGetter(to).then((ws) => {
-        if (ws.readyState === ws.OPEN) {
+      Promise.resolve(this.urlGetter(to)).then((url) => new WebSocket(url)).then((ws) => {
+        if (ws.readyState === WebSocket.OPEN) {
           resolve({ ws });
           return;
         }
-        if (ws.readyState === ws.CLOSING || ws.readyState === ws.CLOSED) {
+        if (ws.readyState === WebSocket.CLOSING || ws.readyState === WebSocket.CLOSED) {
           resolve({ err: "ws is closing or closed" });
           return;
         }
@@ -51,7 +52,7 @@ var WebSocketClientTransport = class extends ClientTransport {
         ws.onerror = (evt) => {
           const err = evt.error;
           resolve({
-            err: err?.code ?? "unexpected disconnect"
+            err: `${err.name}: ${err.message}`
           });
         };
       }).catch((e) => {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../transport/impls/ws/client.ts"],"sourcesContent":["import WebSocket from 'isomorphic-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 };\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 instance.\n   */\n  wsGetter: (to: TransportClientId) => Promise<WebSocket>;\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: () => Promise<WebSocket>,\n    clientId: TransportClientId,\n    providedOptions?: ProvidedClientTransportOptions,\n  ) {\n    super(clientId, providedOptions);\n    this.wsGetter = wsGetter;\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      this.wsGetter(to)\n        .then((ws) => {\n          if (ws.readyState === ws.OPEN) {\n            resolve({ ws });\n            return;\n          }\n\n          if (ws.readyState === ws.CLOSING || ws.readyState === ws.CLOSED) {\n            resolve({ err: 'ws is closing or closed' });\n            return;\n          }\n\n          ws.onopen = () => {\n            resolve({ ws });\n          };\n\n          ws.onclose = (evt: WebSocket.CloseEvent) => {\n            resolve({ err: evt.reason });\n          };\n\n          ws.onerror = (evt: WebSocket.ErrorEvent) => {\n            const err = evt.error as { code: string } | undefined;\n            resolve({\n              err: err?.code ?? 'unexpected disconnect',\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":";;;;;;;;;;;;;AAgBO,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;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,WAAK,SAAS,EAAE,EACb,KAAK,CAAC,OAAO;AACZ,YAAI,GAAG,eAAe,GAAG,MAAM;AAC7B,kBAAQ,EAAE,GAAG,CAAC;AACd;AAAA,QACF;AAEA,YAAI,GAAG,eAAe,GAAG,WAAW,GAAG,eAAe,GAAG,QAAQ;AAC/D,kBAAQ,EAAE,KAAK,0BAA0B,CAAC;AAC1C;AAAA,QACF;AAEA,WAAG,SAAS,MAAM;AAChB,kBAAQ,EAAE,GAAG,CAAC;AAAA,QAChB;AAEA,WAAG,UAAU,CAAC,QAA8B;AAC1C,kBAAQ,EAAE,KAAK,IAAI,OAAO,CAAC;AAAA,QAC7B;AAEA,WAAG,UAAU,CAAC,QAA8B;AAC1C,gBAAM,MAAM,IAAI;AAChB,kBAAQ;AAAA,YACN,KAAK,KAAK,QAAQ;AAAA,UACpB,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 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":[]}

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

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // transport/impls/ws/server.ts
@@ -1020,6 +1030,7 @@ var ServerTransport = class extends Transport {
 };
 
 // transport/impls/ws/connection.ts
+var import_agnostic_ws = __toESM(require("agnostic-ws"), 1);
 var WebSocketConnection = class extends Connection {
   ws;
   constructor(ws) {
@@ -1037,10 +1048,10 @@ var WebSocketConnection = class extends Connection {
     this.ws.onclose = cb;
   }
   addErrorListener(cb) {
-    this.ws.onerror = (err) => cb(new Error(err.message));
+    this.ws.onerror = (err) => cb(err.error);
   }
   send(payload) {
-    if (this.ws.readyState === this.ws.OPEN) {
+    if (this.ws.readyState === import_agnostic_ws.default.OPEN) {
       this.ws.send(payload);
       return true;
     } else {