srvx 0.9.3 → 0.9.5

package/dist/_chunks/_color-Dtg6hRMg.mjs

@@ -0,0 +1,18 @@
+//#region src/_color.ts
+const noColor = /* @__PURE__ */ (() => {
+	const env = globalThis.process?.env;
+	return env.NO_COLOR === "1" || env.TERM === "dumb";
+})();
+const _c = (c, r = 39) => (t) => noColor ? t : `\u001B[${c}m${t}\u001B[${r}m`;
+const bold = /* @__PURE__ */ _c(1, 22);
+const red = /* @__PURE__ */ _c(31);
+const green = /* @__PURE__ */ _c(32);
+const yellow = /* @__PURE__ */ _c(33);
+const blue = /* @__PURE__ */ _c(34);
+const magenta = /* @__PURE__ */ _c(35);
+const cyan = /* @__PURE__ */ _c(36);
+const gray = /* @__PURE__ */ _c(90);
+const url = (title, url$1) => noColor ? `[${title}](${url$1})` : `\u001B]8;;${url$1}\u001B\\${title}\u001B]8;;\u001B\\`;
+
+//#endregion
+export { blue, bold, cyan, gray, green, magenta, red, url, yellow };

package/dist/_chunks/{_plugins-DBERsPAu.mjs → _plugins-CPeJORNN.mjs}

@@ -1,4 +1,4 @@
-import { Colors } from "./_utils.cli-B2YzwlOv.mjs";
+import { gray, red } from "./_color-Dtg6hRMg.mjs";
 
 //#region src/_middleware.ts
 function wrapFetch(server) {
@@ -34,23 +34,21 @@ const gracefulShutdownPlugin = (server) => {
 	const shutdown = async () => {
 		if (isShuttingDown) return;
 		isShuttingDown = true;
-		console.log(Colors.gray(`\nShutting down server... (timeout in ${gracefulShutdown}+${forceShutdown}s)`));
+		const w = process.stderr.write.bind(process.stderr);
+		w(gray(`\nShutting down server in ${gracefulShutdown}s...`));
 		let timeout;
 		await Promise.race([server.close().finally(() => {
 			clearTimeout(timeout);
-			console.log(Colors.green("Server closed all connections."));
+			w(gray(" Server closed.\n"));
 		}), new Promise((resolve) => {
 			timeout = setTimeout(() => {
-				console.warn(Colors.yellow(`Forcing closing connections to exit... (timeout in ${forceShutdown}s)`));
+				w(gray(`\nForce closing connections in ${forceShutdown}s...`));
 				timeout = setTimeout(() => {
-					console.error(Colors.red("Could not close connections in time, force exiting."));
+					w(red("\nCould not close connections in time, force exiting."));
 					resolve();
-				}, 1e3);
-				return server.close(true).finally(() => {
-					clearTimeout(timeout);
-					resolve();
-				});
-			}, 1e3);
+				}, forceShutdown * 1e3);
+				return server.close(true);
+			}, gracefulShutdown * 1e3);
 		})]);
 		globalThis.process.exit(0);
 	};

package/dist/_chunks/{_utils-dqVgpDNy.mjs → _utils-DS1d5FUa.mjs}

@@ -2,6 +2,7 @@
 function resolvePortAndHost(opts) {
 	const _port = opts.port ?? globalThis.process?.env.PORT ?? 3e3;
 	const port = typeof _port === "number" ? _port : Number.parseInt(_port, 10);
+	if (port < 0 || port > 65535) throw new RangeError(`Port must be between 0 and 65535 (got "${port}").`);
 	const hostname = opts.hostname ?? globalThis.process?.env.HOST;
 	return {
 		port,
@@ -56,7 +57,8 @@ function createWaitUntil() {
 	const promises = new Set();
 	return {
 		waitUntil: (promise) => {
-			promises.add(promise.catch(console.error).finally(() => {
+			if (typeof promise?.then !== "function") return;
+			promises.add(Promise.resolve(promise).catch(console.error).finally(() => {
 				promises.delete(promise);
 			}));
 		},

package/dist/adapters/bun.mjs

@@ -1,8 +1,8 @@
-import "../_chunks/_utils.cli-B2YzwlOv.mjs";
+import "../_chunks/_color-Dtg6hRMg.mjs";
 import "../_chunks/_inherit-B9eAGP_O.mjs";
 import { FastURL$1 as FastURL } from "../_chunks/_url-DF-_pEPn.mjs";
-import { createWaitUntil, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "../_chunks/_utils-dqVgpDNy.mjs";
-import { gracefulShutdownPlugin, wrapFetch } from "../_chunks/_plugins-DBERsPAu.mjs";
+import { createWaitUntil, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "../_chunks/_utils-DS1d5FUa.mjs";
+import { gracefulShutdownPlugin, wrapFetch } from "../_chunks/_plugins-CPeJORNN.mjs";
 
 //#region src/adapters/bun.ts
 const FastResponse = Response;

package/dist/adapters/cloudflare.mjs

@@ -1,5 +1,5 @@
-import "../_chunks/_utils.cli-B2YzwlOv.mjs";
-import { errorPlugin, wrapFetch } from "../_chunks/_plugins-DBERsPAu.mjs";
+import "../_chunks/_color-Dtg6hRMg.mjs";
+import { errorPlugin, wrapFetch } from "../_chunks/_plugins-CPeJORNN.mjs";
 
 //#region src/adapters/cloudflare.ts
 const FastURL = URL;

package/dist/adapters/deno.mjs

@@ -1,8 +1,8 @@
-import "../_chunks/_utils.cli-B2YzwlOv.mjs";
+import "../_chunks/_color-Dtg6hRMg.mjs";
 import "../_chunks/_inherit-B9eAGP_O.mjs";
 import { FastURL$1 as FastURL } from "../_chunks/_url-DF-_pEPn.mjs";
-import { createWaitUntil, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "../_chunks/_utils-dqVgpDNy.mjs";
-import { gracefulShutdownPlugin, wrapFetch } from "../_chunks/_plugins-DBERsPAu.mjs";
+import { createWaitUntil, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "../_chunks/_utils-DS1d5FUa.mjs";
+import { gracefulShutdownPlugin, wrapFetch } from "../_chunks/_plugins-CPeJORNN.mjs";
 
 //#region src/adapters/deno.ts
 const FastResponse = Response;

package/dist/adapters/generic.mjs

@@ -1,6 +1,6 @@
-import "../_chunks/_utils.cli-B2YzwlOv.mjs";
-import { createWaitUntil } from "../_chunks/_utils-dqVgpDNy.mjs";
-import { errorPlugin, wrapFetch } from "../_chunks/_plugins-DBERsPAu.mjs";
+import "../_chunks/_color-Dtg6hRMg.mjs";
+import { createWaitUntil } from "../_chunks/_utils-DS1d5FUa.mjs";
+import { errorPlugin, wrapFetch } from "../_chunks/_plugins-CPeJORNN.mjs";
 
 //#region src/adapters/generic.ts
 const FastURL = URL;

package/dist/adapters/node.mjs

@@ -1,8 +1,8 @@
-import "../_chunks/_utils.cli-B2YzwlOv.mjs";
+import "../_chunks/_color-Dtg6hRMg.mjs";
 import { lazyInherit } from "../_chunks/_inherit-B9eAGP_O.mjs";
 import { FastURL$1 as FastURL } from "../_chunks/_url-DF-_pEPn.mjs";
-import { createWaitUntil, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "../_chunks/_utils-dqVgpDNy.mjs";
-import { errorPlugin, gracefulShutdownPlugin, wrapFetch } from "../_chunks/_plugins-DBERsPAu.mjs";
+import { createWaitUntil, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "../_chunks/_utils-DS1d5FUa.mjs";
+import { errorPlugin, gracefulShutdownPlugin, wrapFetch } from "../_chunks/_plugins-CPeJORNN.mjs";
 import { NodeResponse, callNodeHandler } from "../_chunks/call-BUTAdRs1.mjs";
 import nodeHTTP, { IncomingMessage, ServerResponse } from "node:http";
 import { Duplex, Readable } from "node:stream";

package/dist/adapters/service-worker.mjs

@@ -1,5 +1,5 @@
-import "../_chunks/_utils.cli-B2YzwlOv.mjs";
-import { errorPlugin, wrapFetch } from "../_chunks/_plugins-DBERsPAu.mjs";
+import "../_chunks/_color-Dtg6hRMg.mjs";
+import { errorPlugin, wrapFetch } from "../_chunks/_plugins-CPeJORNN.mjs";
 
 //#region src/adapters/service-worker.ts
 const FastURL = URL;

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { Colors } from "./_chunks/_utils.cli-B2YzwlOv.mjs";
+import { bold, cyan, gray, green, magenta, red, url, yellow } from "./_chunks/_color-Dtg6hRMg.mjs";
 import { parseArgs } from "node:util";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import * as nodeHTTP$1 from "node:http";
@@ -156,8 +156,8 @@ async function loadEntry(opts) {
 	} catch (error) {
 		if (error?.code === "ERR_UNKNOWN_FILE_EXTENSION") {
 			const message = String(error);
-			if (/"\.(m|c)?ts"/g.test(message)) console.error(Colors.red(`\nMake sure you're using Node.js v22.18+ or v24+ for TypeScript support (current version: ${process.versions.node})\n\n`));
-			else if (/"\.(m|c)?tsx"/g.test(message)) console.error(Colors.red(`\nYou need a compatible loader for JSX support (Deno, Bun or srvx --register jiti/register)\n\n`));
+			if (/"\.(m|c)?ts"/g.test(message)) console.error(red(`\nMake sure you're using Node.js v22.18+ or v24+ for TypeScript support (current version: ${process.versions.node})\n\n`));
+			else if (/"\.(m|c)?tsx"/g.test(message)) console.error(red(`\nYou need a compatible loader for JSX support (Deno, Bun or srvx --register jiti/register)\n\n`));
 		}
 		if (error instanceof Error) Error.captureStackTrace?.(error, serve);
 		throw error;
@@ -183,14 +183,14 @@ function renderError(error, status = 500, title = "Server Error") {
 }
 function printInfo(entry) {
 	let entryInfo;
-	if (options._entry) entryInfo = Colors.cyan("./" + relative(".", options._entry));
-	else entryInfo = Colors.gray(`(create ${Colors.bold(`server.ts`)} to enable)`);
-	console.log(Colors.gray(`${Colors.bold(Colors.gray("λ"))} Server handler: ${entryInfo}`));
-	if (options._entry && entry._error) console.error(Colors.red(`  ${entry._error}`));
+	if (options._entry) entryInfo = cyan("./" + relative(".", options._entry));
+	else entryInfo = gray(`(create ${bold(`server.ts`)} to enable)`);
+	console.log(gray(`${bold(gray("λ"))} Server handler: ${entryInfo}`));
+	if (options._entry && entry._error) console.error(red(`  ${entry._error}`));
 	let staticInfo;
-	if (options._static) staticInfo = Colors.cyan("./" + relative(".", options._static) + "/");
-	else staticInfo = Colors.gray(`(add ${Colors.bold("public/")} dir to enable)`);
-	console.log(Colors.gray(`${Colors.bold(Colors.gray("∘"))} Static files:   ${staticInfo}`));
+	if (options._static) staticInfo = cyan("./" + relative(".", options._static) + "/");
+	else staticInfo = gray(`(add ${bold("public/")} dir to enable)`);
+	console.log(gray(`${bold(gray("∘"))} Static files:   ${staticInfo}`));
 }
 async function interceptListen(cb) {
 	const originalListen = nodeHTTP$1.Server.prototype.listen;
@@ -217,7 +217,7 @@ async function interceptListen(cb) {
 	};
 }
 async function version() {
-	const version$1 = "0.9.3";
+	const version$1 = "0.9.4";
 	return `srvx ${version$1}\n${runtime()}`;
 }
 function runtime() {
@@ -266,7 +266,7 @@ function parseArgs$1(args$1) {
 		dir = dirname(entry);
 	}
 	if (!existsSync(dir)) {
-		console.error(Colors.red(`Directory "${dir}" does not exist.\n`));
+		console.error(red(`Directory "${dir}" does not exist.\n`));
 		process.exit(1);
 	}
 	return {
@@ -287,55 +287,55 @@ function parseArgs$1(args$1) {
 }
 function example() {
 	const useTs = !options._entry || options._entry.endsWith(".ts");
-	return `${Colors.bold(Colors.gray("// server.ts"))}
-${Colors.magenta("export default")} {
-  ${Colors.cyan("fetch")}(req${useTs ? ": Request" : ""}) {
-    ${Colors.magenta("return")} new Response(${Colors.green("\"Hello, World!\"")});
+	return `${bold(gray("// server.ts"))}
+${magenta("export default")} {
+  ${cyan("fetch")}(req${useTs ? ": Request" : ""}) {
+    ${magenta("return")} new Response(${green("\"Hello, World!\"")});
   }
 }`;
 }
 function usage(mainOpts) {
 	const command = mainOpts.command;
 	return `
-${Colors.cyan(command)} - Start an HTTP server with the specified entry path.
+${cyan(command)} - Start an HTTP server with the specified entry path.
 
-${Colors.bold("USAGE")}
+${bold("USAGE")}
 ${existsSync(options._entry) ? "" : `\n${example()}\n`}
-${Colors.gray("# srvx [options] [entry]")}
-${Colors.gray("$")} ${Colors.cyan(command)} ${Colors.gray("./server.ts")}            ${Colors.gray("# Start development server")}
-${Colors.gray("$")} ${Colors.cyan(command)} --prod                 ${Colors.gray("# Start production  server")}
-${Colors.gray("$")} ${Colors.cyan(command)} --port=8080            ${Colors.gray("# Listen on port 8080")}
-${Colors.gray("$")} ${Colors.cyan(command)} --host=localhost       ${Colors.gray("# Bind to localhost only")}
-${Colors.gray("$")} ${Colors.cyan(command)} --import=jiti/register ${Colors.gray(`# Enable ${Colors.url("jiti", "https://github.com/unjs/jiti")} loader`)}
-${Colors.gray("$")} ${Colors.cyan(command)} --tls --cert=cert.pem --key=key.pem  ${Colors.gray("# Enable TLS (HTTPS/HTTP2)")}
+${gray("# srvx [options] [entry]")}
+${gray("$")} ${cyan(command)} ${gray("./server.ts")}            ${gray("# Start development server")}
+${gray("$")} ${cyan(command)} --prod                 ${gray("# Start production  server")}
+${gray("$")} ${cyan(command)} --port=8080            ${gray("# Listen on port 8080")}
+${gray("$")} ${cyan(command)} --host=localhost       ${gray("# Bind to localhost only")}
+${gray("$")} ${cyan(command)} --import=jiti/register ${gray(`# Enable ${url("jiti", "https://github.com/unjs/jiti")} loader`)}
+${gray("$")} ${cyan(command)} --tls --cert=cert.pem --key=key.pem  ${gray("# Enable TLS (HTTPS/HTTP2)")}
 
 
-${Colors.bold("ARGUMENTS")}
+${bold("ARGUMENTS")}
 
-  ${Colors.yellow("<entry>")}                  Server entry path to serve.
-                           Default: ${defaultEntries.map((e) => Colors.cyan(e)).join(", ")} ${Colors.gray(`(${defaultExts.join(",")})`)}
+  ${yellow("<entry>")}                  Server entry path to serve.
+                           Default: ${defaultEntries.map((e) => cyan(e)).join(", ")} ${gray(`(${defaultExts.join(",")})`)}
 
-${Colors.bold("OPTIONS")}
+${bold("OPTIONS")}
 
-  ${Colors.green("-p, --port")} ${Colors.yellow("<port>")}        Port to listen on (default: ${Colors.yellow("3000")})
-  ${Colors.green("--host")} ${Colors.yellow("<host>")}            Host to bind to (default: all interfaces)
-  ${Colors.green("-s, --static")} ${Colors.yellow("<dir>")}       Serve static files from the specified directory (default: ${Colors.yellow("public")})
-  ${Colors.green("--prod")}                   Run in production mode (no watch, no debug)
-  ${Colors.green("--import")} ${Colors.yellow("<loader>")}        ES module to preload
-  ${Colors.green("--tls")}                    Enable TLS (HTTPS/HTTP2)
-  ${Colors.green("--cert")} ${Colors.yellow("<file>")}            TLS certificate file
-  ${Colors.green("--key")}  ${Colors.yellow("<file>")}            TLS private key file
-  ${Colors.green("-h, --help")}               Show this help message
-  ${Colors.green("-v, --version")}            Show server and runtime versions
+  ${green("-p, --port")} ${yellow("<port>")}        Port to listen on (default: ${yellow("3000")})
+  ${green("--host")} ${yellow("<host>")}            Host to bind to (default: all interfaces)
+  ${green("-s, --static")} ${yellow("<dir>")}       Serve static files from the specified directory (default: ${yellow("public")})
+  ${green("--prod")}                   Run in production mode (no watch, no debug)
+  ${green("--import")} ${yellow("<loader>")}        ES module to preload
+  ${green("--tls")}                    Enable TLS (HTTPS/HTTP2)
+  ${green("--cert")} ${yellow("<file>")}            TLS certificate file
+  ${green("--key")}  ${yellow("<file>")}            TLS private key file
+  ${green("-h, --help")}               Show this help message
+  ${green("-v, --version")}            Show server and runtime versions
 
-${Colors.bold("ENVIRONMENT")}
+${bold("ENVIRONMENT")}
 
-  ${Colors.green("PORT")}                     Override port
-  ${Colors.green("HOST")}                     Override host
-  ${Colors.green("NODE_ENV")}                 Set to ${Colors.yellow("production")} for production mode.
+  ${green("PORT")}                     Override port
+  ${green("HOST")}                     Override host
+  ${green("NODE_ENV")}                 Set to ${yellow("production")} for production mode.
 
-➤ ${Colors.url("Documentation", mainOpts.docs || "https://srvx.h3.dev")}
-➤ ${Colors.url("Report issues", mainOpts.issues || "https://github.com/h3js/srvx/issues")}
+➤ ${url("Documentation", mainOpts.docs || "https://srvx.h3.dev")}
+➤ ${url("Report issues", mainOpts.issues || "https://github.com/h3js/srvx/issues")}
 `.trim();
 }
 function setupProcessErrorHandlers() {

package/dist/log.mjs

@@ -1,18 +1,18 @@
-import { Colors } from "./_chunks/_utils.cli-B2YzwlOv.mjs";
+import { blue, bold, gray, green, red, yellow } from "./_chunks/_color-Dtg6hRMg.mjs";
 
 //#region src/log.ts
 const statusColors = {
-	1: "blue",
-	2: "green",
-	3: "yellow"
+	1: blue,
+	2: green,
+	3: yellow
 };
 const log = (_options = {}) => {
 	return async (req, next) => {
 		const start = performance.now();
 		const res = await next();
 		const duration = performance.now() - start;
-		const statusColor = statusColors[Math.floor(res.status / 100)] || "red";
-		console.log(`${Colors.gray(`[${new Date().toLocaleTimeString()}]`)} ${Colors.bold(req.method)} ${Colors.blue(req.url)} [${Colors[statusColor](res.status + "")}] ${Colors.gray(`(${duration.toFixed(2)}ms)`)}`);
+		const statusColor = statusColors[Math.floor(res.status / 100)] || red;
+		console.log(`${gray(`[${new Date().toLocaleTimeString()}]`)} ${bold(req.method)} ${blue(req.url)} [${statusColor(res.status + "")}] ${gray(`(${duration.toFixed(2)}ms)`)}`);
 		return res;
 	};
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "srvx",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "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",

package/dist/_chunks/_utils.cli-B2YzwlOv.mjs

@@ -1,31 +0,0 @@
-//#region src/_utils.cli.ts
-const noColor = globalThis.process?.env?.NO_COLOR === "1" || globalThis.process?.env?.TERM === "dumb";
-const resets = {
-	1: 22,
-	31: 39,
-	32: 39,
-	33: 39,
-	34: 39,
-	35: 39,
-	36: 39,
-	90: 39
-};
-const _c = (c) => (text) => {
-	if (noColor) return text;
-	const off = resets[c] ?? 0;
-	return `\u001B[${c}m${text}\u001B[${off}m`;
-};
-const Colors = {
-	bold: _c(1),
-	red: _c(31),
-	green: _c(32),
-	yellow: _c(33),
-	blue: _c(34),
-	magenta: _c(35),
-	cyan: _c(36),
-	gray: _c(90),
-	url: (title, url) => noColor ? `[${title}](${url})` : `\u001B]8;;${url}\u001B\\${title}\u001B]8;;\u001B\\`
-};
-
-//#endregion
-export { Colors };