srvx 0.11.6 → 0.11.7

package/dist/adapters/bun.mjs

@@ -24,7 +24,7 @@ var BunServer = class {
 		const loader = globalThis.__srvxLoader__;
 		if (loader) {
 			this.fetch = fetchHandler;
-			loader(fetchHandler);
+			loader({ server: this });
 			return;
 		}
 		this.#wait = createWaitUntil();

package/dist/adapters/deno.mjs

@@ -26,7 +26,7 @@ var DenoServer = class {
 		const loader = globalThis.__srvxLoader__;
 		if (loader) {
 			this.fetch = fetchHandler;
-			loader(fetchHandler);
+			loader({ server: this });
 			return;
 		}
 		this.#wait = createWaitUntil();

package/dist/adapters/node.mjs

@@ -672,14 +672,6 @@ var NodeServer = class {
 		for (const plugin of options.plugins || []) plugin(this);
 		errorPlugin(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,
@@ -689,6 +681,18 @@ var NodeServer = class {
 			const res = fetchHandler(request);
 			return res instanceof Promise ? res.then((resolvedRes) => sendNodeResponse(nodeRes, resolvedRes)) : sendNodeResponse(nodeRes, res);
 		};
+		this.node = {
+			handler,
+			server: void 0
+		};
+		const loader = globalThis.__srvxLoader__;
+		if (loader) {
+			loader({ server: this });
+			return;
+		}
+		gracefulShutdownPlugin(this);
+		this.#wait = createWaitUntil();
+		this.waitUntil = this.#wait.waitUntil;
 		const tls = resolveTLSOptions(this.options);
 		const { port, hostname: host } = resolvePortAndHost(this.options);
 		this.serveOptions = {
@@ -711,10 +715,7 @@ var NodeServer = class {
 		else throw new Error("node.http2 option requires tls certificate!");
 		else if (this.#isSecure) server = nodeHTTPS.createServer(this.serveOptions, handler);
 		else server = nodeHTTP.createServer(this.serveOptions, handler);
-		this.node = {
-			server,
-			handler
-		};
+		this.node.server = server;
 		if (!options.manual) this.serve();
 	}
 	serve() {

package/dist/cli.d.mts

@@ -1,10 +1,6 @@
 import { LoadOptions } from "./loader.mjs";
-import { Server } from "srvx";
 
 //#region src/cli/types.d.ts
-declare global {
-  var __srvx__: Server | undefined;
-}
 type MainOptions = CLIOptions & {
   args?: string[];
   meta?: {

package/dist/cli.mjs

@@ -10,9 +10,13 @@ const NO_ENTRY_ERROR = "No server entry or public directory found";
 async function cliServe(cliOpts) {
 	try {
 		if (!process.env.NODE_ENV) process.env.NODE_ENV = cliOpts.prod ? "production" : "development";
+		let server;
 		const loaded = await loadServerEntry({
 			entry: cliOpts.entry,
-			dir: cliOpts.dir
+			dir: cliOpts.dir,
+			get srvxServer() {
+				return server;
+			}
 		});
 		const { serve: srvxServe } = loaded.nodeCompat ? await import("srvx/node") : await import("srvx");
 		const { serveStatic } = await import("srvx/static");
@@ -29,7 +33,7 @@ async function cliServe(cliOpts) {
 			...loaded.module
 		};
 		printInfo(cliOpts, loaded);
-		await (globalThis.__srvx__ = srvxServe({
+		server = srvxServe({
 			...serverOptions,
 			gracefulShutdown: !!cliOpts.prod,
 			port: cliOpts.port ?? serverOptions.port,
@@ -48,7 +52,8 @@ async function cliServe(cliOpts) {
 				cliOpts.static ? serveStatic({ dir: cliOpts.static }) : void 0,
 				...serverOptions.middleware || []
 			].filter(Boolean)
-		})).ready();
+		});
+		await server.ready();
 	} catch (error) {
 		console.error(error);
 		process.exit(1);
@@ -174,7 +179,7 @@ function getResponseFormat(res) {
 }
 const srvxMeta = {
 	name: "srvx",
-	version: "0.11.6",
+	version: "0.11.7",
 	description: "Universal Server."
 };
 function usage(mainOpts) {

package/dist/loader.d.mts

@@ -1,4 +1,4 @@
-import { ServerHandler } from "srvx";
+import { Server, ServerHandler } from "srvx";
 
 //#region src/loader.d.ts
 declare const defaultExts: string[];
@@ -30,6 +30,14 @@ type LoadOptions = {
   */
   nodeCompat?: boolean;
   /**
+  * Node.js server instance to return when intercepting `http.Server.listen`.
+  */
+  nodeServer?: NodeServer;
+  /**
+  * srvx server instance to return when intercepting `http.Server.listen`.
+  */
+  srvxServer?: Server;
+  /**
   * Hook called after the module is loaded to allow for custom processing.
   *
   * You can return a modified version of the module if needed.
@@ -68,7 +76,12 @@ type LoadedServerEntry = {
   * When `true`, no valid entry point could be located.
   */
   notFound?: boolean;
+  /**
+  * The original srvx server instance if the module used the loader API to export a server directly.
+  */
+  srvxServer?: Server;
 };
 declare function loadServerEntry(opts: LoadOptions): Promise<LoadedServerEntry>;
+type NodeServer = NonNullable<Server["node"]>["server"];
 //#endregion
 export { LoadOptions, LoadedServerEntry, defaultEntries, defaultExts, loadServerEntry };

package/dist/loader.mjs

@@ -2,6 +2,7 @@ import { pathToFileURL } from "node:url";
 import { existsSync } from "node:fs";
 import { resolve } from "node:path";
 import * as nodeHTTP$1 from "node:http";
+import { EventEmitter } from "node:events";
 const defaultExts = [
 	".mjs",
 	".js",
@@ -35,13 +36,13 @@ async function loadServerEntry(opts) {
 	const url = entry.startsWith("file://") ? entry : pathToFileURL(resolve(entry)).href;
 	let mod;
 	let interceptedNodeHandler;
-	let interceptedFetchHandler;
+	let interceptedServer;
 	try {
 		if (opts.interceptHttpListen !== false) {
-			const loaded = await interceptListen(() => import(url));
+			const loaded = await interceptListen(() => import(url), opts);
 			mod = loaded.res;
 			interceptedNodeHandler = loaded.listenHandler;
-			interceptedFetchHandler = loaded.fetchHandler;
+			interceptedServer = loaded.server;
 		} else mod = await import(url);
 	} catch (error) {
 		if (error?.code === "ERR_UNKNOWN_FILE_EXTENSION") {
@@ -52,7 +53,7 @@ async function loadServerEntry(opts) {
 		throw error;
 	}
 	mod = await opts?.onLoad?.(mod) || mod;
-	let fetchHandler = mod?.fetch || mod?.default?.fetch || mod?.default?.default?.fetch || interceptedFetchHandler;
+	let fetchHandler = mod?.fetch || mod?.default?.fetch || mod?.default?.default?.fetch || interceptedServer?.fetch;
 	if (!fetchHandler && typeof mod?.default === "function" && mod.default.length < 2) fetchHandler = mod.default;
 	let nodeCompat = false;
 	if (!fetchHandler && opts.nodeCompat !== false) {
@@ -67,18 +68,21 @@ async function loadServerEntry(opts) {
 		module: mod,
 		nodeCompat,
 		url,
-		fetch: fetchHandler
+		fetch: fetchHandler,
+		srvxServer: interceptedServer
 	};
 }
 let _interceptQueue = Promise.resolve();
-async function interceptListen(cb) {
+async function interceptListen(cb, opts = {}) {
 	const result = _interceptQueue.then(async () => {
 		const originalListen = nodeHTTP$1.Server.prototype.listen;
 		let res;
 		let listenHandler;
-		let fetchHandler;
-		globalThis.__srvxLoader__ = (handler) => {
-			fetchHandler = handler;
+		let server;
+		const nodeServerStub = opts.nodeServer || opts.srvxServer?.node?.server || new StubNodeServer(() => opts.srvxServer?.node?.server);
+		globalThis.__srvxLoader__ = (obj) => {
+			server = obj.server;
+			if (server && server.node) server.node.server ||= nodeServerStub;
 		};
 		try {
 			nodeHTTP$1.Server.prototype.listen = function(arg1, arg2) {
@@ -89,15 +93,7 @@ async function interceptListen(cb) {
 				setImmediate(() => {
 					listenCallback?.();
 				});
-				return new Proxy({}, { get(_, prop) {
-					const server = globalThis.__srvx__;
-					if (!server && prop === "address") return () => ({
-						address: "",
-						family: "",
-						port: 0
-					});
-					return server?.node?.server?.[prop];
-				} });
+				return nodeServerStub;
 			};
 			res = await cb();
 		} finally {
@@ -107,10 +103,36 @@ async function interceptListen(cb) {
 		return {
 			res,
 			listenHandler,
-			fetchHandler
+			server
 		};
 	});
 	_interceptQueue = result.catch(() => {});
 	return result;
 }
+var StubNodeServer = class extends EventEmitter {
+	constructor(getServer) {
+		super();
+		return new Proxy(this, { get(target, prop, receiver) {
+			const server = getServer();
+			if (!server) return Reflect.get(target, prop, receiver);
+			const value = server[prop];
+			if (typeof value === "function") return value.bind(server);
+			return value;
+		} });
+	}
+	address() {
+		return {
+			address: "",
+			family: "",
+			port: 0
+		};
+	}
+	listen() {
+		return this;
+	}
+	close(callback) {
+		callback?.();
+		return this;
+	}
+};
 export { defaultEntries, defaultExts, loadServerEntry };

package/package.json

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