silgi 0.43.8 → 0.43.9

package/dist/cli/commands/run.mjs

@@ -4,14 +4,39 @@ import prepare_default from "./prepare.mjs";
 import consola from "consola";
 import { useSilgiCLI } from "silgi";
 import { version } from "silgi/meta";
-import { defineCommand, runCommand } from "citty";
+import { runCommand } from "citty";
 import { spawn } from "node:child_process";
 import { platform } from "node:os";
 import { promisify } from "node:util";
 import treeKill from "tree-kill";
 
 //#region src/cli/commands/run.ts
-const command = defineCommand({
+const treeKillAsync = promisify(treeKill);
+function waitForProcess(proc) {
+	return new Promise((resolve, reject) => {
+		proc.on("exit", (code) => resolve(code ?? 0));
+		proc.on("error", (err) => reject(err));
+	});
+}
+async function killProcessTree(pid, signal = "SIGTERM") {
+	try {
+		await treeKillAsync(pid, signal);
+		return true;
+	} catch (error) {
+		consola.warn(`Failed to kill process tree for PID ${pid}:`, error);
+		return false;
+	}
+}
+function setupSignalHandlers(onSignal) {
+	const signals = [
+		"SIGINT",
+		"SIGTERM",
+		"SIGHUP"
+	];
+	signals.forEach((signal) => process.on(signal, () => onSignal(signal)));
+	return () => signals.forEach((signal) => process.off(signal, () => onSignal(signal)));
+}
+const command = {
 	meta: {
 		name: "dev",
 		description: "Start the development server for the project",
@@ -35,93 +60,20 @@ const command = defineCommand({
 		const silgi = useSilgiCLI();
 		const startCommand = args.command || rawArgs[0];
 		let childPid = null;
-		let childProcess = null;
 		let hasExited = false;
-		let exitTimeout = null;
-		const signalHandlers = [];
-		const treeKillAsync = promisify(treeKill);
-		const cleanupResources = async () => {};
 		const cleanupAndExit = async (code = 0) => {
 			if (hasExited) return;
 			hasExited = true;
-			if (exitTimeout) {
-				clearTimeout(exitTimeout);
-				exitTimeout = null;
-			}
-			try {
-				await cleanupResources();
-			} catch (error) {
-				consola.warn("Error during cleanup:", error instanceof Error ? error.message : String(error));
-			} finally {
-				signalHandlers.forEach((removeHandler) => removeHandler());
-				signalHandlers.length = 0;
-				process.exit(code);
-			}
-		};
-		const killProcessTree = async (pid, signal = "SIGTERM") => {
-			try {
-				await treeKillAsync(pid, signal);
-				return true;
-			} catch (error) {
-				consola.warn(`Failed to kill process tree for PID ${pid}:`, error instanceof Error ? error.message : String(error));
-				return false;
-			}
-		};
-		const handleSignal = async (signal, watcher) => {
-			if (hasExited) return;
-			consola.info(`Received ${signal}, terminating process...`);
-			if (watcher && typeof watcher.close === "function") try {
-				await watcher.close();
-			} catch (error) {
-				consola.warn("Error closing watcher:", error instanceof Error ? error.message : String(error));
-			}
-			if (childPid) try {
-				await killProcessTree(childPid, signal);
-				exitTimeout = setTimeout(async () => {
-					if (hasExited) return;
-					consola.warn("Process did not exit gracefully, forcing termination...");
-					try {
-						await killProcessTree(childPid, "SIGKILL");
-					} finally {
-						await cleanupAndExit(1);
-					}
-				}, 3e3);
-				if (childProcess) await new Promise((resolve) => {
-					childProcess.on("exit", () => resolve());
-					childProcess.on("error", () => resolve());
-				});
-				clearTimeout(exitTimeout);
-				exitTimeout = null;
-				await cleanupAndExit(0);
-			} catch (error) {
-				consola.error("Error during process termination:", error instanceof Error ? error.message : String(error));
-				await cleanupAndExit(1);
-			}
-			else await cleanupAndExit(0);
-		};
-		const setupSignalHandlers = (watcher) => {
-			const signals = [
-				"SIGINT",
-				"SIGTERM",
-				"SIGHUP"
-			];
-			signals.forEach((signal) => {
-				const handler = () => {
-					process.off(signal, handler);
-					handleSignal(signal, watcher).catch((error) => {
-						consola.error("Error in signal handler:", error instanceof Error ? error.message : String(error));
-						process.exit(1);
-					});
-				};
-				signalHandlers.push(() => {
-					process.off(signal, handler);
-				});
-				process.on(signal, handler);
-			});
+			process.exit(code);
 		};
 		try {
 			const watcher = await watchDev();
-			setupSignalHandlers(watcher);
+			const removeSignalHandlers = setupSignalHandlers(async (signal) => {
+				consola.info(`Received ${signal}, terminating process...`);
+				if (watcher?.close) await watcher.close().catch(() => {});
+				if (childPid) await killProcessTree(childPid, signal);
+				await cleanupAndExit(0);
+			});
 			consola.info(`Starting command: nr ${startCommand}`);
 			const isWindows = platform() === "win32";
 			const proc = spawn("nr", [startCommand], {
@@ -130,34 +82,20 @@ const command = defineCommand({
 				cwd: process.cwd(),
 				...!isWindows && { detached: true }
 			});
-			childProcess = proc;
 			childPid = proc.pid ?? null;
 			if (!childPid) throw new Error("Failed to start child process: no PID assigned");
-			proc.on("error", (error) => {
-				consola.error("Process error:", error.message);
-				if (!hasExited) cleanupAndExit(1).catch(() => {});
-			});
-			proc.on("exit", (code) => {
-				if (code !== null && code !== 0) consola.error(`Process exited with code ${code}`);
-				if (!hasExited) cleanupAndExit(code || 0).catch(() => {});
-			});
-			try {
-				await proc;
-				consola.success(`Process exited successfully.`);
-				cleanupAndExit(0);
-			} catch (procError) {
-				const exitCode = procError && typeof procError.exitCode === "number" ? procError.exitCode : 1;
-				consola.error(`Process exited with code: ${exitCode}`);
-				if (silgi.options.debug) consola.withTag("silgi").error("Error while running the command", procError);
-				cleanupAndExit(exitCode);
-			}
+			const exitCode = await waitForProcess(proc);
+			if (exitCode !== 0) consola.error(`Process exited with code ${exitCode}`);
+			else consola.success("Process exited successfully.");
+			removeSignalHandlers();
+			await cleanupAndExit(exitCode);
 		} catch (error) {
 			consola.error(`Failed to start the development server: ${error instanceof Error ? error.message : error}`);
 			if (silgi.options.debug) consola.withTag("silgi").error("Error while running the command", error);
-			cleanupAndExit(1);
+			await cleanupAndExit(1);
 		}
 	}
-});
+};
 var run_default = command;
 
 //#endregion

package/dist/package.mjs

@@ -1,7 +1,7 @@
 //#region package.json
 var name = "silgi";
 var type = "module";
-var version = "0.43.8";
+var version = "0.43.9";
 var private$1 = false;
 var packageManager = "pnpm@10.12.2";
 var sideEffects = false;

package/dist/types/kits.d.mts

@@ -1,9 +1,9 @@
 import { SilgiCLI } from "./silgiCLI.mjs";
 import { BuildSilgi } from "./silgi.mjs";
 import { ESMCodeGenOptions, ESMImport } from "knitwork";
-import * as h32 from "h3";
+import * as h33 from "h3";
 import { PresetName } from "silgi/presets";
-import * as nitropack_types0 from "nitropack/types";
+import * as nitropack_types1 from "nitropack/types";
 
 //#region src/types/kits.d.ts
 interface SilgiCommands {}
@@ -24,7 +24,7 @@ interface GenImport {
   imports: ESMImport | ESMImport[];
   options?: ESMCodeGenOptions;
 }
-type Framework<T extends PresetName> = T extends "nitro" ? nitropack_types0.NitroApp : T extends "nuxt" ? nitropack_types0.NitroApp : T extends "h3" ? h32.Router : never;
+type Framework<T extends PresetName> = T extends "nitro" ? nitropack_types1.NitroApp : T extends "nuxt" ? nitropack_types1.NitroApp : T extends "h3" ? h33.Router : never;
 interface DefineFrameworkOptions<T extends PresetName> extends Omit<BuildSilgi, "framework"> {
   framework: Framework<T>;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.43.8",
+  "version": "0.43.9",
   "private": false,
   "sideEffects": false,
   "exports": {