@orpc/standard-server-fetch 0.0.0-next.d3b4900 → 0.0.0-next.d5f6b77

package/README.md

@@ -21,28 +21,24 @@
 
 <h3 align="center">Typesafe APIs Made Simple 🪄</h3>
 
-**oRPC is a powerful combination of RPC and OpenAPI**, makes it easy to build APIs that are end-to-end type-safe and adhere to OpenAPI standards, ensuring a smooth and enjoyable developer experience.
+**oRPC is a powerful combination of RPC and OpenAPI**, makes it easy to build APIs that are end-to-end type-safe and adhere to OpenAPI standards
 
 ---
 
 ## Highlights
 
-- **End-to-End Type Safety 🔒**: Ensure complete type safety from inputs to outputs and errors, bridging server and client seamlessly.
-- **First-Class OpenAPI 📄**: Adheres to the OpenAPI standard out of the box, ensuring seamless integration and comprehensive API documentation.
-- **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, 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.
-- **Native Types 📦**: Enjoy built-in support for Date, File, Blob, BigInt, URL and more with no extra setup.
-- **Lazy Router ⏱️**: Improve cold start times with our lazy routing feature.
-- **SSE & Streaming 📡**: Provides SSE and streaming features – perfect for real-time notifications and AI-powered streaming responses.
-- **Reusability 🔄**: Write once and reuse your code across multiple purposes effortlessly.
-- **Extendability 🔌**: Easily enhance oRPC with plugins, middleware, and interceptors.
-- **Reliability 🛡️**: Well-tested, fully TypeScript, production-ready, and MIT licensed for peace of mind.
-- **Simplicity 💡**: Enjoy straightforward, clean code with no hidden magic.
+- **🔗 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.
+- **🚀 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.
+- **⏱️ Lazy Router**: Enhance cold start times with our lazy routing feature.
+- **📡 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
 
@@ -53,6 +49,7 @@ 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).

package/dist/index.d.mts

@@ -53,4 +53,5 @@ interface ToFetchResponseOptions extends ToFetchBodyOptions {
 declare function toFetchResponse(response: StandardResponse, options?: ToFetchResponseOptions): Response;
 declare function toStandardLazyResponse(response: Response): StandardLazyResponse;
 
-export { type ToEventStreamOptions, type ToFetchBodyOptions, type ToFetchRequestOptions, type ToFetchResponseOptions, toEventIterator, toEventStream, toFetchBody, toFetchHeaders, toFetchRequest, toFetchResponse, toStandardBody, toStandardHeaders, toStandardLazyRequest, toStandardLazyResponse };
+export { toEventIterator, toEventStream, toFetchBody, toFetchHeaders, toFetchRequest, toFetchResponse, toStandardBody, toStandardHeaders, toStandardLazyRequest, toStandardLazyResponse };
+export type { ToEventStreamOptions, ToFetchBodyOptions, ToFetchRequestOptions, ToFetchResponseOptions };

package/dist/index.d.ts

@@ -53,4 +53,5 @@ interface ToFetchResponseOptions extends ToFetchBodyOptions {
 declare function toFetchResponse(response: StandardResponse, options?: ToFetchResponseOptions): Response;
 declare function toStandardLazyResponse(response: Response): StandardLazyResponse;
 
-export { type ToEventStreamOptions, type ToFetchBodyOptions, type ToFetchRequestOptions, type ToFetchResponseOptions, toEventIterator, toEventStream, toFetchBody, toFetchHeaders, toFetchRequest, toFetchResponse, toStandardBody, toStandardHeaders, toStandardLazyRequest, toStandardLazyResponse };
+export { toEventIterator, toEventStream, toFetchBody, toFetchHeaders, toFetchRequest, toFetchResponse, toStandardBody, toStandardHeaders, toStandardLazyRequest, toStandardLazyResponse };
+export type { ToEventStreamOptions, ToFetchBodyOptions, ToFetchRequestOptions, ToFetchResponseOptions };

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());
@@ -46,6 +46,7 @@ function toEventStream(iterator, options = {}) {
   const keepAliveEnabled = options.eventIteratorKeepAliveEnabled ?? true;
   const keepAliveInterval = options.eventIteratorKeepAliveInterval ?? 5e3;
   const keepAliveComment = options.eventIteratorKeepAliveComment ?? "";
+  let cancelled = false;
   let timeout;
   const stream = new ReadableStream({
     async pull(controller) {
@@ -59,16 +60,25 @@ function toEventStream(iterator, options = {}) {
         }
         const value = await iterator.next();
         clearInterval(timeout);
-        controller.enqueue(encodeEventMessage({
-          ...getEventMeta(value.value),
-          event: value.done ? "done" : "message",
-          data: stringifyJSON(value.value)
-        }));
+        if (cancelled) {
+          return;
+        }
+        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();
         }
       } catch (err) {
         clearInterval(timeout);
+        if (cancelled) {
+          return;
+        }
         controller.enqueue(encodeEventMessage({
           ...getEventMeta(err),
           event: "error",
@@ -78,6 +88,8 @@ function toEventStream(iterator, options = {}) {
       }
     },
     async cancel(reason) {
+      cancelled = true;
+      clearInterval(timeout);
       if (reason) {
         await iterator.throw?.(reason);
       } else {
@@ -89,18 +101,16 @@ function toEventStream(iterator, options = {}) {
 }
 
 async function toStandardBody(re) {
-  if (!re.body) {
+  if (re.body === null) {
     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 +136,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 +147,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;
   }
@@ -182,15 +193,13 @@ function toFetchHeaders(headers, fetchHeaders = new Headers()) {
 }
 
 function toStandardLazyRequest(request) {
-  const raw = { adapter: "fetch", request };
   return {
-    raw,
     url: new URL(request.url),
     signal: request.signal,
     method: request.method,
-    body: once(() => toStandardBody(raw.request)),
+    body: once(() => toStandardBody(request)),
     get headers() {
-      const headers = toStandardHeaders(raw.request.headers);
+      const headers = toStandardHeaders(request.headers);
       Object.defineProperty(this, "headers", { value: headers, writable: true });
       return headers;
     },
@@ -216,13 +225,11 @@ function toFetchResponse(response, options = {}) {
   return new Response(body, { headers, status: response.status });
 }
 function toStandardLazyResponse(response) {
-  const raw = { adapter: "fetch", response };
   return {
-    raw,
-    body: once(() => toStandardBody(raw.response)),
+    body: once(() => toStandardBody(response)),
     status: response.status,
     get headers() {
-      const headers = toStandardHeaders(raw.response.headers);
+      const headers = toStandardHeaders(response.headers);
       Object.defineProperty(this, "headers", { value: headers, writable: true });
       return headers;
     },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/standard-server-fetch",
   "type": "module",
-  "version": "0.0.0-next.d3b4900",
+  "version": "0.0.0-next.d5f6b77",
   "license": "MIT",
   "homepage": "https://unnoq.com",
   "repository": {
@@ -23,11 +23,11 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "0.0.0-next.d3b4900",
-    "@orpc/standard-server": "0.0.0-next.d3b4900"
+    "@orpc/shared": "0.0.0-next.d5f6b77",
+    "@orpc/standard-server": "0.0.0-next.d5f6b77"
   },
   "devDependencies": {
-    "@hono/node-server": "^1.13.8"
+    "@hono/node-server": "^1.14.1"
   },
   "scripts": {
     "build": "unbuild",