@patiom/daemon 0.0.3 → 0.0.5

package/dist/index.js

@@ -14,9 +14,9 @@ import "adm-zip";
 import getPort, { portNumbers } from "get-port";
 import { parse, stringify } from "smol-toml";
 import dotenv from "dotenv";
-import { confirm, input } from "@inquirer/prompts";
+import { spawn } from "node:child_process";
 //#region package.json
-var version = "0.0.3";
+var version = "0.0.5";
 //#endregion
 //#region src/config.ts
 const PATIOM_ROOT = "/var/lib/patiom";
@@ -179,6 +179,19 @@ const swapCurrentSymlink = async (appName, releaseId, log) => {
 	await fs.rename(tempSymlink, currentSymlink);
 	log("Current symlink swapped successfully");
 };
+const getCurrentRelease = async (appName) => {
+	const currentSymlink = getCurrentSymlink(appName);
+	try {
+		const target = await fs.readlink(currentSymlink);
+		return {
+			id: path.basename(target),
+			path: target,
+			createdAt: (await fs.stat(target)).birthtime
+		};
+	} catch {
+		return null;
+	}
+};
 //#endregion
 //#region src/core/pnpm.ts
 const hasLockfile = async (releaseDir) => {
@@ -223,6 +236,10 @@ const enable = (name) => execa("systemctl", ["enable", name]);
 const start = (name) => execa("systemctl", ["start", name]);
 const stop = (name) => execa("systemctl", ["stop", name]);
 const restart = (name) => execa("systemctl", ["restart", name]);
+const parseUnits = (stdout, appName) => stdout.split("\n").filter((line) => line.includes(`${appName}@`)).map((line) => {
+	const match = line.match(`${appName}@([0-9]+)\\.service`);
+	return match ? match[1] : null;
+}).filter((port) => port !== null);
 const listRunningInstances = async (appName) => {
 	try {
 		const { stdout } = await execa("systemctl", [
@@ -233,10 +250,22 @@ const listRunningInstances = async (appName) => {
 			"--plain",
 			`${appName}@*`
 		]);
-		return stdout.split("\n").filter((line) => line.includes(`${appName}@`)).map((line) => {
-			const match = line.match(`${appName}@([0-9]+)\\.service`);
-			return match ? match[1] : null;
-		}).filter((port) => port !== null);
+		return parseUnits(stdout, appName);
+	} catch {
+		return [];
+	}
+};
+const listAllInstances = async (appName) => {
+	try {
+		const { stdout } = await execa("systemctl", [
+			"list-units",
+			"--type=service",
+			"--all",
+			"--no-pager",
+			"--plain",
+			`${appName}@*`
+		]);
+		return parseUnits(stdout, appName);
 	} catch {
 		return [];
 	}
@@ -375,7 +404,7 @@ After=network.target
 [Service]
 Type=exec
 WorkingDirectory=${PATIOM_ROOT}/apps/%p/current
-ExecStart=${nodeBinPath}/pnpm run ${startScript}
+ExecStart=/usr/local/bin/pnpm run ${startScript}
 Restart=always
 EnvironmentFile=${PATIOM_ROOT}/apps/%p/shared/.env
 Environment=PORT=%i
@@ -462,9 +491,18 @@ const requireScope = (scope) => {
 //#region src/core/validation.ts
 const SAFE_NAME_PATTERN = /^[a-zA-Z0-9][a-zA-Z0-9._-]*$/u;
 const ULID_PATTERN = /^[0-9A-HJKMNP-TV-Z]{26}$/u;
+const RESERVED_NAMES = new Set([
+	"rpxy",
+	"daemon",
+	"patiom",
+	"patiom-server",
+	"system",
+	"status"
+]);
 const validateAppName = (name) => {
 	if (!name || !SAFE_NAME_PATTERN.test(name)) throw new Error("Invalid app name. Use only letters, numbers, hyphens, underscores, and dots.");
 	if (name.includes("..") || name.includes("/") || name.includes("\\")) throw new Error("Invalid app name. Path traversal characters are not allowed.");
+	if (RESERVED_NAMES.has(name.toLowerCase())) throw new Error(`'${name}' is a reserved name and cannot be used as an app name.`);
 };
 const validateReleaseId = (releaseId) => {
 	if (!releaseId || !ULID_PATTERN.test(releaseId)) throw new Error("Invalid release ID. Must be a 26-character ULID.");
@@ -791,6 +829,38 @@ dbRoute.delete("/:name", requireScope("rw"), async (c) => {
 	});
 });
 //#endregion
+//#region src/core/diagnostics.ts
+const getServiceState = async (name) => {
+	try {
+		const { stdout } = await execa("systemctl", ["is-active", name]);
+		return stdout.trim();
+	} catch {
+		return "unknown";
+	}
+};
+const getServiceLogs = async (name, lines = 20) => {
+	try {
+		const { stdout } = await execa("journalctl", [
+			"-u",
+			name,
+			"--no-pager",
+			"-n",
+			String(lines)
+		]);
+		return stdout.split("\n").filter(Boolean);
+	} catch {
+		return [];
+	}
+};
+const getListeningPorts = async () => {
+	try {
+		const { stdout } = await execa("ss", ["-tlnp"]);
+		return stdout.split("\n").filter(Boolean);
+	} catch {
+		return [];
+	}
+};
+//#endregion
 //#region src/routes/apps.ts
 const appsRoute = new Hono();
 appsRoute.get("/", async (c) => {
@@ -808,6 +878,52 @@ appsRoute.get("/", async (c) => {
 		return c.json([]);
 	}
 });
+appsRoute.get("/:name/status", async (c) => {
+	const name = c.req.param("name");
+	const lines = Math.min(parseInt(c.req.query("lines") || "20", 10), 100);
+	try {
+		validateAppName(name);
+	} catch (err) {
+		return c.json({ error: err instanceof Error ? err.message : "Invalid input" }, 400);
+	}
+	const currentRelease = await getCurrentRelease(name);
+	const ports = await listAllInstances(name);
+	const lastDeployStatus = currentRelease ? await fs.readFile(path.join(currentRelease.path, "status"), "utf-8").catch(() => null) : null;
+	const instances = await Promise.all(ports.map(async (port) => {
+		const state = await getServiceState(`${name}@${port}`);
+		const logs = await getServiceLogs(`${name}@${port}`, lines);
+		return {
+			port: Number(port),
+			state,
+			logs
+		};
+	}));
+	return c.json({
+		name,
+		currentRelease: currentRelease?.id ?? null,
+		lastDeploy: lastDeployStatus ? {
+			releaseId: currentRelease.id,
+			status: lastDeployStatus.trim()
+		} : null,
+		instances
+	});
+});
+appsRoute.post("/:name/restart", requireScope("rw"), async (c) => {
+	const name = c.req.param("name");
+	try {
+		validateAppName(name);
+	} catch (err) {
+		return c.json({ error: err instanceof Error ? err.message : "Invalid input" }, 400);
+	}
+	const ports = await listAllInstances(name);
+	if (ports.length === 0) return c.json({ error: "No instances found for this app" }, 404);
+	await Promise.all(ports.map((port) => stop(`${name}@${port}`)));
+	await Promise.all(ports.map((port) => start(`${name}@${port}`)));
+	return c.json({
+		success: true,
+		restarted: ports.map(Number)
+	});
+});
 //#endregion
 //#region src/routes/logs.ts
 const logsRoute = new Hono();
@@ -854,6 +970,48 @@ tokensRoute.delete("/:id", async (c) => {
 	return c.json({ success: true });
 });
 //#endregion
+//#region src/routes/status.ts
+const statusRoute = new Hono();
+statusRoute.get("/", async (c) => {
+	const [rpxyState, rpxyLogs, ports] = await Promise.all([
+		getServiceState("rpxy"),
+		getServiceLogs("rpxy", 20),
+		getListeningPorts()
+	]);
+	return c.json({
+		daemon: {
+			version,
+			uptime: process.uptime(),
+			port: Number(process.env.PORT) || 4e3
+		},
+		rpxy: {
+			state: rpxyState,
+			logs: rpxyLogs
+		},
+		ports
+	});
+});
+//#endregion
+//#region src/routes/system.ts
+const systemRoute = new Hono();
+systemRoute.post("/rpxy/restart", requireScope("rw"), async (c) => {
+	await restart("rpxy");
+	return c.json({
+		success: true,
+		message: "rpxy restarted"
+	});
+});
+systemRoute.post("/daemon/restart", requireScope("rw"), (c) => {
+	spawn("bash", ["-c", "sleep 1 && systemctl restart patiom-daemon"], {
+		detached: true,
+		stdio: "ignore"
+	}).unref();
+	return c.json({
+		success: true,
+		message: "Daemon restarting..."
+	});
+});
+//#endregion
 //#region src/server.ts
 const app = new Hono();
 app.onError((err, c) => {
@@ -872,6 +1030,8 @@ app.route("/db", dbRoute);
 app.route("/apps", appsRoute);
 app.route("/logs", logsRoute);
 app.route("/tokens", tokensRoute);
+app.route("/status", statusRoute);
+app.route("/system", systemRoute);
 const startServer = () => {
 	serve({
 		fetch: app.fetch,
@@ -897,81 +1057,6 @@ const detectIP = async () => {
 		return "unknown";
 	}
 };
-const configureFirewall = async (os, port) => {
-	if (!await confirm({
-		message: "Configure firewall?",
-		default: true
-	})) {
-		consola.info("Skipping firewall configuration");
-		return;
-	}
-	if (os === "ubuntu" || os === "debian") {
-		consola.start("Configuring UFW...");
-		await execa("ufw", [
-			"default",
-			"deny",
-			"incoming"
-		]);
-		await execa("ufw", [
-			"default",
-			"allow",
-			"outgoing"
-		]);
-		await execa("ufw", ["allow", "22/tcp"]);
-		await execa("ufw", ["allow", "80/tcp"]);
-		await execa("ufw", ["allow", "443/tcp"]);
-		await execa("ufw", ["allow", `${port}/tcp`]);
-		await execa("ufw", ["--force", "enable"]);
-		consola.success("UFW configured");
-	} else if ([
-		"almalinux",
-		"rocky",
-		"centos",
-		"fedora",
-		"rhel"
-	].includes(os)) {
-		consola.start("Configuring Firewalld...");
-		await execa("systemctl", [
-			"enable",
-			"--now",
-			"firewalld"
-		]);
-		await execa("firewall-cmd", [
-			"--permanent",
-			"--zone=public",
-			"--add-port=22/tcp"
-		]);
-		await execa("firewall-cmd", [
-			"--permanent",
-			"--zone=public",
-			"--add-port=80/tcp"
-		]);
-		await execa("firewall-cmd", [
-			"--permanent",
-			"--zone=public",
-			"--add-port=443/tcp"
-		]);
-		await execa("firewall-cmd", [
-			"--permanent",
-			"--zone=public",
-			"--add-port",
-			`${port}/tcp`
-		]);
-		await execa("firewall-cmd", ["--reload"]);
-		await execa("setsebool", [
-			"-P",
-			"httpd_can_network_connect",
-			"1"
-		]);
-		consola.success("Firewalld configured");
-	} else consola.warn(`Unsupported OS for firewall: ${os}`);
-};
-const configureACME = async () => {
-	return { email: await input({
-		message: "Email for Let's Encrypt certificates:",
-		validate: (v) => v.includes("@") ? true : "Please enter a valid email"
-	}) };
-};
 const setupPatiomDirs = async () => {
 	await fs.mkdir(PATIOM_ROOT, { recursive: true });
 	await fs.mkdir(path.join(PATIOM_ROOT, "apps"), { recursive: true });
@@ -1010,7 +1095,7 @@ const installServices = async (nodeBinPath) => {
 	await start("patiom-daemon");
 	consola.success("Patiom daemon started");
 };
-const setup = async () => {
+const setup = async (email) => {
 	console.log("");
 	consola.info("Patiom Server Setup");
 	console.log("");
@@ -1020,9 +1105,6 @@ const setup = async () => {
 		consola.error("Unsupported OS. Please use Ubuntu, Debian, AlmaLinux, Rocky, CentOS, Fedora, or RHEL.");
 		process.exit(1);
 	}
-	await configureFirewall(os, DAEMON_PORT);
-	console.log("");
-	const { email } = await configureACME();
 	console.log("");
 	consola.start("Setting up Patiom...");
 	await setupPatiomDirs();
@@ -1042,10 +1124,12 @@ const setup = async () => {
 	consola.info("Next steps:");
 	console.log(`  patiom login --url http://${ip}:${DAEMON_PORT} --token ${token}`);
 	console.log("");
+	consola.info("Firewall: ensure ports 22 (SSH), 80 (HTTP), 443 (HTTPS), and 4000 (daemon) are open");
+	console.log("");
 };
-const runSetup = async () => {
+const runSetup = async (email) => {
 	try {
-		await setup();
+		await setup(email);
 	} catch (err) {
 		consola.error("Setup failed:", err);
 		process.exit(1);
@@ -1067,9 +1151,13 @@ program.command("serve").description("Start the daemon HTTP server").option(skip
 	checkRoot(options.devSkipRootCheck);
 	startServer();
 });
-program.command("setup").description("Interactive first-time server setup").option(skipRootOpt, "Skip root check for development").action((options) => {
+program.command("setup").description("First-time server setup").requiredOption("--email <email>", "Email for Let's Encrypt certificates").option(skipRootOpt, "Skip root check for development").action((options) => {
 	checkRoot(options.devSkipRootCheck);
-	return runSetup();
+	if (!/^\S+@\S+\.\S+$/u.test(options.email)) {
+		consola.error("Invalid email format. Provide a valid email for Let's Encrypt certificates.");
+		process.exit(1);
+	}
+	return runSetup(options.email);
 });
 program.command("upgrade").description("Update the daemon package and restart the service").option(skipRootOpt, "Skip root check for development").action(async (options) => {
 	checkRoot(options.devSkipRootCheck);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patiom/daemon",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "type": "module",
   "bin": {
     "patiom-server": "dist/index.js"
@@ -10,7 +10,6 @@
   ],
   "dependencies": {
     "@hono/node-server": "^2.0.4",
-    "@inquirer/prompts": "^7.8.2",
     "adm-zip": "^0.5.17",
     "commander": "^15.0.0",
     "consola": "^3.4.2",