@renbostudios/edge-ota 0.2.9 → 0.3.1

package/dist/index.js

@@ -13,7 +13,7 @@
  *   edge-ota keygen   — Generate a new ECDSA key pair (prints to stdout)
  */
 import { Command } from "commander";
-import { spawn } from "child_process";
+import { execSync, spawn } from "child_process";
 import fs from "fs";
 import os from "os";
 import path from "path";
@@ -146,7 +146,7 @@ const spin = (() => {
     };
 })();
 // ─── Package version ─────────────────────────────────────────────────────────
-let packageVersion = "0.2.9";
+let packageVersion = "0.3.0";
 try {
     const pkgPath = path.join(__dirname, "..", "package.json");
     if (fs.existsSync(pkgPath)) {
@@ -154,6 +154,70 @@ try {
     }
 }
 catch { /* fallback */ }
+// ─── Auto Update Check ────────────────────────────────────────────────────────
+const UPDATE_CHECK_FILE = path.join(GLOBAL_CONFIG_DIR, "update-check.json");
+function isNewerVersion(current, latest) {
+    const cParts = current.split(".").map(Number);
+    const lParts = latest.split(".").map(Number);
+    for (let i = 0; i < 3; i++) {
+        const cNum = cParts[i] || 0;
+        const lNum = lParts[i] || 0;
+        if (lNum > cNum)
+            return true;
+        if (lNum < cNum)
+            return false;
+    }
+    return false;
+}
+async function checkAndAutoUpdate() {
+    if (process.env.EDGE_OTA_UPDATING === "true")
+        return;
+    try {
+        const now = Date.now();
+        if (fs.existsSync(UPDATE_CHECK_FILE)) {
+            try {
+                const cache = JSON.parse(fs.readFileSync(UPDATE_CHECK_FILE, "utf-8"));
+                // Only check npm once every 15 minutes to keep CLI commands extremely fast
+                if (now - (cache.lastChecked || 0) < 15 * 60 * 1000) {
+                    return;
+                }
+            }
+            catch { /* ignore */ }
+        }
+        // Save timestamp immediately to prevent concurrent requests
+        fs.mkdirSync(GLOBAL_CONFIG_DIR, { recursive: true });
+        fs.writeFileSync(UPDATE_CHECK_FILE, JSON.stringify({ lastChecked: now }));
+        // Fetch latest version from registry with a short 1s timeout
+        const controller = new AbortController();
+        const timerId = setTimeout(() => controller.abort(), 1000);
+        const res = await fetch("https://registry.npmjs.org/@renbostudios/edge-ota/latest", {
+            signal: controller.signal
+        });
+        clearTimeout(timerId);
+        if (!res.ok)
+            return;
+        const data = (await res.json());
+        const latestVersion = data.version;
+        if (latestVersion && isNewerVersion(packageVersion, latestVersion)) {
+            console.log(`\n  ${c.yellow}${c.reset}  New version of ${c.bold}edge-ota${c.reset} available: ${c.green}${latestVersion}${c.reset} (current: ${c.dim}${packageVersion}${c.reset})`);
+            console.log(`  ${c.blue}➜${c.reset}  Auto-updating globally...`);
+            try {
+                execSync("npm install -g @renbostudios/edge-ota", {
+                    stdio: "inherit",
+                    env: { ...process.env, EDGE_OTA_UPDATING: "true" }
+                });
+                console.log(`  ${c.green}✓${c.reset}  Successfully auto-updated to ${c.bold}${latestVersion}${c.reset}!\n`);
+            }
+            catch (err) {
+                console.error(`  ${c.red}✗${c.reset}  Auto-update failed: ${err.message}`);
+                console.error(`     Please update manually: ${c.cyan}npm install -g @renbostudios/edge-ota${c.reset}\n`);
+            }
+        }
+    }
+    catch {
+        // Fail silently so CLI works offline
+    }
+}
 // ─── Banner ───────────────────────────────────────────────────────────────────
 function printBanner() {
     const sep = `${c.dim}${"─".repeat(52)}${c.reset}`;
@@ -163,6 +227,8 @@ function printBanner() {
     console.log(`  ${c.dim}renbostudios.com${c.reset}`);
     console.log(`${sep}\n`);
 }
+// ─── app.json helpers ────────────────────────────────────────────────────────
+const DEFAULT_SERVER = "https://api.ota.renbo.site";
 function readAppJson(cwd) {
     const appJsonPath = path.resolve(cwd, "app.json");
     if (!fs.existsSync(appJsonPath)) {
@@ -193,7 +259,7 @@ function readAppJson(cwd) {
         console.error(`     Run ${c.cyan}edge-ota init${c.reset} to set this up.\n`);
         process.exit(1);
     }
-    // Parse serverUrl and projectId from the updates URL
+    // Parse serverUrl and projectId from the updates URL.
     // Expected format: https://<host>/api/projects/<uuid>/updates
     //              or: https://<host>/api/updates
     let serverUrl;
@@ -213,7 +279,14 @@ function readAppJson(cwd) {
         console.error(`  ${c.red}✗${c.reset}  Could not parse ${c.dim}expo.updates.url${c.reset} in app.json`);
         process.exit(1);
     }
-    return { serverUrl, projectId, runtimeVersion, publicKey: expo.updates?.publicKey };
+    // ── Project-level server override ──
+    // expo.extra.edgeOtaServer lets users point a specific project at a
+    // different (self-hosted) EdgeOTA instance without re-logging in.
+    const projectServer = expo?.extra?.edgeOtaServer;
+    if (projectServer) {
+        serverUrl = projectServer.replace(/\/$/, "");
+    }
+    return { serverUrl, projectId, runtimeVersion, publicKey: expo?.extra?.edgeOtaPublicKey };
 }
 function updateAppJson(cwd, serverUrl, projectId, publicKey) {
     const appJsonPath = path.resolve(cwd, "app.json");
@@ -225,6 +298,8 @@ function updateAppJson(cwd, serverUrl, projectId, publicKey) {
             data.expo = {};
         if (!data.expo.updates)
             data.expo.updates = {};
+        if (!data.expo.extra)
+            data.expo.extra = {};
         const cleanUrl = serverUrl.replace(/\/$/, "");
         data.expo.updates.url = projectId
             ? `${cleanUrl}/api/projects/${projectId}/updates`
@@ -232,13 +307,15 @@ function updateAppJson(cwd, serverUrl, projectId, publicKey) {
         data.expo.updates.checkAutomatically = data.expo.updates.checkAutomatically ?? "ON_LOAD";
         data.expo.updates.fallbackToCacheTimeout = data.expo.updates.fallbackToCacheTimeout ?? 30000;
         data.expo.updates.requestHeaders = data.expo.updates.requestHeaders ?? { "expo-channel-name": "production" };
+        // Store the server URL in expo.extra.edgeOtaServer so users can easily
+        // override which EdgeOTA instance this project points to without re-running
+        // `edge-ota login`. They can edit this value directly in app.json.
+        data.expo.extra.edgeOtaServer = cleanUrl;
         if (publicKey) {
-            data.expo.updates.codeSigningCertificate = undefined; // clear legacy
-            data.expo.extra = data.expo.extra ?? {};
             data.expo.extra.edgeOtaPublicKey = publicKey;
         }
         fs.writeFileSync(appJsonPath, JSON.stringify(data, null, 2) + "\n", "utf-8");
-        console.log(`  ${c.dim}app.json${c.reset}    updated ${c.dim}expo.updates.url${c.reset}`);
+        console.log(`  ${c.dim}app.json${c.reset}    updated ${c.dim}expo.updates.url${c.reset} + ${c.dim}expo.extra.edgeOtaServer${c.reset}`);
     }
     catch (e) {
         console.error(`  ${c.yellow}⚠${c.reset}   Could not update app.json: ${e.message}`);
@@ -462,11 +539,16 @@ program.action(() => {
 program
     .command("login")
     .description("Authenticate with your EdgeOTA account")
-    .option("-s, --server <url>", "EdgeOTA server URL", "https://api.edge-ota.renbo.site")
+    .option("-s, --server <url>", `EdgeOTA server URL (default: ${DEFAULT_SERVER})`)
     .action(async (options) => {
     printBanner();
-    console.log(`  ${c.bold}Sign in to EdgeOTA${c.reset}\n`);
-    const serverUrl = options.server.replace(/\/$/, "");
+    const usingCustomServer = options.server && options.server !== DEFAULT_SERVER;
+    console.log(`  ${c.bold}Sign in to EdgeOTA${c.reset}`);
+    if (usingCustomServer) {
+        console.log(`  ${c.dim}server: ${options.server}${c.reset}`);
+    }
+    console.log();
+    const serverUrl = (options.server || DEFAULT_SERVER).replace(/\/$/, "");
     const email = await ask(`  ${c.dim}email:${c.reset}    `);
     const password = await askSecret(`  ${c.dim}password:${c.reset} `);
     spin.start("authenticating");
@@ -527,7 +609,7 @@ program
         process.exit(1);
     }
     const globalCfg = loadGlobalConfig();
-    const serverUrl = (options.server || globalCfg?.serverUrl || "https://api.edge-ota.renbo.site").replace(/\/$/, "");
+    const serverUrl = (options.server || globalCfg?.serverUrl || DEFAULT_SERVER).replace(/\/$/, "");
     const cwd = process.cwd();
     // Fetch existing projects
     spin.start("fetching existing projects from server");
@@ -851,4 +933,5 @@ program
     console.log(sep);
     console.log(keys.publicKey);
 });
+await checkAndAutoUpdate();
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@renbostudios/edge-ota",
-  "version": "0.2.9",
+  "version": "0.3.1",
   "preferGlobal": true,
   "description": "Zero-SDK, self-hostable OTA update CLI for Expo — push signed JS bundles to any EdgeOTA server",
   "license": "MIT",