srvx 0.11.3 → 0.11.4

package/dist/adapters/bun.d.mts

@@ -10,7 +10,7 @@ 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;
   constructor(options: ServerOptions);
   serve(): Promise<this>;

package/dist/adapters/bun.mjs

@@ -20,10 +20,16 @@ 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.fetch = (request, server) => {
 			Object.defineProperties(request, {
-				waitUntil: { value: this.#wait.waitUntil },
+				waitUntil: { value: this.#wait?.waitUntil },
 				runtime: {
 					enumerable: true,
 					value: {
@@ -72,7 +78,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/deno.d.mts

@@ -9,7 +9,7 @@ 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;
   constructor(options: ServerOptions);
   serve(): Promise<this>;

package/dist/adapters/deno.mjs

@@ -22,10 +22,16 @@ 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.fetch = (request, info) => {
 			Object.defineProperties(request, {
-				waitUntil: { value: this.#wait.waitUntil },
+				waitUntil: { value: this.#wait?.waitUntil },
 				runtime: {
 					enumerable: true,
 					value: {
@@ -81,7 +87,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/node.mjs

@@ -670,15 +670,20 @@ 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();
 		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 +733,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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "srvx",
-  "version": "0.11.3",
+  "version": "0.11.4",
   "description": "Universal Server.",
   "homepage": "https://srvx.h3.dev",
   "license": "MIT",