@bensandee/tooling 0.32.0 → 0.34.0

package/dist/{check-DMDdHanG.mjs → check-Ceom_OgJ.mjs}

@@ -1,5 +1,40 @@
+import * as clack from "@clack/prompts";
 import { execSync } from "node:child_process";
 import { z } from "zod";
+//#region src/utils/log.ts
+const out = (msg) => console.log(msg);
+const isCI = Boolean(process.env["CI"]);
+const log = isCI ? {
+	info: out,
+	warn: (msg) => out(`[warn] ${msg}`),
+	error: (msg) => out(`[error] ${msg}`),
+	success: (msg) => out(`✓ ${msg}`)
+} : clack.log;
+function note(body, title) {
+	if (isCI) {
+		if (title) out(`--- ${title} ---`);
+		out(body);
+	} else clack.note(body, title);
+}
+//#endregion
+//#region src/utils/debug.ts
+/** Check if verbose/debug mode is enabled via environment variables. */
+function isEnvVerbose() {
+	return process.env["TOOLING_DEBUG"] === "true";
+}
+/** Log a debug message when verbose mode is enabled. */
+function debug(config, message) {
+	if (config.verbose) log.info(`[debug] ${message}`);
+}
+/** Log the result of an exec call when verbose mode is enabled. */
+function debugExec(config, label, result) {
+	if (!config.verbose) return;
+	const lines = [`[debug] ${label} (exit code ${String(result.exitCode)})`];
+	if (result.stdout.trim()) lines.push(`  stdout: ${result.stdout.trim()}`);
+	if (result.stderr.trim()) lines.push(`  stderr: ${result.stderr.trim()}`);
+	log.info(lines.join("\n"));
+}
+//#endregion
 //#region src/utils/exec.ts
 /** Type guard for `execSync` errors that carry stdout/stderr/status. */
 function isExecSyncError(err) {
@@ -144,15 +179,25 @@ async function runDockerCheck(executor, config) {
 	const timeoutMs = config.timeoutMs ?? DEFAULT_TIMEOUT_MS;
 	const pollIntervalMs = config.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
 	const { compose } = config;
+	const vc = { verbose: config.verbose ?? false };
+	debug(vc, `Compose files: ${compose.composeFiles.join(", ")}`);
+	debug(vc, `Services: ${compose.services.join(", ")}`);
+	debug(vc, `Health checks: ${config.healthChecks.map((c) => c.name).join(", ") || "(none)"}`);
+	debug(vc, `Timeout: ${String(timeoutMs)}ms, poll interval: ${String(pollIntervalMs)}ms`);
 	const cleanup = () => composeDown(executor, compose);
-	const disposeInt = executor.onSignal("SIGINT", () => {
-		cleanup();
-		process.exit(1);
-	});
-	const disposeTerm = executor.onSignal("SIGTERM", () => {
+	let cleaningUp = false;
+	const gracefulShutdown = () => {
+		if (cleaningUp) {
+			executor.log("Cleanup in progress, please wait...");
+			return;
+		}
+		cleaningUp = true;
+		executor.log("Interrupted — shutting down compose stack...");
 		cleanup();
 		process.exit(1);
-	});
+	};
+	const disposeInt = executor.onSignal("SIGINT", gracefulShutdown);
+	const disposeTerm = executor.onSignal("SIGTERM", gracefulShutdown);
 	try {
 		if (config.buildCommand) {
 			executor.log("Building images...");
@@ -162,12 +207,15 @@ async function runDockerCheck(executor, config) {
 		composeUp(executor, compose);
 		executor.log(`Waiting for stack to be healthy (max ${timeoutMs / 1e3}s)...`);
 		const startTime = executor.now();
+		let lastStatusLogTime = startTime;
 		const healthStatus = new Map(config.healthChecks.map((c) => [c.name, false]));
 		while (executor.now() - startTime < timeoutMs) {
 			const containers = composePs(executor, compose);
+			debug(vc, `compose ps: ${containers.length} container(s)`);
 			let allContainersHealthy = true;
 			for (const service of compose.services) {
 				const status = getContainerHealth(containers, service);
+				debug(vc, `Container ${service}: ${status || "(no healthcheck)"}`);
 				if (status === "unhealthy") {
 					executor.logError(`Container ${service} is unhealthy`);
 					composeLogs(executor, compose, service);
@@ -195,10 +243,12 @@ async function runDockerCheck(executor, config) {
 					elapsedMs: executor.now() - startTime
 				};
 			}
-			const elapsed = Math.floor((executor.now() - startTime) / 1e3);
-			if (elapsed > 0 && elapsed % 5 === 0) {
-				const statuses = [...healthStatus.entries()].map(([name, ok]) => `${name}=${ok ? "OK" : "Pending"}`).join(", ");
-				executor.log(`Waiting... (${elapsed}s elapsed). ${statuses}`);
+			const now = executor.now();
+			if (now - lastStatusLogTime >= 5e3) {
+				lastStatusLogTime = now;
+				const elapsed = Math.floor((now - startTime) / 1e3);
+				const parts = [compose.services.map((s) => `${s}=${getContainerHealth(containers, s)}`).join(", "), [...healthStatus.entries()].map(([name, ok]) => `${name}=${ok ? "OK" : "Pending"}`).join(", ")].filter(Boolean).join(" | ");
+				executor.log(`Waiting... (${elapsed}s elapsed). ${parts}`);
 			}
 			await executor.sleep(pollIntervalMs);
 		}
@@ -225,4 +275,4 @@ async function runDockerCheck(executor, config) {
 	}
 }
 //#endregion
-export { composeDown as a, composeUp as c, composeCommand as i, createRealExecutor as l, checkHttpHealth as n, composeLogs as o, getContainerHealth as r, composePs as s, runDockerCheck as t, isExecSyncError as u };
+export { composeDown as a, composeUp as c, debug as d, debugExec as f, note as h, composeCommand as i, createRealExecutor as l, log as m, checkHttpHealth as n, composeLogs as o, isEnvVerbose as p, getContainerHealth as r, composePs as s, runDockerCheck as t, isExecSyncError as u };

package/dist/docker-check/index.d.mts

@@ -67,6 +67,8 @@ interface CheckConfig {
   timeoutMs?: number;
   /** Interval between polling attempts, in ms. Default: 5000. */
   pollIntervalMs?: number;
+  /** If true, emit detailed debug logging. */
+  verbose?: boolean;
 }
 /** Result of the docker check run. */
 type CheckResult = {

package/dist/docker-check/index.mjs

@@ -1,2 +1,2 @@
-import { a as composeDown, c as composeUp, i as composeCommand, l as createRealExecutor, n as checkHttpHealth, o as composeLogs, r as getContainerHealth, s as composePs, t as runDockerCheck } from "../check-DMDdHanG.mjs";
+import { a as composeDown, c as composeUp, i as composeCommand, l as createRealExecutor, n as checkHttpHealth, o as composeLogs, r as getContainerHealth, s as composePs, t as runDockerCheck } from "../check-Ceom_OgJ.mjs";
 export { checkHttpHealth, composeCommand, composeDown, composeLogs, composePs, composeUp, createRealExecutor, getContainerHealth, runDockerCheck };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bensandee/tooling",
-  "version": "0.32.0",
+  "version": "0.34.0",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
   "bin": {
     "bst": "./dist/bin.mjs"