@selvajs/cli 4.20.0-beta.29 → 4.20.0-beta.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@selvajs/cli",
-  "version": "4.20.0-beta.29",
+  "version": "4.20.0-beta.30",
   "description": "Scaffold and operate a Selva white-label deployment. `npx @selvajs/cli <dir>` to bootstrap, `selva <cmd>` to manage.",
   "license": "MIT",
   "author": "VektorNode",

package/src/checks/runtime.js

@@ -17,6 +17,7 @@ import { join } from 'node:path';
 import { homedir } from 'node:os';
 import { fixable, green, red, yellow } from './result.js';
 import { PM2_VERSION } from '../deployment-package.js';
+import { APP_NAME } from '../commands/pm2.js';
 
 /** The real OS. Tests pass a stand-in with the same shape. */
 export const runtimeEnv = {
@@ -245,7 +246,12 @@ function checkPm2Daemon(dir, env) {
 	const output = String(probe.stdout ?? '') + String(probe.stderr ?? '');
 
 	if (!/out-of-date/i.test(output)) {
-		if (/pong/i.test(output)) return [green('pm2 daemon responds and matches the local pm2')];
+		if (/pong/i.test(output)) {
+			return [
+				green('pm2 daemon responds and matches the local pm2'),
+				checkAppProcess(bin, dir, env)
+			];
+		}
 		return [yellow('pm2 daemon did not answer `pm2 ping` — check `npx pm2 ping` by hand')];
 	}
 
@@ -267,10 +273,37 @@ function checkPm2Daemon(dir, env) {
 		yellow(
 			`pm2 daemon (v${daemon ?? 'unknown'}) differs from the local pm2 (v${local ?? PM2_VERSION}).\n     ` +
 				'Resync it — this briefly restarts managed processes: npx pm2 update'
-		)
+		),
+		checkAppProcess(bin, dir, env)
 	];
 }
 
+// A live daemon says nothing about the app: an interrupted `pm2 update` leaves
+// the daemon up with an empty process table, and every other check still
+// passes. Only called once the daemon is confirmed alive, so `jlist` can't
+// spawn one.
+function checkAppProcess(bin, dir, env) {
+	const r = env.run(bin, ['jlist'], { cwd: dir });
+	// A skewed daemon prints its out-of-date banner ahead of the JSON.
+	const json = String(r.stdout ?? '')
+		.split('\n')
+		.find((line) => line.trimStart().startsWith('['));
+	let list;
+	try {
+		list = JSON.parse(json ?? '');
+	} catch {
+		return yellow(`could not read the pm2 process list — check \`npx pm2 list\` by hand`);
+	}
+	const app = list.find((proc) => proc.name === APP_NAME);
+	const status = app?.pm2_env?.status;
+	if (status === 'online') return green(`${APP_NAME} is online`);
+	return red(
+		`${APP_NAME} is ${app ? `'${status}'` : 'not registered with pm2'} — the app is down.\n     ` +
+			'Start it, then save the list so a reboot brings it back:\n     ' +
+			'npx selva start && npx pm2 save'
+	);
+}
+
 // ── pm2 log rotation ────────────────────────────────────────────────────
 
 // pm2 appends to `$PM2_HOME/logs/*.log` forever. Nothing in a default install
@@ -352,7 +385,6 @@ function installLogRotate(bin, dir, env) {
 }
 
 function parseSkew(output) {
-	// eslint-disable-next-line no-control-regex -- pm2 colourises via chalk on a TTY
 	const clean = output.replace(/\[[0-9;]*m/g, '');
 	return {
 		daemon: /In memory PM2 version:\s*v?(\d+\.\d+\.\d+)/i.exec(clean)?.[1] ?? null,

package/src/commands/pm2.js

@@ -188,6 +188,8 @@ export async function runUpdate() {
 	const after = readRuntimeVersion(dir);
 	p.log.info(`New @selvajs/selva:     ${after ?? 'unknown'}`);
 
+	realignPm2Pin(dir, s);
+
 	if (supabase) {
 		// Provider code is bundled into @selvajs/selva, but the migration SQL ships
 		// here. Left behind, `selva-supabase` copies nothing new. Installed by tag,
@@ -245,6 +247,53 @@ export async function runUpdate() {
 	process.exitCode = 1;
 }
 
+// Moves the deployment onto the pm2 the just-installed CLI pins, then swaps the
+// daemon. Without it a release that bumps pm2 needs `selva migrate` and
+// `pm2 update` by hand on every host. Runs from the OLD CLI, so the pin is read
+// from the new one on disk. The app is stopped here, so the swap costs no
+// extra downtime. A failure leaves the old pm2 working: warn, don't abort.
+function readPm2Pins(dir) {
+	const read = (path) => {
+		try {
+			return JSON.parse(readFileSync(path, 'utf8'));
+		} catch {
+			return null;
+		}
+	};
+	return {
+		declared: read(join(dir, 'package.json'))?.dependencies?.pm2 ?? null,
+		pinned:
+			read(join(dir, 'node_modules', '@selvajs', 'cli', 'package.json'))?.devDependencies?.pm2 ??
+			null
+	};
+}
+
+function realignPm2Pin(dir, s) {
+	const { declared, pinned } = readPm2Pins(dir);
+	if (!pinned || pinned === declared) return;
+
+	s.start(`npm install pm2@${pinned}`);
+	try {
+		execSync(`npm install --save --save-exact --prefer-online pm2@${pinned}`, {
+			cwd: dir,
+			stdio: 'pipe'
+		});
+		s.stop(`pm2 ${declared ?? '(none)'} → ${pinned}`);
+	} catch (err) {
+		s.stop(`npm install pm2@${pinned} failed`);
+		p.log.warn(
+			`${String(err.stderr ?? err.message ?? err).trim()}\n` +
+				'The previous pm2 still runs the app. Retry with `npx selva migrate`.'
+		);
+		return;
+	}
+	try {
+		ensurePm2InSync(dir);
+	} catch (err) {
+		p.log.warn(`${err instanceof Error ? err.message : err}`);
+	}
+}
+
 // The app was stopped before the update, so the first answer is the new process.
 async function waitForHealth(env, timeoutMs = 30_000) {
 	const host = !env.HOST || env.HOST === '0.0.0.0' || env.HOST === '::' ? '127.0.0.1' : env.HOST;