@nmakarov/cli-toolkit 0.76.0 → 0.78.0

package/dist/index.js

@@ -5181,6 +5181,8 @@ var Logger = class _Logger {
   options;
   transport;
   startTimes = {};
+  /** Count at the first progress sample for each prefix (rate baseline). */
+  startCounts = {};
   lastProgressTimes = {};
   constructor(context, options = {}) {
     this.context = context;
@@ -5316,15 +5318,17 @@ var Logger = class _Logger {
       total,
       prefix
     };
-    if (!this.startTimes[prefix ?? ""]) {
-      this.startTimes[prefix ?? ""] = Date.now();
+    const key = prefix ?? "";
+    if (this.startTimes[key] === void 0) {
+      this.startTimes[key] = Date.now();
+      this.startCounts[key] = count;
     }
     const wantTimes = this.options.progressTimes;
     const wantRate = this.options.progressRate;
     if (wantTimes || wantRate) {
-      const elapsedSeconds = (Date.now() - this.startTimes[prefix ?? ""]) / 1e3;
-      const intervals = count > 1 ? count - 1 : 0;
-      const itemsPerSec = intervals > 0 && elapsedSeconds > 0 ? intervals / elapsedSeconds : -1;
+      const elapsedSeconds = (Date.now() - this.startTimes[key]) / 1e3;
+      const done = count - (this.startCounts[key] ?? count);
+      const itemsPerSec = done > 0 && elapsedSeconds > 0 ? done / elapsedSeconds : -1;
       if (wantTimes) {
         let remaining = -1;
         if (itemsPerSec > 0) {
@@ -5338,8 +5342,9 @@ var Logger = class _Logger {
       }
     }
     if (count >= total) {
-      delete this.startTimes[prefix ?? ""];
-      delete this.lastProgressTimes[prefix ?? ""];
+      delete this.startTimes[key];
+      delete this.startCounts[key];
+      delete this.lastProgressTimes[key];
     }
     if (this.shouldOutputProgress(prefix ?? "", count, total)) {
       this.out(payload);
@@ -5903,16 +5908,28 @@ function isPidAlive(pid) {
     return false;
   }
 }
+function parsePm2Jlist(stdout) {
+  const raw = String(stdout ?? "");
+  const text = raw.split("\n").filter((line) => !line.startsWith("[PM2]")).join("\n").trim();
+  if (!text) return [];
+  try {
+    const parsed = JSON.parse(text);
+    return Array.isArray(parsed) ? parsed : [];
+  } catch (err) {
+    throw new Error(`pm2 jlist: invalid JSON (${err?.message ?? err})`);
+  }
+}
 async function getPm2Process(appName, options = {}) {
   const { logger } = options;
+  await runCapture("bash", ["-lc", "pm2 ping >/dev/null 2>&1 || true"], { logger }).catch(() => {
+  });
   const { stdout } = await runCapture("bash", ["-lc", "pm2 jlist"], { logger });
   let list;
   try {
-    list = JSON.parse(stdout || "[]");
+    list = parsePm2Jlist(stdout);
   } catch (err) {
     throw new Error(`pm2 jlist: invalid JSON (${err?.message ?? err})`);
   }
-  if (!Array.isArray(list)) return null;
   return list.find((p) => p?.name === appName) ?? null;
 }
 async function waitPm2(appName, predicate, options = {}) {
@@ -10107,6 +10124,7 @@ export {
   npmInstallEnv,
   organizeFooterMessages,
   parseGitHost,
+  parsePm2Jlist,
   prepareGitHost,
   provisionService,
   pruneReleases,