@flowscripter/dynamic-cli-framework 5.4.9 → 5.4.11

package/dist/src/service/plugin/command/PluginAddSubCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PluginAddSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/plugin/command/PluginAddSubCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AASxE,qBAAa,mBAAoB,YAAW,UAAU;IACpD,QAAQ,CAAC,IAAI,SAAS;IACtB,QAAQ,CAAC,WAAW,6BAA6B;IACjD,QAAQ,CAAC,mBAAmB,SAAS;IACrC,QAAQ,CAAC,OAAO,UAAM;IACtB,QAAQ,CAAC,WAAW;;;;QAMlB;IAEI,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqFrE;CACF"}
+{"version":3,"file":"PluginAddSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/plugin/command/PluginAddSubCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AASxE,qBAAa,mBAAoB,YAAW,UAAU;IACpD,QAAQ,CAAC,IAAI,SAAS;IACtB,QAAQ,CAAC,WAAW,6BAA6B;IACjD,QAAQ,CAAC,mBAAmB,SAAS;IACrC,QAAQ,CAAC,OAAO,UAAM;IACtB,QAAQ,CAAC,WAAW;;;;QAMlB;IAEI,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsGrE;CACF"}

package/dist/src/service/plugin/command/PluginAddSubCommand.js

@@ -57,6 +57,17 @@ export class PluginAddSubCommand {
         const installLabel = descriptor.version && descriptor.version !== "latest"
             ? `${descriptor.pluginId}@${descriptor.version}`
             : descriptor.pluginId;
+        // If the exact same plugin+version is already installed, there's nothing to do - avoids a
+        // needless reinstall and the registry round-trip below.
+        if (descriptor.version && descriptor.version !== "latest") {
+            for await (const installed of pluginService.listInstalled()) {
+                if (installed.pluginId === descriptor.pluginId &&
+                    installed.version === descriptor.version) {
+                    await printerService.print(`Plugin ${descriptor.pluginId}@${installed.version} is already installed.\n`, Icon.INFORMATION);
+                    return;
+                }
+            }
+        }
         // Confirm the package (and specific version/tag, if requested) actually exists on the
         // remote marketplace before invoking the package manager - so a non-existent plugin or
         // version is reported clearly instead of failing later (and less clearly) inside

package/dist/src/service/plugin/command/PluginRemoveSubCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PluginRemoveSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/plugin/command/PluginRemoveSubCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAMxE,qBAAa,sBAAuB,YAAW,UAAU;IACvD,QAAQ,CAAC,IAAI,YAAY;IACzB,QAAQ,CAAC,WAAW,uCAAuC;IAC3D,QAAQ,CAAC,mBAAmB,SAAS;IACrC,QAAQ,CAAC,OAAO,UAAM;IACtB,QAAQ,CAAC,WAAW;;;;QAMlB;IAEI,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAYrE;CACF"}
+{"version":3,"file":"PluginRemoveSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/plugin/command/PluginRemoveSubCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAMxE,qBAAa,sBAAuB,YAAW,UAAU;IACvD,QAAQ,CAAC,IAAI,YAAY;IACzB,QAAQ,CAAC,WAAW,uCAAuC;IAC3D,QAAQ,CAAC,mBAAmB,SAAS;IACrC,QAAQ,CAAC,OAAO,UAAM;IACtB,QAAQ,CAAC,WAAW;;;;QAMlB;IAEI,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBrE;CACF"}

package/dist/src/service/plugin/command/PluginRemoveSubCommand.js

@@ -17,6 +17,17 @@ export class PluginRemoveSubCommand {
         const printerService = context.getServiceById(PRINTER_SERVICE_ID);
         const pluginService = context.getServiceById(PLUGIN_SERVICE_ID);
         const pluginId = argumentValues["pluginId"];
+        let isInstalled = false;
+        for await (const installed of pluginService.listInstalled()) {
+            if (installed.pluginId === pluginId) {
+                isInstalled = true;
+                break;
+            }
+        }
+        if (!isInstalled) {
+            await printerService.print(`Plugin ${pluginId} is not installed.\n`, Icon.INFORMATION);
+            return;
+        }
         await printerService.showSpinner(`Removing plugin: ${pluginId}...`);
         try {
             await pluginService.uninstall(pluginId);

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.9",
+  "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/plugin/command/PluginAddSubCommand.ts

@@ -73,6 +73,23 @@ export class PluginAddSubCommand implements SubCommand {
         ? `${descriptor.pluginId}@${descriptor.version}`
         : descriptor.pluginId;
 
+    // If the exact same plugin+version is already installed, there's nothing to do - avoids a
+    // needless reinstall and the registry round-trip below.
+    if (descriptor.version && descriptor.version !== "latest") {
+      for await (const installed of pluginService.listInstalled()) {
+        if (
+          installed.pluginId === descriptor.pluginId &&
+          installed.version === descriptor.version
+        ) {
+          await printerService.print(
+            `Plugin ${descriptor.pluginId}@${installed.version} is already installed.\n`,
+            Icon.INFORMATION,
+          );
+          return;
+        }
+      }
+    }
+
     // Confirm the package (and specific version/tag, if requested) actually exists on the
     // remote marketplace before invoking the package manager - so a non-existent plugin or
     // version is reported clearly instead of failing later (and less clearly) inside

package/src/service/plugin/command/PluginRemoveSubCommand.ts

@@ -25,6 +25,19 @@ export class PluginRemoveSubCommand implements SubCommand {
     const pluginService = context.getServiceById(PLUGIN_SERVICE_ID) as PluginService;
 
     const pluginId = argumentValues["pluginId"] as string;
+
+    let isInstalled = false;
+    for await (const installed of pluginService.listInstalled()) {
+      if (installed.pluginId === pluginId) {
+        isInstalled = true;
+        break;
+      }
+    }
+    if (!isInstalled) {
+      await printerService.print(`Plugin ${pluginId} is not installed.\n`, Icon.INFORMATION);
+      return;
+    }
+
     await printerService.showSpinner(`Removing plugin: ${pluginId}...`);
     try {
       await pluginService.uninstall(pluginId);

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(