mindwire 0.1.28 → 0.1.30

package/dist/{chunk-5WYSGXFN.js → chunk-RN7ERVJ2.js}

@@ -34,11 +34,19 @@ var ComputerApi = class {
   pairing(id) {
     return this.client.http.request("GET", `/computer/pairings/${encodeURIComponent(id)}`);
   }
+  /** pairingVersion >= 2. Releases an unused QR when a saved phone reconnects.
+   * Returns false if a phone already submitted a request, which must be handled. */
+  closeUnusedPairing(id) {
+    return this.client.http.request("DELETE", `/computer/pairings/${encodeURIComponent(id)}`);
+  }
   completePairing(id, requestId) {
     return this.client.http.request("POST", `/computer/pairings/${encodeURIComponent(id)}/complete`, { body: { requestId } });
   }
-  decide(id, requestId, approve) {
-    return this.client.http.request("POST", `/computer/pairings/${encodeURIComponent(id)}/decision`, { body: { requestId, approve } });
+  async decide(id, requestId, approve, options = {}) {
+    if (options.replaceDeviceIds?.length && ((await this.info()).pairingVersion ?? 0) < 2) {
+      throw new Error("Update the Mindwire service before replacing saved phone approvals.");
+    }
+    return this.client.http.request("POST", `/computer/pairings/${encodeURIComponent(id)}/decision`, { body: { requestId, approve, ...options } });
   }
   devices() {
     return this.client.http.request("GET", "/computer/devices");
@@ -71,7 +79,16 @@ function computerPairingURI(invitation) {
 }
 
 // src/version.ts
-var SDK_VERSION = "0.1.28" ;
+var SDK_VERSION = "0.1.30" ;
+function versionAtLeast(actual, desired) {
+  if (actual === desired) return true;
+  if (!actual || !/^\d+\.\d+\.\d+$/.test(actual) || !/^\d+\.\d+\.\d+$/.test(desired)) return false;
+  const a = actual.split(".").map(Number), b = desired.split(".").map(Number);
+  for (let i = 0; i < 3; i++) {
+    if (a[i] !== b[i]) return a[i] > b[i];
+  }
+  return true;
+}
 
 // src/daemon-binary.ts
 function supported(platform, arch) {
@@ -1876,6 +1893,7 @@ async function acquireProcessLock(file, options = {}) {
 }
 
 // src/computer/lifecycle.ts
+var CONTROLLER_PROTOCOL = 2;
 var defaultStateDirectory = () => path.join(homedir(), ".mindwire", "computer");
 var defaultComputerConfig = () => ({ directory: homedir(), bind: "0.0.0.0", sshPort: 8791, websocketPort: 8792, relay: { kind: "cloudflare" } });
 async function readJSON(file) {
@@ -1930,6 +1948,9 @@ async function ensureComputer(directory, cliPath, patch = {}, onProgress, option
   const configPath = path.join(directory, "computer-config.json");
   const previous = await readJSON(configPath);
   const config = { ...defaultComputerConfig(), ...previous, ...patch };
+  const requestedAt = resume ? Date.now() : 0;
+  if (resume) await writeJSON(path.join(directory, "computer-check.json"), { requestedAt });
+  const compatible = (controller) => (controller?.protocol ?? 0) >= CONTROLLER_PROTOCOL && versionAtLeast(controller?.cliVersion, SDK_VERSION);
   let launchedPID;
   let launchFailure;
   const waitUntilReady = async () => {
@@ -1943,7 +1964,7 @@ async function ensureComputer(directory, cliPath, patch = {}, onProgress, option
         continue;
       }
       if (controller?.error && !controller.recovering) throw new Error(controller.error);
-      if (controller?.ready && await processStateAlive(controller)) return computerClient(directory);
+      if (controller?.ready && compatible(controller) && (controller.checkedAt ?? 0) >= requestedAt && await processStateAlive(controller)) return computerClient(directory);
       if (controller?.phase && controller.phase !== phase) {
         phase = controller.phase;
         onProgress?.(phase);
@@ -1957,14 +1978,14 @@ async function ensureComputer(directory, cliPath, patch = {}, onProgress, option
       throw new Error("Mindwire is running with different connection settings. Run mindwire stop when idle, then retry with the new settings.");
     }
     const controller = await readJSON(path.join(directory, "computer-controller.json"));
-    if (await processStateAlive(controller)) return waitUntilReady();
+    if (compatible(controller) && await processStateAlive(controller)) return waitUntilReady();
   }
   const lockPath = path.join(directory, "launch.lock");
   const lock = await acquireProcessLock(lockPath, {
     signal: options.signal,
     onWait: async () => {
       const controller = await readJSON(path.join(directory, "computer-controller.json"));
-      if (await processStateAlive(controller)) {
+      if (compatible(controller) && await processStateAlive(controller)) {
         const saved = await readJSON(configPath);
         if (Object.keys(patch).some((key) => JSON.stringify(patch[key]) !== JSON.stringify(saved?.[key]))) {
           throw new Error("Another start used different connection settings. Stop Mindwire when idle before changing them.");
@@ -1988,9 +2009,15 @@ async function ensureComputer(directory, cliPath, patch = {}, onProgress, option
         throw new Error("Another start used different connection settings. Stop Mindwire when idle before changing them.");
       }
       const controller2 = await readJSON(path.join(directory, "computer-controller.json"));
-      if (await processStateAlive(controller2)) return waitUntilReady();
+      if (compatible(controller2) && await processStateAlive(controller2)) return waitUntilReady();
+    }
+    let controller = await readJSON(path.join(directory, "computer-controller.json"));
+    if (existing && controller && !compatible(controller) && await processStateAlive(controller)) {
+      onProgress?.("Refreshing the background connection service\u2026");
+      const { handoffController } = await import('./controller-handoff-4GXF4ATR.js');
+      await handoffController(directory, controller, config, await existing.computer.info());
+      controller = void 0;
     }
-    const controller = await readJSON(path.join(directory, "computer-controller.json"));
     if (await processStateAlive(controller)) {
       if (controller?.error && !controller.recovering) throw new Error(controller.error);
     } else {
@@ -2021,7 +2048,7 @@ async function ensureComputer(directory, cliPath, patch = {}, onProgress, option
   }
 }
 async function superviseComputer(directory) {
-  const controller = await import('./controller-5ZTNIHUV.js');
+  const controller = await import('./controller-DIJKMWWU.js');
   await controller.superviseComputer(directory);
 }
 async function stopComputer(directory, force = false) {
@@ -2045,6 +2072,6 @@ async function stopComputer(directory, force = false) {
   throw new Error("Mindwire is still stopping. Check computer.log.");
 }
 
-export { SDK_VERSION, acquireProcessLock, adoptProcess, computerClient, computerPairingQRData, computerPairingURI, currentProcessIdentity, defaultStateDirectory, directRoutes, ensureComputer, ensureDaemonBinary, ownChild, processIdentity, processStateAlive, readJSON, stopComputer, superviseComputer, writeJSON };
-//# sourceMappingURL=chunk-5WYSGXFN.js.map
-//# sourceMappingURL=chunk-5WYSGXFN.js.map
+export { CONTROLLER_PROTOCOL, SDK_VERSION, acquireProcessLock, adoptProcess, computerClient, computerPairingQRData, computerPairingURI, currentProcessIdentity, defaultStateDirectory, directRoutes, ensureComputer, ensureDaemonBinary, ownChild, processIdentity, processStateAlive, readJSON, stopComputer, superviseComputer, writeJSON };
+//# sourceMappingURL=chunk-RN7ERVJ2.js.map
+//# sourceMappingURL=chunk-RN7ERVJ2.js.map