@flowscripter/dynamic-cli-framework 2.3.2 → 2.3.3

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,eAAe,EACf,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;AAe1E,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,cAAc;;gBAM/C,MAAM,EAAE,sBAAsB,EAAE,SAAS,EAAE,SAAS;IAKhE,eAAe,CAAC,YAAY,EAAE,YAAY,EAAE,eAAe,CAAC,EAAE,eAAe,GAAG,IAAI;IAKpF,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;CA2Q1B"}
+{"version":3,"file":"DefaultUpgradeService.d.ts","sourceRoot":"","sources":["../../../../src/service/upgrade/DefaultUpgradeService.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,SAAS,EACT,eAAe,EACf,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;AA0B1E,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,cAAc;;gBAM/C,MAAM,EAAE,sBAAsB,EAAE,SAAS,EAAE,SAAS;IAKhE,eAAe,CAAC,YAAY,EAAE,YAAY,EAAE,eAAe,CAAC,EAAE,eAAe,GAAG,IAAI;IAKpF,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;CAiR1B"}

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

@@ -9,6 +9,16 @@ const logger = getLogger("DefaultUpgradeService");
 // checkForUpgrade() runs opportunistically on every CLI invocation (via BannerServiceProvider),
 // so its version-check network calls must never be allowed to stall CLI startup.
 const VERSION_CHECK_TIMEOUT_MS = 250;
+// SpawnService has no built-in cancellation, so a stalled `brew`/`winget` invocation (e.g. winget's
+// first-ever run on a machine prompting to accept Microsoft Store terms) can otherwise hang
+// checkForUpgrade() indefinitely. Racing against this bounds how long we wait for a result; the
+// underlying process is not killed, but the CLI stops blocking on it.
+async function withSpawnTimeout(spawnPromise, fallback) {
+    return Promise.race([
+        spawnPromise,
+        new Promise((resolve) => setTimeout(() => resolve(fallback), VERSION_CHECK_TIMEOUT_MS)),
+    ]);
+}
 const OS_LABELS = {
     [SupportedOs.LINUX]: "Linux",
     [SupportedOs.MACOS]: "MacOS",
@@ -135,14 +145,20 @@ 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], { stdio: "wrapped", longRunning: false });
+        const result = await withSpawnTimeout(this.#spawnService.spawn(["brew", "list", "--versions", this.#config.homebrew.formula], {
+            stdio: "wrapped",
+            longRunning: false,
+        }), { ok: 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], { stdio: "wrapped", longRunning: false });
+        const result = await withSpawnTimeout(this.#spawnService.spawn(["winget", "list", "--id", this.#config.winget.packageId], {
+            stdio: "wrapped",
+            longRunning: false,
+        }), { ok: false });
         return result.ok;
     }
     #isLinuxScriptInstall() {
@@ -206,11 +222,11 @@ export default class DefaultUpgradeService {
             return undefined;
         }
         const lines = [];
-        const result = await this.#spawnService.spawn(["winget", "show", "--id", this.#config.winget.packageId], {
+        const result = await withSpawnTimeout(this.#spawnService.spawn(["winget", "show", "--id", this.#config.winget.packageId], {
             stdio: "wrapped",
             longRunning: false,
             onOutput: (line) => lines.push(line),
-        });
+        }), { ok: false });
         if (!result.ok) {
             return undefined;
         }

package/package.json

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

package/src/service/upgrade/DefaultUpgradeService.ts

@@ -25,6 +25,17 @@ const logger = getLogger("DefaultUpgradeService");
 // so its version-check network calls must never be allowed to stall CLI startup.
 const VERSION_CHECK_TIMEOUT_MS = 250;
 
+// SpawnService has no built-in cancellation, so a stalled `brew`/`winget` invocation (e.g. winget's
+// first-ever run on a machine prompting to accept Microsoft Store terms) can otherwise hang
+// checkForUpgrade() indefinitely. Racing against this bounds how long we wait for a result; the
+// underlying process is not killed, but the CLI stops blocking on it.
+async function withSpawnTimeout<T>(spawnPromise: Promise<T>, fallback: T): Promise<T> {
+  return Promise.race([
+    spawnPromise,
+    new Promise<T>((resolve) => setTimeout(() => resolve(fallback), VERSION_CHECK_TIMEOUT_MS)),
+  ]);
+}
+
 const OS_LABELS: Record<SupportedOs, string> = {
   [SupportedOs.LINUX]: "Linux",
   [SupportedOs.MACOS]: "MacOS",
@@ -175,9 +186,12 @@ export default class DefaultUpgradeService implements UpgradeService {
     if (!this.#spawnService || !this.#config.homebrew) {
       return false;
     }
-    const result = await this.#spawnService.spawn(
-      ["brew", "list", "--versions", this.#config.homebrew.formula],
-      { stdio: "wrapped", longRunning: false },
+    const result = await withSpawnTimeout(
+      this.#spawnService.spawn(["brew", "list", "--versions", this.#config.homebrew.formula], {
+        stdio: "wrapped",
+        longRunning: false,
+      }),
+      { ok: false } as const,
     );
     return result.ok;
   }
@@ -186,9 +200,12 @@ export default class DefaultUpgradeService implements UpgradeService {
     if (!this.#spawnService || !this.#config.winget) {
       return false;
     }
-    const result = await this.#spawnService.spawn(
-      ["winget", "list", "--id", this.#config.winget.packageId],
-      { stdio: "wrapped", longRunning: false },
+    const result = await withSpawnTimeout(
+      this.#spawnService.spawn(["winget", "list", "--id", this.#config.winget.packageId], {
+        stdio: "wrapped",
+        longRunning: false,
+      }),
+      { ok: false } as const,
     );
     return result.ok;
   }
@@ -262,13 +279,13 @@ export default class DefaultUpgradeService implements UpgradeService {
       return undefined;
     }
     const lines: string[] = [];
-    const result = await this.#spawnService.spawn(
-      ["winget", "show", "--id", this.#config.winget.packageId],
-      {
+    const result = await withSpawnTimeout(
+      this.#spawnService.spawn(["winget", "show", "--id", this.#config.winget.packageId], {
         stdio: "wrapped",
         longRunning: false,
         onOutput: (line) => lines.push(line),
-      },
+      }),
+      { ok: false } as const,
     );
     if (!result.ok) {
       return undefined;