@replit/river 0.203.0 → 0.204.0

package/dist/testUtil/index.d.cts

@@ -1,9 +1,9 @@
-import { b as ProvidedClientTransportOptions, c as ProvidedServerTransportOptions, n as ClientHandshakeOptions, C as Connection, r as ServerHandshakeOptions, T as Transport, A as SessionOptions, m as ClientTransportOptions, e as SessionNoConnection, B as SessionBoundSendFn } from '../context-d6dd8a1a.js';
-import { C as ClientTransport } from '../client-5d2e41a3.js';
-import { S as ServerTransport } from '../server-e46399f9.js';
+import { b as ProvidedClientTransportOptions, c as ProvidedServerTransportOptions, n as ClientHandshakeOptions, C as Connection, r as ServerHandshakeOptions, T as Transport, A as SessionOptions, m as ClientTransportOptions, e as SessionNoConnection, B as SessionBoundSendFn } from '../context-3cf1ed4e.js';
+import { C as ClientTransport } from '../client-0c0a4a5e.js';
+import { S as ServerTransport } from '../server-a287de55.js';
 import { c as TransportClientId, f as PartialTransportMessage, b as OpaqueTransportMessage } from '../message-3def9ded.js';
 import { Static } from '@sinclair/typebox';
-import { E as BaseErrorSchemaType, u as Readable, X as ReadableIterator, Y as ReadableResult } from '../services-56cbea0d.js';
+import { E as BaseErrorSchemaType, u as Readable, X as ReadableIterator, Y as ReadableResult } from '../services-51980ecd.js';
 import NodeWs from 'ws';
 import http from 'node:http';
 import { W as WsLike } from '../wslike-e0b32dd5.js';

package/dist/testUtil/index.d.ts

@@ -1,9 +1,9 @@
-import { b as ProvidedClientTransportOptions, c as ProvidedServerTransportOptions, n as ClientHandshakeOptions, C as Connection, r as ServerHandshakeOptions, T as Transport, A as SessionOptions, m as ClientTransportOptions, e as SessionNoConnection, B as SessionBoundSendFn } from '../context-d6dd8a1a.js';
-import { C as ClientTransport } from '../client-5d2e41a3.js';
-import { S as ServerTransport } from '../server-e46399f9.js';
+import { b as ProvidedClientTransportOptions, c as ProvidedServerTransportOptions, n as ClientHandshakeOptions, C as Connection, r as ServerHandshakeOptions, T as Transport, A as SessionOptions, m as ClientTransportOptions, e as SessionNoConnection, B as SessionBoundSendFn } from '../context-3cf1ed4e.js';
+import { C as ClientTransport } from '../client-0c0a4a5e.js';
+import { S as ServerTransport } from '../server-a287de55.js';
 import { c as TransportClientId, f as PartialTransportMessage, b as OpaqueTransportMessage } from '../message-3def9ded.js';
 import { Static } from '@sinclair/typebox';
-import { E as BaseErrorSchemaType, u as Readable, X as ReadableIterator, Y as ReadableResult } from '../services-56cbea0d.js';
+import { E as BaseErrorSchemaType, u as Readable, X as ReadableIterator, Y as ReadableResult } from '../services-51980ecd.js';
 import NodeWs from 'ws';
 import http from 'node:http';
 import { W as WsLike } from '../wslike-e0b32dd5.js';

package/dist/testUtil/index.js

@@ -1,19 +1,20 @@
 import {
   ClientTransport
-} from "../chunk-DGT3MPD4.js";
+} from "../chunk-3V7VMJNA.js";
 import {
   ServerTransport
-} from "../chunk-D5EIDBUT.js";
+} from "../chunk-YODW2ZMU.js";
 import {
   Connection,
   SessionStateGraph,
   defaultClientTransportOptions,
   defaultTransportOptions
-} from "../chunk-FG22HHCY.js";
+} from "../chunk-6YUDEFCS.js";
 import {
-  currentProtocolVersion
-} from "../chunk-SZHNMLKC.js";
-import "../chunk-LHH5LQ7C.js";
+  currentProtocolVersion,
+  getTracer
+} from "../chunk-LJCR3ADI.js";
+import "../chunk-WBGKPIFS.js";
 import "../chunk-AJGIY2UB.js";
 
 // testUtil/index.ts
@@ -309,7 +310,8 @@ function dummySession() {
       }
     },
     testingSessionOptions,
-    currentProtocolVersion
+    currentProtocolVersion,
+    getTracer()
   );
 }
 function getClientSendFn(clientTransport, serverTransport) {

package/dist/testUtil/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../testUtil/index.ts","../../testUtil/observable/observable.ts","../../testUtil/duplex/duplexPair.ts","../../testUtil/fixtures/mockTransport.ts"],"sourcesContent":["import NodeWs, { WebSocketServer } from 'ws';\nimport http from 'node:http';\nimport { Static } from '@sinclair/typebox';\nimport {\n  OpaqueTransportMessage,\n  PartialTransportMessage,\n  currentProtocolVersion,\n} from '../transport/message';\nimport { Transport } from '../transport/transport';\nimport { Readable, ReadableResult, ReadableIterator } from '../router/streams';\nimport { WsLike } from '../transport/impls/ws/wslike';\nimport {\n  defaultClientTransportOptions,\n  defaultTransportOptions,\n} from '../transport/options';\nimport { Connection } from '../transport/connection';\nimport { SessionState } from '../transport/sessionStateMachine/common';\nimport { SessionStateGraph } from '../transport/sessionStateMachine/transitions';\nimport { BaseErrorSchemaType } from '../router/errors';\nimport { ClientTransport } from '../transport/client';\nimport { ServerTransport } from '../transport/server';\n\nexport {\n  createMockTransportNetwork,\n  InMemoryConnection,\n} from './fixtures/mockTransport';\n\n/**\n * Creates a WebSocket client that connects to a local server at the specified port.\n * This should only be used for testing.\n * @param port - The port number to connect to.\n * @returns A Promise that resolves to a WebSocket instance.\n */\nexport function createLocalWebSocketClient(port: number): WsLike {\n  const sock = new NodeWs(`ws://localhost:${port}`);\n  sock.binaryType = 'arraybuffer';\n\n  return sock;\n}\n\n/**\n * Creates a WebSocket server instance using the provided HTTP server.\n * Only used as helper for testing.\n * @param server - The HTTP server instance to use for the WebSocket server.\n * @returns A Promise that resolves to the created WebSocket server instance.\n */\nexport function createWebSocketServer(server: http.Server) {\n  return new WebSocketServer({ server });\n}\n\n/**\n * Starts listening on the given server and returns the automatically allocated port number.\n * This should only be used for testing.\n * @param server - The http server to listen on.\n * @returns A promise that resolves with the allocated port number.\n * @throws An error if a port cannot be allocated.\n */\nexport function onWsServerReady(server: http.Server): Promise<number> {\n  return new Promise((resolve, reject) => {\n    server.listen(() => {\n      const addr = server.address();\n      if (typeof addr === 'object' && addr) {\n        resolve(addr.port);\n      } else {\n        reject(new Error(\"couldn't find a port to allocate\"));\n      }\n    });\n  });\n}\n\nconst readableIterators = new WeakMap<\n  Readable<unknown, Static<BaseErrorSchemaType>>,\n  ReadableIterator<unknown, Static<BaseErrorSchemaType>>\n>();\n\n/**\n * A safe way to access {@link Readble}'s iterator multiple times in test helpers.\n *\n * If there are other iteration attempts outside of the test helpers\n * (this function, {@link readNextResult}, and {@link isReadableDone})\n * it will throw an error.\n */\nexport function getReadableIterator<T, E extends Static<BaseErrorSchemaType>>(\n  readable: Readable<T, E>,\n): ReadableIterator<T, E> {\n  let iter = readableIterators.get(readable) as\n    | ReadableIterator<T, E>\n    | undefined;\n\n  if (!iter) {\n    iter = readable[Symbol.asyncIterator]();\n    readableIterators.set(readable, iter);\n  }\n\n  return iter;\n}\n\n/**\n * Retrieves the next value from {@link Readable}, or throws an error if the Readable is done.\n *\n * Calling semantics are similar to {@link getReadableIterator}\n */\nexport async function readNextResult<T, E extends Static<BaseErrorSchemaType>>(\n  readable: Readable<T, E>,\n): Promise<ReadableResult<T, E>> {\n  const res = await getReadableIterator(readable).next();\n\n  if (res.done) {\n    throw new Error('readNext from a done Readable');\n  }\n\n  return res.value;\n}\n\n/**\n * Checks if the readable is done iterating, it consumes an iteration in the process.\n *\n * Calling semantics are similar to {@link getReadableIterator}\n */\nexport async function isReadableDone<T, E extends Static<BaseErrorSchemaType>>(\n  readable: Readable<T, E>,\n) {\n  const res = await getReadableIterator(readable).next();\n\n  return res.done;\n}\n\nexport function payloadToTransportMessage<Payload>(\n  payload: Payload,\n): PartialTransportMessage<Payload> {\n  return {\n    streamId: 'stream',\n    controlFlags: 0,\n    payload,\n  };\n}\n\nexport function createDummyTransportMessage() {\n  return payloadToTransportMessage({\n    msg: 'cool',\n    test: Math.random(),\n  });\n}\n\n/**\n * Waits for a message on the transport.\n * @param {Transport} t - The transport to listen to.\n * @param filter - An optional filter function to apply to the received messages.\n * @returns A promise that resolves with the payload of the first message that passes the filter.\n */\nexport async function waitForMessage(\n  t: Transport<Connection>,\n  filter?: (msg: OpaqueTransportMessage) => boolean,\n  rejectMismatch?: boolean,\n) {\n  return new Promise((resolve, reject) => {\n    function cleanup() {\n      t.removeEventListener('message', onMessage);\n    }\n\n    function onMessage(msg: OpaqueTransportMessage) {\n      if (!filter || filter(msg)) {\n        cleanup();\n        resolve(msg.payload);\n      } else if (rejectMismatch) {\n        cleanup();\n        reject(new Error('message didnt match the filter'));\n      }\n    }\n\n    t.addEventListener('message', onMessage);\n  });\n}\n\nexport const testingSessionOptions = defaultTransportOptions;\nexport const testingClientSessionOptions = defaultClientTransportOptions;\n\nexport function dummySession() {\n  return SessionStateGraph.entrypoints.NoConnection(\n    'client',\n    'server',\n    {\n      onSessionGracePeriodElapsed: () => {\n        /* noop */\n      },\n    },\n    testingSessionOptions,\n    currentProtocolVersion,\n  );\n}\n\nexport function getClientSendFn(\n  clientTransport: ClientTransport<Connection>,\n  serverTransport: ServerTransport<Connection>,\n) {\n  const session =\n    clientTransport.sessions.get(serverTransport.clientId) ??\n    clientTransport.createUnconnectedSession(serverTransport.clientId);\n\n  return clientTransport.getSessionBoundSendFn(\n    serverTransport.clientId,\n    session.id,\n  );\n}\n\nexport function getServerSendFn(\n  serverTransport: ServerTransport<Connection>,\n  clientTransport: ClientTransport<Connection>,\n) {\n  const session = serverTransport.sessions.get(clientTransport.clientId);\n  if (!session) {\n    throw new Error('session not found');\n  }\n\n  return serverTransport.getSessionBoundSendFn(\n    clientTransport.clientId,\n    session.id,\n  );\n}\n\nexport function getTransportConnections<ConnType extends Connection>(\n  transport: Transport<ConnType>,\n): Array<ConnType> {\n  const connections = [];\n  for (const session of transport.sessions.values()) {\n    if (session.state === SessionState.Connected) {\n      connections.push(session.conn);\n    }\n  }\n\n  return connections;\n}\n\nexport function numberOfConnections<ConnType extends Connection>(\n  transport: Transport<ConnType>,\n): number {\n  return getTransportConnections(transport).length;\n}\n\nexport function closeAllConnections<ConnType extends Connection>(\n  transport: Transport<ConnType>,\n) {\n  for (const conn of getTransportConnections(transport)) {\n    conn.close();\n  }\n}\n","/**\n * Represents an observable value that can be subscribed to for changes.\n * This should only be used in tests\n * @template T - The type of the value being observed.\n */\nexport class Observable<T> {\n  value: T;\n  private listeners: Set<(val: T) => void>;\n\n  constructor(initialValue: T) {\n    this.value = initialValue;\n    this.listeners = new Set();\n  }\n\n  /**\n   * Gets the current value of the observable.\n   */\n  get() {\n    return this.value;\n  }\n\n  /**\n   * Sets the current value of the observable. All listeners will get an update with this value.\n   * @param newValue - The new value to set.\n   */\n  set(tx: (preValue: T) => T) {\n    const newValue = tx(this.value);\n    this.value = newValue;\n    this.listeners.forEach((listener) => listener(newValue));\n  }\n\n  /**\n   * Subscribes to changes in the observable value.\n   * @param listener - A callback function that will be called when the value changes.\n   * @returns A function that can be called to unsubscribe from further notifications.\n   */\n  observe(listener: (val: T) => void) {\n    this.listeners.add(listener);\n    listener(this.get());\n\n    return () => this.listeners.delete(listener);\n  }\n\n  /**\n   * Returns the number of listeners currently observing the observable\n   */\n  get listenerCount(): number {\n    return this.listeners.size;\n  }\n}\n","import { Duplex } from 'node:stream';\nimport assert from 'assert';\n\nconst kCallback = Symbol('Callback');\nconst kInitOtherSide = Symbol('InitOtherSide');\n\n// yoinked from https://github.com/nodejs/node/blob/c3a7b29e56a5ada6327ebb622ba746d022685742/lib/internal/streams/duplexpair.js#L55\n// but with types\nclass DuplexSide extends Duplex {\n  private otherSide: DuplexSide | null;\n  private [kCallback]: (() => void) | null;\n\n  constructor() {\n    super();\n    this[kCallback] = null;\n    this.otherSide = null;\n  }\n\n  [kInitOtherSide](otherSide: DuplexSide) {\n    if (this.otherSide === null) {\n      this.otherSide = otherSide;\n    }\n  }\n\n  _read() {\n    const callback = this[kCallback];\n    if (callback) {\n      this[kCallback] = null;\n      callback();\n    }\n  }\n\n  _write(\n    chunk: Uint8Array,\n    _encoding: BufferEncoding,\n    callback: (error?: Error | null) => void,\n  ) {\n    assert(this.otherSide !== null);\n    assert(this.otherSide[kCallback] === null);\n    if (chunk.length === 0) {\n      process.nextTick(callback);\n    } else {\n      this.otherSide.push(chunk);\n      this.otherSide[kCallback] = callback;\n    }\n  }\n\n  _final(callback: (error?: Error | null) => void) {\n    this.otherSide?.on('end', callback);\n    this.otherSide?.push(null);\n  }\n}\n\nexport function duplexPair(): [DuplexSide, DuplexSide] {\n  const side0 = new DuplexSide();\n  const side1 = new DuplexSide();\n  side0[kInitOtherSide](side1);\n  side1[kInitOtherSide](side0);\n\n  return [side0, side1];\n}\n","import { TransportClientId } from '../../transport';\nimport { ClientTransport } from '../../transport/client';\nimport { Connection } from '../../transport/connection';\nimport { ServerTransport } from '../../transport/server';\nimport { Observable } from '../observable/observable';\nimport { ProvidedServerTransportOptions } from '../../transport/options';\nimport { TestSetupHelpers, TestTransportOptions } from './transports';\nimport { Duplex } from 'node:stream';\nimport { duplexPair } from '../duplex/duplexPair';\nimport { nanoid } from 'nanoid';\n\nexport class InMemoryConnection extends Connection {\n  conn: Duplex;\n\n  constructor(pipe: Duplex) {\n    super();\n    this.conn = pipe;\n\n    this.conn.on('data', (data: Uint8Array) => {\n      for (const cb of this.dataListeners) {\n        cb(data);\n      }\n    });\n\n    this.conn.on('end', () => {\n      for (const cb of this.closeListeners) {\n        cb();\n      }\n    });\n\n    this.conn.on('error', (err) => {\n      for (const cb of this.errorListeners) {\n        cb(err);\n      }\n    });\n  }\n\n  send(payload: Uint8Array): boolean {\n    setImmediate(() => {\n      this.conn.write(payload);\n    });\n\n    return true;\n  }\n\n  close(): void {\n    setImmediate(() => {\n      this.conn.end();\n    });\n  }\n}\n\ninterface BidiConnection {\n  id: string;\n  clientToServer: Duplex;\n  serverToClient: Duplex;\n  clientId: TransportClientId;\n  serverId: TransportClientId;\n  handled: boolean;\n}\n\n// we construct a network of transports connected by node streams here\n// so that we can test the transport layer without needing to actually\n// use real network/websocket connections\n// this is useful for testing the transport layer in isolation\n// and allows us to control network conditions in a way that would be\n// difficult with real network connections (e.g. simulating a phantom\n// disconnect, .pause() vs .removeAllListeners('data'), congestion,\n// latency, differences in ws implementations between node and browsers, etc.)\nexport function createMockTransportNetwork(\n  opts?: TestTransportOptions,\n): TestSetupHelpers {\n  // conn id -> [client->server, server->client]\n  const connections = new Observable<Record<string, BidiConnection>>({});\n\n  const transports: Array<MockClientTransport | MockServerTransport> = [];\n  class MockClientTransport extends ClientTransport<InMemoryConnection> {\n    async createNewOutgoingConnection(\n      to: TransportClientId,\n    ): Promise<InMemoryConnection> {\n      const [clientToServer, serverToClient] = duplexPair();\n      await new Promise((resolve) => setImmediate(resolve));\n\n      const connId = nanoid();\n      connections.set((prev) => ({\n        ...prev,\n        [connId]: {\n          id: connId,\n          clientToServer,\n          serverToClient,\n          clientId: this.clientId,\n          serverId: to,\n          handled: false,\n        },\n      }));\n\n      return new InMemoryConnection(clientToServer);\n    }\n  }\n\n  class MockServerTransport extends ServerTransport<InMemoryConnection> {\n    subscribeCleanup: () => void;\n\n    constructor(\n      clientId: TransportClientId,\n      options?: ProvidedServerTransportOptions,\n    ) {\n      super(clientId, options);\n\n      this.subscribeCleanup = connections.observe((conns) => {\n        // look for any unhandled connections\n        for (const conn of Object.values(conns)) {\n          // if we've already handled this connection, skip it\n          // or if it's not for us, skip it\n          if (conn.handled || conn.serverId !== this.clientId) {\n            continue;\n          }\n\n          conn.handled = true;\n          const connection = new InMemoryConnection(conn.serverToClient);\n          this.handleConnection(connection);\n        }\n      });\n    }\n\n    close() {\n      this.subscribeCleanup();\n      super.close();\n    }\n  }\n\n  return {\n    getClientTransport: (id, handshakeOptions) => {\n      const clientTransport = new MockClientTransport(id, opts?.client);\n      if (handshakeOptions) {\n        clientTransport.extendHandshake(handshakeOptions);\n      }\n\n      transports.push(clientTransport);\n\n      return clientTransport;\n    },\n    getServerTransport: (id = 'SERVER', handshakeOptions) => {\n      const serverTransport = new MockServerTransport(id, opts?.server);\n      if (handshakeOptions) {\n        serverTransport.extendHandshake(handshakeOptions);\n      }\n\n      transports.push(serverTransport);\n\n      return serverTransport;\n    },\n    simulatePhantomDisconnect() {\n      for (const conn of Object.values(connections.get())) {\n        conn.serverToClient.pause();\n      }\n    },\n    async restartServer() {\n      for (const transport of transports) {\n        if (transport.clientId !== 'SERVER') continue;\n        transport.close();\n      }\n\n      // kill all connections while we're at it\n      for (const conn of Object.values(connections.get())) {\n        conn.serverToClient.end();\n        conn.clientToServer.end();\n      }\n    },\n    cleanup() {\n      for (const conn of Object.values(connections.get())) {\n        conn.serverToClient.end();\n        conn.clientToServer.end();\n      }\n    },\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,OAAO,UAAU,uBAAuB;;;ACKjC,IAAM,aAAN,MAAoB;AAAA,EACzB;AAAA,EACQ;AAAA,EAER,YAAY,cAAiB;AAC3B,SAAK,QAAQ;AACb,SAAK,YAAY,oBAAI,IAAI;AAAA,EAC3B;AAAA;AAAA;AAAA;AAAA,EAKA,MAAM;AACJ,WAAO,KAAK;AAAA,EACd;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,IAAI,IAAwB;AAC1B,UAAM,WAAW,GAAG,KAAK,KAAK;AAC9B,SAAK,QAAQ;AACb,SAAK,UAAU,QAAQ,CAAC,aAAa,SAAS,QAAQ,CAAC;AAAA,EACzD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,QAAQ,UAA4B;AAClC,SAAK,UAAU,IAAI,QAAQ;AAC3B,aAAS,KAAK,IAAI,CAAC;AAEnB,WAAO,MAAM,KAAK,UAAU,OAAO,QAAQ;AAAA,EAC7C;AAAA;AAAA;AAAA;AAAA,EAKA,IAAI,gBAAwB;AAC1B,WAAO,KAAK,UAAU;AAAA,EACxB;AACF;;;ACjDA,SAAS,cAAc;AACvB,OAAO,YAAY;AAEnB,IAAM,YAAY,OAAO,UAAU;AACnC,IAAM,iBAAiB,OAAO,eAAe;AAI7C,IAAM,aAAN,cAAyB,OAAO;AAAA,EACtB;AAAA,EACR,CAAS,SAAS;AAAA,EAElB,cAAc;AACZ,UAAM;AACN,SAAK,SAAS,IAAI;AAClB,SAAK,YAAY;AAAA,EACnB;AAAA,EAEA,CAAC,cAAc,EAAE,WAAuB;AACtC,QAAI,KAAK,cAAc,MAAM;AAC3B,WAAK,YAAY;AAAA,IACnB;AAAA,EACF;AAAA,EAEA,QAAQ;AACN,UAAM,WAAW,KAAK,SAAS;AAC/B,QAAI,UAAU;AACZ,WAAK,SAAS,IAAI;AAClB,eAAS;AAAA,IACX;AAAA,EACF;AAAA,EAEA,OACE,OACA,WACA,UACA;AACA,WAAO,KAAK,cAAc,IAAI;AAC9B,WAAO,KAAK,UAAU,SAAS,MAAM,IAAI;AACzC,QAAI,MAAM,WAAW,GAAG;AACtB,cAAQ,SAAS,QAAQ;AAAA,IAC3B,OAAO;AACL,WAAK,UAAU,KAAK,KAAK;AACzB,WAAK,UAAU,SAAS,IAAI;AAAA,IAC9B;AAAA,EACF;AAAA,EAEA,OAAO,UAA0C;AAC/C,SAAK,WAAW,GAAG,OAAO,QAAQ;AAClC,SAAK,WAAW,KAAK,IAAI;AAAA,EAC3B;AACF;AAEO,SAAS,aAAuC;AACrD,QAAM,QAAQ,IAAI,WAAW;AAC7B,QAAM,QAAQ,IAAI,WAAW;AAC7B,QAAM,cAAc,EAAE,KAAK;AAC3B,QAAM,cAAc,EAAE,KAAK;AAE3B,SAAO,CAAC,OAAO,KAAK;AACtB;;;ACnDA,SAAS,cAAc;AAEhB,IAAM,qBAAN,cAAiC,WAAW;AAAA,EACjD;AAAA,EAEA,YAAY,MAAc;AACxB,UAAM;AACN,SAAK,OAAO;AAEZ,SAAK,KAAK,GAAG,QAAQ,CAAC,SAAqB;AACzC,iBAAW,MAAM,KAAK,eAAe;AACnC,WAAG,IAAI;AAAA,MACT;AAAA,IACF,CAAC;AAED,SAAK,KAAK,GAAG,OAAO,MAAM;AACxB,iBAAW,MAAM,KAAK,gBAAgB;AACpC,WAAG;AAAA,MACL;AAAA,IACF,CAAC;AAED,SAAK,KAAK,GAAG,SAAS,CAAC,QAAQ;AAC7B,iBAAW,MAAM,KAAK,gBAAgB;AACpC,WAAG,GAAG;AAAA,MACR;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEA,KAAK,SAA8B;AACjC,iBAAa,MAAM;AACjB,WAAK,KAAK,MAAM,OAAO;AAAA,IACzB,CAAC;AAED,WAAO;AAAA,EACT;AAAA,EAEA,QAAc;AACZ,iBAAa,MAAM;AACjB,WAAK,KAAK,IAAI;AAAA,IAChB,CAAC;AAAA,EACH;AACF;AAmBO,SAAS,2BACd,MACkB;AAElB,QAAM,cAAc,IAAI,WAA2C,CAAC,CAAC;AAErE,QAAM,aAA+D,CAAC;AAAA,EACtE,MAAM,4BAA4B,gBAAoC;AAAA,IACpE,MAAM,4BACJ,IAC6B;AAC7B,YAAM,CAAC,gBAAgB,cAAc,IAAI,WAAW;AACpD,YAAM,IAAI,QAAQ,CAAC,YAAY,aAAa,OAAO,CAAC;AAEpD,YAAM,SAAS,OAAO;AACtB,kBAAY,IAAI,CAAC,UAAU;AAAA,QACzB,GAAG;AAAA,QACH,CAAC,MAAM,GAAG;AAAA,UACR,IAAI;AAAA,UACJ;AAAA,UACA;AAAA,UACA,UAAU,KAAK;AAAA,UACf,UAAU;AAAA,UACV,SAAS;AAAA,QACX;AAAA,MACF,EAAE;AAEF,aAAO,IAAI,mBAAmB,cAAc;AAAA,IAC9C;AAAA,EACF;AAAA,EAEA,MAAM,4BAA4B,gBAAoC;AAAA,IACpE;AAAA,IAEA,YACE,UACA,SACA;AACA,YAAM,UAAU,OAAO;AAEvB,WAAK,mBAAmB,YAAY,QAAQ,CAAC,UAAU;AAErD,mBAAW,QAAQ,OAAO,OAAO,KAAK,GAAG;AAGvC,cAAI,KAAK,WAAW,KAAK,aAAa,KAAK,UAAU;AACnD;AAAA,UACF;AAEA,eAAK,UAAU;AACf,gBAAM,aAAa,IAAI,mBAAmB,KAAK,cAAc;AAC7D,eAAK,iBAAiB,UAAU;AAAA,QAClC;AAAA,MACF,CAAC;AAAA,IACH;AAAA,IAEA,QAAQ;AACN,WAAK,iBAAiB;AACtB,YAAM,MAAM;AAAA,IACd;AAAA,EACF;AAEA,SAAO;AAAA,IACL,oBAAoB,CAAC,IAAI,qBAAqB;AAC5C,YAAM,kBAAkB,IAAI,oBAAoB,IAAI,MAAM,MAAM;AAChE,UAAI,kBAAkB;AACpB,wBAAgB,gBAAgB,gBAAgB;AAAA,MAClD;AAEA,iBAAW,KAAK,eAAe;AAE/B,aAAO;AAAA,IACT;AAAA,IACA,oBAAoB,CAAC,KAAK,UAAU,qBAAqB;AACvD,YAAM,kBAAkB,IAAI,oBAAoB,IAAI,MAAM,MAAM;AAChE,UAAI,kBAAkB;AACpB,wBAAgB,gBAAgB,gBAAgB;AAAA,MAClD;AAEA,iBAAW,KAAK,eAAe;AAE/B,aAAO;AAAA,IACT;AAAA,IACA,4BAA4B;AAC1B,iBAAW,QAAQ,OAAO,OAAO,YAAY,IAAI,CAAC,GAAG;AACnD,aAAK,eAAe,MAAM;AAAA,MAC5B;AAAA,IACF;AAAA,IACA,MAAM,gBAAgB;AACpB,iBAAW,aAAa,YAAY;AAClC,YAAI,UAAU,aAAa;AAAU;AACrC,kBAAU,MAAM;AAAA,MAClB;AAGA,iBAAW,QAAQ,OAAO,OAAO,YAAY,IAAI,CAAC,GAAG;AACnD,aAAK,eAAe,IAAI;AACxB,aAAK,eAAe,IAAI;AAAA,MAC1B;AAAA,IACF;AAAA,IACA,UAAU;AACR,iBAAW,QAAQ,OAAO,OAAO,YAAY,IAAI,CAAC,GAAG;AACnD,aAAK,eAAe,IAAI;AACxB,aAAK,eAAe,IAAI;AAAA,MAC1B;AAAA,IACF;AAAA,EACF;AACF;;;AH/IO,SAAS,2BAA2B,MAAsB;AAC/D,QAAM,OAAO,IAAI,OAAO,kBAAkB,IAAI,EAAE;AAChD,OAAK,aAAa;AAElB,SAAO;AACT;AAQO,SAAS,sBAAsB,QAAqB;AACzD,SAAO,IAAI,gBAAgB,EAAE,OAAO,CAAC;AACvC;AASO,SAAS,gBAAgB,QAAsC;AACpE,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,WAAO,OAAO,MAAM;AAClB,YAAM,OAAO,OAAO,QAAQ;AAC5B,UAAI,OAAO,SAAS,YAAY,MAAM;AACpC,gBAAQ,KAAK,IAAI;AAAA,MACnB,OAAO;AACL,eAAO,IAAI,MAAM,kCAAkC,CAAC;AAAA,MACtD;AAAA,IACF,CAAC;AAAA,EACH,CAAC;AACH;AAEA,IAAM,oBAAoB,oBAAI,QAG5B;AASK,SAAS,oBACd,UACwB;AACxB,MAAI,OAAO,kBAAkB,IAAI,QAAQ;AAIzC,MAAI,CAAC,MAAM;AACT,WAAO,SAAS,OAAO,aAAa,EAAE;AACtC,sBAAkB,IAAI,UAAU,IAAI;AAAA,EACtC;AAEA,SAAO;AACT;AAOA,eAAsB,eACpB,UAC+B;AAC/B,QAAM,MAAM,MAAM,oBAAoB,QAAQ,EAAE,KAAK;AAErD,MAAI,IAAI,MAAM;AACZ,UAAM,IAAI,MAAM,+BAA+B;AAAA,EACjD;AAEA,SAAO,IAAI;AACb;AAOA,eAAsB,eACpB,UACA;AACA,QAAM,MAAM,MAAM,oBAAoB,QAAQ,EAAE,KAAK;AAErD,SAAO,IAAI;AACb;AAEO,SAAS,0BACd,SACkC;AAClC,SAAO;AAAA,IACL,UAAU;AAAA,IACV,cAAc;AAAA,IACd;AAAA,EACF;AACF;AAEO,SAAS,8BAA8B;AAC5C,SAAO,0BAA0B;AAAA,IAC/B,KAAK;AAAA,IACL,MAAM,KAAK,OAAO;AAAA,EACpB,CAAC;AACH;AAQA,eAAsB,eACpB,GACA,QACA,gBACA;AACA,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,aAAS,UAAU;AACjB,QAAE,oBAAoB,WAAW,SAAS;AAAA,IAC5C;AAEA,aAAS,UAAU,KAA6B;AAC9C,UAAI,CAAC,UAAU,OAAO,GAAG,GAAG;AAC1B,gBAAQ;AACR,gBAAQ,IAAI,OAAO;AAAA,MACrB,WAAW,gBAAgB;AACzB,gBAAQ;AACR,eAAO,IAAI,MAAM,gCAAgC,CAAC;AAAA,MACpD;AAAA,IACF;AAEA,MAAE,iBAAiB,WAAW,SAAS;AAAA,EACzC,CAAC;AACH;AAEO,IAAM,wBAAwB;AAC9B,IAAM,8BAA8B;AAEpC,SAAS,eAAe;AAC7B,SAAO,kBAAkB,YAAY;AAAA,IACnC;AAAA,IACA;AAAA,IACA;AAAA,MACE,6BAA6B,MAAM;AAAA,MAEnC;AAAA,IACF;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;AAEO,SAAS,gBACd,iBACA,iBACA;AACA,QAAM,UACJ,gBAAgB,SAAS,IAAI,gBAAgB,QAAQ,KACrD,gBAAgB,yBAAyB,gBAAgB,QAAQ;AAEnE,SAAO,gBAAgB;AAAA,IACrB,gBAAgB;AAAA,IAChB,QAAQ;AAAA,EACV;AACF;AAEO,SAAS,gBACd,iBACA,iBACA;AACA,QAAM,UAAU,gBAAgB,SAAS,IAAI,gBAAgB,QAAQ;AACrE,MAAI,CAAC,SAAS;AACZ,UAAM,IAAI,MAAM,mBAAmB;AAAA,EACrC;AAEA,SAAO,gBAAgB;AAAA,IACrB,gBAAgB;AAAA,IAChB,QAAQ;AAAA,EACV;AACF;AAEO,SAAS,wBACd,WACiB;AACjB,QAAM,cAAc,CAAC;AACrB,aAAW,WAAW,UAAU,SAAS,OAAO,GAAG;AACjD,QAAI,QAAQ,uCAAkC;AAC5C,kBAAY,KAAK,QAAQ,IAAI;AAAA,IAC/B;AAAA,EACF;AAEA,SAAO;AACT;AAEO,SAAS,oBACd,WACQ;AACR,SAAO,wBAAwB,SAAS,EAAE;AAC5C;AAEO,SAAS,oBACd,WACA;AACA,aAAW,QAAQ,wBAAwB,SAAS,GAAG;AACrD,SAAK,MAAM;AAAA,EACb;AACF;","names":[]}
+{"version":3,"sources":["../../testUtil/index.ts","../../testUtil/observable/observable.ts","../../testUtil/duplex/duplexPair.ts","../../testUtil/fixtures/mockTransport.ts"],"sourcesContent":["import NodeWs, { WebSocketServer } from 'ws';\nimport http from 'node:http';\nimport { Static } from '@sinclair/typebox';\nimport {\n  OpaqueTransportMessage,\n  PartialTransportMessage,\n  currentProtocolVersion,\n} from '../transport/message';\nimport { Transport } from '../transport/transport';\nimport { Readable, ReadableResult, ReadableIterator } from '../router/streams';\nimport { WsLike } from '../transport/impls/ws/wslike';\nimport {\n  defaultClientTransportOptions,\n  defaultTransportOptions,\n} from '../transport/options';\nimport { Connection } from '../transport/connection';\nimport { SessionState } from '../transport/sessionStateMachine/common';\nimport { SessionStateGraph } from '../transport/sessionStateMachine/transitions';\nimport { BaseErrorSchemaType } from '../router/errors';\nimport { ClientTransport } from '../transport/client';\nimport { ServerTransport } from '../transport/server';\nimport { getTracer } from '../tracing';\n\nexport {\n  createMockTransportNetwork,\n  InMemoryConnection,\n} from './fixtures/mockTransport';\n\n/**\n * Creates a WebSocket client that connects to a local server at the specified port.\n * This should only be used for testing.\n * @param port - The port number to connect to.\n * @returns A Promise that resolves to a WebSocket instance.\n */\nexport function createLocalWebSocketClient(port: number): WsLike {\n  const sock = new NodeWs(`ws://localhost:${port}`);\n  sock.binaryType = 'arraybuffer';\n\n  return sock;\n}\n\n/**\n * Creates a WebSocket server instance using the provided HTTP server.\n * Only used as helper for testing.\n * @param server - The HTTP server instance to use for the WebSocket server.\n * @returns A Promise that resolves to the created WebSocket server instance.\n */\nexport function createWebSocketServer(server: http.Server) {\n  return new WebSocketServer({ server });\n}\n\n/**\n * Starts listening on the given server and returns the automatically allocated port number.\n * This should only be used for testing.\n * @param server - The http server to listen on.\n * @returns A promise that resolves with the allocated port number.\n * @throws An error if a port cannot be allocated.\n */\nexport function onWsServerReady(server: http.Server): Promise<number> {\n  return new Promise((resolve, reject) => {\n    server.listen(() => {\n      const addr = server.address();\n      if (typeof addr === 'object' && addr) {\n        resolve(addr.port);\n      } else {\n        reject(new Error(\"couldn't find a port to allocate\"));\n      }\n    });\n  });\n}\n\nconst readableIterators = new WeakMap<\n  Readable<unknown, Static<BaseErrorSchemaType>>,\n  ReadableIterator<unknown, Static<BaseErrorSchemaType>>\n>();\n\n/**\n * A safe way to access {@link Readble}'s iterator multiple times in test helpers.\n *\n * If there are other iteration attempts outside of the test helpers\n * (this function, {@link readNextResult}, and {@link isReadableDone})\n * it will throw an error.\n */\nexport function getReadableIterator<T, E extends Static<BaseErrorSchemaType>>(\n  readable: Readable<T, E>,\n): ReadableIterator<T, E> {\n  let iter = readableIterators.get(readable) as\n    | ReadableIterator<T, E>\n    | undefined;\n\n  if (!iter) {\n    iter = readable[Symbol.asyncIterator]();\n    readableIterators.set(readable, iter);\n  }\n\n  return iter;\n}\n\n/**\n * Retrieves the next value from {@link Readable}, or throws an error if the Readable is done.\n *\n * Calling semantics are similar to {@link getReadableIterator}\n */\nexport async function readNextResult<T, E extends Static<BaseErrorSchemaType>>(\n  readable: Readable<T, E>,\n): Promise<ReadableResult<T, E>> {\n  const res = await getReadableIterator(readable).next();\n\n  if (res.done) {\n    throw new Error('readNext from a done Readable');\n  }\n\n  return res.value;\n}\n\n/**\n * Checks if the readable is done iterating, it consumes an iteration in the process.\n *\n * Calling semantics are similar to {@link getReadableIterator}\n */\nexport async function isReadableDone<T, E extends Static<BaseErrorSchemaType>>(\n  readable: Readable<T, E>,\n) {\n  const res = await getReadableIterator(readable).next();\n\n  return res.done;\n}\n\nexport function payloadToTransportMessage<Payload>(\n  payload: Payload,\n): PartialTransportMessage<Payload> {\n  return {\n    streamId: 'stream',\n    controlFlags: 0,\n    payload,\n  };\n}\n\nexport function createDummyTransportMessage() {\n  return payloadToTransportMessage({\n    msg: 'cool',\n    test: Math.random(),\n  });\n}\n\n/**\n * Waits for a message on the transport.\n * @param {Transport} t - The transport to listen to.\n * @param filter - An optional filter function to apply to the received messages.\n * @returns A promise that resolves with the payload of the first message that passes the filter.\n */\nexport async function waitForMessage(\n  t: Transport<Connection>,\n  filter?: (msg: OpaqueTransportMessage) => boolean,\n  rejectMismatch?: boolean,\n) {\n  return new Promise((resolve, reject) => {\n    function cleanup() {\n      t.removeEventListener('message', onMessage);\n    }\n\n    function onMessage(msg: OpaqueTransportMessage) {\n      if (!filter || filter(msg)) {\n        cleanup();\n        resolve(msg.payload);\n      } else if (rejectMismatch) {\n        cleanup();\n        reject(new Error('message didnt match the filter'));\n      }\n    }\n\n    t.addEventListener('message', onMessage);\n  });\n}\n\nexport const testingSessionOptions = defaultTransportOptions;\nexport const testingClientSessionOptions = defaultClientTransportOptions;\n\nexport function dummySession() {\n  return SessionStateGraph.entrypoints.NoConnection(\n    'client',\n    'server',\n    {\n      onSessionGracePeriodElapsed: () => {\n        /* noop */\n      },\n    },\n    testingSessionOptions,\n    currentProtocolVersion,\n    getTracer(),\n  );\n}\n\nexport function getClientSendFn(\n  clientTransport: ClientTransport<Connection>,\n  serverTransport: ServerTransport<Connection>,\n) {\n  const session =\n    clientTransport.sessions.get(serverTransport.clientId) ??\n    clientTransport.createUnconnectedSession(serverTransport.clientId);\n\n  return clientTransport.getSessionBoundSendFn(\n    serverTransport.clientId,\n    session.id,\n  );\n}\n\nexport function getServerSendFn(\n  serverTransport: ServerTransport<Connection>,\n  clientTransport: ClientTransport<Connection>,\n) {\n  const session = serverTransport.sessions.get(clientTransport.clientId);\n  if (!session) {\n    throw new Error('session not found');\n  }\n\n  return serverTransport.getSessionBoundSendFn(\n    clientTransport.clientId,\n    session.id,\n  );\n}\n\nexport function getTransportConnections<ConnType extends Connection>(\n  transport: Transport<ConnType>,\n): Array<ConnType> {\n  const connections = [];\n  for (const session of transport.sessions.values()) {\n    if (session.state === SessionState.Connected) {\n      connections.push(session.conn);\n    }\n  }\n\n  return connections;\n}\n\nexport function numberOfConnections<ConnType extends Connection>(\n  transport: Transport<ConnType>,\n): number {\n  return getTransportConnections(transport).length;\n}\n\nexport function closeAllConnections<ConnType extends Connection>(\n  transport: Transport<ConnType>,\n) {\n  for (const conn of getTransportConnections(transport)) {\n    conn.close();\n  }\n}\n","/**\n * Represents an observable value that can be subscribed to for changes.\n * This should only be used in tests\n * @template T - The type of the value being observed.\n */\nexport class Observable<T> {\n  value: T;\n  private listeners: Set<(val: T) => void>;\n\n  constructor(initialValue: T) {\n    this.value = initialValue;\n    this.listeners = new Set();\n  }\n\n  /**\n   * Gets the current value of the observable.\n   */\n  get() {\n    return this.value;\n  }\n\n  /**\n   * Sets the current value of the observable. All listeners will get an update with this value.\n   * @param newValue - The new value to set.\n   */\n  set(tx: (preValue: T) => T) {\n    const newValue = tx(this.value);\n    this.value = newValue;\n    this.listeners.forEach((listener) => listener(newValue));\n  }\n\n  /**\n   * Subscribes to changes in the observable value.\n   * @param listener - A callback function that will be called when the value changes.\n   * @returns A function that can be called to unsubscribe from further notifications.\n   */\n  observe(listener: (val: T) => void) {\n    this.listeners.add(listener);\n    listener(this.get());\n\n    return () => this.listeners.delete(listener);\n  }\n\n  /**\n   * Returns the number of listeners currently observing the observable\n   */\n  get listenerCount(): number {\n    return this.listeners.size;\n  }\n}\n","import { Duplex } from 'node:stream';\nimport assert from 'assert';\n\nconst kCallback = Symbol('Callback');\nconst kInitOtherSide = Symbol('InitOtherSide');\n\n// yoinked from https://github.com/nodejs/node/blob/c3a7b29e56a5ada6327ebb622ba746d022685742/lib/internal/streams/duplexpair.js#L55\n// but with types\nclass DuplexSide extends Duplex {\n  private otherSide: DuplexSide | null;\n  private [kCallback]: (() => void) | null;\n\n  constructor() {\n    super();\n    this[kCallback] = null;\n    this.otherSide = null;\n  }\n\n  [kInitOtherSide](otherSide: DuplexSide) {\n    if (this.otherSide === null) {\n      this.otherSide = otherSide;\n    }\n  }\n\n  _read() {\n    const callback = this[kCallback];\n    if (callback) {\n      this[kCallback] = null;\n      callback();\n    }\n  }\n\n  _write(\n    chunk: Uint8Array,\n    _encoding: BufferEncoding,\n    callback: (error?: Error | null) => void,\n  ) {\n    assert(this.otherSide !== null);\n    assert(this.otherSide[kCallback] === null);\n    if (chunk.length === 0) {\n      process.nextTick(callback);\n    } else {\n      this.otherSide.push(chunk);\n      this.otherSide[kCallback] = callback;\n    }\n  }\n\n  _final(callback: (error?: Error | null) => void) {\n    this.otherSide?.on('end', callback);\n    this.otherSide?.push(null);\n  }\n}\n\nexport function duplexPair(): [DuplexSide, DuplexSide] {\n  const side0 = new DuplexSide();\n  const side1 = new DuplexSide();\n  side0[kInitOtherSide](side1);\n  side1[kInitOtherSide](side0);\n\n  return [side0, side1];\n}\n","import { TransportClientId } from '../../transport';\nimport { ClientTransport } from '../../transport/client';\nimport { Connection } from '../../transport/connection';\nimport { ServerTransport } from '../../transport/server';\nimport { Observable } from '../observable/observable';\nimport { ProvidedServerTransportOptions } from '../../transport/options';\nimport { TestSetupHelpers, TestTransportOptions } from './transports';\nimport { Duplex } from 'node:stream';\nimport { duplexPair } from '../duplex/duplexPair';\nimport { nanoid } from 'nanoid';\n\nexport class InMemoryConnection extends Connection {\n  conn: Duplex;\n\n  constructor(pipe: Duplex) {\n    super();\n    this.conn = pipe;\n\n    this.conn.on('data', (data: Uint8Array) => {\n      for (const cb of this.dataListeners) {\n        cb(data);\n      }\n    });\n\n    this.conn.on('end', () => {\n      for (const cb of this.closeListeners) {\n        cb();\n      }\n    });\n\n    this.conn.on('error', (err) => {\n      for (const cb of this.errorListeners) {\n        cb(err);\n      }\n    });\n  }\n\n  send(payload: Uint8Array): boolean {\n    setImmediate(() => {\n      this.conn.write(payload);\n    });\n\n    return true;\n  }\n\n  close(): void {\n    setImmediate(() => {\n      this.conn.end();\n    });\n  }\n}\n\ninterface BidiConnection {\n  id: string;\n  clientToServer: Duplex;\n  serverToClient: Duplex;\n  clientId: TransportClientId;\n  serverId: TransportClientId;\n  handled: boolean;\n}\n\n// we construct a network of transports connected by node streams here\n// so that we can test the transport layer without needing to actually\n// use real network/websocket connections\n// this is useful for testing the transport layer in isolation\n// and allows us to control network conditions in a way that would be\n// difficult with real network connections (e.g. simulating a phantom\n// disconnect, .pause() vs .removeAllListeners('data'), congestion,\n// latency, differences in ws implementations between node and browsers, etc.)\nexport function createMockTransportNetwork(\n  opts?: TestTransportOptions,\n): TestSetupHelpers {\n  // conn id -> [client->server, server->client]\n  const connections = new Observable<Record<string, BidiConnection>>({});\n\n  const transports: Array<MockClientTransport | MockServerTransport> = [];\n  class MockClientTransport extends ClientTransport<InMemoryConnection> {\n    async createNewOutgoingConnection(\n      to: TransportClientId,\n    ): Promise<InMemoryConnection> {\n      const [clientToServer, serverToClient] = duplexPair();\n      await new Promise((resolve) => setImmediate(resolve));\n\n      const connId = nanoid();\n      connections.set((prev) => ({\n        ...prev,\n        [connId]: {\n          id: connId,\n          clientToServer,\n          serverToClient,\n          clientId: this.clientId,\n          serverId: to,\n          handled: false,\n        },\n      }));\n\n      return new InMemoryConnection(clientToServer);\n    }\n  }\n\n  class MockServerTransport extends ServerTransport<InMemoryConnection> {\n    subscribeCleanup: () => void;\n\n    constructor(\n      clientId: TransportClientId,\n      options?: ProvidedServerTransportOptions,\n    ) {\n      super(clientId, options);\n\n      this.subscribeCleanup = connections.observe((conns) => {\n        // look for any unhandled connections\n        for (const conn of Object.values(conns)) {\n          // if we've already handled this connection, skip it\n          // or if it's not for us, skip it\n          if (conn.handled || conn.serverId !== this.clientId) {\n            continue;\n          }\n\n          conn.handled = true;\n          const connection = new InMemoryConnection(conn.serverToClient);\n          this.handleConnection(connection);\n        }\n      });\n    }\n\n    close() {\n      this.subscribeCleanup();\n      super.close();\n    }\n  }\n\n  return {\n    getClientTransport: (id, handshakeOptions) => {\n      const clientTransport = new MockClientTransport(id, opts?.client);\n      if (handshakeOptions) {\n        clientTransport.extendHandshake(handshakeOptions);\n      }\n\n      transports.push(clientTransport);\n\n      return clientTransport;\n    },\n    getServerTransport: (id = 'SERVER', handshakeOptions) => {\n      const serverTransport = new MockServerTransport(id, opts?.server);\n      if (handshakeOptions) {\n        serverTransport.extendHandshake(handshakeOptions);\n      }\n\n      transports.push(serverTransport);\n\n      return serverTransport;\n    },\n    simulatePhantomDisconnect() {\n      for (const conn of Object.values(connections.get())) {\n        conn.serverToClient.pause();\n      }\n    },\n    async restartServer() {\n      for (const transport of transports) {\n        if (transport.clientId !== 'SERVER') continue;\n        transport.close();\n      }\n\n      // kill all connections while we're at it\n      for (const conn of Object.values(connections.get())) {\n        conn.serverToClient.end();\n        conn.clientToServer.end();\n      }\n    },\n    cleanup() {\n      for (const conn of Object.values(connections.get())) {\n        conn.serverToClient.end();\n        conn.clientToServer.end();\n      }\n    },\n  };\n}\n"],"mappings":"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","names":[]}

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

@@ -25,7 +25,7 @@ __export(client_exports, {
 module.exports = __toCommonJS(client_exports);
 
 // transport/client.ts
-var import_api3 = require("@opentelemetry/api");
+var import_api4 = require("@opentelemetry/api");
 
 // transport/message.ts
 var import_typebox = require("@sinclair/typebox");
@@ -299,6 +299,7 @@ var LeakyBucketRateLimit = class {
 };
 
 // logging/log.ts
+var import_api = require("@opentelemetry/api");
 var LoggingLevels = {
   debug: -1,
   info: 0,
@@ -307,6 +308,15 @@ var LoggingLevels = {
 };
 var cleanedLogFn = (log) => {
   return (msg, metadata) => {
+    if (metadata && !metadata.telemetry) {
+      const span = import_api.trace.getSpan(import_api.context.active());
+      if (span) {
+        metadata.telemetry = {
+          traceId: span.spanContext().traceId,
+          spanId: span.spanContext().spanId
+        };
+      }
+    }
     if (!metadata?.transportMessage) {
       log(msg, metadata);
       return;
@@ -450,12 +460,14 @@ var StateMachineState = class {
 var CommonSession = class extends StateMachineState {
   from;
   options;
+  tracer;
   log;
-  constructor({ from, options, log }) {
+  constructor({ from, options, log, tracer }) {
     super();
     this.from = from;
     this.options = options;
     this.log = log;
+    this.tracer = tracer;
   }
   parseMsg(msg) {
     const parsedMsg = this.options.codec.fromBuffer(msg);
@@ -505,13 +517,13 @@ var IdentifiedSession = class extends CommonSession {
     this.protocolVersion = protocolVersion;
   }
   get loggingMetadata() {
-    const spanContext = this.telemetry.span.spanContext();
     const metadata = {
       clientId: this.from,
       connectedTo: this.to,
       sessionId: this.id
     };
     if (this.telemetry.span.isRecording()) {
+      const spanContext = this.telemetry.span.spanContext();
       metadata.telemetry = {
         traceId: spanContext.traceId,
         spanId: spanContext.spanId
@@ -638,10 +650,18 @@ var SessionNoConnection = class extends IdentifiedSessionWithGracePeriod {
 };
 
 // tracing/index.ts
-var import_api = require("@opentelemetry/api");
+var import_api2 = require("@opentelemetry/api");
+
+// transport/stringifyError.ts
+function coerceErrorString(err) {
+  if (err instanceof Error) {
+    return err.message || "unknown reason";
+  }
+  return `[coerced to error] ${String(err)}`;
+}
 
 // package.json
-var version = "0.203.0";
+var version = "0.204.0";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -649,13 +669,13 @@ function getPropagationContext(ctx) {
     traceparent: "",
     tracestate: ""
   };
-  import_api.propagation.inject(ctx, tracing);
+  import_api2.propagation.inject(ctx, tracing);
   return tracing;
 }
-function createSessionTelemetryInfo(sessionId, to, from, propagationCtx) {
-  const parentCtx = propagationCtx ? import_api.propagation.extract(import_api.context.active(), propagationCtx) : import_api.context.active();
+function createSessionTelemetryInfo(tracer, sessionId, to, from, propagationCtx) {
+  const parentCtx = propagationCtx ? import_api2.propagation.extract(import_api2.context.active(), propagationCtx) : import_api2.context.active();
   const span = tracer.startSpan(
-    `session ${sessionId}`,
+    `river.session.${sessionId}`,
     {
       attributes: {
         component: "river",
@@ -666,11 +686,27 @@ function createSessionTelemetryInfo(sessionId, to, from, propagationCtx) {
     },
     parentCtx
   );
-  const ctx = import_api.trace.setSpan(parentCtx, span);
+  const ctx = import_api2.trace.setSpan(parentCtx, span);
   return { span, ctx };
 }
-var tracer = import_api.trace.getTracer("river", version);
-var tracing_default = tracer;
+function createConnectionTelemetryInfo(tracer, connection, info) {
+  const span = tracer.startSpan(
+    `connection ${connection.id}`,
+    {
+      attributes: {
+        component: "river",
+        "river.connection.id": connection.id
+      },
+      links: [{ context: info.span.spanContext() }]
+    },
+    info.ctx
+  );
+  const ctx = import_api2.trace.setSpan(info.ctx, span);
+  return { span, ctx };
+}
+function getTracer() {
+  return import_api2.trace.getTracer("river", version);
+}
 
 // transport/sessionStateMachine/SessionWaitingForHandshake.ts
 var SessionWaitingForHandshake = class extends CommonSession {
@@ -776,7 +812,7 @@ var SessionHandshaking = class extends IdentifiedSessionWithGracePeriod {
 };
 
 // transport/sessionStateMachine/SessionConnected.ts
-var import_api2 = require("@opentelemetry/api");
+var import_api3 = require("@opentelemetry/api");
 var SessionConnected = class extends IdentifiedSession {
   state = "Connected" /* Connected */;
   conn;
@@ -880,7 +916,7 @@ var SessionConnected = class extends IdentifiedSession {
           tags: ["invariant-violation"]
         });
         this.telemetry.span.setStatus({
-          code: import_api2.SpanStatusCode.ERROR,
+          code: import_api3.SpanStatusCode.ERROR,
           message: reason
         });
         this.closeConnection();
@@ -956,6 +992,7 @@ function inheritSharedSession(session) {
     telemetry: session.telemetry,
     options: session.options,
     log: session.log,
+    tracer: session.tracer,
     protocolVersion: session.protocolVersion
   };
 }
@@ -967,9 +1004,9 @@ function inheritSharedSessionWithGrace(session) {
 }
 var SessionStateGraph = {
   entrypoints: {
-    NoConnection: (to, from, listeners, options, protocolVersion, log) => {
+    NoConnection: (to, from, listeners, options, protocolVersion, tracer, log) => {
       const id = `session-${generateId()}`;
-      const telemetry = createSessionTelemetryInfo(id, to, from);
+      const telemetry = createSessionTelemetryInfo(tracer, id, to, from);
       const sendBuffer = [];
       const session = new SessionNoConnection({
         listeners,
@@ -983,6 +1020,7 @@ var SessionStateGraph = {
         telemetry,
         options,
         protocolVersion,
+        tracer,
         log
       });
       session.log?.info(`session ${session.id} created in NoConnection state`, {
@@ -991,12 +1029,13 @@ var SessionStateGraph = {
       });
       return session;
     },
-    WaitingForHandshake: (from, conn, listeners, options, log) => {
+    WaitingForHandshake: (from, conn, listeners, options, tracer, log) => {
       const session = new SessionWaitingForHandshake({
         conn,
         listeners,
         from,
         options,
+        tracer,
         log
       });
       session.log?.info(`session created in WaitingForHandshake state`, {
@@ -1052,6 +1091,11 @@ var SessionStateGraph = {
         listeners,
         ...carriedState
       });
+      conn.telemetry = createConnectionTelemetryInfo(
+        session.tracer,
+        conn,
+        session.telemetry
+      );
       session.log?.info(
         `session ${session.id} transition from Connecting to Handshaking`,
         {
@@ -1095,12 +1139,14 @@ var SessionStateGraph = {
           ack: 0,
           sendBuffer: [],
           telemetry: createSessionTelemetryInfo(
+            pendingSession.tracer,
             sessionId,
             to,
             from,
             propagationCtx
           ),
           options,
+          tracer: pendingSession.tracer,
           log: pendingSession.log,
           protocolVersion
         }
@@ -1112,6 +1158,11 @@ var SessionStateGraph = {
         listeners,
         ...carriedState
       });
+      conn.telemetry = createConnectionTelemetryInfo(
+        session.tracer,
+        conn,
+        session.telemetry
+      );
       session.log?.info(
         `session ${session.id} transition from WaitingForHandshake to Connected`,
         {
@@ -1256,6 +1307,7 @@ var Transport = class {
    */
   options;
   log;
+  tracer;
   sessions;
   /**
    * Creates a new Transport instance.
@@ -1268,6 +1320,7 @@ var Transport = class {
     this.clientId = clientId;
     this.status = "open";
     this.sessions = /* @__PURE__ */ new Map();
+    this.tracer = getTracer();
   }
   bindLogger(fn, level) {
     if (typeof fn === "function") {
@@ -1450,14 +1503,6 @@ var Transport = class {
   }
 };
 
-// transport/stringifyError.ts
-function coerceErrorString(err) {
-  if (err instanceof Error) {
-    return err.message || "unknown reason";
-  }
-  return `[coerced to error] ${String(err)}`;
-}
-
 // transport/client.ts
 var import_value2 = require("@sinclair/typebox/value");
 var ClientTransport = class extends Transport {
@@ -1514,6 +1559,7 @@ var ClientTransport = class extends Transport {
       },
       this.options,
       currentProtocolVersion,
+      this.tracer,
       this.log
     );
     this.createSession(session);
@@ -1582,7 +1628,7 @@ var ClientTransport = class extends Transport {
   }
   rejectHandshakeResponse(session, reason, metadata) {
     session.conn.telemetry?.span.setStatus({
-      code: import_api3.SpanStatusCode.ERROR,
+      code: import_api4.SpanStatusCode.ERROR,
       message: reason
     });
     this.log?.warn(reason, metadata);
@@ -1723,18 +1769,21 @@ var ClientTransport = class extends Transport {
     }
   }
   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);
-        span.setStatus({ code: import_api3.SpanStatusCode.ERROR });
-        throw err;
-      } finally {
-        span.end();
+    const connPromise = session.tracer.startActiveSpan(
+      "connect",
+      async (span) => {
+        try {
+          return await this.createNewOutgoingConnection(session.to);
+        } catch (err) {
+          const errStr = coerceErrorString(err);
+          span.recordException(errStr);
+          span.setStatus({ code: import_api4.SpanStatusCode.ERROR });
+          throw err;
+        } finally {
+          span.end();
+        }
       }
-    });
+    );
     const connectingSession = ClientSessionStateGraph.transition.BackingOffToConnecting(
       session,
       connPromise,
@@ -1811,8 +1860,8 @@ var Connection = class {
   }
   get loggingMetadata() {
     const metadata = { connId: this.id };
-    const spanContext = this.telemetry?.span.spanContext();
-    if (this.telemetry?.span.isRecording() && spanContext) {
+    if (this.telemetry?.span.isRecording()) {
+      const spanContext = this.telemetry.span.spanContext();
       metadata.telemetry = {
         traceId: spanContext.traceId,
         spanId: spanContext.spanId
@@ -1833,6 +1882,22 @@ var Connection = class {
   get errorListeners() {
     return [...this._errorListeners];
   }
+  onData(msg) {
+    for (const cb of this.dataListeners) {
+      cb(msg);
+    }
+  }
+  onError(err) {
+    for (const cb of this.errorListeners) {
+      cb(err);
+    }
+  }
+  onClose() {
+    for (const cb of this.closeListeners) {
+      cb();
+    }
+    this.telemetry?.span.end();
+  }
   /**
    * Handle adding a callback for when a message is received.
    * @param msg The message that was received.
@@ -1899,18 +1964,12 @@ var WebSocketConnection = class extends Connection {
         const err = new Error(
           `websocket closed with code and reason: ${code} - ${reason}`
         );
-        for (const cb of this.errorListeners) {
-          cb(err);
-        }
-      }
-      for (const cb of this.closeListeners) {
-        cb();
+        this.onError(err);
       }
+      this.onClose();
     };
     this.ws.onmessage = (msg) => {
-      for (const cb of this.dataListeners) {
-        cb(msg.data);
-      }
+      this.onData(msg.data);
     };
   }
   send(payload) {