magicbell-cli 1.3.0 → 1.4.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # magicbell-cli
 
+## 1.4.0
+
+### Minor Changes
+
+- [#7414](https://github.com/magicbell/magicbell/pull/7414) [`fb44a37`](https://github.com/magicbell/magicbell/commit/fb44a37b479b32c08501b8f653e323a0836cc3cc) Thanks [@smeijer](https://github.com/smeijer)! - fix windows installer
+
 ## 1.3.0
 
 ### Minor Changes

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "magicbell-cli",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "MagicBell CLI",
   "type": "module",
   "dependencies": {
-    "node-fetch": "^3.3.2",
-    "tar": "^7.5.2"
+    "tar": "^7.5.2",
+    "unzipper": "^0.11.4"
   },
   "bin": {
     "magicbell": "src/cli.js"
@@ -22,6 +22,6 @@
   "goBinary": {
     "name": "magicbell",
     "path": "./bin",
-    "url": "https://github.com/magicbell/homebrew-tap/releases/download/v{{version}}/magicbell-cli_{{platform}}_{{arch}}.tar.gz"
+    "url": "https://github.com/magicbell/homebrew-tap/releases/download/v{{version}}/magicbell-cli_{{platform}}_{{arch}}{{archive_ext}}"
   }
 }

package/src/cli.js

@@ -5,32 +5,76 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 
 import { installBinary } from './install.js';
+import { createDebugLogger } from './log.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const BIN_DIR = path.resolve(__dirname, '../bin');
 const BINARY_NAME = process.platform === 'win32' ? 'magicbell.exe' : 'magicbell';
 const BINARY_PATH = path.join(BIN_DIR, BINARY_NAME);
+const SPAWN_RETRY_ATTEMPTS = 5;
+const SPAWN_RETRY_DELAY_MS = 200;
+const debug = createDebugLogger('cli');
 
 async function ensureBinary() {
-  if (fs.existsSync(BINARY_PATH)) return;
+  if (fs.existsSync(BINARY_PATH)) {
+    debug('Binary already present at', BINARY_PATH);
+    return;
+  }
+
+  debug('Binary missing, installing');
   await installBinary();
+  debug('Installation finished');
 
   if (!fs.existsSync(BINARY_PATH)) {
     throw new Error(`MagicBell binary is missing at ${BINARY_PATH} even after installation.`);
   }
 }
 
+function delay(ms) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+}
+
+async function spawnWithRetry(args) {
+  for (let attempt = 1; attempt <= SPAWN_RETRY_ATTEMPTS; attempt += 1) {
+    try {
+      debug('Spawning binary', { args, attempt });
+      return spawn(BINARY_PATH, args, {
+        stdio: 'inherit',
+      });
+    } catch (error) {
+      if (error && error.code === 'EBUSY' && attempt < SPAWN_RETRY_ATTEMPTS) {
+        debug('Spawn failed with EBUSY, retrying', { attempt, delayMs: SPAWN_RETRY_DELAY_MS * attempt });
+        await delay(SPAWN_RETRY_DELAY_MS * attempt);
+        continue;
+      }
+
+      debug('Spawn failed with fatal error', error);
+      throw error;
+    }
+  }
+
+  throw new Error('Unable to spawn MagicBell CLI binary after multiple attempts.');
+}
+
 async function run() {
   try {
     await ensureBinary();
+    debug('Binary ready, invoking CLI', { args: process.argv.slice(2) });
   } catch (err) {
     console.error(err instanceof Error ? err.message : err);
     process.exit(1);
   }
 
-  const child = spawn(BINARY_PATH, process.argv.slice(2), {
-    stdio: 'inherit',
-  });
+  let child;
+  try {
+    child = await spawnWithRetry(process.argv.slice(2));
+  } catch (error) {
+    const message = error instanceof Error ? error.message : error;
+    console.error('Failed to start the MagicBell binary:', message);
+    process.exit(1);
+  }
 
   child.on('error', (error) => {
     console.error('Failed to start the MagicBell binary:', error.message);
@@ -38,6 +82,7 @@ async function run() {
   });
 
   child.on('exit', (code, signal) => {
+    debug('Child exited', { code, signal });
     if (signal) {
       process.kill(process.pid, signal);
       return;

package/src/install.js

@@ -3,15 +3,19 @@
 // and used via a lazy-load mechanism instead of during postinstall
 
 import fs from 'fs';
-import fetch from 'node-fetch';
 import path from 'path';
+import { pipeline, Readable } from 'stream';
 import * as tar from 'tar';
+import unzipper from 'unzipper';
 import { fileURLToPath } from 'url';
 import zlib from 'zlib';
 
+import { createDebugLogger, isDebugEnabled } from './log.js';
+
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const PACKAGE_ROOT = path.resolve(__dirname, '..');
+const debug = createDebugLogger('install');
 
 // Mapping from Node's `process.arch` to Golang's `$GOARCH`
 const ARCH_MAPPING = {
@@ -66,6 +70,8 @@ function validateConfiguration(packageJson) {
 }
 
 function loadConfiguration() {
+  debug('Loading configuration', { platform: process.platform, arch: process.arch });
+  const isWindows = process.platform === 'win32';
   if (!(process.arch in ARCH_MAPPING)) {
     throw new Error('Installation is not supported for this architecture: ' + process.arch);
   }
@@ -91,7 +97,7 @@ function loadConfiguration() {
   let version = packageJson.goBinary.binaryVersion || packageJson.version;
   if (version[0] === 'v') version = version.substr(1);
 
-  if (process.platform === 'win32') {
+  if (isWindows) {
     binName += '.exe';
   }
 
@@ -100,12 +106,16 @@ function loadConfiguration() {
   url = url.replace(/{{platform}}/g, PLATFORM_MAPPING[process.platform]);
   url = url.replace(/{{version}}/g, version);
   url = url.replace(/{{bin_name}}/g, binName);
+  const archiveExtension = isWindows ? '.zip' : '.tar.gz';
+  url = url.replace(/{{archive_ext}}/g, archiveExtension);
+  debug('Resolved download URL', url);
 
   return {
     binName,
     binPath,
     url,
     version,
+    archiveType: isWindows ? 'zip' : 'tar',
   };
 }
 
@@ -121,8 +131,7 @@ export function installBinary() {
   const options = loadConfiguration();
 
   fs.mkdirSync(options.binPath, { recursive: true });
-  const ungz = zlib.createGunzip();
-  const untar = tar.x({ cwd: options.binPath });
+  debug('Prepared bin path', options.binPath);
 
   return new Promise((resolve, reject) => {
     let settled = false;
@@ -132,31 +141,50 @@ export function installBinary() {
       action(value);
     };
 
-    const handleError = (err) => finish(reject, err);
-    const handleSuccess = () => finish(resolve);
-
-    // First we will Un-GZip, then we will untar. So once untar is completed,
-    // binary is downloaded into `binPath`. Verify the binary and call it good
-    untar.on('end', () => {
-      try {
-        verifyAndPlaceBinary(options.binName, options.binPath);
-        handleSuccess();
-      } catch (err) {
-        handleError(err);
+    const handleError = (err) => {
+      if (isDebugEnabled) {
+        console.error('[magicbell:install] Installation error:', err);
       }
-    });
-
-    ungz.on('error', handleError);
-    untar.on('error', handleError);
+      finish(reject, err);
+    };
+    const handleSuccess = () => finish(resolve);
 
+    debug('Fetching binary', { url: options.url, archiveType: options.archiveType });
     fetch(options.url)
       .then((res) => {
         if (!res.ok) {
-          throw new Error('Error downloading binary. HTTP Status Code: ' + res.status);
+          throw new Error(`Error downloading binary from: '${options.url}'. HTTP Status Code: ${res.status}`);
+        }
+
+        const streams = [];
+        if (options.archiveType === 'zip') {
+          debug('Using zip extractor');
+          streams.push(unzipper.Extract({ path: options.binPath }));
+        } else {
+          debug('Using gzip+tar extractor');
+          streams.push(zlib.createGunzip(), tar.x({ cwd: options.binPath }));
+        }
+
+        if (!res.body) {
+          throw new Error('Download response did not include a body.');
         }
 
-        res.body.on('error', handleError);
-        res.body.pipe(ungz).pipe(untar);
+        const bodyStream = typeof res.body.getReader === 'function' ? Readable.fromWeb(res.body) : res.body;
+        pipeline(bodyStream, ...streams, (err) => {
+          if (err) {
+            handleError(err);
+            return;
+          }
+
+          try {
+            debug('Verifying downloaded binary');
+            verifyAndPlaceBinary(options.binName, options.binPath);
+            debug('Binary verification successful');
+            handleSuccess();
+          } catch (verificationError) {
+            handleError(verificationError);
+          }
+        });
       })
       .catch(handleError);
   });

package/src/log.js

@@ -0,0 +1,11 @@
+const DEBUG_ENABLED = Boolean(process.env.DEBUG);
+
+export function createDebugLogger(scope) {
+  return (...args) => {
+    if (!DEBUG_ENABLED) return;
+    // write to stderr, so it doesn't litter stdout
+    console.error(`[magicbell:${scope}]`, args);
+  };
+}
+
+export const isDebugEnabled = DEBUG_ENABLED;