lunel-cli 0.1.30 → 0.1.32

package/dist/index.js

@@ -13,6 +13,7 @@ import { createServer, createConnection } from "net";
 import { createInterface } from "readline";
 const DEFAULT_PROXY_URL = process.env.LUNEL_PROXY_URL || "https://gateway.lunel.dev";
 const MANAGER_URL = process.env.LUNEL_MANAGER_URL || "https://manager.lunel.dev";
+const CLI_ARGS = process.argv.slice(2);
 import { createRequire } from "module";
 const __require = createRequire(import.meta.url);
 const VERSION = __require("../package.json").version;
@@ -39,6 +40,10 @@ let shuttingDown = false;
 let activeControlWs = null;
 let activeDataWs = null;
 const activeTunnels = new Map();
+const PORT_SYNC_INTERVAL_MS = 30_000;
+let portSyncTimer = null;
+let portScanInFlight = false;
+let lastDiscoveredPorts = [];
 // Popular development server ports to scan on connect
 const DEV_PORTS = [
     1234, // Parcel
@@ -88,6 +93,44 @@ const DEV_PORTS = [
     19006, // Expo web
     24678, // Vite HMR WebSocket
 ];
+function parseExtraPortsFromArgs(args) {
+    const values = [];
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
+        if (arg.startsWith("--extra-ports=")) {
+            values.push(arg.slice("--extra-ports=".length));
+            continue;
+        }
+        if (arg === "--extra-ports" && i + 1 < args.length) {
+            values.push(args[i + 1]);
+            i++;
+        }
+    }
+    const parsed = new Set();
+    for (const value of values) {
+        for (const piece of value.split(",")) {
+            const trimmed = piece.trim();
+            if (!trimmed)
+                continue;
+            const num = Number(trimmed);
+            if (!Number.isInteger(num) || num < 1 || num > 65535)
+                continue;
+            parsed.add(num);
+        }
+    }
+    return Array.from(parsed).sort((a, b) => a - b);
+}
+const EXTRA_PORTS = parseExtraPortsFromArgs(CLI_ARGS);
+const SCAN_PORTS = Array.from(new Set([...DEV_PORTS, ...EXTRA_PORTS])).sort((a, b) => a - b);
+function samePortSet(a, b) {
+    if (a.length !== b.length)
+        return false;
+    for (let i = 0; i < a.length; i++) {
+        if (a[i] !== b[i])
+            return false;
+    }
+    return true;
+}
 // ============================================================================
 // Path Safety
 // ============================================================================
@@ -353,7 +396,9 @@ async function handleGitStatus() {
     const branch = branchResult.stdout.trim();
     // Get status
     const statusResult = await runGit(["status", "--porcelain", "-uall"]);
-    const lines = statusResult.stdout.trim().split("\n").filter(Boolean);
+    // Preserve leading whitespace in each porcelain line.
+    // Example: " M file" (unstaged-only) starts with a space that is semantically important.
+    const lines = statusResult.stdout.split(/\r?\n/).filter((line) => line.length > 0);
     const staged = [];
     const unstaged = [];
     const untracked = [];
@@ -1413,7 +1458,7 @@ async function subscribeToOpenCodeEvents(client) {
 // ============================================================================
 async function scanDevPorts() {
     const openPorts = [];
-    const checks = DEV_PORTS.map((port) => {
+    const checks = SCAN_PORTS.map((port) => {
         return new Promise((resolve) => {
             const socket = createConnection({ port, host: "127.0.0.1" });
             socket.setTimeout(200);
@@ -1434,6 +1479,48 @@ async function scanDevPorts() {
     await Promise.all(checks);
     return openPorts.sort((a, b) => a - b);
 }
+async function publishDiscoveredPorts(ws, force = false) {
+    if (portScanInFlight)
+        return;
+    if (ws.readyState !== WebSocket.OPEN)
+        return;
+    portScanInFlight = true;
+    try {
+        const openPorts = await scanDevPorts();
+        if (!force && samePortSet(openPorts, lastDiscoveredPorts)) {
+            return;
+        }
+        lastDiscoveredPorts = openPorts;
+        ws.send(JSON.stringify({
+            v: 1,
+            id: `evt-${Date.now()}`,
+            ns: "proxy",
+            action: "ports_discovered",
+            payload: { ports: openPorts },
+        }));
+        console.log(`[proxy] ports updated (${openPorts.length}): ${openPorts.join(", ") || "-"}`);
+    }
+    catch (err) {
+        console.error("Port scan failed:", err);
+    }
+    finally {
+        portScanInFlight = false;
+    }
+}
+function stopPortSync() {
+    if (portSyncTimer) {
+        clearInterval(portSyncTimer);
+        portSyncTimer = null;
+    }
+    portScanInFlight = false;
+}
+function startPortSync(ws) {
+    stopPortSync();
+    void publishDiscoveredPorts(ws, true);
+    portSyncTimer = setInterval(() => {
+        void publishDiscoveredPorts(ws, false);
+    }, PORT_SYNC_INTERVAL_MS);
+}
 async function handleProxyConnect(payload) {
     const tunnelId = payload.tunnelId;
     const port = payload.port;
@@ -1824,45 +1911,19 @@ function normalizeGatewayUrl(input) {
         return input.replace(/\/+$/, "");
     return `https://${input}`.replace(/\/+$/, "");
 }
-async function discoverGateways() {
-    try {
-        const response = await fetch(`${MANAGER_URL}/v1/gateways`, {
-            method: "GET",
-            headers: { "Content-Type": "application/json" },
-        });
-        if (!response.ok) {
-            throw new Error(`manager returned ${response.status}`);
-        }
-        const data = (await response.json());
-        const gateways = (data.gateways || []).map((x) => normalizeGatewayUrl(x)).filter(Boolean);
-        const primary = data.primary ? normalizeGatewayUrl(data.primary) : gateways[0];
-        const backup = data.backup ? normalizeGatewayUrl(data.backup) : gateways[1] || null;
-        if (!primary)
-            throw new Error("manager returned no healthy gateways");
-        return { primary, backup };
-    }
-    catch (err) {
-        console.warn(`[manager] gateway discovery failed, using default: ${err.message}`);
-        return { primary: DEFAULT_PROXY_URL, backup: null };
-    }
-}
-async function createSession(gatewayUrl) {
-    const response = await fetch(`${gatewayUrl}/v1/session`, {
+async function createSessionFromManager() {
+    const response = await fetch(`${MANAGER_URL}/v1/session`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
     });
     if (!response.ok) {
-        throw new Error(`Failed to create session: ${response.status}`);
+        throw new Error(`Failed to create session from manager: ${response.status}`);
     }
-    const data = (await response.json());
-    return data.code;
+    return (await response.json());
 }
 function displayQR(primaryGateway, backupGateway, code) {
-    const qrPayload = backupGateway
-        ? `${primaryGateway},${backupGateway},${code}`
-        : `${primaryGateway},${code}`;
     console.log("\n");
-    qrcode.generate(qrPayload, { small: true }, (qr) => {
+    qrcode.generate(code, { small: true }, (qr) => {
         console.log(qr);
         console.log(`\n  Session code: ${code}\n`);
         console.log(`  Primary gateway: ${primaryGateway}`);
@@ -1894,6 +1955,7 @@ function buildWsUrl(gatewayUrl, role, channel) {
 function gracefulShutdown() {
     shuttingDown = true;
     console.log("\nShutting down...");
+    stopPortSync();
     if (ptyProcess) {
         ptyProcess.kill();
         ptyProcess = null;
@@ -1951,6 +2013,7 @@ async function connectWebSocket() {
                         return;
                     closeHandled = true;
                     closeReason = reason;
+                    stopPortSync();
                     cleanupAllTunnels();
                     setTimeout(() => {
                         if (shuttingDown)
@@ -1975,26 +2038,12 @@ async function connectWebSocket() {
                             }
                             if (message.type === "peer_connected") {
                                 console.log("App connected!\n");
-                                scanDevPorts().then((openPorts) => {
-                                    if (openPorts.length > 0) {
-                                        console.log(`Found ${openPorts.length} open dev port(s): ${openPorts.join(", ")}`);
-                                    }
-                                    if (controlWs.readyState === WebSocket.OPEN) {
-                                        controlWs.send(JSON.stringify({
-                                            v: 1,
-                                            id: `evt-${Date.now()}`,
-                                            ns: "proxy",
-                                            action: "ports_discovered",
-                                            payload: { ports: openPorts },
-                                        }));
-                                    }
-                                }).catch((err) => {
-                                    console.error("Port scan failed:", err);
-                                });
+                                startPortSync(controlWs);
                                 return;
                             }
                             if (message.type === "peer_disconnected") {
                                 console.log("App disconnected. Waiting for reconnect window.\n");
+                                stopPortSync();
                                 return;
                             }
                             if (message.type === "app_disconnected") {
@@ -2099,6 +2148,9 @@ async function handleConnectionDrop(reason) {
 async function main() {
     console.log("Lunel CLI v" + VERSION);
     console.log("=".repeat(20) + "\n");
+    if (EXTRA_PORTS.length > 0) {
+        console.log(`Extra ports enabled: ${EXTRA_PORTS.join(", ")}`);
+    }
     try {
         // Generate auth credentials (like CodeNomad does)
         const opencodeUsername = "lunel";
@@ -2126,13 +2178,13 @@ async function main() {
         console.log("OpenCode ready.\n");
         // Subscribe to OpenCode events
         subscribeToOpenCodeEvents(client);
-        const gateways = await discoverGateways();
-        currentPrimaryGateway = gateways.primary;
-        currentBackupGateway = gateways.backup;
+        const session = await createSessionFromManager();
+        currentPrimaryGateway = normalizeGatewayUrl(session.primary);
+        currentBackupGateway = session.backup ? normalizeGatewayUrl(session.backup) : null;
+        currentSessionPassword = session.password;
         activeGatewayUrl = currentPrimaryGateway;
-        const code = await createSession(currentPrimaryGateway);
-        currentSessionCode = code;
-        displayQR(currentPrimaryGateway, currentBackupGateway, code);
+        currentSessionCode = session.code;
+        displayQR(currentPrimaryGateway, currentBackupGateway, session.code);
         await connectWebSocket();
     }
     catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lunel-cli",
-  "version": "0.1.30",
+  "version": "0.1.32",
   "author": [
     {
       "name": "Soham Bharambe",