@flowscripter/dynamic-cli-framework 5.4.10 → 5.4.11

package/dist/src/service/printer/terminal/Progress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Progress.d.ts","sourceRoot":"","sources":["../../../../../src/service/printer/terminal/Progress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,KAAK,QAAQ,MAAM,+BAA+B,CAAC;AAM1D,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAkBxE,MAAM,CAAC,OAAO,OAAO,QAAQ;;IAe3B,YAAmB,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAGpD;IAEM,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CA4BjF;IA4BM,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAyBrE;IAEY,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAe/C;IAEY,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAKpC;IAEY,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAqBlC;IAEM,MAAM,IAAI,IAAI,CAapB;IA0JD,IAAI,aAAa,CAAC,KAAK,EAAE,MAAM,EAE9B;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,MAAM,EAE/B;IAED,IAAI,UAAU,CAAC,KAAK,EAAE,MAAM,EAE3B;IAED,IAAI,UAAU,CAAC,KAAK,EAAE,MAAM,EAE3B;IAED,IAAI,aAAa,CAAC,KAAK,EAAE,aAAa,EAErC;CAmDF"}
+{"version":3,"file":"Progress.d.ts","sourceRoot":"","sources":["../../../../../src/service/printer/terminal/Progress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,KAAK,QAAQ,MAAM,+BAA+B,CAAC;AAU1D,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAkBxE,MAAM,CAAC,OAAO,OAAO,QAAQ;;IAe3B,YAAmB,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAGpD;IAEM,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CA4BjF;IA4BM,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAyBrE;IAEY,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAe/C;IAEY,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAKpC;IAEY,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAqBlC;IAEM,MAAM,IAAI,IAAI,CAapB;IAgKD,IAAI,aAAa,CAAC,KAAK,EAAE,MAAM,EAE9B;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,MAAM,EAE/B;IAED,IAAI,UAAU,CAAC,KAAK,EAAE,MAAM,EAE3B;IAED,IAAI,UAAU,CAAC,KAAK,EAAE,MAAM,EAE3B;IAED,IAAI,aAAa,CAAC,KAAK,EAAE,aAAa,EAErC;CAmDF"}

package/dist/src/service/printer/terminal/Progress.js

@@ -1,6 +1,9 @@
 // Weight given to each new rate sample in the exponential moving average - time constant is
 // roughly 1/RATE_SMOOTHING_FACTOR * 100ms (the render interval).
 const RATE_SMOOTHING_FACTOR = 0.3;
+// A rate this close to zero (units/s) produces a meaningless (and, past a certain point,
+// non-finite) "time remaining" estimate - treat it the same as no rate at all.
+const MAX_REMAINING_MILLIS = 999 * 24 * 60 * 60 * 1000;
 export { ProgressStyle } from "@flowscripter/dynamic-cli-framework-api";
 import { ProgressStyle } from "@flowscripter/dynamic-cli-framework-api";
 const STYLE_CHARS = {
@@ -187,9 +190,14 @@ export default class Progress {
                         Bun.stripANSI(taken).length;
             }
             else {
-                const remaining = bar.rate === undefined || bar.rate === 0
+                const remainingMillis = bar.rate === undefined || bar.rate === 0
+                    ? undefined
+                    : ((bar.total - bar.current) / bar.rate) * 1000;
+                const remaining = remainingMillis === undefined ||
+                    !Number.isFinite(remainingMillis) ||
+                    remainingMillis > MAX_REMAINING_MILLIS
                     ? "-"
-                    : this.#formatTime(((bar.total - bar.current) / bar.rate) * 1000);
+                    : this.#formatTime(remainingMillis);
                 const currentString = bar.current + "";
                 const totalString = bar.total + "";
                 suffix += `${this.#styler.colorText(currentString, this.#valColor)}${this.#styler.colorText("/", this.#labColor)}${this.#styler.colorText(totalString, this.#valColor)}${this.#styler.colorText(bar.units + ", rate:", this.#labColor)} ${rate}${this.#styler.colorText(bar.units + "/s, time remaining:", this.#labColor)} ${remaining}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowscripter/dynamic-cli-framework",
-  "version": "5.4.10",
+  "version": "5.4.11",
   "description": "A framework for developing CLI applications which supports dynamic discovery and installation of new commands",
   "keywords": [
     "bun",

package/src/service/printer/terminal/Progress.ts

@@ -5,6 +5,10 @@ import type Terminal from "../../../terminal/Terminal.ts";
 // roughly 1/RATE_SMOOTHING_FACTOR * 100ms (the render interval).
 const RATE_SMOOTHING_FACTOR = 0.3;
 
+// A rate this close to zero (units/s) produces a meaningless (and, past a certain point,
+// non-finite) "time remaining" estimate - treat it the same as no rate at all.
+const MAX_REMAINING_MILLIS = 999 * 24 * 60 * 60 * 1000;
+
 export { ProgressStyle } from "@flowscripter/dynamic-cli-framework-api";
 import { ProgressStyle } from "@flowscripter/dynamic-cli-framework-api";
 
@@ -255,10 +259,16 @@ export default class Progress {
           1 +
           Bun.stripANSI(taken).length;
       } else {
-        const remaining =
+        const remainingMillis =
           bar.rate === undefined || bar.rate === 0
+            ? undefined
+            : ((bar.total - bar.current) / bar.rate) * 1000;
+        const remaining =
+          remainingMillis === undefined ||
+          !Number.isFinite(remainingMillis) ||
+          remainingMillis > MAX_REMAINING_MILLIS
             ? "-"
-            : this.#formatTime(((bar.total - bar.current) / bar.rate) * 1000);
+            : this.#formatTime(remainingMillis);
         const currentString = bar.current + "";
         const totalString = bar.total + "";
         suffix += `${this.#styler.colorText(currentString, this.#valColor)}${this.#styler.colorText(