@replit/river 0.200.0-rc.4 → 0.200.0-rc.5

package/dist/{chunk-V57VWV5S.js.map → chunk-NM7DK5PR.js.map}

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

package/dist/{chunk-SI4YHBTI.js → chunk-RQY236KB.js}

@@ -5,10 +5,10 @@ import {
 import {
   SessionStateGraph,
   defaultTransportOptions
-} from "./chunk-RDGHFHXN.js";
+} from "./chunk-KD7YZLD6.js";
 import {
   generateId
-} from "./chunk-V57VWV5S.js";
+} from "./chunk-NM7DK5PR.js";
 
 // transport/events.ts
 var ProtocolError = {
@@ -274,4 +274,4 @@ export {
   Transport,
   Connection
 };
-//# sourceMappingURL=chunk-SI4YHBTI.js.map
+//# sourceMappingURL=chunk-RQY236KB.js.map

package/dist/router/index.cjs

@@ -170,6 +170,55 @@ var ServiceSchema = class _ServiceSchema {
       )
     };
   }
+  // TODO remove once clients migrate to v2
+  /**
+   * Same as {@link ServiceSchema.serialize}, but with a format that is compatible with
+   * protocol v1. This is useful to be able to continue to generate schemas for older
+   * clients as they are still supported.
+   */
+  serializeBackwardsCompatible() {
+    return {
+      procedures: Object.fromEntries(
+        Object.entries(this.procedures).map(
+          ([procName, procDef]) => {
+            if (procDef.type === "rpc" || procDef.type === "subscription") {
+              return [
+                procName,
+                {
+                  // BACKWARDS COMPAT: map init to input for protocolv1
+                  // this is the only change needed to make it compatible.
+                  input: import_typebox.Type.Strict(procDef.init),
+                  output: import_typebox.Type.Strict(procDef.output),
+                  // Only add `description` field if the type declares it.
+                  ..."description" in procDef ? { description: procDef.description } : {},
+                  // Only add the `errors` field if the type declares it.
+                  ..."errors" in procDef ? {
+                    errors: import_typebox.Type.Strict(procDef.errors)
+                  } : {},
+                  type: procDef.type
+                }
+              ];
+            }
+            return [
+              procName,
+              {
+                init: import_typebox.Type.Strict(procDef.init),
+                output: import_typebox.Type.Strict(procDef.output),
+                // Only add `description` field if the type declares it.
+                ..."description" in procDef ? { description: procDef.description } : {},
+                // Only add the `errors` field if the type declares it.
+                ..."errors" in procDef ? {
+                  errors: import_typebox.Type.Strict(procDef.errors)
+                } : {},
+                type: procDef.type,
+                input: import_typebox.Type.Strict(procDef.input)
+              }
+            ];
+          }
+        )
+      )
+    };
+  }
   /**
    * Instantiates this schema into a {@link Service} object.
    *
@@ -790,7 +839,7 @@ function isStreamAbort(controlFlag) {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.200.0-rc.4";
+var version = "0.200.0-rc.5";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -1223,7 +1272,8 @@ var RiverServer = class {
     from,
     sessionId,
     tracingCtx,
-    protocolVersion
+    protocolVersion,
+    passInitAsInputForBackwardsCompat
   }) {
     this.openStreams.add(streamId);
     let cleanClose = true;
@@ -1386,6 +1436,9 @@ var RiverServer = class {
         cleanup();
       }
     });
+    if (passInitAsInputForBackwardsCompat) {
+      inputReader.pushValue(Ok(initPayload));
+    }
     const outputWriter = new WriteStreamImpl((response) => {
       this.transport.send(from, {
         streamId,
@@ -1506,7 +1559,7 @@ var RiverServer = class {
             try {
               await procedure.handler(
                 serviceContextWithTransportInfo,
-                initPayload,
+                passInitAsInputForBackwardsCompat ? {} : initPayload,
                 outputWriter
               );
             } catch (err) {
@@ -1528,7 +1581,7 @@ var RiverServer = class {
             try {
               const outputMessage = await procedure.handler(
                 serviceContextWithTransportInfo,
-                initPayload,
+                passInitAsInputForBackwardsCompat ? {} : initPayload,
                 inputReader
               );
               if (outputWriter.isClosed()) {
@@ -1697,23 +1750,28 @@ var RiverServer = class {
       return null;
     }
     const procedure = service.procedures[initMessage.procedureName];
+    let passInitAsInputForBackwardsCompat = false;
     if (!import_value2.Value.Check(procedure.init, initMessage.payload)) {
-      const errMessage = `procedure init failed validation`;
-      this.log?.warn(errMessage, {
-        ...session.loggingMetadata,
-        clientId: this.transport.clientId,
-        transportMessage: initMessage,
-        tags: ["invalid-request"]
-      });
-      this.abortStream(
-        initMessage.from,
-        initMessage.streamId,
-        Err({
-          code: INVALID_REQUEST_CODE,
-          message: errMessage
-        })
-      );
-      return null;
+      if (session.protocolVersion === "v1.1" && (procedure.type === "upload" || procedure.type === "stream") && import_value2.Value.Check(procedure.input, initMessage.payload) && import_value2.Value.Check(procedure.init, {})) {
+        passInitAsInputForBackwardsCompat = true;
+      } else {
+        const errMessage = `procedure init failed validation`;
+        this.log?.warn(errMessage, {
+          ...session.loggingMetadata,
+          clientId: this.transport.clientId,
+          transportMessage: initMessage,
+          tags: ["invalid-request"]
+        });
+        this.abortStream(
+          initMessage.from,
+          initMessage.streamId,
+          Err({
+            code: INVALID_REQUEST_CODE,
+            message: errMessage
+          })
+        );
+        return null;
+      }
     }
     return {
       sessionMetadata,
@@ -1731,7 +1789,8 @@ var RiverServer = class {
       initPayload: initMessage.payload,
       from: initMessage.from,
       sessionId: session.id,
-      protocolVersion: session.protocolVersion
+      protocolVersion: session.protocolVersion,
+      passInitAsInputForBackwardsCompat
     };
   }
   abortStream(to, streamId, payload) {