@nmakarov/cli-toolkit 0.57.0 → 0.61.0

package/dist/index.cjs

@@ -3735,6 +3735,12 @@ var Db = class _Db {
       }
       if (!dbConnectionString) {
         if (!dbName) {
+          const env = context?.args?.env;
+          if (env && String(env).toLowerCase() !== "local") {
+            throw new ParamError(
+              `Db: dbName not set for env="${env}" (set --dbName or DB_NAME_${String(env).toUpperCase()})`
+            );
+          }
           dbName = "local";
         }
         const paramName = `dbConnectionString${capitalizeFirstLetter(dbName)}`;
@@ -5813,10 +5819,47 @@ function isFreshOnline(proc, oldPid) {
   }
   return true;
 }
+async function deletePm2App(appName, options = {}) {
+  const { dryRun = false, logger = console, waitTimeoutMs = 65e3, oldPid = null } = options;
+  if (dryRun) {
+    logger.info(`[dryRun] would pm2 delete ${appName}`);
+    return;
+  }
+  const before = await getPm2Process(appName, { logger });
+  if (!before) {
+    logger.info(`pm2 ${appName}: not present (skip delete)`);
+    return;
+  }
+  await runShell(`pm2 delete "${appName}"`, { logger });
+  await waitPm2(
+    appName,
+    (proc) => {
+      if (proc) return false;
+      if (oldPid != null && isPidAlive(oldPid)) return false;
+      return true;
+    },
+    { timeoutMs: waitTimeoutMs, logger, label: "deleted (process gone)" }
+  );
+  logger.info(`pm2 ${appName} deleted`);
+}
+async function startFromEcosystem(paths, options = {}) {
+  const { dryRun = false, logger = console } = options;
+  if (dryRun) {
+    logger.info(`[dryRun] would pm2 start ${paths.ecosystem} --update-env`);
+    return;
+  }
+  await runShell(
+    `ENV=production NODE_ENV=production pm2 start "${paths.ecosystem}" --update-env`,
+    { logger }
+  );
+  logger.info("pm2 started from ecosystem");
+}
 async function reloadPm2(paths, options = {}) {
   const { dryRun = false, logger = console, appName = null, waitTimeoutMs = 65e3 } = options;
   if (dryRun) {
-    logger.info(`[dryRun] would pm2 startOrReload ${paths.ecosystem} --update-env`);
+    logger.info(
+      `[dryRun] would pm2 delete${appName ? ` ${appName}` : ""} + start ${paths.ecosystem} --update-env`
+    );
     return;
   }
   let oldPid = null;
@@ -5825,11 +5868,15 @@ async function reloadPm2(paths, options = {}) {
     const n = Number(before?.pid);
     if (Number.isFinite(n) && n > 0 && before?.pm2_env?.status === "online") {
       oldPid = n;
-      logger.info(`pm2 ${appName}: reloading (old pid=${oldPid})`);
+      logger.info(`pm2 ${appName}: recreate (old pid=${oldPid})`);
     }
+    await deletePm2App(appName, { dryRun, logger, waitTimeoutMs, oldPid });
+  } else {
+    logger.warn?.(
+      "reloadPm2: appName missing; starting ecosystem without delete (pass appName so script/env always recreate cleanly)"
+    );
   }
-  await runShell(`pm2 startOrReload "${paths.ecosystem}" --update-env`, { logger });
-  logger.info("pm2 reloaded");
+  await startFromEcosystem(paths, { dryRun, logger });
   if (appName) {
     const proc = await waitPm2(
       appName,
@@ -5837,7 +5884,7 @@ async function reloadPm2(paths, options = {}) {
       {
         timeoutMs: waitTimeoutMs,
         logger,
-        label: oldPid ? `online on new pid (old ${oldPid} gone)` : "online after reload"
+        label: oldPid ? `online on new pid (old ${oldPid} gone)` : "online after recreate"
       }
     );
     logger.info(`pm2 ${appName} online pid=${proc?.pid ?? "?"}`);
@@ -5874,11 +5921,15 @@ async function stopPm2(appName, options = {}) {
 async function startPm2(paths, options = {}) {
   const { dryRun = false, logger = console, appName = null, waitTimeoutMs = 65e3 } = options;
   if (dryRun) {
-    logger.info(`[dryRun] would pm2 start ${paths.ecosystem} --update-env`);
+    logger.info(
+      `[dryRun] would pm2 delete${appName ? ` ${appName}` : ""} + start ${paths.ecosystem} --update-env`
+    );
     return;
   }
-  await runShell(`pm2 start "${paths.ecosystem}" --update-env`, { logger });
-  logger.info("pm2 started");
+  if (appName) {
+    await deletePm2App(appName, { dryRun, logger, waitTimeoutMs });
+  }
+  await startFromEcosystem(paths, { dryRun, logger });
   if (appName) {
     const proc = await waitPm2(
       appName,
@@ -6132,11 +6183,12 @@ function resolvePm2Args(pm2) {
 function buildEnsureEnvScript() {
   return `/**
  * Written by cli-toolkit deploy (init-structure). Do not hand-edit.
- * Preloaded via pm2 node_args --require so Args sees ENV=production even when
- * a post-SIGKILL restart briefly omits ecosystem env (otherwise Db \u2192 local:6032).
+ * Preloaded via pm2 node_args --require. Always set (do not only fill when unset):
+ * \`pm2 start \u2026 --update-env\` can inject a non-production ENV from the
+ * deploy shell / prior dump, and a conditional assign would leave it in place.
  */
-if (!process.env.ENV) process.env.ENV = "production";
-if (!process.env.NODE_ENV) process.env.NODE_ENV = "production";
+process.env.ENV = "production";
+process.env.NODE_ENV = "production";
 `;
 }
 function buildEcosystemConfig(service, paths) {
@@ -6498,7 +6550,9 @@ async function rollbackService(service, options = {}) {
     logger.info(`rollback target: v${buildInfo.version} release=${buildInfo.release ?? rollbackTarget.name}`);
   }
   await activateRelease(rollbackTarget.path, paths, { dryRun, logger });
-  await reloadPm2(paths, { dryRun, logger });
+  const appName = service.pm2?.appName ?? null;
+  const waitTimeoutMs = 65e3;
+  await reloadPm2(paths, { dryRun, logger, appName, waitTimeoutMs });
   const summary = `rollback ${activeName} \u2192 ${rollbackTarget.name} dryRun=${dryRun}`;
   if (!dryRun) await appendDeployLog(paths.deployLog, summary);
   return { from: activeName, to: rollbackTarget.name, path: rollbackTarget.path };