@orpc/standard-server-fetch 0.0.0-next.cd121e3 → 0.0.0-next.cf06e99

package/README.md

@@ -32,7 +32,7 @@
 - **Contract-First Development 📜**: (Optional) Define your API contract upfront and implement it with confidence.
 - **Exceptional Developer Experience ✨**: Enjoy a streamlined workflow with robust typing and clear, in-code documentation.
 - **Multi-Runtime Support 🌍**: Run your code seamlessly on Cloudflare, Deno, Bun, Node.js, and more.
-- **Framework Integrations 🧩**: Supports Tanstack Query (React, Vue), Pinia Colada, and more.
+- **Framework Integrations 🧩**: Supports Tanstack Query (React, Vue, Solid, Svelte), Pinia Colada, and more.
 - **Server Actions ⚡️**: Fully compatible with React Server Actions on Next.js, TanStack Start, and more.
 - **Standard Schema Support 🗂️**: Effortlessly work with Zod, Valibot, ArkType, and others right out of the box.
 - **Fast & Lightweight 💨**: Built on native APIs across all runtimes – optimized for speed and efficiency.
@@ -53,16 +53,29 @@ 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/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/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/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/).
 
 ## `@orpc/standard-server-fetch`
 
 [Fetch API](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API) server adapter for oRPC.
 
+## Sponsors
+
+<p align="center">
+  <a href="https://cdn.jsdelivr.net/gh/unnoq/unnoq/sponsors.svg">
+    <img src='https://cdn.jsdelivr.net/gh/unnoq/unnoq/sponsors.svg'/>
+  </a>
+</p>
+
 ## License
 
 Distributed under the MIT License. See [LICENSE](https://github.com/unnoq/orpc/blob/main/LICENSE) for more information.

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,19 +7,19 @@ 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>;
 
@@ -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 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,19 +7,19 @@ 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>;
 
@@ -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 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

@@ -1,5 +1,5 @@
 import { stringifyJSON, parseEmptyableJSON, isTypescriptObject, isAsyncIteratorObject, once } from '@orpc/shared';
-import { EventDecoderStream, encodeEventMessage, getEventMeta, ErrorEvent, withEventMeta, parseContentDisposition, contentDisposition } from '@orpc/standard-server';
+import { EventDecoderStream, encodeEventMessage, getEventMeta, ErrorEvent, withEventMeta, getFilenameFromContentDisposition, generateContentDisposition } from '@orpc/standard-server';
 
 function toEventIterator(stream) {
   const eventStream = stream.pipeThrough(new TextDecoderStream()).pipeThrough(new EventDecoderStream());
@@ -43,27 +43,30 @@ function toEventIterator(stream) {
   return gen();
 }
 function toEventStream(iterator, options = {}) {
-  const pingEnabled = options.eventSourcePingEnabled ?? true;
-  const pingInterval = options.eventSourcePingInterval ?? 5e3;
-  const pingContent = options.eventSourcePingContent ?? "";
+  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);
-        controller.enqueue(encodeEventMessage({
-          ...getEventMeta(value.value),
-          event: value.done ? "done" : "message",
-          data: stringifyJSON(value.value)
-        }));
+        const meta = getEventMeta(value.value);
+        if (!value.done || value.value !== void 0 || meta !== void 0) {
+          controller.enqueue(encodeEventMessage({
+            ...meta,
+            event: value.done ? "done" : "message",
+            data: stringifyJSON(value.value)
+          }));
+        }
         if (value.done) {
           controller.close();
         }
@@ -92,15 +95,13 @@ async function toStandardBody(re) {
   if (!re.body) {
     return void 0;
   }
-  const contentDisposition2 = re.headers.get("content-disposition");
-  if (contentDisposition2) {
-    const fileName = parseContentDisposition(contentDisposition2).parameters.filename;
-    if (typeof fileName === "string") {
-      const blob2 = await re.blob();
-      return new File([blob2], fileName, {
-        type: blob2.type
-      });
-    }
+  const contentDisposition = re.headers.get("content-disposition");
+  if (typeof contentDisposition === "string") {
+    const fileName = getFilenameFromContentDisposition(contentDisposition) ?? "blob";
+    const blob2 = await re.blob();
+    return new File([blob2], fileName, {
+      type: blob2.type
+    });
   }
   const contentType = re.headers.get("content-type");
   if (!contentType || contentType.startsWith("application/json")) {
@@ -126,6 +127,7 @@ async function toStandardBody(re) {
   });
 }
 function toFetchBody(body, headers, options = {}) {
+  const currentContentDisposition = headers.get("content-disposition");
   headers.delete("content-type");
   headers.delete("content-disposition");
   if (body === void 0) {
@@ -136,7 +138,7 @@ function toFetchBody(body, headers, options = {}) {
     headers.set("content-length", body.size.toString());
     headers.set(
       "content-disposition",
-      contentDisposition(body instanceof File ? body.name : "blob", { type: "inline" })
+      currentContentDisposition ?? generateContentDisposition(body instanceof File ? body.name : "blob")
     );
     return body;
   }
@@ -181,9 +183,8 @@ function toFetchHeaders(headers, fetchHeaders = new Headers()) {
   return fetchHeaders;
 }
 
-function toStandardRequest(request) {
+function toStandardLazyRequest(request) {
   return {
-    raw: { request },
     url: new URL(request.url),
     signal: request.signal,
     method: request.method,
@@ -198,11 +199,35 @@ 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 = {}) {
   const headers = toFetchHeaders(response.headers);
   const body = toFetchBody(response.body, headers, options);
   return new Response(body, { headers, status: response.status });
 }
+function toStandardLazyResponse(response) {
+  return {
+    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.0.0-next.cd121e3",
+  "version": "0.0.0-next.cf06e99",
   "license": "MIT",
   "homepage": "https://unnoq.com",
   "repository": {
@@ -23,8 +23,8 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "0.0.0-next.cd121e3",
-    "@orpc/standard-server": "0.0.0-next.cd121e3"
+    "@orpc/shared": "0.0.0-next.cf06e99",
+    "@orpc/standard-server": "0.0.0-next.cf06e99"
   },
   "devDependencies": {
     "@hono/node-server": "^1.13.8"