9remote 2.0.1 → 2.0.2

package/cli/index.js

@@ -588,6 +588,24 @@ async function tuiMode() {
   const MAX_LOG_LINES = 200;
 
   let deviceApprovalBusy = false;
+
+  // Skip redraws while device approval prompt is active — otherwise SSE-driven
+  // menu repaints (state/permissions/log) would clear the screen and overwrite
+  // the prompt, making it invisible to the user.
+  const safeRedraw = () => { if (!deviceApprovalBusy) triggerMenuRedraw?.(); };
+
+  // Handle pending approval — shared by SSE event and fallback poll.
+  // Fallback recovers from missed SSE events (reconnect, TUI in submenu, etc.)
+  const handlePendingApproval = async (socketId, deviceId, ip) => {
+    if (deviceApprovalBusy) return;
+    deviceApprovalBusy = true;
+    const approved = await showDeviceApproval(deviceId, ip);
+    const endpoint = approved ? "approve" : "reject";
+    await apiPost(`/api/device/${endpoint}`, { socketId });
+    deviceApprovalBusy = false;
+    triggerMenuRedraw?.();
+  };
+
   const stopSSE = subscribeSSE(SERVER_PORT, async (type, data) => {
     if (type === "log" && data.message) {
       logBuffer.push(data.message);
@@ -604,26 +622,28 @@ async function tuiMode() {
         currentTunnelUrl = newTunnel;
         if (data.permanentKey) keyData = { ...keyData, key: data.permanentKey };
         menuHeader = await buildMenuHeader(currentOneTimeKey, keyData.key, currentConnectUrl, currentTunnelUrl);
-        triggerMenuRedraw?.();
+        safeRedraw();
       }
     } else if (type === "permissions") {
       // desktopEnabled or permission values changed — refresh both main menu and active submenu
-      activeSubmenuRefresh?.();
-      triggerMenuRedraw?.();
+      if (!deviceApprovalBusy) activeSubmenuRefresh?.();
+      safeRedraw();
     } else if (type === "deviceApproval" && data.action === "pending") {
-      if (deviceApprovalBusy) return;
-      deviceApprovalBusy = true;
-      const approved = await showDeviceApproval(data.deviceId, data.ip);
-      const endpoint = approved ? "approve" : "reject";
-      await apiPost(`/api/device/${endpoint}`, { socketId: data.socketId });
-      deviceApprovalBusy = false;
-      triggerMenuRedraw?.();
+      await handlePendingApproval(data.socketId, data.deviceId, data.ip);
     }
   });
 
+  // Fallback poll: recover from missed SSE pending events
+  const pendingPoll = setInterval(async () => {
+    if (deviceApprovalBusy) return;
+    const d = await apiGet("/api/device/pending");
+    const first = d?.pending?.[0];
+    if (first) await handlePendingApproval(first.socketId, first.deviceId, first.ip);
+  }, 3000);
+
   setupExitHandler({
     getProcess: tuiServerMgr.getProcess,
-    shutdown: () => { tuiServerMgr.shutdown(); stopSSE(); }
+    shutdown: () => { tuiServerMgr.shutdown(); stopSSE(); clearInterval(pendingPoll); }
   }, tunnelProcess, keyData.key);
 
   // Handle web UI Start/Stop commands while TUI is running
@@ -632,6 +652,7 @@ async function tuiMode() {
 
   const onShutdown = () => {
     try { stopSSE(); } catch {}
+    try { clearInterval(pendingPoll); } catch {}
     shutdownAll({
       serverManager: tuiServerMgr,
       tunnelProcess,
@@ -650,8 +671,15 @@ async function tuiMode() {
 }
 
 async function fetchServerState() {
-  const d = await apiGet("/api/ui/state");
-  return { desktopEnabled: !!d?.desktopEnabled, remoteAvailable: !!d?.remoteAvailable };
+  const [d, a] = await Promise.all([
+    apiGet("/api/ui/state"),
+    apiGet("/api/device/auto-approve"),
+  ]);
+  return {
+    desktopEnabled: !!d?.desktopEnabled,
+    remoteAvailable: !!d?.remoteAvailable,
+    autoApprove: !!a?.enabled,
+  };
 }
 
 /**
@@ -664,7 +692,7 @@ async function fetchServerState() {
  */
 async function tuiMenuLoop(keyData, tunnelUrl, getHeader = () => "", setHeader = () => {}, onRedrawRegister = () => {}, onCtrlC = null, logBuffer = []) {
   while (true) {
-    const { desktopEnabled: desktopOn, remoteAvailable } = await fetchServerState();
+    const { desktopEnabled: desktopOn, remoteAvailable, autoApprove } = await fetchServerState();
 
     const items = [
       { label: "Open Web UI", action: "webui" },
@@ -675,8 +703,9 @@ async function tuiMenuLoop(keyData, tunnelUrl, getHeader = () => "", setHeader =
       const desktopLabel = `Remote Desktop: ${desktopOn ? chalk.green("ON") : chalk.gray("OFF")}  ▶`;
       items.push({ label: desktopLabel, action: "desktop" });
     }
+    const autoLabel = autoApprove ? chalk.green("ON") : chalk.gray("OFF");
     items.push(
-      { label: "Manage Devices  \u25b6", action: "devices" },
+      { label: `Manage Devices  \u25b6  ${chalk.dim("(Auto-approve:")} ${autoLabel}${chalk.dim(")")}`, action: "devices" },
       { label: `View Logs (${logBuffer.length})`, action: "logs" },
       { label: chalk.gray("Exit"), action: "exit" },
     );
@@ -800,27 +829,40 @@ async function tuiDesktopMenu() {
 
 async function tuiDevicesMenu() {
   while (true) {
-    const data = await apiGet("/api/device/approved");
-    const devices = data?.devices || [];
+    const [approvedData, autoData] = await Promise.all([
+      apiGet("/api/device/approved"),
+      apiGet("/api/device/auto-approve"),
+    ]);
+    const devices = approvedData?.devices || [];
+    const autoOn = !!autoData?.enabled;
 
+    const toggleLabel = `Auto-approve new devices: ${autoOn ? chalk.green("ON") : chalk.gray("OFF")}`;
     const items = [
+      { label: toggleLabel, action: "toggle" },
       ...devices.map((d) => {
         const short = d.deviceId.slice(0, 8);
         const date = d.approvedAt ? new Date(d.approvedAt).toLocaleString() : "unknown";
-        return { label: `${short}...  ${chalk.dim(date)}` };
+        return { label: `${short}...  ${chalk.dim(date)}`, action: "remove", deviceId: d.deviceId };
       }),
-      { label: chalk.gray("\u2190 Back") },
+      { label: chalk.gray("\u2190 Back"), action: "back" },
     ];
 
     const title = `Approved Devices (${devices.length})`;
-    const idx = await selectMenu(title, items, items.length - 1);
+    const idx = await selectMenu(title, items, 0);
 
-    if (idx === -1 || idx === devices.length) return; // Back/ESC
+    if (idx === -1) return; // ESC
+    const sel = items[idx];
+    if (sel.action === "back") return;
 
-    // Remove selected device
-    const deviceId = devices[idx].deviceId;
-    const confirmed = await tuiConfirm(chalk.yellow(`Remove device ${deviceId.slice(0, 8)}...?`));
-    if (confirmed) await apiPost("/api/device/remove", { deviceId });
+    if (sel.action === "toggle") {
+      await apiPost("/api/device/auto-approve", { enabled: !autoOn });
+      continue;
+    }
+
+    if (sel.action === "remove") {
+      const confirmed = await tuiConfirm(chalk.yellow(`Remove device ${sel.deviceId.slice(0, 8)}...?`));
+      if (confirmed) await apiPost("/api/device/remove", { deviceId: sel.deviceId });
+    }
   }
 }
 

package/cli/utils/tui.js

@@ -212,8 +212,8 @@ export function resetProgress() {
  * @param {Array<{label: string}>} items
  * @param {number} defaultIndex
  * @param {string} headerContent — pre-built string shown above menu
- * @param {(setRedraw: () => void) => void} onRedrawInit — receive a redraw trigger fn (for SSE updates)
- * @returns {Promise<number>} selected index, -1 on ESC
+ * @param {(setRedraw: () => void, forceExit?: () => void) => void} onRedrawInit — receive redraw + forceExit triggers (for SSE updates / external prompts)
+ * @returns {Promise<number>} selected index, -1 on ESC, -2 on forceExit (caller should re-render)
  */
 export function selectMenu(title, items, defaultIndex = 0, headerContent = "", onRedrawInit = null, onCtrlC = null) {
   return new Promise((resolve) => {
@@ -281,8 +281,16 @@ export function selectMenu(title, items, defaultIndex = 0, headerContent = "", o
     process.stdin.resume();
     renderMenu();
 
+    // Allow external code to force-exit this menu (e.g. to show a prompt that needs stdin).
+    // Resolves with -2 so caller knows to re-render/restart the menu with a fresh stdin state.
+    const forceExit = () => {
+      if (!isActive) return;
+      cleanup();
+      resolve(-2);
+    };
+
     // Allow external code (SSE) to trigger a re-render without disrupting navigation
-    if (onRedrawInit) onRedrawInit(renderMenu);
+    if (onRedrawInit) onRedrawInit(renderMenu, forceExit);
   });
 }
 
@@ -333,7 +341,9 @@ export function showDeviceApproval(deviceId, ip) {
     const shortId = deviceId ? deviceId.slice(0, 8) : "unknown";
     const w = W();
 
-    // Fully take over stdin from selectMenu
+    // Save existing keypress listeners (e.g. selectMenu's) so we can restore
+    // them after the prompt — otherwise the caller's menu loses arrow-key input.
+    const savedListeners = process.stdin.listeners("keypress").slice();
     process.stdin.removeAllListeners("keypress");
     if (process.stdin.isTTY) { try { process.stdin.setRawMode(false); } catch {} }
     process.stdin.pause();
@@ -356,6 +366,15 @@ export function showDeviceApproval(deviceId, ip) {
     if (process.stdin.isTTY) { try { process.stdin.setRawMode(true); } catch {} }
     process.stdin.resume();
 
+    const restoreListeners = () => {
+      for (const l of savedListeners) process.stdin.on("keypress", l);
+      if (savedListeners.length > 0) {
+        // Previous owner (selectMenu) was in raw mode + resumed stdin.
+        if (process.stdin.isTTY) { try { process.stdin.setRawMode(true); } catch {} }
+        process.stdin.resume();
+      }
+    };
+
     const onKeypress = (str, key) => {
       if (!key) return;
       const ch = (key.name || "").toLowerCase();
@@ -370,7 +389,7 @@ export function showDeviceApproval(deviceId, ip) {
         console.log(approved
           ? `\n  ${C.green}\u2713 Device approved${C.reset}`
           : `\n  ${C.red}\u2717 Device rejected${C.reset}`);
-        setTimeout(() => resolve(approved), 500);
+        setTimeout(() => { restoreListeners(); resolve(approved); }, 500);
       }
     };