@flowscripter/dynamic-cli-framework 3.0.0 → 3.0.2

package/dist/src/service/upgrade/DefaultUpgradeService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultUpgradeService.d.ts","sourceRoot":"","sources":["../../../../src/service/upgrade/DefaultUpgradeService.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EAEZ,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACd,MAAM,yCAAyC,CAAC;AACjD,OAAO,EACL,aAAa,EACb,aAAa,EACb,WAAW,EACX,KAAK,cAAc,EACpB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAO1E,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAc5C,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,cAAc;;gBAO/C,MAAM,EAAE,sBAAsB,EAAE,SAAS,EAAE,SAAS;IAKhE,eAAe,CACpB,YAAY,EAAE,YAAY,GAAG,SAAS,EACtC,YAAY,EAAE,YAAY,GAAG,SAAS,GACrC,IAAI;IAKA,qBAAqB,CAAC,aAAa,UAAQ,GAAG,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAerF,QAAQ,IAAI,WAAW,GAAG,SAAS;IAanC,UAAU,IAAI,aAAa,GAAG,SAAS;IAWjC,mBAAmB,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAgBxE,eAAe,CAC1B,UAAU,CAAC,EAAE,WAAW,EACxB,YAAY,CAAC,EAAE,aAAa,EAC5B,qBAAqB,CAAC,EAAE,aAAa,GACpC,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAmC7B,OAAO,CAClB,UAAU,CAAC,EAAE,WAAW,EACxB,YAAY,CAAC,EAAE,aAAa,EAC5B,qBAAqB,CAAC,EAAE,aAAa,GACpC,OAAO,CAAC,aAAa,CAAC;CAuQ1B"}
+{"version":3,"file":"DefaultUpgradeService.d.ts","sourceRoot":"","sources":["../../../../src/service/upgrade/DefaultUpgradeService.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EAEZ,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACd,MAAM,yCAAyC,CAAC;AACjD,OAAO,EACL,aAAa,EACb,aAAa,EACb,WAAW,EACX,KAAK,cAAc,EACpB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAS1E,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAc5C,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,cAAc;;gBAO/C,MAAM,EAAE,sBAAsB,EAAE,SAAS,EAAE,SAAS;IAKhE,eAAe,CACpB,YAAY,EAAE,YAAY,GAAG,SAAS,EACtC,YAAY,EAAE,YAAY,GAAG,SAAS,GACrC,IAAI;IAKA,qBAAqB,CAAC,aAAa,UAAQ,GAAG,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IA0BrF,QAAQ,IAAI,WAAW,GAAG,SAAS;IAanC,UAAU,IAAI,aAAa,GAAG,SAAS;IAWjC,mBAAmB,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAgBxE,eAAe,CAC1B,UAAU,CAAC,EAAE,WAAW,EACxB,YAAY,CAAC,EAAE,aAAa,EAC5B,qBAAqB,CAAC,EAAE,aAAa,GACpC,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAmC7B,OAAO,CAClB,UAAU,CAAC,EAAE,WAAW,EACxB,YAAY,CAAC,EAAE,aAAa,EAC5B,qBAAqB,CAAC,EAAE,aAAa,GACpC,OAAO,CAAC,aAAa,CAAC;CAoQ1B"}

package/dist/src/service/upgrade/DefaultUpgradeService.js

@@ -7,7 +7,9 @@ import semver from "semver";
 import getLogger from "../../util/logger.js";
 const logger = getLogger("DefaultUpgradeService");
 // checkForUpgrade() runs opportunistically on every CLI invocation (via BannerServiceProvider),
-// so its version-check network/spawn calls must never be allowed to stall CLI startup.
+// so that opportunistic call is raced against this timeout so it never stalls CLI startup.
+// A deliberate caller (waitForResult=true, e.g. the `upgrade` command) awaits checkForUpgrade()
+// directly with no timeout, so its underlying network/spawn calls are never artificially cut off.
 export const VERSION_CHECK_TIMEOUT_MS = 250;
 function describeSpawnFailure(result) {
     return "timedOut" in result
@@ -35,7 +37,18 @@ export default class DefaultUpgradeService {
     }
     getUpgradeCheckResult(waitForResult = false) {
         if (!this.#upgradeCheckPromise) {
-            this.#upgradeCheckPromise = this.checkForUpgrade();
+            // Only cache a successful result. An `undefined` result can come from a transient
+            // failure (e.g. the opportunistic startup check racing past VERSION_CHECK_TIMEOUT_MS
+            // before checkForUpgrade() itself resolves) - caching that would permanently deny a
+            // later, deliberate caller (e.g. the `upgrade` command explicitly waiting via
+            // waitForResult=true) any chance of a fresh attempt for the rest of this process's
+            // lifetime.
+            this.#upgradeCheckPromise = this.checkForUpgrade().then((result) => {
+                if (result === undefined) {
+                    this.#upgradeCheckPromise = undefined;
+                }
+                return result;
+            });
         }
         if (waitForResult) {
             return this.#upgradeCheckPromise;
@@ -159,14 +172,14 @@ export default class DefaultUpgradeService {
         if (!this.#spawnService || !this.#config.homebrew) {
             return false;
         }
-        const result = await this.#spawnService.spawn(["brew", "list", "--versions", this.#config.homebrew.formula], { mode: "ignore", longRunning: false, timeoutMs: VERSION_CHECK_TIMEOUT_MS });
+        const result = await this.#spawnService.spawn(["brew", "list", "--versions", this.#config.homebrew.formula], { mode: "ignore", longRunning: false });
         return result.ok;
     }
     async #isWingetInstalled() {
         if (!this.#spawnService || !this.#config.winget) {
             return false;
         }
-        const result = await this.#spawnService.spawn(["winget", "list", "--id", this.#config.winget.packageId], { mode: "ignore", longRunning: false, timeoutMs: VERSION_CHECK_TIMEOUT_MS });
+        const result = await this.#spawnService.spawn(["winget", "list", "--id", this.#config.winget.packageId], { mode: "ignore", longRunning: false });
         return result.ok;
     }
     #isLinuxScriptInstall() {
@@ -191,7 +204,7 @@ export default class DefaultUpgradeService {
         }
         const { owner, repo } = this.#config.githubRelease;
         try {
-            const response = await this.#fetchService.fetch(`https://api.github.com/repos/${owner}/${repo}/releases/latest`, { timeoutMs: VERSION_CHECK_TIMEOUT_MS });
+            const response = await this.#fetchService.fetch(`https://api.github.com/repos/${owner}/${repo}/releases/latest`);
             if (!response.ok) {
                 return undefined;
             }
@@ -213,7 +226,7 @@ export default class DefaultUpgradeService {
             return undefined;
         }
         try {
-            const response = await this.#fetchService.fetch(`https://raw.githubusercontent.com/${tapOwner}/homebrew-${tapName}/main/${formula}.rb`, { timeoutMs: VERSION_CHECK_TIMEOUT_MS });
+            const response = await this.#fetchService.fetch(`https://raw.githubusercontent.com/${tapOwner}/homebrew-${tapName}/main/${formula}.rb`);
             if (!response.ok) {
                 return undefined;
             }
@@ -233,7 +246,6 @@ export default class DefaultUpgradeService {
         const result = await this.#spawnService.spawn(["winget", "show", "--id", this.#config.winget.packageId], {
             mode: "wrapped",
             longRunning: false,
-            timeoutMs: VERSION_CHECK_TIMEOUT_MS,
             onOutput: (line) => lines.push(line),
         });
         if (!result.ok) {

package/package.json

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

package/src/service/upgrade/DefaultUpgradeService.ts

@@ -23,7 +23,9 @@ import getLogger from "../../util/logger.ts";
 const logger = getLogger("DefaultUpgradeService");
 
 // checkForUpgrade() runs opportunistically on every CLI invocation (via BannerServiceProvider),
-// so its version-check network/spawn calls must never be allowed to stall CLI startup.
+// so that opportunistic call is raced against this timeout so it never stalls CLI startup.
+// A deliberate caller (waitForResult=true, e.g. the `upgrade` command) awaits checkForUpgrade()
+// directly with no timeout, so its underlying network/spawn calls are never artificially cut off.
 export const VERSION_CHECK_TIMEOUT_MS = 250;
 
 function describeSpawnFailure(result: Extract<SpawnResult, { ok: false }>): string {
@@ -60,7 +62,18 @@ export default class DefaultUpgradeService implements UpgradeService {
 
   public getUpgradeCheckResult(waitForResult = false): Promise<UpgradeCheckResult | undefined> {
     if (!this.#upgradeCheckPromise) {
-      this.#upgradeCheckPromise = this.checkForUpgrade();
+      // Only cache a successful result. An `undefined` result can come from a transient
+      // failure (e.g. the opportunistic startup check racing past VERSION_CHECK_TIMEOUT_MS
+      // before checkForUpgrade() itself resolves) - caching that would permanently deny a
+      // later, deliberate caller (e.g. the `upgrade` command explicitly waiting via
+      // waitForResult=true) any chance of a fresh attempt for the rest of this process's
+      // lifetime.
+      this.#upgradeCheckPromise = this.checkForUpgrade().then((result) => {
+        if (result === undefined) {
+          this.#upgradeCheckPromise = undefined;
+        }
+        return result;
+      });
     }
     if (waitForResult) {
       return this.#upgradeCheckPromise;
@@ -210,7 +223,7 @@ export default class DefaultUpgradeService implements UpgradeService {
     }
     const result = await this.#spawnService.spawn(
       ["brew", "list", "--versions", this.#config.homebrew.formula],
-      { mode: "ignore", longRunning: false, timeoutMs: VERSION_CHECK_TIMEOUT_MS },
+      { mode: "ignore", longRunning: false },
     );
     return result.ok;
   }
@@ -221,7 +234,7 @@ export default class DefaultUpgradeService implements UpgradeService {
     }
     const result = await this.#spawnService.spawn(
       ["winget", "list", "--id", this.#config.winget.packageId],
-      { mode: "ignore", longRunning: false, timeoutMs: VERSION_CHECK_TIMEOUT_MS },
+      { mode: "ignore", longRunning: false },
     );
     return result.ok;
   }
@@ -252,7 +265,6 @@ export default class DefaultUpgradeService implements UpgradeService {
     try {
       const response = await this.#fetchService.fetch(
         `https://api.github.com/repos/${owner}/${repo}/releases/latest`,
-        { timeoutMs: VERSION_CHECK_TIMEOUT_MS },
       );
       if (!response.ok) {
         return undefined;
@@ -277,7 +289,6 @@ export default class DefaultUpgradeService implements UpgradeService {
     try {
       const response = await this.#fetchService.fetch(
         `https://raw.githubusercontent.com/${tapOwner}/homebrew-${tapName}/main/${formula}.rb`,
-        { timeoutMs: VERSION_CHECK_TIMEOUT_MS },
       );
       if (!response.ok) {
         return undefined;
@@ -300,7 +311,6 @@ export default class DefaultUpgradeService implements UpgradeService {
       {
         mode: "wrapped",
         longRunning: false,
-        timeoutMs: VERSION_CHECK_TIMEOUT_MS,
         onOutput: (line) => lines.push(line),
       },
     );