srvx 0.2.1 → 0.2.3

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) {
@@ -79,103 +88,107 @@ const kNodeInspect = /* @__PURE__ */ Symbol.for(
   "nodejs.util.inspect.custom"
 );
 
-const NodeReqHeadersProxy = /* @__PURE__ */ (() => class NodeReqHeadersProxy {
-  constructor(req) {
-    this[kNodeReq] = req;
-  }
-  append(name, value) {
-    name = name.toLowerCase();
-    const _headers = this[kNodeReq].headers;
-    const _current = _headers[name];
-    if (_current) {
-      if (Array.isArray(_current)) {
-        _current.push(value);
+const NodeReqHeadersProxy = /* @__PURE__ */ (() => {
+  class NodeReqHeadersProxy2 {
+    constructor(req) {
+      this[kNodeReq] = req;
+    }
+    append(name, value) {
+      name = name.toLowerCase();
+      const _headers = this[kNodeReq].headers;
+      const _current = _headers[name];
+      if (_current) {
+        if (Array.isArray(_current)) {
+          _current.push(value);
+        } else {
+          _headers[name] = [_current, value];
+        }
       } else {
-        _headers[name] = [_current, value];
+        _headers[name] = value;
       }
-    } else {
-      _headers[name] = value;
     }
-  }
-  delete(name) {
-    name = name.toLowerCase();
-    this[kNodeReq].headers[name] = void 0;
-  }
-  get(name) {
-    name = name.toLowerCase();
-    return _normalizeValue(this[kNodeReq].headers[name]);
-  }
-  getSetCookie() {
-    const setCookie = this[kNodeReq].headers["set-cookie"];
-    if (!setCookie || setCookie.length === 0) {
-      return [];
+    delete(name) {
+      name = name.toLowerCase();
+      this[kNodeReq].headers[name] = void 0;
     }
-    return splitSetCookieString(setCookie);
-  }
-  has(name) {
-    name = name.toLowerCase();
-    return !!this[kNodeReq].headers[name];
-  }
-  set(name, value) {
-    name = name.toLowerCase();
-    this[kNodeReq].headers[name] = value;
-  }
-  get count() {
-    throw new Error("Method not implemented.");
-  }
-  getAll(_name) {
-    throw new Error("Method not implemented.");
-  }
-  toJSON() {
-    const _headers = this[kNodeReq].headers;
-    const result = {};
-    for (const key in _headers) {
-      if (_headers[key]) {
-        result[key] = _normalizeValue(_headers[key]);
-      }
-    }
-    return result;
-  }
-  forEach(cb, thisArg) {
-    const _headers = this[kNodeReq].headers;
-    for (const key in _headers) {
-      if (_headers[key]) {
-        cb.call(
-          thisArg,
-          _normalizeValue(_headers[key]),
-          key,
-          this
-        );
+    get(name) {
+      name = name.toLowerCase();
+      return _normalizeValue(this[kNodeReq].headers[name]);
+    }
+    getSetCookie() {
+      const setCookie = this[kNodeReq].headers["set-cookie"];
+      if (!setCookie || setCookie.length === 0) {
+        return [];
       }
+      return splitSetCookieString(setCookie);
     }
-  }
-  *entries() {
-    const _headers = this[kNodeReq].headers;
-    for (const key in _headers) {
-      yield [key, _normalizeValue(_headers[key])];
+    has(name) {
+      name = name.toLowerCase();
+      return !!this[kNodeReq].headers[name];
     }
-  }
-  *keys() {
-    const keys = Object.keys(this[kNodeReq].headers);
-    for (const key of keys) {
-      yield key;
+    set(name, value) {
+      name = name.toLowerCase();
+      this[kNodeReq].headers[name] = value;
     }
-  }
-  *values() {
-    const values = Object.values(this[kNodeReq].headers);
-    for (const value of values) {
-      yield _normalizeValue(value);
+    get count() {
+      throw new Error("Method not implemented.");
+    }
+    getAll(_name) {
+      throw new Error("Method not implemented.");
+    }
+    toJSON() {
+      const _headers = this[kNodeReq].headers;
+      const result = {};
+      for (const key in _headers) {
+        if (_headers[key]) {
+          result[key] = _normalizeValue(_headers[key]);
+        }
+      }
+      return result;
+    }
+    forEach(cb, thisArg) {
+      const _headers = this[kNodeReq].headers;
+      for (const key in _headers) {
+        if (_headers[key]) {
+          cb.call(
+            thisArg,
+            _normalizeValue(_headers[key]),
+            key,
+            this
+          );
+        }
+      }
+    }
+    *entries() {
+      const _headers = this[kNodeReq].headers;
+      for (const key in _headers) {
+        yield [key, _normalizeValue(_headers[key])];
+      }
+    }
+    *keys() {
+      const keys = Object.keys(this[kNodeReq].headers);
+      for (const key of keys) {
+        yield key;
+      }
+    }
+    *values() {
+      const values = Object.values(this[kNodeReq].headers);
+      for (const value of values) {
+        yield _normalizeValue(value);
+      }
+    }
+    [(Symbol.iterator)]() {
+      return this.entries()[Symbol.iterator]();
+    }
+    get [Symbol.toStringTag]() {
+      return "Headers";
+    }
+    [kNodeInspect]() {
+      return Object.fromEntries(this.entries());
     }
   }
-  [(Symbol.iterator)]() {
-    return this.entries()[Symbol.iterator]();
-  }
-  get [Symbol.toStringTag]() {
-    return "Headers";
-  }
-  [kNodeInspect]() {
-    return Object.fromEntries(this.entries());
-  }
+  Object.setPrototypeOf(NodeReqHeadersProxy2.prototype, Headers.prototype);
+  return NodeReqHeadersProxy2;
 })();
 function _normalizeValue(value) {
   if (Array.isArray(value)) {
@@ -341,148 +354,155 @@ function parseHost(host) {
   return [s[0], String(Number.parseInt(s[1]) || "")];
 }
 
-const NodeRequestProxy = /* @__PURE__ */ (() => class NodeRequestProxy2 {
-  constructor(nodeReq) {
-    this.cache = "default";
-    this.credentials = "same-origin";
-    this.destination = "";
-    this.integrity = "";
-    this.keepalive = false;
-    this.mode = "cors";
-    this.redirect = "follow";
-    this.referrer = "about:client";
-    this.referrerPolicy = "";
-    this.bodyUsed = false;
-    this[kNodeReq] = nodeReq;
-    this._url = new NodeReqURLProxy(nodeReq);
-    this.headers = new NodeReqHeadersProxy(nodeReq);
-  }
-  #abortSignal;
-  #hasBody;
-  #bodyBytes;
-  #blobBody;
-  #formDataBody;
-  #jsonBody;
-  #textBody;
-  #bodyStream;
-  get remoteAddress() {
-    return this[kNodeReq].socket?.remoteAddress;
-  }
-  clone() {
-    return new NodeRequestProxy2(this[kNodeReq]);
-  }
-  get url() {
-    return this._url.href;
-  }
-  get method() {
-    return this[kNodeReq].method || "GET";
-  }
-  get signal() {
-    if (!this.#abortSignal) {
-      this.#abortSignal = new AbortController();
+const NodeRequestProxy = /* @__PURE__ */ (() => {
+  class NodeRequestProxy2 {
+    #url;
+    #headers;
+    #bodyUsed = false;
+    #abortSignal;
+    #hasBody;
+    #bodyBytes;
+    #blobBody;
+    #formDataBody;
+    #jsonBody;
+    #textBody;
+    #bodyStream;
+    constructor(nodeReq) {
+      this[kNodeReq] = nodeReq;
     }
-    return this.#abortSignal.signal;
-  }
-  get _hasBody() {
-    if (this.#hasBody !== void 0) {
-      return this.#hasBody;
+    get headers() {
+      if (!this.#headers) {
+        this.#headers = new NodeReqHeadersProxy(this[kNodeReq]);
+      }
+      return this.#headers;
     }
-    const method = this[kNodeReq].method?.toUpperCase();
-    if (!method || !(method === "PATCH" || method === "POST" || method === "PUT" || method === "DELETE")) {
-      this.#hasBody = false;
-      return false;
+    get remoteAddress() {
+      return this[kNodeReq].socket?.remoteAddress;
+    }
+    clone() {
+      return new NodeRequestProxy2(this[kNodeReq]);
+    }
+    get url() {
+      if (!this.#url) {
+        this.#url = new NodeReqURLProxy(this[kNodeReq]);
+      }
+      return this.#url.href;
+    }
+    get method() {
+      return this[kNodeReq].method || "GET";
     }
-    if (!Number.parseInt(this[kNodeReq].headers["content-length"] || "")) {
-      const isChunked = (this[kNodeReq].headers["transfer-encoding"] || "").split(",").map((e) => e.trim()).filter(Boolean).includes("chunked");
-      if (!isChunked) {
+    get signal() {
+      if (!this.#abortSignal) {
+        this.#abortSignal = new AbortController();
+      }
+      return this.#abortSignal.signal;
+    }
+    get bodyUsed() {
+      return this.#bodyUsed;
+    }
+    get _hasBody() {
+      if (this.#hasBody !== void 0) {
+        return this.#hasBody;
+      }
+      const method = this[kNodeReq].method?.toUpperCase();
+      if (!method || !(method === "PATCH" || method === "POST" || method === "PUT" || method === "DELETE")) {
         this.#hasBody = false;
         return false;
       }
-    }
-    return true;
-  }
-  get body() {
-    if (!this._hasBody) {
-      return null;
-    }
-    if (!this.#bodyStream) {
-      this.bodyUsed = true;
-      this.#bodyStream = new ReadableStream({
-        start: (controller) => {
-          this[kNodeReq].on("data", (chunk) => {
-            controller.enqueue(chunk);
-          }).once("error", (error) => {
-            controller.error(error);
-            this.#abortSignal?.abort();
-          }).once("close", () => {
-            this.#abortSignal?.abort();
-          }).once("end", () => {
-            controller.close();
-          });
+      if (!Number.parseInt(this[kNodeReq].headers["content-length"] || "")) {
+        const isChunked = (this[kNodeReq].headers["transfer-encoding"] || "").split(",").map((e) => e.trim()).filter(Boolean).includes("chunked");
+        if (!isChunked) {
+          this.#hasBody = false;
+          return false;
         }
+      }
+      return true;
+    }
+    get body() {
+      if (!this._hasBody) {
+        return null;
+      }
+      if (!this.#bodyStream) {
+        this.#bodyUsed = true;
+        this.#bodyStream = new ReadableStream({
+          start: (controller) => {
+            this[kNodeReq].on("data", (chunk) => {
+              controller.enqueue(chunk);
+            }).once("error", (error) => {
+              controller.error(error);
+              this.#abortSignal?.abort();
+            }).once("close", () => {
+              this.#abortSignal?.abort();
+            }).once("end", () => {
+              controller.close();
+            });
+          }
+        });
+      }
+      return this.#bodyStream;
+    }
+    bytes() {
+      if (!this.#bodyBytes) {
+        const _bodyStream = this.body;
+        this.#bodyBytes = _bodyStream ? _readStream(_bodyStream) : Promise.resolve(new Uint8Array());
+      }
+      return this.#bodyBytes;
+    }
+    arrayBuffer() {
+      return this.bytes().then((buff) => {
+        return buff.buffer.slice(
+          buff.byteOffset,
+          buff.byteOffset + buff.byteLength
+        );
       });
     }
-    return this.#bodyStream;
-  }
-  bytes() {
-    if (!this.#bodyBytes) {
-      const _bodyStream = this.body;
-      this.#bodyBytes = _bodyStream ? _readStream(_bodyStream) : Promise.resolve(new Uint8Array());
+    blob() {
+      if (!this.#blobBody) {
+        this.#blobBody = this.bytes().then((bytes) => {
+          return new Blob([bytes], {
+            type: this[kNodeReq].headers["content-type"]
+          });
+        });
+      }
+      return this.#blobBody;
     }
-    return this.#bodyBytes;
-  }
-  arrayBuffer() {
-    return this.bytes().then((buff) => {
-      return buff.buffer.slice(
-        buff.byteOffset,
-        buff.byteOffset + buff.byteLength
-      );
-    });
-  }
-  blob() {
-    if (!this.#blobBody) {
-      this.#blobBody = this.bytes().then((bytes) => {
-        return new Blob([bytes], {
-          type: this[kNodeReq].headers["content-type"]
+    formData() {
+      if (!this.#formDataBody) {
+        this.#formDataBody = new Response(this.body, {
+          headers: this.headers
+        }).formData();
+      }
+      return this.#formDataBody;
+    }
+    text() {
+      if (!this.#textBody) {
+        this.#textBody = this.bytes().then((bytes) => {
+          return new TextDecoder().decode(bytes);
         });
-      });
+      }
+      return this.#textBody;
     }
-    return this.#blobBody;
-  }
-  formData() {
-    if (!this.#formDataBody) {
-      this.#formDataBody = new Response(this.body, {
-        headers: this.headers
-      }).formData();
+    json() {
+      if (!this.#jsonBody) {
+        this.#jsonBody = this.text().then((txt) => {
+          return JSON.parse(txt);
+        });
+      }
+      return this.#jsonBody;
     }
-    return this.#formDataBody;
-  }
-  text() {
-    if (!this.#textBody) {
-      this.#textBody = this.bytes().then((bytes) => {
-        return new TextDecoder().decode(bytes);
-      });
+    get [(Symbol.toStringTag)]() {
+      return "Request";
     }
-    return this.#textBody;
-  }
-  json() {
-    if (!this.#jsonBody) {
-      this.#jsonBody = this.text().then((txt) => {
-        return JSON.parse(txt);
-      });
+    [kNodeInspect]() {
+      return {
+        method: this.method,
+        url: this.url,
+        headers: this.headers
+      };
     }
-    return this.#jsonBody;
-  }
-  get [(Symbol.toStringTag)]() {
-    return "Request";
-  }
-  [kNodeInspect]() {
-    return {
-      method: this.method,
-      url: this.url,
-      headers: this.headers
-    };
   }
+  Object.setPrototypeOf(NodeRequestProxy2.prototype, Request.prototype);
+  return NodeRequestProxy2;
 })();
 async function _readStream(stream) {
   const chunks = [];
@@ -516,12 +536,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 +567,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,11 +1,12 @@
 {
   "name": "srvx",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Universal Server API based on web platform standards. Works seamlessly with Deno, Bun and Node.js.",
   "repository": "unjs/srvx",
   "license": "MIT",
   "sideEffects": false,
   "type": "module",
+  "types": "./dist/types.d.mts",
   "exports": {
     "./types": "./dist/types.d.mts",
     "./deno": "./dist/adapters/deno.mjs",
@@ -16,7 +17,8 @@
       "deno": "./dist/adapters/deno.mjs",
       "bun": "./dist/adapters/bun.mjs",
       "workerd": "./dist/adapters/cloudflare.mjs",
-      "node": "./dist/adapters/node.mjs"
+      "node": "./dist/adapters/node.mjs",
+      "types": "./dist/types.d.mts"
     }
   },
   "files": [