@renbostudios/edge-ota 0.2.8 → 0.3.0

package/dist/index.js

@@ -146,7 +146,7 @@ const spin = (() => {
     };
 })();
 // ─── Package version ─────────────────────────────────────────────────────────
-let packageVersion = "0.2.8";
+let packageVersion = "0.3.0";
 try {
     const pkgPath = path.join(__dirname, "..", "package.json");
     if (fs.existsSync(pkgPath)) {
@@ -163,6 +163,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 +195,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 +215,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 +234,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 +243,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}`);
@@ -284,6 +297,75 @@ function askSecret(query) {
         }
     });
 }
+function selectOption(question, options) {
+    return new Promise((resolve) => {
+        if (!process.stdin.isTTY) {
+            console.log(`  ${c.bold}${question}${c.reset}`);
+            options.forEach((opt, idx) => {
+                console.log(`  [${idx + 1}] ${opt.label}`);
+            });
+            ask(`  selection (1-${options.length}): `).then((choice) => {
+                const idx = parseInt(choice) - 1;
+                if (!isNaN(idx) && idx >= 0 && idx < options.length) {
+                    resolve(options[idx].value);
+                }
+                else {
+                    resolve(options[0].value);
+                }
+            });
+            return;
+        }
+        let cursor = 0;
+        const hideCursor = "\u001b[?25l";
+        const showCursor = "\u001b[?25h";
+        let hasRendered = false;
+        console.log(`  ${c.bold}${question}${c.reset}`);
+        function render() {
+            if (hasRendered) {
+                for (let i = 0; i < options.length; i++) {
+                    process.stdout.write("\r\u001b[K\u001b[A");
+                }
+                process.stdout.write("\r\u001b[K");
+            }
+            hasRendered = true;
+            options.forEach((opt, idx) => {
+                const isSelected = idx === cursor;
+                const marker = isSelected ? `${c.cyan}❯${c.reset}` : " ";
+                const text = isSelected ? `${c.bold}${c.cyan}${opt.label}${c.reset}` : `${c.dim}${opt.label}${c.reset}`;
+                process.stdout.write(`  ${marker} ${text}\n`);
+            });
+        }
+        readline.emitKeypressEvents(process.stdin);
+        process.stdin.setRawMode(true);
+        process.stdin.resume();
+        process.stdout.write(hideCursor);
+        render();
+        function onKeypress(str, key) {
+            if (key.ctrl && key.name === "c") {
+                process.stdout.write(showCursor);
+                process.stdin.setRawMode(false);
+                process.stdin.pause();
+                process.exit(0);
+            }
+            if (key.name === "up" || key.name === "k") {
+                cursor = (cursor - 1 + options.length) % options.length;
+                render();
+            }
+            else if (key.name === "down" || key.name === "j") {
+                cursor = (cursor + 1) % options.length;
+                render();
+            }
+            else if (key.name === "return" || key.name === "enter") {
+                process.stdout.write(showCursor);
+                process.stdin.setRawMode(false);
+                process.stdin.removeListener("keypress", onKeypress);
+                process.stdin.pause();
+                resolve(options[cursor].value);
+            }
+        }
+        process.stdin.on("keypress", onKeypress);
+    });
+}
 const CONTENT_TYPES = {
     ".js": "application/javascript",
     ".hbc": "application/javascript",
@@ -393,11 +475,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");
@@ -458,53 +545,108 @@ 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();
-    // Try to read existing app.json for project name suggestion
-    let suggestedName = path.basename(cwd);
-    try {
-        const data = JSON.parse(fs.readFileSync(path.resolve(cwd, "app.json"), "utf-8"));
-        suggestedName = data?.expo?.name || suggestedName;
-    }
-    catch { /* ignore */ }
-    const projectName = (await ask(`  ${c.dim}project name [${suggestedName}]:${c.reset} `)) || suggestedName;
-    spin.start("generating ECDSA P-256 key pair");
-    const keys = await generateECDSAKeyPair();
-    spin.stop("key pair generated");
-    spin.start("registering project on server");
-    let projectId;
+    // Fetch existing projects
+    spin.start("fetching existing projects from server");
+    let projects = [];
     try {
         const res = await fetch(`${serverUrl}/api/projects`, {
-            method: "POST",
-            headers: { "Content-Type": "application/json", Authorization: `Bearer ${token}` },
-            body: JSON.stringify({ name: projectName, publicKey: keys.publicKey }),
+            headers: { Authorization: `Bearer ${token}` }
         });
-        if (!res.ok) {
-            const text = await res.text();
-            spin.fail(`Failed to register project: ${text}`);
-            process.exit(1);
+        if (res.ok) {
+            projects = await res.json();
         }
-        const data = await res.json();
-        projectId = data.id;
-        spin.stop("project registered");
+        spin.stop();
     }
     catch (e) {
-        spin.fail(`Connection error: ${e.message}`);
-        process.exit(1);
+        spin.fail(`Failed to fetch projects: ${e.message}`);
+        // Continue with creation if list fails
+    }
+    let projectId = null;
+    let projectName = "";
+    if (projects.length > 0) {
+        const options = projects.map(p => ({
+            label: `${p.name} ${c.dim}(id: ${p.id.slice(0, 8)}...)${c.reset}`,
+            value: p
+        }));
+        options.push({
+            label: `${c.green}Create a new project...${c.reset}`,
+            value: null
+        });
+        const selected = await selectOption("Select a project to associate with this app:", options);
+        if (selected) {
+            projectId = selected.id;
+            projectName = selected.name;
+        }
+    }
+    const keys = await generateECDSAKeyPair();
+    if (projectId) {
+        // Re-initialize existing project: update public key on the server
+        spin.start(`associating project "${projectName}"`);
+        try {
+            const res = await fetch(`${serverUrl}/api/projects/${projectId}`, {
+                method: "PUT",
+                headers: { "Content-Type": "application/json", Authorization: `Bearer ${token}` },
+                body: JSON.stringify({ name: projectName, publicKey: keys.publicKey }),
+            });
+            if (!res.ok) {
+                const text = await res.text();
+                spin.fail(`Failed to update project public key on server: ${text}`);
+                process.exit(1);
+            }
+            spin.stop(`associated project "${projectName}"`);
+        }
+        catch (e) {
+            spin.fail(`Connection error: ${e.message}`);
+            process.exit(1);
+        }
+    }
+    else {
+        // Create new project
+        let suggestedName = path.basename(cwd);
+        try {
+            const data = JSON.parse(fs.readFileSync(path.resolve(cwd, "app.json"), "utf-8"));
+            suggestedName = data?.expo?.name || suggestedName;
+        }
+        catch { /* ignore */ }
+        projectName = (await ask(`  ${c.dim}project name [${suggestedName}]:${c.reset} `)) || suggestedName;
+        spin.start("registering project on server");
+        try {
+            const res = await fetch(`${serverUrl}/api/projects`, {
+                method: "POST",
+                headers: { "Content-Type": "application/json", Authorization: `Bearer ${token}` },
+                body: JSON.stringify({ name: projectName, publicKey: keys.publicKey }),
+            });
+            if (!res.ok) {
+                const text = await res.text();
+                spin.fail(`Failed to register project: ${text}`);
+                process.exit(1);
+            }
+            const data = await res.json();
+            projectId = data.id;
+            spin.stop("project registered");
+        }
+        catch (e) {
+            spin.fail(`Connection error: ${e.message}`);
+            process.exit(1);
+        }
     }
     // Save private key globally
-    savePrivateKey(projectId, keys.privateKey);
-    // Update app.json
-    updateAppJson(cwd, serverUrl, projectId, keys.publicKey);
-    const sep = `${c.dim}${"─".repeat(52)}${c.reset}`;
-    console.log(`\n${sep}`);
-    console.log(`  ${c.green}✓${c.reset}  ${c.bold}Initialised${c.reset}`);
-    console.log(sep);
-    console.log(`  project    ${c.dim}${projectId}${c.reset}`);
-    console.log(`  server     ${c.dim}${serverUrl}${c.reset}`);
-    console.log(`  key file   ${c.dim}${path.join(GLOBAL_KEYS_DIR, `${projectId}.key`)}${c.reset}`);
-    console.log(sep + "\n");
-    console.log(`  ${c.dim}Next step:${c.reset} run ${c.cyan}edge-ota push${c.reset} to publish your first update.\n`);
+    if (projectId) {
+        savePrivateKey(projectId, keys.privateKey);
+        // Update app.json
+        updateAppJson(cwd, serverUrl, projectId, keys.publicKey);
+        const sep = `${c.dim}${"─".repeat(52)}${c.reset}`;
+        console.log(`\n${sep}`);
+        console.log(`  ${c.green}✓${c.reset}  ${c.bold}Initialised${c.reset}`);
+        console.log(sep);
+        console.log(`  project    ${c.dim}${projectId}${c.reset}`);
+        console.log(`  server     ${c.dim}${serverUrl}${c.reset}`);
+        console.log(`  key file   ${c.dim}${path.join(GLOBAL_KEYS_DIR, `${projectId}.key`)}${c.reset}`);
+        console.log(sep + "\n");
+        console.log(`  ${c.dim}Next step:${c.reset} run ${c.cyan}edge-ota push${c.reset} to publish your first update.\n`);
+    }
 });
 // ──────────────────────────────────────────────────────────────────────────────
 // edge-ota push

package/package.json

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