@moostjs/vite 0.6.37 → 0.6.39

package/dist/index.cjs

@@ -340,7 +340,7 @@ function _define_property(obj, key, value) {
 /**
 * Clean up Moost’s global containers and optionally remove specific instances from the registry.
 *
-* Every instance actually removed from a registry is **disposed** before the
+* Every instance actually removed from the registry is **disposed** before the
 * caches are dropped: its `@MoostDispose` hooks (or `Symbol.asyncDispose` /
 * `Symbol.dispose`) are awaited, so a singleton owning a connection, consumer,
 * timer or file handle releases it instead of leaking one copy per reload. An
@@ -349,46 +349,25 @@ function _define_property(obj, key, value) {
 *
 * @param {Set<string>} [cleanupInstances] A set of module IDs to remove from the registry.
 * @returns the instances that were ejected (and therefore disposed)
-*/ async function moostRestartCleanup(adapters, onEject, cleanupInstances) {
+*/ async function moostRestartCleanup(onEject, cleanupInstances) {
 	const logger = getLogger();
 	const infact = (0, moost.getMoostInfact)();
-	const { registry, scopes } = infact;
-	const registries = [registry, ...Object.values(scopes)];
+	const { registry } = infact;
 	infact._cleanup();
 	const mate = (0, moost.getMoostMate)();
-	/** Instances removed from a registry by this run — disposed below, before the caches drop. */ const ejected = [];
+	/** Instances removed from the registry by this run — disposed below, before the caches drop. */ const ejected = [];
 	if (cleanupInstances) {
-		for (const reg of registries) {
-			for (const key of Object.getOwnPropertySymbols(reg)) {
-				const instance = reg[key];
-				const viteId = mate.read(instance)?.__vite_id;
-				if (viteId && cleanupInstances.has(viteId)) {
-					logger.debug(`🔃 Replacing "${constructorName(instance)}"`);
-					delete reg[key];
-					ejected.push(instance);
-				}
-			}
-			for (const key of Object.getOwnPropertySymbols(reg)) {
-				const instance = reg[key];
-				scanParams(instance, (type) => {
-					if ((type === moost.Moost || type instanceof moost.Moost || type.prototype instanceof moost.Moost) && (!onEject || onEject(instance, type))) {
-						delete reg[key];
-						ejected.push(instance);
-						logger.debug(`✖️  Ejecting "${constructorName(instance)}" (depends on re-instantiated "Moost")`);
-						return true;
-					}
-					for (const adapter of adapters) if (adapter.compare(type) && (!onEject || onEject(instance, type))) {
-						delete reg[key];
-						ejected.push(instance);
-						logger.debug(`✖️  Ejecting "${constructorName(instance)}" (depends on re-instantiated "${adapter.constructor.name}")`);
-						return true;
-					}
-				});
+		for (const key of Object.getOwnPropertySymbols(registry)) {
+			const instance = registry[key];
+			const viteId = mate.read(instance)?.__vite_id;
+			if (viteId && cleanupInstances.has(viteId)) {
+				logger.debug(`🔃 Replacing "${constructorName(instance)}"`);
+				delete registry[key];
+				ejected.push(instance);
 			}
-			clearDependantRegistry(reg, onEject, ejected);
 		}
+		clearDependantRegistry(registry, onEject, ejected);
 		infact.registry = registry;
-		infact.scopes = scopes;
 	}
 	await disposeEjected(ejected);
 	(0, moost.getMoostMate)()._cleanup();
@@ -405,19 +384,21 @@ function _define_property(obj, key, value) {
 	for (const instance of disposed) logger.debug(`♻️  Disposed "${constructorName(instance)}"`);
 	for (const e of errors) logger.warn(`⚠️  Dispose hook "${constructorName(e.instance)}.${String(e.method)}" failed — the reload continues`);
 }
-function clearDependantRegistry(registry, onEject, ejected) {
+/**
+* Ejects, to a fixed point, every instance whose constructor dependency is not
+* in the registry: an instance ejected in one pass ejects its consumers in the
+* next (Moost → Database → Repository → Worker loses the whole chain). An
+* `onEject` veto keeps the instance present, and with it its consumers.
+*/ function clearDependantRegistry(registry, onEject, ejected) {
 	const logger = getLogger();
-	const objSet = /* @__PURE__ */ new Set();
 	let somethingIsDeleted = true;
 	while (somethingIsDeleted) {
 		somethingIsDeleted = false;
-		for (const key of Object.getOwnPropertySymbols(registry)) {
-			const instance = registry[key];
-			objSet.add(Object.getPrototypeOf(instance).constructor);
-		}
-		for (const key of Object.getOwnPropertySymbols(registry)) {
+		const keys = Object.getOwnPropertySymbols(registry);
+		const present = new Set(keys.map((key) => registry[key].constructor));
+		for (const key of keys) {
 			const instance = registry[key];
-			if (checkAndEject(instance, objSet, onEject, registry, key, logger)) {
+			if (checkAndEject(instance, present, onEject, registry, key, logger)) {
 				ejected.push(instance);
 				somethingIsDeleted = true;
 			}
@@ -429,7 +410,7 @@ function checkAndEject(instance, objSet, onEject, registry, key, logger) {
 	scanParams(instance, (type) => {
 		if (!objSet.has(type) && (!onEject || onEject(instance, type))) {
 			delete registry[key];
-			logger.debug(`✖️  Ejecting "${constructorName(instance)}" (depends on "${type.name}" which is not in registry)`);
+			logger.debug(`✖️  Ejecting "${constructorName(instance)}" (depends on "${type.name}", rebuilt by this reload)`);
 			ejected = true;
 			return true;
 		}
@@ -909,7 +890,6 @@ function moostVite(options) {
 				ssrEntry: options.ssrEntry,
 				serverEntry: options.serverEntry,
 				prefix: prefixes,
-				port: options.port,
 				ssrOutlet: options.ssrOutlet,
 				ssrState: options.ssrState,
 				ssrHead: options.ssrHead,
@@ -977,7 +957,7 @@ function moostVite(options) {
 						beginBoot();
 						const cleanupInstances = pendingCleanup ?? void 0;
 						pendingCleanup = null;
-						await moostRestartCleanup(adapters, options.onEject, cleanupInstances);
+						await moostRestartCleanup(options.onEject, cleanupInstances);
 						for (const adapter of adapters) if (adapter.detected) await adapter.init();
 						const entryModule = await getEntryModule(server.environments.ssr.moduleGraph);
 						if (entryModule?.transformResult) server.environments.ssr.moduleGraph.invalidateModule(entryModule);
@@ -999,7 +979,7 @@ function moostVite(options) {
 				}
 			};
 			for (const adapter of adapters) adapter.ssrLoadModule = ssrImport;
-			await moostRestartCleanup(adapters, options.onEject);
+			await moostRestartCleanup(options.onEject);
 			await ssrImport(options.entry);
 			await settleBootInit();
 			server.middlewares.use(async (req, res, next) => {

package/dist/index.mjs

@@ -311,7 +311,7 @@ function _define_property(obj, key, value) {
 /**
 * Clean up Moost’s global containers and optionally remove specific instances from the registry.
 *
-* Every instance actually removed from a registry is **disposed** before the
+* Every instance actually removed from the registry is **disposed** before the
 * caches are dropped: its `@MoostDispose` hooks (or `Symbol.asyncDispose` /
 * `Symbol.dispose`) are awaited, so a singleton owning a connection, consumer,
 * timer or file handle releases it instead of leaking one copy per reload. An
@@ -320,46 +320,25 @@ function _define_property(obj, key, value) {
 *
 * @param {Set<string>} [cleanupInstances] A set of module IDs to remove from the registry.
 * @returns the instances that were ejected (and therefore disposed)
-*/ async function moostRestartCleanup(adapters, onEject, cleanupInstances) {
+*/ async function moostRestartCleanup(onEject, cleanupInstances) {
 	const logger = getLogger();
 	const infact = getMoostInfact();
-	const { registry, scopes } = infact;
-	const registries = [registry, ...Object.values(scopes)];
+	const { registry } = infact;
 	infact._cleanup();
 	const mate = getMoostMate();
-	/** Instances removed from a registry by this run — disposed below, before the caches drop. */ const ejected = [];
+	/** Instances removed from the registry by this run — disposed below, before the caches drop. */ const ejected = [];
 	if (cleanupInstances) {
-		for (const reg of registries) {
-			for (const key of Object.getOwnPropertySymbols(reg)) {
-				const instance = reg[key];
-				const viteId = mate.read(instance)?.__vite_id;
-				if (viteId && cleanupInstances.has(viteId)) {
-					logger.debug(`🔃 Replacing "${constructorName(instance)}"`);
-					delete reg[key];
-					ejected.push(instance);
-				}
-			}
-			for (const key of Object.getOwnPropertySymbols(reg)) {
-				const instance = reg[key];
-				scanParams(instance, (type) => {
-					if ((type === Moost || type instanceof Moost || type.prototype instanceof Moost) && (!onEject || onEject(instance, type))) {
-						delete reg[key];
-						ejected.push(instance);
-						logger.debug(`✖️  Ejecting "${constructorName(instance)}" (depends on re-instantiated "Moost")`);
-						return true;
-					}
-					for (const adapter of adapters) if (adapter.compare(type) && (!onEject || onEject(instance, type))) {
-						delete reg[key];
-						ejected.push(instance);
-						logger.debug(`✖️  Ejecting "${constructorName(instance)}" (depends on re-instantiated "${adapter.constructor.name}")`);
-						return true;
-					}
-				});
+		for (const key of Object.getOwnPropertySymbols(registry)) {
+			const instance = registry[key];
+			const viteId = mate.read(instance)?.__vite_id;
+			if (viteId && cleanupInstances.has(viteId)) {
+				logger.debug(`🔃 Replacing "${constructorName(instance)}"`);
+				delete registry[key];
+				ejected.push(instance);
 			}
-			clearDependantRegistry(reg, onEject, ejected);
 		}
+		clearDependantRegistry(registry, onEject, ejected);
 		infact.registry = registry;
-		infact.scopes = scopes;
 	}
 	await disposeEjected(ejected);
 	getMoostMate()._cleanup();
@@ -376,19 +355,21 @@ function _define_property(obj, key, value) {
 	for (const instance of disposed) logger.debug(`♻️  Disposed "${constructorName(instance)}"`);
 	for (const e of errors) logger.warn(`⚠️  Dispose hook "${constructorName(e.instance)}.${String(e.method)}" failed — the reload continues`);
 }
-function clearDependantRegistry(registry, onEject, ejected) {
+/**
+* Ejects, to a fixed point, every instance whose constructor dependency is not
+* in the registry: an instance ejected in one pass ejects its consumers in the
+* next (Moost → Database → Repository → Worker loses the whole chain). An
+* `onEject` veto keeps the instance present, and with it its consumers.
+*/ function clearDependantRegistry(registry, onEject, ejected) {
 	const logger = getLogger();
-	const objSet = /* @__PURE__ */ new Set();
 	let somethingIsDeleted = true;
 	while (somethingIsDeleted) {
 		somethingIsDeleted = false;
-		for (const key of Object.getOwnPropertySymbols(registry)) {
-			const instance = registry[key];
-			objSet.add(Object.getPrototypeOf(instance).constructor);
-		}
-		for (const key of Object.getOwnPropertySymbols(registry)) {
+		const keys = Object.getOwnPropertySymbols(registry);
+		const present = new Set(keys.map((key) => registry[key].constructor));
+		for (const key of keys) {
 			const instance = registry[key];
-			if (checkAndEject(instance, objSet, onEject, registry, key, logger)) {
+			if (checkAndEject(instance, present, onEject, registry, key, logger)) {
 				ejected.push(instance);
 				somethingIsDeleted = true;
 			}
@@ -400,7 +381,7 @@ function checkAndEject(instance, objSet, onEject, registry, key, logger) {
 	scanParams(instance, (type) => {
 		if (!objSet.has(type) && (!onEject || onEject(instance, type))) {
 			delete registry[key];
-			logger.debug(`✖️  Ejecting "${constructorName(instance)}" (depends on "${type.name}" which is not in registry)`);
+			logger.debug(`✖️  Ejecting "${constructorName(instance)}" (depends on "${type.name}", rebuilt by this reload)`);
 			ejected = true;
 			return true;
 		}
@@ -878,7 +859,6 @@ function moostVite(options) {
 				ssrEntry: options.ssrEntry,
 				serverEntry: options.serverEntry,
 				prefix: prefixes,
-				port: options.port,
 				ssrOutlet: options.ssrOutlet,
 				ssrState: options.ssrState,
 				ssrHead: options.ssrHead,
@@ -946,7 +926,7 @@ function moostVite(options) {
 						beginBoot();
 						const cleanupInstances = pendingCleanup ?? void 0;
 						pendingCleanup = null;
-						await moostRestartCleanup(adapters, options.onEject, cleanupInstances);
+						await moostRestartCleanup(options.onEject, cleanupInstances);
 						for (const adapter of adapters) if (adapter.detected) await adapter.init();
 						const entryModule = await getEntryModule(server.environments.ssr.moduleGraph);
 						if (entryModule?.transformResult) server.environments.ssr.moduleGraph.invalidateModule(entryModule);
@@ -968,7 +948,7 @@ function moostVite(options) {
 				}
 			};
 			for (const adapter of adapters) adapter.ssrLoadModule = ssrImport;
-			await moostRestartCleanup(adapters, options.onEject);
+			await moostRestartCleanup(options.onEject);
 			await ssrImport(options.entry);
 			await settleBootInit();
 			server.middlewares.use(async (req, res, next) => {

package/dist/prod-server.cjs

@@ -1,4 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+let node_events = require("node:events");
 let moost = require("moost");
 
 //#region packages/vite/src/utils.ts
@@ -81,6 +82,11 @@ const logger = (0, moost.createLogger)({ level: 99 }).createTopic("\x1B[2m\x1B[3
 
 //#endregion
 //#region packages/vite/src/prod-server.ts
+/** URL of the address the server actually bound (wildcard binds print as localhost). */ function serverUrl(server) {
+	const addr = server.address();
+	if (!addr || typeof addr === "string") return String(addr);
+	return `http://${addr.address === "::" || addr.address === "0.0.0.0" ? "localhost" : addr.family === "IPv6" ? `[${addr.address}]` : addr.address}:${addr.port}`;
+}
 function stripUndefined(obj) {
 	return Object.fromEntries(Object.entries(obj).filter(([, v]) => v !== void 0));
 }
@@ -135,11 +141,13 @@ async function createSSRServer(options) {
 			use(mw) {
 				userMiddlewares.push(mw);
 			},
-			async listen(_port) {
+			async listen(port, host) {
+				if ((port ?? host ?? opts.port ?? opts.host) !== void 0) console.warn("[moost-vite] port/host passed to createSSRServer() or listen() are ignored in dev — set server.port / server.host in vite.config instead.");
 				for (const mw of userMiddlewares) vite.middlewares.use(mw);
 				if (ssrFallback) vite.middlewares.use(ssrFallback);
 				await vite.listen();
 				vite.printUrls();
+				return vite.httpServer;
 			}
 		};
 	}
@@ -153,6 +161,7 @@ async function createSSRServer(options) {
 	const prefixes = normalizePrefixes(opts.prefix ?? __MOOST_PREFIX__);
 	const ssrForwarding = opts.ssrFetchForwarding ?? __MOOST_SSR_FORWARDING__ ?? true;
 	const defaultPort = opts.port || Number(process.env.PORT) || 3e3;
+	const defaultHost = opts.host ?? process.env.HOST;
 	const template = await fs.readFile(path.resolve(clientDir, "index.html"), "utf8");
 	let render = null;
 	if (__MOOST_SSR_ENTRY__ !== void 0 && !!__MOOST_SSR_ENTRY__) render = (await import(
@@ -228,9 +237,8 @@ async function createSSRServer(options) {
 		use(mw) {
 			userMiddlewares.push(mw);
 		},
-		async listen(port) {
-			const p = port || defaultPort;
-			createHttpServer((req, res) => {
+		async listen(port, host) {
+			const server = createHttpServer((req, res) => {
 				const url = req.url || "/";
 				let i = 0;
 				const runNext = () => {
@@ -245,9 +253,11 @@ async function createSSRServer(options) {
 					serveStatic(req, res);
 				};
 				runNext();
-			}).listen(p, () => {
-				console.log(`Server running at http://localhost:${p}`);
 			});
+			server.listen(port || defaultPort, host || defaultHost);
+			await (0, node_events.once)(server, "listening");
+			console.log(`Server running at ${serverUrl(server)}`);
+			return server;
 		}
 	};
 }

package/dist/prod-server.d.ts

@@ -1,4 +1,5 @@
 import { IncomingMessage, ServerResponse } from 'node:http';
+import { Server } from 'node:net';
 
 /**
  * The value an SSR `render(url)` function may return. Only `html` is required;
@@ -54,6 +55,8 @@ interface TSSRServerOptions {
     prefix?: string | string[];
     /** Override: port number (default: process.env.PORT || 3000) */
     port?: number;
+    /** Override: bind address, e.g. '127.0.0.1' (default: process.env.HOST, else all interfaces) */
+    host?: string;
     /** Override: client build directory (default: 'dist/client') */
     clientDir?: string;
     /** Override: HTML placeholder for SSR content */
@@ -75,8 +78,13 @@ interface TSSRServerOptions {
 interface TSSRServer {
     /** Add Connect-compatible middleware (runs in both dev and prod) */
     use(middleware: TMiddleware): void;
-    /** Start the server */
-    listen(port?: number): Promise<void>;
+    /**
+     * Start the server; resolves with the bound server (for `address()` / `close()`)
+     * and rejects on a bind error (`EADDRINUSE`, `EACCES`, bad host).
+     * `port`/`host` and the matching options apply in production only — in dev,
+     * Vite's `server.port`/`server.host` do.
+     */
+    listen(port?: number, host?: string): Promise<Server>;
 }
 declare function createSSRServer(options?: TSSRServerOptions): Promise<TSSRServer>;
 

package/dist/prod-server.mjs

@@ -1,3 +1,4 @@
+import { once } from "node:events";
 import "node:fs";
 import "node:module";
 import { createLogger } from "moost";
@@ -82,6 +83,11 @@ const logger = createLogger({ level: 99 }).createTopic("\x1B[2m\x1B[36m" + PLUGI
 
 //#endregion
 //#region packages/vite/src/prod-server.ts
+/** URL of the address the server actually bound (wildcard binds print as localhost). */ function serverUrl(server) {
+	const addr = server.address();
+	if (!addr || typeof addr === "string") return String(addr);
+	return `http://${addr.address === "::" || addr.address === "0.0.0.0" ? "localhost" : addr.family === "IPv6" ? `[${addr.address}]` : addr.address}:${addr.port}`;
+}
 function stripUndefined(obj) {
 	return Object.fromEntries(Object.entries(obj).filter(([, v]) => v !== void 0));
 }
@@ -136,11 +142,13 @@ async function createSSRServer(options) {
 			use(mw) {
 				userMiddlewares.push(mw);
 			},
-			async listen(_port) {
+			async listen(port, host) {
+				if ((port ?? host ?? opts.port ?? opts.host) !== void 0) console.warn("[moost-vite] port/host passed to createSSRServer() or listen() are ignored in dev — set server.port / server.host in vite.config instead.");
 				for (const mw of userMiddlewares) vite.middlewares.use(mw);
 				if (ssrFallback) vite.middlewares.use(ssrFallback);
 				await vite.listen();
 				vite.printUrls();
+				return vite.httpServer;
 			}
 		};
 	}
@@ -154,6 +162,7 @@ async function createSSRServer(options) {
 	const prefixes = normalizePrefixes(opts.prefix ?? __MOOST_PREFIX__);
 	const ssrForwarding = opts.ssrFetchForwarding ?? __MOOST_SSR_FORWARDING__ ?? true;
 	const defaultPort = opts.port || Number(process.env.PORT) || 3e3;
+	const defaultHost = opts.host ?? process.env.HOST;
 	const template = await fs.readFile(path.resolve(clientDir, "index.html"), "utf8");
 	let render = null;
 	if (__MOOST_SSR_ENTRY__ !== void 0 && !!__MOOST_SSR_ENTRY__) render = (await import(
@@ -229,9 +238,8 @@ async function createSSRServer(options) {
 		use(mw) {
 			userMiddlewares.push(mw);
 		},
-		async listen(port) {
-			const p = port || defaultPort;
-			createHttpServer((req, res) => {
+		async listen(port, host) {
+			const server = createHttpServer((req, res) => {
 				const url = req.url || "/";
 				let i = 0;
 				const runNext = () => {
@@ -246,9 +254,11 @@ async function createSSRServer(options) {
 					serveStatic(req, res);
 				};
 				runNext();
-			}).listen(p, () => {
-				console.log(`Server running at http://localhost:${p}`);
 			});
+			server.listen(port || defaultPort, host || defaultHost);
+			await once(server, "listening");
+			console.log(`Server running at ${serverUrl(server)}`);
+			return server;
 		}
 	};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moostjs/vite",
-  "version": "0.6.37",
+  "version": "0.6.39",
   "description": "Vite Dev plugin for moostjs",
   "keywords": [
     "composables",
@@ -58,8 +58,8 @@
   "peerDependencies": {
     "sirv": "^3.0.0",
     "vite": "^8.0.0",
-    "@moostjs/event-http": "^0.6.37",
-    "moost": "^0.6.37"
+    "@moostjs/event-http": "^0.6.39",
+    "moost": "^0.6.39"
   },
   "peerDependenciesMeta": {
     "sirv": {