srvx 0.11.0 → 0.11.2

package/bin/srvx.mjs

@@ -1,6 +1,8 @@
 #!/usr/bin/env node
 import { main } from "../dist/cli.mjs";
 
+globalThis.__SRVX_BIN__ = import.meta.url;
+
 await main({
   usage: {
     command: "srvx",

package/dist/_chunks/_plugins.mjs

@@ -1,4 +1,4 @@
-import { i as gray, o as red } from "./_utils.mjs";
+import { a as green, i as gray, l as yellow, n as bold, s as red } from "./_utils.mjs";
 function wrapFetch(server) {
 	const fetchHandler = server.options.fetch;
 	const middleware = server.options.middleware || [];
@@ -23,39 +23,28 @@ const errorPlugin = (server) => {
 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 gracefulShutdown = config === true || !config?.gracefulTimeout ? Number.parseInt(process.env.SERVER_SHUTDOWN_TIMEOUT || "") || 3 : config.gracefulTimeout;
-	const forceShutdown = config === true || !config?.forceTimeout ? Number.parseInt(process.env.SERVER_FORCE_SHUTDOWN_TIMEOUT || "") || 5 : config.forceTimeout;
+	const gracefulTimeout = config === true || !config?.gracefulTimeout ? Number.parseInt(process.env.SERVER_SHUTDOWN_TIMEOUT || "") || 5 : config.gracefulTimeout;
 	let isShuttingDown = false;
-	let forceClose;
+	const w = server.options.silent ? () => {} : process.stderr.write.bind(process.stderr);
+	const forceClose = async () => {
+		w(red("\x1B[2K\rForcibly closing connections...\n"));
+		await server.close(true);
+		w(yellow("Server closed.\n"));
+		globalThis.process.exit(0);
+	};
 	const shutdown = async () => {
-		if (isShuttingDown) {
-			forceClose?.();
-			return;
-		}
+		if (isShuttingDown) return forceClose();
 		isShuttingDown = true;
-		const w = process.stderr.write.bind(process.stderr);
-		w(gray(`\nShutting down server in ${gracefulShutdown}s... (press Ctrl+C again to force close)`));
-		let timeout;
-		await Promise.race([server.close().finally(() => {
-			clearTimeout(timeout);
-			w(gray(" Server closed.\n"));
-		}), new Promise((resolve) => {
-			forceClose = () => {
-				clearTimeout(timeout);
-				w(gray("\nForce closing...\n"));
-				server.close(true);
-				resolve();
-			};
-			timeout = setTimeout(() => {
-				w(gray(`\nForce closing connections in ${forceShutdown}s...`));
-				timeout = setTimeout(() => {
-					w(red("\nCould not close connections in time, force exiting."));
-					resolve();
-				}, forceShutdown * 1e3);
-				return server.close(true);
-			}, gracefulShutdown * 1e3);
-		})]);
-		globalThis.process.exit(0);
+		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);
+			}
+		}
+		w("\x1B[2K\rGraceful shutdown timed out.\n");
+		await forceClose();
 	};
 	for (const sig of ["SIGINT", "SIGTERM"]) globalThis.process.on(sig, shutdown);
 };

package/dist/_chunks/_utils.mjs

@@ -8,7 +8,8 @@ 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) => noColor ? `[${title}](${url})` : `\u001B]8;;${url}\u001B\\${title}\u001B]8;;\u001B\\`;
-export { green as a, yellow as c, gray as i, bold as n, red as o, cyan as r, url as s, blue as t };
+export { green as a, url as c, gray as i, yellow as l, bold as n, magenta as o, cyan as r, red as s, blue as t };

package/dist/cli.d.mts

@@ -7,6 +7,11 @@ declare global {
 }
 type MainOptions = CLIOptions & {
   args?: string[];
+  meta?: {
+    name?: string;
+    version?: string;
+    description?: string;
+  };
   usage?: {
     command?: string;
     docs?: string;

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { a as green, c as yellow, i as gray, n as bold, o as red, r as cyan, s as url } from "./_chunks/_utils.mjs";
+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 { parseArgs } from "node:util";
 import { fileURLToPath } from "node:url";
@@ -6,7 +6,6 @@ import { fork } from "node:child_process";
 import { createReadStream, existsSync, statSync } from "node:fs";
 import { dirname, relative, resolve } from "node:path";
 import { Readable } from "node:stream";
-var version = "0.11.0";
 const NO_ENTRY_ERROR = "No server entry or public directory found";
 async function cliServe(cliOpts) {
 	try {
@@ -32,7 +31,7 @@ async function cliServe(cliOpts) {
 		printInfo(cliOpts, loaded);
 		await (globalThis.__srvx__ = srvxServe({
 			...serverOptions,
-			gracefulShutdown: cliOpts.prod,
+			gracefulShutdown: !!cliOpts.prod,
 			port: cliOpts.port ?? serverOptions.port,
 			hostname: cliOpts.hostname ?? cliOpts.host ?? serverOptions.hostname,
 			tls: cliOpts.tls ? {
@@ -173,10 +172,18 @@ function getResponseFormat(res) {
 		encoding: contentType.includes("charset=") ? contentType.split("charset=")[1].split(";")[0].trim() : "utf8"
 	};
 }
+const srvxMeta = {
+	name: "srvx",
+	version: "0.11.2",
+	description: "Universal Server."
+};
 function usage(mainOpts) {
 	const command = mainOpts.usage?.command || "srvx";
+	const name = mainOpts.meta?.name || srvxMeta.name;
+	const ver = mainOpts.meta?.version || srvxMeta.version;
+	const desc = mainOpts.meta?.description || srvxMeta.description;
 	return `
-${cyan(command)} - Universal Server CLI
+${cyan(name)}${gray(`${ver ? ` ${ver}` : ""} ${desc ? `- ${desc}` : ""}`)}
 
 ${bold("SERVE MODE")}
 
@@ -239,19 +246,13 @@ async function main(mainOpts) {
 	const args = process.argv.slice(2);
 	const cliOpts = parseArgs$1(args);
 	if (cliOpts.version) {
-		console.log(`srvx ${version}\n${runtime()}`);
+		process.stdout.write(versions(mainOpts).join("\n") + "\n");
 		process.exit(0);
 	}
 	if (cliOpts.help) {
 		console.log(usage(mainOpts));
 		process.exit(cliOpts.help ? 0 : 1);
 	}
-	if (process.send) {
-		console.log(gray(`srvx ${version} - ${runtime()}`));
-		setupProcessErrorHandlers();
-		await cliServe(cliOpts);
-		return;
-	}
 	if (cliOpts.mode === "fetch") try {
 		const res = await cliFetch(cliOpts);
 		process.exit(res.ok ? 0 : 22);
@@ -259,48 +260,23 @@ async function main(mainOpts) {
 		console.error(error);
 		process.exit(1);
 	}
+	if (process.send) return startServer(cliOpts);
+	console.log(gray([...versions(mainOpts), cliOpts.prod ? "prod" : "dev"].join(" · ")));
+	const envFiles = [".env", cliOpts.prod ? ".env.production" : ".env.local"].filter((f) => existsSync(f));
+	if (envFiles.length > 0) console.log(`${gray(`Loading environment variables from ${magenta(envFiles.join(", "))}`)}`);
+	if (cliOpts.prod && !cliOpts.import) {
+		for (const envFile of [...envFiles].reverse()) process.loadEnvFile?.(envFile);
+		await startServer(cliOpts);
+		return;
+	}
 	const isBun = !!process.versions.bun;
 	const isDeno = !!process.versions.deno;
 	const isNode = !isBun && !isDeno;
 	const runtimeArgs = [];
+	runtimeArgs.push(...envFiles.map((f) => `--env-file=${f}`));
 	if (!cliOpts.prod) runtimeArgs.push("--watch");
-	if (isNode || isDeno) runtimeArgs.push(...[".env", cliOpts.prod ? ".env.production" : ".env.local"].filter((f) => existsSync(f)).map((f) => `--env-file=${f}`));
-	if (isNode) {
-		const [major, minor] = process.versions.node.split(".");
-		if (major === "22" && +minor >= 6) runtimeArgs.push("--experimental-strip-types");
-		if (cliOpts.import) runtimeArgs.push(`--import=${cliOpts.import}`);
-	}
-	const child = fork(fileURLToPath(new URL("../bin/srvx.mjs", import.meta.url)), args, { execArgv: [...process.execArgv, ...runtimeArgs].filter(Boolean) });
-	child.on("error", (error) => {
-		console.error("Error in child process:", error);
-		process.exit(1);
-	});
-	child.on("exit", (code) => {
-		if (code !== 0) {
-			console.error(`Child process exited with code ${code}`);
-			process.exit(code);
-		}
-	});
-	child.on("message", (msg) => {
-		if (msg && msg.error === "no-entry") {
-			console.error("\n" + red(NO_ENTRY_ERROR) + "\n");
-			process.exit(3);
-		}
-	});
-	let cleanupCalled = false;
-	const cleanup = (signal, exitCode) => {
-		if (cleanupCalled) return;
-		cleanupCalled = true;
-		try {
-			child.kill(signal || "SIGTERM");
-		} catch (error) {
-			console.error("Error killing child process:", error);
-		}
-		if (exitCode !== void 0) process.exit(exitCode);
-	};
-	process.on("exit", () => cleanup("SIGTERM"));
-	process.on("SIGINT", () => cleanup("SIGINT", 130));
-	process.on("SIGTERM", () => cleanup("SIGTERM", 143));
+	if (cliOpts.import && (isNode || isBun)) runtimeArgs.push(`--import=${cliOpts.import}`);
+	await forkCLI(args, runtimeArgs);
 }
 function parseArgs$1(args) {
 	const pArg0 = args.find((a) => !a.startsWith("-"));
@@ -383,6 +359,43 @@ function parseArgs$1(args) {
 		method
 	};
 }
+async function startServer(cliOpts) {
+	setupProcessErrorHandlers();
+	await cliServe(cliOpts);
+}
+async function forkCLI(args, runtimeArgs) {
+	const child = fork(fileURLToPath(globalThis.__SRVX_BIN__ || new URL("../bin/srvx.mjs", import.meta.url)), [...args], { execArgv: [...process.execArgv, ...runtimeArgs].filter(Boolean) });
+	child.on("error", (error) => {
+		console.error("Error in child process:", error);
+		process.exit(1);
+	});
+	child.on("exit", (code) => {
+		if (code !== 0) {
+			console.error(`Child process exited with code ${code}`);
+			process.exit(code);
+		}
+	});
+	child.on("message", (msg) => {
+		if (msg && msg.error === "no-entry") {
+			console.error("\n" + red(NO_ENTRY_ERROR) + "\n");
+			process.exit(3);
+		}
+	});
+	let cleanupCalled = false;
+	const cleanup = (signal, exitCode) => {
+		if (cleanupCalled) return;
+		cleanupCalled = true;
+		try {
+			child.kill(signal || "SIGTERM");
+		} catch (error) {
+			console.error("Error killing child process:", error);
+		}
+		if (exitCode !== void 0) process.exit(exitCode);
+	};
+	process.on("exit", () => cleanup("SIGTERM"));
+	process.on("SIGTERM", () => cleanup("SIGTERM", 143));
+	if (args.includes("--watch")) process.on("SIGINT", () => cleanup("SIGINT", 130));
+}
 function setupProcessErrorHandlers() {
 	process.on("uncaughtException", (error) => {
 		console.error("Uncaught exception:", error);
@@ -393,6 +406,13 @@ function setupProcessErrorHandlers() {
 		process.exit(1);
 	});
 }
+function versions(mainOpts) {
+	const versions = [];
+	if (mainOpts.meta?.name) versions.push(`${mainOpts.meta.name} ${mainOpts.meta.version || ""}`.trim());
+	versions.push(`${srvxMeta.name} ${srvxMeta.version}`);
+	versions.push(runtime());
+	return versions;
+}
 function runtime() {
 	if (process.versions.bun) return `bun ${process.versions.bun}`;
 	else if (process.versions.deno) return `deno ${process.versions.deno}`;

package/dist/log.mjs

@@ -1,4 +1,4 @@
-import { a as green, c as yellow, i as gray, n as bold, o as red, t as blue } from "./_chunks/_utils.mjs";
+import { a as green, i as gray, l as yellow, n as bold, s as red, t as blue } from "./_chunks/_utils.mjs";
 const statusColors = {
 	1: blue,
 	2: green,

package/dist/tracing.d.mts

@@ -19,7 +19,7 @@ type RequestEvent = {
 * Tracing plugin that adds diagnostics channel tracing to middleware and fetch handlers.
 *
 * This plugin wraps all middleware and the fetch handler with tracing instrumentation,
-* allowing you to subscribe to `srvx.fetch` and `srvx.middleware` tracing channels.
+* allowing you to subscribe to `srvx.request` and `srvx.middleware` tracing channels.
 *
 * @example
 * ```ts

package/dist/tracing.mjs

@@ -3,7 +3,7 @@ function tracingPlugin(opts = {}) {
 		const { tracingChannel } = globalThis.process?.getBuiltinModule?.("node:diagnostics_channel") || {};
 		if (!tracingChannel) return;
 		if (opts.fetch !== false) {
-			const fetchChannel = tracingChannel("srvx.fetch");
+			const fetchChannel = tracingChannel("srvx.request");
 			const originalFetch = server.options.fetch;
 			server.options.fetch = (request) => {
 				return fetchChannel.tracePromise(async () => await originalFetch(request), {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "srvx",
-  "version": "0.11.0",
-  "description": "Universal Server API based on web platform standards. Works seamlessly with Deno, Bun and Node.js.",
+  "version": "0.11.2",
+  "description": "Universal Server.",
   "homepage": "https://srvx.h3.dev",
   "license": "MIT",
   "repository": "h3js/srvx",