srvx 0.1.2 → 0.1.4

package/dist/bun.mjs

@@ -1,4 +1,4 @@
-import { S as Server, r as resolvePort } from './shared/srvx.4f681732.mjs';
+import { S as Server, r as resolvePort } from './shared/srvx.-ZdI-RlW.mjs';
 
 function serve(options) {
   return new BunServer(options);

package/dist/deno.mjs

@@ -1,4 +1,4 @@
-import { S as Server, r as resolvePort } from './shared/srvx.4f681732.mjs';
+import { S as Server, r as resolvePort } from './shared/srvx.-ZdI-RlW.mjs';
 
 function serve(options) {
   return new DenoServer(options);

package/dist/node-utils/index.d.mts

@@ -20,14 +20,10 @@ declare const NodeRequestProxy: {
         referrerPolicy: ReferrerPolicy;
         headers: xHeaders;
         bodyUsed: boolean;
-        xNode: {
-            req: NodeHttp__default.IncomingMessage;
-            res: NodeHttp__default.ServerResponse;
-        } | undefined;
-        "__#448@#url": URL;
+        _url: URL;
         "__#448@#abortSignal"?: AbortController;
         "__#448@#hasBody": boolean | undefined;
-        "__#448@#rawBody"?: Promise<Uint8Array>;
+        "__#448@#bodyBytes"?: Promise<Uint8Array>;
         "__#448@#blobBody"?: Promise<Blob>;
         "__#448@#formDataBody"?: Promise<FormData>;
         "__#448@#jsonBody"?: Promise<any>;
@@ -40,12 +36,12 @@ declare const NodeRequestProxy: {
         readonly signal: AbortSignal;
         readonly _hasBody: boolean;
         readonly body: ReadableStream<Uint8Array<ArrayBufferLike>> | null;
-        arrayBuffer(): Promise<ArrayBuffer>;
         bytes(): Promise<Uint8Array>;
+        arrayBuffer(): Promise<ArrayBuffer>;
         blob(): Promise<Blob>;
         formData(): Promise<FormData>;
-        json(): Promise<any>;
         text(): Promise<string>;
+        json(): Promise<any>;
         [kNodeReq]: NodeHttp__default.IncomingMessage;
         readonly [Symbol.toStringTag]: string;
         [kNodeInspect](): {
@@ -68,7 +64,7 @@ declare const NodeFastResponse: {
             status: number;
             statusText: string;
             headers: NodeHttp__default.OutgoingHttpHeader[];
-            body: string | Buffer<ArrayBufferLike> | Uint8Array<ArrayBufferLike> | ReadableStream<Uint8Array<ArrayBufferLike>> | DataView<ArrayBufferLike> | null | undefined;
+            body: string | Uint8Array<ArrayBufferLike> | ReadableStream<Uint8Array<ArrayBufferLike>> | Buffer<ArrayBufferLike> | DataView<ArrayBufferLike> | null | undefined;
         };
         /** Lazy initialized response instance */
         "__#449@#responseObj"?: Response;

package/dist/node-utils/index.d.ts

@@ -20,14 +20,10 @@ declare const NodeRequestProxy: {
         referrerPolicy: ReferrerPolicy;
         headers: xHeaders;
         bodyUsed: boolean;
-        xNode: {
-            req: NodeHttp__default.IncomingMessage;
-            res: NodeHttp__default.ServerResponse;
-        } | undefined;
-        "__#448@#url": URL;
+        _url: URL;
         "__#448@#abortSignal"?: AbortController;
         "__#448@#hasBody": boolean | undefined;
-        "__#448@#rawBody"?: Promise<Uint8Array>;
+        "__#448@#bodyBytes"?: Promise<Uint8Array>;
         "__#448@#blobBody"?: Promise<Blob>;
         "__#448@#formDataBody"?: Promise<FormData>;
         "__#448@#jsonBody"?: Promise<any>;
@@ -40,12 +36,12 @@ declare const NodeRequestProxy: {
         readonly signal: AbortSignal;
         readonly _hasBody: boolean;
         readonly body: ReadableStream<Uint8Array<ArrayBufferLike>> | null;
-        arrayBuffer(): Promise<ArrayBuffer>;
         bytes(): Promise<Uint8Array>;
+        arrayBuffer(): Promise<ArrayBuffer>;
         blob(): Promise<Blob>;
         formData(): Promise<FormData>;
-        json(): Promise<any>;
         text(): Promise<string>;
+        json(): Promise<any>;
         [kNodeReq]: NodeHttp__default.IncomingMessage;
         readonly [Symbol.toStringTag]: string;
         [kNodeInspect](): {
@@ -68,7 +64,7 @@ declare const NodeFastResponse: {
             status: number;
             statusText: string;
             headers: NodeHttp__default.OutgoingHttpHeader[];
-            body: string | Buffer<ArrayBufferLike> | Uint8Array<ArrayBufferLike> | ReadableStream<Uint8Array<ArrayBufferLike>> | DataView<ArrayBufferLike> | null | undefined;
+            body: string | Uint8Array<ArrayBufferLike> | ReadableStream<Uint8Array<ArrayBufferLike>> | Buffer<ArrayBufferLike> | DataView<ArrayBufferLike> | null | undefined;
         };
         /** Lazy initialized response instance */
         "__#449@#responseObj"?: Response;

package/dist/node-utils/index.mjs

@@ -1,4 +1,4 @@
-export { a as NodeReqHeadersProxy, N as NodeRequestProxy, b as NodeResHeadersProxy, s as sendNodeResponse } from '../shared/srvx.2143ff37.mjs';
+export { a as NodeReqHeadersProxy, N as NodeRequestProxy, b as NodeResHeadersProxy, s as sendNodeResponse } from '../shared/srvx.DNp8_Fs3.mjs';
 import { splitSetCookieString } from 'cookie-es';
 
 const NodeFastResponse = /* @__PURE__ */ (() => (
@@ -62,8 +62,8 @@ const NodeFastResponse = /* @__PURE__ */ (() => (
           }
         }
       }
-      this.#body = void 0;
-      this.#init = void 0;
+      this.#body = undefined;
+      this.#init = undefined;
       return {
         status,
         statusText,
@@ -85,9 +85,9 @@ const NodeFastResponse = /* @__PURE__ */ (() => (
     get #response() {
       if (!this.#responseObj) {
         this.#responseObj = new Response(this.#body, this.#init);
-        this.#body = void 0;
-        this.#init = void 0;
-        this.#headersObj = void 0;
+        this.#body = undefined;
+        this.#init = undefined;
+        this.#headersObj = undefined;
       }
       return this.#responseObj;
     }
@@ -140,7 +140,7 @@ const NodeFastResponse = /* @__PURE__ */ (() => (
     // --- body ---
     #fastBody(as) {
       const bodyInit = this.#body;
-      if (bodyInit === null || bodyInit === void 0) {
+      if (bodyInit === null || bodyInit === undefined) {
         return null;
       }
       if (bodyInit instanceof as) {
@@ -209,7 +209,7 @@ const NodeFastResponse = /* @__PURE__ */ (() => (
         return this.#responseObj.text();
       }
       const bodyInit = this.#body;
-      if (bodyInit === null || bodyInit === void 0) {
+      if (bodyInit === null || bodyInit === undefined) {
         return Promise.resolve("");
       }
       if (typeof bodyInit === "string") {

package/dist/node.mjs

@@ -1,6 +1,6 @@
 import NodeHttp from 'node:http';
-import { S as Server, r as resolvePort } from './shared/srvx.4f681732.mjs';
-import { N as NodeRequestProxy, s as sendNodeResponse } from './shared/srvx.2143ff37.mjs';
+import { S as Server, r as resolvePort } from './shared/srvx.-ZdI-RlW.mjs';
+import { N as NodeRequestProxy, s as sendNodeResponse } from './shared/srvx.DNp8_Fs3.mjs';
 import 'cookie-es';
 
 function serve(options) {

package/dist/shared/{srvx.4f681732.mjs → srvx.-ZdI-RlW.mjs}

@@ -103,7 +103,7 @@ class Server {
 
 function resolvePort(portOptions, portEnv) {
   const portInput = portOptions ?? portEnv;
-  if (portInput === void 0) {
+  if (portInput === undefined) {
     return 3e3;
   }
   return typeof portInput === "number" ? portInput : Number.parseInt(portInput, 10);

package/dist/shared/{srvx.2143ff37.mjs → srvx.DNp8_Fs3.mjs}

@@ -11,6 +11,7 @@ const NodeReqHeadersProxy = /* @__PURE__ */ (() => class NodeReqHeadersProxy {
     this[kNodeReq] = req;
   }
   append(name, value) {
+    name = name.toLowerCase();
     const _headers = this[kNodeReq].headers;
     const _current = _headers[name];
     if (_current) {
@@ -24,9 +25,11 @@ const NodeReqHeadersProxy = /* @__PURE__ */ (() => class NodeReqHeadersProxy {
     }
   }
   delete(name) {
-    this[kNodeReq].headers[name] = void 0;
+    name = name.toLowerCase();
+    this[kNodeReq].headers[name] = undefined;
   }
   get(name) {
+    name = name.toLowerCase();
     return _normalizeValue(this[kNodeReq].headers[name]);
   }
   getSetCookie() {
@@ -37,9 +40,11 @@ const NodeReqHeadersProxy = /* @__PURE__ */ (() => class NodeReqHeadersProxy {
     return splitSetCookieString(setCookie);
   }
   has(name) {
+    name = name.toLowerCase();
     return !!this[kNodeReq].headers[name];
   }
   set(name, value) {
+    name = name.toLowerCase();
     this[kNodeReq].headers[name] = value;
   }
   toJSON() {
@@ -179,15 +184,15 @@ const NodeReqURLProxy = /* @__PURE__ */ (() => class _NodeReqURLProxy {
     return this[kNodeReq].headers.host || "";
   }
   set host(value) {
-    this._hostname = void 0;
-    this._port = void 0;
+    this._hostname = undefined;
+    this._port = undefined;
     this[kNodeReq].headers.host = value;
   }
   // hostname
   get hostname() {
-    if (this._hostname === void 0) {
+    if (this._hostname === undefined) {
       const [hostname, port] = parseHost(this[kNodeReq].headers.host);
-      if (this._port === void 0 && port) {
+      if (this._port === undefined && port) {
         this._port = String(Number.parseInt(port) || "");
       }
       this._hostname = hostname || "localhost";
@@ -199,9 +204,9 @@ const NodeReqURLProxy = /* @__PURE__ */ (() => class _NodeReqURLProxy {
   }
   // port
   get port() {
-    if (this._port === void 0) {
+    if (this._port === undefined) {
       const [hostname, port] = parseHost(this[kNodeReq].headers.host);
-      if (this._hostname === void 0 && hostname) {
+      if (this._hostname === undefined && hostname) {
         this._hostname = hostname;
       }
       this._port = port || String(this[kNodeReq].socket?.localPort || "");
@@ -213,10 +218,10 @@ const NodeReqURLProxy = /* @__PURE__ */ (() => class _NodeReqURLProxy {
   }
   // pathname
   get pathname() {
-    if (this._pathname === void 0) {
+    if (this._pathname === undefined) {
       const [pathname, search] = parsePath(this[kNodeReq].url || "/");
       this._pathname = pathname;
-      if (this._search === void 0) {
+      if (this._search === undefined) {
         this._search = search;
       }
     }
@@ -234,10 +239,10 @@ const NodeReqURLProxy = /* @__PURE__ */ (() => class _NodeReqURLProxy {
   }
   // search
   get search() {
-    if (this._search === void 0) {
+    if (this._search === undefined) {
       const [pathname, search] = parsePath(this[kNodeReq].url || "/");
       this._search = search;
-      if (this._pathname === void 0) {
+      if (this._pathname === undefined) {
         this._pathname = pathname;
       }
     }
@@ -253,7 +258,7 @@ const NodeReqURLProxy = /* @__PURE__ */ (() => class _NodeReqURLProxy {
       return;
     }
     this._search = value;
-    this._searchParams = void 0;
+    this._searchParams = undefined;
     this[kNodeReq].url = this.pathname + value;
   }
   // searchParams
@@ -337,13 +342,12 @@ const NodeRequestProxy = /* @__PURE__ */ (() => class NodeRequestProxy2 {
     this.referrerPolicy = "";
     this.bodyUsed = false;
     this[kNodeReq] = nodeReq;
-    this.#url = new NodeReqURLProxy(nodeReq);
+    this._url = new NodeReqURLProxy(nodeReq);
     this.headers = new NodeReqHeadersProxy(nodeReq);
   }
-  #url;
   #abortSignal;
   #hasBody;
-  #rawBody;
+  #bodyBytes;
   #blobBody;
   #formDataBody;
   #jsonBody;
@@ -356,7 +360,7 @@ const NodeRequestProxy = /* @__PURE__ */ (() => class NodeRequestProxy2 {
     return new NodeRequestProxy2(this[kNodeReq]);
   }
   get url() {
-    return this.#url.href;
+    return this._url.href;
   }
   get method() {
     return this[kNodeReq].method || "GET";
@@ -368,7 +372,7 @@ const NodeRequestProxy = /* @__PURE__ */ (() => class NodeRequestProxy2 {
     return this.#abortSignal.signal;
   }
   get _hasBody() {
-    if (this.#hasBody !== void 0) {
+    if (this.#hasBody !== undefined) {
       return this.#hasBody;
     }
     const method = this[kNodeReq].method?.toUpperCase();
@@ -386,7 +390,7 @@ const NodeRequestProxy = /* @__PURE__ */ (() => class NodeRequestProxy2 {
     return true;
   }
   get body() {
-    if (!this.#hasBody) {
+    if (!this._hasBody) {
       return null;
     }
     if (!this.#bodyStream) {
@@ -408,24 +412,25 @@ const NodeRequestProxy = /* @__PURE__ */ (() => class NodeRequestProxy2 {
     }
     return this.#bodyStream;
   }
-  arrayBuffer() {
-    if (!this.#rawBody) {
-      const _bodyStream = this.body;
-      return _bodyStream ? _readStream(_bodyStream).then((buff) => buff.buffer) : Promise.resolve(new ArrayBuffer(0));
-    }
-    return this.#rawBody.then((buff) => buff.buffer);
-  }
   bytes() {
-    if (!this.#rawBody) {
+    if (!this.#bodyBytes) {
       const _bodyStream = this.body;
-      return _bodyStream ? _readStream(_bodyStream) : Promise.resolve(new Uint8Array());
+      this.#bodyBytes = _bodyStream ? _readStream(_bodyStream) : Promise.resolve(new Uint8Array());
     }
-    return this.#rawBody;
+    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.arrayBuffer().then((buff) => {
-        return new Blob([buff], {
+      this.#blobBody = this.bytes().then((bytes) => {
+        return new Blob([bytes], {
           type: this[kNodeReq].headers["content-type"]
         });
       });
@@ -440,6 +445,14 @@ const NodeRequestProxy = /* @__PURE__ */ (() => class NodeRequestProxy2 {
     }
     return this.#formDataBody;
   }
+  text() {
+    if (!this.#textBody) {
+      this.#textBody = this.bytes().then((bytes) => {
+        return new TextDecoder().decode(bytes);
+      });
+    }
+    return this.#textBody;
+  }
   json() {
     if (!this.#jsonBody) {
       this.#jsonBody = this.text().then((txt) => {
@@ -448,14 +461,6 @@ const NodeRequestProxy = /* @__PURE__ */ (() => class NodeRequestProxy2 {
     }
     return this.#jsonBody;
   }
-  text() {
-    if (!this.#textBody) {
-      this.#textBody = this.arrayBuffer().then((buff) => {
-        return new TextDecoder().decode(buff);
-      });
-    }
-    return this.#textBody;
-  }
   get [(Symbol.toStringTag)]() {
     return "Request";
   }
@@ -488,9 +493,7 @@ async function sendNodeResponse(nodeRes, webRes) {
     const res = webRes.xNodeResponse();
     nodeRes.writeHead(res.status, res.statusText, res.headers);
     if (res.body instanceof ReadableStream) {
-      return streamBody(res.body, nodeRes).finally(
-        () => endNodeResponse(nodeRes)
-      );
+      return streamBody(res.body, nodeRes);
     }
     nodeRes.write(res.body);
     return endNodeResponse(nodeRes);
@@ -506,24 +509,50 @@ async function sendNodeResponse(nodeRes, webRes) {
     }
   }
   nodeRes.writeHead(webRes.status || 200, webRes.statusText, headerEntries);
-  return webRes.body ? streamBody(webRes.body, nodeRes).finally(() => endNodeResponse(nodeRes)) : endNodeResponse(nodeRes);
+  return webRes.body ? streamBody(webRes.body, nodeRes) : endNodeResponse(nodeRes);
 }
 function endNodeResponse(nodeRes) {
   return new Promise((resolve) => nodeRes.end(resolve));
 }
-async function streamBody(stream, nodeRes) {
+function streamBody(stream, nodeRes) {
+  if (nodeRes.destroyed) {
+    stream.cancel();
+    return;
+  }
   const reader = stream.getReader();
-  try {
-    while (true) {
-      const { done, value } = await reader.read();
+  function streamCancel(error) {
+    reader.cancel(error).catch(() => {
+    });
+    if (error) {
+      nodeRes.destroy(error);
+    }
+  }
+  function streamHandle({
+    done,
+    value
+  }) {
+    try {
       if (done) {
-        break;
+        nodeRes.end();
+      } else if (nodeRes.write(value)) {
+        reader.read().then(streamHandle, streamCancel);
+      } else {
+        nodeRes.once(
+          "drain",
+          () => reader.read().then(streamHandle, streamCancel)
+        );
       }
-      nodeRes.write(value);
+    } catch (error) {
+      streamCancel(error instanceof Error ? error : undefined);
     }
-  } finally {
-    reader.releaseLock();
   }
+  nodeRes.on("close", streamCancel);
+  nodeRes.on("error", streamCancel);
+  reader.read().then(streamHandle, streamCancel);
+  return reader.closed.finally(() => {
+    nodeRes.off("close", streamCancel);
+    nodeRes.off("error", streamCancel);
+  });
 }
 
 export { NodeRequestProxy as N, NodeReqHeadersProxy as a, NodeResHeadersProxy as b, sendNodeResponse as s };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "srvx",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Universal Server API based on web platform standards. Works seamlessly with Deno, Bun and Node.js.",
   "repository": "unjs/srvx",
   "license": "MIT",
@@ -42,23 +42,23 @@
   },
   "devDependencies": {
     "@hono/node-server": "^1.13.7",
-    "@mjackson/node-fetch-server": "^0.4.1",
-    "@types/bun": "^1.1.14",
+    "@mjackson/node-fetch-server": "^0.5.0",
+    "@types/bun": "^1.1.16",
     "@types/deno": "^2.0.0",
-    "@types/node": "^22.10.1",
+    "@types/node": "^22.10.6",
     "@vitest/coverage-v8": "^2.1.8",
     "automd": "^0.3.12",
     "changelogen": "^0.5.7",
-    "eslint": "^9.16.0",
+    "eslint": "^9.18.0",
     "eslint-config-unjs": "^0.4.2",
-    "execa": "^9.5.1",
+    "execa": "^9.5.2",
     "get-port-please": "^3.1.2",
-    "jiti": "^2.4.1",
-    "prettier": "^3.4.1",
-    "srvx": "^0.1.1",
-    "typescript": "^5.7.2",
-    "unbuild": "^2.0.0",
+    "jiti": "^2.4.2",
+    "prettier": "^3.4.2",
+    "srvx": "^0.1.3",
+    "typescript": "^5.7.3",
+    "unbuild": "^3.3.1",
     "vitest": "^2.1.8"
   },
-  "packageManager": "pnpm@9.14.4"
+  "packageManager": "pnpm@9.15.4"
 }