@nmakarov/cli-toolkit 0.53.0 → 0.55.0

package/dist/index.js

@@ -5587,6 +5587,16 @@ async function pruneReleases(service, paths, options = {}) {
 function sleep(ms) {
   return new Promise((resolve3) => setTimeout(resolve3, ms));
 }
+function isPidAlive(pid) {
+  const n = Number(pid);
+  if (!Number.isFinite(n) || n <= 0) return false;
+  try {
+    process.kill(n, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
 async function getPm2Process(appName, options = {}) {
   const { logger } = options;
   const { stdout } = await runCapture("bash", ["-lc", "pm2 jlist"], { logger });
@@ -5623,21 +5633,44 @@ async function waitPm2(appName, predicate, options = {}) {
     `pm2 wait timed out after ${timeoutMs}ms for ${appName} (${label}); last status=${lastStatus}`
   );
 }
+function isFreshOnline(proc, oldPid) {
+  if (proc?.pm2_env?.status !== "online") return false;
+  const pid = Number(proc.pid);
+  if (!Number.isFinite(pid) || pid <= 0) return false;
+  if (oldPid != null) {
+    if (pid === oldPid) return false;
+    if (isPidAlive(oldPid)) return false;
+  }
+  return true;
+}
 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`);
     return;
   }
+  let oldPid = null;
+  if (appName) {
+    const before = await getPm2Process(appName, { logger });
+    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})`);
+    }
+  }
   await runShell(`pm2 startOrReload "${paths.ecosystem}" --update-env`, { logger });
   logger.info("pm2 reloaded");
   if (appName) {
-    await waitPm2(
+    const proc = await waitPm2(
       appName,
-      (proc) => proc?.pm2_env?.status === "online",
-      { timeoutMs: waitTimeoutMs, logger, label: "online after reload" }
+      (p) => isFreshOnline(p, oldPid),
+      {
+        timeoutMs: waitTimeoutMs,
+        logger,
+        label: oldPid ? `online on new pid (old ${oldPid} gone)` : "online after reload"
+      }
     );
-    logger.info(`pm2 ${appName} online`);
+    logger.info(`pm2 ${appName} online pid=${proc?.pid ?? "?"}`);
   }
 }
 async function stopPm2(appName, options = {}) {
@@ -5655,10 +5688,15 @@ async function stopPm2(appName, options = {}) {
     logger.info(`pm2 ${appName}: already stopped`);
     return;
   }
+  const oldPid = Number(before.pid);
   await runShell(`pm2 stop "${appName}"`, { logger });
   await waitPm2(
     appName,
-    (proc) => !proc || proc.pm2_env?.status === "stopped",
+    (proc) => {
+      if (proc && proc.pm2_env?.status !== "stopped") return false;
+      if (Number.isFinite(oldPid) && oldPid > 0 && isPidAlive(oldPid)) return false;
+      return true;
+    },
     { timeoutMs: waitTimeoutMs, logger, label: "stopped" }
   );
   logger.info(`pm2 ${appName} stopped`);
@@ -5672,12 +5710,12 @@ async function startPm2(paths, options = {}) {
   await runShell(`pm2 start "${paths.ecosystem}" --update-env`, { logger });
   logger.info("pm2 started");
   if (appName) {
-    await waitPm2(
+    const proc = await waitPm2(
       appName,
-      (proc) => proc?.pm2_env?.status === "online",
+      (p) => isFreshOnline(p, null),
       { timeoutMs: waitTimeoutMs, logger, label: "online after start" }
     );
-    logger.info(`pm2 ${appName} online`);
+    logger.info(`pm2 ${appName} online pid=${proc?.pid ?? "?"}`);
   }
 }
 
@@ -9206,6 +9244,8 @@ export {
   installDeps,
   installOperatorShell,
   ipcFileLogsTableNameForSourceResource,
+  isFreshOnline,
+  isPidAlive,
   joiEdateType,
   joiStringArrayType,
   listServicesRegistry as listAliveRunnerHeartbeats,