@replit/river 0.200.0-rc.6 → 0.200.0-rc.8

package/README.md

@@ -92,8 +92,8 @@ export const ExampleService = ServiceSchema.define(
   // procedures
   {
     add: Procedure.rpc({
-      input: Type.Object({ n: Type.Number() }),
-      output: Type.Object({ result: Type.Number() }),
+      requestData: Type.Object({ n: Type.Number() }),
+      responseData: Type.Object({ result: Type.Number() }),
       errors: Type.Never(),
       // note that a handler is unique per user RPC
       async handler(ctx, { n }) {

package/dist/{chunk-IGNFE3QW.js → chunk-3ROTSXAO.js}

@@ -57,11 +57,20 @@ var ControlMessageHandshakeRequestSchema = Type.Object({
 var HandshakeErrorRetriableResponseCodes = Type.Union([
   Type.Literal("SESSION_STATE_MISMATCH")
 ]);
+var HandshakeErrorCustomHandlerFatalResponseCodes = Type.Union([
+  // The custom validation handler rejected the handler because the client is unsupported.
+  Type.Literal("REJECTED_UNSUPPORTED_CLIENT"),
+  // The custom validation handler rejected the handshake.
+  Type.Literal("REJECTED_BY_CUSTOM_HANDLER")
+]);
 var HandshakeErrorFatalResponseCodes = Type.Union([
+  HandshakeErrorCustomHandlerFatalResponseCodes,
+  // The ciient sent a handshake that doesn't comply with the extended handshake metadata.
   Type.Literal("MALFORMED_HANDSHAKE_META"),
+  // The ciient sent a handshake that doesn't comply with ControlMessageHandshakeRequestSchema.
   Type.Literal("MALFORMED_HANDSHAKE"),
-  Type.Literal("PROTOCOL_VERSION_MISMATCH"),
-  Type.Literal("REJECTED_BY_CUSTOM_HANDLER")
+  // The client's protocol version does not match the server's.
+  Type.Literal("PROTOCOL_VERSION_MISMATCH")
 ]);
 var HandshakeErrorResponseCodes = Type.Union([
   HandshakeErrorRetriableResponseCodes,
@@ -191,7 +200,7 @@ function isStreamAbort(controlFlag) {
 }
 
 // package.json
-var version = "0.200.0-rc.6";
+var version = "0.200.0-rc.8";
 
 // util/stringify.ts
 function coerceErrorString(err) {
@@ -294,6 +303,7 @@ export {
   acceptedProtocolVersions,
   ControlMessageHandshakeRequestSchema,
   HandshakeErrorRetriableResponseCodes,
+  HandshakeErrorCustomHandlerFatalResponseCodes,
   ControlMessageHandshakeResponseSchema,
   ControlMessagePayloadSchema,
   OpaqueTransportMessageSchema,
@@ -315,4 +325,4 @@ export {
   tracing_default,
   coerceErrorString
 };
-//# sourceMappingURL=chunk-IGNFE3QW.js.map
+//# sourceMappingURL=chunk-3ROTSXAO.js.map

package/dist/chunk-3ROTSXAO.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../transport/message.ts","../transport/id.ts","../package.json","../util/stringify.ts","../tracing/index.ts"],"sourcesContent":["import { Type, TSchema, Static } from '@sinclair/typebox';\nimport { PropagationContext } from '../tracing';\nimport { generateId } from './id';\nimport {\n  ErrResult,\n  RequestReaderErrorSchema,\n  ResponseReaderErrorSchema,\n} from '../router';\n\n/**\n * Control flags for transport messages.\n */\nexport const enum ControlFlags {\n  /**\n   * Used in heartbeat messages.\n   */\n  AckBit = 0b00001,\n  /**\n   * Used in stream open requests.\n   */\n  StreamOpenBit = 0b00010,\n  /**\n   * Used when writer closes the stream.\n   */\n  StreamClosedBit = 0b01000,\n  /**\n   * Used when readers no longer wish to receive messages.\n   */\n  StreamCloseRequestBit = 0b10000,\n  /**\n   * Used when a stream is aborted due to cancellation or errors\n   */\n  StreamAbortBit = 0b00100,\n}\n\n/**\n * Generic Typebox schema for a transport message.\n * @template T The type of the payload.\n * @param {T} t The payload schema.\n * @returns The transport message schema.\n */\nexport const TransportMessageSchema = <T extends TSchema>(t: T) =>\n  Type.Object({\n    id: Type.String(),\n    from: Type.String(),\n    to: Type.String(),\n    seq: Type.Integer(),\n    ack: Type.Integer(),\n    serviceName: Type.Optional(Type.String()),\n    procedureName: Type.Optional(Type.String()),\n    streamId: Type.String(),\n    controlFlags: Type.Integer(),\n    tracing: Type.Optional(\n      Type.Object({\n        traceparent: Type.String(),\n        tracestate: Type.String(),\n      }),\n    ),\n    payload: t,\n  });\n\n/**\n * Defines the schema for a transport acknowledgement message. This is never constructed manually\n * and is only used internally by the library for tracking inflight messages.\n * @returns The transport message schema.\n */\nexport const ControlMessageAckSchema = Type.Object({\n  type: Type.Literal('ACK'),\n});\n\n/**\n * Defines the schema for a transport close message. This is never constructed manually and is only\n * used internally by the library for closing and cleaning up streams.\n */\nexport const ControlMessageCloseSchema = Type.Object({\n  type: Type.Literal('CLOSE'),\n});\n\nexport const currentProtocolVersion = 'v2.0';\nexport const acceptedProtocolVersions = ['v1.1', currentProtocolVersion];\n\nexport const ControlMessageHandshakeRequestSchema = Type.Object({\n  type: Type.Literal('HANDSHAKE_REQ'),\n  protocolVersion: Type.String(),\n  sessionId: Type.String(),\n  /**\n   * Specifies what the server's expected session state (from the pov of the client). This can be\n   * used by the server to know whether this is a new or a reestablished connection, and whether it\n   * is compatible with what it already has.\n   */\n  expectedSessionState: Type.Object({\n    // what the client expects the server to send next\n    nextExpectedSeq: Type.Integer(),\n    // TODO: remove optional once we know all servers\n    // are nextSentSeq here\n    // what the server expects the client to send next\n    nextSentSeq: Type.Optional(Type.Integer()),\n  }),\n\n  metadata: Type.Optional(Type.Unknown()),\n});\n\nexport const HandshakeErrorRetriableResponseCodes = Type.Union([\n  Type.Literal('SESSION_STATE_MISMATCH'),\n]);\n\nexport const HandshakeErrorCustomHandlerFatalResponseCodes = Type.Union([\n  // The custom validation handler rejected the handler because the client is unsupported.\n  Type.Literal('REJECTED_UNSUPPORTED_CLIENT'),\n  // The custom validation handler rejected the handshake.\n  Type.Literal('REJECTED_BY_CUSTOM_HANDLER'),\n]);\n\nexport const HandshakeErrorFatalResponseCodes = Type.Union([\n  HandshakeErrorCustomHandlerFatalResponseCodes,\n  // The ciient sent a handshake that doesn't comply with the extended handshake metadata.\n  Type.Literal('MALFORMED_HANDSHAKE_META'),\n  // The ciient sent a handshake that doesn't comply with ControlMessageHandshakeRequestSchema.\n  Type.Literal('MALFORMED_HANDSHAKE'),\n  // The client's protocol version does not match the server's.\n  Type.Literal('PROTOCOL_VERSION_MISMATCH'),\n]);\n\nexport const HandshakeErrorResponseCodes = Type.Union([\n  HandshakeErrorRetriableResponseCodes,\n  HandshakeErrorFatalResponseCodes,\n]);\n\nexport const ControlMessageHandshakeResponseSchema = Type.Object({\n  type: Type.Literal('HANDSHAKE_RESP'),\n  status: Type.Union([\n    Type.Object({\n      ok: Type.Literal(true),\n      sessionId: Type.String(),\n    }),\n    Type.Object({\n      ok: Type.Literal(false),\n      reason: Type.String(),\n      // TODO: remove optional once we know all servers\n      // are sending code here\n      code: Type.Optional(HandshakeErrorResponseCodes),\n    }),\n  ]),\n});\n\nexport const ControlMessagePayloadSchema = Type.Union([\n  ControlMessageCloseSchema,\n  ControlMessageAckSchema,\n  ControlMessageHandshakeRequestSchema,\n  ControlMessageHandshakeResponseSchema,\n]);\n\n/**\n * Defines the schema for an opaque transport message that is agnostic to any\n * procedure/service.\n * @returns The transport message schema.\n */\nexport const OpaqueTransportMessageSchema = TransportMessageSchema(\n  Type.Unknown(),\n);\n\n/**\n * Represents a transport message. This is the same type as {@link TransportMessageSchema} but\n * we can't statically infer generics from generic Typebox schemas so we have to define it again here.\n *\n * TypeScript can't enforce types when a bitmask is involved, so these are the semantics of\n * `controlFlags`:\n * * If `controlFlags & StreamOpenBit == StreamOpenBit`, `streamId` must be set to a unique value\n *   (suggestion: use `nanoid`).\n * * If `controlFlags & StreamOpenBit == StreamOpenBit`, `serviceName` and `procedureName` must be set.\n * * If `controlFlags & StreamClosedBit == StreamClosedBit` and the kind is `stream` or `subscription`,\n *   `payload` should be discarded (usually contains a control message).\n * * If `controlFlags & AckBit == AckBit`, the message is an explicit acknowledgement message and doesn't\n *   contain any payload that is relevant to the application so should not be delivered.\n * @template Payload The type of the payload.\n */\nexport interface TransportMessage<Payload = unknown> {\n  id: string;\n  from: TransportClientId;\n  to: TransportClientId;\n  seq: number;\n  ack: number;\n  serviceName?: string;\n  procedureName?: string;\n  streamId: string;\n  controlFlags: number;\n  tracing?: PropagationContext;\n  payload: Payload;\n}\n\nexport type PartialTransportMessage<Payload = unknown> = Omit<\n  TransportMessage<Payload>,\n  'id' | 'from' | 'to' | 'seq' | 'ack'\n>;\n\nexport function handshakeRequestMessage({\n  from,\n  to,\n  sessionId,\n  expectedSessionState,\n  metadata,\n  tracing,\n}: {\n  from: TransportClientId;\n  to: TransportClientId;\n  sessionId: string;\n  expectedSessionState: Static<\n    typeof ControlMessageHandshakeRequestSchema\n  >['expectedSessionState'];\n  metadata?: unknown;\n  tracing?: PropagationContext;\n}): TransportMessage<Static<typeof ControlMessageHandshakeRequestSchema>> {\n  return {\n    id: generateId(),\n    from,\n    to,\n    seq: 0,\n    ack: 0,\n    streamId: generateId(),\n    controlFlags: 0,\n    tracing,\n    payload: {\n      type: 'HANDSHAKE_REQ',\n      protocolVersion: currentProtocolVersion,\n      sessionId,\n      expectedSessionState,\n      metadata,\n    } satisfies Static<typeof ControlMessageHandshakeRequestSchema>,\n  };\n}\n\n/**\n * This is a reason that can be given during the handshake to indicate that the peer has the wrong\n * session state.\n */\nexport const SESSION_STATE_MISMATCH = 'session state mismatch';\n\nexport function handshakeResponseMessage({\n  from,\n  to,\n  status,\n}: {\n  from: TransportClientId;\n  to: TransportClientId;\n  status: Static<typeof ControlMessageHandshakeResponseSchema>['status'];\n}): TransportMessage<Static<typeof ControlMessageHandshakeResponseSchema>> {\n  return {\n    id: generateId(),\n    from,\n    to,\n    seq: 0,\n    ack: 0,\n    streamId: generateId(),\n    controlFlags: 0,\n    payload: {\n      type: 'HANDSHAKE_RESP',\n      status,\n    } satisfies Static<typeof ControlMessageHandshakeResponseSchema>,\n  };\n}\n\nexport function closeStreamMessage(streamId: string): PartialTransportMessage {\n  return {\n    streamId,\n    controlFlags: ControlFlags.StreamClosedBit,\n    payload: {\n      type: 'CLOSE' as const,\n    } satisfies Static<typeof ControlMessagePayloadSchema>,\n  };\n}\n\nexport function requestCloseStreamMessage(\n  streamId: string,\n): PartialTransportMessage {\n  return {\n    streamId,\n    controlFlags: ControlFlags.StreamCloseRequestBit,\n    payload: {\n      type: 'CLOSE' as const,\n    } satisfies Static<typeof ControlMessagePayloadSchema>,\n  };\n}\n\nexport function abortMessage(\n  streamId: string,\n  payload: ErrResult<\n    Static<typeof ResponseReaderErrorSchema | typeof RequestReaderErrorSchema>\n  >,\n) {\n  return {\n    streamId,\n    controlFlags: ControlFlags.StreamAbortBit,\n    payload,\n  };\n}\n\n/**\n * A type alias for a transport message with an opaque payload.\n * @template T - The type of the opaque payload.\n */\nexport type OpaqueTransportMessage = TransportMessage;\nexport type TransportClientId = string;\n\n/**\n * Checks if the given control flag (usually found in msg.controlFlag) is an ack message.\n * @param controlFlag - The control flag to check.\n * @returns True if the control flag contains the AckBit, false otherwise.\n */\nexport function isAck(controlFlag: number): boolean {\n  /* eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison */\n  return (controlFlag & ControlFlags.AckBit) === ControlFlags.AckBit;\n}\n\n/**\n * Checks if the given control flag (usually found in msg.controlFlag) is a stream open message.\n * @param controlFlag - The control flag to check.\n * @returns True if the control flag contains the StreamOpenBit, false otherwise.\n */\nexport function isStreamOpen(controlFlag: number): boolean {\n  return (\n    /* eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison */\n    (controlFlag & ControlFlags.StreamOpenBit) === ControlFlags.StreamOpenBit\n  );\n}\n\n/**\n * Checks if the given control flag (usually found in msg.controlFlag) is a stream close message.\n * @param controlFlag - The control flag to check.\n * @returns True if the control flag contains the StreamCloseBit, false otherwise.\n */\nexport function isStreamClose(controlFlag: number): boolean {\n  return (\n    /* eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison */\n    (controlFlag & ControlFlags.StreamClosedBit) ===\n    ControlFlags.StreamClosedBit\n  );\n}\n\n/**\n * Checks if the given control flag (usually found in msg.controlFlag) is a stream close request message.\n * @param controlFlag - The control flag to check.\n * @returns True if the control flag contains the StreamCloseBit, false otherwise.\n */\nexport function isStreamCloseRequest(controlFlag: number): boolean {\n  return (\n    /* eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison */\n    (controlFlag & ControlFlags.StreamCloseRequestBit) ===\n    ControlFlags.StreamCloseRequestBit\n  );\n}\n\n/**\n * Checks if the given control flag (usually found in msg.controlFlag) is an abort message.\n * @param controlFlag - The control flag to check.\n * @returns True if the control flag contains the AbortBit, false otherwise\n */\nexport function isStreamAbort(controlFlag: number): boolean {\n  return (\n    /* eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison */\n    (controlFlag & ControlFlags.StreamAbortBit) === ControlFlags.StreamAbortBit\n  );\n}\n","import { customAlphabet } from 'nanoid';\n\nconst alphabet = customAlphabet(\n  '1234567890abcdefghijklmnopqrstuvxyzABCDEFGHIJKLMNOPQRSTUVXYZ',\n);\nexport const generateId = () => alphabet(12);\n","{\n  \"name\": \"@replit/river\",\n  \"description\": \"It's like tRPC but... with JSON Schema Support, duplex streaming and support for service multiplexing. Transport agnostic!\",\n  \"version\": \"0.200.0-rc.8\",\n  \"type\": \"module\",\n  \"exports\": {\n    \".\": {\n      \"import\": \"./dist/router/index.js\",\n      \"require\": \"./dist/router/index.cjs\"\n    },\n    \"./logging\": {\n      \"import\": \"./dist/logging/index.js\",\n      \"require\": \"./dist/logging/index.cjs\"\n    },\n    \"./codec\": {\n      \"import\": \"./dist/codec/index.js\",\n      \"require\": \"./dist/codec/index.cjs\"\n    },\n    \"./transport\": {\n      \"import\": \"./dist/transport/index.js\",\n      \"require\": \"./dist/transport/index.cjs\"\n    },\n    \"./transport/ws/client\": {\n      \"import\": \"./dist/transport/impls/ws/client.js\",\n      \"require\": \"./dist/transport/impls/ws/client.cjs\"\n    },\n    \"./transport/ws/server\": {\n      \"import\": \"./dist/transport/impls/ws/server.js\",\n      \"require\": \"./dist/transport/impls/ws/server.cjs\"\n    },\n    \"./transport/uds/client\": {\n      \"import\": \"./dist/transport/impls/uds/client.js\",\n      \"require\": \"./dist/transport/impls/uds/client.cjs\"\n    },\n    \"./transport/uds/server\": {\n      \"import\": \"./dist/transport/impls/uds/server.js\",\n      \"require\": \"./dist/transport/impls/uds/server.cjs\"\n    },\n    \"./test-util\": {\n      \"import\": \"./dist/util/testHelpers.js\",\n      \"require\": \"./dist/util/testHelpers.cjs\"\n    }\n  },\n  \"sideEffects\": [\n    \"./dist/logging/index.js\"\n  ],\n  \"files\": [\n    \"dist\"\n  ],\n  \"dependencies\": {\n    \"@msgpack/msgpack\": \"^3.0.0-beta2\",\n    \"nanoid\": \"^4.0.2\",\n    \"ws\": \"^8.17.0\"\n  },\n  \"peerDependencies\": {\n    \"@opentelemetry/api\": \"^1.7.0\",\n    \"@sinclair/typebox\": \"~0.32.8\"\n  },\n  \"devDependencies\": {\n    \"@opentelemetry/core\": \"^1.7.0\",\n    \"@opentelemetry/sdk-trace-base\": \"^1.24.1\",\n    \"@opentelemetry/sdk-trace-web\": \"^1.24.1\",\n    \"@types/ws\": \"^8.5.5\",\n    \"@typescript-eslint/eslint-plugin\": \"^7.8.0\",\n    \"@typescript-eslint/parser\": \"^7.8.0\",\n    \"@vitest/ui\": \"^1.3.1\",\n    \"eslint\": \"^8.57.0\",\n    \"eslint-config-prettier\": \"^9.1.0\",\n    \"eslint-plugin-prettier\": \"^5.1.3\",\n    \"prettier\": \"^3.0.0\",\n    \"tsup\": \"^7.2.0\",\n    \"typescript\": \"^5.4.5\",\n    \"vitest\": \"^1.3.1\"\n  },\n  \"scripts\": {\n    \"check\": \"tsc --noEmit && npm run format && npm run lint\",\n    \"format\": \"npx prettier . --check\",\n    \"format:fix\": \"npx prettier . --write\",\n    \"lint\": \"eslint .\",\n    \"lint:fix\": \"eslint . --fix\",\n    \"fix\": \"npm run format:fix && npm run lint:fix\",\n    \"build\": \"rm -rf dist && tsup && du -sh dist\",\n    \"prepack\": \"npm run build\",\n    \"release\": \"npm publish --access public\",\n    \"test:ui\": \"echo \\\"remember to go to /__vitest__ in the webview\\\" && vitest --ui --api.host 0.0.0.0 --api.port 3000\",\n    \"test\": \"vitest\",\n    \"test:single\": \"vitest run --reporter=dot\",\n    \"test:flake\": \"./flake.sh\",\n    \"bench\": \"vitest bench\"\n  },\n  \"engines\": {\n    \"node\": \">=16\"\n  },\n  \"keywords\": [\n    \"rpc\",\n    \"websockets\",\n    \"jsonschema\"\n  ],\n  \"author\": \"Jacky Zhao\",\n  \"license\": \"MIT\"\n}\n","export function coerceErrorString(err: unknown): string {\n  if (err instanceof Error) {\n    return err.message || 'unknown reason';\n  }\n\n  return `[coerced to error] ${String(err)}`;\n}\n","import {\n  Context,\n  Span,\n  SpanKind,\n  context,\n  propagation,\n  trace,\n} from '@opentelemetry/api';\nimport { version as RIVER_VERSION } from '../package.json';\nimport { ValidProcType } from '../router';\nimport { ClientTransport, Connection } from '../transport';\n\nexport interface PropagationContext {\n  traceparent: string;\n  tracestate: string;\n}\n\nexport interface TelemetryInfo {\n  span: Span;\n  ctx: Context;\n}\n\nexport function getPropagationContext(\n  ctx: Context,\n): PropagationContext | undefined {\n  const tracing = {\n    traceparent: '',\n    tracestate: '',\n  };\n  propagation.inject(ctx, tracing);\n  return tracing;\n}\n\nexport function createSessionTelemetryInfo(\n  sessionId: string,\n  to: string,\n  from: string,\n  propagationCtx?: PropagationContext,\n): TelemetryInfo {\n  const parentCtx = propagationCtx\n    ? propagation.extract(context.active(), propagationCtx)\n    : context.active();\n\n  const span = tracer.startSpan(\n    `session ${sessionId}`,\n    {\n      attributes: {\n        component: 'river',\n        'river.session.id': sessionId,\n        'river.session.to': to,\n        'river.session.from': from,\n      },\n    },\n    parentCtx,\n  );\n\n  const ctx = trace.setSpan(parentCtx, span);\n\n  return { span, ctx };\n}\n\nexport function createConnectionTelemetryInfo(\n  connection: Connection,\n  info: TelemetryInfo,\n): TelemetryInfo {\n  const span = tracer.startSpan(\n    `connection ${connection.id}`,\n    {\n      attributes: {\n        component: 'river',\n        'river.connection.id': connection.id,\n      },\n      links: [{ context: info.span.spanContext() }],\n    },\n    info.ctx,\n  );\n\n  const ctx = trace.setSpan(info.ctx, span);\n\n  return { span, ctx };\n}\n\nexport function createProcTelemetryInfo(\n  transport: ClientTransport<Connection>,\n  kind: ValidProcType,\n  serviceName: string,\n  procedureName: string,\n  streamId: string,\n): TelemetryInfo {\n  const baseCtx = context.active();\n  const span = tracer.startSpan(\n    `procedure call ${serviceName}.${procedureName}`,\n    {\n      attributes: {\n        component: 'river',\n        'river.method.kind': kind,\n        'river.method.service': serviceName,\n        'river.method.name': procedureName,\n        'river.streamId': streamId,\n        'span.kind': 'client',\n      },\n      kind: SpanKind.CLIENT,\n    },\n    baseCtx,\n  );\n\n  const ctx = trace.setSpan(baseCtx, span);\n\n  transport.log?.info(`invoked ${serviceName}.${procedureName}`, {\n    clientId: transport.clientId,\n    transportMessage: {\n      procedureName,\n      serviceName,\n    },\n    telemetry: {\n      traceId: span.spanContext().traceId,\n      spanId: span.spanContext().spanId,\n    },\n  });\n  return { span, ctx };\n}\n\nexport function createHandlerSpan<Fn extends (span: Span) => unknown>(\n  kind: ValidProcType,\n  serviceName: string,\n  procedureName: string,\n  streamId: string,\n  tracing: PropagationContext | undefined,\n  fn: Fn,\n): ReturnType<Fn> {\n  const ctx = tracing\n    ? propagation.extract(context.active(), tracing)\n    : context.active();\n\n  return tracer.startActiveSpan<Fn>(\n    `procedure handler ${serviceName}.${procedureName}`,\n    {\n      attributes: {\n        component: 'river',\n        'river.method.kind': kind,\n        'river.method.service': serviceName,\n        'river.method.name': procedureName,\n        'river.streamId': streamId,\n        'span.kind': 'server',\n      },\n      kind: SpanKind.SERVER,\n    },\n    ctx,\n    fn,\n  );\n}\n\nconst tracer = trace.getTracer('river', RIVER_VERSION);\nexport default tracer;\n"],"mappings":"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","names":[]}

package/dist/{chunk-GXRIBO3N.js → chunk-B5VE44UX.js}

@@ -1,6 +1,6 @@
 import {
   Connection
-} from "./chunk-NOLXEIRP.js";
+} from "./chunk-J54ZWTQM.js";
 
 // transport/impls/ws/connection.ts
 var WebSocketConnection = class extends Connection {
@@ -47,4 +47,4 @@ var WebSocketConnection = class extends Connection {
 export {
   WebSocketConnection
 };
-//# sourceMappingURL=chunk-GXRIBO3N.js.map
+//# sourceMappingURL=chunk-B5VE44UX.js.map

package/dist/{chunk-WE2PAPNC.js → chunk-FAIV2RO2.js}

@@ -1,11 +1,11 @@
 import {
   ProtocolError,
   Transport
-} from "./chunk-NOLXEIRP.js";
+} from "./chunk-J54ZWTQM.js";
 import {
-  SessionStateGraph,
+  ClientSessionStateGraph,
   defaultClientTransportOptions
-} from "./chunk-TMNVRR5R.js";
+} from "./chunk-Y3JHOIJ7.js";
 import {
   ControlMessageHandshakeResponseSchema,
   HandshakeErrorRetriableResponseCodes,
@@ -14,7 +14,7 @@ import {
   getPropagationContext,
   handshakeRequestMessage,
   tracing_default
-} from "./chunk-IGNFE3QW.js";
+} from "./chunk-3ROTSXAO.js";
 
 // transport/client.ts
 import { SpanStatusCode } from "@opentelemetry/api";
@@ -22,17 +22,17 @@ import { SpanStatusCode } from "@opentelemetry/api";
 // transport/rateLimit.ts
 var LeakyBucketRateLimit = class {
   budgetConsumed;
-  intervalHandles;
+  intervalHandle;
   options;
   constructor(options) {
     this.options = options;
-    this.budgetConsumed = /* @__PURE__ */ new Map();
-    this.intervalHandles = /* @__PURE__ */ new Map();
+    this.budgetConsumed = 0;
   }
-  getBackoffMs(user) {
-    if (!this.budgetConsumed.has(user))
+  getBackoffMs() {
+    if (this.getBudgetConsumed() === 0) {
       return 0;
-    const exponent = Math.max(0, this.getBudgetConsumed(user) - 1);
+    }
+    const exponent = Math.max(0, this.getBudgetConsumed() - 1);
     const jitter = Math.floor(Math.random() * this.options.maxJitterMs);
     const backoffMs = Math.min(
       this.options.baseIntervalMs * 2 ** exponent,
@@ -43,50 +43,46 @@ var LeakyBucketRateLimit = class {
   get totalBudgetRestoreTime() {
     return this.options.budgetRestoreIntervalMs * this.options.attemptBudgetCapacity;
   }
-  consumeBudget(user) {
-    this.stopLeak(user);
-    this.budgetConsumed.set(user, this.getBudgetConsumed(user) + 1);
+  consumeBudget() {
+    this.stopLeak();
+    this.budgetConsumed = this.getBudgetConsumed() + 1;
   }
-  getBudgetConsumed(user) {
-    return this.budgetConsumed.get(user) ?? 0;
+  getBudgetConsumed() {
+    return this.budgetConsumed;
   }
-  hasBudget(user) {
-    return this.getBudgetConsumed(user) < this.options.attemptBudgetCapacity;
+  hasBudget() {
+    return this.getBudgetConsumed() < this.options.attemptBudgetCapacity;
   }
-  startRestoringBudget(user) {
-    if (this.intervalHandles.has(user)) {
+  startRestoringBudget() {
+    if (this.intervalHandle) {
       return;
     }
     const restoreBudgetForUser = () => {
-      const currentBudget = this.budgetConsumed.get(user);
+      const currentBudget = this.budgetConsumed;
       if (!currentBudget) {
-        this.stopLeak(user);
+        this.stopLeak();
         return;
       }
       const newBudget = currentBudget - 1;
       if (newBudget === 0) {
-        this.budgetConsumed.delete(user);
         return;
       }
-      this.budgetConsumed.set(user, newBudget);
+      this.budgetConsumed = newBudget;
     };
-    const intervalHandle = setInterval(
+    this.intervalHandle = setInterval(
       restoreBudgetForUser,
       this.options.budgetRestoreIntervalMs
     );
-    this.intervalHandles.set(user, intervalHandle);
   }
-  stopLeak(user) {
-    if (!this.intervalHandles.has(user)) {
+  stopLeak() {
+    if (!this.intervalHandle) {
       return;
     }
-    clearInterval(this.intervalHandles.get(user));
-    this.intervalHandles.delete(user);
+    clearInterval(this.intervalHandle);
+    this.intervalHandle = void 0;
   }
   close() {
-    for (const user of this.intervalHandles.keys()) {
-      this.stopLeak(user);
-    }
+    this.stopLeak();
   }
 };
 
@@ -109,8 +105,10 @@ var ClientTransport = class extends Transport {
    * Optional handshake options for this client.
    */
   handshakeExtensions;
+  sessions;
   constructor(clientId, providedOptions) {
     super(clientId, providedOptions);
+    this.sessions = /* @__PURE__ */ new Map();
     this.options = {
       ...defaultClientTransportOptions,
       ...providedOptions
@@ -121,6 +119,10 @@ var ClientTransport = class extends Transport {
     this.handshakeExtensions = options;
   }
   tryReconnecting(to) {
+    const oldSession = this.sessions.get(to);
+    if (!this.options.enableTransparentSessionReconnects && oldSession) {
+      this.deleteSession(oldSession);
+    }
     if (this.reconnectOnConnectionDrop && this.getStatus() === "open") {
       this.connect(to);
     }
@@ -142,7 +144,7 @@ var ClientTransport = class extends Transport {
     return session.send(msg);
   }
   createUnconnectedSession(to) {
-    const session = SessionStateGraph.entrypoints.NoConnection(
+    const session = ClientSessionStateGraph.entrypoint(
       to,
       this.clientId,
       {
@@ -169,40 +171,51 @@ var ClientTransport = class extends Transport {
     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);
+    const handshakingSession = ClientSessionStateGraph.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, code) => {
+          this.log?.error(
+            `invalid handshake: ${reason}`,
+            handshakingSession.loggingMetadata
+          );
+          this.deleteSession(session);
+          this.protocolError({
+            type: ProtocolError.HandshakeFailed,
+            code,
+            message: reason
+          });
+        },
+        onHandshakeTimeout: () => {
+          this.log?.error(
+            `connection to ${handshakingSession.to} timed out during handshake`,
+            handshakingSession.loggingMetadata
+          );
+          this.onConnClosed(handshakingSession);
+        },
+        onSessionGracePeriodElapsed: () => {
+          this.onSessionGracePeriodElapsed(handshakingSession);
+        }
       }
-    });
+    );
     this.updateSession(handshakingSession);
     void this.sendHandshake(handshakingSession);
     return handshakingSession;
@@ -233,15 +246,19 @@ var ClientTransport = class extends Transport {
         msg.payload.status.code
       ) : false;
       const reason = `handshake failed: ${msg.payload.status.reason}`;
+      const to = session.to;
       this.rejectHandshakeResponse(session, reason, {
         ...session.loggingMetadata,
         transportMessage: msg
       });
       if (retriable) {
-        this.tryReconnecting(session.to);
+        this.tryReconnecting(to);
       } else {
-        this.deleteSession(session);
-        this.protocolError(ProtocolError.HandshakeFailed, reason);
+        this.protocolError({
+          type: ProtocolError.HandshakeFailed,
+          code: msg.payload.status.code,
+          message: reason
+        });
       }
       return;
     }
@@ -257,7 +274,7 @@ var ClientTransport = class extends Transport {
       ...session.loggingMetadata,
       transportMessage: msg
     });
-    const connectedSession = SessionStateGraph.transition.HandshakingToConnected(session, {
+    const connectedSession = ClientSessionStateGraph.transition.HandshakingToConnected(session, {
       onConnectionErrored: (err) => {
         const errStr = coerceErrorString(err);
         this.log?.warn(
@@ -275,17 +292,26 @@ var ClientTransport = class extends Transport {
       onMessage: (msg2) => this.handleMsg(msg2),
       onInvalidMessage: (reason) => {
         this.deleteSession(connectedSession);
-        this.protocolError(ProtocolError.MessageOrderingViolated, reason);
+        this.protocolError({
+          type: ProtocolError.MessageOrderingViolated,
+          message: reason
+        });
       }
     });
     this.updateSession(connectedSession);
-    this.retryBudget.startRestoringBudget(connectedSession.to);
+    this.retryBudget.startRestoringBudget();
   }
   /**
    * Manually attempts to connect to a client.
    * @param to The client ID of the node to connect to.
    */
   connect(to) {
+    if (this.getStatus() !== "open") {
+      this.log?.info(
+        `transport state is no longer open, cancelling attempt to connect to ${to}`
+      );
+      return;
+    }
     let session = this.sessions.get(to);
     session ??= this.createUnconnectedSession(to);
     if (session.state !== "NoConnection" /* NoConnection */) {
@@ -295,39 +321,40 @@ var ClientTransport = class extends Transport {
       );
       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);
+    if (!this.retryBudget.hasBudget()) {
+      const budgetConsumed = this.retryBudget.getBudgetConsumed();
       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);
+      this.protocolError({
+        type: ProtocolError.RetriesExceeded,
+        message: errMsg
+      });
       return;
     }
-    let sleep = Promise.resolve();
-    const backoffMs = this.retryBudget.getBackoffMs(to);
-    if (backoffMs > 0) {
-      sleep = new Promise((resolve) => setTimeout(resolve, backoffMs));
-    }
+    const backoffMs = this.retryBudget.getBackoffMs();
     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");
+    this.retryBudget.consumeBudget();
+    const backingOffSession = ClientSessionStateGraph.transition.NoConnectionToBackingOff(
+      session,
+      backoffMs,
+      {
+        onBackoffFinished: () => {
+          this.onBackoffFinished(backingOffSession);
+        },
+        onSessionGracePeriodElapsed: () => {
+          this.onSessionGracePeriodElapsed(backingOffSession);
         }
-        span.addEvent("connecting");
-        return await this.createNewOutgoingConnection(to);
+      }
+    );
+    this.updateSession(backingOffSession);
+  }
+  onBackoffFinished(session) {
+    const connPromise = tracing_default.startActiveSpan("connect", async (span) => {
+      try {
+        return await this.createNewOutgoingConnection(session.to);
       } catch (err) {
         const errStr = coerceErrorString(err);
         span.recordException(errStr);
@@ -337,14 +364,17 @@ var ClientTransport = class extends Transport {
         span.end();
       }
     });
-    const connectingSession = SessionStateGraph.transition.NoConnectionToConnecting(
+    const connectingSession = ClientSessionStateGraph.transition.BackingOffToConnecting(
       session,
-      reconnectPromise,
+      connPromise,
       {
         onConnectionEstablished: (conn) => {
           this.log?.debug(
             `connection to ${connectingSession.to} established`,
-            connectingSession.loggingMetadata
+            {
+              ...conn.loggingMetadata,
+              ...connectingSession.loggingMetadata
+            }
           );
           this.onConnectionEstablished(connectingSession, conn);
         },
@@ -362,6 +392,9 @@ var ClientTransport = class extends Transport {
             connectingSession.loggingMetadata
           );
           this.onConnectingFailed(connectingSession);
+        },
+        onSessionGracePeriodElapsed: () => {
+          this.onSessionGracePeriodElapsed(connectingSession);
         }
       }
     );
@@ -398,4 +431,4 @@ var ClientTransport = class extends Transport {
 export {
   ClientTransport
 };
-//# sourceMappingURL=chunk-WE2PAPNC.js.map
+//# sourceMappingURL=chunk-FAIV2RO2.js.map

package/dist/chunk-FAIV2RO2.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  currentProtocolVersion,\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 {\n  ClientSession,\n  ClientSessionStateGraph,\n} from './sessionStateMachine/transitions';\nimport { SessionState } from './sessionStateMachine/common';\nimport { SessionNoConnection } from './sessionStateMachine/SessionNoConnection';\nimport { SessionBackingOff } from './sessionStateMachine/SessionBackingOff';\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  sessions: Map<TransportClientId, ClientSession<ConnType>>;\n\n  constructor(\n    clientId: TransportClientId,\n    providedOptions?: ProvidedClientTransportOptions,\n  ) {\n    super(clientId, providedOptions);\n    this.sessions = new Map();\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   *\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: TransportClientId) {\n    const oldSession = this.sessions.get(to);\n    if (!this.options.enableTransparentSessionReconnects && oldSession) {\n      this.deleteSession(oldSession);\n    }\n\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 = ClientSessionStateGraph.entrypoint(\n      to,\n      this.clientId,\n      {\n        onSessionGracePeriodElapsed: () => {\n          this.onSessionGracePeriodElapsed(session);\n        },\n      },\n      this.options,\n      currentProtocolVersion,\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      ClientSessionStateGraph.transition.ConnectingToHandshaking(\n        session,\n        conn,\n        {\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, code) => {\n            this.log?.error(\n              `invalid handshake: ${reason}`,\n              handshakingSession.loggingMetadata,\n            );\n            this.deleteSession(session);\n            this.protocolError({\n              type: ProtocolError.HandshakeFailed,\n              code,\n              message: reason,\n            });\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          onSessionGracePeriodElapsed: () => {\n            this.onSessionGracePeriodElapsed(handshakingSession);\n          },\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      const to = session.to;\n      this.rejectHandshakeResponse(session, reason, {\n        ...session.loggingMetadata,\n        transportMessage: msg,\n      });\n\n      if (retriable) {\n        this.tryReconnecting(to);\n      } else {\n        this.protocolError({\n          type: ProtocolError.HandshakeFailed,\n          code: msg.payload.status.code,\n          message: reason,\n        });\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      ClientSessionStateGraph.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({\n            type: ProtocolError.MessageOrderingViolated,\n            message: reason,\n          });\n        },\n      });\n\n    this.updateSession(connectedSession);\n    this.retryBudget.startRestoringBudget();\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    if (this.getStatus() !== 'open') {\n      this.log?.info(\n        `transport state is no longer open, cancelling attempt to connect to ${to}`,\n      );\n      return;\n    }\n\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    // check budget\n    if (!this.retryBudget.hasBudget()) {\n      const budgetConsumed = this.retryBudget.getBudgetConsumed();\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({\n        type: ProtocolError.RetriesExceeded,\n        message: errMsg,\n      });\n      return;\n    }\n\n    const backoffMs = this.retryBudget.getBackoffMs();\n\n    this.log?.info(\n      `attempting connection to ${to} (${backoffMs}ms backoff)`,\n      session.loggingMetadata,\n    );\n\n    this.retryBudget.consumeBudget();\n    const backingOffSession =\n      ClientSessionStateGraph.transition.NoConnectionToBackingOff(\n        session,\n        backoffMs,\n        {\n          onBackoffFinished: () => {\n            this.onBackoffFinished(backingOffSession);\n          },\n          onSessionGracePeriodElapsed: () => {\n            this.onSessionGracePeriodElapsed(backingOffSession);\n          },\n        },\n      );\n\n    this.updateSession(backingOffSession);\n  }\n\n  protected onBackoffFinished(session: SessionBackingOff) {\n    const connPromise = tracer.startActiveSpan('connect', async (span) => {\n      try {\n        return await this.createNewOutgoingConnection(session.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    // transition to connecting\n    const connectingSession =\n      ClientSessionStateGraph.transition.BackingOffToConnecting(\n        session,\n        connPromise,\n        {\n          onConnectionEstablished: (conn) => {\n            this.log?.debug(\n              `connection to ${connectingSession.to} established`,\n              {\n                ...conn.loggingMetadata,\n                ...connectingSession.loggingMetadata,\n              },\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          onSessionGracePeriodElapsed: () => {\n            this.onSessionGracePeriodElapsed(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","/**\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: number;\n  private intervalHandle?: ReturnType<typeof setInterval>;\n  private readonly options: ConnectionRetryOptions;\n\n  constructor(options: ConnectionRetryOptions) {\n    this.options = options;\n    this.budgetConsumed = 0;\n  }\n\n  getBackoffMs() {\n    if (this.getBudgetConsumed() === 0) {\n      return 0;\n    }\n\n    const exponent = Math.max(0, this.getBudgetConsumed() - 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() {\n    // If we're consuming again, let's ensure that we're not leaking\n    this.stopLeak();\n    this.budgetConsumed = this.getBudgetConsumed() + 1;\n  }\n\n  getBudgetConsumed() {\n    return this.budgetConsumed;\n  }\n\n  hasBudget() {\n    return this.getBudgetConsumed() < this.options.attemptBudgetCapacity;\n  }\n\n  startRestoringBudget() {\n    if (this.intervalHandle) {\n      return;\n    }\n\n    const restoreBudgetForUser = () => {\n      const currentBudget = this.budgetConsumed;\n      if (!currentBudget) {\n        this.stopLeak();\n        return;\n      }\n\n      const newBudget = currentBudget - 1;\n      if (newBudget === 0) {\n        return;\n      }\n\n      this.budgetConsumed = newBudget;\n    };\n\n    this.intervalHandle = setInterval(\n      restoreBudgetForUser,\n      this.options.budgetRestoreIntervalMs,\n    );\n  }\n\n  private stopLeak() {\n    if (!this.intervalHandle) {\n      return;\n    }\n\n    clearInterval(this.intervalHandle);\n    this.intervalHandle = undefined;\n  }\n\n  close() {\n    this.stopLeak();\n  }\n}\n"],"mappings":"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","names":["msg"]}

package/dist/{chunk-NOLXEIRP.js → chunk-J54ZWTQM.js}

@@ -5,10 +5,10 @@ import {
 import {
   SessionStateGraph,
   defaultTransportOptions
-} from "./chunk-TMNVRR5R.js";
+} from "./chunk-Y3JHOIJ7.js";
 import {
   generateId
-} from "./chunk-IGNFE3QW.js";
+} from "./chunk-3ROTSXAO.js";
 
 // transport/events.ts
 var ProtocolError = {
@@ -112,8 +112,8 @@ var Transport = class {
   removeEventListener(type, handler) {
     this.eventDispatcher.removeEventListener(type, handler);
   }
-  protocolError(type, message) {
-    this.eventDispatcher.dispatchEvent("protocolError", { type, message });
+  protocolError(message) {
+    this.eventDispatcher.dispatchEvent("protocolError", message);
   }
   /**
    * Default close implementation for transports. You should override this in the downstream
@@ -160,8 +160,9 @@ var Transport = class {
       status: "disconnect",
       session
     });
+    const to = session.to;
     session.close();
-    this.sessions.delete(session.to);
+    this.sessions.delete(to);
   }
   // common listeners
   onSessionGracePeriodElapsed(session) {
@@ -274,4 +275,4 @@ export {
   Transport,
   Connection
 };
-//# sourceMappingURL=chunk-NOLXEIRP.js.map
+//# sourceMappingURL=chunk-J54ZWTQM.js.map