@maravilla-labs/cli 0.1.0 → 0.1.3

package/bin/maravilla-update.js

@@ -0,0 +1,12 @@
+#!/usr/bin/env node
+// Thin wrapper that runs the package updater
+import { fileURLToPath } from 'url';
+import path from 'path';
+import { spawn } from 'child_process';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const updater = path.join(__dirname, '..', 'scripts', 'update.js');
+
+const child = spawn(process.execPath, [updater], { stdio: 'inherit' });
+child.on('exit', (code) => process.exit(code ?? 0));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maravilla-labs/cli",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "description": "NPM wrapper for the Maravilla CLI binary; downloads the right release for your platform.",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Maravilla Labs",
@@ -14,7 +14,8 @@
   },
   "homepage": "https://github.com/solutas/maravilla-runtime#readme",
   "bin": {
-    "maravilla": "bin/maravilla"
+    "maravilla": "bin/maravilla",
+    "maravilla-update": "bin/maravilla-update.js"
   },
   "type": "module",
   "scripts": {

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) {
@@ -73,8 +108,38 @@ async function extractArchive(archivePath, targetDir, ext) {
   }
 }
 
+async function currentVersion() {
+  return new Promise((resolve) => {
+    const child = spawn(INSTALL_PATH, ['--version'], { stdio: ['ignore', 'pipe', 'ignore'] });
+    let out = '';
+    child.stdout.on('data', (d) => (out += d.toString()));
+    child.on('error', () => resolve(null));
+    child.on('exit', (code) => {
+      if (code === 0) {
+        const v = (out || '').trim();
+        const m = v.match(/(\d+\.\d+\.\d+)/);
+        resolve(m ? m[1] : null);
+      } else {
+        resolve(null);
+      }
+    });
+  });
+}
+
+function cmpSemver(a, b) {
+  if (!a || !b) return 1;
+  const pa = a.split('.').map(Number);
+  const pb = b.split('.').map(Number);
+  for (let i = 0; i < 3; i++) {
+    if (pa[i] > pb[i]) return 1;
+    if (pa[i] < pb[i]) return -1;
+  }
+  return 0;
+}
+
 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}`;
@@ -85,6 +150,19 @@ 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})`));
+        return;
+      }
+    } catch {}
+  }
+
   log(chalk.bold(`Installing ${BIN_NAME} ${chalk.cyan(tag)} for ${chalk.cyan(target)}`));
   log(`Downloading from ${url}`);
   await downloadWithProgress(url, archive);
@@ -92,7 +170,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

@@ -2,11 +2,93 @@
 import { fileURLToPath } from 'url';
 import path from 'path';
 import { spawn } from 'child_process';
+import fetch from 'node-fetch';
+import chalk from 'chalk';
 
-// Simply rerun the postinstall script to fetch latest/specified version
+// Re-run postinstall only when an update is actually needed
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const postinstall = path.join(__dirname, 'postinstall.js');
 
-const child = spawn(process.execPath, [postinstall], { stdio: 'inherit' });
-child.on('exit', (code) => process.exit(code ?? 0));
+const BIN_NAME = 'maravilla';
+const REPO = process.env.MARAVILLA_CLI_REPO || 'maravilla-labs/maravilla-cli';
+const BIN_DIR = path.join(__dirname, '..', 'bin');
+const EXECUTABLE = process.platform === 'win32' ? `${BIN_NAME}.exe` : BIN_NAME;
+const INSTALL_PATH = path.join(BIN_DIR, EXECUTABLE);
+
+function flower() {
+	return chalk.magenta('✿');
+}
+
+function log(msg) {
+	console.log(`${flower()} ${msg}`);
+}
+
+async function currentVersion() {
+	return new Promise((resolve) => {
+		const child = spawn(INSTALL_PATH, ['--version'], { stdio: ['ignore', 'pipe', 'ignore'] });
+		let out = '';
+		child.stdout.on('data', (d) => (out += d.toString()));
+		child.on('error', () => resolve(null));
+		child.on('exit', (code) => {
+			if (code === 0) {
+				const v = (out || '').trim();
+				// clap default prints: "maravilla X.Y.Z" — extract semver
+				const match = v.match(/(\d+\.\d+\.\d+)/);
+				resolve(match ? match[1] : null);
+			} else {
+				resolve(null);
+			}
+		});
+	});
+}
+
+async function latestVersion() {
+	const api = `https://api.github.com/repos/${REPO}/releases/latest`;
+	const res = await fetch(api, { headers: { 'User-Agent': 'maravilla-cli-updater' } });
+	if (!res.ok) throw new Error(`Failed to fetch latest release: ${res.status} ${res.statusText}`);
+	const json = await res.json();
+	const tag = json.tag_name || '';
+	// tags are like cli-vX.Y.Z
+	const m = tag.match(/v(\d+\.\d+\.\d+)/);
+	return { tag, version: m ? m[1] : null };
+}
+
+function cmpSemver(a, b) {
+	if (!a || !b) return 1; // treat unknown as needs update
+	const pa = a.split('.').map(Number);
+	const pb = b.split('.').map(Number);
+	for (let i = 0; i < 3; i++) {
+		if (pa[i] > pb[i]) return 1;
+		if (pa[i] < pb[i]) return -1;
+	}
+	return 0;
+}
+
+async function main() {
+	// Allow forcing a version via env (MARAVILLA_VERSION)
+	const forced = process.env.MARAVILLA_VERSION?.replace(/^v/, '') || null;
+	const cur = await currentVersion();
+	const { tag, version: latest } = await latestVersion();
+
+	if (forced) {
+		log(chalk.cyan(`Forcing update to v${forced}`));
+	} else if (cur && latest && cmpSemver(cur, latest) >= 0) {
+		log(chalk.green(`Already up to date (v${cur})`));
+		return 0;
+	} else if (cur && latest) {
+		log(`Updating from v${cur} to ${chalk.cyan(tag)}`);
+	} else {
+		log(`Updating to ${chalk.cyan(tag)}`);
+	}
+
+	return await new Promise((resolve) => {
+		const child = spawn(process.execPath, [postinstall], { stdio: 'inherit' });
+		child.on('exit', (code) => resolve(code ?? 0));
+	});
+}
+
+main().then((code) => process.exit(code)).catch((e) => {
+	console.error(chalk.red(`${flower()} update failed: ${e.message}`));
+	process.exit(1);
+});