@nmakarov/cli-toolkit 0.77.0 → 0.79.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);
@@ -6315,6 +6320,12 @@ function resolveKillTimeoutMs(pm2) {
   if (Number.isFinite(stopSec) && stopSec > 0) return Math.floor(stopSec * 1e3) + 5e3;
   return 65e3;
 }
+var DEFAULT_KILL_RETRY_TIME_MS = 1e4;
+function resolveKillRetryTimeMs(pm2) {
+  const explicit = Number(pm2?.killRetryTime);
+  if (Number.isFinite(explicit) && explicit > 0) return Math.floor(explicit);
+  return DEFAULT_KILL_RETRY_TIME_MS;
+}
 function resolvePm2Args(pm2) {
   const base = String(pm2?.args ?? "").trim();
   const stopSec = Number(pm2?.stopAllowance);
@@ -6338,6 +6349,7 @@ function buildEcosystemConfig(service, paths) {
   const outLog = join9(paths.logs, `${pm2.appName}.out.log`);
   const errLog = join9(paths.logs, `${pm2.appName}.err.log`);
   const killTimeoutMs = resolveKillTimeoutMs(pm2);
+  const killRetryTimeMs = resolveKillRetryTimeMs(pm2);
   const args = resolvePm2Args(pm2);
   const ensureEnv = paths.ensureEnv;
   return `/**
@@ -6363,6 +6375,9 @@ module.exports = {
             max_memory_restart: "1500M",
             // Grace window after SIGINT/SIGTERM before SIGKILL (ms). Align with --stopAllowance.
             kill_timeout: ${killTimeoutMs},
+            // How often pm2 re-checks / logs "failed to kill - retrying in \u2026"
+            // while waiting for graceful exit (pm2 default 100ms \u2192 noisy logs).
+            kill_retry_time: ${killRetryTimeMs},
             out_file: "${outLog}",
             error_file: "${errLog}",
             merge_logs: true,