@maravilla-labs/cli 0.1.5 → 0.1.7

package/bin/maravilla-update.js

@@ -2,11 +2,11 @@
 // Thin wrapper that runs the package updater
 import { fileURLToPath } from 'url';
 import path from 'path';
-import { spawn } from 'child_process';
+import { createRequire } from 'module';
 
 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));
+// directly import the updater script
+const require = createRequire(import.meta.url);
+await import(path.join(__dirname, '..', 'scripts', 'update.js'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maravilla-labs/cli",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "NPM wrapper for the Maravilla CLI binary; downloads the right release for your platform.",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Maravilla Labs",
@@ -50,6 +50,7 @@
     "tar": "^6.2.1",
     "unzipper": "^0.10.14",
     "progress": "^2.0.3",
-    "chalk": "^5.3.0"
+    "chalk": "^5.3.0",
+    "https-proxy-agent": "^7.0.4"
   }
 }

package/scripts/postinstall.js

@@ -11,6 +11,7 @@ import ProgressBar from 'progress';
 import chalk from 'chalk';
 import { resolveTarget, artifactName } from './platform.js';
 import crypto from 'crypto';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 
 // Allow CI to skip downloading the binary
 if (process.env.MARAVILLA_CLI_SKIP_INSTALL === '1' || process.env.CI) {
@@ -28,6 +29,10 @@ const VERSION = process.env.MARAVILLA_VERSION || 'latest'; // cli-vX.Y.Z or 'lat
 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);
+const GH_TOKEN = process.env.MARAVILLA_GH_TOKEN || process.env.GITHUB_TOKEN || '';
+const PROXY = process.env.HTTPS_PROXY || process.env.HTTP_PROXY || '';
+const HTTP_TIMEOUT_MS = Number(process.env.MARAVILLA_HTTP_TIMEOUT_MS || 15000);
+const HTTP_RETRIES = Math.max(1, Number(process.env.MARAVILLA_HTTP_RETRIES || 3));
 
 function flower() {
   return chalk.magenta('✿');
@@ -43,13 +48,13 @@ 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 });
+  return await fetch(url, { ...opts, signal: controller.signal });
   } finally {
     clearTimeout(t);
   }
 }
 
-async function withRetries(taskFn, tries = 3, baseDelay = 1000) {
+async function withRetries(taskFn, tries = HTTP_RETRIES, baseDelay = 1000) {
   let attempt = 0;
   let lastErr;
   while (attempt < tries) {
@@ -67,13 +72,37 @@ async function withRetries(taskFn, tries = 3, baseDelay = 1000) {
   throw lastErr;
 }
 
+function makeFetchOpts() {
+  const headers = { 'User-Agent': 'maravilla-cli-installer' };
+  if (GH_TOKEN) headers['Authorization'] = `Bearer ${GH_TOKEN}`;
+  const opts = { headers };
+  if (PROXY) {
+    try { opts.agent = new HttpsProxyAgent(PROXY); } catch {}
+  }
+  return opts;
+}
+
 async function getReleaseTag() {
   if (VERSION && VERSION !== 'latest') return VERSION;
   const api = `https://api.github.com/repos/${REPO}/releases/latest`;
-  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;
+  const opts = makeFetchOpts();
+  try {
+    console.log(chalk.gray(`${flower()} fetching latest release tag (${Math.round(HTTP_TIMEOUT_MS/100)/10}s timeout, ${HTTP_RETRIES} retries)`));
+    const res = await withRetries(() => abortableFetch(api, opts, HTTP_TIMEOUT_MS));
+    if (!res.ok) throw new Error(`Failed to fetch latest release: ${res.status} ${res.statusText}`);
+    const json = await res.json();
+    if (!json.tag_name) throw new Error('No tag_name in API response');
+    return json.tag_name;
+  } catch (e) {
+    console.log(chalk.yellow(`${flower()} API lookup failed (${e.message}). Falling back to HTML redirect...`));
+    // Fallback: use HTML redirect to /releases/tag/<tag>
+    const html = `https://github.com/${REPO}/releases/latest`;
+    const res = await abortableFetch(html, { ...opts, redirect: 'manual' }, Math.min(HTTP_TIMEOUT_MS, 10000));
+    const loc = res.headers.get('location') || '';
+    const m = loc.match(/\/releases\/tag\/([^/]+)$/);
+    if (m) return m[1];
+    throw new Error('Could not resolve latest tag via fallback');
+  }
 }
 
 async function downloadWithProgress(url, dest) {
@@ -139,6 +168,19 @@ function cmpSemver(a, b) {
 
 async function install() {
   const { target, ext } = resolveTarget();
+
+  // Detect current installed version first to enable true offline fast-path
+  let cur = null;
+  try { cur = await currentVersion(); } catch {}
+
+  if (process.env.MARAVILLA_OFFLINE === '1') {
+    if (cur) {
+      log(chalk.yellow(`Offline mode: keeping existing v${cur}`));
+      return;
+    }
+    throw new Error('Offline mode: no existing binary; set MARAVILLA_VERSION to a specific tag or retry online');
+  }
+
   log(`Resolving latest release tag from ${chalk.cyan(REPO)}`);
   const tag = await getReleaseTag();
   const art = artifactName(BIN_NAME, tag, target);
@@ -155,21 +197,8 @@ async function install() {
   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;
-      }
-      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;
@@ -183,7 +212,7 @@ async function install() {
   // Verify checksum if SHA256SUMS is available
   try {
     log('Verifying checksum');
-  const sumsRes = await abortableFetch(sumsUrl, { headers: { 'User-Agent': 'maravilla-cli-installer' } }, 15000);
+    const sumsRes = await abortableFetch(sumsUrl, makeFetchOpts(), 15000);
     if (sumsRes.ok) {
       const sumsText = await sumsRes.text();
       const expected = sumsText

package/scripts/update.js

@@ -3,6 +3,7 @@ import { fileURLToPath } from 'url';
 import path from 'path';
 import { spawn } from 'child_process';
 import fetch from 'node-fetch';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import chalk from 'chalk';
 
 // Re-run postinstall only when an update is actually needed
@@ -15,6 +16,10 @@ 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);
+const GH_TOKEN = process.env.MARAVILLA_GH_TOKEN || process.env.GITHUB_TOKEN || '';
+const PROXY = process.env.HTTPS_PROXY || process.env.HTTP_PROXY || '';
+const HTTP_TIMEOUT_MS = Number(process.env.MARAVILLA_HTTP_TIMEOUT_MS || 15000);
+const HTTP_RETRIES = Math.max(1, Number(process.env.MARAVILLA_HTTP_RETRIES || 3));
 
 function flower() {
 	return chalk.magenta('✿');
@@ -43,15 +48,39 @@ async function currentVersion() {
 	});
 }
 
+function makeFetchOpts() {
+	const headers = { 'User-Agent': 'maravilla-cli-updater' };
+	if (GH_TOKEN) headers['Authorization'] = `Bearer ${GH_TOKEN}`;
+	const opts = { headers };
+	if (PROXY) {
+		try { opts.agent = new HttpsProxyAgent(PROXY); } catch {}
+	}
+	return opts;
+}
+
 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 };
+	const opts = makeFetchOpts();
+	try {
+		const controller = new AbortController();
+		const t = setTimeout(() => controller.abort(), HTTP_TIMEOUT_MS);
+		const res = await fetch(api, { ...opts, signal: controller.signal });
+		clearTimeout(t);
+		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 || '';
+		const m = tag.match(/v(\d+\.\d+\.\d+)/);
+		return { tag, version: m ? m[1] : null };
+	} catch (e) {
+		// Fallback to HTML redirect
+		const html = `https://github.com/${REPO}/releases/latest`;
+		const res = await fetch(html, { ...opts, redirect: 'manual' });
+		const loc = res.headers.get('location') || '';
+		const m = loc.match(/\/releases\/tag\/([^/]+)$/);
+		const tag = m ? m[1] : '';
+		const mv = tag.match(/v(\d+\.\d+\.\d+)/);
+		return { tag, version: mv ? mv[1] : null };
+	}
 }
 
 function cmpSemver(a, b) {