srvx 0.2.1 → 0.2.2

package/dist/adapters/node.d.mts

@@ -1,5 +1,6 @@
 import { ServerOptions, Server, FetchHandler, NodeHttpHandler } from '../types.mjs';
 import NodeHttp__default from 'node:http';
+import { Readable } from 'node:stream';
 import 'node:net';
 import 'bun';
 import '@cloudflare/workers-types';
@@ -7,8 +8,8 @@ import '@cloudflare/workers-types';
 type NodeFastResponse = InstanceType<typeof NodeFastResponse>;
 declare const NodeFastResponse: {
     new (body?: BodyInit | null, init?: ResponseInit): {
-        "__#4200@#body"?: BodyInit | null;
-        "__#4200@#init"?: ResponseInit;
+        "__#4201@#body"?: BodyInit | null;
+        "__#4201@#init"?: ResponseInit;
         /**
          * Prepare Node.js response object
          */
@@ -16,14 +17,14 @@ declare const NodeFastResponse: {
             status: number;
             statusText: string;
             headers: NodeHttp__default.OutgoingHttpHeader[];
-            body: string | Uint8Array<ArrayBufferLike> | ReadableStream<Uint8Array<ArrayBufferLike>> | Buffer<ArrayBufferLike> | DataView<ArrayBufferLike> | null | undefined;
+            body: string | Uint8Array<ArrayBufferLike> | ReadableStream<Uint8Array<ArrayBufferLike>> | Readable | Buffer<ArrayBufferLike> | DataView<ArrayBufferLike> | null | undefined;
         };
         /** Lazy initialized response instance */
-        "__#4200@#responseObj"?: Response;
+        "__#4201@#responseObj"?: Response;
         /** Lazy initialized headers instance */
-        "__#4200@#headersObj"?: Headers;
+        "__#4201@#headersObj"?: Headers;
         clone(): Response;
-        readonly "__#4200@#response": Response;
+        readonly "__#4201@#response": Response;
         readonly headers: Headers;
         readonly ok: boolean;
         readonly redirected: boolean;
@@ -31,7 +32,7 @@ declare const NodeFastResponse: {
         readonly statusText: string;
         readonly type: ResponseType;
         readonly url: string;
-        "__#4200@#fastBody"<T extends object>(as: new (...args: any[]) => T): T | null | false;
+        "__#4201@#fastBody"<T extends object>(as: new (...args: any[]) => T): T | null | false;
         readonly body: ReadableStream<Uint8Array> | null;
         readonly bodyUsed: boolean;
         arrayBuffer(): Promise<ArrayBuffer>;

package/dist/adapters/node.mjs

@@ -10,11 +10,18 @@ async function sendNodeResponse(nodeRes, webRes) {
   }
   if (webRes.nodeResponse) {
     const res = webRes.nodeResponse();
-    nodeRes.writeHead(res.status, res.statusText, res.headers);
-    if (res.body instanceof ReadableStream) {
-      return streamBody(res.body, nodeRes);
+    if (!nodeRes.headersSent) {
+      nodeRes.writeHead(res.status, res.statusText, res.headers);
+    }
+    if (res.body) {
+      if (res.body instanceof ReadableStream) {
+        return streamBody(res.body, nodeRes);
+      } else if (typeof res.body?.pipe === "function") {
+        res.body.pipe(nodeRes);
+        return new Promise((resolve) => nodeRes.on("close", resolve));
+      }
+      nodeRes.write(res.body);
     }
-    nodeRes.write(res.body);
     return endNodeResponse(nodeRes);
   }
   const headerEntries = [];
@@ -27,7 +34,9 @@ async function sendNodeResponse(nodeRes, webRes) {
       headerEntries.push([key, value]);
     }
   }
-  nodeRes.writeHead(webRes.status || 200, webRes.statusText, headerEntries);
+  if (!nodeRes.headersSent) {
+    nodeRes.writeHead(webRes.status || 200, webRes.statusText, headerEntries);
+  }
   return webRes.body ? streamBody(webRes.body, nodeRes) : endNodeResponse(nodeRes);
 }
 function endNodeResponse(nodeRes) {
@@ -516,12 +525,10 @@ const NodeFastResponse = /* @__PURE__ */ (() => (
       const status = this.#init?.status ?? 200;
       const statusText = this.#init?.statusText ?? "";
       const headers = [];
-      let headersInit = this.#init?.headers;
+      const headersInit = this.#init?.headers;
       if (headersInit) {
-        if (typeof headersInit === "object") {
-          headersInit = Object.entries(headersInit);
-        }
-        for (const [key, value] of headersInit) {
+        const headerEntries = headersInit.entries ? headersInit.entries() : Object.entries(headersInit);
+        for (const [key, value] of headerEntries) {
           if (key === "set-cookie") {
             for (const setCookie of splitSetCookieString(value)) {
               headers.push(["set-cookie", setCookie]);
@@ -549,6 +556,8 @@ const NodeFastResponse = /* @__PURE__ */ (() => (
           if (bodyInit.type) {
             headers.push(["content-type", bodyInit.type]);
           }
+        } else if (typeof bodyInit.pipe === "function") {
+          body = bodyInit;
         } else {
           const res = new Response(bodyInit);
           body = res.body;

package/dist/types.d.mts

@@ -4,6 +4,7 @@ import * as Bun from 'bun';
 import * as CF from '@cloudflare/workers-types';
 
 type MaybePromise<T> = T | Promise<T>;
+declare const Response: globalThis.Response;
 /**
  * Create a new server instance.
  */
@@ -172,4 +173,4 @@ type DenoFetchHandler = (request: Request, info?: Deno.ServeHandlerInfo<Deno.Net
 type NodeHttpHandler = (nodeReq: NodeHttp.IncomingMessage, nodeRes: NodeHttp.ServerResponse) => void | Promise<void>;
 type CloudflareFetchHandler = CF.ExportedHandlerFetchHandler;
 
-export { type BunFetchandler, type CloudflareFetchHandler, type DenoFetchHandler, type FetchHandler, type NodeHttpHandler, type Server, type ServerHandler, type ServerOptions, type ServerPlugin, type ServerPluginInstance, type ServerRequest, serve };
+export { type BunFetchandler, type CloudflareFetchHandler, type DenoFetchHandler, type FetchHandler, type NodeHttpHandler, Response, type Server, type ServerHandler, type ServerOptions, type ServerPlugin, type ServerPluginInstance, type ServerRequest, serve };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "srvx",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Universal Server API based on web platform standards. Works seamlessly with Deno, Bun and Node.js.",
   "repository": "unjs/srvx",
   "license": "MIT",