@nmakarov/cli-toolkit 0.75.0 → 0.77.0

package/dist/index.js

@@ -5171,7 +5171,8 @@ var LEVEL_COLORS = {
   silly: chalk.gray,
   request: chalk.green,
   response: chalk.yellow,
-  progress: chalk.green,
+  // Magenta stands out from white info / green request lines.
+  progress: chalk.magentaBright,
   results: chalk.magenta
 };
 var Logger = class _Logger {
@@ -5190,7 +5191,8 @@ var Logger = class _Logger {
     this.updateTransport();
   }
   /**
-   * Configure logger options. Accepts both LoggerOptions shape and flat param names (levels string, progressWithTimes, progressThrottleMs).
+   * Configure logger options. Accepts both LoggerOptions shape and flat param names
+   * (levels string, progressWithTimes, progressWithRate, progressThrottleMs).
    */
   configure(options) {
     if (options.mode !== void 0) {
@@ -5210,10 +5212,12 @@ var Logger = class _Logger {
     }
     if (options.progress !== void 0) {
       if (options.progress.withTimes !== void 0) this.options.progressTimes = options.progress.withTimes;
+      if (options.progress.withRate !== void 0) this.options.progressRate = options.progress.withRate;
       if (options.progress.throttleMs !== void 0) this.options.progressThrottle = options.progress.throttleMs;
     }
     const flat = options;
     if (flat.progressWithTimes !== void 0) this.options.progressTimes = flat.progressWithTimes;
+    if (flat.progressWithRate !== void 0) this.options.progressRate = flat.progressWithRate;
     if (flat.progressThrottleMs !== void 0) this.options.progressThrottle = flat.progressThrottleMs;
   }
   /**
@@ -5230,6 +5234,7 @@ var Logger = class _Logger {
       timestamp: "boolean default false",
       levels: "string",
       progressWithTimes: "boolean default false",
+      progressWithRate: "boolean default false",
       progressThrottleMs: "number"
     };
     const discovered = context.params.getAllForModule("logger", paramDefs);
@@ -5248,6 +5253,7 @@ var Logger = class _Logger {
       timestamp: false,
       levels: DEFAULT_LEVELS,
       progressTimes: false,
+      progressRate: false,
       progressThrottle: void 0
     };
   }
@@ -5313,15 +5319,23 @@ var Logger = class _Logger {
     if (!this.startTimes[prefix ?? ""]) {
       this.startTimes[prefix ?? ""] = Date.now();
     }
-    if (this.options.progressTimes) {
+    const wantTimes = this.options.progressTimes;
+    const wantRate = this.options.progressRate;
+    if (wantTimes || wantRate) {
       const elapsedSeconds = (Date.now() - this.startTimes[prefix ?? ""]) / 1e3;
-      let remaining = -1;
-      if (count > 1) {
-        const rate = elapsedSeconds / (count - 1);
-        remaining = (total - count) * rate;
+      const intervals = count > 1 ? count - 1 : 0;
+      const itemsPerSec = intervals > 0 && elapsedSeconds > 0 ? intervals / elapsedSeconds : -1;
+      if (wantTimes) {
+        let remaining = -1;
+        if (itemsPerSec > 0) {
+          remaining = (total - count) / itemsPerSec;
+        }
+        payload.elapsed = this.round(elapsedSeconds, 2);
+        payload.remaining = remaining >= 0 ? this.round(remaining, 2) : remaining;
+      }
+      if (wantRate) {
+        payload.rate = itemsPerSec >= 0 ? this.round(itemsPerSec, 2) : itemsPerSec;
       }
-      payload.elapsed = this.round(elapsedSeconds, 2);
-      payload.remaining = remaining >= 0 ? this.round(remaining, 2) : remaining;
     }
     if (count >= total) {
       delete this.startTimes[prefix ?? ""];
@@ -5386,10 +5400,13 @@ var Logger = class _Logger {
       parts.push(formatter.bold(struct.message));
     }
     if (struct.level === "progress") {
+      const formatter = LEVEL_COLORS[struct.level];
       if (struct.elapsed !== void 0 && struct.remaining !== void 0) {
-        const formatter = LEVEL_COLORS[struct.level];
         parts.push(formatter(`${struct.elapsed}/${struct.remaining}`));
       }
+      if (struct.rate !== void 0) {
+        parts.push(formatter(struct.rate >= 0 ? `${struct.rate}/s` : "-/s"));
+      }
     }
     if (struct.chunks && struct.chunks.length) {
       parts.push(this.inspectChunks(struct.chunks));
@@ -5886,16 +5903,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 = {}) {
@@ -8360,6 +8389,7 @@ var LOGGER_RUNTIME_KEYS = [
   "route",
   "prefix",
   "progressWithTimes",
+  "progressWithRate",
   "progressThrottleMs"
 ];
 var DEFAULT_RUNTIME_PARAM_SPECS = [
@@ -8471,6 +8501,7 @@ function coerceRuntimeValue(key, value) {
     case "showLevel":
     case "timestamp":
     case "progressWithTimes":
+    case "progressWithRate":
       if (typeof value === "boolean") return value;
       if (value === "true" || value === "1") return true;
       if (value === "false" || value === "0") return false;
@@ -10088,6 +10119,7 @@ export {
   npmInstallEnv,
   organizeFooterMessages,
   parseGitHost,
+  parsePm2Jlist,
   prepareGitHost,
   provisionService,
   pruneReleases,