@studiometa/trafic-agent 0.1.37 → 0.1.39

package/dist/{server-CLrB1zpR.js → server-BAjHxgqh.js}

@@ -294,42 +294,31 @@ function watchProjectList(projectListPath, onChange) {
 		if (eventType === "change") onChange();
 	});
 }
-/**
-* Run a ddev command without blocking the event loop.
-*
-* The agent is single-threaded and serves forward auth for every project, so
-* an `execSync` here stops the whole server for the duration of the command.
-* `ddev start` takes over a minute, which froze auth for every unrelated
-* project and produced request timeouts on a live server. Nothing about
-* "background" work with setTimeout helps: the timer callback still runs on
-* the same thread.
-*/
-function ddev(args, timeoutMs) {
-	return new Promise((resolve) => {
-		execFile("ddev", args, {
-			encoding: "utf-8",
-			timeout: timeoutMs
-		}, (error, stdout) => {
-			if (error) {
-				console.error(`ddev ${args.join(" ")} failed:`, error.message);
-				resolve({
-					ok: false,
-					stdout: stdout ?? ""
-				});
-				return;
-			}
+/** The real runner, used unless a caller passes its own. */
+var nodeDdevRunner = (args, timeoutMs) => new Promise((resolve) => {
+	execFile("ddev", args, {
+		encoding: "utf-8",
+		timeout: timeoutMs
+	}, (error, stdout) => {
+		if (error) {
+			console.error(`ddev ${args.join(" ")} failed:`, error.message);
 			resolve({
-				ok: true,
+				ok: false,
 				stdout: stdout ?? ""
 			});
+			return;
+		}
+		resolve({
+			ok: true,
+			stdout: stdout ?? ""
 		});
 	});
-}
+});
 /**
 * Get detailed project info using ddev describe
 */
-async function getProjectInfo(name) {
-	const { ok, stdout } = await ddev([
+async function getProjectInfo(name, run = nodeDdevRunner) {
+	const { ok, stdout } = await run([
 		"describe",
 		name,
 		"-j"
@@ -359,15 +348,15 @@ async function getProjectInfo(name) {
 * Resolves when the project is up. Callers in the request path must not await
 * it — respond first, then let this settle and record the outcome.
 */
-async function startProject(name) {
-	const { ok } = await ddev(["start", name], 12e4);
+async function startProject(name, run = nodeDdevRunner) {
+	const { ok } = await run(["start", name], 12e4);
 	return ok;
 }
 /**
 * Stop a DDEV project
 */
-async function stopProject(name) {
-	const { ok } = await ddev(["stop", name], 6e4);
+async function stopProject(name, run = nodeDdevRunner) {
+	const { ok } = await run(["stop", name], 6e4);
 	return ok;
 }
 /**
@@ -394,7 +383,134 @@ function listProjects() {
 	}
 }
 //#endregion
+//#region src/setup/steps.ts
+var stepNumber = 0;
+var dryRun = false;
+/**
+* Set dry-run mode
+*/
+function setDryRun(value) {
+	dryRun = value;
+}
+/**
+* Reset step counter
+*/
+function resetSteps() {
+	stepNumber = 0;
+}
+/**
+* Log a step
+*/
+function step(message) {
+	stepNumber++;
+	console.log(`\n\x1b[36m[${stepNumber}]\x1b[0m ${message}`);
+}
+/**
+* Log success
+*/
+function success(message) {
+	console.log(`    \x1b[32m✓\x1b[0m ${message}`);
+}
+/**
+* Log warning
+*/
+function warn(message) {
+	console.log(`    \x1b[33m⚠\x1b[0m ${message}`);
+}
+/**
+* Log error
+*/
+function error(message) {
+	console.log(`    \x1b[31m✗\x1b[0m ${message}`);
+}
+/**
+* Log info
+*/
+function info(message) {
+	console.log(`    ${message}`);
+}
+/**
+* Execute a command (or show in dry-run mode)
+*/
+function exec(command, options) {
+	if (dryRun) {
+		if (!options?.silent) console.log(`    \x1b[90m$ ${command}\x1b[0m`);
+		return "";
+	}
+	try {
+		return execSync(command, {
+			encoding: "utf-8",
+			stdio: options?.silent ? "pipe" : "inherit"
+		});
+	} catch (err) {
+		throw new Error(`Command failed: ${command}\n${err.stderr ?? ""}`);
+	}
+}
+/**
+* Execute a command and return output (silent)
+*/
+function execSilent(command) {
+	if (dryRun) return "";
+	try {
+		return execSync(command, {
+			encoding: "utf-8",
+			stdio: "pipe"
+		}).trim();
+	} catch {
+		return "";
+	}
+}
+/**
+* Check if a command exists
+*/
+function commandExists(command) {
+	try {
+		execSync(`which ${command}`, { stdio: "pipe" });
+		return true;
+	} catch {
+		return false;
+	}
+}
+/**
+* Check if running as root
+*/
+function isRoot() {
+	return process.getuid?.() === 0;
+}
+/**
+* Write a file (or show in dry-run mode)
+*/
+function writeFile(path, content) {
+	if (dryRun) {
+		console.log(`    \x1b[90mWrite ${path}:\x1b[0m`);
+		const lines = content.split("\n").slice(0, 5);
+		for (const line of lines) console.log(`    \x1b[90m  ${line}\x1b[0m`);
+		if (content.split("\n").length > 5) console.log(`    \x1b[90m  ...\x1b[0m`);
+		return;
+	}
+	writeFileSync(path, content);
+}
+//#endregion
+//#region src/setup/io.ts
+/**
+* The real implementation, used when no io is injected.
+*
+* `writeFile` comes from steps.js rather than `node:fs` so writes are
+* skipped in dry-run mode. Reads stay direct: they change nothing.
+*/
+var nodeIo = {
+	exec,
+	execSilent,
+	commandExists,
+	writeFile,
+	fileExists: existsSync,
+	readFile: (path) => readFileSync(path, "utf-8"),
+	env: process.env
+};
+//#endregion
 //#region src/utils/db.ts
+/** The real clock, used unless a caller passes its own. */
+var systemClock = () => Date.now();
 var db = null;
 /**
 * Initialize the database connection and schema
@@ -442,12 +558,12 @@ function closeDb() {
 /**
 * Update project last access time
 */
-function updateProjectAccess(name) {
+function updateProjectAccess(name, now = systemClock) {
 	getDb().prepare(`
     INSERT INTO projects (name, last_access, status)
     VALUES (?, ?, 'running')
     ON CONFLICT(name) DO UPDATE SET last_access = excluded.last_access
-  `).run(name, Date.now());
+  `).run(name, now());
 }
 /**
 * Get project record
@@ -458,19 +574,19 @@ function getProject(name) {
 /**
 * Set project status
 */
-function setProjectStatus(name, status) {
+function setProjectStatus(name, status, now = systemClock) {
 	getDb().prepare(`
     INSERT INTO projects (name, last_access, status)
     VALUES (?, ?, ?)
     ON CONFLICT(name) DO UPDATE SET status = excluded.status
-  `).run(name, Date.now(), status);
+  `).run(name, now(), status);
 }
 /**
 * Get idle projects (last access older than threshold)
 */
-function getIdleProjects(thresholdMs) {
+function getIdleProjects(thresholdMs, now = systemClock) {
 	const database = getDb();
-	const cutoff = Date.now() - thresholdMs;
+	const cutoff = now() - thresholdMs;
 	return database.prepare(`
     SELECT name, last_access as lastAccess, status
     FROM projects
@@ -501,9 +617,9 @@ function getAccessLogs(project, limit = 100) {
 /**
 * Clean old access logs (older than given days)
 */
-function cleanOldLogs(days) {
+function cleanOldLogs(days, now = systemClock) {
 	const database = getDb();
-	const cutoff = Date.now() - days * 24 * 60 * 60 * 1e3;
+	const cutoff = now() - days * 24 * 60 * 60 * 1e3;
 	const result = database.prepare("DELETE FROM access_logs WHERE timestamp < ?").run(cutoff);
 	return Number(result.changes);
 }
@@ -574,131 +690,6 @@ function getIdleTimeoutMs(config) {
 	return ms > 0 ? ms : void 0;
 }
 //#endregion
-//#region src/setup/steps.ts
-var stepNumber = 0;
-var dryRun = false;
-/**
-* Set dry-run mode
-*/
-function setDryRun(value) {
-	dryRun = value;
-}
-/**
-* Reset step counter
-*/
-function resetSteps() {
-	stepNumber = 0;
-}
-/**
-* Log a step
-*/
-function step(message) {
-	stepNumber++;
-	console.log(`\n\x1b[36m[${stepNumber}]\x1b[0m ${message}`);
-}
-/**
-* Log success
-*/
-function success(message) {
-	console.log(`    \x1b[32m✓\x1b[0m ${message}`);
-}
-/**
-* Log warning
-*/
-function warn(message) {
-	console.log(`    \x1b[33m⚠\x1b[0m ${message}`);
-}
-/**
-* Log error
-*/
-function error(message) {
-	console.log(`    \x1b[31m✗\x1b[0m ${message}`);
-}
-/**
-* Log info
-*/
-function info(message) {
-	console.log(`    ${message}`);
-}
-/**
-* Execute a command (or show in dry-run mode)
-*/
-function exec(command, options) {
-	if (dryRun) {
-		if (!options?.silent) console.log(`    \x1b[90m$ ${command}\x1b[0m`);
-		return "";
-	}
-	try {
-		return execSync(command, {
-			encoding: "utf-8",
-			stdio: options?.silent ? "pipe" : "inherit"
-		});
-	} catch (err) {
-		throw new Error(`Command failed: ${command}\n${err.stderr ?? ""}`);
-	}
-}
-/**
-* Execute a command and return output (silent)
-*/
-function execSilent(command) {
-	if (dryRun) return "";
-	try {
-		return execSync(command, {
-			encoding: "utf-8",
-			stdio: "pipe"
-		}).trim();
-	} catch {
-		return "";
-	}
-}
-/**
-* Check if a command exists
-*/
-function commandExists(command) {
-	try {
-		execSync(`which ${command}`, { stdio: "pipe" });
-		return true;
-	} catch {
-		return false;
-	}
-}
-/**
-* Check if running as root
-*/
-function isRoot() {
-	return process.getuid?.() === 0;
-}
-/**
-* Write a file (or show in dry-run mode)
-*/
-function writeFile(path, content) {
-	if (dryRun) {
-		console.log(`    \x1b[90mWrite ${path}:\x1b[0m`);
-		const lines = content.split("\n").slice(0, 5);
-		for (const line of lines) console.log(`    \x1b[90m  ${line}\x1b[0m`);
-		if (content.split("\n").length > 5) console.log(`    \x1b[90m  ...\x1b[0m`);
-		return;
-	}
-	writeFileSync(path, content);
-}
-//#endregion
-//#region src/setup/io.ts
-/**
-* The real implementation, used when no io is injected.
-*
-* `writeFile` comes from steps.js rather than `node:fs` so writes are
-* skipped in dry-run mode. Reads stay direct: they change nothing.
-*/
-var nodeIo = {
-	exec,
-	execSilent,
-	commandExists,
-	writeFile,
-	fileExists: existsSync,
-	readFile: (path) => readFileSync(path, "utf-8"),
-	env: process.env
-};
-//#endregion
 //#region src/setup/ddev.ts
 /**
 * Install system dependencies required by Trafic
@@ -1028,12 +1019,12 @@ function loadTemplate(name) {
 /**
 * Get effective auth config for a project (merges global + per-project)
 */
-function getEffectiveAuthConfig(projectName) {
-	if (!projectName) return config.auth;
-	const projectConfig = projectConfigs.get(projectName);
-	if (!projectConfig?.auth_policy) return config.auth;
+function getEffectiveAuthConfig(projectName, deps) {
+	if (!projectName) return deps.auth;
+	const projectConfig = deps.projectConfigs.get(projectName);
+	if (!projectConfig?.auth_policy) return deps.auth;
 	return {
-		...config.auth,
+		...deps.auth,
 		defaultPolicy: projectConfig.auth_policy
 	};
 }
@@ -1041,14 +1032,14 @@ function getEffectiveAuthConfig(projectName) {
 * Handle forward auth requests from Traefik
 * Traefik sends the original request headers, we return 200 (allow) or 401 (deny)
 */
-function handleAuth(req, res) {
+function handleAuth(req, res, deps) {
 	const hostname = req.headers["x-forwarded-host"] ?? "";
 	const socketIp = req.socket.remoteAddress ?? "";
 	const forwardedFor = req.headers["x-forwarded-for"];
 	const authorization = req.headers["authorization"];
 	const path = req.headers["x-forwarded-uri"] ?? "/";
-	const projectName = hostnameIndex.get(hostname);
-	const authConfig = getEffectiveAuthConfig(projectName);
+	const projectName = deps.hostnameIndex.get(hostname);
+	const authConfig = getEffectiveAuthConfig(projectName, deps);
 	const clientIp = resolveClientIp(socketIp, forwardedFor, authConfig.trustedProxyHops);
 	if (checkAuth({
 		hostname,
@@ -1057,8 +1048,8 @@ function handleAuth(req, res) {
 		forwardedFor
 	}, authConfig).allowed) {
 		if (projectName) {
-			updateProjectAccess(projectName);
-			logAccess({
+			deps.updateProjectAccess(projectName);
+			deps.logAccess({
 				project: projectName,
 				timestamp: Date.now(),
 				ip: clientIp,
@@ -1077,17 +1068,17 @@ function handleAuth(req, res) {
 * Handle errors middleware requests (502 from Traefik)
 * When a project is stopped, Traefik returns 502. We show a waiting page and start the project.
 */
-async function handleErrors(req, res) {
+async function handleErrors(req, res, deps) {
 	const hostname = req.headers["x-forwarded-host"] ?? req.headers.host ?? "";
-	const projectName = hostnameIndex.get(hostname);
+	const projectName = deps.hostnameIndex.get(hostname);
 	if (!projectName) {
-		const template = loadTemplate("error");
+		const template = deps.loadTemplate("error");
 		res.writeHead(404, { "Content-Type": "text/html" });
 		res.end(template.replace("{{message}}", "Project not found"));
 		return;
 	}
-	if (getProject(projectName)?.status === "starting") {
-		const template = loadTemplate("wait");
+	if (deps.getProject(projectName)?.status === "starting") {
+		const template = deps.loadTemplate("wait");
 		res.writeHead(503, {
 			"Content-Type": "text/html",
 			"Retry-After": "5"
@@ -1095,32 +1086,32 @@ async function handleErrors(req, res) {
 		res.end(template.replace(/\{\{project\}\}/g, projectName).replace(/\{\{hostname\}\}/g, hostname));
 		return;
 	}
-	setProjectStatus(projectName, "starting");
-	const template = loadTemplate("wait");
+	deps.setProjectStatus(projectName, "starting");
+	const template = deps.loadTemplate("wait");
 	res.writeHead(503, {
 		"Content-Type": "text/html",
 		"Retry-After": "5"
 	});
 	res.end(template.replace(/\{\{project\}\}/g, projectName).replace(/\{\{hostname\}\}/g, hostname));
-	startProject(projectName).then((success) => {
-		setProjectStatus(projectName, success ? "running" : "stopped");
+	deps.startProject(projectName).then((success) => {
+		deps.setProjectStatus(projectName, success ? "running" : "stopped");
 	}).catch((error) => {
-		setProjectStatus(projectName, "stopped");
+		deps.setProjectStatus(projectName, "stopped");
 		console.error(`Could not start ${projectName}:`, error);
 	});
 }
 /**
 * Handle status polling requests
 */
-async function handleStatus(req, res) {
+async function handleStatus(req, res, deps) {
 	const projectName = new URL(req.url ?? "/", `http://${req.headers.host}`).searchParams.get("project");
 	if (!projectName) {
 		res.writeHead(400, { "Content-Type": "application/json" });
 		res.end(JSON.stringify({ error: "Missing project parameter" }));
 		return;
 	}
-	const info = await getProjectInfo(projectName);
-	const record = getProject(projectName);
+	const info = await deps.getProjectInfo(projectName);
+	const record = deps.getProject(projectName);
 	res.writeHead(200, { "Content-Type": "application/json" });
 	res.end(JSON.stringify({
 		name: projectName,
@@ -1148,18 +1139,18 @@ function routePath(target) {
 /**
 * Request handler
 */
-async function handleRequest(req, res) {
+async function handleRequest(req, res, deps) {
 	const path = routePath(req.url);
 	try {
-		if (path === "/__auth__" || path.startsWith("/__auth__/")) handleAuth(req, res);
-		else if (path === "/__status__" || path.startsWith("/__status__/")) await handleStatus(req, res);
+		if (path === "/__auth__" || path.startsWith("/__auth__/")) handleAuth(req, res, deps);
+		else if (path === "/__status__" || path.startsWith("/__status__/")) await handleStatus(req, res, deps);
 		else if (path === "/__health__") {
 			res.writeHead(200, { "Content-Type": "application/json" });
 			res.end(JSON.stringify({
 				status: "ok",
 				version: "__VERSION__"
 			}));
-		} else await handleErrors(req, res);
+		} else await handleErrors(req, res, deps);
 	} catch (error) {
 		console.error("Request error:", error);
 		res.writeHead(500, { "Content-Type": "text/plain" });
@@ -1194,8 +1185,20 @@ function startServer(agentConfig) {
 		console.log("Project list changed, reloading...");
 		reloadProjects();
 	});
+	const deps = () => ({
+		auth: config.auth,
+		hostnameIndex,
+		projectConfigs,
+		loadTemplate,
+		updateProjectAccess,
+		logAccess,
+		getProject,
+		setProjectStatus,
+		startProject,
+		getProjectInfo
+	});
 	createServer((req, res) => {
-		handleRequest(req, res).catch((error) => {
+		handleRequest(req, res, deps()).catch((error) => {
 			console.error("Unhandled error:", error);
 			if (!res.headersSent) {
 				res.writeHead(500);
@@ -1209,6 +1212,6 @@ function startServer(agentConfig) {
 	});
 }
 //#endregion
-export { initDb as A, stopProject as B, shouldNeverStop as C, getDb as D, getAccessLogs as E, getProjectFromHostname as F, parseBasicAuth as G, checkAuth as H, getProjectInfo as I, parseBearerToken as K, listProjects as L, setProjectStatus as M, updateProjectAccess as N, getIdleProjects as O, buildHostnameIndex as P, loadProjectList as R, loadProjectConfig as S, closeDb as T, matchHostname as U, watchProjectList as V, matchIp as W, setDryRun as _, configureTraefik as a, warn as b, installSystemDeps as c, error as d, exec as f, resetSteps as g, isRoot as h, configureDdev as i, logAccess as j, getProject as k, purgeTraefikAcmeStorage as l, info as m, startServer as n, getDockerGatewayIp as o, execSilent as p, addDdevAptRepo as r, installDdev as s, routePath as t, nodeIo as u, step as v, cleanOldLogs as w, getIdleTimeoutMs as x, success as y, startProject as z };
+export { error as A, buildHostnameIndex as B, getIdleProjects as C, setProjectStatus as D, logAccess as E, resetSteps as F, startProject as G, getProjectInfo as H, setDryRun as I, checkAuth as J, stopProject as K, step as L, execSilent as M, info as N, updateProjectAccess as O, isRoot as P, parseBearerToken as Q, success as R, getDb as S, initDb as T, listProjects as U, getProjectFromHostname as V, loadProjectList as W, matchIp as X, matchHostname as Y, parseBasicAuth as Z, loadProjectConfig as _, handleStatus as a, closeDb as b, addDdevAptRepo as c, getDockerGatewayIp as d, installDdev as f, getIdleTimeoutMs as g, readToolPorts as h, handleRequest as i, exec as j, nodeIo as k, configureDdev as l, purgeTraefikAcmeStorage as m, handleAuth as n, routePath as o, installSystemDeps as p, watchProjectList as q, handleErrors as r, startServer as s, getEffectiveAuthConfig as t, configureTraefik as u, shouldNeverStop as v, getProject as w, getAccessLogs as x, cleanOldLogs as y, warn as z };
 
-//# sourceMappingURL=server-CLrB1zpR.js.map
+//# sourceMappingURL=server-BAjHxgqh.js.map