@orpc/standard-server-node 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.d.mts

@@ -1,7 +1,7 @@
-import { StandardBody, StandardHeaders, StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
 import { Readable } from 'node:stream';
 import { IncomingMessage, ServerResponse } from 'node:http';
 import { Http2ServerRequest, Http2ServerResponse } from 'node:http2';
+import { StandardBody, StandardHeaders, StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
 
 declare function toEventIterator(stream: Readable): AsyncGenerator<unknown | void, unknown | void, void>;
 interface ToEventStreamOptions {

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-import { StandardBody, StandardHeaders, StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
 import { Readable } from 'node:stream';
 import { IncomingMessage, ServerResponse } from 'node:http';
 import { Http2ServerRequest, Http2ServerResponse } from 'node:http2';
+import { StandardBody, StandardHeaders, StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
 
 declare function toEventIterator(stream: Readable): AsyncGenerator<unknown | void, unknown | void, void>;
 interface ToEventStreamOptions {

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { Readable } from 'node:stream';
-import { stringifyJSON, parseEmptyableJSON, isTypescriptObject, isAsyncIteratorObject, once } from '@orpc/shared';
-import { EventDecoderStream, encodeEventMessage, getEventMeta, ErrorEvent, withEventMeta, parseContentDisposition, contentDisposition } from '@orpc/standard-server';
+import { stringifyJSON, parseEmptyableJSON, isTypescriptObject, toArray, isAsyncIteratorObject, once } from '@orpc/shared';
+import { EventDecoderStream, encodeEventMessage, getEventMeta, ErrorEvent, withEventMeta, getFilenameFromContentDisposition, generateContentDisposition } from '@orpc/standard-server';
 
 function toEventIterator(stream) {
   const eventStream = Readable.toWeb(stream).pipeThrough(new TextDecoderStream()).pipeThrough(new EventDecoderStream());
@@ -60,11 +60,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();
         }
@@ -94,13 +97,11 @@ async function toStandardBody(req) {
   if (method === "GET" || method === "HEAD") {
     return void 0;
   }
-  const contentDisposition2 = req.headers["content-disposition"];
+  const contentDisposition = req.headers["content-disposition"];
   const contentType = req.headers["content-type"];
-  if (contentDisposition2) {
-    const fileName = parseContentDisposition(contentDisposition2).parameters.filename;
-    if (typeof fileName === "string") {
-      return _streamToFile(req, fileName, contentType ?? "");
-    }
+  if (typeof contentDisposition === "string") {
+    const fileName = getFilenameFromContentDisposition(contentDisposition) ?? "blob";
+    return _streamToFile(req, fileName, contentType ?? "");
   }
   if (!contentType || contentType.startsWith("application/json")) {
     const text = await _streamToString(req);
@@ -122,6 +123,7 @@ async function toStandardBody(req) {
   return _streamToFile(req, "blob", contentType);
 }
 function toNodeHttpBody(body, headers, options = {}) {
+  const currentContentDisposition = toArray(headers["content-disposition"])[0];
   delete headers["content-type"];
   delete headers["content-disposition"];
   if (body === void 0) {
@@ -130,10 +132,7 @@ function toNodeHttpBody(body, headers, options = {}) {
   if (body instanceof Blob) {
     headers["content-type"] = body.type;
     headers["content-length"] = body.size.toString();
-    headers["content-disposition"] = contentDisposition(
-      body instanceof File ? body.name : "blob",
-      { type: "inline" }
-    );
+    headers["content-disposition"] = currentContentDisposition ?? generateContentDisposition(body instanceof File ? body.name : "blob");
     return Readable.fromWeb(body.stream());
   }
   if (body instanceof FormData) {
@@ -192,17 +191,15 @@ function toAbortSignal(res) {
 }
 
 function toStandardLazyRequest(req, res) {
-  const raw = { adapter: "node", request: req, response: res };
   const method = req.method ?? "GET";
   const protocol = "encrypted" in req.socket && req.socket.encrypted ? "https:" : "http:";
   const host = req.headers.host ?? "localhost";
   const url = new URL(req.originalUrl ?? req.url ?? "/", `${protocol}//${host}`);
   return {
-    raw,
     method,
     url,
     headers: req.headers,
-    body: once(() => toStandardBody(raw.request)),
+    body: once(() => toStandardBody(req)),
     signal: toAbortSignal(res)
   };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/standard-server-node",
   "type": "module",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.6",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -23,8 +23,8 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "1.0.0-beta.4",
-    "@orpc/standard-server": "1.0.0-beta.4"
+    "@orpc/shared": "1.0.0-beta.6",
+    "@orpc/standard-server": "1.0.0-beta.6"
   },
   "devDependencies": {
     "@types/node": "^22.13.1",