@nmakarov/cli-toolkit 0.73.0 → 0.76.0

package/dist/init.js

@@ -2505,7 +2505,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 {
@@ -2524,7 +2525,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) {
@@ -2544,10 +2546,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;
   }
   /**
@@ -2564,6 +2568,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);
@@ -2582,6 +2587,7 @@ var Logger = class _Logger {
       timestamp: false,
       levels: DEFAULT_LEVELS,
       progressTimes: false,
+      progressRate: false,
       progressThrottle: void 0
     };
   }
@@ -2647,15 +2653,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 ?? ""];
@@ -2720,10 +2734,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));
@@ -2783,6 +2800,7 @@ function setup(opts = {}) {
   const partialContext = {
     emitter: new EventEmitter(),
     isStop: () => false,
+    isKill: () => false,
     cleanupFunctions: [],
     registerCleanup: (fn) => {
       partialContext.cleanupFunctions.push(fn);
@@ -2804,6 +2822,7 @@ function setup(opts = {}) {
     logger,
     emitter: partialContext.emitter,
     isStop: partialContext.isStop,
+    isKill: partialContext.isKill,
     cleanupFunctions: partialContext.cleanupFunctions,
     registerCleanup: partialContext.registerCleanup,
     // For long-running scripts (servers): with --showUsedParams=top, print
@@ -2853,6 +2872,7 @@ function printAllParameters(context) {
 }
 async function init(flow, opts = {}) {
   let stop = false;
+  let kill = false;
   let context = null;
   let cleanupRan = false;
   const runRegisteredCleanups = async (ctx) => {
@@ -2882,6 +2902,7 @@ async function init(flow, opts = {}) {
     }
     context = setup(opts);
     context.isStop = () => stop;
+    context.isKill = () => kill;
     context = await setupModules(context, opts);
     const stopAfter = context.args.get("stopAfter");
     const stopAllowanceSec = Number(context.params.get("stopAllowance", "number default 60"));
@@ -2920,6 +2941,14 @@ async function init(flow, opts = {}) {
       );
       context.emitter.emit("stop", stopAllowanceMs);
     });
+    process.on("SIGUSR2", () => {
+      if (!context || kill) return;
+      kill = true;
+      stop = true;
+      context.logger.warn(">> SIGUSR2: emitting kill (urgent stop)");
+      context.emitter.emit("kill");
+      context.emitter.emit("stop", stopAllowanceMs);
+    });
     await flow(context);
   } catch (error) {
     const errorLocation = error instanceof Error && error.stack ? error.stack.split("\n")[1]?.trim() || "Unknown location" : "Unknown location";
@@ -2946,7 +2975,7 @@ async function init(flow, opts = {}) {
     }
     if (process.exitCode && process.exitCode !== 0) {
       process.exit(process.exitCode);
-    } else if (stop) {
+    } else if (stop || kill) {
       process.exit(0);
     }
   }