@orpc/standard-server-fetch 0.45.1 → 0.47.0

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { StandardBody, StandardHeaders, StandardRequest, StandardResponse } from '@orpc/standard-server';
+import { StandardBody, StandardHeaders, StandardLazyRequest, StandardRequest, StandardResponse, StandardLazyResponse } from '@orpc/standard-server';
 
 declare function toEventIterator(stream: ReadableStream<Uint8Array>): AsyncGenerator<unknown | void, unknown | void, void>;
 interface ToEventStreamOptions {
@@ -7,21 +7,21 @@ interface ToEventStreamOptions {
      *
      * @default true
      */
-    eventSourcePingEnabled?: boolean;
+    eventIteratorKeepAliveEnabled?: boolean;
     /**
      * Interval (in milliseconds) between ping comments sent after the last event.
      *
      * @default 5000
      */
-    eventSourcePingInterval?: number;
+    eventIteratorKeepAliveInterval?: number;
     /**
      * The content of the ping comment. Must not include newline characters.
      *
      * @default ''
      */
-    eventSourcePingContent?: string;
+    eventIteratorKeepAliveComment?: string;
 }
-declare function toEventStream(iterator: AsyncIterator<unknown | void, unknown | void, void>, options?: ToEventStreamOptions): ReadableStream<Uint8Array>;
+declare function toEventStream(iterator: AsyncIterator<unknown | void, unknown | void, void>, options: ToEventStreamOptions): ReadableStream<Uint8Array>;
 
 declare function toStandardBody(re: Request | Response): Promise<StandardBody>;
 interface ToFetchBodyOptions extends ToEventStreamOptions {
@@ -30,7 +30,7 @@ interface ToFetchBodyOptions extends ToEventStreamOptions {
  * @param body
  * @param headers - The headers can be changed by the function and effects on the original headers.
  */
-declare function toFetchBody(body: StandardBody, headers: Headers, options?: ToFetchBodyOptions): string | Blob | FormData | URLSearchParams | undefined | ReadableStream<Uint8Array>;
+declare function toFetchBody(body: StandardBody, headers: Headers, options: ToFetchBodyOptions): string | Blob | FormData | URLSearchParams | undefined | ReadableStream<Uint8Array>;
 
 /**
  * @param headers
@@ -43,10 +43,14 @@ declare function toStandardHeaders(headers: Headers, standardHeaders?: StandardH
  */
 declare function toFetchHeaders(headers: StandardHeaders, fetchHeaders?: Headers): Headers;
 
-declare function toStandardRequest(request: Request): StandardRequest;
+declare function toStandardLazyRequest(request: Request): StandardLazyRequest;
+interface ToFetchRequestOptions extends ToFetchBodyOptions {
+}
+declare function toFetchRequest(request: StandardRequest, options: ToFetchRequestOptions): Request;
 
 interface ToFetchResponseOptions extends ToFetchBodyOptions {
 }
-declare function toFetchResponse(response: StandardResponse, options?: ToFetchResponseOptions): Response;
+declare function toFetchResponse(response: StandardResponse, options: ToFetchResponseOptions): Response;
+declare function toStandardLazyResponse(response: Response): StandardLazyResponse;
 
-export { type ToEventStreamOptions, type ToFetchBodyOptions, type ToFetchResponseOptions, toEventIterator, toEventStream, toFetchBody, toFetchHeaders, toFetchResponse, toStandardBody, toStandardHeaders, toStandardRequest };
+export { type ToEventStreamOptions, type ToFetchBodyOptions, type ToFetchRequestOptions, type ToFetchResponseOptions, toEventIterator, toEventStream, toFetchBody, toFetchHeaders, toFetchRequest, toFetchResponse, toStandardBody, toStandardHeaders, toStandardLazyRequest, toStandardLazyResponse };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { StandardBody, StandardHeaders, StandardRequest, StandardResponse } from '@orpc/standard-server';
+import { StandardBody, StandardHeaders, StandardLazyRequest, StandardRequest, StandardResponse, StandardLazyResponse } from '@orpc/standard-server';
 
 declare function toEventIterator(stream: ReadableStream<Uint8Array>): AsyncGenerator<unknown | void, unknown | void, void>;
 interface ToEventStreamOptions {
@@ -7,21 +7,21 @@ interface ToEventStreamOptions {
      *
      * @default true
      */
-    eventSourcePingEnabled?: boolean;
+    eventIteratorKeepAliveEnabled?: boolean;
     /**
      * Interval (in milliseconds) between ping comments sent after the last event.
      *
      * @default 5000
      */
-    eventSourcePingInterval?: number;
+    eventIteratorKeepAliveInterval?: number;
     /**
      * The content of the ping comment. Must not include newline characters.
      *
      * @default ''
      */
-    eventSourcePingContent?: string;
+    eventIteratorKeepAliveComment?: string;
 }
-declare function toEventStream(iterator: AsyncIterator<unknown | void, unknown | void, void>, options?: ToEventStreamOptions): ReadableStream<Uint8Array>;
+declare function toEventStream(iterator: AsyncIterator<unknown | void, unknown | void, void>, options: ToEventStreamOptions): ReadableStream<Uint8Array>;
 
 declare function toStandardBody(re: Request | Response): Promise<StandardBody>;
 interface ToFetchBodyOptions extends ToEventStreamOptions {
@@ -30,7 +30,7 @@ interface ToFetchBodyOptions extends ToEventStreamOptions {
  * @param body
  * @param headers - The headers can be changed by the function and effects on the original headers.
  */
-declare function toFetchBody(body: StandardBody, headers: Headers, options?: ToFetchBodyOptions): string | Blob | FormData | URLSearchParams | undefined | ReadableStream<Uint8Array>;
+declare function toFetchBody(body: StandardBody, headers: Headers, options: ToFetchBodyOptions): string | Blob | FormData | URLSearchParams | undefined | ReadableStream<Uint8Array>;
 
 /**
  * @param headers
@@ -43,10 +43,14 @@ declare function toStandardHeaders(headers: Headers, standardHeaders?: StandardH
  */
 declare function toFetchHeaders(headers: StandardHeaders, fetchHeaders?: Headers): Headers;
 
-declare function toStandardRequest(request: Request): StandardRequest;
+declare function toStandardLazyRequest(request: Request): StandardLazyRequest;
+interface ToFetchRequestOptions extends ToFetchBodyOptions {
+}
+declare function toFetchRequest(request: StandardRequest, options: ToFetchRequestOptions): Request;
 
 interface ToFetchResponseOptions extends ToFetchBodyOptions {
 }
-declare function toFetchResponse(response: StandardResponse, options?: ToFetchResponseOptions): Response;
+declare function toFetchResponse(response: StandardResponse, options: ToFetchResponseOptions): Response;
+declare function toStandardLazyResponse(response: Response): StandardLazyResponse;
 
-export { type ToEventStreamOptions, type ToFetchBodyOptions, type ToFetchResponseOptions, toEventIterator, toEventStream, toFetchBody, toFetchHeaders, toFetchResponse, toStandardBody, toStandardHeaders, toStandardRequest };
+export { type ToEventStreamOptions, type ToFetchBodyOptions, type ToFetchRequestOptions, type ToFetchResponseOptions, toEventIterator, toEventStream, toFetchBody, toFetchHeaders, toFetchRequest, toFetchResponse, toStandardBody, toStandardHeaders, toStandardLazyRequest, toStandardLazyResponse };

package/dist/index.mjs

@@ -42,20 +42,20 @@ function toEventIterator(stream) {
   }
   return gen();
 }
-function toEventStream(iterator, options = {}) {
-  const pingEnabled = options.eventSourcePingEnabled ?? true;
-  const pingInterval = options.eventSourcePingInterval ?? 5e3;
-  const pingContent = options.eventSourcePingContent ?? "";
+function toEventStream(iterator, options) {
+  const keepAliveEnabled = options.eventIteratorKeepAliveEnabled ?? true;
+  const keepAliveInterval = options.eventIteratorKeepAliveInterval ?? 5e3;
+  const keepAliveComment = options.eventIteratorKeepAliveComment ?? "";
   let timeout;
   const stream = new ReadableStream({
     async pull(controller) {
       try {
-        if (pingEnabled) {
+        if (keepAliveEnabled) {
           timeout = setInterval(() => {
             controller.enqueue(encodeEventMessage({
-              comments: [pingContent]
+              comments: [keepAliveComment]
             }));
-          }, pingInterval);
+          }, keepAliveInterval);
         }
         const value = await iterator.next();
         clearInterval(timeout);
@@ -125,7 +125,7 @@ async function toStandardBody(re) {
     type: blob.type
   });
 }
-function toFetchBody(body, headers, options = {}) {
+function toFetchBody(body, headers, options) {
   headers.delete("content-type");
   headers.delete("content-disposition");
   if (body === void 0) {
@@ -181,7 +181,7 @@ function toFetchHeaders(headers, fetchHeaders = new Headers()) {
   return fetchHeaders;
 }
 
-function toStandardRequest(request) {
+function toStandardLazyRequest(request) {
   return {
     raw: { request },
     url: new URL(request.url),
@@ -198,11 +198,36 @@ function toStandardRequest(request) {
     }
   };
 }
+function toFetchRequest(request, options) {
+  const headers = toFetchHeaders(request.headers);
+  const body = toFetchBody(request.body, headers, options);
+  return new Request(request.url, {
+    signal: request.signal,
+    method: request.method,
+    headers,
+    body
+  });
+}
 
-function toFetchResponse(response, options = {}) {
+function toFetchResponse(response, options) {
   const headers = toFetchHeaders(response.headers);
   const body = toFetchBody(response.body, headers, options);
   return new Response(body, { headers, status: response.status });
 }
+function toStandardLazyResponse(response) {
+  return {
+    raw: { response },
+    body: once(() => toStandardBody(response)),
+    status: response.status,
+    get headers() {
+      const headers = toStandardHeaders(response.headers);
+      Object.defineProperty(this, "headers", { value: headers, writable: true });
+      return headers;
+    },
+    set headers(value) {
+      Object.defineProperty(this, "headers", { value, writable: true });
+    }
+  };
+}
 
-export { toEventIterator, toEventStream, toFetchBody, toFetchHeaders, toFetchResponse, toStandardBody, toStandardHeaders, toStandardRequest };
+export { toEventIterator, toEventStream, toFetchBody, toFetchHeaders, toFetchRequest, toFetchResponse, toStandardBody, toStandardHeaders, toStandardLazyRequest, toStandardLazyResponse };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/standard-server-fetch",
   "type": "module",
-  "version": "0.45.1",
+  "version": "0.47.0",
   "license": "MIT",
   "homepage": "https://unnoq.com",
   "repository": {
@@ -23,8 +23,8 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "0.45.1",
-    "@orpc/standard-server": "0.45.1"
+    "@orpc/shared": "0.47.0",
+    "@orpc/standard-server": "0.47.0"
   },
   "devDependencies": {
     "@hono/node-server": "^1.13.8"