@orpc/standard-server-peer 0.0.0-next.fa8d145 → 0.0.0-next.fc1437c

package/README.md

@@ -17,6 +17,9 @@
   <a href="https://discord.gg/TXEbwRBvQn">
     <img alt="Discord" src="https://img.shields.io/discord/1308966753044398161?color=7389D8&label&logo=discord&logoColor=ffffff" />
   </a>
+  <a href="https://deepwiki.com/unnoq/orpc">
+    <img src="https://deepwiki.com/badge.svg" alt="Ask DeepWiki">
+  </a>
 </div>
 
 <h3 align="center">Typesafe APIs Made Simple 🪄</h3>
@@ -30,7 +33,8 @@
 - **🔗 End-to-End Type Safety**: Ensure type-safe inputs, outputs, and errors from client to server.
 - **📘 First-Class OpenAPI**: Built-in support that fully adheres to the OpenAPI standard.
 - **📝 Contract-First Development**: Optionally define your API contract before implementation.
-- **⚙️ Framework Integrations**: Seamlessly integrate with TanStack Query (React, Vue, Solid, Svelte), Pinia Colada, and more.
+- **🔍 First-Class OpenTelemetry**: Seamlessly integrate with OpenTelemetry for observability.
+- **⚙️ Framework Integrations**: Seamlessly integrate with TanStack Query (React, Vue, Solid, Svelte, Angular), SWR, Pinia Colada, and more.
 - **🚀 Server Actions**: Fully compatible with React Server Actions on Next.js, TanStack Start, and other platforms.
 - **🔠 Standard Schema Support**: Works out of the box with Zod, Valibot, ArkType, and other schema validators.
 - **🗃️ Native Types**: Supports native types like Date, File, Blob, BigInt, URL, and more.
@@ -38,7 +42,6 @@
 - **📡 SSE & Streaming**: Enjoy full type-safe support for SSE and streaming.
 - **🌍 Multi-Runtime Support**: Fast and lightweight on Cloudflare, Deno, Bun, Node.js, and beyond.
 - **🔌 Extendability**: Easily extend functionality with plugins, middleware, and interceptors.
-- **🛡️ Reliability**: Well-tested, TypeScript-based, production-ready, and MIT licensed.
 
 ## Documentation
 
@@ -49,14 +52,14 @@ You can find the full documentation [here](https://orpc.unnoq.com).
 - [@orpc/contract](https://www.npmjs.com/package/@orpc/contract): Build your API contract.
 - [@orpc/server](https://www.npmjs.com/package/@orpc/server): Build your API or implement API contract.
 - [@orpc/client](https://www.npmjs.com/package/@orpc/client): Consume your API on the client with type-safety.
-- [@orpc/nest](https://www.npmjs.com/package/@orpc/nest): Deeply integrate oRPC with NestJS.
+- [@orpc/openapi](https://www.npmjs.com/package/@orpc/openapi): Generate OpenAPI specs and handle OpenAPI requests.
+- [@orpc/otel](https://www.npmjs.com/package/@orpc/otel): [OpenTelemetry](https://opentelemetry.io/) integration for observability.
+- [@orpc/nest](https://www.npmjs.com/package/@orpc/nest): Deeply integrate oRPC with [NestJS](https://nestjs.com/).
 - [@orpc/react](https://www.npmjs.com/package/@orpc/react): Utilities for integrating oRPC with React and React Server Actions.
-- [@orpc/react-query](https://www.npmjs.com/package/@orpc/react-query): Integration with [React Query](https://tanstack.com/query/latest/docs/framework/react/overview).
-- [@orpc/vue-query](https://www.npmjs.com/package/@orpc/vue-query): Integration with [Vue Query](https://tanstack.com/query/latest/docs/framework/vue/overview).
-- [@orpc/solid-query](https://www.npmjs.com/package/@orpc/solid-query): Integration with [Solid Query](https://tanstack.com/query/latest/docs/framework/solid/overview).
-- [@orpc/svelte-query](https://www.npmjs.com/package/@orpc/svelte-query): Integration with [Svelte Query](https://tanstack.com/query/latest/docs/framework/svelte/overview).
+- [@orpc/tanstack-query](https://www.npmjs.com/package/@orpc/tanstack-query): [TanStack Query](https://tanstack.com/query/latest) integration.
+- [@orpc/experimental-react-swr](https://www.npmjs.com/package/@orpc/experimental-react-swr): [SWR](https://swr.vercel.app/) integration.
 - [@orpc/vue-colada](https://www.npmjs.com/package/@orpc/vue-colada): Integration with [Pinia Colada](https://pinia-colada.esm.dev/).
-- [@orpc/openapi](https://www.npmjs.com/package/@orpc/openapi): Generate OpenAPI specs and handle OpenAPI requests.
+- [@orpc/hey-api](https://www.npmjs.com/package/@orpc/hey-api): [Hey API](https://heyapi.dev/) integration.
 - [@orpc/zod](https://www.npmjs.com/package/@orpc/zod): More schemas that [Zod](https://zod.dev/) doesn't support yet.
 - [@orpc/valibot](https://www.npmjs.com/package/@orpc/valibot): OpenAPI spec generation from [Valibot](https://valibot.dev/).
 - [@orpc/arktype](https://www.npmjs.com/package/@orpc/arktype): OpenAPI spec generation from [ArkType](https://arktype.io/).

package/dist/index.d.mts

@@ -1,7 +1,7 @@
-import { Promisable, AsyncIdQueueCloseOptions as AsyncIdQueueCloseOptions$1, CreateAsyncIteratorObjectCleanupFn } from '@orpc/shared';
-import { StandardRequest, StandardResponse, EventMeta, StandardHeaders } from '@orpc/standard-server';
+import { Promisable, AsyncIdQueueCloseOptions as AsyncIdQueueCloseOptions$1, SetSpanErrorOptions, AsyncIteratorClassCleanupFn, AsyncIteratorClass } from '@orpc/shared';
+import { StandardRequest, StandardResponse, EventMeta } from '@orpc/standard-server';
 
-type EncodedMessage = string | ArrayBufferLike | Blob;
+type EncodedMessage = string | ArrayBufferLike | Uint8Array;
 interface EncodedMessageSendFn {
     (message: EncodedMessage): Promisable<void>;
 }
@@ -16,13 +16,26 @@ interface ClientPeerCloseOptions extends AsyncIdQueueCloseOptions$1 {
 }
 declare class ClientPeer {
     private readonly idGenerator;
+    /**
+     * Queue of responses sent from server, awaiting consumption
+     */
     private readonly responseQueue;
+    /**
+     * Queue of event iterator messages sent from server, awaiting consumption
+     */
     private readonly serverEventIteratorQueue;
+    /**
+     * Controllers used to signal that the client should stop sending event iterator messages
+     */
     private readonly serverControllers;
+    /**
+     * Cleanup functions invoked when the request/response is closed
+     */
+    private readonly cleanupFns;
     private readonly send;
     constructor(send: EncodedMessageSendFn);
     get length(): number;
-    open(id: number): AbortController;
+    open(id: string): AbortController;
     request(request: StandardRequest): Promise<StandardResponse>;
     message(raw: EncodedMessage): Promise<void>;
     close(options?: AsyncIdQueueCloseOptions$1): void;
@@ -51,36 +64,42 @@ interface ResponseMessageMap {
     [MessageType.ABORT_SIGNAL]: void;
 }
 type DecodedMessageUnion<TMap extends RequestMessageMap | ResponseMessageMap> = {
-    [K in keyof TMap]: [id: number, type: K, payload: TMap[K]];
+    [K in keyof TMap]: [id: string, type: K, payload: TMap[K]];
 }[keyof TMap];
 type DecodedRequestMessage = DecodedMessageUnion<RequestMessageMap>;
 type DecodedResponseMessage = DecodedMessageUnion<ResponseMessageMap>;
-declare function encodeRequestMessage<T extends keyof RequestMessageMap>(id: number, type: T, payload: RequestMessageMap[T]): Promise<EncodedMessage>;
+declare function encodeRequestMessage<T extends keyof RequestMessageMap>(id: string, type: T, payload: RequestMessageMap[T]): Promise<EncodedMessage>;
 declare function decodeRequestMessage(raw: EncodedMessage): Promise<DecodedRequestMessage>;
-declare function encodeResponseMessage<T extends keyof ResponseMessageMap>(id: number, type: T, payload: ResponseMessageMap[T]): Promise<EncodedMessage>;
+declare function encodeResponseMessage<T extends keyof ResponseMessageMap>(id: string, type: T, payload: ResponseMessageMap[T]): Promise<EncodedMessage>;
 declare function decodeResponseMessage(raw: EncodedMessage): Promise<DecodedResponseMessage>;
-declare function isEventIteratorHeaders(headers: StandardHeaders): boolean;
 
 interface AsyncIdQueueCloseOptions {
-    id?: number;
-    reason?: Error;
+    id?: string;
+    reason?: unknown;
 }
 declare class AsyncIdQueue<T> {
     private readonly openIds;
-    private readonly items;
-    private readonly pendingPulls;
+    private readonly queues;
+    private readonly waiters;
     get length(): number;
-    open(id: number): void;
-    isOpen(id: number): boolean;
-    push(id: number, item: T): void;
-    pull(id: number): Promise<T>;
+    get waiterIds(): string[];
+    hasBufferedItems(id: string): boolean;
+    open(id: string): void;
+    isOpen(id: string): boolean;
+    push(id: string, item: T): void;
+    pull(id: string): Promise<T>;
     close({ id, reason }?: AsyncIdQueueCloseOptions): void;
-    assertOpen(id: number): void;
+    assertOpen(id: string): void;
 }
 
-declare function toEventIterator(queue: AsyncIdQueue<EventIteratorPayload>, id: number, cleanup: CreateAsyncIteratorObjectCleanupFn): AsyncGenerator;
+interface ToEventIteratorOptions extends SetSpanErrorOptions {
+}
+declare function toEventIterator(queue: AsyncIdQueue<EventIteratorPayload>, id: string, cleanup: AsyncIteratorClassCleanupFn, options?: ToEventIteratorOptions): AsyncIteratorClass<unknown>;
 declare function resolveEventIterator(iterator: AsyncIterator<any>, callback: (payload: EventIteratorPayload) => Promise<'next' | 'abort'>): Promise<void>;
 
+interface ServerPeerHandleRequestFn {
+    (request: StandardRequest): Promise<StandardResponse>;
+}
 interface ServerPeerCloseOptions extends AsyncIdQueueCloseOptions$1 {
     /**
      * Should abort or not?
@@ -90,16 +109,28 @@ interface ServerPeerCloseOptions extends AsyncIdQueueCloseOptions$1 {
     abort?: boolean;
 }
 declare class ServerPeer {
+    /**
+     * Queue of event iterator messages sent from client, awaiting consumption
+     */
     private readonly clientEventIteratorQueue;
+    /**
+     * Map of active client request controllers, should be synced to request signal
+     */
     private readonly clientControllers;
     private readonly send;
     constructor(send: EncodedMessageSendFn);
     get length(): number;
-    open(id: number): AbortController;
-    message(raw: EncodedMessage): Promise<[id: number, StandardRequest | undefined]>;
-    response(id: number, response: StandardResponse): Promise<void>;
+    open(id: string): AbortController;
+    /**
+     * @todo This method will return Promise<void> in the next major version.
+     */
+    message(raw: EncodedMessage, handleRequest?: ServerPeerHandleRequestFn): Promise<[id: string, StandardRequest | undefined]>;
+    /**
+     * @deprecated Please pass the `handleRequest` (second arg) function to the `message` method instead.
+     */
+    response(id: string, response: StandardResponse): Promise<void>;
     close({ abort, ...options }?: ServerPeerCloseOptions): void;
 }
 
-export { ClientPeer, MessageType, ServerPeer, decodeRequestMessage, decodeResponseMessage, encodeRequestMessage, encodeResponseMessage, isEventIteratorHeaders, resolveEventIterator, toEventIterator };
-export type { ClientPeerCloseOptions, DecodedRequestMessage, DecodedResponseMessage, EncodedMessage, EncodedMessageSendFn, EventIteratorEvent, EventIteratorPayload, RequestMessageMap, ResponseMessageMap, ServerPeerCloseOptions };
+export { ClientPeer, MessageType, ServerPeer, decodeRequestMessage, decodeResponseMessage, encodeRequestMessage, encodeResponseMessage, resolveEventIterator, toEventIterator };
+export type { ClientPeerCloseOptions, DecodedRequestMessage, DecodedResponseMessage, EncodedMessage, EncodedMessageSendFn, EventIteratorEvent, EventIteratorPayload, RequestMessageMap, ResponseMessageMap, ServerPeerCloseOptions, ServerPeerHandleRequestFn, ToEventIteratorOptions };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-import { Promisable, AsyncIdQueueCloseOptions as AsyncIdQueueCloseOptions$1, CreateAsyncIteratorObjectCleanupFn } from '@orpc/shared';
-import { StandardRequest, StandardResponse, EventMeta, StandardHeaders } from '@orpc/standard-server';
+import { Promisable, AsyncIdQueueCloseOptions as AsyncIdQueueCloseOptions$1, SetSpanErrorOptions, AsyncIteratorClassCleanupFn, AsyncIteratorClass } from '@orpc/shared';
+import { StandardRequest, StandardResponse, EventMeta } from '@orpc/standard-server';
 
-type EncodedMessage = string | ArrayBufferLike | Blob;
+type EncodedMessage = string | ArrayBufferLike | Uint8Array;
 interface EncodedMessageSendFn {
     (message: EncodedMessage): Promisable<void>;
 }
@@ -16,13 +16,26 @@ interface ClientPeerCloseOptions extends AsyncIdQueueCloseOptions$1 {
 }
 declare class ClientPeer {
     private readonly idGenerator;
+    /**
+     * Queue of responses sent from server, awaiting consumption
+     */
     private readonly responseQueue;
+    /**
+     * Queue of event iterator messages sent from server, awaiting consumption
+     */
     private readonly serverEventIteratorQueue;
+    /**
+     * Controllers used to signal that the client should stop sending event iterator messages
+     */
     private readonly serverControllers;
+    /**
+     * Cleanup functions invoked when the request/response is closed
+     */
+    private readonly cleanupFns;
     private readonly send;
     constructor(send: EncodedMessageSendFn);
     get length(): number;
-    open(id: number): AbortController;
+    open(id: string): AbortController;
     request(request: StandardRequest): Promise<StandardResponse>;
     message(raw: EncodedMessage): Promise<void>;
     close(options?: AsyncIdQueueCloseOptions$1): void;
@@ -51,36 +64,42 @@ interface ResponseMessageMap {
     [MessageType.ABORT_SIGNAL]: void;
 }
 type DecodedMessageUnion<TMap extends RequestMessageMap | ResponseMessageMap> = {
-    [K in keyof TMap]: [id: number, type: K, payload: TMap[K]];
+    [K in keyof TMap]: [id: string, type: K, payload: TMap[K]];
 }[keyof TMap];
 type DecodedRequestMessage = DecodedMessageUnion<RequestMessageMap>;
 type DecodedResponseMessage = DecodedMessageUnion<ResponseMessageMap>;
-declare function encodeRequestMessage<T extends keyof RequestMessageMap>(id: number, type: T, payload: RequestMessageMap[T]): Promise<EncodedMessage>;
+declare function encodeRequestMessage<T extends keyof RequestMessageMap>(id: string, type: T, payload: RequestMessageMap[T]): Promise<EncodedMessage>;
 declare function decodeRequestMessage(raw: EncodedMessage): Promise<DecodedRequestMessage>;
-declare function encodeResponseMessage<T extends keyof ResponseMessageMap>(id: number, type: T, payload: ResponseMessageMap[T]): Promise<EncodedMessage>;
+declare function encodeResponseMessage<T extends keyof ResponseMessageMap>(id: string, type: T, payload: ResponseMessageMap[T]): Promise<EncodedMessage>;
 declare function decodeResponseMessage(raw: EncodedMessage): Promise<DecodedResponseMessage>;
-declare function isEventIteratorHeaders(headers: StandardHeaders): boolean;
 
 interface AsyncIdQueueCloseOptions {
-    id?: number;
-    reason?: Error;
+    id?: string;
+    reason?: unknown;
 }
 declare class AsyncIdQueue<T> {
     private readonly openIds;
-    private readonly items;
-    private readonly pendingPulls;
+    private readonly queues;
+    private readonly waiters;
     get length(): number;
-    open(id: number): void;
-    isOpen(id: number): boolean;
-    push(id: number, item: T): void;
-    pull(id: number): Promise<T>;
+    get waiterIds(): string[];
+    hasBufferedItems(id: string): boolean;
+    open(id: string): void;
+    isOpen(id: string): boolean;
+    push(id: string, item: T): void;
+    pull(id: string): Promise<T>;
     close({ id, reason }?: AsyncIdQueueCloseOptions): void;
-    assertOpen(id: number): void;
+    assertOpen(id: string): void;
 }
 
-declare function toEventIterator(queue: AsyncIdQueue<EventIteratorPayload>, id: number, cleanup: CreateAsyncIteratorObjectCleanupFn): AsyncGenerator;
+interface ToEventIteratorOptions extends SetSpanErrorOptions {
+}
+declare function toEventIterator(queue: AsyncIdQueue<EventIteratorPayload>, id: string, cleanup: AsyncIteratorClassCleanupFn, options?: ToEventIteratorOptions): AsyncIteratorClass<unknown>;
 declare function resolveEventIterator(iterator: AsyncIterator<any>, callback: (payload: EventIteratorPayload) => Promise<'next' | 'abort'>): Promise<void>;
 
+interface ServerPeerHandleRequestFn {
+    (request: StandardRequest): Promise<StandardResponse>;
+}
 interface ServerPeerCloseOptions extends AsyncIdQueueCloseOptions$1 {
     /**
      * Should abort or not?
@@ -90,16 +109,28 @@ interface ServerPeerCloseOptions extends AsyncIdQueueCloseOptions$1 {
     abort?: boolean;
 }
 declare class ServerPeer {
+    /**
+     * Queue of event iterator messages sent from client, awaiting consumption
+     */
     private readonly clientEventIteratorQueue;
+    /**
+     * Map of active client request controllers, should be synced to request signal
+     */
     private readonly clientControllers;
     private readonly send;
     constructor(send: EncodedMessageSendFn);
     get length(): number;
-    open(id: number): AbortController;
-    message(raw: EncodedMessage): Promise<[id: number, StandardRequest | undefined]>;
-    response(id: number, response: StandardResponse): Promise<void>;
+    open(id: string): AbortController;
+    /**
+     * @todo This method will return Promise<void> in the next major version.
+     */
+    message(raw: EncodedMessage, handleRequest?: ServerPeerHandleRequestFn): Promise<[id: string, StandardRequest | undefined]>;
+    /**
+     * @deprecated Please pass the `handleRequest` (second arg) function to the `message` method instead.
+     */
+    response(id: string, response: StandardResponse): Promise<void>;
     close({ abort, ...options }?: ServerPeerCloseOptions): void;
 }
 
-export { ClientPeer, MessageType, ServerPeer, decodeRequestMessage, decodeResponseMessage, encodeRequestMessage, encodeResponseMessage, isEventIteratorHeaders, resolveEventIterator, toEventIterator };
-export type { ClientPeerCloseOptions, DecodedRequestMessage, DecodedResponseMessage, EncodedMessage, EncodedMessageSendFn, EventIteratorEvent, EventIteratorPayload, RequestMessageMap, ResponseMessageMap, ServerPeerCloseOptions };
+export { ClientPeer, MessageType, ServerPeer, decodeRequestMessage, decodeResponseMessage, encodeRequestMessage, encodeResponseMessage, resolveEventIterator, toEventIterator };
+export type { ClientPeerCloseOptions, DecodedRequestMessage, DecodedResponseMessage, EncodedMessage, EncodedMessageSendFn, EventIteratorEvent, EventIteratorPayload, RequestMessageMap, ResponseMessageMap, ServerPeerCloseOptions, ServerPeerHandleRequestFn, ToEventIteratorOptions };

package/dist/index.mjs

@@ -1,6 +1,8 @@
-import { isAsyncIteratorObject, stringifyJSON, createAsyncIteratorObject, isTypescriptObject, SequentialIdGenerator, AsyncIdQueue } from '@orpc/shared';
-import { flattenHeader, getFilenameFromContentDisposition, generateContentDisposition, withEventMeta, ErrorEvent, getEventMeta } from '@orpc/standard-server';
+import { isAsyncIteratorObject, stringifyJSON, readAsBuffer, AsyncIteratorClass, startSpan, runInSpanContext, isTypescriptObject, setSpanError, runWithSpan, SequentialIdGenerator, AsyncIdQueue, getGlobalOtelConfig, clone, AbortError } from '@orpc/shared';
+import { generateContentDisposition, flattenHeader, getFilenameFromContentDisposition, withEventMeta, ErrorEvent, getEventMeta, isEventIteratorHeaders, HibernationEventIterator } from '@orpc/standard-server';
 
+const SHORTABLE_ORIGIN = "orpc://localhost";
+const SHORTABLE_ORIGIN_MATCHER = /^orpc:\/\/localhost\//;
 var MessageType = /* @__PURE__ */ ((MessageType2) => {
   MessageType2[MessageType2["REQUEST"] = 1] = "REQUEST";
   MessageType2[MessageType2["RESPONSE"] = 2] = "RESPONSE";
@@ -22,12 +24,12 @@ async function encodeRequestMessage(id, type, payload) {
     return encodeRawMessage({ i: id, t: type, p: payload });
   }
   const request = payload;
-  const { body: processedBody, headers: processedHeaders } = await prepareBodyAndHeadersForSerialization(
+  const { body: processedBody, headers: processedHeaders } = await serializeBodyAndHeaders(
     request.body,
     request.headers
   );
   const serializedPayload = {
-    u: request.url.toString().replace(/^orpc:\//, "/"),
+    u: request.url.toString().replace(SHORTABLE_ORIGIN_MATCHER, "/"),
     b: processedBody instanceof Blob ? void 0 : processedBody,
     h: Object.keys(processedHeaders).length > 0 ? processedHeaders : void 0,
     m: request.method === "POST" ? void 0 : request.method
@@ -42,7 +44,7 @@ async function encodeRequestMessage(id, type, payload) {
   return encodeRawMessage(baseMessage);
 }
 async function decodeRequestMessage(raw) {
-  const { json: message, blobData } = await decodeRawMessage(raw);
+  const { json: message, buffer } = await decodeRawMessage(raw);
   const id = message.i;
   const type = message.t;
   if (type === 3 /* EVENT_ITERATOR */) {
@@ -54,21 +56,13 @@ async function decodeRequestMessage(raw) {
   }
   const payload = message.p;
   const headers = payload.h ?? {};
-  let body = payload.b;
-  const contentType = flattenHeader(headers["content-type"]);
-  if (blobData) {
-    const contentDisposition = flattenHeader(headers["content-disposition"]);
-    if (contentDisposition === void 0 && contentType?.startsWith("multipart/form-data")) {
-      const tempRes = new Response(blobData, { headers: { "content-type": contentType } });
-      body = await tempRes.formData();
-    } else {
-      const filename = getFilenameFromContentDisposition(contentDisposition) ?? "blob";
-      body = new File([blobData], filename, { type: contentType });
-    }
-  } else if (contentType?.startsWith("application/x-www-form-urlencoded") && typeof body === "string") {
-    body = new URLSearchParams(body);
-  }
-  return [id, 1 /* REQUEST */, { url: new URL(payload.u, "orpc:/"), headers, method: payload.m ?? "POST", body }];
+  const body = await deserializeBody(headers, payload.b, buffer);
+  return [id, 1 /* REQUEST */, {
+    url: payload.u.startsWith("/") ? new URL(`${SHORTABLE_ORIGIN}${payload.u}`) : new URL(payload.u),
+    headers,
+    method: payload.m ?? "POST",
+    body
+  }];
 }
 async function encodeResponseMessage(id, type, payload) {
   if (type === 3 /* EVENT_ITERATOR */) {
@@ -84,7 +78,7 @@ async function encodeResponseMessage(id, type, payload) {
     return encodeRawMessage({ i: id, t: type, p: void 0 });
   }
   const response = payload;
-  const { body: processedBody, headers: processedHeaders } = await prepareBodyAndHeadersForSerialization(
+  const { body: processedBody, headers: processedHeaders } = await serializeBodyAndHeaders(
     response.body,
     response.headers
   );
@@ -103,7 +97,7 @@ async function encodeResponseMessage(id, type, payload) {
   return encodeRawMessage(baseMessage);
 }
 async function decodeResponseMessage(raw) {
-  const { json: message, blobData } = await decodeRawMessage(raw);
+  const { json: message, buffer } = await decodeRawMessage(raw);
   const id = message.i;
   const type = message.t;
   if (type === 3 /* EVENT_ITERATOR */) {
@@ -115,23 +109,10 @@ async function decodeResponseMessage(raw) {
   }
   const payload = message.p;
   const headers = payload.h ?? {};
-  let body = payload.b;
-  const contentType = flattenHeader(headers["content-type"]);
-  if (blobData) {
-    const contentDisposition = flattenHeader(headers["content-disposition"]);
-    if (contentDisposition === void 0 && contentType?.startsWith("multipart/form-data")) {
-      const tempRes = new Response(blobData, { headers: { "content-type": contentType } });
-      body = await tempRes.formData();
-    } else {
-      const filename = getFilenameFromContentDisposition(contentDisposition) ?? "blob";
-      body = new File([blobData], filename, { type: contentType });
-    }
-  } else if (contentType?.startsWith("application/x-www-form-urlencoded") && typeof body === "string") {
-    body = new URLSearchParams(body);
-  }
+  const body = await deserializeBody(headers, payload.b, buffer);
   return [id, 2 /* RESPONSE */, { status: payload.s ?? 200, headers, body }];
 }
-async function prepareBodyAndHeadersForSerialization(body, originalHeaders) {
+async function serializeBodyAndHeaders(body, originalHeaders) {
   const headers = { ...originalHeaders };
   const originalContentDisposition = headers["content-disposition"];
   delete headers["content-type"];
@@ -159,113 +140,184 @@ async function prepareBodyAndHeadersForSerialization(body, originalHeaders) {
   }
   return { body, headers };
 }
-function isEventIteratorHeaders(headers) {
-  return Boolean(flattenHeader(headers["content-type"])?.startsWith("text/event-stream") && headers["content-disposition"] === void 0);
+async function deserializeBody(headers, body, buffer) {
+  const contentType = flattenHeader(headers["content-type"]);
+  const contentDisposition = flattenHeader(headers["content-disposition"]);
+  if (typeof contentDisposition === "string") {
+    const filename = getFilenameFromContentDisposition(contentDisposition) ?? "blob";
+    return new File(buffer === void 0 ? [] : [buffer], filename, { type: contentType });
+  }
+  if (contentType?.startsWith("multipart/form-data")) {
+    const tempRes = new Response(buffer, { headers: { "content-type": contentType } });
+    return tempRes.formData();
+  }
+  if (contentType?.startsWith("application/x-www-form-urlencoded") && typeof body === "string") {
+    return new URLSearchParams(body);
+  }
+  return body;
 }
 const JSON_AND_BINARY_DELIMITER = 255;
-async function encodeRawMessage(data, blobData) {
+async function encodeRawMessage(data, blob) {
   const json = stringifyJSON(data);
-  if (blobData === void 0) {
+  if (blob === void 0 || blob.size === 0) {
     return json;
   }
-  return new Blob([
+  return readAsBuffer(new Blob([
     new TextEncoder().encode(json),
     new Uint8Array([JSON_AND_BINARY_DELIMITER]),
-    blobData
-  ]);
+    blob
+  ]));
 }
 async function decodeRawMessage(raw) {
   if (typeof raw === "string") {
     return { json: JSON.parse(raw) };
   }
-  const buffer = new Uint8Array(raw instanceof Blob ? await raw.arrayBuffer() : raw);
+  const buffer = raw instanceof Uint8Array ? raw : new Uint8Array(raw);
   const delimiterIndex = buffer.indexOf(JSON_AND_BINARY_DELIMITER);
   if (delimiterIndex === -1) {
     const jsonPart2 = new TextDecoder().decode(buffer);
     return { json: JSON.parse(jsonPart2) };
   }
-  const jsonPart = new TextDecoder().decode(buffer.slice(0, delimiterIndex));
-  const blobData = buffer.slice(delimiterIndex + 1);
+  const jsonPart = new TextDecoder().decode(buffer.subarray(0, delimiterIndex));
+  const bufferPart = buffer.subarray(delimiterIndex + 1);
   return {
     json: JSON.parse(jsonPart),
-    blobData
+    buffer: bufferPart
   };
 }
 
-function toEventIterator(queue, id, cleanup) {
-  return createAsyncIteratorObject(async () => {
-    const item = await queue.pull(id);
-    switch (item.event) {
-      case "message": {
-        let data = item.data;
-        if (item.meta && isTypescriptObject(data)) {
-          data = withEventMeta(data, item.meta);
+function toEventIterator(queue, id, cleanup, options = {}) {
+  let span;
+  return new AsyncIteratorClass(async () => {
+    span ??= startSpan("consume_event_iterator_stream");
+    try {
+      const item = await runInSpanContext(span, () => queue.pull(id));
+      switch (item.event) {
+        case "message": {
+          let data = item.data;
+          if (item.meta && isTypescriptObject(data)) {
+            data = withEventMeta(data, item.meta);
+          }
+          span?.addEvent("message");
+          return { value: data, done: false };
         }
-        return { value: data, done: false };
-      }
-      case "error": {
-        let error = new ErrorEvent({
-          data: item.data
-        });
-        if (item.meta) {
-          error = withEventMeta(error, item.meta);
+        case "error": {
+          let error = new ErrorEvent({
+            data: item.data
+          });
+          if (item.meta) {
+            error = withEventMeta(error, item.meta);
+          }
+          span?.addEvent("error");
+          throw error;
         }
-        throw error;
-      }
-      case "done": {
-        let data = item.data;
-        if (item.meta && isTypescriptObject(data)) {
-          data = withEventMeta(data, item.meta);
+        case "done": {
+          let data = item.data;
+          if (item.meta && isTypescriptObject(data)) {
+            data = withEventMeta(data, item.meta);
+          }
+          span?.addEvent("done");
+          return { value: data, done: true };
         }
-        return { value: data, done: true };
       }
-    }
-  }, cleanup);
-}
-async function resolveEventIterator(iterator, callback) {
-  while (true) {
-    const payload = await (async () => {
-      try {
-        const { value, done } = await iterator.next();
-        if (done) {
-          return { event: "done", data: value, meta: getEventMeta(value) };
-        }
-        return { event: "message", data: value, meta: getEventMeta(value) };
-      } catch (err) {
-        return {
-          meta: getEventMeta(err),
-          event: "error",
-          data: err instanceof ErrorEvent ? err.data : void 0
-        };
+    } catch (e) {
+      if (!(e instanceof ErrorEvent)) {
+        setSpanError(span, e, options);
       }
-    })();
+      throw e;
+    }
+  }, async (reason) => {
     try {
-      const direction = await callback(payload);
-      if (payload.event === "done" || payload.event === "error") {
-        return;
+      if (reason !== "next") {
+        span?.addEvent("cancelled");
       }
-      if (direction === "abort") {
+      await runInSpanContext(span, () => cleanup(reason));
+    } catch (e) {
+      setSpanError(span, e, options);
+      throw e;
+    } finally {
+      span?.end();
+    }
+  });
+}
+function resolveEventIterator(iterator, callback) {
+  return runWithSpan(
+    { name: "stream_event_iterator" },
+    async (span) => {
+      while (true) {
+        const payload = await (async () => {
+          try {
+            const { value, done } = await iterator.next();
+            if (done) {
+              span?.addEvent("done");
+              return { event: "done", data: value, meta: getEventMeta(value) };
+            }
+            span?.addEvent("message");
+            return { event: "message", data: value, meta: getEventMeta(value) };
+          } catch (err) {
+            if (err instanceof ErrorEvent) {
+              span?.addEvent("error");
+              return {
+                event: "error",
+                data: err.data,
+                meta: getEventMeta(err)
+              };
+            } else {
+              try {
+                await callback({ event: "error", data: void 0 });
+              } catch (err2) {
+                setSpanError(span, err);
+                throw err2;
+              }
+              throw err;
+            }
+          }
+        })();
+        let isInvokeCleanupFn = false;
         try {
-          await iterator.return?.();
-        } catch {
+          const direction = await callback(payload);
+          if (payload.event === "done" || payload.event === "error") {
+            return;
+          }
+          if (direction === "abort") {
+            isInvokeCleanupFn = true;
+            await iterator.return?.();
+            return;
+          }
+        } catch (err) {
+          if (!isInvokeCleanupFn) {
+            try {
+              await iterator.return?.();
+            } catch (err2) {
+              setSpanError(span, err);
+              throw err2;
+            }
+          }
+          throw err;
         }
-        return;
-      }
-    } catch (err) {
-      try {
-        await iterator.return?.();
-      } catch {
       }
-      throw err;
     }
-  }
+  );
 }
 
 class ClientPeer {
   idGenerator = new SequentialIdGenerator();
+  /**
+   * Queue of responses sent from server, awaiting consumption
+   */
   responseQueue = new AsyncIdQueue();
+  /**
+   * Queue of event iterator messages sent from server, awaiting consumption
+   */
   serverEventIteratorQueue = new AsyncIdQueue();
+  /**
+   * Controllers used to signal that the client should stop sending event iterator messages
+   */
   serverControllers = /* @__PURE__ */ new Map();
+  /**
+   * Cleanup functions invoked when the request/response is closed
+   */
+  cleanupFns = /* @__PURE__ */ new Map();
   send;
   constructor(send) {
     this.send = async (id, ...rest) => encodeRequestMessage(id, ...rest).then(async (raw) => {
@@ -275,48 +327,85 @@ class ClientPeer {
     });
   }
   get length() {
-    return (+this.responseQueue.length + this.serverEventIteratorQueue.length + this.serverControllers.size) / 3;
+    return (+this.responseQueue.length + this.serverEventIteratorQueue.length + this.serverControllers.size + this.cleanupFns.size) / 4;
   }
   open(id) {
     this.serverEventIteratorQueue.open(id);
     this.responseQueue.open(id);
     const controller = new AbortController();
     this.serverControllers.set(id, controller);
+    this.cleanupFns.set(id, []);
     return controller;
   }
   async request(request) {
     const signal = request.signal;
-    if (signal?.aborted) {
-      throw signal.reason;
-    }
-    const id = this.idGenerator.generate();
-    const serverController = this.open(id);
-    return new Promise((resolve, reject) => {
-      this.send(id, MessageType.REQUEST, request).then(async () => {
+    return runWithSpan(
+      { name: "send_peer_request", signal },
+      async () => {
         if (signal?.aborted) {
-          await this.send(id, MessageType.ABORT_SIGNAL, void 0);
-          this.close({ id, reason: signal.reason });
-          return;
+          throw signal.reason;
         }
-        signal?.addEventListener("abort", async () => {
-          await this.send(id, MessageType.ABORT_SIGNAL, void 0);
-          this.close({ id, reason: signal.reason });
-        }, { once: true });
-        if (isAsyncIteratorObject(request.body)) {
-          await resolveEventIterator(request.body, async (payload) => {
-            if (serverController.signal.aborted) {
-              return "abort";
-            }
-            await this.send(id, MessageType.EVENT_ITERATOR, payload);
-            return "next";
+        const id = this.idGenerator.generate();
+        const serverController = this.open(id);
+        try {
+          const otelConfig = getGlobalOtelConfig();
+          if (otelConfig) {
+            const headers = clone(request.headers);
+            otelConfig.propagation.inject(otelConfig.context.active(), headers);
+            request = { ...request, headers };
+          }
+          await this.send(id, MessageType.REQUEST, request);
+          if (signal?.aborted) {
+            await this.send(id, MessageType.ABORT_SIGNAL, void 0);
+            throw signal.reason;
+          }
+          let abortListener;
+          signal?.addEventListener("abort", abortListener = async () => {
+            await this.send(id, MessageType.ABORT_SIGNAL, void 0);
+            this.close({ id, reason: signal.reason });
+          }, { once: true });
+          this.cleanupFns.get(id)?.push(() => {
+            signal?.removeEventListener("abort", abortListener);
           });
+          if (isAsyncIteratorObject(request.body)) {
+            const iterator = request.body;
+            void resolveEventIterator(iterator, async (payload) => {
+              if (serverController.signal.aborted) {
+                return "abort";
+              }
+              await this.send(id, MessageType.EVENT_ITERATOR, payload);
+              return "next";
+            });
+          }
+          const response = await this.responseQueue.pull(id);
+          if (isEventIteratorHeaders(response.headers)) {
+            const iterator = toEventIterator(
+              this.serverEventIteratorQueue,
+              id,
+              async (reason) => {
+                try {
+                  if (reason !== "next") {
+                    await this.send(id, MessageType.ABORT_SIGNAL, void 0);
+                  }
+                } finally {
+                  this.close({ id });
+                }
+              },
+              { signal }
+            );
+            return {
+              ...response,
+              body: iterator
+            };
+          }
+          this.close({ id });
+          return response;
+        } catch (err) {
+          this.close({ id, reason: err });
+          throw err;
         }
-      }).catch((err) => {
-        this.close({ id, reason: err });
-        reject(err);
-      });
-      this.responseQueue.pull(id).then(resolve).catch(reject);
-    });
+      }
+    );
   }
   async message(raw) {
     const [id, type, payload] = await decodeResponseMessage(raw);
@@ -333,31 +422,19 @@ class ClientPeer {
     if (!this.responseQueue.isOpen(id)) {
       return;
     }
-    if (isEventIteratorHeaders(payload.headers)) {
-      this.responseQueue.push(id, {
-        ...payload,
-        body: toEventIterator(this.serverEventIteratorQueue, id, async (reason) => {
-          try {
-            if (reason !== "next") {
-              await this.send(id, MessageType.ABORT_SIGNAL, void 0);
-            }
-          } finally {
-            this.close({ id });
-          }
-        })
-      });
-    } else {
-      this.responseQueue.push(id, payload);
-      this.close({ id });
-    }
+    this.responseQueue.push(id, payload);
   }
   close(options = {}) {
     if (options.id !== void 0) {
       this.serverControllers.get(options.id)?.abort(options.reason);
       this.serverControllers.delete(options.id);
+      this.cleanupFns.get(options.id)?.forEach((fn) => fn());
+      this.cleanupFns.delete(options.id);
     } else {
       this.serverControllers.forEach((c) => c.abort(options.reason));
       this.serverControllers.clear();
+      this.cleanupFns.forEach((fns) => fns.forEach((fn) => fn()));
+      this.cleanupFns.clear();
     }
     this.responseQueue.close(options);
     this.serverEventIteratorQueue.close(options);
@@ -365,7 +442,13 @@ class ClientPeer {
 }
 
 class ServerPeer {
+  /**
+   * Queue of event iterator messages sent from client, awaiting consumption
+   */
   clientEventIteratorQueue = new AsyncIdQueue();
+  /**
+   * Map of active client request controllers, should be synced to request signal
+   */
   clientControllers = /* @__PURE__ */ new Map();
   send;
   constructor(send) {
@@ -384,10 +467,13 @@ class ServerPeer {
     this.clientControllers.set(id, controller);
     return controller;
   }
-  async message(raw) {
+  /**
+   * @todo This method will return Promise<void> in the next major version.
+   */
+  async message(raw, handleRequest) {
     const [id, type, payload] = await decodeRequestMessage(raw);
     if (type === MessageType.ABORT_SIGNAL) {
-      this.close({ id });
+      this.close({ id, reason: new AbortError("Client aborted the request") });
       return [id, void 0];
     }
     if (type === MessageType.EVENT_ITERATOR) {
@@ -397,47 +483,89 @@ class ServerPeer {
       return [id, void 0];
     }
     const clientController = this.open(id);
+    const signal = clientController.signal;
     const request = {
       ...payload,
-      signal: clientController.signal,
-      body: isEventIteratorHeaders(payload.headers) ? toEventIterator(this.clientEventIteratorQueue, id, async (reason) => {
-        if (reason !== "next") {
-          await this.send(id, MessageType.ABORT_SIGNAL, void 0);
-        }
-      }) : payload.body
+      signal,
+      body: isEventIteratorHeaders(payload.headers) ? toEventIterator(
+        this.clientEventIteratorQueue,
+        id,
+        async (reason) => {
+          if (reason !== "next") {
+            await this.send(id, MessageType.ABORT_SIGNAL, void 0);
+          }
+        },
+        { signal }
+      ) : payload.body
     };
+    if (handleRequest) {
+      let context;
+      const otelConfig = getGlobalOtelConfig();
+      if (otelConfig) {
+        context = otelConfig.propagation.extract(otelConfig.context.active(), request.headers);
+      }
+      await runWithSpan(
+        { name: "receive_peer_request", context },
+        async () => {
+          const response = await runWithSpan(
+            { name: "handle_request" },
+            async () => {
+              try {
+                return await handleRequest(request);
+              } catch (reason) {
+                this.close({ id, reason, abort: false });
+                throw reason;
+              }
+            }
+          );
+          await runWithSpan(
+            { name: "send_peer_response" },
+            () => this.response(id, response)
+          );
+        }
+      );
+    }
     return [id, request];
   }
+  /**
+   * @deprecated Please pass the `handleRequest` (second arg) function to the `message` method instead.
+   */
   async response(id, response) {
     const signal = this.clientControllers.get(id)?.signal;
     if (!signal || signal.aborted) {
       return;
     }
-    await this.send(id, MessageType.RESPONSE, response).then(async () => {
+    try {
+      await this.send(id, MessageType.RESPONSE, response);
       if (!signal.aborted && isAsyncIteratorObject(response.body)) {
-        await resolveEventIterator(response.body, async (payload) => {
-          if (signal.aborted) {
-            return "abort";
-          }
-          await this.send(id, MessageType.EVENT_ITERATOR, payload);
-          return "next";
-        });
+        if (response.body instanceof HibernationEventIterator) {
+          response.body.hibernationCallback?.(id);
+        } else {
+          const iterator = response.body;
+          await resolveEventIterator(iterator, async (payload) => {
+            if (signal.aborted) {
+              return "abort";
+            }
+            await this.send(id, MessageType.EVENT_ITERATOR, payload);
+            return "next";
+          });
+        }
       }
       this.close({ id, abort: false });
-    }).catch((reason) => {
+    } catch (reason) {
       this.close({ id, reason, abort: false });
       throw reason;
-    });
+    }
   }
   close({ abort = true, ...options } = {}) {
     if (options.id === void 0) {
       if (abort) {
-        this.clientControllers.forEach((c) => c.abort());
+        this.clientControllers.forEach((c) => c.abort(options.reason));
       }
       this.clientControllers.clear();
     } else {
       if (abort) {
-        this.clientControllers.get(options.id)?.abort();
+        this.clientControllers.get(options.id)?.abort(options.reason);
       }
       this.clientControllers.delete(options.id);
     }
@@ -445,4 +573,4 @@ class ServerPeer {
   }
 }
 
-export { ClientPeer, MessageType, ServerPeer, decodeRequestMessage, decodeResponseMessage, encodeRequestMessage, encodeResponseMessage, isEventIteratorHeaders, resolveEventIterator, toEventIterator };
+export { ClientPeer, MessageType, ServerPeer, decodeRequestMessage, decodeResponseMessage, encodeRequestMessage, encodeResponseMessage, resolveEventIterator, toEventIterator };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/standard-server-peer",
   "type": "module",
-  "version": "0.0.0-next.fa8d145",
+  "version": "0.0.0-next.fc1437c",
   "license": "MIT",
   "homepage": "https://unnoq.com",
   "repository": {
@@ -23,8 +23,8 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "0.0.0-next.fa8d145",
-    "@orpc/standard-server": "0.0.0-next.fa8d145"
+    "@orpc/shared": "0.0.0-next.fc1437c",
+    "@orpc/standard-server": "0.0.0-next.fc1437c"
   },
   "scripts": {
     "build": "unbuild",