@selvajs/cli 4.8.0-beta.10 → 4.8.0-beta.11

package/src/deployment-package.js

@@ -3,6 +3,10 @@
 // than in either command — two copies drifted once already, and the pm2 pin is
 // exactly the field where a silent difference costs the most.
 
+import { readFileSync } from 'node:fs';
+import { join, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
 /**
  * pm2 is pinned exactly, not caret-ranged.
  *
@@ -10,8 +14,29 @@
  * two deployments installed a week apart resolve differently, and the newer one
  * silently adopts the daemon the older one started — the skew `ensurePm2InSync`
  * has to detect and, in the daemon-is-newer direction, cannot repair (#118).
+ *
+ * Read from this package's own devDependencies rather than written here as a
+ * literal. Dependabot scans manifests, not source, so a literal is invisible to
+ * it — this pin sat on 5.4.3 while upstream reached 7.x, which is precisely the
+ * drift operators point at when they argue for distro packages instead.
+ * `checkPinIsExact` keeps the manifest entry from being loosened to a range.
  */
-const PM2_VERSION = '5.4.3';
+const PM2_VERSION = readPinnedPm2Version();
+
+function readPinnedPm2Version() {
+	const manifest = JSON.parse(
+		readFileSync(join(dirname(fileURLToPath(import.meta.url)), '..', 'package.json'), 'utf8')
+	);
+	const pinned = manifest.devDependencies?.pm2;
+	if (!pinned || !/^\d+\.\d+\.\d+$/.test(pinned)) {
+		throw new Error(
+			`@selvajs/cli devDependencies.pm2 must be an exact version, got ${JSON.stringify(pinned)}. ` +
+				`Every deployment this CLI scaffolds inherits it, and a range there lets two ` +
+				`installs resolve different pm2s that then fight over one daemon.`
+		);
+	}
+	return pinned;
+}
 
 const SCRIPTS = {
 	start: 'selva start',
@@ -33,6 +58,21 @@ const DEPENDENCIES = {
 	pm2: PM2_VERSION
 };
 
+/**
+ * npm `overrides` forced onto every deployment — security patches for
+ * transitive deps whose direct parent hasn't picked up the fix yet. Each entry
+ * is a temporary shim: remove it once the parent ships the fixed version on
+ * its own (the override then matches what would install anyway, so removal is
+ * cleanup, never urgent).
+ *
+ * js-yaml: pm2 <= 7.0.3 pins 4.3.0, which carries the quadratic-complexity
+ * DoS advisories (GHSA-5p4m-2wfm-xmqj and friends); the fix landed in 4.3.1.
+ * Drop when pm2's own js-yaml dependency reaches >= 4.3.1.
+ */
+export const OVERRIDES = {
+	'js-yaml': '^4.3.1'
+};
+
 /**
  * Legacy `@selvajs/*` packages that a deployment may still list. Each was
  * either renamed or folded into `@selvajs/selva`; `migrate` drops them and
@@ -68,7 +108,8 @@ export function buildDeploymentPackageJson({ name, version = '0.1.0', engines })
 		private: true,
 		type: 'module',
 		scripts: { ...SCRIPTS },
-		dependencies: { ...DEPENDENCIES }
+		dependencies: { ...DEPENDENCIES },
+		overrides: { ...OVERRIDES }
 	};
 	if (engines && typeof engines === 'object') pkg.engines = { ...engines };
 	return pkg;
@@ -86,11 +127,11 @@ export const CANONICAL_FIELDS = new Set([
 	'type',
 	'scripts',
 	'dependencies',
+	'overrides',
 	'engines'
 ]);
 
 export function sanitizePackageName(name) {
-	// npm package names: lowercase, no spaces, limited punctuation.
 	return (
 		String(name ?? '')
 			.toLowerCase()

package/src/env.js

@@ -2,13 +2,10 @@
 
 import { readFileSync, writeFileSync, existsSync } from 'node:fs';
 
-/**
- * Old env name → its replacement, for keys renamed without changing meaning.
- * The server still reads each old name for one minor version and warns at boot
- * (`readRenamed` in `@selvajs/server` `resolveComputeLimits`); `selva doctor`
- * reports them and `selva migrate` rewrites them. Keep in sync with that list,
- * and drop an entry when the server stops reading it.
- */
+// Old env name → its replacement, for keys renamed without changing meaning.
+// The server still reads each old name for one minor version and warns at
+// boot; keep this in sync with the server's list and drop an entry once the
+// server stops reading it.
 export const RENAMED_ENV_VARS = {
 	COMPUTE_DEFINITION_BYTE_CACHE_MB: 'COMPUTE_DEFINITION_CACHE_MB',
 	COMPUTE_RESPONSE_CACHE_MB: 'COMPUTE_SOLVE_CACHE_MB',
@@ -16,16 +13,12 @@ export const RENAMED_ENV_VARS = {
 	MAX_SOLVE_DURATION_MS: 'COMPUTE_SOLVE_DEADLINE_MS'
 };
 
-/**
- * Deprecated vars whose replacement changes the VALUE too, so they can't be
- * rewritten by renaming a key. `selva doctor` reports these; migrate leaves
- * them alone rather than guessing.
- */
+// Deprecated vars whose replacement changes the VALUE too, so a simple key
+// rename can't migrate them — `selva migrate` leaves these alone rather than guessing.
 export const REPLACED_ENV_VARS = {
 	SELVA_FLAG_COMPUTE_DEBUG_VERBOSE: 'SELVA_FLAG_COMPUTE_DEBUG=verbose'
 };
 
-// Parse a .env file into { key: value }. Preserves nothing else.
 export function parseEnv(text) {
 	const out = {};
 	for (const rawLine of text.split(/\r?\n/)) {
@@ -51,7 +44,6 @@ export function readEnvFile(path) {
 	return parseEnv(readFileSync(path, 'utf8'));
 }
 
-// Merge values into template: preserve structure, rewrite in-place, append new keys.
 export function mergeEnv(template, values) {
 	const seen = new Set();
 	const lines = template.split(/\r?\n/);
@@ -92,7 +84,6 @@ export function mergeEnv(template, values) {
 		out.push(...appended);
 	}
 
-	// Ensure single trailing newline (shell append mishap guard).
 	while (out.length > 0 && out[out.length - 1] === '') out.pop();
 	return out.join('\n') + '\n';
 }
@@ -102,17 +93,15 @@ export function writeEnvFile(path, template, values) {
 }
 
 /**
- * Rewrite deprecated keys to their current names, in place. `renames` maps old
- * name → new name. Only the key is touched — the value, comments, ordering and
- * spacing survive, so an operator's tuned file stays recognisably theirs.
+ * Rewrite deprecated keys to their current names, in place. Only the key is
+ * touched — value, comments, ordering, and spacing survive.
  *
  * A key already present under its new name is left alone and its old line is
- * dropped: the server resolves the same way (new name wins), so keeping both
- * would preserve a line that does nothing.
+ * dropped: the server resolves new-name-wins, so keeping both would preserve
+ * a line that does nothing.
  *
- * Returns `{ text, changes }` where `changes` is `[oldName, newName, 'renamed'
- * | 'dropped']` per line acted on; an empty array means the file was already
- * current and nothing should be written.
+ * Returns `{ text, changes }`, `changes` being `[oldName, newName, 'renamed'
+ * | 'dropped']` per line acted on. Empty means the file was already current.
  */
 export function renameEnvKeys(text, renames) {
 	const present = new Set(Object.keys(parseEnv(text)));

package/src/paths.js

@@ -65,9 +65,8 @@ export function readEnvTemplate(dir) {
 	return '';
 }
 
-// A deployment directory must contain an .env and an ecosystem.config.cjs.
-// Anything else (selva.config.js, node_modules) is "should be there" but the
-// CLI doesn't require it — `selva init` is allowed to fix a partial install.
+// Either .env or ecosystem.config.cjs is enough — selva.config.js and
+// node_modules are expected too, but init should still fix a partial install.
 export function isDeploymentDir(dir) {
 	return existsSync(join(dir, '.env')) || existsSync(join(dir, 'ecosystem.config.cjs'));
 }

package/src/prompts.js

@@ -18,9 +18,7 @@ export function collectConfigFromEnv(env = process.env) {
 		'local',
 		'SELVA_AUTH_PROVIDER'
 	);
-	// Default data/storage to auth — matches the prompt's "use same provider
-	// for all three" default. Header-auth has no data layer, so it falls
-	// through to local unless explicitly overridden.
+	// Header-auth has no data layer, so it falls through to local unless overridden.
 	const dataDefault = auth === 'header' ? 'local' : auth;
 	const data = pick(
 		env.SELVA_DATA_PROVIDER,
@@ -72,7 +70,6 @@ export function collectConfigFromEnv(env = process.env) {
 			values.HEADER_AUTH_DISPLAY_NAME_HEADER = env.HEADER_AUTH_DISPLAY_NAME_HEADER;
 	}
 
-	// ── Bootstrap admin ──────────────────────────────────────────────────
 	const adminRequired = auth === 'header' || tenancy === 'multi';
 	const adminEmail = env.BOOTSTRAP_INSTANCE_ADMIN_EMAIL || '';
 	if (adminRequired && !adminEmail) {
@@ -127,15 +124,11 @@ function requireEnv(env, name) {
 	return v;
 }
 
-// Run full interactive prompt sequence; return env vars. Caller decides merge vs fresh.
-// `defaults` pre-populates prompts (cheap re-run).
 export async function collectConfig({ defaults = {}, mode = 'create' } = {}) {
 	const isInit = mode === 'init';
 
 	p.intro(pc.bgCyan(pc.black(isInit ? ' selva init ' : ' Selva — new deployment ')));
 
-	// Brand prompts (SELVA_BRAND_NAME / COPYRIGHT_NAME / TAGLINE / DESCRIPTION)
-
 	const tenancy = await p.select({
 		message: 'Tenancy mode',
 		initialValue: defaults.SELVA_TENANCY ?? 'single',
@@ -169,7 +162,6 @@ export async function collectConfig({ defaults = {}, mode = 'create' } = {}) {
 	});
 	cancelOn(auth);
 
-	// Header-auth: auth-only; user must pick separate data/storage backend.
 	let data;
 	let storage;
 	if (auth === 'header') {
@@ -197,7 +189,6 @@ export async function collectConfig({ defaults = {}, mode = 'create' } = {}) {
 		cancelOn(storageChoice);
 		storage = storageChoice;
 	} else {
-		// Operators usually want same backend for all three; ask once, default the others.
 		const mixProviders = await p.confirm({
 			message: `Use ${pc.cyan(auth)} for data and storage too?`,
 			initialValue: pickSameProviderDefault(defaults, auth)
@@ -281,7 +272,6 @@ export async function collectConfig({ defaults = {}, mode = 'create' } = {}) {
 	}
 
 	if (auth === 'header') {
-		// HEADER_AUTH_DATA_DIR: ask only if data provider isn't local (fallback available).
 		if (data !== 'local') {
 			const dataDir = await p.text({
 				message: 'HEADER_AUTH_DATA_DIR — directory for header-allowlist.json',
@@ -330,7 +320,7 @@ export async function collectConfig({ defaults = {}, mode = 'create' } = {}) {
 			providerValues.HEADER_AUTH_DISPLAY_NAME_HEADER = stringValue(display);
 		}
 
-		// Header-auth: default to loopback (not enforced; Docker networks may override).
+		// Not enforced — a Docker network can still route to the container on another host.
 		const bindLoopback = await p.confirm({
 			message: 'Bind the app to 127.0.0.1 only? (recommended for header-auth)',
 			initialValue: !defaults.HOST || defaults.HOST === '127.0.0.1' || defaults.HOST === 'localhost'
@@ -339,7 +329,6 @@ export async function collectConfig({ defaults = {}, mode = 'create' } = {}) {
 		providerValues.HOST = bindLoopback ? '127.0.0.1' : stringValue(defaults.HOST);
 	}
 
-	// Bootstrap admin (checked only while no admin exists; safe to leave set).
 	if (auth === 'header') {
 		p.note(
 			[
@@ -494,10 +483,11 @@ export async function collectConfig({ defaults = {}, mode = 'create' } = {}) {
 	return values;
 }
 
-// Init: default to "same provider" only if current .env already shows that.
 function pickSameProviderDefault(defaults, auth) {
 	const data = defaults.SELVA_DATA_PROVIDER ?? auth;
 	const storage = defaults.SELVA_STORAGE_PROVIDER ?? auth;
+	// No existing defaults means a fresh `create`, not a re-prompted `init` — default to
+	// "same provider for all three" since there's nothing yet to disagree with auth.
 	if (!defaults.SELVA_DATA_PROVIDER && !defaults.SELVA_STORAGE_PROVIDER) return true;
 	return data === auth && storage === auth;
 }