@orpc/standard-server-node 1.0.0-beta.5 → 1.0.0-beta.7

package/dist/index.d.mts

@@ -53,4 +53,5 @@ declare function sendStandardResponse(res: NodeHttpResponse, standardResponse: S
 
 declare function toAbortSignal(res: NodeHttpResponse): AbortSignal;
 
-export { type NodeHttpRequest, type NodeHttpResponse, type SendStandardResponseOptions, type ToEventStreamOptions, type ToNodeHttpBodyOptions, sendStandardResponse, toAbortSignal, toEventIterator, toEventStream, toNodeHttpBody, toStandardBody, toStandardLazyRequest };
+export { sendStandardResponse, toAbortSignal, toEventIterator, toEventStream, toNodeHttpBody, toStandardBody, toStandardLazyRequest };
+export type { NodeHttpRequest, NodeHttpResponse, SendStandardResponseOptions, ToEventStreamOptions, ToNodeHttpBodyOptions };

package/dist/index.d.ts

@@ -53,4 +53,5 @@ declare function sendStandardResponse(res: NodeHttpResponse, standardResponse: S
 
 declare function toAbortSignal(res: NodeHttpResponse): AbortSignal;
 
-export { type NodeHttpRequest, type NodeHttpResponse, type SendStandardResponseOptions, type ToEventStreamOptions, type ToNodeHttpBodyOptions, sendStandardResponse, toAbortSignal, toEventIterator, toEventStream, toNodeHttpBody, toStandardBody, toStandardLazyRequest };
+export { sendStandardResponse, toAbortSignal, toEventIterator, toEventStream, toNodeHttpBody, toStandardBody, toStandardLazyRequest };
+export type { NodeHttpRequest, NodeHttpResponse, SendStandardResponseOptions, ToEventStreamOptions, ToNodeHttpBodyOptions };

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) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/standard-server-node",
   "type": "module",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.7",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -23,13 +23,13 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/standard-server": "1.0.0-beta.5",
-    "@orpc/shared": "1.0.0-beta.5"
+    "@orpc/shared": "1.0.0-beta.7",
+    "@orpc/standard-server": "1.0.0-beta.7"
   },
   "devDependencies": {
-    "@types/node": "^22.13.1",
-    "@types/supertest": "^6.0.2",
-    "supertest": "^7.0.0"
+    "@types/node": "^22.14.0",
+    "@types/supertest": "^6.0.3",
+    "supertest": "^7.1.0"
   },
   "scripts": {
     "build": "unbuild",