@replit/river 0.23.18 → 0.24.0

package/dist/chunk-NLQPPDOT.js

@@ -0,0 +1,399 @@
+import {
+  ProtocolError,
+  Transport
+} from "./chunk-ZAT3R4CU.js";
+import {
+  SessionStateGraph,
+  defaultClientTransportOptions
+} from "./chunk-JA57I7MG.js";
+import {
+  ControlMessageHandshakeResponseSchema,
+  HandshakeErrorRetriableResponseCodes,
+  coerceErrorString,
+  getPropagationContext,
+  handshakeRequestMessage,
+  tracing_default
+} from "./chunk-PJGGC3LV.js";
+
+// transport/client.ts
+import { SpanStatusCode } from "@opentelemetry/api";
+
+// 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);
+    };
+    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);
+    }
+  }
+};
+
+// transport/client.ts
+import { Value } from "@sinclair/typebox/value";
+var ClientTransport = class extends Transport {
+  /**
+   * The options for this transport.
+   */
+  options;
+  retryBudget;
+  /**
+   * A flag indicating whether the transport should automatically reconnect
+   * when a connection is dropped.
+   * Realistically, this should always be true for clients unless you are writing
+   * tests or a special case where you don't want to reconnect.
+   */
+  reconnectOnConnectionDrop = true;
+  /**
+   * Optional handshake options for this client.
+   */
+  handshakeExtensions;
+  constructor(clientId, providedOptions) {
+    super(clientId, providedOptions);
+    this.options = {
+      ...defaultClientTransportOptions,
+      ...providedOptions
+    };
+    this.retryBudget = new LeakyBucketRateLimit(this.options);
+  }
+  extendHandshake(options) {
+    this.handshakeExtensions = options;
+  }
+  tryReconnecting(to) {
+    if (this.reconnectOnConnectionDrop && this.getStatus() === "open") {
+      this.connect(to);
+    }
+  }
+  send(to, msg) {
+    if (this.getStatus() === "closed") {
+      const err = "transport is closed, cant send";
+      this.log?.error(err, {
+        clientId: this.clientId,
+        transportMessage: msg,
+        tags: ["invariant-violation"]
+      });
+      throw new Error(err);
+    }
+    let session = this.sessions.get(to);
+    if (!session) {
+      session = this.createUnconnectedSession(to);
+    }
+    return session.send(msg);
+  }
+  createUnconnectedSession(to) {
+    const session = SessionStateGraph.entrypoints.NoConnection(
+      to,
+      this.clientId,
+      {
+        onSessionGracePeriodElapsed: () => {
+          this.onSessionGracePeriodElapsed(session);
+        }
+      },
+      this.options,
+      this.log
+    );
+    this.updateSession(session);
+    return session;
+  }
+  // listeners
+  onConnectingFailed(session) {
+    const noConnectionSession = super.onConnectingFailed(session);
+    this.tryReconnecting(noConnectionSession.to);
+    return noConnectionSession;
+  }
+  onConnClosed(session) {
+    const noConnectionSession = super.onConnClosed(session);
+    this.tryReconnecting(noConnectionSession.to);
+    return noConnectionSession;
+  }
+  onConnectionEstablished(session, conn) {
+    const handshakingSession = SessionStateGraph.transition.ConnectingToHandshaking(session, conn, {
+      onConnectionErrored: (err) => {
+        const errStr = coerceErrorString(err);
+        this.log?.error(
+          `connection to ${handshakingSession.to} errored during handshake: ${errStr}`,
+          handshakingSession.loggingMetadata
+        );
+      },
+      onConnectionClosed: () => {
+        this.log?.warn(
+          `connection to ${handshakingSession.to} closed during handshake`,
+          handshakingSession.loggingMetadata
+        );
+        this.onConnClosed(handshakingSession);
+      },
+      onHandshake: (msg) => {
+        this.onHandshakeResponse(handshakingSession, msg);
+      },
+      onInvalidHandshake: (reason) => {
+        this.log?.error(
+          `invalid handshake: ${reason}`,
+          handshakingSession.loggingMetadata
+        );
+        this.deleteSession(session);
+        this.protocolError(ProtocolError.HandshakeFailed, reason);
+      },
+      onHandshakeTimeout: () => {
+        this.log?.error(
+          `connection to ${handshakingSession.to} timed out during handshake`,
+          handshakingSession.loggingMetadata
+        );
+        this.onConnClosed(handshakingSession);
+      }
+    });
+    this.updateSession(handshakingSession);
+    void this.sendHandshake(handshakingSession);
+    return handshakingSession;
+  }
+  rejectHandshakeResponse(session, reason, metadata) {
+    session.conn.telemetry?.span.setStatus({
+      code: SpanStatusCode.ERROR,
+      message: reason
+    });
+    this.log?.warn(reason, metadata);
+    this.deleteSession(session);
+  }
+  onHandshakeResponse(session, msg) {
+    if (!Value.Check(ControlMessageHandshakeResponseSchema, msg.payload)) {
+      const reason = `received invalid handshake response`;
+      this.rejectHandshakeResponse(session, reason, {
+        ...session.loggingMetadata,
+        transportMessage: msg,
+        validationErrors: [
+          ...Value.Errors(ControlMessageHandshakeResponseSchema, msg.payload)
+        ]
+      });
+      return;
+    }
+    if (!msg.payload.status.ok) {
+      const retriable = msg.payload.status.code ? Value.Check(
+        HandshakeErrorRetriableResponseCodes,
+        msg.payload.status.code
+      ) : false;
+      const reason = `handshake failed: ${msg.payload.status.reason}`;
+      this.rejectHandshakeResponse(session, reason, {
+        ...session.loggingMetadata,
+        transportMessage: msg
+      });
+      if (retriable) {
+        this.tryReconnecting(session.to);
+      } else {
+        this.deleteSession(session);
+        this.protocolError(ProtocolError.HandshakeFailed, reason);
+      }
+      return;
+    }
+    if (msg.payload.status.sessionId !== session.id) {
+      const reason = `session id mismatch: expected ${session.id}, got ${msg.payload.status.sessionId}`;
+      this.rejectHandshakeResponse(session, reason, {
+        ...session.loggingMetadata,
+        transportMessage: msg
+      });
+      return;
+    }
+    this.log?.info(`handshake from ${msg.from} ok`, {
+      ...session.loggingMetadata,
+      transportMessage: msg
+    });
+    const connectedSession = SessionStateGraph.transition.HandshakingToConnected(session, {
+      onConnectionErrored: (err) => {
+        const errStr = coerceErrorString(err);
+        this.log?.warn(
+          `connection to ${connectedSession.to} errored: ${errStr}`,
+          connectedSession.loggingMetadata
+        );
+      },
+      onConnectionClosed: () => {
+        this.log?.info(
+          `connection to ${connectedSession.to} closed`,
+          connectedSession.loggingMetadata
+        );
+        this.onConnClosed(connectedSession);
+      },
+      onMessage: (msg2) => this.handleMsg(msg2),
+      onInvalidMessage: (reason) => {
+        this.deleteSession(connectedSession);
+        this.protocolError(ProtocolError.MessageOrderingViolated, reason);
+      }
+    });
+    this.updateSession(connectedSession);
+    this.retryBudget.startRestoringBudget(connectedSession.to);
+  }
+  /**
+   * Manually attempts to connect to a client.
+   * @param to The client ID of the node to connect to.
+   */
+  connect(to) {
+    let session = this.sessions.get(to);
+    session ??= this.createUnconnectedSession(to);
+    if (session.state !== "NoConnection" /* NoConnection */) {
+      this.log?.debug(
+        `session to ${to} has state ${session.state}, skipping connect attempt`,
+        session.loggingMetadata
+      );
+      return;
+    }
+    if (this.getStatus() !== "open") {
+      this.log?.info(
+        `transport state is no longer open, cancelling attempt to connect to ${to}`,
+        session.loggingMetadata
+      );
+      return;
+    }
+    if (!this.retryBudget.hasBudget(to)) {
+      const budgetConsumed = this.retryBudget.getBudgetConsumed(to);
+      const errMsg = `tried to connect to ${to} but retry budget exceeded (more than ${budgetConsumed} attempts in the last ${this.retryBudget.totalBudgetRestoreTime}ms)`;
+      this.log?.error(errMsg, session.loggingMetadata);
+      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.log?.info(
+      `attempting connection to ${to} (${backoffMs}ms backoff)`,
+      session.loggingMetadata
+    );
+    this.retryBudget.consumeBudget(to);
+    const reconnectPromise = tracing_default.startActiveSpan("connect", async (span) => {
+      try {
+        span.addEvent("backoff", { backoffMs });
+        await sleep;
+        if (this.getStatus() !== "open") {
+          throw new Error("transport state is no longer open");
+        }
+        span.addEvent("connecting");
+        return await this.createNewOutgoingConnection(to);
+      } catch (err) {
+        const errStr = coerceErrorString(err);
+        span.recordException(errStr);
+        span.setStatus({ code: SpanStatusCode.ERROR });
+        throw err;
+      } finally {
+        span.end();
+      }
+    });
+    const connectingSession = SessionStateGraph.transition.NoConnectionToConnecting(
+      session,
+      reconnectPromise,
+      {
+        onConnectionEstablished: (conn) => {
+          this.log?.debug(
+            `connection to ${connectingSession.to} established`,
+            connectingSession.loggingMetadata
+          );
+          this.onConnectionEstablished(connectingSession, conn);
+        },
+        onConnectionFailed: (error) => {
+          const errStr = coerceErrorString(error);
+          this.log?.error(
+            `error connecting to ${connectingSession.to}: ${errStr}`,
+            connectingSession.loggingMetadata
+          );
+          this.onConnectingFailed(connectingSession);
+        },
+        onConnectionTimeout: () => {
+          this.log?.error(
+            `connection to ${connectingSession.to} timed out`,
+            connectingSession.loggingMetadata
+          );
+          this.onConnectingFailed(connectingSession);
+        }
+      }
+    );
+    this.updateSession(connectingSession);
+  }
+  async sendHandshake(session) {
+    let metadata = void 0;
+    if (this.handshakeExtensions) {
+      metadata = await this.handshakeExtensions.construct();
+    }
+    const requestMsg = handshakeRequestMessage({
+      from: this.clientId,
+      to: session.to,
+      sessionId: session.id,
+      expectedSessionState: {
+        nextExpectedSeq: session.ack,
+        nextSentSeq: session.nextSeq()
+      },
+      metadata,
+      tracing: getPropagationContext(session.telemetry.ctx)
+    });
+    this.log?.debug(`sending handshake request to ${session.to}`, {
+      ...session.loggingMetadata,
+      transportMessage: requestMsg
+    });
+    session.sendHandshake(requestMsg);
+  }
+  close() {
+    this.retryBudget.close();
+    super.close();
+  }
+};
+
+export {
+  ClientTransport
+};
+//# sourceMappingURL=chunk-NLQPPDOT.js.map

package/dist/chunk-NLQPPDOT.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../transport/client.ts","../transport/rateLimit.ts"],"sourcesContent":["import { SpanStatusCode } from '@opentelemetry/api';\nimport { ClientHandshakeOptions } from '../router/handshake';\nimport {\n  ControlMessageHandshakeResponseSchema,\n  HandshakeErrorRetriableResponseCodes,\n  OpaqueTransportMessage,\n  PartialTransportMessage,\n  TransportClientId,\n  handshakeRequestMessage,\n} from './message';\nimport {\n  ClientTransportOptions,\n  ProvidedClientTransportOptions,\n  defaultClientTransportOptions,\n} from './options';\nimport { LeakyBucketRateLimit } from './rateLimit';\nimport { Transport } from './transport';\nimport { coerceErrorString } from '../util/stringify';\nimport { ProtocolError } from './events';\nimport { Value } from '@sinclair/typebox/value';\nimport tracer, { getPropagationContext } from '../tracing';\nimport { Connection } from './connection';\nimport { MessageMetadata } from '../logging';\nimport { SessionConnecting } from './sessionStateMachine/SessionConnecting';\nimport { SessionHandshaking } from './sessionStateMachine/SessionHandshaking';\nimport { SessionConnected } from './sessionStateMachine/SessionConnected';\nimport { SessionStateGraph } from './sessionStateMachine/transitions';\nimport { SessionState } from './sessionStateMachine/common';\nimport { SessionNoConnection } from './sessionStateMachine/SessionNoConnection';\n\nexport abstract class ClientTransport<\n  ConnType extends Connection,\n> extends Transport<ConnType> {\n  /**\n   * The options for this transport.\n   */\n  protected options: ClientTransportOptions;\n\n  retryBudget: LeakyBucketRateLimit;\n\n  /**\n   * A flag indicating whether the transport should automatically reconnect\n   * when a connection is dropped.\n   * Realistically, this should always be true for clients unless you are writing\n   * tests or a special case where you don't want to reconnect.\n   */\n  reconnectOnConnectionDrop = true;\n\n  /**\n   * Optional handshake options for this client.\n   */\n  handshakeExtensions?: ClientHandshakeOptions;\n\n  constructor(\n    clientId: TransportClientId,\n    providedOptions?: ProvidedClientTransportOptions,\n  ) {\n    super(clientId, providedOptions);\n    this.options = {\n      ...defaultClientTransportOptions,\n      ...providedOptions,\n    };\n    this.retryBudget = new LeakyBucketRateLimit(this.options);\n  }\n\n  extendHandshake(options: ClientHandshakeOptions) {\n    this.handshakeExtensions = options;\n  }\n\n  /**\n   * Abstract method that creates a new {@link Connection} object.\n   * This should call {@link handleConnection} when the connection is created.\n   * The downstream client implementation needs to implement this.\n   *\n   * @param to The client ID of the node to connect to.\n   * @returns The new connection object.\n   */\n  protected abstract createNewOutgoingConnection(\n    to: TransportClientId,\n  ): Promise<ConnType>;\n\n  private tryReconnecting(to: string) {\n    if (this.reconnectOnConnectionDrop && this.getStatus() === 'open') {\n      this.connect(to);\n    }\n  }\n\n  send(to: string, msg: PartialTransportMessage): string {\n    if (this.getStatus() === 'closed') {\n      const err = 'transport is closed, cant send';\n      this.log?.error(err, {\n        clientId: this.clientId,\n        transportMessage: msg,\n        tags: ['invariant-violation'],\n      });\n\n      throw new Error(err);\n    }\n\n    let session = this.sessions.get(to);\n    if (!session) {\n      session = this.createUnconnectedSession(to);\n    }\n\n    return session.send(msg);\n  }\n\n  private createUnconnectedSession(to: string): SessionNoConnection {\n    const session = SessionStateGraph.entrypoints.NoConnection(\n      to,\n      this.clientId,\n      {\n        onSessionGracePeriodElapsed: () => {\n          this.onSessionGracePeriodElapsed(session);\n        },\n      },\n      this.options,\n      this.log,\n    );\n\n    this.updateSession(session);\n    return session;\n  }\n\n  // listeners\n  protected onConnectingFailed(session: SessionConnecting<ConnType>) {\n    const noConnectionSession = super.onConnectingFailed(session);\n    this.tryReconnecting(noConnectionSession.to);\n    return noConnectionSession;\n  }\n\n  protected onConnClosed(\n    session: SessionHandshaking<ConnType> | SessionConnected<ConnType>,\n  ) {\n    const noConnectionSession = super.onConnClosed(session);\n    this.tryReconnecting(noConnectionSession.to);\n    return noConnectionSession;\n  }\n\n  protected onConnectionEstablished(\n    session: SessionConnecting<ConnType>,\n    conn: ConnType,\n  ): SessionHandshaking<ConnType> {\n    // transition to handshaking\n    const handshakingSession =\n      SessionStateGraph.transition.ConnectingToHandshaking(session, conn, {\n        onConnectionErrored: (err) => {\n          // just log, when we error we also emit close\n          const errStr = coerceErrorString(err);\n          this.log?.error(\n            `connection to ${handshakingSession.to} errored during handshake: ${errStr}`,\n            handshakingSession.loggingMetadata,\n          );\n        },\n        onConnectionClosed: () => {\n          this.log?.warn(\n            `connection to ${handshakingSession.to} closed during handshake`,\n            handshakingSession.loggingMetadata,\n          );\n          this.onConnClosed(handshakingSession);\n        },\n        onHandshake: (msg) => {\n          this.onHandshakeResponse(handshakingSession, msg);\n        },\n        onInvalidHandshake: (reason) => {\n          this.log?.error(\n            `invalid handshake: ${reason}`,\n            handshakingSession.loggingMetadata,\n          );\n          this.deleteSession(session);\n          this.protocolError(ProtocolError.HandshakeFailed, reason);\n        },\n        onHandshakeTimeout: () => {\n          this.log?.error(\n            `connection to ${handshakingSession.to} timed out during handshake`,\n            handshakingSession.loggingMetadata,\n          );\n          this.onConnClosed(handshakingSession);\n        },\n      });\n\n    this.updateSession(handshakingSession);\n    void this.sendHandshake(handshakingSession);\n    return handshakingSession;\n  }\n\n  private rejectHandshakeResponse(\n    session: SessionHandshaking<ConnType>,\n    reason: string,\n    metadata: MessageMetadata,\n  ) {\n    session.conn.telemetry?.span.setStatus({\n      code: SpanStatusCode.ERROR,\n      message: reason,\n    });\n\n    this.log?.warn(reason, metadata);\n    this.deleteSession(session);\n  }\n\n  protected onHandshakeResponse(\n    session: SessionHandshaking<ConnType>,\n    msg: OpaqueTransportMessage,\n  ) {\n    // invariant: msg is a handshake response\n    if (!Value.Check(ControlMessageHandshakeResponseSchema, msg.payload)) {\n      const reason = `received invalid handshake response`;\n      this.rejectHandshakeResponse(session, reason, {\n        ...session.loggingMetadata,\n        transportMessage: msg,\n        validationErrors: [\n          ...Value.Errors(ControlMessageHandshakeResponseSchema, msg.payload),\n        ],\n      });\n      return;\n    }\n\n    // invariant: handshake response should be ok\n    if (!msg.payload.status.ok) {\n      // TODO: remove conditional check after we know code is always present\n      const retriable = msg.payload.status.code\n        ? Value.Check(\n            HandshakeErrorRetriableResponseCodes,\n            msg.payload.status.code,\n          )\n        : false;\n\n      const reason = `handshake failed: ${msg.payload.status.reason}`;\n      this.rejectHandshakeResponse(session, reason, {\n        ...session.loggingMetadata,\n        transportMessage: msg,\n      });\n\n      if (retriable) {\n        this.tryReconnecting(session.to);\n      } else {\n        this.deleteSession(session);\n        this.protocolError(ProtocolError.HandshakeFailed, reason);\n      }\n\n      return;\n    }\n\n    // invariant: session id should match between client + server\n    if (msg.payload.status.sessionId !== session.id) {\n      const reason = `session id mismatch: expected ${session.id}, got ${msg.payload.status.sessionId}`;\n      this.rejectHandshakeResponse(session, reason, {\n        ...session.loggingMetadata,\n        transportMessage: msg,\n      });\n      return;\n    }\n\n    // transition to connected!\n    this.log?.info(`handshake from ${msg.from} ok`, {\n      ...session.loggingMetadata,\n      transportMessage: msg,\n    });\n\n    const connectedSession =\n      SessionStateGraph.transition.HandshakingToConnected(session, {\n        onConnectionErrored: (err) => {\n          // just log, when we error we also emit close\n          const errStr = coerceErrorString(err);\n          this.log?.warn(\n            `connection to ${connectedSession.to} errored: ${errStr}`,\n            connectedSession.loggingMetadata,\n          );\n        },\n        onConnectionClosed: () => {\n          this.log?.info(\n            `connection to ${connectedSession.to} closed`,\n            connectedSession.loggingMetadata,\n          );\n          this.onConnClosed(connectedSession);\n        },\n        onMessage: (msg) => this.handleMsg(msg),\n        onInvalidMessage: (reason) => {\n          this.deleteSession(connectedSession);\n          this.protocolError(ProtocolError.MessageOrderingViolated, reason);\n        },\n      });\n\n    this.updateSession(connectedSession);\n    this.retryBudget.startRestoringBudget(connectedSession.to);\n  }\n\n  /**\n   * Manually attempts to connect to a client.\n   * @param to The client ID of the node to connect to.\n   */\n  connect(to: TransportClientId) {\n    // create a new session if one does not exist\n    let session = this.sessions.get(to);\n    session ??= this.createUnconnectedSession(to);\n\n    if (session.state !== SessionState.NoConnection) {\n      // already trying to connect\n      this.log?.debug(\n        `session to ${to} has state ${session.state}, skipping connect attempt`,\n        session.loggingMetadata,\n      );\n      return;\n    }\n\n    if (this.getStatus() !== 'open') {\n      this.log?.info(\n        `transport state is no longer open, cancelling attempt to connect to ${to}`,\n        session.loggingMetadata,\n      );\n      return;\n    }\n\n    // check budget\n    if (!this.retryBudget.hasBudget(to)) {\n      const budgetConsumed = this.retryBudget.getBudgetConsumed(to);\n      const errMsg = `tried to connect to ${to} but retry budget exceeded (more than ${budgetConsumed} attempts in the last ${this.retryBudget.totalBudgetRestoreTime}ms)`;\n      this.log?.error(errMsg, session.loggingMetadata);\n      this.protocolError(ProtocolError.RetriesExceeded, errMsg);\n      return;\n    }\n\n    let sleep = Promise.resolve();\n    const backoffMs = this.retryBudget.getBackoffMs(to);\n    if (backoffMs > 0) {\n      sleep = new Promise((resolve) => setTimeout(resolve, backoffMs));\n    }\n\n    this.log?.info(\n      `attempting connection to ${to} (${backoffMs}ms backoff)`,\n      session.loggingMetadata,\n    );\n\n    this.retryBudget.consumeBudget(to);\n    const reconnectPromise = tracer.startActiveSpan('connect', async (span) => {\n      try {\n        span.addEvent('backoff', { backoffMs });\n        await sleep;\n        if (this.getStatus() !== 'open') {\n          throw new Error('transport state is no longer open');\n        }\n\n        span.addEvent('connecting');\n        return await this.createNewOutgoingConnection(to);\n      } catch (err) {\n        // rethrow the error so that the promise is rejected\n        // as it was before we wrapped it in a span\n        const errStr = coerceErrorString(err);\n        span.recordException(errStr);\n        span.setStatus({ code: SpanStatusCode.ERROR });\n        throw err;\n      } finally {\n        span.end();\n      }\n    });\n\n    const connectingSession =\n      SessionStateGraph.transition.NoConnectionToConnecting(\n        session,\n        reconnectPromise,\n        {\n          onConnectionEstablished: (conn) => {\n            this.log?.debug(\n              `connection to ${connectingSession.to} established`,\n              connectingSession.loggingMetadata,\n            );\n\n            // cast here because conn can't be narrowed to ConnType\n            // in the callback due to variance rules\n            this.onConnectionEstablished(connectingSession, conn as ConnType);\n          },\n          onConnectionFailed: (error: unknown) => {\n            const errStr = coerceErrorString(error);\n            this.log?.error(\n              `error connecting to ${connectingSession.to}: ${errStr}`,\n              connectingSession.loggingMetadata,\n            );\n            this.onConnectingFailed(connectingSession);\n          },\n          onConnectionTimeout: () => {\n            this.log?.error(\n              `connection to ${connectingSession.to} timed out`,\n              connectingSession.loggingMetadata,\n            );\n            this.onConnectingFailed(connectingSession);\n          },\n        },\n      );\n\n    this.updateSession(connectingSession);\n  }\n\n  private async sendHandshake(session: SessionHandshaking<ConnType>) {\n    let metadata: unknown = undefined;\n\n    if (this.handshakeExtensions) {\n      metadata = await this.handshakeExtensions.construct();\n    }\n\n    const requestMsg = handshakeRequestMessage({\n      from: this.clientId,\n      to: session.to,\n      sessionId: session.id,\n      expectedSessionState: {\n        nextExpectedSeq: session.ack,\n        nextSentSeq: session.nextSeq(),\n      },\n      metadata,\n      tracing: getPropagationContext(session.telemetry.ctx),\n    });\n\n    this.log?.debug(`sending handshake request to ${session.to}`, {\n      ...session.loggingMetadata,\n      transportMessage: requestMsg,\n    });\n\n    session.sendHandshake(requestMsg);\n  }\n\n  close() {\n    this.retryBudget.close();\n    super.close();\n  }\n}\n","import { TransportClientId } from './message';\n\n/**\n * Options to control the backoff and retry behavior of the client transport's connection behaviour.\n *\n * River implements exponential backoff with jitter to prevent flooding the server\n * when there's an issue with connection establishment.\n *\n * The backoff is calculated via the following:\n *   backOff = min(jitter + {@link baseIntervalMs} * 2 ^ budget_consumed, {@link maxBackoffMs})\n *\n * We use a leaky bucket rate limit with a budget of {@link attemptBudgetCapacity} reconnection attempts.\n * Budget only starts to restore after a successful handshake at a rate of one budget per {@link budgetRestoreIntervalMs}.\n */\nexport interface ConnectionRetryOptions {\n  /**\n   * The base interval to wait before retrying a connection.\n   */\n  baseIntervalMs: number;\n\n  /**\n   * The maximum random jitter to add to the total backoff time.\n   */\n  maxJitterMs: number;\n\n  /**\n   * The maximum amount of time to wait before retrying a connection.\n   * This does not include the jitter.\n   */\n  maxBackoffMs: number;\n\n  /**\n   * The max number of times to attempt a connection before a successful handshake.\n   * This persists across connections but starts restoring budget after a successful handshake.\n   * The restoration interval depends on {@link budgetRestoreIntervalMs}\n   */\n  attemptBudgetCapacity: number;\n\n  /**\n   * After a successful connection attempt, how long to wait before we restore a single budget.\n   */\n  budgetRestoreIntervalMs: number;\n}\n\nexport class LeakyBucketRateLimit {\n  private budgetConsumed: Map<TransportClientId, number>;\n  private intervalHandles: Map<\n    TransportClientId,\n    ReturnType<typeof setInterval>\n  >;\n  private readonly options: ConnectionRetryOptions;\n\n  constructor(options: ConnectionRetryOptions) {\n    this.options = options;\n    this.budgetConsumed = new Map();\n    this.intervalHandles = new Map();\n  }\n\n  getBackoffMs(user: TransportClientId) {\n    if (!this.budgetConsumed.has(user)) return 0;\n\n    const exponent = Math.max(0, this.getBudgetConsumed(user) - 1);\n    const jitter = Math.floor(Math.random() * this.options.maxJitterMs);\n    const backoffMs = Math.min(\n      this.options.baseIntervalMs * 2 ** exponent,\n      this.options.maxBackoffMs,\n    );\n\n    return backoffMs + jitter;\n  }\n\n  get totalBudgetRestoreTime() {\n    return (\n      this.options.budgetRestoreIntervalMs * this.options.attemptBudgetCapacity\n    );\n  }\n\n  consumeBudget(user: TransportClientId) {\n    // If we're consuming again, let's ensure that we're not leaking\n    this.stopLeak(user);\n    this.budgetConsumed.set(user, this.getBudgetConsumed(user) + 1);\n  }\n\n  getBudgetConsumed(user: TransportClientId) {\n    return this.budgetConsumed.get(user) ?? 0;\n  }\n\n  hasBudget(user: TransportClientId) {\n    return this.getBudgetConsumed(user) < this.options.attemptBudgetCapacity;\n  }\n\n  startRestoringBudget(user: TransportClientId) {\n    if (this.intervalHandles.has(user)) {\n      return;\n    }\n\n    const restoreBudgetForUser = () => {\n      const currentBudget = this.budgetConsumed.get(user);\n      if (!currentBudget) {\n        this.stopLeak(user);\n        return;\n      }\n\n      const newBudget = currentBudget - 1;\n      if (newBudget === 0) {\n        this.budgetConsumed.delete(user);\n        return;\n      }\n\n      this.budgetConsumed.set(user, newBudget);\n    };\n\n    const intervalHandle = setInterval(\n      restoreBudgetForUser,\n      this.options.budgetRestoreIntervalMs,\n    );\n\n    this.intervalHandles.set(user, intervalHandle);\n  }\n\n  private stopLeak(user: TransportClientId) {\n    if (!this.intervalHandles.has(user)) {\n      return;\n    }\n\n    clearInterval(this.intervalHandles.get(user));\n    this.intervalHandles.delete(user);\n  }\n\n  close() {\n    for (const user of this.intervalHandles.keys()) {\n      this.stopLeak(user);\n    }\n  }\n}\n"],"mappings":"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","names":["msg"]}

package/dist/{chunk-R2HAS3GM.js → chunk-PJGGC3LV.js}

@@ -1,6 +1,12 @@
+// transport/id.ts
+import { customAlphabet } from "nanoid";
+var alphabet = customAlphabet(
+  "1234567890abcdefghijklmnopqrstuvxyzABCDEFGHIJKLMNOPQRSTUVXYZ"
+);
+var generateId = () => alphabet(12);
+
 // transport/message.ts
 import { Type } from "@sinclair/typebox";
-import { nanoid } from "nanoid";
 var TransportMessageSchema = (t) => Type.Object({
   id: Type.String(),
   from: Type.String(),
@@ -35,18 +41,29 @@ var ControlMessageHandshakeRequestSchema = Type.Object({
    * used by the server to know whether this is a new or a reestablished connection, and whether it
    * is compatible with what it already has.
    */
-  expectedSessionState: Type.Optional(
-    Type.Object({
-      /**
-       * reconnect is set to true if the client explicitly wants to reestablish an existing
-       * connection.
-       */
-      reconnect: Type.Boolean(),
-      nextExpectedSeq: Type.Integer()
-    })
-  ),
+  expectedSessionState: Type.Object({
+    // what the client expects the server to send next
+    nextExpectedSeq: Type.Integer(),
+    // TODO: remove optional once we know all servers
+    // are nextSentSeq here
+    // what the server expects the client to send next
+    nextSentSeq: Type.Optional(Type.Integer())
+  }),
   metadata: Type.Optional(Type.Unknown())
 });
+var HandshakeErrorRetriableResponseCodes = Type.Union([
+  Type.Literal("SESSION_STATE_MISMATCH")
+]);
+var HandshakeErrorFatalResponseCodes = Type.Union([
+  Type.Literal("MALFORMED_HANDSHAKE_META"),
+  Type.Literal("MALFORMED_HANDSHAKE"),
+  Type.Literal("PROTOCOL_VERSION_MISMATCH"),
+  Type.Literal("REJECTED_BY_CUSTOM_HANDLER")
+]);
+var HandshakeErrorResponseCodes = Type.Union([
+  HandshakeErrorRetriableResponseCodes,
+  HandshakeErrorFatalResponseCodes
+]);
 var ControlMessageHandshakeResponseSchema = Type.Object({
   type: Type.Literal("HANDSHAKE_RESP"),
   status: Type.Union([
@@ -56,7 +73,10 @@ var ControlMessageHandshakeResponseSchema = Type.Object({
     }),
     Type.Object({
       ok: Type.Literal(false),
-      reason: Type.String()
+      reason: Type.String(),
+      // TODO: remove optional once we know all servers
+      // are sending code here
+      code: Type.Optional(HandshakeErrorResponseCodes)
     })
   ])
 });
@@ -78,12 +98,12 @@ function handshakeRequestMessage({
   tracing
 }) {
   return {
-    id: nanoid(),
+    id: generateId(),
     from,
     to,
     seq: 0,
     ack: 0,
-    streamId: nanoid(),
+    streamId: generateId(),
     controlFlags: 0,
     tracing,
     payload: {
@@ -95,19 +115,18 @@ function handshakeRequestMessage({
     }
   };
 }
-var SESSION_STATE_MISMATCH = "session state mismatch";
 function handshakeResponseMessage({
   from,
   to,
   status
 }) {
   return {
-    id: nanoid(),
+    id: generateId(),
     from,
     to,
     seq: 0,
     ack: 0,
-    streamId: nanoid(),
+    streamId: generateId(),
     controlFlags: 0,
     payload: {
       type: "HANDSHAKE_RESP",
@@ -115,6 +134,15 @@ function handshakeResponseMessage({
     }
   };
 }
+function closeStreamMessage(streamId) {
+  return {
+    streamId,
+    controlFlags: 4 /* StreamClosedBit */,
+    payload: {
+      type: "CLOSE"
+    }
+  };
+}
 function isAck(controlFlag) {
   return (controlFlag & 1 /* AckBit */) === 1 /* AckBit */;
 }
@@ -132,7 +160,7 @@ function isStreamClose(controlFlag) {
 }
 
 // package.json
-var version = "0.23.18";
+var version = "0.24.0";
 
 // util/stringify.ts
 function coerceErrorString(err) {
@@ -157,16 +185,16 @@ function getPropagationContext(ctx) {
   propagation.inject(ctx, tracing);
   return tracing;
 }
-function createSessionTelemetryInfo(session, propagationCtx) {
+function createSessionTelemetryInfo(sessionId, to, from, propagationCtx) {
   const parentCtx = propagationCtx ? propagation.extract(context.active(), propagationCtx) : context.active();
   const span = tracer.startSpan(
-    `session ${session.id}`,
+    `session ${sessionId}`,
     {
       attributes: {
         component: "river",
-        "river.session.id": session.id,
-        "river.session.to": session.to,
-        "river.session.from": session.from
+        "river.session.id": sessionId,
+        "river.session.to": to,
+        "river.session.from": from
       }
     },
     parentCtx
@@ -174,21 +202,6 @@ function createSessionTelemetryInfo(session, propagationCtx) {
   const ctx = trace.setSpan(parentCtx, span);
   return { span, ctx };
 }
-function createConnectionTelemetryInfo(connection, info) {
-  const span = tracer.startSpan(
-    `connection ${connection.id}`,
-    {
-      attributes: {
-        component: "river",
-        "river.connection.id": connection.id
-      },
-      links: [{ context: info.span.spanContext() }]
-    },
-    info.ctx
-  );
-  const ctx = trace.setSpan(info.ctx, span);
-  return { span, ctx };
-}
 function createProcTelemetryInfo(transport, kind, serviceName, procedureName, streamId) {
   const baseCtx = context.active();
   const span = tracer.startSpan(
@@ -243,25 +256,26 @@ var tracer = trace.getTracer("river", version);
 var tracing_default = tracer;
 
 export {
+  generateId,
   TransportMessageSchema,
   PROTOCOL_VERSION,
   ControlMessageHandshakeRequestSchema,
+  HandshakeErrorRetriableResponseCodes,
   ControlMessageHandshakeResponseSchema,
   ControlMessagePayloadSchema,
   OpaqueTransportMessageSchema,
   handshakeRequestMessage,
-  SESSION_STATE_MISMATCH,
   handshakeResponseMessage,
+  closeStreamMessage,
   isAck,
   isStreamOpen,
   isStreamClose,
   version,
   getPropagationContext,
   createSessionTelemetryInfo,
-  createConnectionTelemetryInfo,
   createProcTelemetryInfo,
   createHandlerSpan,
   tracing_default,
   coerceErrorString
 };
-//# sourceMappingURL=chunk-R2HAS3GM.js.map
+//# sourceMappingURL=chunk-PJGGC3LV.js.map