srvx 0.2.7 → 0.2.8

package/dist/adapters/node.d.mts

@@ -1,4 +1,4 @@
-import { ServerOptions, Server, FetchHandler, NodeHttpHandler } from '../types.mjs';
+import { ServerRequest, ServerOptions, Server, FetchHandler, NodeHttpHandler } from '../types.mjs';
 import NodeHttp__default from 'node:http';
 import { Readable } from 'node:stream';
 import 'node:https';
@@ -6,13 +6,13 @@ import 'node:net';
 import 'bun';
 import '@cloudflare/workers-types';
 
-type NodeFastResponse = InstanceType<typeof NodeFastResponse>;
+type NodeResponse = InstanceType<typeof NodeResponse>;
 /**
  * Fast Response for Node.js runtime
  *
  * It is faster because in most cases it doesn't create a full Response instance.
  */
-declare const NodeFastResponse: {
+declare const NodeResponse: {
     new (body?: BodyInit | null, init?: ResponseInit): {
         "__#4363@#body"?: BodyInit | null;
         "__#4363@#init"?: ResponseInit;
@@ -23,7 +23,7 @@ declare const NodeFastResponse: {
             status: number;
             statusText: string;
             headers: NodeHttp__default.OutgoingHttpHeader[];
-            body: string | Uint8Array<ArrayBufferLike> | ReadableStream<Uint8Array<ArrayBufferLike>> | Readable | Buffer<ArrayBufferLike> | DataView<ArrayBufferLike> | null | undefined;
+            body: string | Buffer<ArrayBufferLike> | Uint8Array<ArrayBufferLike> | ReadableStream<Uint8Array<ArrayBufferLike>> | Readable | DataView<ArrayBufferLike> | null | undefined;
         };
         /** Lazy initialized response instance */
         "__#4363@#responseObj"?: globalThis.Response;
@@ -48,9 +48,80 @@ declare const NodeFastResponse: {
         text(): Promise<string>;
         json(): Promise<any>;
     };
+    json(data: any, init?: ResponseInit): globalThis.Response;
+    error(): globalThis.Response;
+    redirect(url: string | URL, status?: number): globalThis.Response;
+};
+
+declare const NodeRequest: {
+    new (nodeCtx: {
+        req: NodeHttp__default.IncomingMessage;
+        res: NodeHttp__default.ServerResponse;
+    }): ServerRequest;
+};
+
+declare const kNodeInspect: unique symbol;
+
+declare const NodeRequestHeaders: {
+    new (nodeCtx: {
+        req: NodeHttp__default.IncomingMessage;
+        res?: NodeHttp__default.ServerResponse;
+    }): {
+        node: {
+            req: NodeHttp__default.IncomingMessage;
+            res?: NodeHttp__default.ServerResponse;
+        };
+        append(name: string, value: string): void;
+        delete(name: string): void;
+        get(name: string): string | null;
+        getSetCookie(): string[];
+        has(name: string): boolean;
+        set(name: string, value: string): void;
+        readonly count: number;
+        getAll(_name: "set-cookie" | "Set-Cookie"): string[];
+        toJSON(): Record<string, string>;
+        forEach(cb: (value: string, key: string, parent: /*elided*/ any) => void, thisArg?: any): void;
+        entries(): HeadersIterator<[string, string]>;
+        keys(): HeadersIterator<string>;
+        values(): HeadersIterator<string>;
+        [Symbol.iterator](): HeadersIterator<[string, string]>;
+        readonly [Symbol.toStringTag]: string;
+        [kNodeInspect](): {
+            [k: string]: string;
+        };
+    };
+};
+declare const NodeResponseHeaders: {
+    new (nodeCtx: {
+        req?: NodeHttp__default.IncomingMessage;
+        res: NodeHttp__default.ServerResponse;
+    }): {
+        node: {
+            req?: NodeHttp__default.IncomingMessage;
+            res: NodeHttp__default.ServerResponse;
+        };
+        append(name: string, value: string): void;
+        delete(name: string): void;
+        get(name: string): string | null;
+        getSetCookie(): string[];
+        has(name: string): boolean;
+        set(name: string, value: string): void;
+        readonly count: number;
+        getAll(_name: "set-cookie" | "Set-Cookie"): string[];
+        toJSON(): Record<string, string>;
+        forEach(cb: (value: string, key: string, parent: /*elided*/ any) => void, thisArg?: any): void;
+        entries(): HeadersIterator<[string, string]>;
+        keys(): HeadersIterator<string>;
+        values(): HeadersIterator<string>;
+        [Symbol.iterator](): HeadersIterator<[string, string]>;
+        readonly [Symbol.toStringTag]: string;
+        [kNodeInspect](): {
+            [k: string]: string;
+        };
+    };
 };
 
 declare function serve(options: ServerOptions): Server;
 declare function toNodeHandler(fetchHandler: FetchHandler): NodeHttpHandler;
 
-export { NodeFastResponse as Response, serve, toNodeHandler };
+export { NodeRequest, NodeRequestHeaders, NodeResponse, NodeResponseHeaders, NodeRequest as Request, NodeResponse as Response, serve, toNodeHandler };

package/dist/adapters/node.mjs

@@ -93,7 +93,7 @@ const kNodeInspect = /* @__PURE__ */ Symbol.for(
   "nodejs.util.inspect.custom"
 );
 
-const NodeReqHeadersProxy = /* @__PURE__ */ (() => {
+const NodeRequestHeaders = /* @__PURE__ */ (() => {
   const _Headers = class Headers {
     constructor(nodeCtx) {
       this.node = nodeCtx;
@@ -118,6 +118,10 @@ const NodeReqHeadersProxy = /* @__PURE__ */ (() => {
     }
     get(name) {
       name = name.toLowerCase();
+      const rawValue = this.node.req.headers[name];
+      if (rawValue === void 0) {
+        return null;
+      }
       return _normalizeValue(this.node.req.headers[name]);
     }
     getSetCookie() {
@@ -195,14 +199,105 @@ const NodeReqHeadersProxy = /* @__PURE__ */ (() => {
   Object.setPrototypeOf(_Headers.prototype, globalThis.Headers.prototype);
   return _Headers;
 })();
+const NodeResponseHeaders = /* @__PURE__ */ (() => {
+  const _Headers = class Headers {
+    constructor(nodeCtx) {
+      this.node = nodeCtx;
+    }
+    append(name, value) {
+      this.node.res.appendHeader(name, value);
+    }
+    delete(name) {
+      this.node.res.removeHeader(name);
+    }
+    get(name) {
+      const rawValue = this.node.res.getHeader(name);
+      if (rawValue === void 0) {
+        return null;
+      }
+      return _normalizeValue(rawValue);
+    }
+    getSetCookie() {
+      const setCookie = _normalizeValue(this.node.res.getHeader("set-cookie"));
+      if (!setCookie) {
+        return [];
+      }
+      return splitSetCookieString(setCookie);
+    }
+    has(name) {
+      return this.node.res.hasHeader(name);
+    }
+    set(name, value) {
+      this.node.res.setHeader(name, value);
+    }
+    get count() {
+      throw new Error("Method not implemented.");
+    }
+    getAll(_name) {
+      throw new Error("Method not implemented.");
+    }
+    toJSON() {
+      const _headers = this.node.res.getHeaders();
+      const result = {};
+      for (const key in _headers) {
+        if (_headers[key]) {
+          result[key] = _normalizeValue(_headers[key]);
+        }
+      }
+      return result;
+    }
+    forEach(cb, thisArg) {
+      const _headers = this.node.res.getHeaders();
+      for (const key in _headers) {
+        if (_headers[key]) {
+          cb.call(
+            thisArg,
+            _normalizeValue(_headers[key]),
+            key,
+            this
+          );
+        }
+      }
+    }
+    *entries() {
+      const _headers = this.node.res.getHeaders();
+      for (const key in _headers) {
+        yield [key, _normalizeValue(_headers[key])];
+      }
+    }
+    *keys() {
+      const keys = this.node.res.getHeaderNames();
+      for (const key of keys) {
+        yield key;
+      }
+    }
+    *values() {
+      const values = Object.values(this.node.res.getHeaders());
+      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());
+    }
+  };
+  Object.setPrototypeOf(_Headers.prototype, globalThis.Headers.prototype);
+  return _Headers;
+})();
 function _normalizeValue(value) {
   if (Array.isArray(value)) {
     return value.join(", ");
   }
-  return value || "";
+  return typeof value === "string" ? value : String(value ?? "");
 }
 
-const NodeReqURLProxy = /* @__PURE__ */ (() => {
+const NodeRequestURL = /* @__PURE__ */ (() => {
   const _URL = class URL {
     constructor(nodeCtx) {
       this._hash = "";
@@ -381,7 +476,7 @@ function parseHost(host) {
   return [s[0], String(Number.parseInt(s[1]) || "")];
 }
 
-const NodeRequestProxy = /* @__PURE__ */ (() => {
+const NodeRequest = /* @__PURE__ */ (() => {
   const _Request = class Request {
     #url;
     #headers;
@@ -399,7 +494,7 @@ const NodeRequestProxy = /* @__PURE__ */ (() => {
     }
     get headers() {
       if (!this.#headers) {
-        this.#headers = new NodeReqHeadersProxy(this.node);
+        this.#headers = new NodeRequestHeaders(this.node);
       }
       return this.#headers;
     }
@@ -411,7 +506,7 @@ const NodeRequestProxy = /* @__PURE__ */ (() => {
     }
     get _url() {
       if (!this.#url) {
-        this.#url = new NodeReqURLProxy(this.node);
+        this.#url = new NodeRequestURL(this.node);
       }
       return this.#url;
     }
@@ -547,7 +642,10 @@ async function _readStream(stream) {
   return Buffer.concat(chunks);
 }
 
-const NodeFastResponse = /* @__PURE__ */ (() => {
+const NodeResponse = /* @__PURE__ */ (() => {
+  const CONTENT_TYPE = "content-type";
+  const JSON_TYPE = "application/json";
+  const JSON_HEADER = [[CONTENT_TYPE, JSON_TYPE]];
   const _Response = class Response {
     #body;
     #init;
@@ -555,6 +653,27 @@ const NodeFastResponse = /* @__PURE__ */ (() => {
       this.#body = body;
       this.#init = init;
     }
+    static json(data, init) {
+      if (init?.headers) {
+        if (!init.headers[CONTENT_TYPE]) {
+          const initHeaders = new Headers(init.headers);
+          if (!initHeaders.has(CONTENT_TYPE)) {
+            initHeaders.set(CONTENT_TYPE, JSON_TYPE);
+          }
+          init = { ...init, headers: initHeaders };
+        }
+      } else {
+        init = init ? { ...init } : {};
+        init.headers = JSON_HEADER;
+      }
+      return new _Response(JSON.stringify(data), init);
+    }
+    static error() {
+      return globalThis.Response.error();
+    }
+    static redirect(url, status) {
+      return globalThis.Response.redirect(url, status);
+    }
     /**
      * Prepare Node.js response object
      */
@@ -774,7 +893,7 @@ function serve(options) {
 }
 function toNodeHandler(fetchHandler) {
   return (nodeReq, nodeRes) => {
-    const request = new NodeRequestProxy({ req: nodeReq, res: nodeRes });
+    const request = new NodeRequest({ req: nodeReq, res: nodeRes });
     const res = fetchHandler(request);
     return res instanceof Promise ? res.then((resolvedRes) => sendNodeResponse(nodeRes, resolvedRes)) : sendNodeResponse(nodeRes, res);
   };
@@ -786,7 +905,7 @@ class NodeServer {
     const fetchHandler = wrapFetch(this, this.options.fetch);
     this.fetch = fetchHandler;
     const handler = (nodeReq, nodeRes) => {
-      const request = new NodeRequestProxy({ req: nodeReq, res: nodeRes });
+      const request = new NodeRequest({ req: nodeReq, res: nodeRes });
       const res = fetchHandler(request);
       return res instanceof Promise ? res.then((resolvedRes) => sendNodeResponse(nodeRes, resolvedRes)) : sendNodeResponse(nodeRes, res);
     };
@@ -842,4 +961,4 @@ class NodeServer {
   }
 }
 
-export { NodeFastResponse as Response, serve, toNodeHandler };
+export { NodeRequest, NodeRequestHeaders, NodeResponse, NodeResponseHeaders, NodeRequest as Request, NodeResponse as Response, serve, toNodeHandler };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "srvx",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Universal Server API based on web platform standards. Works seamlessly with Deno, Bun and Node.js.",
   "repository": "unjs/srvx",
   "license": "MIT",
@@ -13,11 +13,11 @@
     "./node": "./dist/adapters/node.mjs",
     "./cloudflare": "./dist/adapters/cloudflare.mjs",
     ".": {
+      "types": "./dist/types.d.mts",
       "deno": "./dist/adapters/deno.mjs",
       "bun": "./dist/adapters/bun.mjs",
       "workerd": "./dist/adapters/cloudflare.mjs",
-      "node": "./dist/adapters/node.mjs",
-      "types": "./dist/types.d.mts"
+      "node": "./dist/adapters/node.mjs"
     }
   },
   "types": "./dist/types.d.mts",