srvx 0.2.6 → 0.2.7

package/dist/adapters/bun.d.mts

@@ -1,4 +1,4 @@
-import { ServerOptions, Server, BunFetchandler } from '../types.mjs';
+import { ServerOptions, Server, BunFetchHandler } from '../types.mjs';
 import * as Bun from 'bun';
 import 'node:http';
 import 'node:https';
@@ -13,12 +13,12 @@ declare const Response: {
     redirect(url: string | URL, status?: number): Response;
 };
 declare function serve(options: ServerOptions): BunServer;
-declare class BunServer implements Server<BunFetchandler> {
+declare class BunServer implements Server<BunFetchHandler> {
     readonly runtime = "bun";
     readonly options: ServerOptions;
     readonly bun: Server["bun"];
     readonly serveOptions: Bun.ServeOptions | Bun.TLSServeOptions;
-    readonly fetch: BunFetchandler;
+    readonly fetch: BunFetchHandler;
     constructor(options: ServerOptions);
     serve(): Promise<Awaited<this>>;
     get url(): string | undefined;

package/dist/adapters/node.d.mts

@@ -26,11 +26,11 @@ declare const NodeFastResponse: {
             body: string | Uint8Array<ArrayBufferLike> | ReadableStream<Uint8Array<ArrayBufferLike>> | Readable | Buffer<ArrayBufferLike> | DataView<ArrayBufferLike> | null | undefined;
         };
         /** Lazy initialized response instance */
-        "__#4363@#responseObj"?: Response;
+        "__#4363@#responseObj"?: globalThis.Response;
         /** Lazy initialized headers instance */
         "__#4363@#headersObj"?: Headers;
-        clone(): Response;
-        readonly "__#4363@#response": Response;
+        clone(): globalThis.Response;
+        readonly "__#4363@#response": globalThis.Response;
         readonly headers: Headers;
         readonly ok: boolean;
         readonly redirected: boolean;

package/dist/adapters/node.mjs

@@ -89,19 +89,18 @@ function streamBody(stream, nodeRes) {
   });
 }
 
-const kNodeReq = /* @__PURE__ */ Symbol.for("srvx.node.request");
 const kNodeInspect = /* @__PURE__ */ Symbol.for(
   "nodejs.util.inspect.custom"
 );
 
 const NodeReqHeadersProxy = /* @__PURE__ */ (() => {
-  class NodeReqHeadersProxy2 {
-    constructor(req) {
-      this[kNodeReq] = req;
+  const _Headers = class Headers {
+    constructor(nodeCtx) {
+      this.node = nodeCtx;
     }
     append(name, value) {
       name = name.toLowerCase();
-      const _headers = this[kNodeReq].headers;
+      const _headers = this.node.req.headers;
       const _current = _headers[name];
       if (_current) {
         if (Array.isArray(_current)) {
@@ -115,14 +114,14 @@ const NodeReqHeadersProxy = /* @__PURE__ */ (() => {
     }
     delete(name) {
       name = name.toLowerCase();
-      this[kNodeReq].headers[name] = void 0;
+      this.node.req.headers[name] = void 0;
     }
     get(name) {
       name = name.toLowerCase();
-      return _normalizeValue(this[kNodeReq].headers[name]);
+      return _normalizeValue(this.node.req.headers[name]);
     }
     getSetCookie() {
-      const setCookie = this[kNodeReq].headers["set-cookie"];
+      const setCookie = this.node.req.headers["set-cookie"];
       if (!setCookie || setCookie.length === 0) {
         return [];
       }
@@ -130,11 +129,11 @@ const NodeReqHeadersProxy = /* @__PURE__ */ (() => {
     }
     has(name) {
       name = name.toLowerCase();
-      return !!this[kNodeReq].headers[name];
+      return !!this.node.req.headers[name];
     }
     set(name, value) {
       name = name.toLowerCase();
-      this[kNodeReq].headers[name] = value;
+      this.node.req.headers[name] = value;
     }
     get count() {
       throw new Error("Method not implemented.");
@@ -143,7 +142,7 @@ const NodeReqHeadersProxy = /* @__PURE__ */ (() => {
       throw new Error("Method not implemented.");
     }
     toJSON() {
-      const _headers = this[kNodeReq].headers;
+      const _headers = this.node.req.headers;
       const result = {};
       for (const key in _headers) {
         if (_headers[key]) {
@@ -153,7 +152,7 @@ const NodeReqHeadersProxy = /* @__PURE__ */ (() => {
       return result;
     }
     forEach(cb, thisArg) {
-      const _headers = this[kNodeReq].headers;
+      const _headers = this.node.req.headers;
       for (const key in _headers) {
         if (_headers[key]) {
           cb.call(
@@ -166,24 +165,24 @@ const NodeReqHeadersProxy = /* @__PURE__ */ (() => {
       }
     }
     *entries() {
-      const _headers = this[kNodeReq].headers;
+      const _headers = this.node.req.headers;
       for (const key in _headers) {
         yield [key, _normalizeValue(_headers[key])];
       }
     }
     *keys() {
-      const keys = Object.keys(this[kNodeReq].headers);
+      const keys = Object.keys(this.node.req.headers);
       for (const key of keys) {
         yield key;
       }
     }
     *values() {
-      const values = Object.values(this[kNodeReq].headers);
+      const values = Object.values(this.node.req.headers);
       for (const value of values) {
         yield _normalizeValue(value);
       }
     }
-    [(Symbol.iterator)]() {
+    [Symbol.iterator]() {
       return this.entries()[Symbol.iterator]();
     }
     get [Symbol.toStringTag]() {
@@ -192,9 +191,9 @@ const NodeReqHeadersProxy = /* @__PURE__ */ (() => {
     [kNodeInspect]() {
       return Object.fromEntries(this.entries());
     }
-  }
-  Object.setPrototypeOf(NodeReqHeadersProxy2.prototype, Headers.prototype);
-  return NodeReqHeadersProxy2;
+  };
+  Object.setPrototypeOf(_Headers.prototype, globalThis.Headers.prototype);
+  return _Headers;
 })();
 function _normalizeValue(value) {
   if (Array.isArray(value)) {
@@ -203,149 +202,171 @@ function _normalizeValue(value) {
   return value || "";
 }
 
-const NodeReqURLProxy = /* @__PURE__ */ (() => class _NodeReqURLProxy {
-  constructor(req) {
-    this.hash = "";
-    this.password = "";
-    this.username = "";
-    this[kNodeReq] = req;
-  }
-  // host
-  get host() {
-    return this[kNodeReq].headers.host || "";
-  }
-  set host(value) {
-    this._hostname = void 0;
-    this._port = void 0;
-    this[kNodeReq].headers.host = value;
-  }
-  // hostname
-  get hostname() {
-    if (this._hostname === void 0) {
-      const [hostname, port] = parseHost(this[kNodeReq].headers.host);
-      if (this._port === void 0 && port) {
-        this._port = String(Number.parseInt(port) || "");
+const NodeReqURLProxy = /* @__PURE__ */ (() => {
+  const _URL = class URL {
+    constructor(nodeCtx) {
+      this._hash = "";
+      this._username = "";
+      this._password = "";
+      this.node = nodeCtx;
+    }
+    get hash() {
+      return this._hash;
+    }
+    set hash(value) {
+      this._hash = value;
+    }
+    get username() {
+      return this._username;
+    }
+    set username(value) {
+      this._username = value;
+    }
+    get password() {
+      return this._password;
+    }
+    set password(value) {
+      this._password = value;
+    }
+    // host
+    get host() {
+      return this.node.req.headers.host || "";
+    }
+    set host(value) {
+      this._hostname = void 0;
+      this._port = void 0;
+      this.node.req.headers.host = value;
+    }
+    // hostname
+    get hostname() {
+      if (this._hostname === void 0) {
+        const [hostname, port] = parseHost(this.node.req.headers.host);
+        if (this._port === void 0 && port) {
+          this._port = String(Number.parseInt(port) || "");
+        }
+        this._hostname = hostname || "localhost";
       }
-      this._hostname = hostname || "localhost";
+      return this._hostname;
     }
-    return this._hostname;
-  }
-  set hostname(value) {
-    this._hostname = value;
-  }
-  // port
-  get port() {
-    if (this._port === void 0) {
-      const [hostname, port] = parseHost(this[kNodeReq].headers.host);
-      if (this._hostname === void 0 && hostname) {
-        this._hostname = hostname;
+    set hostname(value) {
+      this._hostname = value;
+    }
+    // port
+    get port() {
+      if (this._port === void 0) {
+        const [hostname, port] = parseHost(this.node.req.headers.host);
+        if (this._hostname === void 0 && hostname) {
+          this._hostname = hostname;
+        }
+        this._port = port || String(this.node.req.socket?.localPort || "");
       }
-      this._port = port || String(this[kNodeReq].socket?.localPort || "");
+      return this._port;
     }
-    return this._port;
-  }
-  set port(value) {
-    this._port = String(Number.parseInt(value) || "");
-  }
-  // pathname
-  get pathname() {
-    if (this._pathname === void 0) {
-      const [pathname, search] = parsePath(this[kNodeReq].url || "/");
-      this._pathname = pathname;
+    set port(value) {
+      this._port = String(Number.parseInt(value) || "");
+    }
+    // pathname
+    get pathname() {
+      if (this._pathname === void 0) {
+        const [pathname, search] = parsePath(this.node.req.url || "/");
+        this._pathname = pathname;
+        if (this._search === void 0) {
+          this._search = search;
+        }
+      }
+      return this._pathname;
+    }
+    set pathname(value) {
+      if (value[0] !== "/") {
+        value = "/" + value;
+      }
+      if (value === this._pathname) {
+        return;
+      }
+      this._pathname = value;
+      this.node.req.url = value + this.search;
+    }
+    // search
+    get search() {
       if (this._search === void 0) {
+        const [pathname, search] = parsePath(this.node.req.url || "/");
         this._search = search;
+        if (this._pathname === void 0) {
+          this._pathname = pathname;
+        }
       }
+      return this._search;
     }
-    return this._pathname;
-  }
-  set pathname(value) {
-    if (value[0] !== "/") {
-      value = "/" + value;
+    set search(value) {
+      if (value === "?") {
+        value = "";
+      } else if (value && value[0] !== "?") {
+        value = "?" + value;
+      }
+      if (value === this._search) {
+        return;
+      }
+      this._search = value;
+      this._searchParams = void 0;
+      this.node.req.url = this.pathname + value;
     }
-    if (value === this._pathname) {
-      return;
+    // searchParams
+    get searchParams() {
+      if (!this._searchParams) {
+        this._searchParams = new URLSearchParams(this.search);
+      }
+      return this._searchParams;
     }
-    this._pathname = value;
-    this[kNodeReq].url = value + this.search;
-  }
-  // search
-  get search() {
-    if (this._search === void 0) {
-      const [pathname, search] = parsePath(this[kNodeReq].url || "/");
-      this._search = search;
-      if (this._pathname === void 0) {
-        this._pathname = pathname;
+    set searchParams(value) {
+      this._searchParams = value;
+      this._search = value.toString();
+    }
+    // protocol
+    get protocol() {
+      if (!this._protocol) {
+        this._protocol = this.node.req.socket?.encrypted || this.node.req.headers["x-forwarded-proto"] === "https" ? "https:" : "http:";
       }
+      return this._protocol;
     }
-    return this._search;
-  }
-  set search(value) {
-    if (value === "?") {
-      value = "";
-    } else if (value && value[0] !== "?") {
-      value = "?" + value;
+    set protocol(value) {
+      this._protocol = value;
     }
-    if (value === this._search) {
-      return;
+    // origin
+    get origin() {
+      return `${this.protocol}//${this.host}`;
     }
-    this._search = value;
-    this._searchParams = void 0;
-    this[kNodeReq].url = this.pathname + value;
-  }
-  // searchParams
-  get searchParams() {
-    if (!this._searchParams) {
-      this._searchParams = new URLSearchParams(this.search);
+    set origin(_value) {
     }
-    return this._searchParams;
-  }
-  set searchParams(value) {
-    this._searchParams = value;
-    this._search = value.toString();
-  }
-  // protocol
-  get protocol() {
-    if (!this._protocol) {
-      this._protocol = this[kNodeReq].socket?.encrypted || this[kNodeReq].headers["x-forwarded-proto"] === "https" ? "https:" : "http:";
+    // href
+    get href() {
+      return `${this.protocol}//${this.host}${this.pathname}${this.search}`;
     }
-    return this._protocol;
-  }
-  set protocol(value) {
-    this._protocol = value;
-  }
-  // origin
-  get origin() {
-    return `${this.protocol}//${this.host}`;
-  }
-  set origin(_value) {
-  }
-  // href
-  get href() {
-    return `${this.protocol}//${this.host}${this.pathname}${this.search}`;
-  }
-  set href(value) {
-    const _url = new URL(value);
-    this._protocol = _url.protocol;
-    this.username = _url.username;
-    this.password = _url.password;
-    this._hostname = _url.hostname;
-    this._port = _url.port;
-    this.pathname = _url.pathname;
-    this.search = _url.search;
-    this.hash = _url.hash;
-  }
-  toString() {
-    return this.href;
-  }
-  toJSON() {
-    return this.href;
-  }
-  get [(Symbol.toStringTag)]() {
-    return "URL";
-  }
-  [kNodeInspect]() {
-    return this.href;
-  }
+    set href(value) {
+      const _url = new globalThis.URL(value);
+      this._protocol = _url.protocol;
+      this.username = _url.username;
+      this.password = _url.password;
+      this._hostname = _url.hostname;
+      this._port = _url.port;
+      this.pathname = _url.pathname;
+      this.search = _url.search;
+      this.hash = _url.hash;
+    }
+    toString() {
+      return this.href;
+    }
+    toJSON() {
+      return this.href;
+    }
+    get [Symbol.toStringTag]() {
+      return "URL";
+    }
+    [kNodeInspect]() {
+      return this.href;
+    }
+  };
+  Object.setPrototypeOf(_URL.prototype, globalThis.URL.prototype);
+  return _URL;
 })();
 function parsePath(input) {
   const url = (input || "/").replace(/\\/g, "/");
@@ -361,7 +382,7 @@ function parseHost(host) {
 }
 
 const NodeRequestProxy = /* @__PURE__ */ (() => {
-  class NodeRequestProxy2 {
+  const _Request = class Request {
     #url;
     #headers;
     #bodyUsed = false;
@@ -373,29 +394,32 @@ const NodeRequestProxy = /* @__PURE__ */ (() => {
     #jsonBody;
     #textBody;
     #bodyStream;
-    constructor(nodeReq) {
-      this[kNodeReq] = nodeReq;
+    constructor(nodeCtx) {
+      this.node = nodeCtx;
     }
     get headers() {
       if (!this.#headers) {
-        this.#headers = new NodeReqHeadersProxy(this[kNodeReq]);
+        this.#headers = new NodeReqHeadersProxy(this.node);
       }
       return this.#headers;
     }
     get remoteAddress() {
-      return this[kNodeReq].socket?.remoteAddress;
+      return this.node.req.socket?.remoteAddress;
     }
     clone() {
-      return new NodeRequestProxy2(this[kNodeReq]);
+      return new _Request({ ...this.node });
     }
-    get url() {
+    get _url() {
       if (!this.#url) {
-        this.#url = new NodeReqURLProxy(this[kNodeReq]);
+        this.#url = new NodeReqURLProxy(this.node);
       }
-      return this.#url.href;
+      return this.#url;
+    }
+    get url() {
+      return this._url.href;
     }
     get method() {
-      return this[kNodeReq].method || "GET";
+      return this.node.req.method || "GET";
     }
     get signal() {
       if (!this.#abortSignal) {
@@ -410,13 +434,13 @@ const NodeRequestProxy = /* @__PURE__ */ (() => {
       if (this.#hasBody !== void 0) {
         return this.#hasBody;
       }
-      const method = this[kNodeReq].method?.toUpperCase();
+      const method = this.node.req.method?.toUpperCase();
       if (!method || !(method === "PATCH" || method === "POST" || method === "PUT" || method === "DELETE")) {
         this.#hasBody = false;
         return false;
       }
-      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 (!Number.parseInt(this.node.req.headers["content-length"] || "")) {
+        const isChunked = (this.node.req.headers["transfer-encoding"] || "").split(",").map((e) => e.trim()).filter(Boolean).includes("chunked");
         if (!isChunked) {
           this.#hasBody = false;
           return false;
@@ -433,7 +457,7 @@ const NodeRequestProxy = /* @__PURE__ */ (() => {
         this.#bodyUsed = true;
         this.#bodyStream = new ReadableStream({
           start: (controller) => {
-            this[kNodeReq].on("data", (chunk) => {
+            this.node.req.on("data", (chunk) => {
               controller.enqueue(chunk);
             }).once("error", (error) => {
               controller.error(error);
@@ -467,7 +491,7 @@ const NodeRequestProxy = /* @__PURE__ */ (() => {
       if (!this.#blobBody) {
         this.#blobBody = this.bytes().then((bytes) => {
           return new Blob([bytes], {
-            type: this[kNodeReq].headers["content-type"]
+            type: this.node.req.headers["content-type"]
           });
         });
       }
@@ -497,7 +521,7 @@ const NodeRequestProxy = /* @__PURE__ */ (() => {
       }
       return this.#jsonBody;
     }
-    get [(Symbol.toStringTag)]() {
+    get [Symbol.toStringTag]() {
       return "Request";
     }
     [kNodeInspect]() {
@@ -507,9 +531,9 @@ const NodeRequestProxy = /* @__PURE__ */ (() => {
         headers: this.headers
       };
     }
-  }
-  Object.setPrototypeOf(NodeRequestProxy2.prototype, Request.prototype);
-  return NodeRequestProxy2;
+  };
+  Object.setPrototypeOf(_Request.prototype, globalThis.Request.prototype);
+  return _Request;
 })();
 async function _readStream(stream) {
   const chunks = [];
@@ -524,7 +548,7 @@ async function _readStream(stream) {
 }
 
 const NodeFastResponse = /* @__PURE__ */ (() => {
-  class NodeFastResponse2 {
+  const _Response = class Response {
     #body;
     #init;
     constructor(body, init) {
@@ -572,7 +596,7 @@ const NodeFastResponse = /* @__PURE__ */ (() => {
         } else if (typeof bodyInit.pipe === "function") {
           body = bodyInit;
         } else {
-          const res = new Response(bodyInit);
+          const res = new globalThis.Response(bodyInit);
           body = res.body;
           for (const [key, value] of res.headers) {
             headers.push([key, value]);
@@ -597,11 +621,11 @@ const NodeFastResponse = /* @__PURE__ */ (() => {
       if (this.#responseObj) {
         return this.#responseObj.clone();
       }
-      return new Response(this.#body, this.#init);
+      return new globalThis.Response(this.#body, this.#init);
     }
     get #response() {
       if (!this.#responseObj) {
-        this.#responseObj = new Response(this.#body, this.#init);
+        this.#responseObj = new globalThis.Response(this.#body, this.#init);
         this.#body = void 0;
         this.#init = void 0;
         this.#headersObj = void 0;
@@ -740,9 +764,9 @@ const NodeFastResponse = /* @__PURE__ */ (() => {
       }
       return this.text().then((text) => JSON.parse(text));
     }
-  }
-  Object.setPrototypeOf(NodeFastResponse2.prototype, Response.prototype);
-  return NodeFastResponse2;
+  };
+  Object.setPrototypeOf(_Response.prototype, globalThis.Response.prototype);
+  return _Response;
 })();
 
 function serve(options) {
@@ -750,8 +774,7 @@ function serve(options) {
 }
 function toNodeHandler(fetchHandler) {
   return (nodeReq, nodeRes) => {
-    const request = new NodeRequestProxy(nodeReq);
-    request.node = { req: nodeReq, res: nodeRes };
+    const request = new NodeRequestProxy({ req: nodeReq, res: nodeRes });
     const res = fetchHandler(request);
     return res instanceof Promise ? res.then((resolvedRes) => sendNodeResponse(nodeRes, resolvedRes)) : sendNodeResponse(nodeRes, res);
   };
@@ -763,8 +786,7 @@ class NodeServer {
     const fetchHandler = wrapFetch(this, this.options.fetch);
     this.fetch = fetchHandler;
     const handler = (nodeReq, nodeRes) => {
-      const request = new NodeRequestProxy(nodeReq);
-      request.node = { req: nodeReq, res: nodeRes };
+      const request = new NodeRequestProxy({ req: nodeReq, res: nodeRes });
       const res = fetchHandler(request);
       return res instanceof Promise ? res.then((resolvedRes) => sendNodeResponse(nodeRes, resolvedRes)) : sendNodeResponse(nodeRes, res);
     };

package/dist/types.d.mts

@@ -194,9 +194,9 @@ interface ServerRequest extends Request {
     };
 }
 type FetchHandler = (request: Request) => Response | Promise<Response>;
-type BunFetchandler = (request: Request, server?: Bun.Server) => Response | Promise<Response>;
+type BunFetchHandler = (request: Request, server?: Bun.Server) => Response | Promise<Response>;
 type DenoFetchHandler = (request: Request, info?: Deno.ServeHandlerInfo<Deno.NetAddr>) => Response | Promise<Response>;
 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, Response, type Server, type ServerHandler, type ServerOptions, type ServerPlugin, type ServerPluginInstance, type ServerRequest, serve };
+export { type BunFetchHandler, 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,12 +1,11 @@
 {
   "name": "srvx",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "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",
@@ -21,6 +20,7 @@
       "types": "./dist/types.d.mts"
     }
   },
+  "types": "./dist/types.d.mts",
   "files": [
     "dist"
   ],
@@ -30,12 +30,12 @@
     "dev": "vitest dev",
     "lint": "eslint . && prettier -c .",
     "lint:fix": "automd && eslint . --fix && prettier -w .",
-    "play:mkcert": "openssl req -x509 -newkey rsa:2048 -nodes -keyout server.key -out server.crt -days 365 -subj /CN=srvx.local",
-    "play:node": "node playground/app.mjs",
-    "play:deno": "deno run -A playground/app.mjs",
+    "prepack": "pnpm build",
     "play:bun": "bun playground/app.mjs",
     "play:cf": "pnpx wrangler dev playground/app.mjs",
-    "prepack": "pnpm build",
+    "play:deno": "deno run -A playground/app.mjs",
+    "play:mkcert": "openssl req -x509 -newkey rsa:2048 -nodes -keyout server.key -out server.crt -days 365 -subj /CN=srvx.local",
+    "play:node": "node playground/app.mjs",
     "release": "pnpm test && changelogen --release && npm publish && git push --follow-tags",
     "test": "pnpm lint && pnpm test:types && vitest run --coverage",
     "test:types": "tsc --noEmit --skipLibCheck"
@@ -66,5 +66,8 @@
     "unbuild": "^3.5.0",
     "vitest": "^3.0.9"
   },
-  "packageManager": "pnpm@10.6.5"
+  "packageManager": "pnpm@10.6.5",
+  "engines": {
+    "node": ">=20.11.1"
+  }
 }