@patiom/daemon 0.0.2 → 0.0.4

package/dist/index.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 import { consola } from "consola";
 import { program } from "commander";
 import { readFileSync } from "node:fs";
@@ -13,9 +14,8 @@ 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";
 //#region package.json
-var version = "0.0.2";
+var version = "0.0.4";
 //#endregion
 //#region src/config.ts
 const PATIOM_ROOT = "/var/lib/patiom";
@@ -406,7 +406,7 @@ After=network.target
 
 [Service]
 Type=exec
-ExecStart=${nodeBinPath}/patiom-server serve
+ExecStart=/usr/local/bin/patiom-server serve
 Restart=always
 Environment=PORT=${port}
 Environment=PATH=${nodeBinPath}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
@@ -896,81 +896,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 });
@@ -1009,7 +934,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("");
@@ -1019,9 +944,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();
@@ -1041,10 +963,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);
@@ -1066,9 +990,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,16 +1,15 @@
 {
   "name": "@patiom/daemon",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "type": "module",
   "bin": {
-    "patiom-server": "./dist/index.js"
+    "patiom-server": "dist/index.js"
   },
   "files": [
     "dist"
   ],
   "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",