srvx 0.9.2 → 0.9.3

package/dist/_chunks/_plugins-DBERsPAu.mjs

@@ -0,0 +1,61 @@
+import { Colors } from "./_utils.cli-B2YzwlOv.mjs";
+
+//#region src/_middleware.ts
+function wrapFetch(server) {
+	const fetchHandler = server.options.fetch;
+	const middleware = server.options.middleware || [];
+	return middleware.length === 0 ? fetchHandler : (request) => callMiddleware(request, fetchHandler, middleware, 0);
+}
+function callMiddleware(request, fetchHandler, middleware, index) {
+	if (index === middleware.length) return fetchHandler(request);
+	return middleware[index](request, () => callMiddleware(request, fetchHandler, middleware, index + 1));
+}
+
+//#endregion
+//#region src/_plugins.ts
+const errorPlugin = (server) => {
+	const errorHandler = server.options.error;
+	if (!errorHandler) return;
+	server.options.middleware.unshift((_req, next) => {
+		try {
+			const res = next();
+			return res instanceof Promise ? res.catch((error) => errorHandler(error)) : res;
+		} catch (error) {
+			return errorHandler(error);
+		}
+	});
+};
+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;
+	let isShuttingDown = false;
+	const shutdown = async () => {
+		if (isShuttingDown) return;
+		isShuttingDown = true;
+		console.log(Colors.gray(`\nShutting down server... (timeout in ${gracefulShutdown}+${forceShutdown}s)`));
+		let timeout;
+		await Promise.race([server.close().finally(() => {
+			clearTimeout(timeout);
+			console.log(Colors.green("Server closed all connections."));
+		}), new Promise((resolve) => {
+			timeout = setTimeout(() => {
+				console.warn(Colors.yellow(`Forcing closing connections to exit... (timeout in ${forceShutdown}s)`));
+				timeout = setTimeout(() => {
+					console.error(Colors.red("Could not close connections in time, force exiting."));
+					resolve();
+				}, 1e3);
+				return server.close(true).finally(() => {
+					clearTimeout(timeout);
+					resolve();
+				});
+			}, 1e3);
+		})]);
+		globalThis.process.exit(0);
+	};
+	for (const sig of ["SIGINT", "SIGTERM"]) globalThis.process.on(sig, shutdown);
+};
+
+//#endregion
+export { errorPlugin, gracefulShutdownPlugin, wrapFetch };

package/dist/_chunks/call-DdhHMGpi.mjs

@@ -0,0 +1,4 @@
+import "./_inherit-B9eAGP_O.mjs";
+import { callNodeHandler } from "./call-BUTAdRs1.mjs";
+
+export { callNodeHandler };

package/dist/_chunks/{types-4jUOEbJe.d.mts → types-sQhe-gMy.d.mts}

@@ -93,6 +93,17 @@ interface ServerOptions {
   */
   silent?: boolean;
   /**
+  * Graceful shutdown on SIGINT and SIGTERM signals.
+  *
+  * Supported for Node.js, Deno and Bun runtimes.
+  *
+  * @default true (disabled in test and ci environments)
+  */
+  gracefulShutdown?: boolean | {
+    gracefulTimeout?: number;
+    forceTimeout?: number;
+  };
+  /**
   * TLS server options.
   */
   tls?: {

package/dist/adapters/bun.d.mts

@@ -1,5 +1,5 @@
-import { BunFetchHandler, Server, ServerOptions } from "../_chunks/types-4jUOEbJe.mjs";
-import { FastURL$2 as FastURL } from "../_chunks/_url-D-jAQyRZ.mjs";
+import { BunFetchHandler, Server, ServerOptions } from "../_chunks/types-sQhe-gMy.mjs";
+import { FastURL$2 as FastURL } from "../_chunks/_url-Dd8UPFqt.mjs";
 import * as bun from "bun";
 
 //#region src/adapters/bun.d.ts

package/dist/adapters/bun.mjs

@@ -1,7 +1,8 @@
+import "../_chunks/_utils.cli-B2YzwlOv.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 { wrapFetch } from "../_chunks/_middleware-Z-W2xNSK.mjs";
+import { gracefulShutdownPlugin, wrapFetch } from "../_chunks/_plugins-DBERsPAu.mjs";
 
 //#region src/adapters/bun.ts
 const FastResponse = Response;
@@ -21,6 +22,7 @@ var BunServer = class {
 			middleware: [...options.middleware || []]
 		};
 		for (const plugin of options.plugins || []) plugin(this);
+		gracefulShutdownPlugin(this);
 		const fetchHandler = wrapFetch(this);
 		this.#wait = createWaitUntil();
 		this.fetch = (request, server) => {

package/dist/adapters/cloudflare.d.mts

@@ -1,4 +1,4 @@
-import { Server, ServerOptions } from "../_chunks/types-4jUOEbJe.mjs";
+import { Server, ServerOptions } from "../_chunks/types-sQhe-gMy.mjs";
 import * as CF from "@cloudflare/workers-types";
 
 //#region src/adapters/cloudflare.d.ts

package/dist/adapters/cloudflare.mjs

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

package/dist/adapters/deno.d.mts

@@ -1,5 +1,5 @@
-import { DenoFetchHandler, Server, ServerOptions } from "../_chunks/types-4jUOEbJe.mjs";
-import { FastURL$2 as FastURL } from "../_chunks/_url-D-jAQyRZ.mjs";
+import { DenoFetchHandler, Server, ServerOptions } from "../_chunks/types-sQhe-gMy.mjs";
+import { FastURL$2 as FastURL } from "../_chunks/_url-Dd8UPFqt.mjs";
 
 //#region src/adapters/deno.d.ts
 declare const FastResponse: typeof globalThis.Response;

package/dist/adapters/deno.mjs

@@ -1,7 +1,8 @@
+import "../_chunks/_utils.cli-B2YzwlOv.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 { wrapFetch } from "../_chunks/_middleware-Z-W2xNSK.mjs";
+import { gracefulShutdownPlugin, wrapFetch } from "../_chunks/_plugins-DBERsPAu.mjs";
 
 //#region src/adapters/deno.ts
 const FastResponse = Response;
@@ -23,6 +24,7 @@ var DenoServer = class {
 			middleware: [...options.middleware || []]
 		};
 		for (const plugin of options.plugins || []) plugin(this);
+		gracefulShutdownPlugin(this);
 		const fetchHandler = wrapFetch(this);
 		this.#wait = createWaitUntil();
 		this.fetch = (request, info) => {

package/dist/adapters/generic.d.mts

@@ -1,4 +1,4 @@
-import { Server, ServerOptions } from "../_chunks/types-4jUOEbJe.mjs";
+import { Server, ServerOptions } from "../_chunks/types-sQhe-gMy.mjs";
 
 //#region src/adapters/generic.d.ts
 declare const FastURL: typeof globalThis.URL;

package/dist/adapters/generic.mjs

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

package/dist/adapters/node.d.mts

@@ -1,5 +1,5 @@
-import { FetchHandler, NodeHttpHandler, NodeServerRequest, NodeServerResponse, Server, ServerOptions, ServerRequest } from "../_chunks/types-4jUOEbJe.mjs";
-import { FastURL$2 as FastURL } from "../_chunks/_url-D-jAQyRZ.mjs";
+import { FetchHandler, NodeHttpHandler, NodeServerRequest, NodeServerResponse, Server, ServerOptions, ServerRequest } from "../_chunks/types-sQhe-gMy.mjs";
+import { FastURL$2 as FastURL } from "../_chunks/_url-Dd8UPFqt.mjs";
 import { Readable } from "node:stream";
 
 //#region src/adapters/_node/request.d.ts

package/dist/adapters/node.mjs

@@ -1,9 +1,9 @@
+import "../_chunks/_utils.cli-B2YzwlOv.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 { wrapFetch } from "../_chunks/_middleware-Z-W2xNSK.mjs";
-import { errorPlugin } from "../_chunks/_plugins-DOhVIkXu.mjs";
-import { NodeResponse, callNodeHandler } from "../_chunks/call-gjL9LWHI.mjs";
+import { errorPlugin, gracefulShutdownPlugin, wrapFetch } from "../_chunks/_plugins-DBERsPAu.mjs";
+import { NodeResponse, callNodeHandler } from "../_chunks/call-BUTAdRs1.mjs";
 import nodeHTTP, { IncomingMessage, ServerResponse } from "node:http";
 import { Duplex, Readable } from "node:stream";
 import nodeHTTPS from "node:https";
@@ -568,6 +568,7 @@ var NodeServer = class {
 		};
 		for (const plugin of options.plugins || []) plugin(this);
 		errorPlugin(this);
+		gracefulShutdownPlugin(this);
 		const fetchHandler = this.fetch = wrapFetch(this);
 		this.#wait = createWaitUntil();
 		const handler = (nodeReq, nodeRes) => {

package/dist/adapters/service-worker.d.mts

@@ -1,4 +1,4 @@
-import { Server, ServerOptions, ServerRequest } from "../_chunks/types-4jUOEbJe.mjs";
+import { Server, ServerOptions, ServerRequest } from "../_chunks/types-sQhe-gMy.mjs";
 
 //#region src/adapters/service-worker.d.ts
 declare const FastURL: typeof globalThis.URL;

package/dist/adapters/service-worker.mjs

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

package/dist/cli.mjs

@@ -103,18 +103,6 @@ async function serve() {
 		await server.ready();
 		await globalThis.__srvx_listen_cb__?.();
 		printInfo(entry);
-		let cleanupCalled = false;
-		const cleanup = (exitCode) => {
-			if (cleanupCalled) return;
-			cleanupCalled = true;
-			console.log(Colors.gray("\rGracefully stopping server..."));
-			server.close(true).catch(console.error).then(() => {
-				console.log(Colors.gray("Server stopped."));
-				process.exit(exitCode || 0);
-			});
-		};
-		process.on("SIGINT", () => cleanup(130));
-		process.on("SIGTERM", () => cleanup(143));
 	} catch (error) {
 		console.error(error);
 		process.exit(1);
@@ -148,7 +136,7 @@ async function loadEntry(opts) {
 			const nodeHandler = listenHandler || (typeof mod.default === "function" ? mod.default : void 0);
 			if (nodeHandler) {
 				_legacyNode = true;
-				const { callNodeHandler } = await import("./_chunks/call-Bz_KtGHu.mjs");
+				const { callNodeHandler } = await import("./_chunks/call-DdhHMGpi.mjs");
 				fetchHandler = (webReq) => callNodeHandler(nodeHandler, webReq);
 			}
 		}
@@ -229,7 +217,7 @@ async function interceptListen(cb) {
 	};
 }
 async function version() {
-	const version$1 = "0.9.1";
+	const version$1 = "0.9.3";
 	return `srvx ${version$1}\n${runtime()}`;
 }
 function runtime() {

package/dist/log.d.mts

@@ -1,4 +1,4 @@
-import { ServerMiddleware } from "./_chunks/types-4jUOEbJe.mjs";
+import { ServerMiddleware } from "./_chunks/types-sQhe-gMy.mjs";
 
 //#region src/log.d.ts
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type

package/dist/static.d.mts

@@ -1,4 +1,4 @@
-import { ServerMiddleware } from "./_chunks/types-4jUOEbJe.mjs";
+import { ServerMiddleware } from "./_chunks/types-sQhe-gMy.mjs";
 
 //#region src/static.d.ts
 interface ServeStaticOptions {

package/dist/types.d.mts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "srvx",
-  "version": "0.9.2",
+  "version": "0.9.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",

package/dist/_chunks/_middleware-Z-W2xNSK.mjs

@@ -1,13 +0,0 @@
-//#region src/_middleware.ts
-function wrapFetch(server) {
-	const fetchHandler = server.options.fetch;
-	const middleware = server.options.middleware || [];
-	return middleware.length === 0 ? fetchHandler : (request) => callMiddleware(request, fetchHandler, middleware, 0);
-}
-function callMiddleware(request, fetchHandler, middleware, index) {
-	if (index === middleware.length) return fetchHandler(request);
-	return middleware[index](request, () => callMiddleware(request, fetchHandler, middleware, index + 1));
-}
-
-//#endregion
-export { wrapFetch };

package/dist/_chunks/_plugins-DOhVIkXu.mjs

@@ -1,16 +0,0 @@
-//#region src/_plugins.ts
-const errorPlugin = (server) => {
-	const errorHandler = server.options.error;
-	if (!errorHandler) return;
-	server.options.middleware.unshift((_req, next) => {
-		try {
-			const res = next();
-			return res instanceof Promise ? res.catch((error) => errorHandler(error)) : res;
-		} catch (error) {
-			return errorHandler(error);
-		}
-	});
-};
-
-//#endregion
-export { errorPlugin };

package/dist/_chunks/call-Bz_KtGHu.mjs

@@ -1,4 +0,0 @@
-import "./_inherit-B9eAGP_O.mjs";
-import { callNodeHandler } from "./call-gjL9LWHI.mjs";
-
-export { callNodeHandler };