@orpc/standard-server-node 1.14.10 → 1.14.12

package/dist/index.d.mts

@@ -46,9 +46,11 @@ interface SendStandardResponseOptions extends ToNodeHttpBodyOptions {
 }
 declare function sendStandardResponse(res: NodeHttpResponse, standardResponse: StandardResponse, options?: SendStandardResponseOptions): Promise<void>;
 
-declare function toAbortSignal(stream: Stream.Writable): AbortSignal;
+declare function toAbortSignal(stream: Stream.Writable | NodeHttpResponse): AbortSignal;
 
 declare function toStandardUrl(req: NodeHttpRequest): URL;
 
-export { sendStandardResponse, toAbortSignal, toEventIterator, toEventStream, toNodeHttpBody, toNodeHttpHeaders, toStandardBody, toStandardLazyRequest, toStandardMethod, toStandardUrl };
+declare function isNodeResponseStreamEnded(res: Stream.Writable | NodeHttpResponse): boolean;
+
+export { isNodeResponseStreamEnded, sendStandardResponse, toAbortSignal, toEventIterator, toEventStream, toNodeHttpBody, toNodeHttpHeaders, toStandardBody, toStandardLazyRequest, toStandardMethod, toStandardUrl };
 export type { NodeHttpRequest, NodeHttpResponse, SendStandardResponseOptions, ToEventIteratorOptions, ToEventStreamOptions, ToNodeHttpBodyOptions, ToStandardBodyOptions };

package/dist/index.d.ts

@@ -46,9 +46,11 @@ interface SendStandardResponseOptions extends ToNodeHttpBodyOptions {
 }
 declare function sendStandardResponse(res: NodeHttpResponse, standardResponse: StandardResponse, options?: SendStandardResponseOptions): Promise<void>;
 
-declare function toAbortSignal(stream: Stream.Writable): AbortSignal;
+declare function toAbortSignal(stream: Stream.Writable | NodeHttpResponse): AbortSignal;
 
 declare function toStandardUrl(req: NodeHttpRequest): URL;
 
-export { sendStandardResponse, toAbortSignal, toEventIterator, toEventStream, toNodeHttpBody, toNodeHttpHeaders, toStandardBody, toStandardLazyRequest, toStandardMethod, toStandardUrl };
+declare function isNodeResponseStreamEnded(res: Stream.Writable | NodeHttpResponse): boolean;
+
+export { isNodeResponseStreamEnded, sendStandardResponse, toAbortSignal, toEventIterator, toEventStream, toNodeHttpBody, toNodeHttpHeaders, toStandardBody, toStandardLazyRequest, toStandardMethod, toStandardUrl };
 export type { NodeHttpRequest, NodeHttpResponse, SendStandardResponseOptions, ToEventIteratorOptions, ToEventStreamOptions, ToNodeHttpBodyOptions, ToStandardBodyOptions };

package/dist/index.mjs

@@ -113,14 +113,27 @@ function toStandardMethod(method) {
   return method ?? "GET";
 }
 
+function isNodeResponseStreamEnded(res) {
+  const stream = "stream" in res ? res.stream : res;
+  return stream.closed || stream.destroyed || stream.writableFinished;
+}
+
 function toAbortSignal(stream) {
   const controller = new AbortController();
-  stream.once("error", (error) => controller.abort(error));
-  stream.once("close", () => {
-    if (!stream.writableFinished) {
+  if (stream.errored) {
+    controller.abort(stream.errored);
+  } else if (isNodeResponseStreamEnded(stream)) {
+    if (!stream.writableFinished || !stream.writableEnded) {
       controller.abort(new AbortError("Writable stream closed before it finished writing"));
     }
-  });
+  } else {
+    stream.once("error", (error) => controller.abort(error));
+    stream.once("close", () => {
+      if (!stream.writableFinished || !stream.writableEnded) {
+        controller.abort(new AbortError("Writable stream closed before it finished writing"));
+      }
+    });
+  }
   return controller.signal;
 }
 
@@ -144,10 +157,21 @@ function toStandardLazyRequest(req, res) {
 
 function sendStandardResponse(res, standardResponse, options = {}) {
   return new Promise((resolve, reject) => {
-    res.once("error", reject);
-    res.once("close", resolve);
     const resHeaders = { ...standardResponse.headers };
     const resBody = toNodeHttpBody(standardResponse.body, resHeaders, options);
+    if (isNodeResponseStreamEnded(res)) {
+      if (typeof resBody === "object" && !resBody.closed) {
+        resBody.destroy();
+      }
+      if (res.errored) {
+        reject(res.errored);
+      } else {
+        resolve();
+      }
+      return;
+    }
+    res.once("error", reject);
+    res.once("close", resolve);
     res.writeHead(standardResponse.status, toNodeHttpHeaders(resHeaders));
     if (resBody === void 0) {
       res.end();
@@ -165,4 +189,4 @@ function sendStandardResponse(res, standardResponse, options = {}) {
   });
 }
 
-export { sendStandardResponse, toAbortSignal, toEventIterator, toEventStream, toNodeHttpBody, toNodeHttpHeaders, toStandardBody, toStandardLazyRequest, toStandardMethod, toStandardUrl };
+export { isNodeResponseStreamEnded, sendStandardResponse, toAbortSignal, toEventIterator, toEventStream, toNodeHttpBody, toNodeHttpHeaders, toStandardBody, toStandardLazyRequest, toStandardMethod, toStandardUrl };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/standard-server-node",
   "type": "module",
-  "version": "1.14.10",
+  "version": "1.14.12",
   "license": "MIT",
   "homepage": "https://orpc.dev",
   "repository": {
@@ -24,9 +24,9 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/standard-server": "1.14.10",
-    "@orpc/shared": "1.14.10",
-    "@orpc/standard-server-fetch": "1.14.10"
+    "@orpc/standard-server-fetch": "1.14.12",
+    "@orpc/standard-server": "1.14.12",
+    "@orpc/shared": "1.14.12"
   },
   "devDependencies": {
     "@types/node": "^22.19.3",