@orpc/standard-server-fetch 1.0.0-beta.4 → 1.0.0-beta.6

package/README.md

@@ -53,6 +53,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.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());
@@ -59,11 +59,14 @@ 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)
-        }));
+        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;
   }
@@ -182,15 +184,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 +216,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": "1.0.0-beta.4",
+  "version": "1.0.0-beta.6",
   "license": "MIT",
   "homepage": "https://unnoq.com",
   "repository": {
@@ -23,8 +23,8 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/standard-server": "1.0.0-beta.4",
-    "@orpc/shared": "1.0.0-beta.4"
+    "@orpc/shared": "1.0.0-beta.6",
+    "@orpc/standard-server": "1.0.0-beta.6"
   },
   "devDependencies": {
     "@hono/node-server": "^1.13.8"