@flowscripter/dynamic-cli-framework 5.0.4 → 5.0.6

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;AAM1E,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAkB5C,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,CAAC;IA0BzE,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,CAAC;IAwCjB,OAAO,CAClB,UAAU,CAAC,EAAE,WAAW,EACxB,YAAY,CAAC,EAAE,aAAa,EAC5B,qBAAqB,CAAC,EAAE,aAAa,GACpC,OAAO,CAAC,aAAa,CAAC;CA4S1B"}
+{"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;AAM1E,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAkB5C,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,CAAC;IA0BzE,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,CAAC;IAwCjB,OAAO,CAClB,UAAU,CAAC,EAAE,WAAW,EACxB,YAAY,CAAC,EAAE,aAAa,EAC5B,qBAAqB,CAAC,EAAE,aAAa,GACpC,OAAO,CAAC,aAAa,CAAC;CAsU1B"}

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

@@ -1,7 +1,7 @@
 import process from "node:process";
-import { mkdtemp } from "node:fs/promises";
+import { mkdtemp, rename, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 import { InstallMethod, SupportedArch, SupportedOs, } from "@flowscripter/dynamic-cli-framework-api";
 import semver from "semver";
 // checkForUpgrade() runs opportunistically on every CLI invocation (via BannerServiceProvider),
@@ -330,7 +330,9 @@ export default class DefaultUpgradeService {
     }
     async #upgradeViaGithubRelease(os, arch) {
         const { owner, repo, assetPattern } = this.#config.githubRelease;
-        const archLabel = os === SupportedOs.MACOS ? "aarch64" : arch === SupportedArch.X64 ? "x64" : "arm64";
+        // macOS release assets use "aarch64" rather than "arm64" for the arm64 build; x64 (including
+        // Intel Macs) always uses "x64" regardless of os.
+        const archLabel = arch === SupportedArch.X64 ? "x64" : os === SupportedOs.MACOS ? "aarch64" : "arm64";
         const assetName = assetPattern.replace("{os}", OS_LABELS[os]).replace("{arch}", archLabel);
         const url = `https://github.com/${owner}/${repo}/releases/latest/download/${assetName}`;
         // longRunning: true gets cooperative Ctrl-C handling during what can be the slowest step of
@@ -355,6 +357,14 @@ export default class DefaultUpgradeService {
             }
             const extractedBinary = join(tmpDir, `${this.#cliConfig.name}.exe`);
             const oldPath = `${currentExecutable}.old.exe`;
+            // Best-effort cleanup of a stale "<exe>.old.exe" left behind by a *previous* upgrade run.
+            // Windows won't let us delete the just-renamed-aside exe while this process still has it
+            // open/mapped - that can only happen once we're no longer holding it, i.e. at the start of
+            // the NEXT invocation, before we move today's running exe aside. Ignore failures: the file
+            // may not exist, or may still be locked (e.g. another instance still running).
+            await this.#spawnService.spawn(["cmd", "/c", "del", "/f", "/q", oldPath], {
+                mode: "ignore",
+            });
             const moveResult = await this.#spawnService.spawn(["cmd", "/c", "move", "/y", currentExecutable, oldPath], { mode: "ignore" });
             if (!moveResult.ok) {
                 throw new Error("Failed to move current executable aside");
@@ -372,8 +382,22 @@ export default class DefaultUpgradeService {
                 throw new Error("Failed to extract release archive");
             }
             const extractedBinary = join(tmpDir, this.#cliConfig.name);
-            await Bun.write(currentExecutable, Bun.file(extractedBinary));
-            await this.#spawnService.spawn(["chmod", "+x", currentExecutable], { mode: "ignore" });
+            // Extract into a staging file in the SAME directory as the running executable (not
+            // os.tmpdir(), which may be a different filesystem/mount), then atomically rename it over
+            // currentExecutable. This avoids ETXTBSY: the kernel refuses to open-for-write the inode
+            // mapped as a running process's text segment, but rename() only swaps the directory entry
+            // to point at a different inode - the running process keeps executing from its original,
+            // now-unlinked-but-still-open inode until it next execs/restarts.
+            const stagingDir = await mkdtemp(join(dirname(currentExecutable), ".upgrade-"));
+            try {
+                const stagingBinary = join(stagingDir, this.#cliConfig.name);
+                await Bun.write(stagingBinary, Bun.file(extractedBinary));
+                await this.#spawnService.spawn(["chmod", "+x", stagingBinary], { mode: "ignore" });
+                await rename(stagingBinary, currentExecutable);
+            }
+            finally {
+                await rm(stagingDir, { recursive: true, force: true });
+            }
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowscripter/dynamic-cli-framework",
-  "version": "5.0.4",
+  "version": "5.0.6",
   "description": "A framework for developing CLI applications which supports dynamic discovery and installation of new commands",
   "keywords": [
     "bun",
@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "@flowscripter/dynamic-cli-framework-api": "^2.0.0",
-    "@flowscripter/dynamic-plugin-framework": "2.0.2",
+    "@flowscripter/dynamic-plugin-framework": "2.0.3",
     "emphasize": "^7.0.0",
     "fastest-levenshtein": "^1.0.16",
     "figlet": "^1.11.0",

package/src/service/upgrade/DefaultUpgradeService.ts

@@ -1,7 +1,7 @@
 import process from "node:process";
-import { mkdtemp } from "node:fs/promises";
+import { mkdtemp, rename, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 import type {
   CLIConfig,
   FetchService,
@@ -413,8 +413,10 @@ export default class DefaultUpgradeService implements UpgradeService {
 
   async #upgradeViaGithubRelease(os: SupportedOs, arch: SupportedArch): Promise<void> {
     const { owner, repo, assetPattern } = this.#config.githubRelease!;
+    // macOS release assets use "aarch64" rather than "arm64" for the arm64 build; x64 (including
+    // Intel Macs) always uses "x64" regardless of os.
     const archLabel =
-      os === SupportedOs.MACOS ? "aarch64" : arch === SupportedArch.X64 ? "x64" : "arm64";
+      arch === SupportedArch.X64 ? "x64" : os === SupportedOs.MACOS ? "aarch64" : "arm64";
     const assetName = assetPattern.replace("{os}", OS_LABELS[os]).replace("{arch}", archLabel);
     const url = `https://github.com/${owner}/${repo}/releases/latest/download/${assetName}`;
 
@@ -446,6 +448,16 @@ export default class DefaultUpgradeService implements UpgradeService {
       }
       const extractedBinary = join(tmpDir, `${this.#cliConfig.name}.exe`);
       const oldPath = `${currentExecutable}.old.exe`;
+
+      // Best-effort cleanup of a stale "<exe>.old.exe" left behind by a *previous* upgrade run.
+      // Windows won't let us delete the just-renamed-aside exe while this process still has it
+      // open/mapped - that can only happen once we're no longer holding it, i.e. at the start of
+      // the NEXT invocation, before we move today's running exe aside. Ignore failures: the file
+      // may not exist, or may still be locked (e.g. another instance still running).
+      await this.#spawnService!.spawn(["cmd", "/c", "del", "/f", "/q", oldPath], {
+        mode: "ignore",
+      });
+
       const moveResult = await this.#spawnService!.spawn(
         ["cmd", "/c", "move", "/y", currentExecutable, oldPath],
         { mode: "ignore" },
@@ -471,8 +483,22 @@ export default class DefaultUpgradeService implements UpgradeService {
         throw new Error("Failed to extract release archive");
       }
       const extractedBinary = join(tmpDir, this.#cliConfig.name);
-      await Bun.write(currentExecutable, Bun.file(extractedBinary));
-      await this.#spawnService!.spawn(["chmod", "+x", currentExecutable], { mode: "ignore" });
+
+      // Extract into a staging file in the SAME directory as the running executable (not
+      // os.tmpdir(), which may be a different filesystem/mount), then atomically rename it over
+      // currentExecutable. This avoids ETXTBSY: the kernel refuses to open-for-write the inode
+      // mapped as a running process's text segment, but rename() only swaps the directory entry
+      // to point at a different inode - the running process keeps executing from its original,
+      // now-unlinked-but-still-open inode until it next execs/restarts.
+      const stagingDir = await mkdtemp(join(dirname(currentExecutable), ".upgrade-"));
+      try {
+        const stagingBinary = join(stagingDir, this.#cliConfig.name);
+        await Bun.write(stagingBinary, Bun.file(extractedBinary));
+        await this.#spawnService!.spawn(["chmod", "+x", stagingBinary], { mode: "ignore" });
+        await rename(stagingBinary, currentExecutable);
+      } finally {
+        await rm(stagingDir, { recursive: true, force: true });
+      }
     }
   }
 }