@replit/river 0.15.1 → 0.15.2

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

@@ -134,60 +134,6 @@ 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 {
@@ -196,15 +142,6 @@ var Connection = class {
     this.debugId = `conn-${unsafeId()}`;
   }
 };
-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;
@@ -399,14 +336,146 @@ function coerceErrorString(err) {
   return `[coerced to error] ${String(err)}`;
 }
 
+// transport/rateLimit.ts
+var LeakyBucketRateLimit = class {
+  budgetConsumed;
+  intervalHandles;
+  options;
+  constructor(options) {
+    this.options = options;
+    this.budgetConsumed = /* @__PURE__ */ new Map();
+    this.intervalHandles = /* @__PURE__ */ new Map();
+  }
+  getBackoffMs(user) {
+    if (!this.budgetConsumed.has(user))
+      return 0;
+    const exponent = Math.max(0, this.getBudgetConsumed(user) - 1);
+    const jitter = Math.floor(Math.random() * this.options.maxJitterMs);
+    const backoffMs = Math.min(
+      this.options.baseIntervalMs * 2 ** exponent,
+      this.options.maxBackoffMs
+    );
+    return backoffMs + jitter;
+  }
+  get totalBudgetRestoreTime() {
+    return this.options.budgetRestoreIntervalMs * this.options.attemptBudgetCapacity;
+  }
+  consumeBudget(user) {
+    this.stopLeak(user);
+    this.budgetConsumed.set(user, this.getBudgetConsumed(user) + 1);
+  }
+  getBudgetConsumed(user) {
+    return this.budgetConsumed.get(user) ?? 0;
+  }
+  hasBudget(user) {
+    return this.getBudgetConsumed(user) < this.options.attemptBudgetCapacity;
+  }
+  startRestoringBudget(user) {
+    if (this.intervalHandles.has(user)) {
+      return;
+    }
+    const restoreBudgetForUser = () => {
+      const currentBudget = this.budgetConsumed.get(user);
+      if (!currentBudget) {
+        this.stopLeak(user);
+        return;
+      }
+      const newBudget = currentBudget - 1;
+      if (newBudget === 0) {
+        this.budgetConsumed.delete(user);
+        return;
+      }
+      this.budgetConsumed.set(user, newBudget);
+    };
+    restoreBudgetForUser();
+    const intervalHandle = setInterval(
+      restoreBudgetForUser,
+      this.options.budgetRestoreIntervalMs
+    );
+    this.intervalHandles.set(user, intervalHandle);
+  }
+  stopLeak(user) {
+    if (!this.intervalHandles.has(user)) {
+      return;
+    }
+    clearInterval(this.intervalHandles.get(user));
+    this.intervalHandles.delete(user);
+  }
+  close() {
+    for (const user of this.intervalHandles.keys()) {
+      this.stopLeak(user);
+    }
+  }
+};
+
+// 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 RECONNECT_JITTER_MAX_MS = 500;
-var RECONNECT_INTERVAL_MS = 250;
 var defaultTransportOptions = {
-  retryIntervalMs: RECONNECT_INTERVAL_MS,
-  retryJitterMs: RECONNECT_JITTER_MAX_MS,
-  retryAttemptsMax: 5,
-  ...defaultSessionOptions
+  heartbeatIntervalMs: 1e3,
+  heartbeatsUntilDead: 2,
+  sessionDisconnectGraceMs: 5e3,
+  codec: NaiveJsonCodec
+};
+var defaultClientTransportOptions = {
+  connectionRetryOptions: {
+    baseIntervalMs: 250,
+    maxJitterMs: 200,
+    maxBackoffMs: 32e3,
+    attemptBudgetCapacity: 15,
+    budgetRestoreIntervalMs: 200
+  },
+  ...defaultTransportOptions
 };
 var Transport = class {
   /**
@@ -681,14 +750,26 @@ var Transport = class {
   }
 };
 var ClientTransport = class extends Transport {
+  /**
+   * The options for this transport.
+   */
+  options;
   /**
    * The map of reconnect promises for each client ID.
    */
   inflightConnectionPromises;
+  retryBudget;
   tryReconnecting = true;
   constructor(clientId, providedOptions) {
     super(clientId, providedOptions);
+    this.options = {
+      ...defaultClientTransportOptions,
+      ...providedOptions
+    };
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
+    this.retryBudget = new LeakyBucketRateLimit(
+      this.options.connectionRetryOptions
+    );
   }
   handleConnection(conn, to) {
     if (this.state !== "open")
@@ -719,7 +800,10 @@ var ClientTransport = class extends Transport {
       log?.info(
         `${this.clientId} -- connection (id: ${conn.debugId}) to ${to} disconnected`
       );
-      void this.connect(to);
+      this.inflightConnectionPromises.delete(to);
+      if (this.tryReconnecting) {
+        void this.connect(to);
+      }
     });
     conn.addErrorListener((err) => {
       log?.warn(
@@ -770,41 +854,64 @@ var ClientTransport = class extends Transport {
    * Manually attempts to connect to a client.
    * @param to The client ID of the node to connect to.
    */
-  async connect(to, attempt = 0) {
-    if (this.state !== "open" || !this.tryReconnecting) {
+  async connect(to) {
+    const canProceedWithConnection = () => this.state === "open";
+    if (!canProceedWithConnection()) {
       log?.info(
-        `${this.clientId} -- transport state is no longer open, not attempting connection`
+        `${this.clientId} -- transport state is no longer open, cancelling attempt to connect to ${to}`
       );
       return;
     }
     let reconnectPromise = this.inflightConnectionPromises.get(to);
     if (!reconnectPromise) {
-      reconnectPromise = this.createNewOutgoingConnection(to).then((conn) => {
+      log?.info(`${this.clientId} -- attempting connection to ${to}`);
+      const budgetConsumed = this.retryBudget.getBudgetConsumed(to);
+      if (!this.retryBudget.hasBudget(to)) {
+        const errMsg = `not attempting to connect to ${to}, retry budget exceeded (more than ${budgetConsumed} attempts in the last ${this.retryBudget.totalBudgetRestoreTime}ms)`;
+        log?.warn(`${this.clientId} -- ${errMsg}`);
+        this.protocolError(ProtocolError.RetriesExceeded, errMsg);
+        return;
+      }
+      let sleep = Promise.resolve();
+      const backoffMs = this.retryBudget.getBackoffMs(to);
+      if (backoffMs > 0) {
+        sleep = new Promise((resolve) => setTimeout(resolve, backoffMs));
+      }
+      this.retryBudget.consumeBudget(to);
+      reconnectPromise = sleep.then(() => {
+        if (!canProceedWithConnection()) {
+          throw new Error("transport state is no longer open");
+        }
+      }).then(() => this.createNewOutgoingConnection(to)).then((conn) => {
+        if (!canProceedWithConnection()) {
+          log?.info(
+            `${this.clientId} -- transport state is no longer open, closing pre-handshake connection (id: ${conn.debugId}) to ${to}`
+          );
+          conn.close();
+          throw new Error("transport state is no longer open");
+        }
+        this.retryBudget.startRestoringBudget(to);
         this.sendHandshake(to, conn);
         return conn;
       });
       this.inflightConnectionPromises.set(to, reconnectPromise);
+    } else {
+      log?.info(
+        `${this.clientId} -- attempting connection to ${to} (reusing previous attempt)`
+      );
     }
     try {
       await reconnectPromise;
     } catch (error) {
-      const errStr = coerceErrorString(error);
       this.inflightConnectionPromises.delete(to);
-      const shouldRetry = this.state === "open" && this.tryReconnecting;
-      if (!shouldRetry)
-        return;
-      if (attempt >= this.options.retryAttemptsMax) {
-        const errMsg = `connection to ${to} failed after ${attempt} attempts (${errStr}), giving up`;
-        log?.error(`${this.clientId} -- ${errMsg}`);
-        this.protocolError(ProtocolError.RetriesExceeded, errMsg);
-        return;
+      const errStr = coerceErrorString(error);
+      if (!this.tryReconnecting || !canProceedWithConnection()) {
+        log?.warn(`${this.clientId} -- connection to ${to} failed (${errStr})`);
       } else {
-        const jitter = Math.floor(Math.random() * this.options.retryJitterMs);
-        const backoffMs = this.options.retryIntervalMs * 2 ** attempt + jitter;
         log?.warn(
-          `${this.clientId} -- connection to ${to} failed (${errStr}), trying again in ${backoffMs}ms`
+          `${this.clientId} -- connection to ${to} failed (${errStr}), retrying`
         );
-        setTimeout(() => void this.connect(to, attempt + 1), backoffMs);
+        return this.connect(to);
       }
     }
   }
@@ -817,9 +924,9 @@ var ClientTransport = class extends Transport {
     log?.debug(`${this.clientId} -- sending handshake request to ${to}`);
     conn.send(this.codec.toBuffer(requestMsg));
   }
-  onDisconnect(conn, session) {
-    this.inflightConnectionPromises.delete(session.to);
-    super.onDisconnect(conn, session);
+  close() {
+    this.retryBudget.close();
+    super.close();
   }
 };
 

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-76b801f8.js';
-import { W as WebSocketConnection } from '../../../connection-93daccc3.js';
+import { a as ClientTransport, b as TransportClientId, c as ProvidedClientTransportOptions } from '../../../index-bbccacef.js';
+import { W as WebSocketConnection } from '../../../connection-f4492948.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 
@@ -21,7 +21,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?: Partial<TransportOptions>);
+    constructor(wsGetter: () => Promise<WebSocket>, clientId: TransportClientId, providedOptions?: ProvidedClientTransportOptions);
     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-76b801f8.js';
-import { W as WebSocketConnection } from '../../../connection-93daccc3.js';
+import { a as ClientTransport, b as TransportClientId, c as ProvidedClientTransportOptions } from '../../../index-bbccacef.js';
+import { W as WebSocketConnection } from '../../../connection-f4492948.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 
@@ -21,7 +21,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?: Partial<TransportOptions>);
+    constructor(wsGetter: () => Promise<WebSocket>, clientId: TransportClientId, providedOptions?: ProvidedClientTransportOptions);
     createNewOutgoingConnection(to: string): Promise<WebSocketConnection>;
 }
 

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

@@ -1,9 +1,9 @@
 import {
   WebSocketConnection
-} from "../../../chunk-5TX4BKAD.js";
+} from "../../../chunk-ZRB6IKPV.js";
 import {
   ClientTransport
-} from "../../../chunk-O6YQ3JAH.js";
+} from "../../../chunk-B7VTDQR7.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log

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

@@ -142,60 +142,6 @@ 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 {
@@ -204,15 +150,6 @@ var Connection = class {
     this.debugId = `conn-${unsafeId()}`;
   }
 };
-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;
@@ -407,14 +344,74 @@ function coerceErrorString(err) {
   return `[coerced to error] ${String(err)}`;
 }
 
+// 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 RECONNECT_JITTER_MAX_MS = 500;
-var RECONNECT_INTERVAL_MS = 250;
 var defaultTransportOptions = {
-  retryIntervalMs: RECONNECT_INTERVAL_MS,
-  retryJitterMs: RECONNECT_JITTER_MAX_MS,
-  retryAttemptsMax: 5,
-  ...defaultSessionOptions
+  heartbeatIntervalMs: 1e3,
+  heartbeatsUntilDead: 2,
+  sessionDisconnectGraceMs: 5e3,
+  codec: NaiveJsonCodec
+};
+var defaultClientTransportOptions = {
+  connectionRetryOptions: {
+    baseIntervalMs: 250,
+    maxJitterMs: 200,
+    maxBackoffMs: 32e3,
+    attemptBudgetCapacity: 15,
+    budgetRestoreIntervalMs: 200
+  },
+  ...defaultTransportOptions
 };
 var Transport = class {
   /**

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

@@ -1,13 +1,13 @@
-import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-76b801f8.js';
+import { S as ServerTransport, b as TransportClientId, d as ProvidedTransportOptions } from '../../../index-bbccacef.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-93daccc3.js';
+import { W as WebSocketConnection } from '../../../connection-f4492948.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 
 declare class WebSocketServerTransport extends ServerTransport<WebSocketConnection> {
     wss: WebSocketServer;
-    constructor(wss: WebSocketServer, clientId: TransportClientId, providedOptions?: Partial<TransportOptions>);
+    constructor(wss: WebSocketServer, clientId: TransportClientId, providedOptions?: Partial<ProvidedTransportOptions>);
     connectionHandler: (ws: WebSocket) => void;
     close(): void;
 }

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

@@ -1,13 +1,13 @@
-import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-76b801f8.js';
+import { S as ServerTransport, b as TransportClientId, d as ProvidedTransportOptions } from '../../../index-bbccacef.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-93daccc3.js';
+import { W as WebSocketConnection } from '../../../connection-f4492948.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 
 declare class WebSocketServerTransport extends ServerTransport<WebSocketConnection> {
     wss: WebSocketServer;
-    constructor(wss: WebSocketServer, clientId: TransportClientId, providedOptions?: Partial<TransportOptions>);
+    constructor(wss: WebSocketServer, clientId: TransportClientId, providedOptions?: Partial<ProvidedTransportOptions>);
     connectionHandler: (ws: WebSocket) => void;
     close(): void;
 }

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

@@ -1,9 +1,9 @@
 import {
   WebSocketConnection
-} from "../../../chunk-5TX4BKAD.js";
+} from "../../../chunk-ZRB6IKPV.js";
 import {
   ServerTransport
-} from "../../../chunk-O6YQ3JAH.js";
+} from "../../../chunk-B7VTDQR7.js";
 import "../../../chunk-GFRAOY75.js";
 import "../../../chunk-H4BYJELI.js";
 import "../../../chunk-GZ7HCLLM.js";