@replit/river 0.207.3 → 0.208.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/{chunk-BO7MFCO6.js → chunk-2WFRHXDZ.js} +47 -84
- package/dist/chunk-2WFRHXDZ.js.map +1 -0
- package/dist/{chunk-B7REV3ZV.js → chunk-BXKBENJE.js} +2 -2
- package/dist/{chunk-QGPYCXV4.js → chunk-EVAQ2QMB.js} +61 -38
- package/dist/chunk-EVAQ2QMB.js.map +1 -0
- package/dist/codec/index.cjs +1 -1
- package/dist/codec/index.cjs.map +1 -1
- package/dist/codec/index.js +2 -2
- package/dist/{connection-06d72f2e.d.ts → connection-098d4aad.d.ts} +1 -1
- package/dist/router/index.cjs +58 -35
- package/dist/router/index.cjs.map +1 -1
- package/dist/router/index.d.cts +24 -5
- package/dist/router/index.d.ts +24 -5
- package/dist/router/index.js +1 -1
- package/dist/{services-87887bc5.d.ts → services-44be1b6b.d.ts} +22 -25
- package/dist/testUtil/index.cjs +51 -94
- package/dist/testUtil/index.cjs.map +1 -1
- package/dist/testUtil/index.d.cts +1 -1
- package/dist/testUtil/index.d.ts +1 -1
- package/dist/testUtil/index.js +5 -11
- package/dist/testUtil/index.js.map +1 -1
- package/dist/transport/impls/ws/client.cjs +48 -73
- package/dist/transport/impls/ws/client.cjs.map +1 -1
- package/dist/transport/impls/ws/client.d.cts +2 -2
- package/dist/transport/impls/ws/client.d.ts +2 -2
- package/dist/transport/impls/ws/client.js +3 -3
- package/dist/transport/impls/ws/server.cjs +48 -76
- package/dist/transport/impls/ws/server.cjs.map +1 -1
- package/dist/transport/impls/ws/server.d.cts +2 -2
- package/dist/transport/impls/ws/server.d.ts +2 -2
- package/dist/transport/impls/ws/server.js +3 -3
- package/dist/transport/index.cjs +48 -85
- package/dist/transport/index.cjs.map +1 -1
- package/dist/transport/index.d.cts +2 -2
- package/dist/transport/index.d.ts +2 -2
- package/dist/transport/index.js +2 -2
- package/package.json +3 -3
- package/dist/chunk-BO7MFCO6.js.map +0 -1
- package/dist/chunk-QGPYCXV4.js.map +0 -1
- /package/dist/{chunk-B7REV3ZV.js.map → chunk-BXKBENJE.js.map} +0 -0
package/dist/codec/index.cjs
CHANGED
package/dist/codec/index.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../codec/index.ts","../../codec/binary.ts","../../codec/json.ts","../../codec/adapter.ts","../../transport/message.ts","../../transport/stringifyError.ts"],"sourcesContent":["export { BinaryCodec } from './binary';\nexport { NaiveJsonCodec } from './json';\nexport type { Codec } from './types';\nexport { CodecMessageAdapter } from './adapter';\n","import { decode, encode } from '@msgpack/msgpack';\nimport { Codec } from './types';\n\n/**\n * Binary codec, uses [msgpack](https://www.npmjs.com/package/@msgpack/msgpack) under the hood\n * @type {Codec}\n */\nexport const BinaryCodec: Codec = {\n toBuffer(obj) {\n return encode(obj, { ignoreUndefined: true });\n },\n fromBuffer: (buff: Uint8Array) => {\n const res = decode(buff);\n if (typeof res !== 'object' || res === null) {\n throw new Error('unpacked msg is not an object');\n }\n\n return res;\n },\n};\n","import { Codec } from './types';\n\nconst encoder = new TextEncoder();\nconst decoder = new TextDecoder();\n\n// Convert Uint8Array to base64\nfunction uint8ArrayToBase64(uint8Array: Uint8Array) {\n let binary = '';\n uint8Array.forEach((byte) => {\n binary += String.fromCharCode(byte);\n });\n\n return btoa(binary);\n}\n\n// Convert base64 to Uint8Array\nfunction base64ToUint8Array(base64: string) {\n const binaryString = atob(base64);\n const uint8Array = new Uint8Array(binaryString.length);\n for (let i = 0; i < binaryString.length; i++) {\n uint8Array[i] = binaryString.charCodeAt(i);\n }\n\n return uint8Array;\n}\n\ninterface Base64EncodedValue {\n $t: string;\n}\n\n/**\n * Naive JSON codec implementation using JSON.stringify and JSON.parse.\n * @type {Codec}\n */\nexport const NaiveJsonCodec: Codec = {\n toBuffer: (obj: object) => {\n return encoder.encode(\n JSON.stringify(obj, function replacer<\n T extends object,\n >(this: T, key: keyof T) {\n const val = this[key];\n if (val instanceof Uint8Array) {\n return { $t: uint8ArrayToBase64(val) } satisfies Base64EncodedValue;\n } else {\n return val;\n }\n }),\n );\n },\n fromBuffer: (buff: Uint8Array) => {\n const parsed = JSON.parse(\n decoder.decode(buff),\n function reviver(_key, val: unknown) {\n if ((val as Base64EncodedValue | undefined)?.$t) {\n return base64ToUint8Array((val as Base64EncodedValue).$t);\n } else {\n return val;\n }\n },\n ) as unknown;\n\n if (typeof parsed !== 'object' || parsed === null) {\n throw new Error('unpacked msg is not an object');\n }\n\n return parsed;\n },\n};\n","import { Value } from '@sinclair/typebox/value';\nimport {\n OpaqueTransportMessage,\n OpaqueTransportMessageSchema,\n} from '../transport';\nimport { Codec } from './types';\nimport { DeserializeResult, SerializeResult } from '../transport/results';\nimport { coerceErrorString } from '../transport/stringifyError';\n\n/**\n * Adapts a {@link Codec} to the {@link OpaqueTransportMessage} format,\n * accounting for fallibility of toBuffer and fromBuffer and wrapping\n * it with a Result type.\n */\nexport class CodecMessageAdapter {\n constructor(private readonly codec: Codec) {}\n\n toBuffer(msg: OpaqueTransportMessage): SerializeResult {\n try {\n return {\n ok: true,\n value: this.codec.toBuffer(msg),\n };\n } catch (e) {\n return {\n ok: false,\n reason: coerceErrorString(e),\n };\n }\n }\n\n fromBuffer(buf: Uint8Array): DeserializeResult {\n try {\n const parsedMsg = this.codec.fromBuffer(buf);\n if (!Value.Check(OpaqueTransportMessageSchema, parsedMsg)) {\n return {\n ok: false,\n reason: 'transport message schema mismatch',\n };\n }\n\n return {\n ok: true,\n value: parsedMsg,\n };\n } catch (e) {\n return {\n ok: false,\n reason: coerceErrorString(e),\n };\n }\n }\n}\n","import { Type, TSchema, Static } from '@sinclair/typebox';\nimport { PropagationContext } from '../tracing';\nimport { generateId } from './id';\nimport { ErrResult, ReaderErrorSchema } 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 a stream is cancelled due errors or to explicit cancellation\n */\n StreamCancelBit = 0b00100,\n /**\n * Used when writer closes the stream.\n */\n StreamClosedBit = 0b01000,\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 type ProtocolVersion = 'v1.1' | 'v2.0';\nexport const currentProtocolVersion = 'v2.0' satisfies ProtocolVersion;\nexport const acceptedProtocolVersions = ['v1.1', currentProtocolVersion];\nexport function isAcceptedProtocolVersion(\n version: string,\n): version is ProtocolVersion {\n return acceptedProtocolVersions.includes(version);\n}\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 nextSentSeq: Type.Integer(),\n }),\n\n metadata: Type.Optional(Type.Unknown()),\n});\n\nexport const HandshakeErrorRetriableResponseCodes = Type.Union([\n Type.Literal('SESSION_STATE_MISMATCH'),\n]);\n\nexport const HandshakeErrorCustomHandlerFatalResponseCodes = Type.Union([\n // The custom validation handler rejected the handler because the client is unsupported.\n Type.Literal('REJECTED_UNSUPPORTED_CLIENT'),\n // The custom validation handler rejected the handshake.\n Type.Literal('REJECTED_BY_CUSTOM_HANDLER'),\n]);\n\nexport const HandshakeErrorFatalResponseCodes = Type.Union([\n HandshakeErrorCustomHandlerFatalResponseCodes,\n // The ciient sent a handshake that doesn't comply with the extended handshake metadata.\n Type.Literal('MALFORMED_HANDSHAKE_META'),\n // The ciient sent a handshake that doesn't comply with ControlMessageHandshakeRequestSchema.\n Type.Literal('MALFORMED_HANDSHAKE'),\n // The client's protocol version does not match the server's.\n Type.Literal('PROTOCOL_VERSION_MISMATCH'),\n]);\n\nexport const HandshakeErrorResponseCodes = Type.Union([\n HandshakeErrorRetriableResponseCodes,\n HandshakeErrorFatalResponseCodes,\n]);\n\nexport const ControlMessageHandshakeResponseSchema = Type.Object({\n type: Type.Literal('HANDSHAKE_RESP'),\n status: Type.Union([\n Type.Object({\n ok: Type.Literal(true),\n sessionId: Type.String(),\n }),\n Type.Object({\n ok: Type.Literal(false),\n reason: Type.String(),\n code: 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 cancelMessage(\n streamId: string,\n payload: ErrResult<Static<typeof ReaderErrorSchema>>,\n) {\n return {\n streamId,\n controlFlags: ControlFlags.StreamCancelBit,\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 an cancel message.\n * @param controlFlag - The control flag to check.\n * @returns True if the control flag contains the CancelBit, false otherwise\n */\nexport function isStreamCancel(controlFlag: number): boolean {\n return (\n /* eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison */\n (controlFlag & ControlFlags.StreamCancelBit) ===\n ControlFlags.StreamCancelBit\n );\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"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,qBAA+B;AAOxB,IAAM,cAAqB;AAAA,EAChC,SAAS,KAAK;AACZ,eAAO,uBAAO,KAAK,EAAE,iBAAiB,KAAK,CAAC;AAAA,EAC9C;AAAA,EACA,YAAY,CAAC,SAAqB;AAChC,UAAM,UAAM,uBAAO,IAAI;AACvB,QAAI,OAAO,QAAQ,YAAY,QAAQ,MAAM;AAC3C,YAAM,IAAI,MAAM,+BAA+B;AAAA,IACjD;AAEA,WAAO;AAAA,EACT;AACF;;;ACjBA,IAAM,UAAU,IAAI,YAAY;AAChC,IAAM,UAAU,IAAI,YAAY;AAGhC,SAAS,mBAAmB,YAAwB;AAClD,MAAI,SAAS;AACb,aAAW,QAAQ,CAAC,SAAS;AAC3B,cAAU,OAAO,aAAa,IAAI;AAAA,EACpC,CAAC;AAED,SAAO,KAAK,MAAM;AACpB;AAGA,SAAS,mBAAmB,QAAgB;AAC1C,QAAM,eAAe,KAAK,MAAM;AAChC,QAAM,aAAa,IAAI,WAAW,aAAa,MAAM;AACrD,WAAS,IAAI,GAAG,IAAI,aAAa,QAAQ,KAAK;AAC5C,eAAW,CAAC,IAAI,aAAa,WAAW,CAAC;AAAA,EAC3C;AAEA,SAAO;AACT;AAUO,IAAM,iBAAwB;AAAA,EACnC,UAAU,CAAC,QAAgB;AACzB,WAAO,QAAQ;AAAA,MACb,KAAK,UAAU,KAAK,SAAS,SAElB,KAAc;AACvB,cAAM,MAAM,KAAK,GAAG;AACpB,YAAI,eAAe,YAAY;AAC7B,iBAAO,EAAE,IAAI,mBAAmB,GAAG,EAAE;AAAA,QACvC,OAAO;AACL,iBAAO;AAAA,QACT;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACF;AAAA,EACA,YAAY,CAAC,SAAqB;AAChC,UAAM,SAAS,KAAK;AAAA,MAClB,QAAQ,OAAO,IAAI;AAAA,MACnB,SAAS,QAAQ,MAAM,KAAc;AACnC,YAAK,KAAwC,IAAI;AAC/C,iBAAO,mBAAoB,IAA2B,EAAE;AAAA,QAC1D,OAAO;AACL,iBAAO;AAAA,QACT;AAAA,MACF;AAAA,IACF;AAEA,QAAI,OAAO,WAAW,YAAY,WAAW,MAAM;AACjD,YAAM,IAAI,MAAM,+BAA+B;AAAA,IACjD;AAEA,WAAO;AAAA,EACT;AACF;;;ACnEA,mBAAsB;;;ACAtB,qBAAsC;AAiC/B,IAAM,yBAAyB,CAAoB,MACxD,oBAAK,OAAO;AAAA,EACV,IAAI,oBAAK,OAAO;AAAA,EAChB,MAAM,oBAAK,OAAO;AAAA,EAClB,IAAI,oBAAK,OAAO;AAAA,EAChB,KAAK,oBAAK,QAAQ;AAAA,EAClB,KAAK,oBAAK,QAAQ;AAAA,EAClB,aAAa,oBAAK,SAAS,oBAAK,OAAO,CAAC;AAAA,EACxC,eAAe,oBAAK,SAAS,oBAAK,OAAO,CAAC;AAAA,EAC1C,UAAU,oBAAK,OAAO;AAAA,EACtB,cAAc,oBAAK,QAAQ;AAAA,EAC3B,SAAS,oBAAK;AAAA,IACZ,oBAAK,OAAO;AAAA,MACV,aAAa,oBAAK,OAAO;AAAA,MACzB,YAAY,oBAAK,OAAO;AAAA,IAC1B,CAAC;AAAA,EACH;AAAA,EACA,SAAS;AACX,CAAC;AAOI,IAAM,0BAA0B,oBAAK,OAAO;AAAA,EACjD,MAAM,oBAAK,QAAQ,KAAK;AAC1B,CAAC;AAMM,IAAM,4BAA4B,oBAAK,OAAO;AAAA,EACnD,MAAM,oBAAK,QAAQ,OAAO;AAC5B,CAAC;AAWM,IAAM,uCAAuC,oBAAK,OAAO;AAAA,EAC9D,MAAM,oBAAK,QAAQ,eAAe;AAAA,EAClC,iBAAiB,oBAAK,OAAO;AAAA,EAC7B,WAAW,oBAAK,OAAO;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAMvB,sBAAsB,oBAAK,OAAO;AAAA;AAAA,IAEhC,iBAAiB,oBAAK,QAAQ;AAAA,IAC9B,aAAa,oBAAK,QAAQ;AAAA,EAC5B,CAAC;AAAA,EAED,UAAU,oBAAK,SAAS,oBAAK,QAAQ,CAAC;AACxC,CAAC;AAEM,IAAM,uCAAuC,oBAAK,MAAM;AAAA,EAC7D,oBAAK,QAAQ,wBAAwB;AACvC,CAAC;AAEM,IAAM,gDAAgD,oBAAK,MAAM;AAAA;AAAA,EAEtE,oBAAK,QAAQ,6BAA6B;AAAA;AAAA,EAE1C,oBAAK,QAAQ,4BAA4B;AAC3C,CAAC;AAEM,IAAM,mCAAmC,oBAAK,MAAM;AAAA,EACzD;AAAA;AAAA,EAEA,oBAAK,QAAQ,0BAA0B;AAAA;AAAA,EAEvC,oBAAK,QAAQ,qBAAqB;AAAA;AAAA,EAElC,oBAAK,QAAQ,2BAA2B;AAC1C,CAAC;AAEM,IAAM,8BAA8B,oBAAK,MAAM;AAAA,EACpD;AAAA,EACA;AACF,CAAC;AAEM,IAAM,wCAAwC,oBAAK,OAAO;AAAA,EAC/D,MAAM,oBAAK,QAAQ,gBAAgB;AAAA,EACnC,QAAQ,oBAAK,MAAM;AAAA,IACjB,oBAAK,OAAO;AAAA,MACV,IAAI,oBAAK,QAAQ,IAAI;AAAA,MACrB,WAAW,oBAAK,OAAO;AAAA,IACzB,CAAC;AAAA,IACD,oBAAK,OAAO;AAAA,MACV,IAAI,oBAAK,QAAQ,KAAK;AAAA,MACtB,QAAQ,oBAAK,OAAO;AAAA,MACpB,MAAM;AAAA,IACR,CAAC;AAAA,EACH,CAAC;AACH,CAAC;AAEM,IAAM,8BAA8B,oBAAK,MAAM;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,CAAC;AAOM,IAAM,+BAA+B;AAAA,EAC1C,oBAAK,QAAQ;AACf;;;ACxJO,SAAS,kBAAkB,KAAsB;AACtD,MAAI,eAAe,OAAO;AACxB,WAAO,IAAI,WAAW;AAAA,EACxB;AAEA,SAAO,sBAAsB,OAAO,GAAG,CAAC;AAC1C;;;AFQO,IAAM,sBAAN,MAA0B;AAAA,EAC/B,YAA6B,OAAc;AAAd;AAAA,EAAe;AAAA,EAE5C,SAAS,KAA8C;AACrD,QAAI;AACF,aAAO;AAAA,QACL,IAAI;AAAA,QACJ,OAAO,KAAK,MAAM,SAAS,GAAG;AAAA,MAChC;AAAA,IACF,SAAS,GAAG;AACV,aAAO;AAAA,QACL,IAAI;AAAA,QACJ,QAAQ,kBAAkB,CAAC;AAAA,MAC7B;AAAA,IACF;AAAA,EACF;AAAA,EAEA,WAAW,KAAoC;AAC7C,QAAI;AACF,YAAM,YAAY,KAAK,MAAM,WAAW,GAAG;AAC3C,UAAI,CAAC,mBAAM,MAAM,8BAA8B,SAAS,GAAG;AACzD,eAAO;AAAA,UACL,IAAI;AAAA,UACJ,QAAQ;AAAA,QACV;AAAA,MACF;AAEA,aAAO;AAAA,QACL,IAAI;AAAA,QACJ,OAAO;AAAA,MACT;AAAA,IACF,SAAS,GAAG;AACV,aAAO;AAAA,QACL,IAAI;AAAA,QACJ,QAAQ,kBAAkB,CAAC;AAAA,MAC7B;AAAA,IACF;AAAA,EACF;AACF;","names":[]}
|
|
1
|
+
{"version":3,"sources":["../../codec/index.ts","../../codec/binary.ts","../../codec/json.ts","../../codec/adapter.ts","../../transport/message.ts","../../transport/stringifyError.ts"],"sourcesContent":["export { BinaryCodec } from './binary';\nexport { NaiveJsonCodec } from './json';\nexport type { Codec } from './types';\nexport { CodecMessageAdapter } from './adapter';\n","import { decode, encode } from '@msgpack/msgpack';\nimport { Codec } from './types';\n\n/**\n * Binary codec, uses [msgpack](https://www.npmjs.com/package/@msgpack/msgpack) under the hood\n * @type {Codec}\n */\nexport const BinaryCodec: Codec = {\n toBuffer(obj) {\n return encode(obj, { ignoreUndefined: true });\n },\n fromBuffer: (buff: Uint8Array) => {\n const res = decode(buff);\n if (typeof res !== 'object' || res === null) {\n throw new Error('unpacked msg is not an object');\n }\n\n return res;\n },\n};\n","import { Codec } from './types';\n\nconst encoder = new TextEncoder();\nconst decoder = new TextDecoder();\n\n// Convert Uint8Array to base64\nfunction uint8ArrayToBase64(uint8Array: Uint8Array) {\n let binary = '';\n uint8Array.forEach((byte) => {\n binary += String.fromCharCode(byte);\n });\n\n return btoa(binary);\n}\n\n// Convert base64 to Uint8Array\nfunction base64ToUint8Array(base64: string) {\n const binaryString = atob(base64);\n const uint8Array = new Uint8Array(binaryString.length);\n for (let i = 0; i < binaryString.length; i++) {\n uint8Array[i] = binaryString.charCodeAt(i);\n }\n\n return uint8Array;\n}\n\ninterface Base64EncodedValue {\n $t: string;\n}\n\n/**\n * Naive JSON codec implementation using JSON.stringify and JSON.parse.\n * @type {Codec}\n */\nexport const NaiveJsonCodec: Codec = {\n toBuffer: (obj: object) => {\n return encoder.encode(\n JSON.stringify(obj, function replacer<\n T extends object,\n >(this: T, key: keyof T) {\n const val = this[key];\n if (val instanceof Uint8Array) {\n return { $t: uint8ArrayToBase64(val) } satisfies Base64EncodedValue;\n } else {\n return val;\n }\n }),\n );\n },\n fromBuffer: (buff: Uint8Array) => {\n const parsed = JSON.parse(\n decoder.decode(buff),\n function reviver(_key, val: unknown) {\n if ((val as Base64EncodedValue | undefined)?.$t !== undefined) {\n return base64ToUint8Array((val as Base64EncodedValue).$t);\n } else {\n return val;\n }\n },\n ) as unknown;\n\n if (typeof parsed !== 'object' || parsed === null) {\n throw new Error('unpacked msg is not an object');\n }\n\n return parsed;\n },\n};\n","import { Value } from '@sinclair/typebox/value';\nimport {\n OpaqueTransportMessage,\n OpaqueTransportMessageSchema,\n} from '../transport';\nimport { Codec } from './types';\nimport { DeserializeResult, SerializeResult } from '../transport/results';\nimport { coerceErrorString } from '../transport/stringifyError';\n\n/**\n * Adapts a {@link Codec} to the {@link OpaqueTransportMessage} format,\n * accounting for fallibility of toBuffer and fromBuffer and wrapping\n * it with a Result type.\n */\nexport class CodecMessageAdapter {\n constructor(private readonly codec: Codec) {}\n\n toBuffer(msg: OpaqueTransportMessage): SerializeResult {\n try {\n return {\n ok: true,\n value: this.codec.toBuffer(msg),\n };\n } catch (e) {\n return {\n ok: false,\n reason: coerceErrorString(e),\n };\n }\n }\n\n fromBuffer(buf: Uint8Array): DeserializeResult {\n try {\n const parsedMsg = this.codec.fromBuffer(buf);\n if (!Value.Check(OpaqueTransportMessageSchema, parsedMsg)) {\n return {\n ok: false,\n reason: 'transport message schema mismatch',\n };\n }\n\n return {\n ok: true,\n value: parsedMsg,\n };\n } catch (e) {\n return {\n ok: false,\n reason: coerceErrorString(e),\n };\n }\n }\n}\n","import { Type, TSchema, Static } from '@sinclair/typebox';\nimport { PropagationContext } from '../tracing';\nimport { generateId } from './id';\nimport { ErrResult, ReaderErrorSchema } 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 a stream is cancelled due errors or to explicit cancellation\n */\n StreamCancelBit = 0b00100,\n /**\n * Used when writer closes the stream.\n */\n StreamClosedBit = 0b01000,\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 type ProtocolVersion = 'v1.1' | 'v2.0';\nexport const currentProtocolVersion = 'v2.0' satisfies ProtocolVersion;\nexport const acceptedProtocolVersions = ['v1.1', currentProtocolVersion];\nexport function isAcceptedProtocolVersion(\n version: string,\n): version is ProtocolVersion {\n return acceptedProtocolVersions.includes(version);\n}\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 nextSentSeq: Type.Integer(),\n }),\n\n metadata: Type.Optional(Type.Unknown()),\n});\n\nexport const HandshakeErrorRetriableResponseCodes = Type.Union([\n Type.Literal('SESSION_STATE_MISMATCH'),\n]);\n\nexport const HandshakeErrorCustomHandlerFatalResponseCodes = Type.Union([\n // The custom validation handler rejected the handler because the client is unsupported.\n Type.Literal('REJECTED_UNSUPPORTED_CLIENT'),\n // The custom validation handler rejected the handshake.\n Type.Literal('REJECTED_BY_CUSTOM_HANDLER'),\n]);\n\nexport const HandshakeErrorFatalResponseCodes = Type.Union([\n HandshakeErrorCustomHandlerFatalResponseCodes,\n // The ciient sent a handshake that doesn't comply with the extended handshake metadata.\n Type.Literal('MALFORMED_HANDSHAKE_META'),\n // The ciient sent a handshake that doesn't comply with ControlMessageHandshakeRequestSchema.\n Type.Literal('MALFORMED_HANDSHAKE'),\n // The client's protocol version does not match the server's.\n Type.Literal('PROTOCOL_VERSION_MISMATCH'),\n]);\n\nexport const HandshakeErrorResponseCodes = Type.Union([\n HandshakeErrorRetriableResponseCodes,\n HandshakeErrorFatalResponseCodes,\n]);\n\nexport const ControlMessageHandshakeResponseSchema = Type.Object({\n type: Type.Literal('HANDSHAKE_RESP'),\n status: Type.Union([\n Type.Object({\n ok: Type.Literal(true),\n sessionId: Type.String(),\n }),\n Type.Object({\n ok: Type.Literal(false),\n reason: Type.String(),\n code: 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 cancelMessage(\n streamId: string,\n payload: ErrResult<Static<typeof ReaderErrorSchema>>,\n) {\n return {\n streamId,\n controlFlags: ControlFlags.StreamCancelBit,\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 an cancel message.\n * @param controlFlag - The control flag to check.\n * @returns True if the control flag contains the CancelBit, false otherwise\n */\nexport function isStreamCancel(controlFlag: number): boolean {\n return (\n /* eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison */\n (controlFlag & ControlFlags.StreamCancelBit) ===\n ControlFlags.StreamCancelBit\n );\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"],"mappings":"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","names":[]}
|
package/dist/codec/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { T as Tags } from './index-02554794.js';
|
|
2
2
|
import { P as ProtocolVersion, O as OpaqueTransportMessage } from './message-01c3e85a.js';
|
|
3
|
-
import { b as Connection } from './services-
|
|
3
|
+
import { b as Connection } from './services-44be1b6b.js';
|
|
4
4
|
import { W as WsLike } from './wslike-e0b32dd5.js';
|
|
5
5
|
|
|
6
6
|
interface ConnectionInfoExtras extends Record<string, unknown> {
|
package/dist/router/index.cjs
CHANGED
|
@@ -68,10 +68,11 @@ function castTypeboxValueErrors(errors) {
|
|
|
68
68
|
}
|
|
69
69
|
return result;
|
|
70
70
|
}
|
|
71
|
-
var
|
|
71
|
+
var CancelErrorSchema = import_typebox.Type.Object({
|
|
72
72
|
code: import_typebox.Type.Literal(CANCEL_CODE),
|
|
73
73
|
message: import_typebox.Type.String()
|
|
74
74
|
});
|
|
75
|
+
var CancelResultSchema = ErrResultSchema(CancelErrorSchema);
|
|
75
76
|
var ReaderErrorSchema = import_typebox.Type.Union([
|
|
76
77
|
import_typebox.Type.Object({
|
|
77
78
|
code: import_typebox.Type.Literal(UNCAUGHT_ERROR_CODE),
|
|
@@ -91,8 +92,9 @@ var ReaderErrorSchema = import_typebox.Type.Union([
|
|
|
91
92
|
})
|
|
92
93
|
)
|
|
93
94
|
}),
|
|
94
|
-
|
|
95
|
+
CancelErrorSchema
|
|
95
96
|
]);
|
|
97
|
+
var ReaderErrorResultSchema = ErrResultSchema(ReaderErrorSchema);
|
|
96
98
|
function isUnion(schema) {
|
|
97
99
|
return schema[import_typebox.Kind] === "Union";
|
|
98
100
|
}
|
|
@@ -900,7 +902,6 @@ var WritableImpl = class {
|
|
|
900
902
|
|
|
901
903
|
// router/client.ts
|
|
902
904
|
var import_value = require("@sinclair/typebox/value");
|
|
903
|
-
var ReaderErrResultSchema = ErrResultSchema(ReaderErrorSchema);
|
|
904
905
|
var noop = () => {
|
|
905
906
|
};
|
|
906
907
|
function _createRecursiveProxy(callback, path) {
|
|
@@ -1050,20 +1051,20 @@ function handleProc(procType, transport, serverId, init, serviceName, procedureN
|
|
|
1050
1051
|
cleanClose = false;
|
|
1051
1052
|
span.addEvent("received cancel");
|
|
1052
1053
|
let cancelResult;
|
|
1053
|
-
if (import_value.Value.Check(
|
|
1054
|
+
if (import_value.Value.Check(ReaderErrorResultSchema, msg.payload)) {
|
|
1054
1055
|
cancelResult = msg.payload;
|
|
1055
1056
|
} else {
|
|
1056
1057
|
cancelResult = Err({
|
|
1057
1058
|
code: CANCEL_CODE,
|
|
1058
1059
|
message: "stream cancelled with invalid payload"
|
|
1059
1060
|
});
|
|
1060
|
-
transport.log?.
|
|
1061
|
+
transport.log?.warn(
|
|
1061
1062
|
"got stream cancel without a valid protocol error",
|
|
1062
1063
|
{
|
|
1063
1064
|
clientId: transport.clientId,
|
|
1064
1065
|
transportMessage: msg,
|
|
1065
1066
|
validationErrors: [
|
|
1066
|
-
...import_value.Value.Errors(
|
|
1067
|
+
...import_value.Value.Errors(ReaderErrorResultSchema, msg.payload)
|
|
1067
1068
|
]
|
|
1068
1069
|
}
|
|
1069
1070
|
);
|
|
@@ -1191,6 +1192,7 @@ var RiverServer = class {
|
|
|
1191
1192
|
transport;
|
|
1192
1193
|
contextMap;
|
|
1193
1194
|
log;
|
|
1195
|
+
middlewares;
|
|
1194
1196
|
/**
|
|
1195
1197
|
* We create a tombstones for streams cancelled by the server
|
|
1196
1198
|
* so that we don't hit errors when the client has inflight
|
|
@@ -1203,8 +1205,9 @@ var RiverServer = class {
|
|
|
1203
1205
|
streams;
|
|
1204
1206
|
services;
|
|
1205
1207
|
unregisterTransportListeners;
|
|
1206
|
-
constructor(transport, services, handshakeOptions, extendedContext, maxCancelledStreamTombstonesPerSession = 200) {
|
|
1208
|
+
constructor(transport, services, handshakeOptions, extendedContext, maxCancelledStreamTombstonesPerSession = 200, middlewares = []) {
|
|
1207
1209
|
const instances = {};
|
|
1210
|
+
this.middlewares = middlewares;
|
|
1208
1211
|
this.services = instances;
|
|
1209
1212
|
this.contextMap = /* @__PURE__ */ new Map();
|
|
1210
1213
|
for (const [name, service] of Object.entries(services)) {
|
|
@@ -1328,7 +1331,7 @@ var RiverServer = class {
|
|
|
1328
1331
|
if (isStreamCancelBackwardsCompat(msg.controlFlags, protocolVersion)) {
|
|
1329
1332
|
let cancelResult;
|
|
1330
1333
|
if (import_value2.Value.Check(CancelResultSchema, msg.payload)) {
|
|
1331
|
-
cancelResult =
|
|
1334
|
+
cancelResult = msg.payload;
|
|
1332
1335
|
} else {
|
|
1333
1336
|
cancelResult = Err({
|
|
1334
1337
|
code: CANCEL_CODE,
|
|
@@ -1524,12 +1527,12 @@ var RiverServer = class {
|
|
|
1524
1527
|
if (procClosesWithInit) {
|
|
1525
1528
|
closeReadable();
|
|
1526
1529
|
}
|
|
1527
|
-
const handlerContextWithSpan =
|
|
1530
|
+
const handlerContextWithSpan = {
|
|
1528
1531
|
...serviceContext,
|
|
1529
1532
|
from,
|
|
1530
1533
|
sessionId,
|
|
1531
1534
|
metadata: sessionMetadata,
|
|
1532
|
-
span
|
|
1535
|
+
span,
|
|
1533
1536
|
cancel: (message) => {
|
|
1534
1537
|
const errRes = {
|
|
1535
1538
|
code: CANCEL_CODE,
|
|
@@ -1539,13 +1542,24 @@ var RiverServer = class {
|
|
|
1539
1542
|
return Err(errRes);
|
|
1540
1543
|
},
|
|
1541
1544
|
signal: finishedController.signal
|
|
1542
|
-
}
|
|
1543
|
-
|
|
1544
|
-
|
|
1545
|
-
|
|
1545
|
+
};
|
|
1546
|
+
const middlewareContext = {
|
|
1547
|
+
...serviceContext,
|
|
1548
|
+
sessionId,
|
|
1549
|
+
from,
|
|
1550
|
+
metadata: sessionMetadata,
|
|
1551
|
+
span,
|
|
1552
|
+
signal: finishedController.signal,
|
|
1553
|
+
streamId,
|
|
1554
|
+
procedureName,
|
|
1555
|
+
serviceName
|
|
1556
|
+
};
|
|
1557
|
+
const runProcedureHandler = async () => {
|
|
1558
|
+
switch (procedure.type) {
|
|
1559
|
+
case "rpc":
|
|
1546
1560
|
try {
|
|
1547
1561
|
const responsePayload = await procedure.handler({
|
|
1548
|
-
ctx: handlerContextWithSpan
|
|
1562
|
+
ctx: handlerContextWithSpan,
|
|
1549
1563
|
reqInit: initPayload
|
|
1550
1564
|
});
|
|
1551
1565
|
if (resWritable.isClosed()) {
|
|
@@ -1557,13 +1571,11 @@ var RiverServer = class {
|
|
|
1557
1571
|
} finally {
|
|
1558
1572
|
span.end();
|
|
1559
1573
|
}
|
|
1560
|
-
|
|
1561
|
-
|
|
1562
|
-
case "stream":
|
|
1563
|
-
void (async () => {
|
|
1574
|
+
break;
|
|
1575
|
+
case "stream":
|
|
1564
1576
|
try {
|
|
1565
1577
|
await procedure.handler({
|
|
1566
|
-
ctx: handlerContextWithSpan
|
|
1578
|
+
ctx: handlerContextWithSpan,
|
|
1567
1579
|
reqInit: initPayload,
|
|
1568
1580
|
reqReadable,
|
|
1569
1581
|
resWritable
|
|
@@ -1573,13 +1585,11 @@ var RiverServer = class {
|
|
|
1573
1585
|
} finally {
|
|
1574
1586
|
span.end();
|
|
1575
1587
|
}
|
|
1576
|
-
|
|
1577
|
-
|
|
1578
|
-
case "subscription":
|
|
1579
|
-
void (async () => {
|
|
1588
|
+
break;
|
|
1589
|
+
case "subscription":
|
|
1580
1590
|
try {
|
|
1581
1591
|
await procedure.handler({
|
|
1582
|
-
ctx: handlerContextWithSpan
|
|
1592
|
+
ctx: handlerContextWithSpan,
|
|
1583
1593
|
reqInit: initPayload,
|
|
1584
1594
|
resWritable
|
|
1585
1595
|
});
|
|
@@ -1588,13 +1598,11 @@ var RiverServer = class {
|
|
|
1588
1598
|
} finally {
|
|
1589
1599
|
span.end();
|
|
1590
1600
|
}
|
|
1591
|
-
|
|
1592
|
-
|
|
1593
|
-
case "upload":
|
|
1594
|
-
void (async () => {
|
|
1601
|
+
break;
|
|
1602
|
+
case "upload":
|
|
1595
1603
|
try {
|
|
1596
1604
|
const responsePayload = await procedure.handler({
|
|
1597
|
-
ctx: handlerContextWithSpan
|
|
1605
|
+
ctx: handlerContextWithSpan,
|
|
1598
1606
|
reqInit: initPayload,
|
|
1599
1607
|
reqReadable
|
|
1600
1608
|
});
|
|
@@ -1607,9 +1615,23 @@ var RiverServer = class {
|
|
|
1607
1615
|
} finally {
|
|
1608
1616
|
span.end();
|
|
1609
1617
|
}
|
|
1610
|
-
|
|
1611
|
-
|
|
1612
|
-
}
|
|
1618
|
+
break;
|
|
1619
|
+
}
|
|
1620
|
+
};
|
|
1621
|
+
this.middlewares.reduceRight(
|
|
1622
|
+
(next, middleware) => {
|
|
1623
|
+
return () => {
|
|
1624
|
+
middleware({
|
|
1625
|
+
ctx: middlewareContext,
|
|
1626
|
+
reqInit: initPayload,
|
|
1627
|
+
next
|
|
1628
|
+
});
|
|
1629
|
+
};
|
|
1630
|
+
},
|
|
1631
|
+
() => {
|
|
1632
|
+
void runProcedureHandler();
|
|
1633
|
+
}
|
|
1634
|
+
)();
|
|
1613
1635
|
if (!finishedController.signal.aborted) {
|
|
1614
1636
|
this.streams.set(streamId, procStream);
|
|
1615
1637
|
}
|
|
@@ -1860,7 +1882,8 @@ function createServer(transport, services, providedServerOptions) {
|
|
|
1860
1882
|
services,
|
|
1861
1883
|
providedServerOptions?.handshakeOptions,
|
|
1862
1884
|
providedServerOptions?.extendedContext,
|
|
1863
|
-
providedServerOptions?.maxCancelledStreamTombstonesPerSession
|
|
1885
|
+
providedServerOptions?.maxCancelledStreamTombstonesPerSession,
|
|
1886
|
+
providedServerOptions?.middlewares
|
|
1864
1887
|
);
|
|
1865
1888
|
}
|
|
1866
1889
|
|
|
@@ -1873,7 +1896,7 @@ function createServerHandshakeOptions(schema, validate) {
|
|
|
1873
1896
|
}
|
|
1874
1897
|
|
|
1875
1898
|
// package.json
|
|
1876
|
-
var version = "0.
|
|
1899
|
+
var version = "0.208.1";
|
|
1877
1900
|
// Annotate the CommonJS export names for ESM import in node:
|
|
1878
1901
|
0 && (module.exports = {
|
|
1879
1902
|
CANCEL_CODE,
|