@replit/river 0.23.13 → 0.23.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (62) hide show
  1. package/dist/{chunk-2FNLANTJ.js → chunk-5HK7ZQYH.js} +10 -2
  2. package/dist/{chunk-2FNLANTJ.js.map → chunk-5HK7ZQYH.js.map} +1 -1
  3. package/dist/{chunk-KFTGQ3QC.js → chunk-AEY7BBOZ.js} +2 -2
  4. package/dist/{chunk-S4DUN7KK.js → chunk-IJTGEBLG.js} +41 -20
  5. package/dist/chunk-IJTGEBLG.js.map +1 -0
  6. package/dist/{chunk-ZUKDZY54.js → chunk-JMVKSGND.js} +89 -25
  7. package/dist/chunk-JMVKSGND.js.map +1 -0
  8. package/dist/{chunk-XM656KMN.js → chunk-MD4S7GO2.js} +71 -3
  9. package/dist/chunk-MD4S7GO2.js.map +1 -0
  10. package/dist/{chunk-ES4XO2XD.js → chunk-OXVWMLID.js} +33 -4
  11. package/dist/chunk-OXVWMLID.js.map +1 -0
  12. package/dist/{chunk-SX6HI63Q.js → chunk-RQQZUQGE.js} +2 -2
  13. package/dist/{chunk-4QZOW4DH.js → chunk-XYEOXPZQ.js} +2 -2
  14. package/dist/{client-dd5c9dd0.d.ts → client-e13979ac.d.ts} +1 -1
  15. package/dist/{connection-39816c00.d.ts → connection-5d0978ce.d.ts} +1 -1
  16. package/dist/{connection-40318f22.d.ts → connection-e57e98ea.d.ts} +1 -1
  17. package/dist/{handshake-e428d1c8.d.ts → handshake-5665ffd3.d.ts} +13 -0
  18. package/dist/router/index.cjs +16 -1
  19. package/dist/router/index.cjs.map +1 -1
  20. package/dist/router/index.d.cts +7 -7
  21. package/dist/router/index.d.ts +7 -7
  22. package/dist/router/index.js +2 -2
  23. package/dist/{server-ebf80863.d.ts → server-1cfc88d1.d.ts} +1 -1
  24. package/dist/{services-f406b3aa.d.ts → services-86c4d10d.d.ts} +2 -2
  25. package/dist/transport/impls/uds/client.cjs +138 -18
  26. package/dist/transport/impls/uds/client.cjs.map +1 -1
  27. package/dist/transport/impls/uds/client.d.cts +3 -3
  28. package/dist/transport/impls/uds/client.d.ts +3 -3
  29. package/dist/transport/impls/uds/client.js +5 -5
  30. package/dist/transport/impls/uds/server.cjs +182 -23
  31. package/dist/transport/impls/uds/server.cjs.map +1 -1
  32. package/dist/transport/impls/uds/server.d.cts +3 -3
  33. package/dist/transport/impls/uds/server.d.ts +3 -3
  34. package/dist/transport/impls/uds/server.js +5 -5
  35. package/dist/transport/impls/ws/client.cjs +138 -18
  36. package/dist/transport/impls/ws/client.cjs.map +1 -1
  37. package/dist/transport/impls/ws/client.d.cts +3 -3
  38. package/dist/transport/impls/ws/client.d.ts +3 -3
  39. package/dist/transport/impls/ws/client.js +5 -5
  40. package/dist/transport/impls/ws/server.cjs +182 -23
  41. package/dist/transport/impls/ws/server.cjs.map +1 -1
  42. package/dist/transport/impls/ws/server.d.cts +3 -3
  43. package/dist/transport/impls/ws/server.d.ts +3 -3
  44. package/dist/transport/impls/ws/server.js +5 -5
  45. package/dist/transport/index.cjs +227 -40
  46. package/dist/transport/index.cjs.map +1 -1
  47. package/dist/transport/index.d.cts +3 -3
  48. package/dist/transport/index.d.ts +3 -3
  49. package/dist/transport/index.js +5 -5
  50. package/dist/util/testHelpers.cjs +9 -1
  51. package/dist/util/testHelpers.cjs.map +1 -1
  52. package/dist/util/testHelpers.d.cts +3 -3
  53. package/dist/util/testHelpers.d.ts +3 -3
  54. package/dist/util/testHelpers.js +3 -3
  55. package/package.json +13 -14
  56. package/dist/chunk-ES4XO2XD.js.map +0 -1
  57. package/dist/chunk-S4DUN7KK.js.map +0 -1
  58. package/dist/chunk-XM656KMN.js.map +0 -1
  59. package/dist/chunk-ZUKDZY54.js.map +0 -1
  60. /package/dist/{chunk-KFTGQ3QC.js.map → chunk-AEY7BBOZ.js.map} +0 -0
  61. /package/dist/{chunk-SX6HI63Q.js.map → chunk-RQQZUQGE.js.map} +0 -0
  62. /package/dist/{chunk-4QZOW4DH.js.map → chunk-XYEOXPZQ.js.map} +0 -0
@@ -1,6 +1,6 @@
1
1
  import {
2
2
  createSessionTelemetryInfo
3
- } from "./chunk-ES4XO2XD.js";
3
+ } from "./chunk-OXVWMLID.js";
4
4
  import {
5
5
  NaiveJsonCodec
6
6
  } from "./chunk-4PVU7J25.js";
@@ -274,9 +274,17 @@ var Session = class {
274
274
  get connected() {
275
275
  return this.connection !== void 0;
276
276
  }
277
+ get nextExpectedAck() {
278
+ return this.seq;
279
+ }
277
280
  get nextExpectedSeq() {
278
281
  return this.ack;
279
282
  }
283
+ // This is only used in tests to make the session misbehave.
284
+ /* @internal */
285
+ advanceAckForTesting(by) {
286
+ this.ack += by;
287
+ }
280
288
  constructMsg(partialMsg) {
281
289
  const msg = {
282
290
  ...partialMsg,
@@ -324,4 +332,4 @@ export {
324
332
  defaultClientTransportOptions,
325
333
  defaultServerTransportOptions
326
334
  };
327
- //# sourceMappingURL=chunk-2FNLANTJ.js.map
335
+ //# sourceMappingURL=chunk-5HK7ZQYH.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../transport/session.ts","../transport/options.ts"],"sourcesContent":["import { customAlphabet } from 'nanoid';\nimport {\n ControlFlags,\n ControlMessageAckSchema,\n OpaqueTransportMessage,\n PartialTransportMessage,\n TransportClientId,\n TransportMessage,\n} from './message';\nimport { Codec } from '../codec';\nimport { Logger, MessageMetadata } from '../logging/log';\nimport { Static } from '@sinclair/typebox';\nimport {\n PropagationContext,\n TelemetryInfo,\n createSessionTelemetryInfo,\n} from '../tracing';\nimport { SpanStatusCode } from '@opentelemetry/api';\n\nconst nanoid = customAlphabet('1234567890abcdefghijklmnopqrstuvxyz', 6);\nexport const unsafeId = () => nanoid();\n\ntype SequenceNumber = number;\n\n/**\n * A connection is the actual raw underlying transport connection.\n * It’s responsible for dispatching to/from the actual connection itself\n * This should be instantiated as soon as the client/server has a connection\n * It’s tied to the lifecycle of the underlying transport connection (i.e. if the WS drops, this connection should be deleted)\n */\nexport abstract class Connection {\n id: string;\n telemetry?: TelemetryInfo;\n constructor() {\n this.id = `conn-${nanoid(12)}`; // for debugging, no collision safety needed\n }\n\n get loggingMetadata(): MessageMetadata {\n const metadata: MessageMetadata = { connId: this.id };\n const spanContext = this.telemetry?.span.spanContext();\n\n if (this.telemetry?.span.isRecording() && spanContext) {\n metadata.telemetry = {\n traceId: spanContext.traceId,\n spanId: spanContext.spanId,\n };\n }\n\n return metadata;\n }\n\n /**\n * Handle adding a callback for when a message is received.\n * @param msg The message that was received.\n */\n abstract addDataListener(cb: (msg: Uint8Array) => void): void;\n abstract removeDataListener(cb: (msg: Uint8Array) => void): void;\n\n /**\n * Handle adding a callback for when the connection is closed.\n * This should also be called if an error happens.\n * @param cb The callback to call when the connection is closed.\n */\n abstract addCloseListener(cb: () => void): void;\n\n /**\n * Handle adding a callback for when an error is received.\n * This should only be used for this.logging errors, all cleanup\n * should be delegated to addCloseListener.\n *\n * The implementer should take care such that the implemented\n * connection will call both the close and error callbacks\n * on an error.\n *\n * @param cb The callback to call when an error is received.\n */\n abstract addErrorListener(cb: (err: Error) => void): void;\n\n /**\n * Sends a message over the connection.\n * @param msg The message to send.\n * @returns true if the message was sent, false otherwise.\n */\n abstract send(msg: Uint8Array): boolean;\n\n /**\n * Closes the connection.\n */\n abstract close(): void;\n}\n\nexport interface SessionOptions {\n /**\n * Frequency at which to send heartbeat acknowledgements\n */\n heartbeatIntervalMs: number;\n /**\n * Number of elapsed heartbeats without a response message before we consider\n * the connection dead.\n */\n heartbeatsUntilDead: number;\n /**\n * Duration to wait between connection disconnect and actual session disconnect\n */\n sessionDisconnectGraceMs: number;\n /**\n * The codec to use for encoding/decoding messages over the wire\n */\n codec: Codec;\n}\n\n/**\n * A session is a higher-level abstraction that operates over the span of potentially multiple transport-level connections\n * - It’s responsible for tracking any metadata for a particular client that might need to be persisted across connections (i.e. the sendBuffer, ack, seq)\n * - This will only be considered disconnected if\n * - the server tells the client that we’ve reconnected but it doesn’t recognize us anymore (server definitely died) or\n * - we hit a grace period after a connection disconnect\n */\nexport class Session<ConnType extends Connection> {\n private codec: Codec;\n private options: SessionOptions;\n readonly telemetry: TelemetryInfo;\n\n /**\n * The buffer of messages that have been sent but not yet acknowledged.\n */\n private sendBuffer: Array<OpaqueTransportMessage> = [];\n\n /**\n * The active connection associated with this session\n */\n connection?: ConnType;\n /**\n * A connection that is currently undergoing handshaking. Used to distinguish between the active\n * connection, but still be able to close it if needed.\n */\n private handshakingConnection?: ConnType;\n readonly from: TransportClientId;\n readonly to: TransportClientId;\n\n /**\n * The unique ID of this session.\n */\n readonly id: string;\n\n /**\n * What the other side advertised as their session ID\n * for this session.\n */\n advertisedSessionId?: string;\n\n /**\n * Number of messages we've sent along this session (excluding handshake and acks)\n */\n private seq: SequenceNumber = 0;\n\n /**\n * Number of unique messages we've received this session (excluding handshake and acks)\n */\n private ack: SequenceNumber = 0;\n\n /**\n * The grace period between when the inner connection is disconnected\n * and when we should consider the entire session disconnected.\n */\n private disconnectionGrace?: ReturnType<typeof setTimeout>;\n\n /**\n * Number of heartbeats we've sent without a response.\n */\n private heartbeatMisses: number;\n\n /**\n * The interval for sending heartbeats.\n */\n private heartbeat: ReturnType<typeof setInterval>;\n private log?: Logger;\n\n constructor(\n conn: ConnType | undefined,\n from: TransportClientId,\n to: TransportClientId,\n options: SessionOptions,\n propagationCtx?: PropagationContext,\n ) {\n this.id = `session-${nanoid(12)}`;\n this.options = options;\n this.from = from;\n this.to = to;\n this.connection = conn;\n this.codec = options.codec;\n\n // setup heartbeat\n this.heartbeatMisses = 0;\n this.heartbeat = setInterval(\n () => this.sendHeartbeat(),\n options.heartbeatIntervalMs,\n );\n this.telemetry = createSessionTelemetryInfo(this, propagationCtx);\n }\n\n bindLogger(log: Logger) {\n this.log = log;\n }\n\n get loggingMetadata(): MessageMetadata {\n const spanContext = this.telemetry.span.spanContext();\n\n return {\n clientId: this.from,\n connectedTo: this.to,\n sessionId: this.id,\n connId: this.connection?.id,\n telemetry: {\n traceId: spanContext.traceId,\n spanId: spanContext.spanId,\n },\n };\n }\n\n /**\n * Sends a message over the session's connection.\n * If the connection is not ready or the message fails to send, the message can be buffered for retry unless skipped.\n *\n * @param msg The partial message to be sent, which will be constructed into a full message.\n * @param addToSendBuff Whether to add the message to the send buffer for retry.\n * @returns The full transport ID of the message that was attempted to be sent.\n */\n send(msg: PartialTransportMessage): string {\n const fullMsg: TransportMessage = this.constructMsg(msg);\n this.log?.debug(`sending msg`, {\n ...this.loggingMetadata,\n transportMessage: fullMsg,\n });\n\n if (this.connection) {\n const ok = this.connection.send(this.codec.toBuffer(fullMsg));\n if (ok) return fullMsg.id;\n this.log?.info(\n `failed to send msg to ${fullMsg.to}, connection is probably dead`,\n {\n ...this.loggingMetadata,\n transportMessage: fullMsg,\n },\n );\n } else {\n this.log?.debug(\n `buffering msg to ${fullMsg.to}, connection not ready yet`,\n { ...this.loggingMetadata, transportMessage: fullMsg },\n );\n }\n\n return fullMsg.id;\n }\n\n sendHeartbeat() {\n const misses = this.heartbeatMisses;\n const missDuration = misses * this.options.heartbeatIntervalMs;\n if (misses > this.options.heartbeatsUntilDead) {\n if (this.connection) {\n this.log?.info(\n `closing connection to ${this.to} due to inactivity (missed ${misses} heartbeats which is ${missDuration}ms)`,\n this.loggingMetadata,\n );\n this.telemetry.span.addEvent('closing connection due to inactivity');\n this.closeStaleConnection();\n }\n return;\n }\n\n this.send({\n streamId: 'heartbeat',\n controlFlags: ControlFlags.AckBit,\n payload: {\n type: 'ACK',\n } satisfies Static<typeof ControlMessageAckSchema>,\n });\n this.heartbeatMisses++;\n }\n\n resetBufferedMessages() {\n this.sendBuffer = [];\n this.seq = 0;\n this.ack = 0;\n }\n\n sendBufferedMessages(conn: ConnType) {\n this.log?.info(`resending ${this.sendBuffer.length} buffered messages`, {\n ...this.loggingMetadata,\n connId: conn.id,\n });\n for (const msg of this.sendBuffer) {\n this.log?.debug(`resending msg`, {\n ...this.loggingMetadata,\n transportMessage: msg,\n connId: conn.id,\n });\n const ok = conn.send(this.codec.toBuffer(msg));\n if (!ok) {\n // this should never happen unless the transport has an\n // incorrect implementation of `createNewOutgoingConnection`\n const errMsg = `failed to send buffered message to ${this.to} (sus, this is a fresh connection)`;\n conn.telemetry?.span.setStatus({\n code: SpanStatusCode.ERROR,\n message: errMsg,\n });\n\n this.log?.error(errMsg, {\n ...this.loggingMetadata,\n transportMessage: msg,\n connId: conn.id,\n tags: ['invariant-violation'],\n });\n conn.close();\n return;\n }\n }\n }\n\n updateBookkeeping(ack: number, seq: number) {\n if (seq + 1 < this.ack) {\n this.log?.error(`received stale seq ${seq} + 1 < ${this.ack}`, {\n ...this.loggingMetadata,\n tags: ['invariant-violation'],\n });\n return;\n }\n\n this.sendBuffer = this.sendBuffer.filter((unacked) => unacked.seq >= ack);\n this.ack = seq + 1;\n }\n\n private closeStaleConnection(conn?: ConnType) {\n if (this.connection === undefined || this.connection === conn) return;\n this.log?.info(\n `closing old inner connection from session to ${this.to}`,\n this.loggingMetadata,\n );\n this.connection.close();\n this.connection = undefined;\n }\n\n replaceWithNewConnection(newConn: ConnType, isTransparentReconnect: boolean) {\n this.closeStaleConnection(newConn);\n this.cancelGrace();\n if (isTransparentReconnect) {\n // only send the buffered messages if this is considered a transparent reconnect. there are\n // cases where the cient reconnects but with a different session id. for those cases we should\n // not send messages from a previous session.\n\n this.sendBufferedMessages(newConn);\n }\n this.connection = newConn;\n\n // we only call replaceWithNewConnection after\n // having successfully completed a handshake so we clear\n // it here\n this.handshakingConnection = undefined;\n }\n\n replaceWithNewHandshakingConnection(newConn: ConnType) {\n this.handshakingConnection = newConn;\n }\n\n beginGrace(cb: () => void) {\n this.log?.info(\n `starting ${this.options.sessionDisconnectGraceMs}ms grace period until session to ${this.to} is closed`,\n this.loggingMetadata,\n );\n\n // Replace any old timeouts to prevent this from firing twice.\n this.cancelGrace();\n this.disconnectionGrace = setTimeout(() => {\n this.log?.info(\n `grace period for ${this.to} elapsed`,\n this.loggingMetadata,\n );\n cb();\n }, this.options.sessionDisconnectGraceMs);\n }\n\n // called on reconnect of the underlying session\n cancelGrace() {\n this.heartbeatMisses = 0;\n clearTimeout(this.disconnectionGrace);\n this.disconnectionGrace = undefined;\n }\n\n /**\n * Used to close the handshaking connection, if set.\n */\n closeHandshakingConnection(expectedHandshakingConn?: ConnType) {\n if (this.handshakingConnection === undefined) return;\n if (\n expectedHandshakingConn !== undefined &&\n this.handshakingConnection === expectedHandshakingConn\n ) {\n // If the handshaking connection is the expected one, don't close it.\n return;\n }\n this.handshakingConnection.close();\n this.handshakingConnection = undefined;\n }\n\n // closed when we want to discard the whole session\n // (i.e. shutdown or session disconnect)\n close() {\n this.closeStaleConnection();\n this.cancelGrace();\n this.resetBufferedMessages();\n clearInterval(this.heartbeat);\n }\n\n get connected() {\n return this.connection !== undefined;\n }\n\n get nextExpectedSeq() {\n return this.ack;\n }\n\n constructMsg<Payload>(\n partialMsg: PartialTransportMessage<Payload>,\n ): TransportMessage<Payload> {\n const msg = {\n ...partialMsg,\n id: unsafeId(),\n to: this.to,\n from: this.from,\n seq: this.seq,\n ack: this.ack,\n };\n\n this.seq++;\n this.sendBuffer.push(msg);\n return msg;\n }\n\n inspectSendBuffer(): ReadonlyArray<OpaqueTransportMessage> {\n return this.sendBuffer;\n }\n}\n","import { NaiveJsonCodec } from '../codec/json';\nimport { ConnectionRetryOptions } from './rateLimit';\nimport { SessionOptions } from './session';\n\nexport type TransportOptions = SessionOptions;\n\nexport type ProvidedTransportOptions = Partial<TransportOptions>;\n\nexport const defaultTransportOptions: TransportOptions = {\n heartbeatIntervalMs: 1_000,\n heartbeatsUntilDead: 2,\n sessionDisconnectGraceMs: 5_000,\n codec: NaiveJsonCodec,\n};\n\nexport type ClientTransportOptions = TransportOptions & ConnectionRetryOptions;\n\nexport type ProvidedClientTransportOptions = Partial<ClientTransportOptions>;\n\nconst defaultConnectionRetryOptions: ConnectionRetryOptions = {\n baseIntervalMs: 250,\n maxJitterMs: 200,\n maxBackoffMs: 32_000,\n attemptBudgetCapacity: 5,\n budgetRestoreIntervalMs: 200,\n};\n\nexport const defaultClientTransportOptions: ClientTransportOptions = {\n ...defaultTransportOptions,\n ...defaultConnectionRetryOptions,\n};\n\nexport type ServerTransportOptions = TransportOptions;\n\nexport type ProvidedServerTransportOptions = Partial<ServerTransportOptions>;\n\nexport const defaultServerTransportOptions: ServerTransportOptions = {\n ...defaultTransportOptions,\n};\n"],"mappings":"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","names":[]}
1
+ {"version":3,"sources":["../transport/session.ts","../transport/options.ts"],"sourcesContent":["import { customAlphabet } from 'nanoid';\nimport {\n ControlFlags,\n ControlMessageAckSchema,\n OpaqueTransportMessage,\n PartialTransportMessage,\n TransportClientId,\n TransportMessage,\n} from './message';\nimport { Codec } from '../codec';\nimport { Logger, MessageMetadata } from '../logging/log';\nimport { Static } from '@sinclair/typebox';\nimport {\n PropagationContext,\n TelemetryInfo,\n createSessionTelemetryInfo,\n} from '../tracing';\nimport { SpanStatusCode } from '@opentelemetry/api';\n\nconst nanoid = customAlphabet('1234567890abcdefghijklmnopqrstuvxyz', 6);\nexport const unsafeId = () => nanoid();\n\ntype SequenceNumber = number;\n\n/**\n * A connection is the actual raw underlying transport connection.\n * It’s responsible for dispatching to/from the actual connection itself\n * This should be instantiated as soon as the client/server has a connection\n * It’s tied to the lifecycle of the underlying transport connection (i.e. if the WS drops, this connection should be deleted)\n */\nexport abstract class Connection {\n id: string;\n telemetry?: TelemetryInfo;\n constructor() {\n this.id = `conn-${nanoid(12)}`; // for debugging, no collision safety needed\n }\n\n get loggingMetadata(): MessageMetadata {\n const metadata: MessageMetadata = { connId: this.id };\n const spanContext = this.telemetry?.span.spanContext();\n\n if (this.telemetry?.span.isRecording() && spanContext) {\n metadata.telemetry = {\n traceId: spanContext.traceId,\n spanId: spanContext.spanId,\n };\n }\n\n return metadata;\n }\n\n /**\n * Handle adding a callback for when a message is received.\n * @param msg The message that was received.\n */\n abstract addDataListener(cb: (msg: Uint8Array) => void): void;\n abstract removeDataListener(cb: (msg: Uint8Array) => void): void;\n\n /**\n * Handle adding a callback for when the connection is closed.\n * This should also be called if an error happens.\n * @param cb The callback to call when the connection is closed.\n */\n abstract addCloseListener(cb: () => void): void;\n\n /**\n * Handle adding a callback for when an error is received.\n * This should only be used for this.logging errors, all cleanup\n * should be delegated to addCloseListener.\n *\n * The implementer should take care such that the implemented\n * connection will call both the close and error callbacks\n * on an error.\n *\n * @param cb The callback to call when an error is received.\n */\n abstract addErrorListener(cb: (err: Error) => void): void;\n\n /**\n * Sends a message over the connection.\n * @param msg The message to send.\n * @returns true if the message was sent, false otherwise.\n */\n abstract send(msg: Uint8Array): boolean;\n\n /**\n * Closes the connection.\n */\n abstract close(): void;\n}\n\nexport interface SessionOptions {\n /**\n * Frequency at which to send heartbeat acknowledgements\n */\n heartbeatIntervalMs: number;\n /**\n * Number of elapsed heartbeats without a response message before we consider\n * the connection dead.\n */\n heartbeatsUntilDead: number;\n /**\n * Duration to wait between connection disconnect and actual session disconnect\n */\n sessionDisconnectGraceMs: number;\n /**\n * The codec to use for encoding/decoding messages over the wire\n */\n codec: Codec;\n}\n\n/**\n * A session is a higher-level abstraction that operates over the span of potentially multiple transport-level connections\n * - It’s responsible for tracking any metadata for a particular client that might need to be persisted across connections (i.e. the sendBuffer, ack, seq)\n * - This will only be considered disconnected if\n * - the server tells the client that we’ve reconnected but it doesn’t recognize us anymore (server definitely died) or\n * - we hit a grace period after a connection disconnect\n */\nexport class Session<ConnType extends Connection> {\n private codec: Codec;\n private options: SessionOptions;\n readonly telemetry: TelemetryInfo;\n\n /**\n * The buffer of messages that have been sent but not yet acknowledged.\n */\n private sendBuffer: Array<OpaqueTransportMessage> = [];\n\n /**\n * The active connection associated with this session\n */\n connection?: ConnType;\n /**\n * A connection that is currently undergoing handshaking. Used to distinguish between the active\n * connection, but still be able to close it if needed.\n */\n private handshakingConnection?: ConnType;\n readonly from: TransportClientId;\n readonly to: TransportClientId;\n\n /**\n * The unique ID of this session.\n */\n readonly id: string;\n\n /**\n * What the other side advertised as their session ID\n * for this session.\n */\n advertisedSessionId?: string;\n\n /**\n * Number of messages we've sent along this session (excluding handshake and acks)\n */\n private seq: SequenceNumber = 0;\n\n /**\n * Number of unique messages we've received this session (excluding handshake and acks)\n */\n private ack: SequenceNumber = 0;\n\n /**\n * The grace period between when the inner connection is disconnected\n * and when we should consider the entire session disconnected.\n */\n private disconnectionGrace?: ReturnType<typeof setTimeout>;\n\n /**\n * Number of heartbeats we've sent without a response.\n */\n private heartbeatMisses: number;\n\n /**\n * The interval for sending heartbeats.\n */\n private heartbeat: ReturnType<typeof setInterval>;\n private log?: Logger;\n\n constructor(\n conn: ConnType | undefined,\n from: TransportClientId,\n to: TransportClientId,\n options: SessionOptions,\n propagationCtx?: PropagationContext,\n ) {\n this.id = `session-${nanoid(12)}`;\n this.options = options;\n this.from = from;\n this.to = to;\n this.connection = conn;\n this.codec = options.codec;\n\n // setup heartbeat\n this.heartbeatMisses = 0;\n this.heartbeat = setInterval(\n () => this.sendHeartbeat(),\n options.heartbeatIntervalMs,\n );\n this.telemetry = createSessionTelemetryInfo(this, propagationCtx);\n }\n\n bindLogger(log: Logger) {\n this.log = log;\n }\n\n get loggingMetadata(): MessageMetadata {\n const spanContext = this.telemetry.span.spanContext();\n\n return {\n clientId: this.from,\n connectedTo: this.to,\n sessionId: this.id,\n connId: this.connection?.id,\n telemetry: {\n traceId: spanContext.traceId,\n spanId: spanContext.spanId,\n },\n };\n }\n\n /**\n * Sends a message over the session's connection.\n * If the connection is not ready or the message fails to send, the message can be buffered for retry unless skipped.\n *\n * @param msg The partial message to be sent, which will be constructed into a full message.\n * @param addToSendBuff Whether to add the message to the send buffer for retry.\n * @returns The full transport ID of the message that was attempted to be sent.\n */\n send(msg: PartialTransportMessage): string {\n const fullMsg: TransportMessage = this.constructMsg(msg);\n this.log?.debug(`sending msg`, {\n ...this.loggingMetadata,\n transportMessage: fullMsg,\n });\n\n if (this.connection) {\n const ok = this.connection.send(this.codec.toBuffer(fullMsg));\n if (ok) return fullMsg.id;\n this.log?.info(\n `failed to send msg to ${fullMsg.to}, connection is probably dead`,\n {\n ...this.loggingMetadata,\n transportMessage: fullMsg,\n },\n );\n } else {\n this.log?.debug(\n `buffering msg to ${fullMsg.to}, connection not ready yet`,\n { ...this.loggingMetadata, transportMessage: fullMsg },\n );\n }\n\n return fullMsg.id;\n }\n\n sendHeartbeat() {\n const misses = this.heartbeatMisses;\n const missDuration = misses * this.options.heartbeatIntervalMs;\n if (misses > this.options.heartbeatsUntilDead) {\n if (this.connection) {\n this.log?.info(\n `closing connection to ${this.to} due to inactivity (missed ${misses} heartbeats which is ${missDuration}ms)`,\n this.loggingMetadata,\n );\n this.telemetry.span.addEvent('closing connection due to inactivity');\n this.closeStaleConnection();\n }\n return;\n }\n\n this.send({\n streamId: 'heartbeat',\n controlFlags: ControlFlags.AckBit,\n payload: {\n type: 'ACK',\n } satisfies Static<typeof ControlMessageAckSchema>,\n });\n this.heartbeatMisses++;\n }\n\n resetBufferedMessages() {\n this.sendBuffer = [];\n this.seq = 0;\n this.ack = 0;\n }\n\n sendBufferedMessages(conn: ConnType) {\n this.log?.info(`resending ${this.sendBuffer.length} buffered messages`, {\n ...this.loggingMetadata,\n connId: conn.id,\n });\n for (const msg of this.sendBuffer) {\n this.log?.debug(`resending msg`, {\n ...this.loggingMetadata,\n transportMessage: msg,\n connId: conn.id,\n });\n const ok = conn.send(this.codec.toBuffer(msg));\n if (!ok) {\n // this should never happen unless the transport has an\n // incorrect implementation of `createNewOutgoingConnection`\n const errMsg = `failed to send buffered message to ${this.to} (sus, this is a fresh connection)`;\n conn.telemetry?.span.setStatus({\n code: SpanStatusCode.ERROR,\n message: errMsg,\n });\n\n this.log?.error(errMsg, {\n ...this.loggingMetadata,\n transportMessage: msg,\n connId: conn.id,\n tags: ['invariant-violation'],\n });\n conn.close();\n return;\n }\n }\n }\n\n updateBookkeeping(ack: number, seq: number) {\n if (seq + 1 < this.ack) {\n this.log?.error(`received stale seq ${seq} + 1 < ${this.ack}`, {\n ...this.loggingMetadata,\n tags: ['invariant-violation'],\n });\n return;\n }\n\n this.sendBuffer = this.sendBuffer.filter((unacked) => unacked.seq >= ack);\n this.ack = seq + 1;\n }\n\n private closeStaleConnection(conn?: ConnType) {\n if (this.connection === undefined || this.connection === conn) return;\n this.log?.info(\n `closing old inner connection from session to ${this.to}`,\n this.loggingMetadata,\n );\n this.connection.close();\n this.connection = undefined;\n }\n\n replaceWithNewConnection(newConn: ConnType, isTransparentReconnect: boolean) {\n this.closeStaleConnection(newConn);\n this.cancelGrace();\n if (isTransparentReconnect) {\n // only send the buffered messages if this is considered a transparent reconnect. there are\n // cases where the cient reconnects but with a different session id. for those cases we should\n // not send messages from a previous session.\n\n this.sendBufferedMessages(newConn);\n }\n this.connection = newConn;\n\n // we only call replaceWithNewConnection after\n // having successfully completed a handshake so we clear\n // it here\n this.handshakingConnection = undefined;\n }\n\n replaceWithNewHandshakingConnection(newConn: ConnType) {\n this.handshakingConnection = newConn;\n }\n\n beginGrace(cb: () => void) {\n this.log?.info(\n `starting ${this.options.sessionDisconnectGraceMs}ms grace period until session to ${this.to} is closed`,\n this.loggingMetadata,\n );\n\n // Replace any old timeouts to prevent this from firing twice.\n this.cancelGrace();\n this.disconnectionGrace = setTimeout(() => {\n this.log?.info(\n `grace period for ${this.to} elapsed`,\n this.loggingMetadata,\n );\n cb();\n }, this.options.sessionDisconnectGraceMs);\n }\n\n // called on reconnect of the underlying session\n cancelGrace() {\n this.heartbeatMisses = 0;\n clearTimeout(this.disconnectionGrace);\n this.disconnectionGrace = undefined;\n }\n\n /**\n * Used to close the handshaking connection, if set.\n */\n closeHandshakingConnection(expectedHandshakingConn?: ConnType) {\n if (this.handshakingConnection === undefined) return;\n if (\n expectedHandshakingConn !== undefined &&\n this.handshakingConnection === expectedHandshakingConn\n ) {\n // If the handshaking connection is the expected one, don't close it.\n return;\n }\n this.handshakingConnection.close();\n this.handshakingConnection = undefined;\n }\n\n // closed when we want to discard the whole session\n // (i.e. shutdown or session disconnect)\n close() {\n this.closeStaleConnection();\n this.cancelGrace();\n this.resetBufferedMessages();\n clearInterval(this.heartbeat);\n }\n\n get connected() {\n return this.connection !== undefined;\n }\n\n get nextExpectedAck() {\n return this.seq;\n }\n\n get nextExpectedSeq() {\n return this.ack;\n }\n\n // This is only used in tests to make the session misbehave.\n /* @internal */ advanceAckForTesting(by: number) {\n this.ack += by;\n }\n\n constructMsg<Payload>(\n partialMsg: PartialTransportMessage<Payload>,\n ): TransportMessage<Payload> {\n const msg = {\n ...partialMsg,\n id: unsafeId(),\n to: this.to,\n from: this.from,\n seq: this.seq,\n ack: this.ack,\n };\n\n this.seq++;\n this.sendBuffer.push(msg);\n return msg;\n }\n\n inspectSendBuffer(): ReadonlyArray<OpaqueTransportMessage> {\n return this.sendBuffer;\n }\n}\n","import { NaiveJsonCodec } from '../codec/json';\nimport { ConnectionRetryOptions } from './rateLimit';\nimport { SessionOptions } from './session';\n\nexport type TransportOptions = SessionOptions;\n\nexport type ProvidedTransportOptions = Partial<TransportOptions>;\n\nexport const defaultTransportOptions: TransportOptions = {\n heartbeatIntervalMs: 1_000,\n heartbeatsUntilDead: 2,\n sessionDisconnectGraceMs: 5_000,\n codec: NaiveJsonCodec,\n};\n\nexport type ClientTransportOptions = TransportOptions & ConnectionRetryOptions;\n\nexport type ProvidedClientTransportOptions = Partial<ClientTransportOptions>;\n\nconst defaultConnectionRetryOptions: ConnectionRetryOptions = {\n baseIntervalMs: 250,\n maxJitterMs: 200,\n maxBackoffMs: 32_000,\n attemptBudgetCapacity: 5,\n budgetRestoreIntervalMs: 200,\n};\n\nexport const defaultClientTransportOptions: ClientTransportOptions = {\n ...defaultTransportOptions,\n ...defaultConnectionRetryOptions,\n};\n\nexport type ServerTransportOptions = TransportOptions;\n\nexport type ProvidedServerTransportOptions = Partial<ServerTransportOptions>;\n\nexport const defaultServerTransportOptions: ServerTransportOptions = {\n ...defaultTransportOptions,\n};\n"],"mappings":";;;;;;;;AAAA,SAAS,sBAAsB;AAiB/B,SAAS,sBAAsB;AAE/B,IAAM,SAAS,eAAe,uCAAuC,CAAC;AAC/D,IAAM,WAAW,MAAM,OAAO;AAU9B,IAAe,aAAf,MAA0B;AAAA,EAC/B;AAAA,EACA;AAAA,EACA,cAAc;AACZ,SAAK,KAAK,QAAQ,OAAO,EAAE,CAAC;AAAA,EAC9B;AAAA,EAEA,IAAI,kBAAmC;AACrC,UAAM,WAA4B,EAAE,QAAQ,KAAK,GAAG;AACpD,UAAM,cAAc,KAAK,WAAW,KAAK,YAAY;AAErD,QAAI,KAAK,WAAW,KAAK,YAAY,KAAK,aAAa;AACrD,eAAS,YAAY;AAAA,QACnB,SAAS,YAAY;AAAA,QACrB,QAAQ,YAAY;AAAA,MACtB;AAAA,IACF;AAEA,WAAO;AAAA,EACT;AAwCF;AA6BO,IAAM,UAAN,MAA2C;AAAA,EACxC;AAAA,EACA;AAAA,EACC;AAAA;AAAA;AAAA;AAAA,EAKD,aAA4C,CAAC;AAAA;AAAA;AAAA;AAAA,EAKrD;AAAA;AAAA;AAAA;AAAA;AAAA,EAKQ;AAAA,EACC;AAAA,EACA;AAAA;AAAA;AAAA;AAAA,EAKA;AAAA;AAAA;AAAA;AAAA;AAAA,EAMT;AAAA;AAAA;AAAA;AAAA,EAKQ,MAAsB;AAAA;AAAA;AAAA;AAAA,EAKtB,MAAsB;AAAA;AAAA;AAAA;AAAA;AAAA,EAMtB;AAAA;AAAA;AAAA;AAAA,EAKA;AAAA;AAAA;AAAA;AAAA,EAKA;AAAA,EACA;AAAA,EAER,YACE,MACA,MACA,IACA,SACA,gBACA;AACA,SAAK,KAAK,WAAW,OAAO,EAAE,CAAC;AAC/B,SAAK,UAAU;AACf,SAAK,OAAO;AACZ,SAAK,KAAK;AACV,SAAK,aAAa;AAClB,SAAK,QAAQ,QAAQ;AAGrB,SAAK,kBAAkB;AACvB,SAAK,YAAY;AAAA,MACf,MAAM,KAAK,cAAc;AAAA,MACzB,QAAQ;AAAA,IACV;AACA,SAAK,YAAY,2BAA2B,MAAM,cAAc;AAAA,EAClE;AAAA,EAEA,WAAW,KAAa;AACtB,SAAK,MAAM;AAAA,EACb;AAAA,EAEA,IAAI,kBAAmC;AACrC,UAAM,cAAc,KAAK,UAAU,KAAK,YAAY;AAEpD,WAAO;AAAA,MACL,UAAU,KAAK;AAAA,MACf,aAAa,KAAK;AAAA,MAClB,WAAW,KAAK;AAAA,MAChB,QAAQ,KAAK,YAAY;AAAA,MACzB,WAAW;AAAA,QACT,SAAS,YAAY;AAAA,QACrB,QAAQ,YAAY;AAAA,MACtB;AAAA,IACF;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAUA,KAAK,KAAsC;AACzC,UAAM,UAA4B,KAAK,aAAa,GAAG;AACvD,SAAK,KAAK,MAAM,eAAe;AAAA,MAC7B,GAAG,KAAK;AAAA,MACR,kBAAkB;AAAA,IACpB,CAAC;AAED,QAAI,KAAK,YAAY;AACnB,YAAM,KAAK,KAAK,WAAW,KAAK,KAAK,MAAM,SAAS,OAAO,CAAC;AAC5D,UAAI;AAAI,eAAO,QAAQ;AACvB,WAAK,KAAK;AAAA,QACR,yBAAyB,QAAQ,EAAE;AAAA,QACnC;AAAA,UACE,GAAG,KAAK;AAAA,UACR,kBAAkB;AAAA,QACpB;AAAA,MACF;AAAA,IACF,OAAO;AACL,WAAK,KAAK;AAAA,QACR,oBAAoB,QAAQ,EAAE;AAAA,QAC9B,EAAE,GAAG,KAAK,iBAAiB,kBAAkB,QAAQ;AAAA,MACvD;AAAA,IACF;AAEA,WAAO,QAAQ;AAAA,EACjB;AAAA,EAEA,gBAAgB;AACd,UAAM,SAAS,KAAK;AACpB,UAAM,eAAe,SAAS,KAAK,QAAQ;AAC3C,QAAI,SAAS,KAAK,QAAQ,qBAAqB;AAC7C,UAAI,KAAK,YAAY;AACnB,aAAK,KAAK;AAAA,UACR,yBAAyB,KAAK,EAAE,8BAA8B,MAAM,wBAAwB,YAAY;AAAA,UACxG,KAAK;AAAA,QACP;AACA,aAAK,UAAU,KAAK,SAAS,sCAAsC;AACnE,aAAK,qBAAqB;AAAA,MAC5B;AACA;AAAA,IACF;AAEA,SAAK,KAAK;AAAA,MACR,UAAU;AAAA,MACV;AAAA,MACA,SAAS;AAAA,QACP,MAAM;AAAA,MACR;AAAA,IACF,CAAC;AACD,SAAK;AAAA,EACP;AAAA,EAEA,wBAAwB;AACtB,SAAK,aAAa,CAAC;AACnB,SAAK,MAAM;AACX,SAAK,MAAM;AAAA,EACb;AAAA,EAEA,qBAAqB,MAAgB;AACnC,SAAK,KAAK,KAAK,aAAa,KAAK,WAAW,MAAM,sBAAsB;AAAA,MACtE,GAAG,KAAK;AAAA,MACR,QAAQ,KAAK;AAAA,IACf,CAAC;AACD,eAAW,OAAO,KAAK,YAAY;AACjC,WAAK,KAAK,MAAM,iBAAiB;AAAA,QAC/B,GAAG,KAAK;AAAA,QACR,kBAAkB;AAAA,QAClB,QAAQ,KAAK;AAAA,MACf,CAAC;AACD,YAAM,KAAK,KAAK,KAAK,KAAK,MAAM,SAAS,GAAG,CAAC;AAC7C,UAAI,CAAC,IAAI;AAGP,cAAM,SAAS,sCAAsC,KAAK,EAAE;AAC5D,aAAK,WAAW,KAAK,UAAU;AAAA,UAC7B,MAAM,eAAe;AAAA,UACrB,SAAS;AAAA,QACX,CAAC;AAED,aAAK,KAAK,MAAM,QAAQ;AAAA,UACtB,GAAG,KAAK;AAAA,UACR,kBAAkB;AAAA,UAClB,QAAQ,KAAK;AAAA,UACb,MAAM,CAAC,qBAAqB;AAAA,QAC9B,CAAC;AACD,aAAK,MAAM;AACX;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,kBAAkB,KAAa,KAAa;AAC1C,QAAI,MAAM,IAAI,KAAK,KAAK;AACtB,WAAK,KAAK,MAAM,sBAAsB,GAAG,UAAU,KAAK,GAAG,IAAI;AAAA,QAC7D,GAAG,KAAK;AAAA,QACR,MAAM,CAAC,qBAAqB;AAAA,MAC9B,CAAC;AACD;AAAA,IACF;AAEA,SAAK,aAAa,KAAK,WAAW,OAAO,CAAC,YAAY,QAAQ,OAAO,GAAG;AACxE,SAAK,MAAM,MAAM;AAAA,EACnB;AAAA,EAEQ,qBAAqB,MAAiB;AAC5C,QAAI,KAAK,eAAe,UAAa,KAAK,eAAe;AAAM;AAC/D,SAAK,KAAK;AAAA,MACR,gDAAgD,KAAK,EAAE;AAAA,MACvD,KAAK;AAAA,IACP;AACA,SAAK,WAAW,MAAM;AACtB,SAAK,aAAa;AAAA,EACpB;AAAA,EAEA,yBAAyB,SAAmB,wBAAiC;AAC3E,SAAK,qBAAqB,OAAO;AACjC,SAAK,YAAY;AACjB,QAAI,wBAAwB;AAK1B,WAAK,qBAAqB,OAAO;AAAA,IACnC;AACA,SAAK,aAAa;AAKlB,SAAK,wBAAwB;AAAA,EAC/B;AAAA,EAEA,oCAAoC,SAAmB;AACrD,SAAK,wBAAwB;AAAA,EAC/B;AAAA,EAEA,WAAW,IAAgB;AACzB,SAAK,KAAK;AAAA,MACR,YAAY,KAAK,QAAQ,wBAAwB,oCAAoC,KAAK,EAAE;AAAA,MAC5F,KAAK;AAAA,IACP;AAGA,SAAK,YAAY;AACjB,SAAK,qBAAqB,WAAW,MAAM;AACzC,WAAK,KAAK;AAAA,QACR,oBAAoB,KAAK,EAAE;AAAA,QAC3B,KAAK;AAAA,MACP;AACA,SAAG;AAAA,IACL,GAAG,KAAK,QAAQ,wBAAwB;AAAA,EAC1C;AAAA;AAAA,EAGA,cAAc;AACZ,SAAK,kBAAkB;AACvB,iBAAa,KAAK,kBAAkB;AACpC,SAAK,qBAAqB;AAAA,EAC5B;AAAA;AAAA;AAAA;AAAA,EAKA,2BAA2B,yBAAoC;AAC7D,QAAI,KAAK,0BAA0B;AAAW;AAC9C,QACE,4BAA4B,UAC5B,KAAK,0BAA0B,yBAC/B;AAEA;AAAA,IACF;AACA,SAAK,sBAAsB,MAAM;AACjC,SAAK,wBAAwB;AAAA,EAC/B;AAAA;AAAA;AAAA,EAIA,QAAQ;AACN,SAAK,qBAAqB;AAC1B,SAAK,YAAY;AACjB,SAAK,sBAAsB;AAC3B,kBAAc,KAAK,SAAS;AAAA,EAC9B;AAAA,EAEA,IAAI,YAAY;AACd,WAAO,KAAK,eAAe;AAAA,EAC7B;AAAA,EAEA,IAAI,kBAAkB;AACpB,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,IAAI,kBAAkB;AACpB,WAAO,KAAK;AAAA,EACd;AAAA;AAAA;AAAA,EAGgB,qBAAqB,IAAY;AAC/C,SAAK,OAAO;AAAA,EACd;AAAA,EAEA,aACE,YAC2B;AAC3B,UAAM,MAAM;AAAA,MACV,GAAG;AAAA,MACH,IAAI,SAAS;AAAA,MACb,IAAI,KAAK;AAAA,MACT,MAAM,KAAK;AAAA,MACX,KAAK,KAAK;AAAA,MACV,KAAK,KAAK;AAAA,IACZ;AAEA,SAAK;AACL,SAAK,WAAW,KAAK,GAAG;AACxB,WAAO;AAAA,EACT;AAAA,EAEA,oBAA2D;AACzD,WAAO,KAAK;AAAA,EACd;AACF;;;AC1bO,IAAM,0BAA4C;AAAA,EACvD,qBAAqB;AAAA,EACrB,qBAAqB;AAAA,EACrB,0BAA0B;AAAA,EAC1B,OAAO;AACT;AAMA,IAAM,gCAAwD;AAAA,EAC5D,gBAAgB;AAAA,EAChB,aAAa;AAAA,EACb,cAAc;AAAA,EACd,uBAAuB;AAAA,EACvB,yBAAyB;AAC3B;AAEO,IAAM,gCAAwD;AAAA,EACnE,GAAG;AAAA,EACH,GAAG;AACL;AAMO,IAAM,gCAAwD;AAAA,EACnE,GAAG;AACL;","names":[]}
@@ -6,7 +6,7 @@ import {
6
6
  getPropagationContext,
7
7
  isStreamClose,
8
8
  isStreamOpen
9
- } from "./chunk-ES4XO2XD.js";
9
+ } from "./chunk-OXVWMLID.js";
10
10
 
11
11
  // router/services.ts
12
12
  import { Type } from "@sinclair/typebox";
@@ -1862,4 +1862,4 @@ export {
1862
1862
  createClientHandshakeOptions,
1863
1863
  createServerHandshakeOptions
1864
1864
  };
1865
- //# sourceMappingURL=chunk-KFTGQ3QC.js.map
1865
+ //# sourceMappingURL=chunk-AEY7BBOZ.js.map
@@ -1,17 +1,18 @@
1
1
  import {
2
2
  ProtocolError,
3
3
  Transport
4
- } from "./chunk-XM656KMN.js";
4
+ } from "./chunk-MD4S7GO2.js";
5
5
  import {
6
6
  defaultClientTransportOptions
7
- } from "./chunk-2FNLANTJ.js";
7
+ } from "./chunk-5HK7ZQYH.js";
8
8
  import {
9
9
  ControlMessageHandshakeResponseSchema,
10
+ SESSION_STATE_MISMATCH,
10
11
  coerceErrorString,
11
12
  getPropagationContext,
12
13
  handshakeRequestMessage,
13
14
  tracing_default
14
- } from "./chunk-ES4XO2XD.js";
15
+ } from "./chunk-OXVWMLID.js";
15
16
 
16
17
  // transport/client.ts
17
18
  import { SpanStatusCode } from "@opentelemetry/api";
@@ -230,24 +231,40 @@ var ClientTransport = class extends Transport {
230
231
  );
231
232
  return false;
232
233
  }
234
+ const previousSession = this.sessions.get(parsed.from);
233
235
  if (!parsed.payload.status.ok) {
234
- conn.telemetry?.span.setStatus({
235
- code: SpanStatusCode.ERROR,
236
- message: "handshake rejected"
237
- });
238
- this.log?.warn(`received handshake rejection`, {
239
- ...conn.loggingMetadata,
240
- clientId: this.clientId,
241
- connectedTo: parsed.from,
242
- transportMessage: parsed
243
- });
236
+ if (parsed.payload.status.reason === SESSION_STATE_MISMATCH) {
237
+ if (previousSession) {
238
+ this.deleteSession({
239
+ session: previousSession,
240
+ closeHandshakingConnection: true
241
+ });
242
+ }
243
+ conn.telemetry?.span.setStatus({
244
+ code: SpanStatusCode.ERROR,
245
+ message: parsed.payload.status.reason
246
+ });
247
+ } else {
248
+ conn.telemetry?.span.setStatus({
249
+ code: SpanStatusCode.ERROR,
250
+ message: "handshake rejected"
251
+ });
252
+ }
253
+ this.log?.warn(
254
+ `received handshake rejection: ${parsed.payload.status.reason}`,
255
+ {
256
+ ...conn.loggingMetadata,
257
+ clientId: this.clientId,
258
+ connectedTo: parsed.from,
259
+ transportMessage: parsed
260
+ }
261
+ );
244
262
  this.protocolError(
245
263
  ProtocolError.HandshakeFailed,
246
264
  parsed.payload.status.reason
247
265
  );
248
266
  return false;
249
267
  }
250
- const previousSession = this.sessions.get(parsed.from);
251
268
  if (previousSession?.advertisedSessionId && previousSession.advertisedSessionId !== parsed.payload.status.sessionId) {
252
269
  this.deleteSession({
253
270
  session: previousSession,
@@ -427,13 +444,17 @@ var ClientTransport = class extends Transport {
427
444
  }
428
445
  }
429
446
  const { session } = this.getOrCreateSession({ to, handshakingConn: conn });
430
- const requestMsg = handshakeRequestMessage(
431
- this.clientId,
447
+ const requestMsg = handshakeRequestMessage({
448
+ from: this.clientId,
432
449
  to,
433
- session.id,
450
+ sessionId: session.id,
451
+ expectedSessionState: {
452
+ reconnect: session.advertisedSessionId !== void 0,
453
+ nextExpectedSeq: session.nextExpectedSeq
454
+ },
434
455
  metadata,
435
- getPropagationContext(session.telemetry.ctx)
436
- );
456
+ tracing: getPropagationContext(session.telemetry.ctx)
457
+ });
437
458
  this.log?.debug(`sending handshake request to ${to}`, {
438
459
  ...conn.loggingMetadata,
439
460
  clientId: this.clientId,
@@ -452,4 +473,4 @@ var ClientTransport = class extends Transport {
452
473
  export {
453
474
  ClientTransport
454
475
  };
455
- //# sourceMappingURL=chunk-S4DUN7KK.js.map
476
+ //# sourceMappingURL=chunk-IJTGEBLG.js.map
@@ -0,0 +1 @@
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 SESSION_STATE_MISMATCH,\n TransportClientId,\n handshakeRequestMessage,\n} from './message';\nimport {\n ClientTransportOptions,\n ProvidedClientTransportOptions,\n defaultClientTransportOptions,\n} from './options';\nimport { LeakyBucketRateLimit } from './rateLimit';\nimport { Connection, Session } from './session';\nimport { Transport } from './transport';\nimport { coerceErrorString } from '../util/stringify';\nimport { ProtocolError } from './events';\nimport { Value } from '@sinclair/typebox/value';\nimport tracer, { getPropagationContext } from '../tracing';\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 /**\n * The map of reconnect promises for each client ID.\n */\n inflightConnectionPromises: Map<TransportClientId, Promise<ConnType>>;\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.inflightConnectionPromises = new Map();\n this.retryBudget = new LeakyBucketRateLimit(this.options);\n }\n\n extendHandshake(options: ClientHandshakeOptions) {\n this.handshakeExtensions = options;\n }\n\n protected handleConnection(conn: ConnType, to: TransportClientId): void {\n if (this.getStatus() !== 'open') return;\n let session: Session<ConnType> | undefined = undefined;\n\n // kill the conn after the grace period if we haven't received a handshake\n const handshakeTimeout = setTimeout(() => {\n if (session) return;\n this.log?.warn(\n `connection to ${to} timed out waiting for handshake, closing`,\n { ...conn.loggingMetadata, clientId: this.clientId, connectedTo: to },\n );\n conn.close();\n }, this.options.sessionDisconnectGraceMs);\n\n const handshakeHandler = (data: Uint8Array) => {\n const maybeSession = this.receiveHandshakeResponseMessage(data, conn);\n clearTimeout(handshakeTimeout);\n if (!maybeSession) {\n conn.close();\n return;\n } else {\n session = maybeSession;\n }\n\n // when we are done handshake sequence,\n // remove handshake listener and use the normal message listener\n conn.removeDataListener(handshakeHandler);\n conn.addDataListener((data) => {\n const parsed = this.parseMsg(data, conn);\n if (!parsed) {\n conn.telemetry?.span.setStatus({\n code: SpanStatusCode.ERROR,\n message: 'message parse failure',\n });\n conn.close();\n return;\n }\n\n this.handleMsg(parsed, conn);\n });\n };\n\n conn.addDataListener(handshakeHandler);\n conn.addCloseListener(() => {\n if (session) {\n this.onDisconnect(conn, session);\n }\n\n const willReconnect =\n this.reconnectOnConnectionDrop && this.getStatus() === 'open';\n\n this.log?.info(\n `connection to ${to} disconnected` +\n (willReconnect ? ', reconnecting' : ''),\n {\n ...conn.loggingMetadata,\n ...session?.loggingMetadata,\n clientId: this.clientId,\n connectedTo: to,\n },\n );\n\n this.inflightConnectionPromises.delete(to);\n if (this.reconnectOnConnectionDrop) {\n void this.connect(to);\n }\n });\n conn.addErrorListener((err) => {\n conn.telemetry?.span.setStatus({\n code: SpanStatusCode.ERROR,\n message: 'connection error',\n });\n this.log?.warn(\n `error in connection to ${to}: ${coerceErrorString(err)}`,\n {\n ...conn.loggingMetadata,\n ...session?.loggingMetadata,\n clientId: this.clientId,\n connectedTo: to,\n },\n );\n });\n }\n\n receiveHandshakeResponseMessage(\n data: Uint8Array,\n conn: ConnType,\n ): Session<ConnType> | false {\n const parsed = this.parseMsg(data, conn);\n if (!parsed) {\n conn.telemetry?.span.setStatus({\n code: SpanStatusCode.ERROR,\n message: 'non-transport message',\n });\n this.protocolError(\n ProtocolError.HandshakeFailed,\n 'received non-transport message',\n );\n return false;\n }\n\n if (!Value.Check(ControlMessageHandshakeResponseSchema, parsed.payload)) {\n conn.telemetry?.span.setStatus({\n code: SpanStatusCode.ERROR,\n message: 'invalid handshake response',\n });\n this.log?.warn(`received invalid handshake resp`, {\n ...conn.loggingMetadata,\n clientId: this.clientId,\n connectedTo: parsed.from,\n transportMessage: parsed,\n validationErrors: [\n ...Value.Errors(\n ControlMessageHandshakeResponseSchema,\n parsed.payload,\n ),\n ],\n });\n this.protocolError(\n ProtocolError.HandshakeFailed,\n 'invalid handshake resp',\n );\n return false;\n }\n\n const previousSession = this.sessions.get(parsed.from);\n if (!parsed.payload.status.ok) {\n if (parsed.payload.status.reason === SESSION_STATE_MISMATCH) {\n if (previousSession) {\n // The server has told us that we cannot continue with the session because it has the\n // wrong state. We should delete this session and start fresh.\n this.deleteSession({\n session: previousSession,\n closeHandshakingConnection: true,\n });\n }\n\n conn.telemetry?.span.setStatus({\n code: SpanStatusCode.ERROR,\n message: parsed.payload.status.reason,\n });\n } else {\n conn.telemetry?.span.setStatus({\n code: SpanStatusCode.ERROR,\n message: 'handshake rejected',\n });\n }\n this.log?.warn(\n `received handshake rejection: ${parsed.payload.status.reason}`,\n {\n ...conn.loggingMetadata,\n clientId: this.clientId,\n connectedTo: parsed.from,\n transportMessage: parsed,\n },\n );\n this.protocolError(\n ProtocolError.HandshakeFailed,\n parsed.payload.status.reason,\n );\n return false;\n }\n\n // before we claim victory and we deem that the handshake is fully established, check that our\n // session matches the remote's. if they do not match, proactively close the connection.\n // otherwise we will end up breaking a lot of invariants.\n //\n // TODO: Remove this once we finish rolling out the handshake-initiated session agreement.\n if (\n previousSession?.advertisedSessionId &&\n previousSession.advertisedSessionId !== parsed.payload.status.sessionId\n ) {\n this.deleteSession({\n session: previousSession,\n closeHandshakingConnection: true,\n });\n\n conn.telemetry?.span.setStatus({\n code: SpanStatusCode.ERROR,\n message: 'session id mismatch',\n });\n this.log?.warn(`handshake from ${parsed.from} session id mismatch`, {\n ...conn.loggingMetadata,\n clientId: this.clientId,\n connectedTo: parsed.from,\n transportMessage: parsed,\n });\n this.protocolError(ProtocolError.HandshakeFailed, 'session id mismatch');\n return false;\n }\n\n this.log?.debug(`handshake from ${parsed.from} ok`, {\n ...conn.loggingMetadata,\n clientId: this.clientId,\n connectedTo: parsed.from,\n transportMessage: parsed,\n });\n\n const { session, isTransparentReconnect } = this.getOrCreateSession({\n to: parsed.from,\n conn,\n sessionId: parsed.payload.status.sessionId,\n });\n\n this.onConnect(conn, session, isTransparentReconnect);\n\n // After a successful connection, we start restoring the budget\n // so that the next time we try to connect, we don't hit the client\n // with backoff forever.\n this.retryBudget.startRestoringBudget(session.to);\n return session;\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 /**\n * Manually attempts to connect to a client.\n * @param to The client ID of the node to connect to.\n */\n async connect(to: TransportClientId): Promise<void> {\n if (this.connections.has(to)) {\n this.log?.info(`already connected to ${to}, skipping connect attempt`, {\n clientId: this.clientId,\n connectedTo: to,\n });\n return;\n }\n\n const canProceedWithConnection = () => this.getStatus() === 'open';\n if (!canProceedWithConnection()) {\n this.log?.info(\n `transport state is no longer open, cancelling attempt to connect to ${to}`,\n { clientId: this.clientId, connectedTo: to },\n );\n return;\n }\n\n let reconnectPromise = this.inflightConnectionPromises.get(to);\n if (!reconnectPromise) {\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, { clientId: this.clientId, connectedTo: to });\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 {\n clientId: this.clientId,\n connectedTo: to,\n },\n );\n this.retryBudget.consumeBudget(to);\n reconnectPromise = tracer.startActiveSpan('connect', async (span) => {\n try {\n span.addEvent('backoff', { backoffMs });\n await sleep;\n if (!canProceedWithConnection()) {\n throw new Error('transport state is no longer open');\n }\n\n span.addEvent('connecting');\n const conn = await this.createNewOutgoingConnection(to);\n if (!canProceedWithConnection()) {\n this.log?.info(\n `transport state is no longer open, closing pre-handshake connection to ${to}`,\n {\n ...conn.loggingMetadata,\n clientId: this.clientId,\n connectedTo: to,\n },\n );\n conn.close();\n throw new Error('transport state is no longer open');\n }\n\n span.addEvent('sending handshake');\n const ok = await this.sendHandshake(to, conn);\n if (!ok) {\n conn.close();\n throw new Error('failed to send handshake');\n }\n\n return conn;\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 this.inflightConnectionPromises.set(to, reconnectPromise);\n } else {\n this.log?.info(\n `attempting connection to ${to} (reusing previous attempt)`,\n {\n clientId: this.clientId,\n connectedTo: to,\n },\n );\n }\n\n try {\n await reconnectPromise;\n } catch (error: unknown) {\n this.inflightConnectionPromises.delete(to);\n const errStr = coerceErrorString(error);\n\n if (!this.reconnectOnConnectionDrop || !canProceedWithConnection()) {\n this.log?.warn(`connection to ${to} failed (${errStr})`, {\n clientId: this.clientId,\n connectedTo: to,\n });\n } else {\n this.log?.warn(`connection to ${to} failed (${errStr}), retrying`, {\n clientId: this.clientId,\n connectedTo: to,\n });\n await this.connect(to);\n }\n }\n }\n\n protected deleteSession({\n session,\n closeHandshakingConnection,\n handshakingConn,\n }: {\n session: Session<ConnType>;\n closeHandshakingConnection: boolean;\n handshakingConn?: ConnType;\n }) {\n this.inflightConnectionPromises.delete(session.to);\n super.deleteSession({\n session,\n closeHandshakingConnection,\n handshakingConn,\n });\n }\n\n protected async sendHandshake(to: TransportClientId, conn: ConnType) {\n let metadata: unknown = undefined;\n\n if (this.handshakeExtensions) {\n metadata = await this.handshakeExtensions.construct();\n if (!Value.Check(this.handshakeExtensions.schema, metadata)) {\n this.log?.error(`constructed handshake metadata did not match schema`, {\n ...conn.loggingMetadata,\n clientId: this.clientId,\n connectedTo: to,\n validationErrors: [\n ...Value.Errors(this.handshakeExtensions.schema, metadata),\n ],\n tags: ['invariant-violation'],\n });\n this.protocolError(\n ProtocolError.HandshakeFailed,\n 'handshake metadata did not match schema',\n );\n conn.telemetry?.span.setStatus({\n code: SpanStatusCode.ERROR,\n message: 'handshake meta mismatch',\n });\n return false;\n }\n }\n\n // don't pass conn here as we dont want the session to start using the conn\n // until we have finished the handshake. Still, let the session know that\n // it is semi-associated with the conn, and it can close it if .close() is called.\n const { session } = this.getOrCreateSession({ to, handshakingConn: conn });\n const requestMsg = handshakeRequestMessage({\n from: this.clientId,\n to,\n sessionId: session.id,\n expectedSessionState: {\n reconnect: session.advertisedSessionId !== undefined,\n nextExpectedSeq: session.nextExpectedSeq,\n },\n metadata,\n tracing: getPropagationContext(session.telemetry.ctx),\n });\n this.log?.debug(`sending handshake request to ${to}`, {\n ...conn.loggingMetadata,\n clientId: this.clientId,\n connectedTo: to,\n transportMessage: requestMsg,\n });\n conn.send(this.codec.toBuffer(requestMsg));\n return true;\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":["data"]}
@@ -1,16 +1,17 @@
1
1
  import {
2
2
  ProtocolError,
3
3
  Transport
4
- } from "./chunk-XM656KMN.js";
4
+ } from "./chunk-MD4S7GO2.js";
5
5
  import {
6
6
  defaultServerTransportOptions
7
- } from "./chunk-2FNLANTJ.js";
7
+ } from "./chunk-5HK7ZQYH.js";
8
8
  import {
9
9
  ControlMessageHandshakeRequestSchema,
10
10
  PROTOCOL_VERSION,
11
+ SESSION_STATE_MISMATCH,
11
12
  coerceErrorString,
12
13
  handshakeResponseMessage
13
- } from "./chunk-ES4XO2XD.js";
14
+ } from "./chunk-OXVWMLID.js";
14
15
 
15
16
  // transport/server.ts
16
17
  import { SpanStatusCode } from "@opentelemetry/api";
@@ -134,9 +135,13 @@ var ServerTransport = class extends Transport {
134
135
  message: "malformed handshake meta"
135
136
  });
136
137
  const reason = "received malformed handshake metadata";
137
- const responseMsg = handshakeResponseMessage(this.clientId, from, {
138
- ok: false,
139
- reason
138
+ const responseMsg = handshakeResponseMessage({
139
+ from: this.clientId,
140
+ to: from,
141
+ status: {
142
+ ok: false,
143
+ reason
144
+ }
140
145
  });
141
146
  conn.send(this.codec.toBuffer(responseMsg));
142
147
  this.log?.warn(`received malformed handshake metadata from ${from}`, {
@@ -160,9 +165,13 @@ var ServerTransport = class extends Transport {
160
165
  code: SpanStatusCode.ERROR,
161
166
  message: reason
162
167
  });
163
- const responseMsg = handshakeResponseMessage(this.clientId, from, {
164
- ok: false,
165
- reason
168
+ const responseMsg = handshakeResponseMessage({
169
+ from: this.clientId,
170
+ to: from,
171
+ status: {
172
+ ok: false,
173
+ reason
174
+ }
166
175
  });
167
176
  conn.send(this.codec.toBuffer(responseMsg));
168
177
  this.log?.warn(`rejected handshake from ${from}`, {
@@ -194,9 +203,13 @@ var ServerTransport = class extends Transport {
194
203
  message: "invalid handshake request"
195
204
  });
196
205
  const reason = "received invalid handshake msg";
197
- const responseMsg2 = handshakeResponseMessage(this.clientId, parsed.from, {
198
- ok: false,
199
- reason
206
+ const responseMsg2 = handshakeResponseMessage({
207
+ from: this.clientId,
208
+ to: parsed.from,
209
+ status: {
210
+ ok: false,
211
+ reason
212
+ }
200
213
  });
201
214
  conn.send(this.codec.toBuffer(responseMsg2));
202
215
  this.log?.warn(reason, {
@@ -222,9 +235,13 @@ var ServerTransport = class extends Transport {
222
235
  message: "incorrect protocol version"
223
236
  });
224
237
  const reason = `incorrect version (got: ${gotVersion} wanted ${PROTOCOL_VERSION})`;
225
- const responseMsg2 = handshakeResponseMessage(this.clientId, parsed.from, {
226
- ok: false,
227
- reason
238
+ const responseMsg2 = handshakeResponseMessage({
239
+ from: this.clientId,
240
+ to: parsed.from,
241
+ status: {
242
+ ok: false,
243
+ reason
244
+ }
228
245
  });
229
246
  conn.send(this.codec.toBuffer(responseMsg2));
230
247
  this.log?.warn(
@@ -244,20 +261,67 @@ var ServerTransport = class extends Transport {
244
261
  if (parsedMetadata === false) {
245
262
  return false;
246
263
  }
247
- const { session, isTransparentReconnect } = this.getOrCreateSession({
248
- to: parsed.from,
249
- conn,
250
- sessionId: parsed.payload.sessionId,
251
- propagationCtx: parsed.tracing
252
- });
264
+ let session;
265
+ let isTransparentReconnect;
266
+ if (!parsed.payload.expectedSessionState) {
267
+ ({ session, isTransparentReconnect } = this.getOrCreateSession({
268
+ to: parsed.from,
269
+ conn,
270
+ sessionId: parsed.payload.sessionId,
271
+ propagationCtx: parsed.tracing
272
+ }));
273
+ } else if (parsed.payload.expectedSessionState.reconnect) {
274
+ const existingSession = this.getExistingSession({
275
+ to: parsed.from,
276
+ sessionId: parsed.payload.sessionId,
277
+ nextExpectedSeq: parsed.payload.expectedSessionState.nextExpectedSeq
278
+ });
279
+ if (existingSession === false) {
280
+ conn.telemetry?.span.setStatus({
281
+ code: SpanStatusCode.ERROR,
282
+ message: SESSION_STATE_MISMATCH
283
+ });
284
+ const reason = SESSION_STATE_MISMATCH;
285
+ const responseMsg2 = handshakeResponseMessage({
286
+ from: this.clientId,
287
+ to: parsed.from,
288
+ status: {
289
+ ok: false,
290
+ reason
291
+ }
292
+ });
293
+ conn.send(this.codec.toBuffer(responseMsg2));
294
+ this.log?.warn(
295
+ `'received handshake msg with incompatible existing session state: ${parsed.payload.sessionId}`,
296
+ { ...conn.loggingMetadata, clientId: this.clientId }
297
+ );
298
+ this.protocolError(ProtocolError.HandshakeFailed, reason);
299
+ return false;
300
+ }
301
+ session = existingSession;
302
+ isTransparentReconnect = false;
303
+ } else {
304
+ const createdSession = this.createNewSession({
305
+ to: parsed.from,
306
+ conn,
307
+ sessionId: parsed.payload.sessionId,
308
+ propagationCtx: parsed.tracing
309
+ });
310
+ session = createdSession;
311
+ isTransparentReconnect = false;
312
+ }
253
313
  this.sessionHandshakeMetadata.set(session, parsedMetadata);
254
314
  this.log?.debug(
255
315
  `handshake from ${parsed.from} ok, responding with handshake success`,
256
316
  conn.loggingMetadata
257
317
  );
258
- const responseMsg = handshakeResponseMessage(this.clientId, parsed.from, {
259
- ok: true,
260
- sessionId: session.id
318
+ const responseMsg = handshakeResponseMessage({
319
+ from: this.clientId,
320
+ to: parsed.from,
321
+ status: {
322
+ ok: true,
323
+ sessionId: session.id
324
+ }
261
325
  });
262
326
  conn.send(this.codec.toBuffer(responseMsg));
263
327
  this.onConnect(conn, session, isTransparentReconnect);
@@ -268,4 +332,4 @@ var ServerTransport = class extends Transport {
268
332
  export {
269
333
  ServerTransport
270
334
  };
271
- //# sourceMappingURL=chunk-ZUKDZY54.js.map
335
+ //# sourceMappingURL=chunk-JMVKSGND.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../transport/server.ts"],"sourcesContent":["import { SpanStatusCode } from '@opentelemetry/api';\nimport { ParsedMetadata } from '../router/context';\nimport { ServerHandshakeOptions } from '../router/handshake';\nimport {\n ControlMessageHandshakeRequestSchema,\n PROTOCOL_VERSION,\n SESSION_STATE_MISMATCH,\n TransportClientId,\n handshakeResponseMessage,\n} from './message';\nimport {\n ProvidedServerTransportOptions,\n ServerTransportOptions,\n defaultServerTransportOptions,\n} from './options';\nimport { Connection, Session } from './session';\nimport { Transport } from './transport';\nimport { coerceErrorString } from '../util/stringify';\nimport { Static } from '@sinclair/typebox';\nimport { Value } from '@sinclair/typebox/value';\nimport { ProtocolError } from './events';\n\nexport abstract class ServerTransport<\n ConnType extends Connection,\n> extends Transport<ConnType> {\n /**\n * The options for this transport.\n */\n protected options: ServerTransportOptions;\n\n /**\n * Optional handshake options for the server.\n */\n handshakeExtensions?: ServerHandshakeOptions;\n\n /**\n * A map of session handshake data for each session.\n */\n sessionHandshakeMetadata: WeakMap<Session<ConnType>, ParsedMetadata>;\n\n constructor(\n clientId: TransportClientId,\n providedOptions?: ProvidedServerTransportOptions,\n ) {\n super(clientId, providedOptions);\n this.options = {\n ...defaultServerTransportOptions,\n ...providedOptions,\n };\n this.sessionHandshakeMetadata = new WeakMap();\n this.log?.info(`initiated server transport`, {\n clientId: this.clientId,\n protocolVersion: PROTOCOL_VERSION,\n });\n }\n\n extendHandshake(options: ServerHandshakeOptions) {\n this.handshakeExtensions = options;\n }\n\n protected handleConnection(conn: ConnType) {\n if (this.getStatus() !== 'open') return;\n\n this.log?.info(`new incoming connection`, {\n ...conn.loggingMetadata,\n clientId: this.clientId,\n });\n\n let session: Session<ConnType> | undefined = undefined;\n const client = () => session?.to ?? 'unknown';\n\n // kill the conn after the grace period if we haven't received a handshake\n const handshakeTimeout = setTimeout(() => {\n if (!session) {\n this.log?.warn(\n `connection to ${client()} timed out waiting for handshake, closing`,\n {\n ...conn.loggingMetadata,\n clientId: this.clientId,\n connectedTo: client(),\n },\n );\n conn.telemetry?.span.setStatus({\n code: SpanStatusCode.ERROR,\n message: 'handshake timeout',\n });\n conn.close();\n }\n }, this.options.sessionDisconnectGraceMs);\n\n const buffer: Array<Uint8Array> = [];\n let receivedHandshakeMessage = false;\n\n const handshakeHandler = (data: Uint8Array) => {\n // if we've already received, just buffer the data\n if (receivedHandshakeMessage) {\n buffer.push(data);\n return;\n }\n\n receivedHandshakeMessage = true;\n clearTimeout(handshakeTimeout);\n\n void this.receiveHandshakeRequestMessage(data, conn).then(\n (maybeSession) => {\n if (!maybeSession) {\n conn.close();\n return;\n }\n\n session = maybeSession;\n\n // when we are done handshake sequence,\n // remove handshake listener and use the normal message listener\n const dataHandler = (data: Uint8Array) => {\n const parsed = this.parseMsg(data, conn);\n if (!parsed) {\n conn.close();\n return;\n }\n\n this.handleMsg(parsed, conn);\n };\n\n // process any data we missed\n for (const data of buffer) {\n dataHandler(data);\n }\n\n conn.removeDataListener(handshakeHandler);\n conn.addDataListener(dataHandler);\n buffer.length = 0;\n },\n );\n };\n\n conn.addDataListener(handshakeHandler);\n conn.addCloseListener(() => {\n if (!session) return;\n this.log?.info(`connection to ${client()} disconnected`, {\n ...conn.loggingMetadata,\n clientId: this.clientId,\n });\n this.onDisconnect(conn, session);\n });\n\n conn.addErrorListener((err) => {\n conn.telemetry?.span.setStatus({\n code: SpanStatusCode.ERROR,\n message: 'connection error',\n });\n if (!session) return;\n this.log?.warn(\n `connection to ${client()} got an error: ${coerceErrorString(err)}`,\n { ...conn.loggingMetadata, clientId: this.clientId },\n );\n });\n }\n\n private async validateHandshakeMetadata(\n conn: ConnType,\n session: Session<ConnType> | undefined,\n rawMetadata: Static<\n typeof ControlMessageHandshakeRequestSchema\n >['metadata'],\n from: TransportClientId,\n ): Promise<ParsedMetadata | false> {\n let parsedMetadata: ParsedMetadata = {};\n if (this.handshakeExtensions) {\n // check that the metadata that was sent is the correct shape\n if (!Value.Check(this.handshakeExtensions.schema, rawMetadata)) {\n conn.telemetry?.span.setStatus({\n code: SpanStatusCode.ERROR,\n message: 'malformed handshake meta',\n });\n const reason = 'received malformed handshake metadata';\n const responseMsg = handshakeResponseMessage({\n from: this.clientId,\n to: from,\n status: {\n ok: false,\n reason,\n },\n });\n conn.send(this.codec.toBuffer(responseMsg));\n this.log?.warn(`received malformed handshake metadata from ${from}`, {\n ...conn.loggingMetadata,\n clientId: this.clientId,\n validationErrors: [\n ...Value.Errors(this.handshakeExtensions.schema, rawMetadata),\n ],\n });\n this.protocolError(ProtocolError.HandshakeFailed, reason);\n return false;\n }\n\n const previousParsedMetadata = session\n ? this.sessionHandshakeMetadata.get(session)\n : undefined;\n\n parsedMetadata = await this.handshakeExtensions.validate(\n rawMetadata,\n previousParsedMetadata,\n );\n\n // handler rejected the connection\n if (parsedMetadata === false) {\n const reason = 'rejected by handshake handler';\n conn.telemetry?.span.setStatus({\n code: SpanStatusCode.ERROR,\n message: reason,\n });\n const responseMsg = handshakeResponseMessage({\n from: this.clientId,\n to: from,\n status: {\n ok: false,\n reason,\n },\n });\n conn.send(this.codec.toBuffer(responseMsg));\n this.log?.warn(`rejected handshake from ${from}`, {\n ...conn.loggingMetadata,\n clientId: this.clientId,\n });\n this.protocolError(ProtocolError.HandshakeFailed, reason);\n return false;\n }\n }\n\n return parsedMetadata;\n }\n\n async receiveHandshakeRequestMessage(\n data: Uint8Array,\n conn: ConnType,\n ): Promise<Session<ConnType> | false> {\n const parsed = this.parseMsg(data, conn);\n if (!parsed) {\n conn.telemetry?.span.setStatus({\n code: SpanStatusCode.ERROR,\n message: 'non-transport message',\n });\n this.protocolError(\n ProtocolError.HandshakeFailed,\n 'received non-transport message',\n );\n return false;\n }\n\n if (!Value.Check(ControlMessageHandshakeRequestSchema, parsed.payload)) {\n conn.telemetry?.span.setStatus({\n code: SpanStatusCode.ERROR,\n message: 'invalid handshake request',\n });\n const reason = 'received invalid handshake msg';\n const responseMsg = handshakeResponseMessage({\n from: this.clientId,\n to: parsed.from,\n status: {\n ok: false,\n reason,\n },\n });\n conn.send(this.codec.toBuffer(responseMsg));\n this.log?.warn(reason, {\n ...conn.loggingMetadata,\n clientId: this.clientId,\n // safe to this.log metadata here as we remove the payload\n // before passing it to user-land\n transportMessage: parsed,\n validationErrors: [\n ...Value.Errors(ControlMessageHandshakeRequestSchema, parsed.payload),\n ],\n });\n this.protocolError(\n ProtocolError.HandshakeFailed,\n 'invalid handshake request',\n );\n return false;\n }\n\n // double check protocol version here\n const gotVersion = parsed.payload.protocolVersion;\n if (gotVersion !== PROTOCOL_VERSION) {\n conn.telemetry?.span.setStatus({\n code: SpanStatusCode.ERROR,\n message: 'incorrect protocol version',\n });\n\n const reason = `incorrect version (got: ${gotVersion} wanted ${PROTOCOL_VERSION})`;\n const responseMsg = handshakeResponseMessage({\n from: this.clientId,\n to: parsed.from,\n status: {\n ok: false,\n reason,\n },\n });\n conn.send(this.codec.toBuffer(responseMsg));\n this.log?.warn(\n `received handshake msg with incompatible protocol version (got: ${gotVersion}, expected: ${PROTOCOL_VERSION})`,\n { ...conn.loggingMetadata, clientId: this.clientId },\n );\n this.protocolError(ProtocolError.HandshakeFailed, reason);\n return false;\n }\n\n const oldSession = this.sessions.get(parsed.from);\n const parsedMetadata = await this.validateHandshakeMetadata(\n conn,\n oldSession,\n parsed.payload.metadata,\n parsed.from,\n );\n\n if (parsedMetadata === false) {\n return false;\n }\n\n let session: Session<ConnType>;\n let isTransparentReconnect: boolean;\n if (!parsed.payload.expectedSessionState) {\n // TODO: remove once we have upgraded all clients.\n ({ session, isTransparentReconnect } = this.getOrCreateSession({\n to: parsed.from,\n conn,\n sessionId: parsed.payload.sessionId,\n propagationCtx: parsed.tracing,\n }));\n } else if (parsed.payload.expectedSessionState.reconnect) {\n // this has to be an existing session. if it doesn't match what we expect, reject the\n // handshake\n const existingSession = this.getExistingSession({\n to: parsed.from,\n sessionId: parsed.payload.sessionId,\n nextExpectedSeq: parsed.payload.expectedSessionState.nextExpectedSeq,\n });\n if (existingSession === false) {\n conn.telemetry?.span.setStatus({\n code: SpanStatusCode.ERROR,\n message: SESSION_STATE_MISMATCH,\n });\n\n const reason = SESSION_STATE_MISMATCH;\n const responseMsg = handshakeResponseMessage({\n from: this.clientId,\n to: parsed.from,\n status: {\n ok: false,\n reason,\n },\n });\n conn.send(this.codec.toBuffer(responseMsg));\n this.log?.warn(\n `'received handshake msg with incompatible existing session state: ${parsed.payload.sessionId}`,\n { ...conn.loggingMetadata, clientId: this.clientId },\n );\n this.protocolError(ProtocolError.HandshakeFailed, reason);\n return false;\n }\n session = existingSession;\n isTransparentReconnect = false;\n } else {\n // this has to be a new session. if one already exists, it will be replaced silently\n const createdSession = this.createNewSession({\n to: parsed.from,\n conn,\n sessionId: parsed.payload.sessionId,\n propagationCtx: parsed.tracing,\n });\n session = createdSession;\n isTransparentReconnect = false;\n }\n\n this.sessionHandshakeMetadata.set(session, parsedMetadata);\n\n this.log?.debug(\n `handshake from ${parsed.from} ok, responding with handshake success`,\n conn.loggingMetadata,\n );\n const responseMsg = handshakeResponseMessage({\n from: this.clientId,\n to: parsed.from,\n status: {\n ok: true,\n sessionId: session.id,\n },\n });\n conn.send(this.codec.toBuffer(responseMsg));\n this.onConnect(conn, session, isTransparentReconnect);\n\n return session;\n }\n}\n"],"mappings":"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","names":["data","responseMsg"]}
@@ -5,12 +5,12 @@ import {
5
5
  import {
6
6
  Session,
7
7
  defaultTransportOptions
8
- } from "./chunk-2FNLANTJ.js";
8
+ } from "./chunk-5HK7ZQYH.js";
9
9
  import {
10
10
  OpaqueTransportMessageSchema,
11
11
  createConnectionTelemetryInfo,
12
12
  isAck
13
- } from "./chunk-ES4XO2XD.js";
13
+ } from "./chunk-OXVWMLID.js";
14
14
 
15
15
  // transport/events.ts
16
16
  var ProtocolError = {
@@ -135,6 +135,20 @@ var Transport = class {
135
135
  if (this.log) {
136
136
  session.bindLogger(this.log);
137
137
  }
138
+ const currentSession = this.sessions.get(session.to);
139
+ if (currentSession) {
140
+ this.log?.warn(
141
+ `session ${session.id} from ${session.to} surreptitiously replacing ${currentSession.id}`,
142
+ {
143
+ ...currentSession.loggingMetadata,
144
+ tags: ["invariant-violation"]
145
+ }
146
+ );
147
+ this.deleteSession({
148
+ session: currentSession,
149
+ closeHandshakingConnection: false
150
+ });
151
+ }
138
152
  this.sessions.set(session.to, session);
139
153
  this.eventDispatcher.dispatchEvent("sessionStatus", {
140
154
  status: "connect",
@@ -142,6 +156,49 @@ var Transport = class {
142
156
  });
143
157
  return session;
144
158
  }
159
+ createNewSession({
160
+ to,
161
+ conn,
162
+ sessionId,
163
+ propagationCtx
164
+ }) {
165
+ let session = this.sessions.get(to);
166
+ if (session !== void 0) {
167
+ this.log?.info(
168
+ `session for ${to} already exists, replacing it with a new session as requested`,
169
+ session.loggingMetadata
170
+ );
171
+ this.deleteSession({
172
+ session,
173
+ closeHandshakingConnection: false
174
+ });
175
+ session = void 0;
176
+ }
177
+ session = this.createSession(to, conn, propagationCtx);
178
+ session.advertisedSessionId = sessionId;
179
+ this.log?.info(`created new session for ${to}`, session.loggingMetadata);
180
+ return session;
181
+ }
182
+ getExistingSession({
183
+ to,
184
+ sessionId,
185
+ nextExpectedSeq
186
+ }) {
187
+ const session = this.sessions.get(to);
188
+ if (
189
+ // reject this request if there was no previous session to replace
190
+ session === void 0 || // or if both parties do not agree about the next expected sequence number
191
+ session.nextExpectedAck < nextExpectedSeq || // or if both parties do not agree on the advertised session id
192
+ session.advertisedSessionId !== sessionId
193
+ ) {
194
+ return false;
195
+ }
196
+ this.log?.info(
197
+ `reused existing session for ${to}`,
198
+ session.loggingMetadata
199
+ );
200
+ return session;
201
+ }
145
202
  getOrCreateSession({
146
203
  to,
147
204
  conn,
@@ -190,6 +247,17 @@ var Transport = class {
190
247
  }
191
248
  session.close();
192
249
  session.telemetry.span.end();
250
+ const currentSession = this.sessions.get(session.to);
251
+ if (currentSession && currentSession.id !== session.id) {
252
+ this.log?.warn(
253
+ `session ${session.id} disconnect from ${session.to}, mismatch with ${currentSession.id}`,
254
+ {
255
+ ...session.loggingMetadata,
256
+ tags: ["invariant-violation"]
257
+ }
258
+ );
259
+ return;
260
+ }
193
261
  this.sessions.delete(session.to);
194
262
  this.log?.info(
195
263
  `session ${session.id} disconnect from ${session.to}`,
@@ -405,4 +473,4 @@ export {
405
473
  ProtocolError,
406
474
  Transport
407
475
  };
408
- //# sourceMappingURL=chunk-XM656KMN.js.map
476
+ //# sourceMappingURL=chunk-MD4S7GO2.js.map