mindwire 0.1.40 → 0.1.41

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { enableAddressDiscovery, disableAddressDiscovery, discoveryDescription, connectionAddress, saveDiscoveryPreference, discoveryPreference, reconcileAddressDiscovery, connectionInfo, connectionDescription, updateComputer, updateProgress, activeUpdate } from './chunk-ZP7F7LP7.js';
-import { SDK_VERSION, defaultStateDirectory, computerClient, superviseComputer, ensureComputer, readJSON, defaultComputerConfig, computerPairingURI, stopComputer, processStateAlive, providerFailure, acquireProcessLock, writeJSON, currentProcessIdentity, CONTROLLER_PROTOCOL, versionAtLeast, websocketURL, providerNeedsAction, cloudflareCommand, computerPairingQRData, ProviderConnectionError } from './chunk-BJL5K6M7.js';
-import './chunk-PFYKJ6LX.js';
+import { enableAddressDiscovery, disableAddressDiscovery, discoveryDescription, connectionAddress, saveDiscoveryPreference, discoveryPreference, reconcileAddressDiscovery, connectionInfo, connectionDescription, updateComputer, updateProgress, activeUpdate } from './chunk-4XNTGVCI.js';
+import { SDK_VERSION, defaultStateDirectory, computerClient, superviseComputer, ensureComputer, readJSON, defaultComputerConfig, computerPairingURI, stopComputer, processStateAlive, providerFailure, acquireProcessLock, writeJSON, currentProcessIdentity, CONTROLLER_PROTOCOL, versionAtLeast, websocketURL, providerNeedsAction, cloudflareCommand, computerPairingQRData, ProviderConnectionError } from './chunk-T2ZIA4TK.js';
+import { ApiError } from './chunk-PFYKJ6LX.js';
 import { promisify, parseArgs } from 'util';
 import { fileURLToPath, pathToFileURL } from 'url';
 import { realpathSync, mkdtempSync, chmodSync, writeFileSync, rmSync } from 'fs';
@@ -1384,9 +1384,34 @@ Allow only ${terminalText(info.username)}. Leave password-only VNC access off.`)
     }
     info = await client.surfaces.localStatus();
   }
-  const password = await prompt.secret(`Mac password for ${terminalText(info.username)} (hidden): `);
-  if (!password || Buffer.byteLength(password) > 63 || password.includes("\0")) throw new Error("Enter your Mac password (up to 63 UTF-8 bytes). Desktop settings were not changed.");
-  await client.surfaces.configureLocal({ enabled: true, username: info.username, password }, localToken);
+  while (true) {
+    const password = await prompt.secret(`Mac password for ${terminalText(info.username)} (hidden): `);
+    let retryMessage;
+    if (!password || Buffer.byteLength(password) > 63 || password.includes("\0")) {
+      retryMessage = "Enter your Mac login password (up to 63 UTF-8 bytes).";
+    } else {
+      try {
+        await client.surfaces.configureLocal({ enabled: true, username: info.username, password }, localToken);
+        break;
+      } catch (error) {
+        if (!(error instanceof ApiError) || !error.body || typeof error.body !== "object" || !("code" in error.body) || error.body.code !== "desktop_authentication") throw error;
+        retryMessage = `The Mac didn\u2019t accept that login. Check the password for ${terminalText(info.username)} and try again.
+Use your Mac login password, not your Apple Account password. If it\u2019s correct, check that Screen Sharing allows this account.`;
+      }
+    }
+    prompt.print(`${retryMessage}
+Desktop settings were not changed.`);
+    const retry = prompt.select ? await prompt.select("Mac login", [
+      { value: "retry", label: "Try password again" },
+      { value: "settings", label: "Open Screen Sharing settings" },
+      { value: "cancel", label: "Cancel setup" }
+    ]) : (await prompt.question("Try password again? [y/N]: ")).toLowerCase() === "y" ? "retry" : "cancel";
+    if (retry !== "retry" && retry !== "settings") return info;
+    if (retry === "settings") {
+      (options.openSettings ?? openScreenSharingSettings)();
+      await prompt.question("Check that your Mac account is allowed, then press Return to retry: ");
+    }
+  }
   prompt.print("Desktop access is on. Open Desktop in Mindwire on your phone.\nTurn it off anytime with mindwire desktop disable.");
   return client.surfaces.localStatus();
 }