@faable/faable 4.9.0 → 4.9.1

package/dist/commands/upgrade/index.js

@@ -1,7 +1,7 @@
 import ora from 'ora';
 import { version } from '../../config.js';
 import { isDevBuild, getLatestVersion, isNewerVersion, CLI_PACKAGE } from '../../lib/UpdateChecker.js';
-import { cmd } from '../../lib/cmd.js';
+import { upgradeTo, npmDeps } from '../../lib/self_upgrade.js';
 import { log } from '../../log.js';
 
 const upgrade = {
@@ -22,15 +22,25 @@ const upgrade = {
             return;
         }
         const spinner = ora(`Upgrading ${CLI_PACKAGE} ${version} → ${latest}`).start();
-        try {
-            await cmd(`npm install -g --prefer-online ${CLI_PACKAGE}@latest`, { timeout: 180_000 });
+        const res = await upgradeTo(latest, npmDeps, {
+            onRetry: () => {
+                spinner.text = `${latest} was just published and the npm registry is still propagating it — retrying…`;
+            },
+        });
+        if (res.ok) {
             spinner.succeed(`Upgraded to ${latest}`);
+            return;
         }
-        catch {
-            spinner.fail("Upgrade failed");
-            log.error(`❌ Could not upgrade automatically. Try manually: npm install -g --prefer-online ${CLI_PACKAGE}@latest`);
-            process.exit(1);
+        spinner.fail("Upgrade failed");
+        if (res.reason === "not_propagated") {
+            log.error(`❌ ${latest} is not available from the npm registry yet (still on ${res.installed ?? version}). A release takes a few minutes to propagate — run \`faable upgrade\` again shortly.`);
+        }
+        else {
+            if (res.output)
+                log.error(res.output.trim());
+            log.error(`❌ Could not upgrade automatically. Try manually: npm install -g ${CLI_PACKAGE}@${latest}`);
         }
+        process.exit(1);
     },
 };
 

package/dist/lib/self_upgrade.js

@@ -0,0 +1,51 @@
+import { execFile } from 'child_process';
+import { CLI_PACKAGE } from './UpdateChecker.js';
+
+// npm's ways of saying "that version does not exist (here, yet)".
+const NOT_FOUND = /ETARGET|notarget|No matching version|E404/i;
+const upgradeTo = async (target, deps, { attempts = 5, wait_ms = 30_000, onRetry = (_n) => { } } = {}) => {
+    let output = "";
+    for (let n = 1; n <= attempts; n++) {
+        const res = await deps.install(target);
+        output = res.output;
+        if (res.ok) {
+            const installed = await deps.installed();
+            if (installed === target)
+                return { ok: true, attempts: n };
+            // npm said yes and changed nothing: the same lag, from another angle.
+        }
+        else if (!NOT_FOUND.test(res.output)) {
+            return { ok: false, reason: "install_failed", output };
+        }
+        if (n < attempts) {
+            onRetry(n);
+            await deps.sleep(wait_ms);
+        }
+    }
+    return {
+        ok: false,
+        reason: "not_propagated",
+        output,
+        installed: await deps.installed(),
+    };
+};
+const run = (file, args, timeout) => new Promise((resolve) => {
+    execFile(file, args, { timeout, maxBuffer: 10 * 1024 * 1024 }, (err, stdout, stderr) => resolve({ ok: !err, output: `${stdout ?? ""}${stderr ?? ""}` }));
+});
+const npm = process.platform === "win32" ? "npm.cmd" : "npm";
+/** The real thing: global npm. */
+const npmDeps = {
+    install: (version) => run(npm, ["install", "-g", "--prefer-online", `${CLI_PACKAGE}@${version}`], 180_000),
+    installed: async () => {
+        const res = await run(npm, ["ls", "-g", "--json", "--depth=0", CLI_PACKAGE], 30_000);
+        try {
+            return JSON.parse(res.output).dependencies?.[CLI_PACKAGE]?.version;
+        }
+        catch {
+            return undefined;
+        }
+    },
+    sleep: (ms) => new Promise((r) => setTimeout(r, ms)),
+};
+
+export { npmDeps, upgradeTo };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faable/faable",
-  "version": "4.9.0",
+  "version": "4.9.1",
   "main": "dist/index.js",
   "license": "MIT",
   "author": "Marc Pomar <marc@faable.com>",