@maravilla-labs/cli 0.1.1 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maravilla-labs/cli",
-  "version": "0.1.1",
+  "version": "0.1.4",
   "description": "NPM wrapper for the Maravilla CLI binary; downloads the right release for your platform.",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Maravilla Labs",

package/scripts/postinstall.js

@@ -37,17 +37,47 @@ function log(msg) {
   console.log(`${flower()} ${msg}`);
 }
 
+function sleep(ms) { return new Promise(r => setTimeout(r, ms)); }
+
+async function abortableFetch(url, opts = {}, timeoutMs = 30000) {
+  const controller = new AbortController();
+  const t = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    return await fetch(url, { ...opts, signal: controller.signal });
+  } finally {
+    clearTimeout(t);
+  }
+}
+
+async function withRetries(taskFn, tries = 3, baseDelay = 1000) {
+  let attempt = 0;
+  let lastErr;
+  while (attempt < tries) {
+    try {
+      return await taskFn();
+    } catch (e) {
+      lastErr = e;
+      attempt++;
+      if (attempt >= tries) break;
+      const delay = baseDelay * Math.pow(2, attempt - 1);
+      console.log(chalk.yellow(`${flower()} retrying in ${Math.round(delay/100)/10}s...`));
+      await sleep(delay);
+    }
+  }
+  throw lastErr;
+}
+
 async function getReleaseTag() {
   if (VERSION && VERSION !== 'latest') return VERSION;
   const api = `https://api.github.com/repos/${REPO}/releases/latest`;
-  const res = await fetch(api, { headers: { 'User-Agent': 'maravilla-cli-installer' } });
+  const res = await withRetries(() => abortableFetch(api, { headers: { 'User-Agent': 'maravilla-cli-installer' } }, 20000));
   if (!res.ok) throw new Error(`Failed to fetch latest release: ${res.status} ${res.statusText}`);
   const json = await res.json();
   return json.tag_name;
 }
 
 async function downloadWithProgress(url, dest) {
-  const res = await fetch(url);
+  const res = await withRetries(() => abortableFetch(url, {}, 60000));
   if (!res.ok) throw new Error(`Failed to download ${url}: ${res.status} ${res.statusText}`);
   const total = Number(res.headers.get('content-length')) || 0;
   const bar = total ? new ProgressBar(`${flower()} downloading [:bar] :percent :etas`, {
@@ -58,9 +88,14 @@ async function downloadWithProgress(url, dest) {
     res.body,
     new (class extends fs.WriteStream {
       constructor(dest) { super(dest); }
-      write(chunk, enc, cb) { if (bar) bar.tick(chunk.length); super.write(chunk, enc, cb); }
+      write(chunk, enc, cb) {
+        if (bar) bar.tick(chunk.length);
+        else process.stdout.write('.');
+        super.write(chunk, enc, cb);
+      }
     })(dest)
   );
+  if (!bar) process.stdout.write('\n');
 }
 
 async function extractArchive(archivePath, targetDir, ext) {
@@ -104,6 +139,7 @@ function cmpSemver(a, b) {
 
 async function install() {
   const { target, ext } = resolveTarget();
+  log(`Resolving latest release tag from ${chalk.cyan(REPO)}`);
   const tag = await getReleaseTag();
   const art = artifactName(BIN_NAME, tag, target);
   const assetFile = `${art}.${ext}`;
@@ -114,17 +150,30 @@ async function install() {
   const tmpDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'maravilla-cli-'));
   const archive = path.join(tmpDir, assetFile);
 
-  // Fast path: if installed and matches latest, skip
-  if (VERSION === 'latest') {
-    try {
-      const cur = await currentVersion();
-      const m = tag.match(/v(\d+\.\d+\.\d+)/);
-      const latest = m ? m[1] : null;
-      if (cur && latest && cmpSemver(cur, latest) >= 0) {
-        log(chalk.green(`Already up to date (v${cur})`));
+  // Decide whether to download based on current vs requested version
+  const force = process.env.MARAVILLA_FORCE_INSTALL === '1';
+  let requested = null;
+  const m = tag.match(/v(\d+\.\d+\.\d+)/);
+  if (m) requested = m[1];
+  let cur = null;
+  try { cur = await currentVersion(); } catch {}
+
+  if (!force) {
+    if (process.env.MARAVILLA_OFFLINE === '1') {
+      if (cur) {
+        if (requested && cmpSemver(cur, requested) < 0) {
+          log(chalk.yellow(`Offline mode: cannot update to v${requested}; keeping existing v${cur}`));
+          return;
+        }
+        log(chalk.yellow(`Offline mode: keeping existing v${cur}`));
         return;
       }
-    } catch {}
+      throw new Error('Offline mode: no existing binary to keep');
+    }
+    if (cur && requested && cmpSemver(cur, requested) >= 0) {
+      log(chalk.green(`Already up to date (v${cur})`));
+      return;
+    }
   }
 
   log(chalk.bold(`Installing ${BIN_NAME} ${chalk.cyan(tag)} for ${chalk.cyan(target)}`));
@@ -134,7 +183,7 @@ async function install() {
   // Verify checksum if SHA256SUMS is available
   try {
     log('Verifying checksum');
-    const sumsRes = await fetch(sumsUrl, { headers: { 'User-Agent': 'maravilla-cli-installer' } });
+  const sumsRes = await abortableFetch(sumsUrl, { headers: { 'User-Agent': 'maravilla-cli-installer' } }, 15000);
     if (sumsRes.ok) {
       const sumsText = await sumsRes.text();
       const expected = sumsText

package/scripts/update.js

@@ -82,8 +82,9 @@ async function main() {
 		log(`Updating to ${chalk.cyan(tag)}`);
 	}
 
-	return await new Promise((resolve) => {
-		const child = spawn(process.execPath, [postinstall], { stdio: 'inherit' });
+		return await new Promise((resolve) => {
+			const env = { ...process.env, MARAVILLA_FORCE_INSTALL: '1' };
+			const child = spawn(process.execPath, [postinstall], { stdio: 'inherit', env });
 		child.on('exit', (code) => resolve(code ?? 0));
 	});
 }