mindwire 0.1.27 → 0.1.29

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { defaultStateDirectory, superviseComputer, ensureComputer, computerPairingURI, stopComputer, computerClient, SDK_VERSION, readJSON, writeJSON, currentProcessIdentity, processStateAlive, acquireProcessLock, computerPairingQRData } from './chunk-QXHI4TMC.js';
+import { defaultStateDirectory, superviseComputer, ensureComputer, computerPairingURI, stopComputer, computerClient, SDK_VERSION, readJSON, writeJSON, currentProcessIdentity, processStateAlive, acquireProcessLock, computerPairingQRData } from './chunk-QPZMGVY7.js';
 import './chunk-T6TD76UA.js';
 import { promisify, parseArgs } from 'util';
 import { fileURLToPath, pathToFileURL } from 'url';
@@ -7,16 +7,18 @@ import { realpathSync, mkdtempSync, chmodSync, writeFileSync, rmSync } from 'fs'
 import * as path from 'path';
 import { join } from 'path';
 import { createHash } from 'crypto';
-import { hostname, homedir, tmpdir } from 'os';
 import { createInterface } from 'readline/promises';
 import { setTimeout as setTimeout$1 } from 'timers/promises';
 import { execFile, spawn } from 'child_process';
+import { homedir, tmpdir } from 'os';
 import * as fs from 'fs/promises';
 
 var enterScreen = "\x1B[?1049h\x1B[?25l";
 var leaveScreen = "\x1B[0m\x1B[?25h\x1B[?1049l";
 var clearScreen = "\x1B[H\x1B[2J";
-var scanInstruction = "Mindwire \u2192 Add computer \u2192 Scan QR code";
+function scanInstruction(invitation) {
+  return "mode" in invitation && invitation.mode === "reconnect" ? "Workspaces \u2192 your computer \u2192 Reconnect Computer \u2192 Scan Connection Code" : "Mindwire \u2192 Add computer \u2192 Scan QR code";
+}
 async function createPairingQR(invitation) {
   const QR = await import('qrcode');
   const data = computerPairingQRData(invitation);
@@ -34,7 +36,7 @@ async function createPairingQR(invitation) {
     lines.push("\x1B[30;107m" + line + "\x1B[0m");
   }
   const svg = await QR.toString(data, { ...options, type: "svg" });
-  return { lines, columns: Math.max(width, scanInstruction.length) + 1, rows: lines.length + 5, svg };
+  return { lines, columns: Math.max(width, scanInstruction(invitation).length) + 1, rows: lines.length + 5, svg };
 }
 function escapeHTML(value) {
   return value.replace(/[&<>"']/g, (ch) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[ch]);
@@ -60,15 +62,15 @@ textarea{width:100%;margin-top:12px;padding:8px;color:inherit;background:#252528
 <small>MINDWIRE</small><h1>${title}</h1><p>${escapeHTML(invitation.name)}</p>
 <div class="code" id="code" role="img" aria-label="Mindwire connection QR code">${svg}</div>
 <p id="expiry" data-expires="${escapeHTML(invitation.expiresAt)}" aria-live="off"></p>
-<div class="steps"><p>In Mindwire, open <strong>Add computer</strong> and scan.</p>
-<p>${reconnect ? "Your saved pairing and workspace stay the same. No new approval is needed." : "Then return to the terminal to approve your phone."}</p></div>
+<div class="steps"><p>${reconnect ? "In Mindwire, open your computer in <strong>Workspaces</strong>, then <strong>Reconnect Computer \u2192 Scan Connection Code</strong>." : "In Mindwire, open <strong>Add computer</strong> and scan."}</p>
+<p>${reconnect ? "Your saved pairing and workspace stay the same. No new approval is needed." : "Saved keys reconnect automatically. Approve on this computer only if asked."}</p></div>
 <button type="button" id="copy">Copy ${reconnect ? "reconnect" : "pairing"} link</button>
 <textarea id="link" readonly hidden aria-label="Pairing link">${escapeHTML(computerPairingURI(invitation))}</textarea>
 <footer>You can close this page after ${reconnect ? "reconnecting" : "pairing"}.</footer>
 </main><script>
 const expiry=document.getElementById('expiry'),code=document.getElementById('code'),copy=document.getElementById('copy'),link=document.getElementById('link');
 function tick(){const seconds=Math.max(0,Math.ceil((Date.parse(expiry.dataset.expires)-Date.now())/1000));
-if(!seconds){code.remove();copy.disabled=true;link.value='';link.hidden=true;expiry.textContent='Code expired. Run mindwire ${reconnect ? "reconnect" : "connect pair"} for a new code.';return;}
+if(!seconds){code.remove();copy.disabled=true;link.value='';link.hidden=true;expiry.textContent='Code expired. Run mindwire connect for a new code.';return;}
 expiry.textContent='Expires in '+Math.floor(seconds/60)+':'+String(seconds%60).padStart(2,'0');}
 tick();setInterval(tick,1000);
 copy.addEventListener('click',async()=>{try{await navigator.clipboard.writeText(link.value);copy.textContent='Copied';}
@@ -93,16 +95,18 @@ async function openBrowser(url) {
 }
 async function showPairingInvitation(invitation, options = {}) {
   const reconnect = "mode" in invitation && invitation.mode === "reconnect";
-  const nextStep = reconnect ? "Scan with a saved phone, then press Enter here." : "Return here to approve your phone.";
+  const instruction = scanInstruction(invitation);
+  const nextStep = reconnect ? "Scan with a saved phone." : "Approve on this computer only if asked.";
   const waiting = reconnect ? "Your saved pairing stays the same." : "Waiting for your phone\u2026";
-  const command = reconnect ? "mindwire reconnect" : "mindwire connect pair";
+  const command = "mindwire connect";
   const output = options.output ?? process.stdout;
   const environment = options.environment ?? process.env;
   const mode = options.mode ?? "auto";
   const interactive = !!output.isTTY && environment.TERM !== "dumb";
   const linkOnly = mode === "none" || !interactive && mode !== "browser";
   if (linkOnly) {
-    output.write(`Paste this link in Mindwire \u2192 Add computer (expires in 5 minutes):
+    const destination = reconnect ? "Workspaces \u2192 your computer \u2192 Reconnect Computer" : "Add computer";
+    output.write(`Paste this link in Mindwire \u2192 ${destination} (expires in 5 minutes):
 ${computerPairingURI(invitation)}
 
 ${waiting}
@@ -121,10 +125,10 @@ ${waiting}
     if (closed || !useScreen) return;
     let lines;
     if (fits()) {
-      lines = [scanInstruction, "", ...qr.lines, "", waiting];
+      lines = [instruction, "", ...qr.lines, "", waiting];
     } else {
       const size = `Terminal QR needs ${qr.columns} columns \xD7 ${qr.rows} rows.`;
-      lines = browser === "opened" ? ["QR opened in your browser.", scanInstruction, nextStep] : browser === "opening" ? ["Opening a resizable QR in your browser\u2026", nextStep] : browser === "failed" ? ["Couldn't open a browser here.", size, "Enlarge this terminal, or run:", `${command} --no-qr`] : [size, "Enlarge this terminal, or use --qr browser."];
+      lines = browser === "opened" ? ["QR opened in your browser.", instruction, nextStep] : browser === "opening" ? ["Opening a resizable QR in your browser\u2026", nextStep] : browser === "failed" ? ["Couldn't open a browser here.", size, "Enlarge this terminal, or run:", `${command} --no-qr`] : [size, "Enlarge this terminal, or use --qr browser."];
       lines = lines.map((line) => line.slice(0, Math.max(0, (output.columns ?? 80) - 1))).slice(0, Math.max(0, (output.rows ?? 24) - 1));
     }
     output.write(clearScreen + lines.join("\r\n"));
@@ -149,7 +153,7 @@ ${waiting}
       if (closed) return;
       if (useScreen) draw();
       else output.write(browser === "opened" ? `QR opened in your browser.
-${scanInstruction}
+${instruction}
 ${nextStep}
 ` : `Open this local QR page in a browser:
 ${pageURL ?? `Page unavailable. Run ${command} --no-qr for a link.`}
@@ -414,22 +418,23 @@ function connectionAction(value) {
   throw new Error("Use mindwire connect, mindwire connect resume, mindwire reconnect, or mindwire connect pair.");
 }
 async function chooseConnectionAction(options) {
-  const paired = options.devices.filter((device) => !device.revoked);
-  if (options.requested) {
-    if (options.requested !== "pair" && paired.length === 0) {
-      throw new Error("No saved phones yet. Run mindwire connect to pair one first.");
-    }
-    return options.requested;
-  }
-  if (paired.length === 0) return "pair";
-  if (!options.question) return "resume";
+  if (options.requested === "pair" || options.requested === "reconnect") return "pair";
+  return options.devices.some((device) => !device.revoked && device.connected) ? "resume" : "pair";
+}
+async function choosePairingDecision(options) {
+  const replacements = options.replacements.filter((device) => !device.revoked);
+  const prompt = replacements.length ? `
+Previous approvals with this name:
+${deviceSummary(replacements, true)}
+
+Allow this phone? [r = replace these approvals, a = add a different phone, N = deny]: ` : "Allow this phone to access this workspace? [y/N] ";
   for (; ; ) {
-    const answer = (await options.question(
-      "\n  1  Resume saved connection\n  2  Refresh address on a saved phone (QR)\n  3  Pair another phone\n\nChoose [1]: "
-    )).trim().toLowerCase();
-    if (answer === "" || answer === "1" || answer === "resume") return "resume";
-    if (answer === "2" || answer === "reconnect") return "reconnect";
-    if (answer === "3" || answer === "pair") return "pair";
+    const answer = (await options.question(prompt)).trim().toLowerCase();
+    if (["", "n", "no"].includes(answer)) return { approve: false };
+    if (replacements.length) {
+      if (["r", "replace"].includes(answer)) return { approve: true, replaceDeviceIds: replacements.map((device) => device.id) };
+      if (["a", "add"].includes(answer)) return { approve: true };
+    } else if (["y", "yes"].includes(answer)) return { approve: true };
   }
 }
 async function chooseStartupAction(options) {
@@ -446,24 +451,16 @@ async function chooseStartupAction(options) {
     if (["n", "no"].includes(answer)) return false;
   }
 }
-function reconnectCode(info, name, now = /* @__PURE__ */ new Date()) {
-  if (info.routes.length === 0) throw new Error("No connection address is ready. Run mindwire status and retry once the tunnel is online.");
-  return {
-    version: 1,
-    mode: "reconnect",
-    computerId: info.computerId,
-    registryId: info.registryId,
-    fingerprint: info.fingerprint,
-    name,
-    routes: info.routes,
-    expiresAt: new Date(now.getTime() + 5 * 6e4).toISOString()
-  };
-}
-function deviceSummary(devices) {
-  return devices.filter((device) => !device.revoked).sort((a, b) => a.name.localeCompare(b.name) || a.id.localeCompare(b.id)).map((device) => {
-    const name = device.name.replace(/[\x00-\x1f\x7f-\x9f]/g, "");
+function deviceSummary(devices, showKeys = false) {
+  const saved = devices.filter((device) => !device.revoked);
+  const names = /* @__PURE__ */ new Map();
+  const safeName2 = (device) => device.name.replace(/[\x00-\x1f\x7f-\x9f]/g, "");
+  for (const device of saved) names.set(safeName2(device), (names.get(safeName2(device)) ?? 0) + 1);
+  return saved.sort((a, b) => a.name.localeCompare(b.name) || a.id.localeCompare(b.id)).map((device) => {
+    const name = safeName2(device);
     const status = device.connected === true ? "connected" : "paired";
-    return `  ${name} \xB7 ${status}`;
+    const identity = showKeys || (names.get(name) ?? 0) > 1 ? ` \xB7 key ${device.id.slice(0, 8)}` : "";
+    return `  ${name} \xB7 ${status}${identity}`;
   }).join("\n");
 }
 
@@ -471,9 +468,8 @@ function deviceSummary(devices) {
 var help = `Mindwire \u2014 connect this computer to your phone
 
   npm install -g mindwire
-  mindwire connect                       Resume a saved connection, or pair your first phone
-  mindwire connect resume                Resume without creating another pairing
-  mindwire reconnect                     Refresh a saved phone's address with a QR code
+  mindwire connect                       Connect your phone; saved keys reconnect automatically
+  mindwire reconnect                     Show a connection QR again (also repairs a missing pairing)
   mindwire connect pair                  Pair another phone with this computer
   mindwire connect --relay none --host laptop.tailnet  Use your existing VPN
   mindwire connect --relay none           Direct SSH only (reachable network required)
@@ -502,6 +498,7 @@ Options:
   --no-qr                                Print only the pairing link
   --startup                              Enable automatic startup without a prompt
   --no-startup                            Skip automatic startup setup
+  --replace-device DEVICE_ID              With approve: replace a lost phone key (repeatable)
 
 The default works across Wi-Fi and mobile networks. Mindwire privately downloads
 a verified Cloudflare helper when needed. Relays carry encrypted SSH.
@@ -531,7 +528,8 @@ async function main(args = process.argv.slice(2)) {
     version: { type: "string" },
     force: { type: "boolean" },
     startup: { type: "boolean" },
-    "no-startup": { type: "boolean" }
+    "no-startup": { type: "boolean" },
+    "replace-device": { type: "string", multiple: true }
   } });
   const command = positionals[0] ?? "help";
   if (values.help || command === "help") {
@@ -600,7 +598,7 @@ async function main(args = process.argv.slice(2)) {
     const devices = await client2.computer.devices();
     const saved = devices.filter((device) => !device.revoked);
     if (saved.length) emit("saved_devices", { devices: saved }, `
-Saved phones
+Saved approvals on this computer
 ${deviceSummary(saved)}`);
     const question = !values.json && process.stdin.isTTY ? async (prompt) => {
       const input = createInterface({ input: process.stdin, output: process.stderr });
@@ -610,13 +608,13 @@ ${deviceSummary(saved)}`);
         input.close();
       }
     } : void 0;
-    const action = await chooseConnectionAction({ requested: requestedAction, devices, question });
+    const action = await chooseConnectionAction({ requested: requestedAction, devices });
     const startupPreference = await startupStatus(directory);
     const startupAction = await chooseStartupAction({
       state: startupPreference,
       startup: values.startup,
       noStartup: values["no-startup"],
-      question
+      question: action === "pair" && saved.length === 0 ? question : void 0
     });
     if (startupAction !== void 0) {
       try {
@@ -629,29 +627,12 @@ ${deviceSummary(saved)}`);
       emit("startup", startupPreference, startupPreference.enabled ? "Automatic startup is on. Change it with mindwire startup disable." : "Automatic startup is off. Enable it with mindwire startup enable.");
     }
     if (action === "resume") {
-      emit("resumed", { computerId: info.computerId, devices: saved }, "\nReady for your saved phone. Open this computer in Mindwire.");
-      if (info.routes.some((route) => route.kind === "websocket" && new URL(route.url).hostname.endsWith(".trycloudflare.com"))) {
-        emit("reconnect_hint", {}, "If its temporary tunnel address changed, run mindwire reconnect to refresh your phone.");
-      }
-      return;
-    }
-    if (action === "reconnect") {
-      const code = reconnectCode(await client2.computer.info(), hostname());
-      emit("reconnect_code", { code, uri: computerPairingURI(code) });
-      if (values.json) return;
-      const display2 = await showPairingInvitation(code, {
-        mode: values["no-qr"] ? "none" : values.qr ?? "auto"
-      });
-      try {
-        if (question) await question("\nScan with your saved phone, then press Enter to close this code. ");
-        else if (values.qr === "browser") {
-          emit("waiting", {}, "This code stays open until it expires. Press Ctrl+C to close it; Mindwire keeps running.");
-          await setTimeout$1(Math.max(0, Date.parse(code.expiresAt) - Date.now()));
-        }
-      } finally {
-        display2.close();
-      }
-      emit("resumed", { computerId: info.computerId }, "Saved pairing kept. Mindwire continues running in the background.");
+      const connected = saved.filter((device) => device.connected);
+      emit("connected", { computerId: info.computerId, devices: connected }, `
+Connected:
+${deviceSummary(connected)}
+Mindwire continues running in the background.`);
+      emit("connect_hint", {}, "To scan again or add a phone, run mindwire reconnect.");
       return;
     }
     const invitation = await client2.computer.invite((await client2.computer.info()).routes);
@@ -662,12 +643,31 @@ ${deviceSummary(saved)}`);
     });
     try {
       let shownRequest;
+      let authorized = false;
       while (Date.now() < Date.parse(invitation.expiresAt)) {
         const pairing = await client2.computer.pairing(invitation.pairingId);
+        if (pairing.status === "waiting" && requestedAction !== "pair" && requestedAction !== "reconnect") {
+          const connected = (await client2.computer.devices()).filter((device) => !device.revoked && device.connected);
+          if (connected.length && ((info.pairingVersion ?? 0) < 2 || (await client2.computer.closeUnusedPairing(invitation.pairingId)).cancelled)) {
+            display?.close();
+            emit("connected", { computerId: info.computerId, devices: connected }, `Connected:
+${deviceSummary(connected)}
+Mindwire continues running in the background.`);
+            return;
+          }
+        }
         if (pairing.status === "approved") {
           display?.close();
-          emit("paired", {}, "Phone connected. You can close this terminal; Mindwire keeps running.");
-          return;
+          if (pairing.completed) {
+            emit("paired", { computerId: info.computerId, completed: true }, "Phone connected and saved. You can close this terminal; Mindwire keeps running.");
+            return;
+          }
+          if (!authorized) {
+            authorized = true;
+            emit("authorized", {}, "Phone authorized. Waiting for it to save the connection\u2026");
+          }
+          await setTimeout$1(750);
+          continue;
         }
         if (pairing.status === "rejected") {
           display?.close();
@@ -679,14 +679,16 @@ ${deviceSummary(saved)}`);
           shownRequest = pairing.request.id;
           const key = Buffer.from(pairing.request.publicKey.split(" ")[1] ?? "", "base64");
           const fingerprint = "SHA256:" + createHash("sha256").update(key).digest("base64").replace(/=+$/, "");
+          const deviceId = createHash("sha256").update(key).digest("base64url");
+          const replacements = (info.pairingVersion ?? 0) >= 2 ? (await client2.computer.devices()).filter((device) => !device.revoked && device.id !== deviceId && device.name === pairing.request.name) : [];
           emit(
             "approval_required",
-            { pairingId: invitation.pairingId, request: pairing.request, fingerprint },
+            { pairingId: invitation.pairingId, request: pairing.request, fingerprint, replacements },
             `
 ${safeName(pairing.request.name)} wants to connect.
 Device key: ${fingerprint}`
           );
-          if (!process.stdin.isTTY) {
+          if (!question) {
             emit(
               "approval_command",
               { command: `mindwire approve ${invitation.pairingId} ${pairing.request.id}` },
@@ -694,18 +696,18 @@ Device key: ${fingerprint}`
 mindwire approve ${invitation.pairingId} ${pairing.request.id}`
             );
           } else {
-            const input = createInterface({ input: process.stdin, output: process.stderr });
-            try {
-              const answer = await input.question("Allow this phone to access this workspace? [y/N] ");
-              await client2.computer.decide(invitation.pairingId, pairing.request.id, /^y(es)?$/i.test(answer.trim()));
-            } finally {
-              input.close();
-            }
+            const decision = await choosePairingDecision({ replacements, question });
+            await client2.computer.decide(
+              invitation.pairingId,
+              pairing.request.id,
+              decision.approve,
+              decision.replaceDeviceIds ? { replaceDeviceIds: decision.replaceDeviceIds } : {}
+            );
           }
         }
         await setTimeout$1(750);
       }
-      throw new Error("Pairing expired. Run mindwire connect to show a new QR code.");
+      throw new Error(authorized ? "The phone was approved but did not finish saving. Run mindwire connect and scan again; its saved key will be reused." : "Connection code expired. Run mindwire connect to show a new QR code.");
     } finally {
       display?.close();
     }
@@ -749,8 +751,13 @@ ${controller.error}` : ""}`
     case "approve":
     case "reject": {
       if (!positionals[1] || !positionals[2]) throw new Error(`Use mindwire ${command} PAIRING_ID REQUEST_ID.`);
-      await client.computer.decide(positionals[1], positionals[2], command === "approve");
-      emit(command, {}, command === "approve" ? "Phone approved." : "Phone declined.");
+      await client.computer.decide(
+        positionals[1],
+        positionals[2],
+        command === "approve",
+        values["replace-device"] ? { replaceDeviceIds: values["replace-device"] } : {}
+      );
+      emit(command, {}, command === "approve" ? "Phone approved. Waiting for it to save the connection." : "Phone declined.");
       break;
     }
     case "update": {