@orpc/standard-server-peer 0.0.0-next.ac518b6 → 0.0.0-next.add5acf

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import { Promisable, AsyncIdQueueCloseOptions as AsyncIdQueueCloseOptions$1, AsyncIteratorClassCleanupFn, AsyncIteratorClass } from '@orpc/shared';
-import { StandardRequest, StandardResponse, EventMeta } from '@orpc/standard-server';
+import { StandardRequest, StandardResponse, EventMeta, StandardHeaders } from '@orpc/standard-server';
 
-type EncodedMessage = string | ArrayBufferLike | Uint8Array;
+type EncodedMessage = string | ArrayBufferLike;
 interface EncodedMessageSendFn {
     (message: EncodedMessage): Promisable<void>;
 }
@@ -59,6 +59,7 @@ declare function encodeRequestMessage<T extends keyof RequestMessageMap>(id: str
 declare function decodeRequestMessage(raw: EncodedMessage): Promise<DecodedRequestMessage>;
 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?: string;
@@ -100,5 +101,5 @@ declare class ServerPeer {
     close({ abort, ...options }?: ServerPeerCloseOptions): void;
 }
 
-export { ClientPeer, MessageType, ServerPeer, decodeRequestMessage, decodeResponseMessage, encodeRequestMessage, encodeResponseMessage, resolveEventIterator, toEventIterator };
+export { ClientPeer, MessageType, ServerPeer, decodeRequestMessage, decodeResponseMessage, encodeRequestMessage, encodeResponseMessage, isEventIteratorHeaders, resolveEventIterator, toEventIterator };
 export type { ClientPeerCloseOptions, DecodedRequestMessage, DecodedResponseMessage, EncodedMessage, EncodedMessageSendFn, EventIteratorEvent, EventIteratorPayload, RequestMessageMap, ResponseMessageMap, ServerPeerCloseOptions };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { Promisable, AsyncIdQueueCloseOptions as AsyncIdQueueCloseOptions$1, AsyncIteratorClassCleanupFn, AsyncIteratorClass } from '@orpc/shared';
-import { StandardRequest, StandardResponse, EventMeta } from '@orpc/standard-server';
+import { StandardRequest, StandardResponse, EventMeta, StandardHeaders } from '@orpc/standard-server';
 
-type EncodedMessage = string | ArrayBufferLike | Uint8Array;
+type EncodedMessage = string | ArrayBufferLike;
 interface EncodedMessageSendFn {
     (message: EncodedMessage): Promisable<void>;
 }
@@ -59,6 +59,7 @@ declare function encodeRequestMessage<T extends keyof RequestMessageMap>(id: str
 declare function decodeRequestMessage(raw: EncodedMessage): Promise<DecodedRequestMessage>;
 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?: string;
@@ -100,5 +101,5 @@ declare class ServerPeer {
     close({ abort, ...options }?: ServerPeerCloseOptions): void;
 }
 
-export { ClientPeer, MessageType, ServerPeer, decodeRequestMessage, decodeResponseMessage, encodeRequestMessage, encodeResponseMessage, resolveEventIterator, toEventIterator };
+export { ClientPeer, MessageType, ServerPeer, decodeRequestMessage, decodeResponseMessage, encodeRequestMessage, encodeResponseMessage, isEventIteratorHeaders, resolveEventIterator, toEventIterator };
 export type { ClientPeerCloseOptions, DecodedRequestMessage, DecodedResponseMessage, EncodedMessage, EncodedMessageSendFn, EventIteratorEvent, EventIteratorPayload, RequestMessageMap, ResponseMessageMap, ServerPeerCloseOptions };

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { isAsyncIteratorObject, stringifyJSON, readAsBuffer, AsyncIteratorClass, isTypescriptObject, SequentialIdGenerator, AsyncIdQueue } from '@orpc/shared';
-import { generateContentDisposition, flattenHeader, getFilenameFromContentDisposition, withEventMeta, ErrorEvent, getEventMeta, isEventIteratorHeaders, experimental_HibernationEventIterator } from '@orpc/standard-server';
+import { isAsyncIteratorObject, stringifyJSON, AsyncIteratorClass, isTypescriptObject, SequentialIdGenerator, AsyncIdQueue } from '@orpc/shared';
+import { flattenHeader, getFilenameFromContentDisposition, generateContentDisposition, withEventMeta, ErrorEvent, getEventMeta, experimental_HibernationEventIterator } from '@orpc/standard-server';
 
 var MessageType = /* @__PURE__ */ ((MessageType2) => {
   MessageType2[MessageType2["REQUEST"] = 1] = "REQUEST";
@@ -22,7 +22,7 @@ async function encodeRequestMessage(id, type, payload) {
     return encodeRawMessage({ i: id, t: type, p: payload });
   }
   const request = payload;
-  const { body: processedBody, headers: processedHeaders } = await serializeBodyAndHeaders(
+  const { body: processedBody, headers: processedHeaders } = await prepareBodyAndHeadersForSerialization(
     request.body,
     request.headers
   );
@@ -42,7 +42,7 @@ async function encodeRequestMessage(id, type, payload) {
   return encodeRawMessage(baseMessage);
 }
 async function decodeRequestMessage(raw) {
-  const { json: message, buffer } = await decodeRawMessage(raw);
+  const { json: message, blobData } = await decodeRawMessage(raw);
   const id = message.i;
   const type = message.t;
   if (type === 3 /* EVENT_ITERATOR */) {
@@ -54,7 +54,20 @@ async function decodeRequestMessage(raw) {
   }
   const payload = message.p;
   const headers = payload.h ?? {};
-  const body = await deserializeBody(headers, payload.b, buffer);
+  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 }];
 }
 async function encodeResponseMessage(id, type, payload) {
@@ -71,7 +84,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 serializeBodyAndHeaders(
+  const { body: processedBody, headers: processedHeaders } = await prepareBodyAndHeadersForSerialization(
     response.body,
     response.headers
   );
@@ -90,7 +103,7 @@ async function encodeResponseMessage(id, type, payload) {
   return encodeRawMessage(baseMessage);
 }
 async function decodeResponseMessage(raw) {
-  const { json: message, buffer } = await decodeRawMessage(raw);
+  const { json: message, blobData } = await decodeRawMessage(raw);
   const id = message.i;
   const type = message.t;
   if (type === 3 /* EVENT_ITERATOR */) {
@@ -102,10 +115,23 @@ async function decodeResponseMessage(raw) {
   }
   const payload = message.p;
   const headers = payload.h ?? {};
-  const body = await deserializeBody(headers, payload.b, buffer);
+  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, 2 /* RESPONSE */, { status: payload.s ?? 200, headers, body }];
 }
-async function serializeBodyAndHeaders(body, originalHeaders) {
+async function prepareBodyAndHeadersForSerialization(body, originalHeaders) {
   const headers = { ...originalHeaders };
   const originalContentDisposition = headers["content-disposition"];
   delete headers["content-type"];
@@ -133,49 +159,36 @@ async function serializeBodyAndHeaders(body, originalHeaders) {
   }
   return { body, headers };
 }
-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;
+function isEventIteratorHeaders(headers) {
+  return Boolean(flattenHeader(headers["content-type"])?.startsWith("text/event-stream") && headers["content-disposition"] === void 0);
 }
 const JSON_AND_BINARY_DELIMITER = 255;
-async function encodeRawMessage(data, blob) {
+async function encodeRawMessage(data, blobData) {
   const json = stringifyJSON(data);
-  if (blob === void 0 || blob.size === 0) {
+  if (blobData === void 0) {
     return json;
   }
-  return readAsBuffer(new Blob([
+  return new Blob([
     new TextEncoder().encode(json),
     new Uint8Array([JSON_AND_BINARY_DELIMITER]),
-    blob
-  ]));
+    blobData
+  ]).arrayBuffer();
 }
 async function decodeRawMessage(raw) {
   if (typeof raw === "string") {
     return { json: JSON.parse(raw) };
   }
-  const buffer = raw instanceof Uint8Array ? raw : new Uint8Array(raw);
+  const buffer = new Uint8Array(raw instanceof Blob ? await raw.arrayBuffer() : 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.subarray(0, delimiterIndex));
-  const bufferPart = buffer.subarray(delimiterIndex + 1);
+  const jsonPart = new TextDecoder().decode(buffer.slice(0, delimiterIndex));
+  const blobData = buffer.slice(delimiterIndex + 1);
   return {
     json: JSON.parse(jsonPart),
-    buffer: bufferPart
+    blobData: blobData.buffer
   };
 }
 
@@ -436,4 +449,4 @@ class ServerPeer {
   }
 }
 
-export { ClientPeer, MessageType, ServerPeer, decodeRequestMessage, decodeResponseMessage, encodeRequestMessage, encodeResponseMessage, resolveEventIterator, toEventIterator };
+export { ClientPeer, MessageType, ServerPeer, decodeRequestMessage, decodeResponseMessage, encodeRequestMessage, encodeResponseMessage, isEventIteratorHeaders, resolveEventIterator, toEventIterator };

package/package.json

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