srvx 0.7.1 → 0.7.3

package/dist/{chunks/_url-CirWh9Lc.mjs → _chunks/_url-Dsik4Hgl.mjs}

@@ -89,11 +89,7 @@ const FastURL = /* @__PURE__ */ (() => {
 				const url = this.#originalURL;
 				const protoIndex = url.indexOf("://");
 				if (protoIndex === -1) return this._url.pathname;
-				const pIndex = url.indexOf(
-					"/",
-					protoIndex + 4
-					/* :// */
-);
+				const pIndex = url.indexOf("/", protoIndex + 4);
 				if (pIndex === -1) return this._url.pathname;
 				const qIndex = this._urlqindex = url.indexOf("?", pIndex);
 				this._pathname = url.slice(pIndex, qIndex === -1 ? void 0 : qIndex);

package/dist/{chunks/types-egi3HKdd.d.mts → _chunks/types-CAoaOHnD.d.mts}

@@ -7,6 +7,9 @@ import * as CF from "@cloudflare/workers-types";
 
 //#region src/types.d.ts
 type MaybePromise<T> = T | Promise<T>;
+// ----------------------------------------------------------------------------
+// srvx API
+// ----------------------------------------------------------------------------
 /**
 * Faster URL constructor with lazy access to pathname and search params (For Node, Deno, and Bun).
 */
@@ -187,6 +190,9 @@ interface Server<Handler = ServerHandler> {
   */
   close(closeActiveConnections?: boolean): Promise<void>;
 }
+// ----------------------------------------------------------------------------
+// Request with runtime addons.
+// ----------------------------------------------------------------------------
 interface ServerRuntimeContext {
   name: "node" | "deno" | "bun" | "cloudflare" | (string & {});
   /**
@@ -226,6 +232,9 @@ interface ServerRequest extends Request {
   */
   ip?: string | undefined;
 }
+// ----------------------------------------------------------------------------
+// Different handler types
+// ----------------------------------------------------------------------------
 type FetchHandler = (request: Request) => Response | Promise<Response>;
 type ErrorHandler = (error: unknown) => Response | Promise<Response>;
 type BunFetchHandler = (request: Request, server?: Bun.Server) => Response | Promise<Response>;
@@ -233,5 +242,6 @@ type DenoFetchHandler = (request: Request, info?: Deno.ServeHandlerInfo<Deno.Net
 type NodeServerRequest = NodeHttp$1.IncomingMessage | NodeHttp2.Http2ServerRequest;
 type NodeServerResponse = NodeHttp$1.ServerResponse | NodeHttp2.Http2ServerResponse;
 type NodeHttpHandler = (req: NodeServerRequest, res: NodeServerResponse) => void | Promise<void>;
-type CloudflareFetchHandler = CF.ExportedHandlerFetchHandler; //#endregion
+type CloudflareFetchHandler = CF.ExportedHandlerFetchHandler;
+//#endregion
 export { BunFetchHandler, CloudflareFetchHandler, DenoFetchHandler, ErrorHandler, FastResponse, FastURL, FetchHandler, NodeHttpHandler, NodeServerRequest, NodeServerResponse, Server, ServerHandler, ServerMiddleware, ServerOptions, ServerPlugin, ServerRequest, ServerRuntimeContext, serve };

package/dist/{bun.d.mts → adapters/bun.d.mts}

@@ -1,10 +1,11 @@
-import { BunFetchHandler, Server, ServerOptions } from "./chunks/types-egi3HKdd.mjs";
-import { FastURL$2 as FastURL } from "./chunks/_url-BwTFuoNW.mjs";
+import { BunFetchHandler, Server, ServerOptions } from "../_chunks/types-CAoaOHnD.mjs";
+import { FastURL$2 as FastURL } from "../_chunks/_url-0kFTYgtJ.mjs";
 import * as bun from "bun";
 
 //#region src/adapters/bun.d.ts
 declare const FastResponse: typeof globalThis.Response;
 declare function serve(options: ServerOptions): BunServer;
+// https://bun.sh/docs/api/http
 declare class BunServer implements Server<BunFetchHandler> {
   readonly runtime = "bun";
   readonly options: Server["options"];
@@ -17,6 +18,5 @@ declare class BunServer implements Server<BunFetchHandler> {
   ready(): Promise<this>;
   close(closeAll?: boolean): Promise<void>;
 }
-
 //#endregion
 export { FastResponse, FastURL, serve };

package/dist/{bun.mjs → adapters/bun.mjs}

@@ -1,5 +1,5 @@
-import { FastURL$1 as FastURL, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "./chunks/_url-CirWh9Lc.mjs";
-import { wrapFetch } from "./chunks/_middleware-DSFIayTI.mjs";
+import { FastURL$1 as FastURL, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "../_chunks/_url-Dsik4Hgl.mjs";
+import { wrapFetch } from "../_chunks/_middleware-Bz7WmB2e.mjs";
 
 //#region src/adapters/bun.ts
 const FastResponse = Response;
@@ -24,7 +24,7 @@ var BunServer = class {
 				runtime: {
 					enumerable: true,
 					value: {
-						runtime: "bun",
+						name: "bun",
 						bun: { server }
 					}
 				},

package/dist/{cloudflare.d.mts → adapters/cloudflare.d.mts}

@@ -1,10 +1,9 @@
-import { Server, ServerOptions } from "./chunks/types-egi3HKdd.mjs";
+import { Server, ServerOptions } from "../_chunks/types-CAoaOHnD.mjs";
 import * as CF from "@cloudflare/workers-types";
 
 //#region src/adapters/cloudflare.d.ts
 declare const FastURL: typeof globalThis.URL;
 declare const FastResponse: typeof globalThis.Response;
 declare function serve(options: ServerOptions): Server<CF.ExportedHandlerFetchHandler>;
-
 //#endregion
 export { FastResponse, FastURL, serve };

package/dist/{cloudflare.mjs → adapters/cloudflare.mjs}

@@ -1,5 +1,5 @@
-import { wrapFetch } from "./chunks/_middleware-DSFIayTI.mjs";
-import { errorPlugin } from "./chunks/_plugins-BTotWVHV.mjs";
+import { wrapFetch } from "../_chunks/_middleware-Bz7WmB2e.mjs";
+import { errorPlugin } from "../_chunks/_plugins-CDyQtZq-.mjs";
 
 //#region src/adapters/cloudflare.ts
 const FastURL = URL;
@@ -24,7 +24,7 @@ var CloudflareServer = class {
 			Object.defineProperties(request, { runtime: {
 				enumerable: true,
 				value: {
-					runtime: "cloudflare",
+					name: "cloudflare",
 					cloudflare: {
 						env,
 						context

package/dist/{deno.d.mts → adapters/deno.d.mts}

@@ -1,9 +1,10 @@
-import { DenoFetchHandler, Server, ServerOptions } from "./chunks/types-egi3HKdd.mjs";
-import { FastURL$2 as FastURL } from "./chunks/_url-BwTFuoNW.mjs";
+import { DenoFetchHandler, Server, ServerOptions } from "../_chunks/types-CAoaOHnD.mjs";
+import { FastURL$2 as FastURL } from "../_chunks/_url-0kFTYgtJ.mjs";
 
 //#region src/adapters/deno.d.ts
 declare const FastResponse: typeof globalThis.Response;
 declare function serve(options: ServerOptions): DenoServer;
+// https://docs.deno.com/api/deno/~/Deno.serve
 declare class DenoServer implements Server<DenoFetchHandler> {
   #private;
   readonly runtime = "deno";
@@ -17,6 +18,5 @@ declare class DenoServer implements Server<DenoFetchHandler> {
   ready(): Promise<Server>;
   close(): Promise<void | undefined>;
 }
-
 //#endregion
 export { FastResponse, FastURL, serve };

package/dist/{deno.mjs → adapters/deno.mjs}

@@ -1,5 +1,5 @@
-import { FastURL$1 as FastURL, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "./chunks/_url-CirWh9Lc.mjs";
-import { wrapFetch } from "./chunks/_middleware-DSFIayTI.mjs";
+import { FastURL$1 as FastURL, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "../_chunks/_url-Dsik4Hgl.mjs";
+import { wrapFetch } from "../_chunks/_middleware-Bz7WmB2e.mjs";
 
 //#region src/adapters/deno.ts
 const FastResponse = Response;
@@ -26,7 +26,7 @@ var DenoServer = class {
 				runtime: {
 					enumerable: true,
 					value: {
-						runtime: "deno",
+						name: "deno",
 						deno: {
 							info,
 							server: this.deno?.server

package/dist/{generic.d.mts → adapters/generic.d.mts}

@@ -1,9 +1,8 @@
-import { Server, ServerOptions } from "./chunks/types-egi3HKdd.mjs";
+import { Server, ServerOptions } from "../_chunks/types-CAoaOHnD.mjs";
 
 //#region src/adapters/generic.d.ts
 declare const FastURL: typeof globalThis.URL;
 declare const FastResponse: typeof globalThis.Response;
 declare function serve(options: ServerOptions): Server;
-
 //#endregion
 export { FastResponse, FastURL, serve };

package/dist/{generic.mjs → adapters/generic.mjs}

@@ -1,5 +1,5 @@
-import { wrapFetch } from "./chunks/_middleware-DSFIayTI.mjs";
-import { errorPlugin } from "./chunks/_plugins-BTotWVHV.mjs";
+import { wrapFetch } from "../_chunks/_middleware-Bz7WmB2e.mjs";
+import { errorPlugin } from "../_chunks/_plugins-CDyQtZq-.mjs";
 
 //#region src/adapters/generic.ts
 const FastURL = URL;

package/dist/{node.d.mts → adapters/node.d.mts}

@@ -1,5 +1,5 @@
-import { FetchHandler, NodeHttpHandler, NodeServerRequest, NodeServerResponse, Server, ServerOptions, ServerRequest } from "./chunks/types-egi3HKdd.mjs";
-import { FastURL$2 as FastURL } from "./chunks/_url-BwTFuoNW.mjs";
+import { FetchHandler, NodeHttpHandler, NodeServerRequest, NodeServerResponse, Server, ServerOptions, ServerRequest } from "../_chunks/types-CAoaOHnD.mjs";
+import { FastURL$2 as FastURL } from "../_chunks/_url-0kFTYgtJ.mjs";
 import NodeHttp from "node:http";
 import { Readable } from "node:stream";
 
@@ -11,7 +11,6 @@ type NodeRequestContext = {
 declare const NodeRequest: {
   new (nodeCtx: NodeRequestContext): ServerRequest;
 };
-
 //#endregion
 //#region src/adapters/_node/headers.d.ts
 declare const NodeRequestHeaders: {
@@ -26,7 +25,6 @@ declare const NodeResponseHeaders: {
     res: NodeServerResponse;
   }): globalThis.Headers;
 };
-
 //#endregion
 //#region src/adapters/_node/response.d.ts
 type NodeResponse = InstanceType<typeof NodeResponse>;
@@ -45,11 +43,9 @@ declare const NodeResponse: {
     };
   };
 };
-
 //#endregion
 //#region src/adapters/node.d.ts
 declare function serve(options: ServerOptions): Server;
 declare function toNodeHandler(fetchHandler: FetchHandler): NodeHttpHandler;
-
 //#endregion
 export { NodeResponse as FastResponse, FastURL, NodeRequest, NodeRequestHeaders, NodeResponse, NodeResponseHeaders, serve, toNodeHandler };

package/dist/{node.mjs → adapters/node.mjs}

@@ -1,6 +1,6 @@
-import { FastURL$1 as FastURL, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "./chunks/_url-CirWh9Lc.mjs";
-import { wrapFetch } from "./chunks/_middleware-DSFIayTI.mjs";
-import { errorPlugin } from "./chunks/_plugins-BTotWVHV.mjs";
+import { FastURL$1 as FastURL, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "../_chunks/_url-Dsik4Hgl.mjs";
+import { wrapFetch } from "../_chunks/_middleware-Bz7WmB2e.mjs";
+import { errorPlugin } from "../_chunks/_plugins-CDyQtZq-.mjs";
 import { splitSetCookieString } from "cookie-es";
 
 //#region src/adapters/_node/send.ts
@@ -222,7 +222,7 @@ function _normalizeValue(value) {
 	return typeof value === "string" ? value : String(value ?? "");
 }
 function validateHeader(name) {
-	if (name[0] === ":") throw new TypeError("Invalid header name");
+	if (name[0] === ":") throw new TypeError(`${JSON.stringify(name)} is an invalid header name.`);
 	return name.toLowerCase();
 }
 
@@ -426,7 +426,12 @@ const NodeRequest = /* @__PURE__ */ (() => {
 			return this._node.req.method || "GET";
 		}
 		get signal() {
-			if (!this.#abortSignal) this.#abortSignal = new AbortController();
+			if (!this.#abortSignal) {
+				this.#abortSignal = new AbortController();
+				this._node.req.once("close", () => {
+					this.#abortSignal?.abort();
+				});
+			}
 			return this.#abortSignal.signal;
 		}
 		get bodyUsed() {
@@ -572,13 +577,13 @@ const NodeResponse = /* @__PURE__ */ (() => {
 			const statusText = this.#init?.statusText ?? "";
 			const headers = [];
 			const headersInit = this.#init?.headers;
-			if (headersInit) {
+			if (this.#headersObj) for (const [key, value] of this.#headersObj) if (key === "set-cookie") for (const setCookie of splitSetCookieString(value)) headers.push(["set-cookie", setCookie]);
+			else headers.push([key, value]);
+			else if (headersInit) {
 				const headerEntries = Array.isArray(headersInit) ? headersInit : 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]);
 				else headers.push([key, value]);
 			}
-			if (this.#headersObj) for (const [key, value] of this.#headersObj) if (key === "set-cookie") for (const setCookie of splitSetCookieString(value)) headers.push(["set-cookie", setCookie]);
-			else headers.push([key, value]);
 			const bodyInit = this.#body;
 			let body;
 			if (bodyInit) if (typeof bodyInit === "string") body = bodyInit;
@@ -597,6 +602,8 @@ const NodeResponse = /* @__PURE__ */ (() => {
 			}
 			this.#body = void 0;
 			this.#init = void 0;
+			this.#headersObj = void 0;
+			this.#responseObj = void 0;
 			return {
 				status,
 				statusText,
@@ -610,11 +617,18 @@ const NodeResponse = /* @__PURE__ */ (() => {
 		#headersObj;
 		clone() {
 			if (this.#responseObj) return this.#responseObj.clone();
+			if (this.#headersObj) return new globalThis.Response(this.#body, {
+				...this.#init,
+				headers: new Headers(this.#headersObj)
+			});
 			return new globalThis.Response(this.#body, this.#init);
 		}
 		get #response() {
 			if (!this.#responseObj) {
-				this.#responseObj = new globalThis.Response(this.#body, this.#init);
+				this.#responseObj = this.#headersObj ? new globalThis.Response(this.#body, {
+					...this.#init,
+					headers: new Headers(this.#headersObj)
+				}) : new globalThis.Response(this.#body, this.#init);
 				this.#body = void 0;
 				this.#init = void 0;
 				this.#headersObj = void 0;

package/dist/{service-worker.d.mts → adapters/service-worker.d.mts}

@@ -1,10 +1,9 @@
-import { Server, ServerOptions, ServerRequest } from "./chunks/types-egi3HKdd.mjs";
+import { Server, ServerOptions, ServerRequest } from "../_chunks/types-CAoaOHnD.mjs";
 
 //#region src/adapters/service-worker.d.ts
 declare const FastURL: typeof globalThis.URL;
 declare const FastResponse: typeof globalThis.Response;
 type ServiceWorkerHandler = (request: ServerRequest, event: FetchEvent) => Response | Promise<Response>;
 declare function serve(options: ServerOptions): Server<ServiceWorkerHandler>;
-
 //#endregion
 export { FastResponse, FastURL, ServiceWorkerHandler, serve };

package/dist/{service-worker.mjs → adapters/service-worker.mjs}

@@ -1,5 +1,5 @@
-import { wrapFetch } from "./chunks/_middleware-DSFIayTI.mjs";
-import { errorPlugin } from "./chunks/_plugins-BTotWVHV.mjs";
+import { wrapFetch } from "../_chunks/_middleware-Bz7WmB2e.mjs";
+import { errorPlugin } from "../_chunks/_plugins-CDyQtZq-.mjs";
 
 //#region src/adapters/service-worker.ts
 const FastURL = URL;
@@ -27,7 +27,7 @@ var ServiceWorkerServer = class {
 			Object.defineProperties(request, { runtime: {
 				enumerable: true,
 				value: {
-					runtime: "service-worker",
+					name: "service-worker",
 					serviceWorker: { event }
 				}
 			} });

package/dist/types.d.mts

@@ -1,2 +1,2 @@
-import { BunFetchHandler, CloudflareFetchHandler, DenoFetchHandler, ErrorHandler, FastResponse, FastURL, FetchHandler, NodeHttpHandler, NodeServerRequest, NodeServerResponse, Server, ServerHandler, ServerMiddleware, ServerOptions, ServerPlugin, ServerRequest, ServerRuntimeContext, serve } from "./chunks/types-egi3HKdd.mjs";
+import { BunFetchHandler, CloudflareFetchHandler, DenoFetchHandler, ErrorHandler, FastResponse, FastURL, FetchHandler, NodeHttpHandler, NodeServerRequest, NodeServerResponse, Server, ServerHandler, ServerMiddleware, ServerOptions, ServerPlugin, ServerRequest, ServerRuntimeContext, serve } from "./_chunks/types-CAoaOHnD.mjs";
 export { BunFetchHandler, CloudflareFetchHandler, DenoFetchHandler, ErrorHandler, FastResponse, FastURL, FetchHandler, NodeHttpHandler, NodeServerRequest, NodeServerResponse, Server, ServerHandler, ServerMiddleware, ServerOptions, ServerPlugin, ServerRequest, ServerRuntimeContext, serve };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "srvx",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "Universal Server API based on web platform standards. Works seamlessly with Deno, Bun and Node.js.",
   "homepage": "https://srvx.h3.dev",
   "repository": "h3js/srvx",
@@ -9,20 +9,20 @@
   "type": "module",
   "exports": {
     "./types": "./dist/types.d.mts",
-    "./deno": "./dist/deno.mjs",
-    "./bun": "./dist/bun.mjs",
-    "./node": "./dist/node.mjs",
-    "./cloudflare": "./dist/cloudflare.mjs",
-    "./generic": "./dist/generic.mjs",
-    "./service-worker": "./dist/service-worker.mjs",
+    "./deno": "./dist/adapters/deno.mjs",
+    "./bun": "./dist/adapters/bun.mjs",
+    "./node": "./dist/adapters/node.mjs",
+    "./cloudflare": "./dist/adapters/cloudflare.mjs",
+    "./generic": "./dist/adapters/generic.mjs",
+    "./service-worker": "./dist/adapters/service-worker.mjs",
     ".": {
       "types": "./dist/types.d.mts",
-      "deno": "./dist/deno.mjs",
-      "bun": "./dist/bun.mjs",
-      "workerd": "./dist/cloudflare.mjs",
-      "browser": "./dist/service-worker.mjs",
-      "node": "./dist/node.mjs",
-      "default": "./dist/generic.mjs"
+      "deno": "./dist/adapters/deno.mjs",
+      "bun": "./dist/adapters/bun.mjs",
+      "workerd": "./dist/adapters/cloudflare.mjs",
+      "browser": "./dist/adapters/service-worker.mjs",
+      "node": "./dist/adapters/node.mjs",
+      "default": "./dist/adapters/generic.mjs"
     }
   },
   "types": "./dist/types.d.mts",
@@ -40,11 +40,11 @@
     "lint:fix": "automd && eslint . --fix && prettier -w .",
     "node-ts": "node --disable-warning=ExperimentalWarning --experimental-strip-types",
     "prepack": "pnpm build",
-    "play:bun": "bun playground/app.mjs",
+    "play:bun": "bun --watch playground/app.mjs",
     "play:cf": "pnpx wrangler dev playground/app.mjs",
-    "play:deno": "deno run -A playground/app.mjs",
+    "play:deno": "deno run -A --watch 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",
+    "play:node": "pnpm node-ts --watch playground/app.mjs",
     "play:sw": "pnpm build && pnpx serve playground",
     "release": "pnpm test && changelogen --release && npm publish && git push --follow-tags",
     "test": "pnpm lint && pnpm test:types && vitest run --coverage",
@@ -57,29 +57,31 @@
     "cookie-es": "^2.0.0"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250513.0",
-    "@hono/node-server": "^1.14.1",
+    "@cloudflare/workers-types": "^4.20250525.0",
+    "@hono/node-server": "^1.14.3",
     "@mitata/counters": "^0.0.8",
     "@mjackson/node-fetch-server": "^0.6.1",
-    "@types/bun": "^1.2.13",
+    "@types/bun": "^1.2.14",
     "@types/deno": "^2.3.0",
-    "@types/node": "^22.15.17",
+    "@types/node": "^22.15.21",
     "@types/node-forge": "^1.3.11",
-    "@types/serviceworker": "^0.0.134",
-    "@vitest/coverage-v8": "^3.1.3",
+    "@types/serviceworker": "^0.0.135",
+    "@vitest/coverage-v8": "^3.1.4",
+    "@whatwg-node/server": "^0.10.10",
     "automd": "^0.4.0",
     "changelogen": "^0.6.1",
-    "eslint": "^9.26.0",
+    "eslint": "^9.27.0",
     "eslint-config-unjs": "^0.4.2",
-    "execa": "^9.5.3",
+    "execa": "^9.6.0",
     "get-port-please": "^3.1.2",
     "mitata": "^1.0.34",
     "node-forge": "^1.3.1",
-    "obuild": "^0.0.7",
+    "obuild": "^0.2.0",
     "prettier": "^3.5.3",
+    "tslib": "^2.8.1",
     "typescript": "^5.8.3",
-    "undici": "^7.9.0",
-    "vitest": "^3.1.3"
+    "undici": "^7.10.0",
+    "vitest": "^3.1.4"
   },
   "packageManager": "pnpm@10.11.0",
   "engines": {