srvx 0.2.2 → 0.2.4

package/dist/adapters/node.mjs

@@ -88,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)) {
@@ -350,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 = [];

package/dist/types.d.mts

@@ -4,7 +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;
+declare const Response: typeof globalThis.Response;
 /**
  * Create a new server instance.
  */

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "srvx",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "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": [