srvx 0.11.3 → 0.11.5

package/dist/adapters/bun.d.mts

@@ -10,8 +10,9 @@ 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;
+  readonly waitUntil?: Server["waitUntil"];
   constructor(options: ServerOptions);
   serve(): Promise<this>;
   get url(): string | undefined;

package/dist/adapters/bun.mjs

@@ -11,6 +11,7 @@ var BunServer = class {
 	bun = {};
 	serveOptions;
 	fetch;
+	waitUntil;
 	#wait;
 	constructor(options) {
 		this.options = {
@@ -20,10 +21,17 @@ 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.waitUntil = this.#wait.waitUntil;
 		this.fetch = (request, server) => {
 			Object.defineProperties(request, {
-				waitUntil: { value: this.#wait.waitUntil },
+				waitUntil: { value: this.#wait?.waitUntil },
 				runtime: {
 					enumerable: true,
 					value: {
@@ -72,7 +80,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/bunny.d.mts

@@ -0,0 +1,8 @@
+import { Server, ServerOptions } from "../types.mjs";
+
+//#region src/adapters/bunny.d.ts
+declare const FastURL: typeof globalThis.URL;
+declare const FastResponse: typeof globalThis.Response;
+declare function serve(options: ServerOptions): Server;
+//#endregion
+export { FastResponse, FastURL, serve };

package/dist/adapters/bunny.mjs

@@ -0,0 +1,55 @@
+import { t as createWaitUntil } from "../_chunks/_utils2.mjs";
+import { r as wrapFetch, t as errorPlugin } from "../_chunks/_plugins.mjs";
+const FastURL = URL;
+const FastResponse = Response;
+function serve(options) {
+	return new BunnyServer(options);
+}
+var BunnyServer = class {
+	runtime = "bunny";
+	options;
+	fetch;
+	_started = false;
+	#wait;
+	constructor(options) {
+		this.options = {
+			...options,
+			middleware: [...options.middleware || []]
+		};
+		for (const plugin of options.plugins || []) plugin(this);
+		errorPlugin(this);
+		const fetchHandler = wrapFetch(this);
+		this.#wait = createWaitUntil();
+		this.fetch = (request) => {
+			Object.defineProperties(request, {
+				waitUntil: { value: this.#wait?.waitUntil },
+				runtime: {
+					enumerable: true,
+					value: { name: "bunny" }
+				},
+				ip: {
+					enumerable: true,
+					get() {
+						return request.headers.get("x-real-ip");
+					}
+				}
+			});
+			return fetchHandler(request);
+		};
+		if (!options.manual) this.serve();
+	}
+	serve() {
+		if (typeof Bunny !== "undefined" && Bunny.v1?.serve) {
+			if (this._started) return;
+			this._started = true;
+			Bunny.v1.serve(this.fetch);
+		} else throw new Error("[srvx] Bunny runtime not detected.");
+	}
+	ready() {
+		return Promise.resolve(this);
+	}
+	async close() {
+		await this.#wait?.wait();
+	}
+};
+export { FastResponse, FastURL, serve };

package/dist/adapters/deno.d.mts

@@ -9,8 +9,9 @@ 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;
+  readonly waitUntil?: Server["waitUntil"];
   constructor(options: ServerOptions);
   serve(): Promise<this>;
   get url(): string | undefined;

package/dist/adapters/deno.mjs

@@ -11,6 +11,7 @@ var DenoServer = class {
 	deno = {};
 	serveOptions;
 	fetch;
+	waitUntil;
 	#listeningPromise;
 	#listeningInfo;
 	#wait;
@@ -22,10 +23,17 @@ 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.waitUntil = this.#wait.waitUntil;
 		this.fetch = (request, info) => {
 			Object.defineProperties(request, {
-				waitUntil: { value: this.#wait.waitUntil },
+				waitUntil: { value: this.#wait?.waitUntil },
 				runtime: {
 					enumerable: true,
 					value: {
@@ -81,7 +89,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/generic.mjs

@@ -9,6 +9,7 @@ var GenericServer = class {
 	runtime = "generic";
 	options;
 	fetch;
+	waitUntil;
 	#wait;
 	constructor(options) {
 		this.options = {
@@ -18,6 +19,7 @@ var GenericServer = class {
 		for (const plugin of options.plugins || []) plugin(this);
 		errorPlugin(this);
 		this.#wait = createWaitUntil();
+		this.waitUntil = this.#wait.waitUntil;
 		const fetchHandler = wrapFetch(this);
 		this.fetch = (request) => {
 			Object.defineProperties(request, { waitUntil: { value: this.#wait.waitUntil } });

package/dist/adapters/node.mjs

@@ -660,6 +660,7 @@ var NodeServer = class {
 	node;
 	serveOptions;
 	fetch;
+	waitUntil;
 	#isSecure;
 	#listeningPromise;
 	#wait;
@@ -670,15 +671,21 @@ 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();
+		this.waitUntil = this.#wait.waitUntil;
 		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);
 		};
@@ -728,7 +735,7 @@ 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();

package/dist/cli.mjs

@@ -174,7 +174,7 @@ function getResponseFormat(res) {
 }
 const srvxMeta = {
 	name: "srvx",
-	version: "0.11.3",
+	version: "0.11.5",
 	description: "Universal Server."
 };
 function usage(mainOpts) {

package/dist/loader.mjs

@@ -34,12 +34,14 @@ async function loadServerEntry(opts) {
 	}
 	const url = entry.startsWith("file://") ? entry : pathToFileURL(resolve(entry)).href;
 	let mod;
-	let listenHandler;
+	let interceptedNodeHandler;
+	let interceptedFetchHandler;
 	try {
 		if (opts.interceptHttpListen !== false) {
 			const loaded = await interceptListen(() => import(url));
 			mod = loaded.res;
-			listenHandler = loaded.listenHandler;
+			interceptedNodeHandler = loaded.listenHandler;
+			interceptedFetchHandler = loaded.fetchHandler;
 		} else mod = await import(url);
 	} catch (error) {
 		if (error?.code === "ERR_UNKNOWN_FILE_EXTENSION") {
@@ -50,11 +52,11 @@ async function loadServerEntry(opts) {
 		throw error;
 	}
 	mod = await opts?.onLoad?.(mod) || mod;
-	let fetchHandler = mod?.fetch || mod?.default?.fetch || mod?.default?.default?.fetch;
+	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 = listenHandler || (typeof mod?.default === "function" ? mod.default : void 0);
+		const nodeHandler = interceptedNodeHandler || (typeof mod?.default === "function" ? mod.default : void 0);
 		if (nodeHandler) {
 			nodeCompat = true;
 			const { fetchNodeHandler } = await import("srvx/node");
@@ -74,6 +76,10 @@ async function interceptListen(cb) {
 		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;
@@ -96,10 +102,12 @@ async function interceptListen(cb) {
 			res = await cb();
 		} finally {
 			nodeHTTP$1.Server.prototype.listen = originalListen;
+			delete globalThis.__srvxLoader__;
 		}
 		return {
 			res,
-			listenHandler
+			listenHandler,
+			fetchHandler
 		};
 	});
 	_interceptQueue = result.catch(() => {});

package/dist/types.d.mts

@@ -154,7 +154,7 @@ interface Server<Handler = ServerHandler> {
   /**
   * Current runtime name
   */
-  readonly runtime: "node" | "deno" | "bun" | "cloudflare" | "service-worker" | "aws-lambda" | "generic";
+  readonly runtime: "node" | "deno" | "bun" | "bunny" | "cloudflare" | "service-worker" | "aws-lambda" | "generic";
   /**
   * Server options
   */
@@ -198,6 +198,12 @@ interface Server<Handler = ServerHandler> {
   */
   ready(): Promise<Server<Handler>>;
   /**
+  * Register a background task that the server should await before closing.
+  *
+  * Same as `request.waitUntil` but available at the server level for use outside of request handlers.
+  */
+  readonly waitUntil?: (promise: Promise<unknown>) => void;
+  /**
   * Stop listening to prevent new connections from being accepted.
   *
   * By default, it does not cancel in-flight requests or websockets. That means it may take some time before all network activity stops.
@@ -208,7 +214,7 @@ interface Server<Handler = ServerHandler> {
   close(closeActiveConnections?: boolean): Promise<void>;
 }
 interface ServerRuntimeContext {
-  name: "node" | "deno" | "bun" | "cloudflare" | "aws-lambda" | (string & {});
+  name: "node" | "deno" | "bun" | "bunny" | "cloudflare" | "aws-lambda" | (string & {});
   /**
   * Underlying Node.js server request info.
   */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "srvx",
-  "version": "0.11.3",
+  "version": "0.11.5",
   "description": "Universal Server.",
   "homepage": "https://srvx.h3.dev",
   "license": "MIT",
@@ -20,6 +20,7 @@
     "./bun": "./dist/adapters/bun.mjs",
     "./node": "./dist/adapters/node.mjs",
     "./cloudflare": "./dist/adapters/cloudflare.mjs",
+    "./bunny": "./dist/adapters/bunny.mjs",
     "./generic": "./dist/adapters/generic.mjs",
     "./service-worker": "./dist/adapters/service-worker.mjs",
     "./aws-lambda": "./dist/adapters/aws-lambda.mjs",
@@ -58,18 +59,18 @@
     "vitest": "vitest"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20260210.0",
+    "@cloudflare/workers-types": "^4.20260217.0",
     "@hono/node-server": "^1.19.9",
     "@mitata/counters": "^0.0.8",
     "@mjackson/node-fetch-server": "^0.7.0",
     "@types/aws-lambda": "^8.10.160",
-    "@types/bun": "^1.3.8",
+    "@types/bun": "^1.3.9",
     "@types/deno": "^2.5.0",
     "@types/express": "^5.0.6",
     "@types/node": "^25.2.3",
     "@types/node-forge": "^1.3.14",
-    "@types/serviceworker": "^0.0.186",
-    "@typescript/native-preview": "^7.0.0-dev.20260210.1",
+    "@types/serviceworker": "^0.0.191",
+    "@typescript/native-preview": "^7.0.0-dev.20260217.1",
     "@vitest/coverage-v8": "^4.0.18",
     "@whatwg-node/server": "^0.10.18",
     "automd": "^0.4.3",
@@ -83,12 +84,12 @@
     "mitata": "^1.0.34",
     "node-forge": "^1.3.3",
     "obuild": "^0.4.27",
-    "oxfmt": "^0.28.0",
-    "oxlint": "^1.43.0",
-    "srvx-release": "npm:srvx@^0.10.1",
+    "oxfmt": "^0.33.0",
+    "oxlint": "^1.48.0",
+    "srvx-release": "npm:srvx@^0.11.4",
     "tslib": "^2.8.1",
     "typescript": "^5.9.3",
-    "undici": "^7.21.0",
+    "undici": "^7.22.0",
     "vitest": "^4.0.18"
   },
   "resolutions": {
@@ -97,5 +98,5 @@
   "engines": {
     "node": ">=20.16.0"
   },
-  "packageManager": "pnpm@10.29.2"
+  "packageManager": "pnpm@10.29.3"
 }