srvx 0.11.2 → 0.11.4

package/dist/_chunks/_plugins.mjs

@@ -1,4 +1,4 @@
-import { a as green, i as gray, l as yellow, n as bold, s as red } from "./_utils.mjs";
+import { a as green, i as gray, n as bold, s as red } from "./_utils.mjs";
 function wrapFetch(server) {
 	const fetchHandler = server.options.fetch;
 	const middleware = server.options.middleware || [];
@@ -24,23 +24,28 @@ const gracefulShutdownPlugin = (server) => {
 	const config = server.options?.gracefulShutdown;
 	if (!globalThis.process?.on || config === false || config === void 0 && (process.env.CI || process.env.TEST)) return;
 	const gracefulTimeout = config === true || !config?.gracefulTimeout ? Number.parseInt(process.env.SERVER_SHUTDOWN_TIMEOUT || "") || 5 : config.gracefulTimeout;
-	let isShuttingDown = false;
+	let isClosing = false;
+	let isClosed = false;
 	const w = server.options.silent ? () => {} : process.stderr.write.bind(process.stderr);
 	const forceClose = async () => {
+		if (isClosed) return;
 		w(red("\x1B[2K\rForcibly closing connections...\n"));
+		isClosed = true;
 		await server.close(true);
-		w(yellow("Server closed.\n"));
-		globalThis.process.exit(0);
 	};
 	const shutdown = async () => {
-		if (isShuttingDown) return forceClose();
-		isShuttingDown = true;
+		if (isClosing || isClosed) return;
+		setTimeout(() => {
+			globalThis.process.once("SIGINT", forceClose);
+		}, 100);
+		isClosing = true;
 		const closePromise = server.close();
 		for (let remaining = gracefulTimeout; remaining > 0; remaining--) {
 			w(gray(`\rStopping server gracefully (${remaining}s)... Press ${bold("Ctrl+C")} again to force close.`));
 			if (await Promise.race([closePromise.then(() => true), new Promise((r) => setTimeout(() => r(false), 1e3))])) {
 				w("\x1B[2K\r" + green("Server closed successfully.\n"));
-				globalThis.process.exit(0);
+				isClosed = true;
+				return;
 			}
 		}
 		w("\x1B[2K\rGraceful shutdown timed out.\n");

package/dist/adapters/bun.d.mts

@@ -10,7 +10,7 @@ declare class BunServer implements Server<BunFetchHandler> {
   readonly runtime = "bun";
   readonly options: Server["options"];
   readonly bun: Server["bun"];
-  readonly serveOptions: bun.Serve.Options<any>;
+  readonly serveOptions: bun.Serve.Options<any> | undefined;
   readonly fetch: BunFetchHandler;
   constructor(options: ServerOptions);
   serve(): Promise<this>;

package/dist/adapters/bun.mjs

@@ -20,10 +20,16 @@ var BunServer = class {
 		for (const plugin of options.plugins || []) plugin(this);
 		gracefulShutdownPlugin(this);
 		const fetchHandler = wrapFetch(this);
+		const loader = globalThis.__srvxLoader__;
+		if (loader) {
+			this.fetch = fetchHandler;
+			loader(fetchHandler);
+			return;
+		}
 		this.#wait = createWaitUntil();
 		this.fetch = (request, server) => {
 			Object.defineProperties(request, {
-				waitUntil: { value: this.#wait.waitUntil },
+				waitUntil: { value: this.#wait?.waitUntil },
 				runtime: {
 					enumerable: true,
 					value: {
@@ -72,7 +78,7 @@ var BunServer = class {
 		return Promise.resolve(this);
 	}
 	async close(closeAll) {
-		await Promise.all([this.#wait.wait(), Promise.resolve(this.bun?.server?.stop(closeAll))]);
+		await Promise.all([this.#wait?.wait(), Promise.resolve(this.bun?.server?.stop(closeAll))]);
 	}
 };
 export { FastResponse, FastURL, serve };

package/dist/adapters/deno.d.mts

@@ -9,7 +9,7 @@ declare class DenoServer implements Server<DenoFetchHandler> {
   readonly runtime = "deno";
   readonly options: Server["options"];
   readonly deno: Server["deno"];
-  readonly serveOptions: Deno.ServeTcpOptions | (Deno.ServeTcpOptions & Deno.TlsCertifiedKeyPem);
+  readonly serveOptions: Deno.ServeTcpOptions | (Deno.ServeTcpOptions & Deno.TlsCertifiedKeyPem) | undefined;
   readonly fetch: DenoFetchHandler;
   constructor(options: ServerOptions);
   serve(): Promise<this>;

package/dist/adapters/deno.mjs

@@ -22,10 +22,16 @@ var DenoServer = class {
 		for (const plugin of options.plugins || []) plugin(this);
 		gracefulShutdownPlugin(this);
 		const fetchHandler = wrapFetch(this);
+		const loader = globalThis.__srvxLoader__;
+		if (loader) {
+			this.fetch = fetchHandler;
+			loader(fetchHandler);
+			return;
+		}
 		this.#wait = createWaitUntil();
 		this.fetch = (request, info) => {
 			Object.defineProperties(request, {
-				waitUntil: { value: this.#wait.waitUntil },
+				waitUntil: { value: this.#wait?.waitUntil },
 				runtime: {
 					enumerable: true,
 					value: {
@@ -81,7 +87,7 @@ var DenoServer = class {
 		return Promise.resolve(this.#listeningPromise).then(() => this);
 	}
 	async close() {
-		await Promise.all([this.#wait.wait(), Promise.resolve(this.deno?.server?.shutdown())]);
+		await Promise.all([this.#wait?.wait(), Promise.resolve(this.deno?.server?.shutdown())]);
 	}
 };
 export { FastResponse, FastURL, serve };

package/dist/adapters/node.mjs

@@ -2,7 +2,7 @@ import { n as lazyInherit, t as FastURL } from "../_chunks/_url.mjs";
 import { a as resolveTLSOptions, i as resolvePortAndHost, n as fmtURL, r as printListening, t as createWaitUntil } from "../_chunks/_utils2.mjs";
 import { n as gracefulShutdownPlugin, r as wrapFetch, t as errorPlugin } from "../_chunks/_plugins.mjs";
 import nodeHTTP, { IncomingMessage, ServerResponse } from "node:http";
-import { Duplex, Readable } from "node:stream";
+import { Duplex, PassThrough, Readable } from "node:stream";
 import nodeHTTPS from "node:https";
 import nodeHTTP2 from "node:http2";
 async function sendNodeResponse(nodeRes, webRes) {
@@ -316,7 +316,15 @@ const NodeResponse = /* @__PURE__ */ (() => {
 		}
 		get _response() {
 			if (this.#response) return this.#response;
-			this.#response = new NativeResponse(this.#body, this.#headers ? {
+			let body = this.#body;
+			if (body && typeof body.pipe === "function" && !(body instanceof Readable)) {
+				const stream = new PassThrough();
+				body.pipe(stream);
+				const abort = body.abort;
+				if (abort) stream.once("close", () => abort());
+				body = stream;
+			}
+			this.#response = new NativeResponse(body, this.#headers ? {
 				...this.#init,
 				headers: this.#headers
 			} : this.#init);
@@ -662,15 +670,20 @@ var NodeServer = class {
 		};
 		for (const plugin of options.plugins || []) plugin(this);
 		errorPlugin(this);
-		gracefulShutdownPlugin(this);
 		const fetchHandler = this.fetch = wrapFetch(this);
+		const loader = globalThis.__srvxLoader__;
+		if (loader) {
+			loader(fetchHandler);
+			return;
+		}
+		gracefulShutdownPlugin(this);
 		this.#wait = createWaitUntil();
 		const handler = (nodeReq, nodeRes) => {
 			const request = new NodeRequest({
 				req: nodeReq,
 				res: nodeRes
 			});
-			request.waitUntil = this.#wait.waitUntil;
+			request.waitUntil = this.#wait?.waitUntil;
 			const res = fetchHandler(request);
 			return res instanceof Promise ? res.then((resolvedRes) => sendNodeResponse(nodeRes, resolvedRes)) : sendNodeResponse(nodeRes, res);
 		};
@@ -720,10 +733,10 @@ var NodeServer = class {
 		return Promise.resolve(this.#listeningPromise).then(() => this);
 	}
 	async close(closeAll) {
-		await Promise.all([this.#wait.wait(), new Promise((resolve, reject) => {
+		await Promise.all([this.#wait?.wait(), new Promise((resolve, reject) => {
 			const server = this.node?.server;
+			if (server && closeAll && "closeAllConnections" in server) server.closeAllConnections();
 			if (!server || !server.listening) return resolve();
-			if (closeAll && "closeAllConnections" in server) server.closeAllConnections();
 			server.close((error) => error ? reject(error) : resolve());
 		})]);
 	}

package/dist/cli.d.mts

@@ -1,4 +1,4 @@
-import { t as LoadOptions } from "./_chunks/loader.mjs";
+import { LoadOptions } from "./loader.mjs";
 import { Server } from "srvx";
 
 //#region src/cli/types.d.ts

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 import { a as green, c as url, i as gray, l as yellow, n as bold, o as magenta, r as cyan, s as red } from "./_chunks/_utils.mjs";
-import { r as loadServerEntry } from "./_chunks/loader.mjs";
+import { loadServerEntry } from "./loader.mjs";
 import { parseArgs } from "node:util";
 import { fileURLToPath } from "node:url";
 import { fork } from "node:child_process";
@@ -174,7 +174,7 @@ function getResponseFormat(res) {
 }
 const srvxMeta = {
 	name: "srvx",
-	version: "0.11.2",
+	version: "0.11.3",
 	description: "Universal Server."
 };
 function usage(mainOpts) {

package/dist/loader.d.mts

@@ -1,2 +1,74 @@
-import { a as loadServerEntry, i as defaultExts, n as LoadedServerEntry, r as defaultEntries, t as LoadOptions } from "./_chunks/loader.mjs";
+import { ServerHandler } from "srvx";
+
+//#region src/loader.d.ts
+declare const defaultExts: string[];
+declare const defaultEntries: string[];
+/**
+* Options for loading a server entry module.
+*/
+type LoadOptions = {
+  /**
+  * Path or URL to the server entry file.
+  *
+  * If not provided, common entry points will be searched automatically.
+  */
+  entry?: string;
+  /**
+  * Base directory for resolving relative paths.
+  *
+  * @default "."
+  */
+  dir?: string;
+  /**
+  * Set to `false` to disable interception of `http.Server.listen` to detect legacy handlers.
+  *
+  * @default true
+  */
+  interceptHttpListen?: boolean;
+  /**
+  * Set to `false` to disable Node.js handler (req, res) compatibility.
+  */
+  nodeCompat?: boolean;
+  /**
+  * Hook called after the module is loaded to allow for custom processing.
+  *
+  * You can return a modified version of the module if needed.
+  */
+  onLoad?: (module: unknown) => any;
+};
+/**
+* Result of loading a server entry module.
+*/
+type LoadedServerEntry = {
+  /**
+  * The web fetch handler extracted from the loaded module.
+  *
+  * This is resolved from `module.fetch`, `module.default.fetch`,
+  * or upgraded from a legacy Node.js handler.
+  */
+  fetch?: ServerHandler;
+  /**
+  * The raw loaded module.
+  */
+  module?: any;
+  /**
+  * Whether the handler was upgraded from a legacy Node.js HTTP handler.
+  *
+  * When `true`, the original module exported a Node.js-style `(req, res)` handler
+  * that has been wrapped for web fetch compatibility.
+  */
+  nodeCompat?: boolean;
+  /**
+  * The resolved `file://` URL of the loaded entry module.
+  */
+  url?: string;
+  /**
+  * Whether the specified entry file was not found.
+  *
+  * When `true`, no valid entry point could be located.
+  */
+  notFound?: boolean;
+};
+declare function loadServerEntry(opts: LoadOptions): Promise<LoadedServerEntry>;
+//#endregion
 export { LoadOptions, LoadedServerEntry, defaultEntries, defaultExts, loadServerEntry };

package/dist/loader.mjs

@@ -1,2 +1,116 @@
-import { n as defaultExts, r as loadServerEntry, t as defaultEntries } from "./_chunks/loader.mjs";
+import { pathToFileURL } from "node:url";
+import { existsSync } from "node:fs";
+import { resolve } from "node:path";
+import * as nodeHTTP$1 from "node:http";
+const defaultExts = [
+	".mjs",
+	".js",
+	".mts",
+	".ts"
+];
+const defaultEntries = [
+	"server",
+	"server/index",
+	"src/server",
+	"server/server"
+];
+async function loadServerEntry(opts) {
+	let entry = opts.entry;
+	if (entry) {
+		entry = resolve(opts.dir || ".", entry);
+		if (!existsSync(entry)) return { notFound: true };
+	} else {
+		for (const defEntry of defaultEntries) {
+			for (const defExt of defaultExts) {
+				const entryPath = resolve(opts.dir || ".", `${defEntry}${defExt}`);
+				if (existsSync(entryPath)) {
+					entry = entryPath;
+					break;
+				}
+			}
+			if (entry) break;
+		}
+		if (!entry) return { notFound: true };
+	}
+	const url = entry.startsWith("file://") ? entry : pathToFileURL(resolve(entry)).href;
+	let mod;
+	let interceptedNodeHandler;
+	let interceptedFetchHandler;
+	try {
+		if (opts.interceptHttpListen !== false) {
+			const loaded = await interceptListen(() => import(url));
+			mod = loaded.res;
+			interceptedNodeHandler = loaded.listenHandler;
+			interceptedFetchHandler = loaded.fetchHandler;
+		} else mod = await import(url);
+	} catch (error) {
+		if (error?.code === "ERR_UNKNOWN_FILE_EXTENSION") {
+			const message = String(error);
+			if (/"\.(m|c)?ts"/g.test(message)) throw new Error(`Make sure you're using Node.js v22.18+ or v24+ for TypeScript support (current version: ${process.versions.node})`, { cause: error });
+			else if (/"\.(m|c)?tsx"/g.test(message)) throw new Error(`You need a compatible loader for JSX support (Deno, Bun or srvx --register jiti/register)`, { cause: error });
+		}
+		throw error;
+	}
+	mod = await opts?.onLoad?.(mod) || mod;
+	let fetchHandler = mod?.fetch || mod?.default?.fetch || mod?.default?.default?.fetch || interceptedFetchHandler;
+	if (!fetchHandler && typeof mod?.default === "function" && mod.default.length < 2) fetchHandler = mod.default;
+	let nodeCompat = false;
+	if (!fetchHandler && opts.nodeCompat !== false) {
+		const nodeHandler = interceptedNodeHandler || (typeof mod?.default === "function" ? mod.default : void 0);
+		if (nodeHandler) {
+			nodeCompat = true;
+			const { fetchNodeHandler } = await import("srvx/node");
+			fetchHandler = (webReq) => fetchNodeHandler(nodeHandler, webReq);
+		}
+	}
+	return {
+		module: mod,
+		nodeCompat,
+		url,
+		fetch: fetchHandler
+	};
+}
+let _interceptQueue = Promise.resolve();
+async function interceptListen(cb) {
+	const result = _interceptQueue.then(async () => {
+		const originalListen = nodeHTTP$1.Server.prototype.listen;
+		let res;
+		let listenHandler;
+		let fetchHandler;
+		globalThis.__srvxLoader__ = (handler) => {
+			fetchHandler = handler;
+		};
+		try {
+			nodeHTTP$1.Server.prototype.listen = function(arg1, arg2) {
+				listenHandler = this._events.request;
+				if (Array.isArray(listenHandler)) listenHandler = listenHandler[0];
+				nodeHTTP$1.Server.prototype.listen = originalListen;
+				const listenCallback = [arg1, arg2].find((arg) => typeof arg === "function");
+				setImmediate(() => {
+					listenCallback?.();
+				});
+				return new Proxy({}, { get(_, prop) {
+					const server = globalThis.__srvx__;
+					if (!server && prop === "address") return () => ({
+						address: "",
+						family: "",
+						port: 0
+					});
+					return server?.node?.server?.[prop];
+				} });
+			};
+			res = await cb();
+		} finally {
+			nodeHTTP$1.Server.prototype.listen = originalListen;
+			delete globalThis.__srvxLoader__;
+		}
+		return {
+			res,
+			listenHandler,
+			fetchHandler
+		};
+	});
+	_interceptQueue = result.catch(() => {});
+	return result;
+}
 export { defaultEntries, defaultExts, loadServerEntry };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "srvx",
-  "version": "0.11.2",
+  "version": "0.11.4",
   "description": "Universal Server.",
   "homepage": "https://srvx.h3.dev",
   "license": "MIT",
@@ -58,7 +58,7 @@
     "vitest": "vitest"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20260203.0",
+    "@cloudflare/workers-types": "^4.20260210.0",
     "@hono/node-server": "^1.19.9",
     "@mitata/counters": "^0.0.8",
     "@mjackson/node-fetch-server": "^0.7.0",
@@ -66,10 +66,10 @@
     "@types/bun": "^1.3.8",
     "@types/deno": "^2.5.0",
     "@types/express": "^5.0.6",
-    "@types/node": "^25.2.0",
+    "@types/node": "^25.2.3",
     "@types/node-forge": "^1.3.14",
-    "@types/serviceworker": "^0.0.182",
-    "@typescript/native-preview": "^7.0.0-dev.20260203.1",
+    "@types/serviceworker": "^0.0.186",
+    "@typescript/native-preview": "^7.0.0-dev.20260210.1",
     "@vitest/coverage-v8": "^4.0.18",
     "@whatwg-node/server": "^0.10.18",
     "automd": "^0.4.3",
@@ -82,13 +82,13 @@
     "mdbox": "^0.1.1",
     "mitata": "^1.0.34",
     "node-forge": "^1.3.3",
-    "obuild": "^0.4.22",
+    "obuild": "^0.4.27",
     "oxfmt": "^0.28.0",
     "oxlint": "^1.43.0",
     "srvx-release": "npm:srvx@^0.10.1",
     "tslib": "^2.8.1",
     "typescript": "^5.9.3",
-    "undici": "^7.20.0",
+    "undici": "^7.21.0",
     "vitest": "^4.0.18"
   },
   "resolutions": {
@@ -97,5 +97,5 @@
   "engines": {
     "node": ">=20.16.0"
   },
-  "packageManager": "pnpm@10.28.2"
+  "packageManager": "pnpm@10.29.2"
 }

package/dist/_chunks/loader.d.mts

@@ -1,74 +0,0 @@
-import { ServerHandler } from "srvx";
-
-//#region src/loader.d.ts
-declare const defaultExts: string[];
-declare const defaultEntries: string[];
-/**
-* Options for loading a server entry module.
-*/
-type LoadOptions = {
-  /**
-  * Path or URL to the server entry file.
-  *
-  * If not provided, common entry points will be searched automatically.
-  */
-  entry?: string;
-  /**
-  * Base directory for resolving relative paths.
-  *
-  * @default "."
-  */
-  dir?: string;
-  /**
-  * Set to `false` to disable interception of `http.Server.listen` to detect legacy handlers.
-  *
-  * @default true
-  */
-  interceptHttpListen?: boolean;
-  /**
-  * Set to `false` to disable Node.js handler (req, res) compatibility.
-  */
-  nodeCompat?: boolean;
-  /**
-  * Hook called after the module is loaded to allow for custom processing.
-  *
-  * You can return a modified version of the module if needed.
-  */
-  onLoad?: (module: unknown) => any;
-};
-/**
-* Result of loading a server entry module.
-*/
-type LoadedServerEntry = {
-  /**
-  * The web fetch handler extracted from the loaded module.
-  *
-  * This is resolved from `module.fetch`, `module.default.fetch`,
-  * or upgraded from a legacy Node.js handler.
-  */
-  fetch?: ServerHandler;
-  /**
-  * The raw loaded module.
-  */
-  module?: any;
-  /**
-  * Whether the handler was upgraded from a legacy Node.js HTTP handler.
-  *
-  * When `true`, the original module exported a Node.js-style `(req, res)` handler
-  * that has been wrapped for web fetch compatibility.
-  */
-  nodeCompat?: boolean;
-  /**
-  * The resolved `file://` URL of the loaded entry module.
-  */
-  url?: string;
-  /**
-  * Whether the specified entry file was not found.
-  *
-  * When `true`, no valid entry point could be located.
-  */
-  notFound?: boolean;
-};
-declare function loadServerEntry(opts: LoadOptions): Promise<LoadedServerEntry>;
-//#endregion
-export { loadServerEntry as a, defaultExts as i, LoadedServerEntry as n, defaultEntries as r, LoadOptions as t };

package/dist/_chunks/loader.mjs

@@ -1,108 +0,0 @@
-import { pathToFileURL } from "node:url";
-import { existsSync } from "node:fs";
-import { resolve } from "node:path";
-import * as nodeHTTP$1 from "node:http";
-const defaultExts = [
-	".mjs",
-	".js",
-	".mts",
-	".ts"
-];
-const defaultEntries = [
-	"server",
-	"server/index",
-	"src/server",
-	"server/server"
-];
-async function loadServerEntry(opts) {
-	let entry = opts.entry;
-	if (entry) {
-		entry = resolve(opts.dir || ".", entry);
-		if (!existsSync(entry)) return { notFound: true };
-	} else {
-		for (const defEntry of defaultEntries) {
-			for (const defExt of defaultExts) {
-				const entryPath = resolve(opts.dir || ".", `${defEntry}${defExt}`);
-				if (existsSync(entryPath)) {
-					entry = entryPath;
-					break;
-				}
-			}
-			if (entry) break;
-		}
-		if (!entry) return { notFound: true };
-	}
-	const url = entry.startsWith("file://") ? entry : pathToFileURL(resolve(entry)).href;
-	let mod;
-	let listenHandler;
-	try {
-		if (opts.interceptHttpListen !== false) {
-			const loaded = await interceptListen(() => import(url));
-			mod = loaded.res;
-			listenHandler = loaded.listenHandler;
-		} else mod = await import(url);
-	} catch (error) {
-		if (error?.code === "ERR_UNKNOWN_FILE_EXTENSION") {
-			const message = String(error);
-			if (/"\.(m|c)?ts"/g.test(message)) throw new Error(`Make sure you're using Node.js v22.18+ or v24+ for TypeScript support (current version: ${process.versions.node})`, { cause: error });
-			else if (/"\.(m|c)?tsx"/g.test(message)) throw new Error(`You need a compatible loader for JSX support (Deno, Bun or srvx --register jiti/register)`, { cause: error });
-		}
-		throw error;
-	}
-	mod = await opts?.onLoad?.(mod) || mod;
-	let fetchHandler = mod?.fetch || mod?.default?.fetch || mod?.default?.default?.fetch;
-	if (!fetchHandler && typeof mod?.default === "function" && mod.default.length < 2) fetchHandler = mod.default;
-	let nodeCompat = false;
-	if (!fetchHandler && opts.nodeCompat !== false) {
-		const nodeHandler = listenHandler || (typeof mod?.default === "function" ? mod.default : void 0);
-		if (nodeHandler) {
-			nodeCompat = true;
-			const { fetchNodeHandler } = await import("srvx/node");
-			fetchHandler = (webReq) => fetchNodeHandler(nodeHandler, webReq);
-		}
-	}
-	return {
-		module: mod,
-		nodeCompat,
-		url,
-		fetch: fetchHandler
-	};
-}
-let _interceptQueue = Promise.resolve();
-async function interceptListen(cb) {
-	const result = _interceptQueue.then(async () => {
-		const originalListen = nodeHTTP$1.Server.prototype.listen;
-		let res;
-		let listenHandler;
-		try {
-			nodeHTTP$1.Server.prototype.listen = function(arg1, arg2) {
-				listenHandler = this._events.request;
-				if (Array.isArray(listenHandler)) listenHandler = listenHandler[0];
-				nodeHTTP$1.Server.prototype.listen = originalListen;
-				const listenCallback = [arg1, arg2].find((arg) => typeof arg === "function");
-				setImmediate(() => {
-					listenCallback?.();
-				});
-				return new Proxy({}, { get(_, prop) {
-					const server = globalThis.__srvx__;
-					if (!server && prop === "address") return () => ({
-						address: "",
-						family: "",
-						port: 0
-					});
-					return server?.node?.server?.[prop];
-				} });
-			};
-			res = await cb();
-		} finally {
-			nodeHTTP$1.Server.prototype.listen = originalListen;
-		}
-		return {
-			res,
-			listenHandler
-		};
-	});
-	_interceptQueue = result.catch(() => {});
-	return result;
-}
-export { defaultExts as n, loadServerEntry as r, defaultEntries as t };