fix: improve pairing and server auto-connect

Author: DjDeveloperr

ios/SimDeckStudio/App/AppModel.swift

@@ -152,7 +152,11 @@ final class AppModel {
                     presentPairingOnAuth: false
                 )
                 isAutoConnecting = false
-                hasAutoConnected = connected
+                if connected {
+                    hasAutoConnected = true
+                } else {
+                    await autoConnectToAvailableEndpointIfNeeded()
+                }
             }
         }
         discovery.start()
@@ -762,24 +766,45 @@ final class AppModel {
     }
 
     private func autoConnectIfNeeded(_ endpoint: SimDeckEndpoint) async {
-        let connectionEndpoint = endpointWithReusableToken(endpoint)
-        guard !connectionEndpoint.requiresPairing || connectionEndpoint.token?.nilIfBlank != nil else {
-            return
-        }
         guard !hasAutoConnected, !isAutoConnecting, self.endpoint == nil, authEndpoint == nil else { return }
+        await autoConnectToAvailableEndpointIfNeeded(preferredEndpoint: endpoint)
+    }
+
+    private func autoConnectToAvailableEndpointIfNeeded(preferredEndpoint: SimDeckEndpoint? = nil) async {
+        guard !hasAutoConnected, !isAutoConnecting, self.endpoint == nil, authEndpoint == nil else { return }
+        let candidates = autoConnectCandidates(preferredEndpoint: preferredEndpoint)
+        guard !candidates.isEmpty else { return }
+
         isAutoConnecting = true
-        let connected = await connect(
-            connectionEndpoint,
-            autoStart: false,
-            saveEndpoint: false,
-            presentPairingOnAuth: false
-        )
+        var connected = false
+        for candidate in candidates {
+            connected = await connect(
+                candidate,
+                autoStart: false,
+                saveEndpoint: false,
+                presentPairingOnAuth: false
+            )
+            if connected {
+                break
+            }
+        }
         isAutoConnecting = false
         if connected {
             hasAutoConnected = true
         }
     }
 
+    private func autoConnectCandidates(preferredEndpoint: SimDeckEndpoint?) -> [SimDeckEndpoint] {
+        let orderedEndpoints = [preferredEndpoint].compactMap(\.self)
+            + discovery.endpoints
+            + savedEndpoints
+        return uniqued(orderedEndpoints)
+            .map(endpointWithReusableToken)
+            .filter { endpoint in
+                !endpoint.requiresPairing || endpoint.token?.nilIfBlank != nil
+            }
+    }
+
     private func isCurrentStreamRequest(_ generation: Int, simulatorID: String) -> Bool {
         streamRequestGeneration == generation && selectedSimulatorID == simulatorID
     }

server/src/main.rs

@@ -1490,6 +1490,10 @@ fn render_qr_code(value: &str) -> anyhow::Result<String> {
         .build())
 }
 
+fn print_pair_progress(message: impl AsRef<str>) {
+    eprintln!("simdeck pair: {}", message.as_ref());
+}
+
 fn wait_for_daemon(metadata: &DaemonMetadata, timeout: Duration) -> anyhow::Result<()> {
     let deadline = Instant::now() + timeout;
     while Instant::now() < deadline {
@@ -1749,15 +1753,28 @@ fn pair_global_service(options: PairGlobalServiceOptions) -> anyhow::Result<()>
         json,
     } = options;
 
+    if port.is_none() {
+        print_pair_progress("checking the installed service port");
+    }
     let port = match port {
         Some(port) => port,
         None => service::installed_port()?.unwrap_or(choose_daemon_port_for_bind(4310, bind)?),
     };
+    print_pair_progress(format!("using port {port}"));
+
+    print_pair_progress("detecting LAN and Tailscale addresses");
     let advertise_host = advertise_host.or_else(|| {
         detect_lan_ip()
             .or_else(detect_tailscale_ip)
             .map(|ip| ip.to_string())
     });
+    if let Some(host) = advertise_host.as_deref() {
+        print_pair_progress(format!("advertising {host}:{port}"));
+    } else {
+        print_pair_progress("no LAN or Tailscale address detected; local pairing only");
+    }
+
+    print_pair_progress("starting the global SimDeck service");
     let result = service::pair(ServiceOptions {
         port,
         bind,
@@ -1770,8 +1787,16 @@ fn pair_global_service(options: PairGlobalServiceOptions) -> anyhow::Result<()>
         access_token: None,
         pairing_code: None,
     })?;
+    print_pair_progress(format!(
+        "installed {}; logs: {}, {}",
+        result.service,
+        result.stdout_log.display(),
+        result.stderr_log.display()
+    ));
     let target = PairingTarget::from_service(result)?;
+    print_pair_progress(format!("waiting for service health at {}", target.http_url));
     wait_for_pairing_target(&target, Duration::from_secs(15))?;
+    print_pair_progress("service is ready; rendering pairing QR");
     print_pairing_result(&target, true, json)
 }