srvx 0.7.3 → 0.7.5

package/dist/_chunks/{_url-Dsik4Hgl.mjs → _url-0eSmxIIk.mjs}

@@ -1,59 +1,3 @@
-//#region src/_utils.node.ts
-function resolvePortAndHost(opts) {
-	const _port = opts.port ?? globalThis.process?.env.PORT ?? 3e3;
-	const port = typeof _port === "number" ? _port : Number.parseInt(_port, 10);
-	const hostname = opts.hostname ?? globalThis.process?.env.HOST;
-	return {
-		port,
-		hostname
-	};
-}
-function fmtURL(host, port, secure) {
-	if (!host || !port) return void 0;
-	if (host.includes(":")) host = `[${host}]`;
-	return `http${secure ? "s" : ""}://${host}:${port}/`;
-}
-function printListening(opts, url) {
-	if (!url || (opts.silent ?? globalThis.process?.env?.TEST)) return;
-	const _url = new URL(url);
-	const allInterfaces = _url.hostname === "[::]" || _url.hostname === "0.0.0.0";
-	if (allInterfaces) {
-		_url.hostname = "localhost";
-		url = _url.href;
-	}
-	let listeningOn = `➜ Listening on:`;
-	let additionalInfo = allInterfaces ? " (all interfaces)" : "";
-	if (globalThis.process.stdout?.isTTY) {
-		listeningOn = `\u001B[32m${listeningOn}\u001B[0m`;
-		url = `\u001B[36m${url}\u001B[0m`;
-		additionalInfo = `\u001B[2m${additionalInfo}\u001B[0m`;
-	}
-	console.log(`  ${listeningOn} ${url}${additionalInfo}`);
-}
-function resolveTLSOptions(opts) {
-	if (!opts.tls || opts.protocol === "http") return;
-	const cert = resolveCertOrKey(opts.tls.cert);
-	const key = resolveCertOrKey(opts.tls.key);
-	if (!cert && !key) {
-		if (opts.protocol === "https") throw new TypeError("TLS `cert` and `key` must be provided for `https` protocol.");
-		return;
-	}
-	if (!cert || !key) throw new TypeError("TLS `cert` and `key` must be provided together.");
-	return {
-		cert,
-		key,
-		passphrase: opts.tls.passphrase
-	};
-}
-function resolveCertOrKey(value) {
-	if (!value) return;
-	if (typeof value !== "string") throw new TypeError("TLS certificate and key must be strings in PEM format or file paths.");
-	if (value.startsWith("-----BEGIN ")) return value;
-	const { readFileSync } = process.getBuiltinModule("node:fs");
-	return readFileSync(value, "utf8");
-}
-
-//#endregion
 //#region src/_url.ts
 /**
 * Wrapper for URL with fast path access to `.pathname` and `.search` props.
@@ -63,7 +7,7 @@ function resolveCertOrKey(value) {
 * **NOTE:** Triggering the setters or getters on other props will deoptimize to full URL parsing.
 */
 const FastURL = /* @__PURE__ */ (() => {
-	const FastURL$1 = class URL$1 {
+	const FastURL$1 = class URL {
 		#originalURL;
 		#parsedURL;
 		_pathname;
@@ -144,4 +88,4 @@ const FastURL = /* @__PURE__ */ (() => {
 })();
 
 //#endregion
-export { FastURL as FastURL$1, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions };
+export { FastURL as FastURL$1 };

package/dist/_chunks/_utils-ek-l5xdY.mjs

@@ -0,0 +1,70 @@
+//#region src/_utils.ts
+function resolvePortAndHost(opts) {
+	const _port = opts.port ?? globalThis.process?.env.PORT ?? 3e3;
+	const port = typeof _port === "number" ? _port : Number.parseInt(_port, 10);
+	const hostname = opts.hostname ?? globalThis.process?.env.HOST;
+	return {
+		port,
+		hostname
+	};
+}
+function fmtURL(host, port, secure) {
+	if (!host || !port) return void 0;
+	if (host.includes(":")) host = `[${host}]`;
+	return `http${secure ? "s" : ""}://${host}:${port}/`;
+}
+function printListening(opts, url) {
+	if (!url || (opts.silent ?? globalThis.process?.env?.TEST)) return;
+	const _url = new URL(url);
+	const allInterfaces = _url.hostname === "[::]" || _url.hostname === "0.0.0.0";
+	if (allInterfaces) {
+		_url.hostname = "localhost";
+		url = _url.href;
+	}
+	let listeningOn = `➜ Listening on:`;
+	let additionalInfo = allInterfaces ? " (all interfaces)" : "";
+	if (globalThis.process.stdout?.isTTY) {
+		listeningOn = `\u001B[32m${listeningOn}\u001B[0m`;
+		url = `\u001B[36m${url}\u001B[0m`;
+		additionalInfo = `\u001B[2m${additionalInfo}\u001B[0m`;
+	}
+	console.log(`  ${listeningOn} ${url}${additionalInfo}`);
+}
+function resolveTLSOptions(opts) {
+	if (!opts.tls || opts.protocol === "http") return;
+	const cert = resolveCertOrKey(opts.tls.cert);
+	const key = resolveCertOrKey(opts.tls.key);
+	if (!cert && !key) {
+		if (opts.protocol === "https") throw new TypeError("TLS `cert` and `key` must be provided for `https` protocol.");
+		return;
+	}
+	if (!cert || !key) throw new TypeError("TLS `cert` and `key` must be provided together.");
+	return {
+		cert,
+		key,
+		passphrase: opts.tls.passphrase
+	};
+}
+function resolveCertOrKey(value) {
+	if (!value) return;
+	if (typeof value !== "string") throw new TypeError("TLS certificate and key must be strings in PEM format or file paths.");
+	if (value.startsWith("-----BEGIN ")) return value;
+	const { readFileSync } = process.getBuiltinModule("node:fs");
+	return readFileSync(value, "utf8");
+}
+function createWaitUntil() {
+	const promises = new Set();
+	return {
+		waitUntil: (promise) => {
+			promises.add(promise.catch(console.error).finally(() => {
+				promises.delete(promise);
+			}));
+		},
+		wait: () => {
+			return Promise.all(promises);
+		}
+	};
+}
+
+//#endregion
+export { createWaitUntil, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions };

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

@@ -231,6 +231,10 @@ interface ServerRequest extends Request {
   * IP address of the client.
   */
   ip?: string | undefined;
+  /**
+  * Tell the runtime about an ongoing operation that shouldn't close until the promise resolves.
+  */
+  waitUntil?: (promise: Promise<unknown>) => void | Promise<void>;
 }
 // ----------------------------------------------------------------------------
 // Different handler types

package/dist/adapters/bun.d.mts

@@ -1,5 +1,5 @@
-import { BunFetchHandler, Server, ServerOptions } from "../_chunks/types-CAoaOHnD.mjs";
-import { FastURL$2 as FastURL } from "../_chunks/_url-0kFTYgtJ.mjs";
+import { BunFetchHandler, Server, ServerOptions } from "../_chunks/types-mRjDOdKf.mjs";
+import { FastURL$2 as FastURL } from "../_chunks/_url-CE8HuNzA.mjs";
 import * as bun from "bun";
 
 //#region src/adapters/bun.d.ts
@@ -7,6 +7,7 @@ declare const FastResponse: typeof globalThis.Response;
 declare function serve(options: ServerOptions): BunServer;
 // https://bun.sh/docs/api/http
 declare class BunServer implements Server<BunFetchHandler> {
+  #private;
   readonly runtime = "bun";
   readonly options: Server["options"];
   readonly bun: Server["bun"];

package/dist/adapters/bun.mjs

@@ -1,5 +1,6 @@
-import { FastURL$1 as FastURL, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "../_chunks/_url-Dsik4Hgl.mjs";
+import { createWaitUntil, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "../_chunks/_utils-ek-l5xdY.mjs";
 import { wrapFetch } from "../_chunks/_middleware-Bz7WmB2e.mjs";
+import { FastURL$1 as FastURL } from "../_chunks/_url-0eSmxIIk.mjs";
 
 //#region src/adapters/bun.ts
 const FastResponse = Response;
@@ -12,6 +13,7 @@ var BunServer = class {
 	bun = {};
 	serveOptions;
 	fetch;
+	#wait;
 	constructor(options) {
 		this.options = {
 			...options,
@@ -19,8 +21,10 @@ var BunServer = class {
 		};
 		for (const plugin of options.plugins || []) plugin(this);
 		const fetchHandler = wrapFetch(this);
+		this.#wait = createWaitUntil();
 		this.fetch = (request, server) => {
 			Object.defineProperties(request, {
+				waitUntil: { value: this.#wait.waitUntil },
 				runtime: {
 					enumerable: true,
 					value: {
@@ -68,8 +72,8 @@ var BunServer = class {
 	ready() {
 		return Promise.resolve(this);
 	}
-	close(closeAll) {
-		return Promise.resolve(this.bun?.server?.stop(closeAll));
+	async close(closeAll) {
+		await Promise.all([this.#wait.wait(), Promise.resolve(this.bun?.server?.stop(closeAll))]);
 	}
 };
 

package/dist/adapters/cloudflare.d.mts

@@ -1,4 +1,4 @@
-import { Server, ServerOptions } from "../_chunks/types-CAoaOHnD.mjs";
+import { Server, ServerOptions } from "../_chunks/types-mRjDOdKf.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-Bz7WmB2e.mjs";
-import { errorPlugin } from "../_chunks/_plugins-CDyQtZq-.mjs";
+import { errorPlugin } from "../_chunks/_plugins-ta8pkwXd.mjs";
 
 //#region src/adapters/cloudflare.ts
 const FastURL = URL;
@@ -21,16 +21,19 @@ var CloudflareServer = class {
 		errorPlugin(this);
 		const fetchHandler = wrapFetch(this);
 		this.fetch = (request, env, context) => {
-			Object.defineProperties(request, { runtime: {
-				enumerable: true,
-				value: {
-					name: "cloudflare",
-					cloudflare: {
-						env,
-						context
+			Object.defineProperties(request, {
+				waitUntil: { value: context.waitUntil.bind(context) },
+				runtime: {
+					enumerable: true,
+					value: {
+						name: "cloudflare",
+						cloudflare: {
+							env,
+							context
+						}
 					}
 				}
-			} });
+			});
 			return fetchHandler(request);
 		};
 		this.serveOptions = { fetch: this.fetch };

package/dist/adapters/deno.d.mts

@@ -1,5 +1,5 @@
-import { DenoFetchHandler, Server, ServerOptions } from "../_chunks/types-CAoaOHnD.mjs";
-import { FastURL$2 as FastURL } from "../_chunks/_url-0kFTYgtJ.mjs";
+import { DenoFetchHandler, Server, ServerOptions } from "../_chunks/types-mRjDOdKf.mjs";
+import { FastURL$2 as FastURL } from "../_chunks/_url-CE8HuNzA.mjs";
 
 //#region src/adapters/deno.d.ts
 declare const FastResponse: typeof globalThis.Response;
@@ -16,7 +16,7 @@ declare class DenoServer implements Server<DenoFetchHandler> {
   serve(): Promise<this>;
   get url(): string | undefined;
   ready(): Promise<Server>;
-  close(): Promise<void | undefined>;
+  close(): Promise<void>;
 }
 //#endregion
 export { FastResponse, FastURL, serve };

package/dist/adapters/deno.mjs

@@ -1,5 +1,6 @@
-import { FastURL$1 as FastURL, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "../_chunks/_url-Dsik4Hgl.mjs";
+import { createWaitUntil, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "../_chunks/_utils-ek-l5xdY.mjs";
 import { wrapFetch } from "../_chunks/_middleware-Bz7WmB2e.mjs";
+import { FastURL$1 as FastURL } from "../_chunks/_url-0eSmxIIk.mjs";
 
 //#region src/adapters/deno.ts
 const FastResponse = Response;
@@ -14,6 +15,7 @@ var DenoServer = class {
 	fetch;
 	#listeningPromise;
 	#listeningInfo;
+	#wait;
 	constructor(options) {
 		this.options = {
 			...options,
@@ -21,8 +23,10 @@ var DenoServer = class {
 		};
 		for (const plugin of options.plugins || []) plugin(this);
 		const fetchHandler = wrapFetch(this);
+		this.#wait = createWaitUntil();
 		this.fetch = (request, info) => {
 			Object.defineProperties(request, {
+				waitUntil: { value: this.#wait.waitUntil },
 				runtime: {
 					enumerable: true,
 					value: {
@@ -77,8 +81,8 @@ var DenoServer = class {
 	ready() {
 		return Promise.resolve(this.#listeningPromise).then(() => this);
 	}
-	close() {
-		return Promise.resolve(this.deno?.server?.shutdown());
+	async close() {
+		await Promise.all([this.#wait.wait(), Promise.resolve(this.deno?.server?.shutdown())]);
 	}
 };
 

package/dist/adapters/generic.d.mts

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

package/dist/adapters/generic.mjs

@@ -1,5 +1,6 @@
+import { createWaitUntil } from "../_chunks/_utils-ek-l5xdY.mjs";
 import { wrapFetch } from "../_chunks/_middleware-Bz7WmB2e.mjs";
-import { errorPlugin } from "../_chunks/_plugins-CDyQtZq-.mjs";
+import { errorPlugin } from "../_chunks/_plugins-ta8pkwXd.mjs";
 
 //#region src/adapters/generic.ts
 const FastURL = URL;
@@ -11,6 +12,7 @@ var GenericServer = class {
 	runtime = "generic";
 	options;
 	fetch;
+	#wait;
 	constructor(options) {
 		this.options = {
 			...options,
@@ -18,8 +20,10 @@ var GenericServer = class {
 		};
 		for (const plugin of options.plugins || []) plugin(this);
 		errorPlugin(this);
+		this.#wait = createWaitUntil();
 		const fetchHandler = wrapFetch(this);
 		this.fetch = (request) => {
+			Object.defineProperties(request, { waitUntil: { value: this.#wait.waitUntil } });
 			return Promise.resolve(fetchHandler(request));
 		};
 	}
@@ -27,8 +31,8 @@ var GenericServer = class {
 	ready() {
 		return Promise.resolve(this);
 	}
-	close() {
-		return Promise.resolve();
+	async close() {
+		await this.#wait.wait();
 	}
 };
 

package/dist/adapters/node.d.mts

@@ -1,5 +1,5 @@
-import { FetchHandler, NodeHttpHandler, NodeServerRequest, NodeServerResponse, Server, ServerOptions, ServerRequest } from "../_chunks/types-CAoaOHnD.mjs";
-import { FastURL$2 as FastURL } from "../_chunks/_url-0kFTYgtJ.mjs";
+import { FetchHandler, NodeHttpHandler, NodeServerRequest, NodeServerResponse, Server, ServerOptions, ServerRequest } from "../_chunks/types-mRjDOdKf.mjs";
+import { FastURL$2 as FastURL } from "../_chunks/_url-CE8HuNzA.mjs";
 import NodeHttp from "node:http";
 import { Readable } from "node:stream";
 

package/dist/adapters/node.mjs

@@ -1,6 +1,7 @@
-import { FastURL$1 as FastURL, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "../_chunks/_url-Dsik4Hgl.mjs";
+import { createWaitUntil, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "../_chunks/_utils-ek-l5xdY.mjs";
 import { wrapFetch } from "../_chunks/_middleware-Bz7WmB2e.mjs";
-import { errorPlugin } from "../_chunks/_plugins-CDyQtZq-.mjs";
+import { FastURL$1 as FastURL } from "../_chunks/_url-0eSmxIIk.mjs";
+import { errorPlugin } from "../_chunks/_plugins-ta8pkwXd.mjs";
 import { splitSetCookieString } from "cookie-es";
 
 //#region src/adapters/_node/send.ts
@@ -744,6 +745,7 @@ var NodeServer = class {
 	fetch;
 	#isSecure;
 	#listeningPromise;
+	#wait;
 	constructor(options) {
 		this.options = {
 			...options,
@@ -752,11 +754,13 @@ var NodeServer = class {
 		for (const plugin of options.plugins || []) plugin(this);
 		errorPlugin(this);
 		const fetchHandler = this.fetch = wrapFetch(this);
+		this.#wait = createWaitUntil();
 		const handler = (nodeReq, nodeRes) => {
 			const request = new NodeRequest({
 				req: nodeReq,
 				res: nodeRes
 			});
+			request.waitUntil = this.#wait.waitUntil;
 			const res = fetchHandler(request);
 			return res instanceof Promise ? res.then((resolvedRes) => sendNodeResponse(nodeRes, resolvedRes)) : sendNodeResponse(nodeRes, res);
 		};
@@ -813,13 +817,13 @@ var NodeServer = class {
 	ready() {
 		return Promise.resolve(this.#listeningPromise).then(() => this);
 	}
-	close(closeAll) {
-		return new Promise((resolve, reject) => {
+	async close(closeAll) {
+		await Promise.all([this.#wait.wait(), new Promise((resolve, reject) => {
 			const server = this.node?.server;
 			if (!server) return resolve();
 			if (closeAll && "closeAllConnections" in server) server.closeAllConnections();
 			server.close((error) => error ? reject(error) : resolve());
-		});
+		})]);
 	}
 };
 

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

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

package/dist/adapters/service-worker.mjs

@@ -1,11 +1,11 @@
 import { wrapFetch } from "../_chunks/_middleware-Bz7WmB2e.mjs";
-import { errorPlugin } from "../_chunks/_plugins-CDyQtZq-.mjs";
+import { errorPlugin } from "../_chunks/_plugins-ta8pkwXd.mjs";
 
 //#region src/adapters/service-worker.ts
 const FastURL = URL;
 const FastResponse = Response;
 const isBrowserWindow = typeof window !== "undefined" && typeof navigator !== "undefined";
-const isServiceWorker = typeof self !== "undefined" && "skipWaiting" in self;
+const isServiceWorker = /* @__PURE__ */ (() => typeof self !== "undefined" && "skipWaiting" in self)();
 function serve(options) {
 	return new ServiceWorkerServer(options);
 }
@@ -52,6 +52,7 @@ var ServiceWorkerServer = class {
 		} else if (isServiceWorker) {
 			this.#fetchListener = async (event) => {
 				if (/\/[^/]*\.[a-zA-Z0-9]+$/.test(new URL(event.request.url).pathname)) return;
+				Object.defineProperty(event.request, "waitUntil", { value: event.waitUntil.bind(event) });
 				const response = await this.fetch(event.request, event);
 				if (response.status !== 404) event.respondWith(response);
 			};

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-CAoaOHnD.mjs";
+import { BunFetchHandler, CloudflareFetchHandler, DenoFetchHandler, ErrorHandler, FastResponse, FastURL, FetchHandler, NodeHttpHandler, NodeServerRequest, NodeServerResponse, Server, ServerHandler, ServerMiddleware, ServerOptions, ServerPlugin, ServerRequest, ServerRuntimeContext, serve } from "./_chunks/types-mRjDOdKf.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.3",
+  "version": "0.7.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",