@patiom/daemon 0.0.6 → 0.0.8

package/dist/index.js

@@ -16,7 +16,7 @@ import { parse, stringify } from "smol-toml";
 import dotenv from "dotenv";
 import { spawn } from "node:child_process";
 //#region package.json
-var version = "0.0.6";
+var version = "0.0.8";
 //#endregion
 //#region src/config.ts
 const PATIOM_ROOT = "/var/lib/patiom";
@@ -193,23 +193,19 @@ const getCurrentRelease = async (appName) => {
 	}
 };
 //#endregion
-//#region src/core/pnpm.ts
-const hasLockfile = async (releaseDir) => {
+//#region src/core/pm.ts
+const hasPackageLock = async (releaseDir) => {
 	try {
-		await fs.access(path.join(releaseDir, "pnpm-lock.yaml"));
+		await fs.access(path.join(releaseDir, "package-lock.json"));
 		return true;
 	} catch {
 		return false;
 	}
 };
 const install = async (releaseDir, log) => {
-	const args = await hasLockfile(releaseDir) ? [
-		"install",
-		"--frozen-lockfile",
-		"--prod"
-	] : ["install", "--prod"];
-	log(`Running: pnpm ${args.join(" ")}`);
-	const proc = execa("pnpm", args, {
+	const args = await hasPackageLock(releaseDir) ? ["ci", "--omit=dev"] : ["install", "--omit=dev"];
+	log(`Running: npm ${args.join(" ")}`);
+	const proc = execa("npm", args, {
 		cwd: releaseDir,
 		stdout: "pipe",
 		stderr: "pipe"
@@ -400,15 +396,16 @@ const ensureStorageDir = async (appName, storageFolder, log) => {
 const appServiceTemplate = ({ nodeBinPath, startScript }) => `[Unit]
 Description=Patiom App: %p (port %i)
 After=network.target
+StartLimitIntervalSec=0
 
 [Service]
 Type=exec
 WorkingDirectory=${PATIOM_ROOT}/apps/%p/current
-ExecStart=/usr/local/bin/pnpm run ${startScript}
+ExecStart=npm run ${startScript}
 Restart=always
+RestartSec=5
 EnvironmentFile=${PATIOM_ROOT}/apps/%p/shared/.env
 Environment=PORT=%i
-Environment=npm_config_verifyDepsBeforeRun=false
 Environment=PATH=${nodeBinPath}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 DynamicUser=yes
@@ -422,10 +419,12 @@ WantedBy=multi-user.target
 const rpxyServiceTemplate = ({ rpxyBinPath }) => `[Unit]
 Description=rpxy Reverse Proxy
 After=network.target
+StartLimitIntervalSec=0
 
 [Service]
 ExecStart=${rpxyBinPath} --config /etc/rpxy/config.toml
 Restart=always
+RestartSec=5
 LimitNOFILE=65536
 
 [Install]
@@ -434,11 +433,13 @@ WantedBy=multi-user.target
 const daemonServiceTemplate = ({ nodeBinPath, port }) => `[Unit]
 Description=Patiom Daemon
 After=network.target
+StartLimitIntervalSec=0
 
 [Service]
 Type=exec
-ExecStart=/usr/local/bin/patiom-server serve
+ExecStart=${nodeBinPath}/patiom-server serve
 Restart=always
+RestartSec=5
 Environment=PORT=${port}
 Environment=PATH=${nodeBinPath}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
@@ -626,7 +627,7 @@ const executeDeploy = async (name, releaseId, zipBuffer, domains, sslipDomain, i
 	await install(releaseDir, log);
 	await log("Detecting start script...");
 	const startScript = await getStartScript(releaseDir);
-	await log(`Using start script: pnpm run ${startScript}`);
+	await log(`Using start script: npm run ${startScript}`);
 	await log("Writing systemd unit file...");
 	await writeUnitFile(name, startScript);
 	await log("Allocating ports...");
@@ -640,7 +641,11 @@ const executeDeploy = async (name, releaseId, zipBuffer, domains, sslipDomain, i
 		const sslip = await buildSslipDomain(name);
 		if (sslip) allDomains.push(sslip);
 	}
-	if (allDomains.length > 0) await updateRpxyConfig(name, allDomains, ports, log);
+	if (allDomains.length > 0) {
+		await updateRpxyConfig(name, allDomains, ports, log);
+		log("Restarting rpxy...");
+		await restart("rpxy");
+	}
 	await log(`Deployment complete!`);
 	await log(`Domains: ${allDomains.join(", ") || "none"}`);
 	await log(`Ports: ${ports.join(", ")}`);
@@ -1165,8 +1170,8 @@ program.command("upgrade").description("Update the daemon package and restart th
 	consola.info(`Current version: ${version}`);
 	let latest = null;
 	try {
-		const { stdout } = await execa("pnpm", [
-			"info",
+		const { stdout } = await execa("npm", [
+			"view",
 			"@patiom/daemon",
 			"version"
 		]);
@@ -1180,11 +1185,16 @@ program.command("upgrade").description("Update the daemon package and restart th
 	}
 	if (latest) consola.info(`Latest version: ${latest}`);
 	consola.start("Updating @patiom/daemon...");
-	await execa("pnpm", [
-		"update",
+	await execa("npm", [
+		"uninstall",
 		"-g",
 		"@patiom/daemon"
 	]);
+	await execa("npm", [
+		"install",
+		"-g",
+		"@patiom/daemon@latest"
+	]);
 	const pkgPath = path.resolve(import.meta.dirname, "..", "package.json");
 	const newVersion = JSON.parse(readFileSync(pkgPath, "utf-8")).version;
 	consola.success(`Updated to ${newVersion}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patiom/daemon",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "type": "module",
   "bin": {
     "patiom-server": "dist/index.js"