@mentra/bluetooth-sdk 0.1.21-beta.3 → 3.1.0-dev.10

package/ios/MentraOtaServerModule.swift

@@ -0,0 +1,147 @@
+import ExpoModulesCore
+import Foundation
+
+/// Expo surface for the hotspot-served OTA file server (OS-1676).
+///
+/// JS hands over the rewritten manifest body and a map of sha256 -> local file path, and gets
+/// back the base URL the glasses should be pointed at via ota_start. The optional host
+/// argument lets the caller pass an authoritative address; otherwise interface scanning is
+/// used (under a glasses-hotspot session en0 holds the hotspot client address).
+public class MentraOtaServerModule: Module {
+    private let serverLock = NSLock()
+    private var otaServer: LocalOtaServer?
+    private lazy var artifactDownloader = BackgroundOtaArtifactDownloader { [weak self] destination, written, total in
+        self?.sendEvent("artifactDownloadProgress", [
+            "destination": destination,
+            "bytesWritten": written,
+            "contentLength": total,
+        ])
+    }
+
+    public func definition() -> ModuleDefinition {
+        Name("MentraOtaServer")
+
+        Events("artifactDownloadProgress")
+
+        AsyncFunction("startOtaServer") { (manifestJson: String, artifactPaths: [String: String], host: String?) -> [String: Any] in
+            try self.startOtaServer(manifestJson: manifestJson, artifactPaths: artifactPaths, hostOverride: host)
+        }
+
+        AsyncFunction("stopOtaServer") {
+            self.stopOtaServerInternal()
+        }
+
+        AsyncFunction("waitForWifiAddress") { (gateway: String, timeoutMs: Int) -> String in
+            try await self.waitForWifiAddress(gateway: gateway, timeoutMs: timeoutMs)
+        }
+
+        AsyncFunction("downloadArtifact") { (source: String, destination: String) in
+            try await self.artifactDownloader.download(from: source, to: destination)
+        }
+
+        OnDestroy {
+            self.stopOtaServerInternal()
+        }
+    }
+
+    private func startOtaServer(
+        manifestJson: String,
+        artifactPaths: [String: String],
+        hostOverride: String?
+    ) throws -> [String: Any] {
+        serverLock.lock()
+        defer { serverLock.unlock() }
+
+        var artifacts: [String: URL] = [:]
+        for (key, path) in artifactPaths {
+            let url = path.hasPrefix("file://")
+                ? (URL(string: path) ?? URL(fileURLWithPath: String(path.dropFirst("file://".count))))
+                : URL(fileURLWithPath: path)
+            guard FileManager.default.fileExists(atPath: url.path) else {
+                throw OtaServerModuleError("Artifact \(key) not found at \(url.path)")
+            }
+            artifacts[key] = url
+        }
+
+        guard let host = hostOverride?.isEmpty == false ? hostOverride : LocalIPv4.bestLocalIPv4Address() else {
+            throw OtaServerModuleError("No Wi-Fi/LAN IPv4 address found for this phone.")
+        }
+
+        let server = otaServer ?? LocalOtaServer(
+            onLog: { [weak self] message in
+                self?.emitStatus(message: message)
+            }
+        )
+        otaServer = server
+        server.configure(manifestJson: manifestJson, artifacts: artifacts)
+
+        if let activePort = server.activePort {
+            emitStatus(message: "OTA server ready at http://\(host):\(activePort)/version.json")
+            return serverResult(host: host, port: activePort)
+        }
+
+        var lastError: Error?
+        for port in otaPorts {
+            do {
+                let actualPort = try server.start(host: host, port: UInt16(port))
+                emitStatus(message: "OTA server ready at http://\(host):\(actualPort)/version.json")
+                return serverResult(host: host, port: actualPort)
+            } catch {
+                lastError = error
+                emitStatus(message: "Port \(port) unavailable: \(error.localizedDescription)")
+            }
+        }
+
+        throw OtaServerModuleError(
+            "Could not start OTA server: \(lastError?.localizedDescription ?? "all ports unavailable")"
+        )
+    }
+
+    private func waitForWifiAddress(gateway: String, timeoutMs: Int) async throws -> String {
+        let deadline = Date().addingTimeInterval(Double(max(timeoutMs, 0)) / 1000.0)
+        repeat {
+            if let address = LocalIPv4.wifiIPv4Address(matchingGateway: gateway) {
+                return address
+            }
+            try await Task.sleep(nanoseconds: 250_000_000)
+        } while Date() < deadline
+
+        throw OtaServerModuleError("The iPhone did not join the glasses hotspot subnet.")
+    }
+
+    private func stopOtaServerInternal() {
+        serverLock.lock()
+        defer { serverLock.unlock() }
+
+        otaServer?.stop()
+        emitStatus(message: "OTA server stopped")
+    }
+
+    private func emitStatus(message: String) {
+        NSLog("[MentraOtaServer] %@", message)
+    }
+
+    private func serverResult(host: String, port: UInt16) -> [String: Any] {
+        [
+            "baseUrl": "http://\(host):\(port)",
+            "manifestUrl": "http://\(host):\(port)/version.json",
+            "host": host,
+            "port": port,
+        ]
+    }
+
+    private let otaPorts = [8791, 8792, 8793, 8794]
+}
+
+final class OtaServerModuleError: Exception, @unchecked Sendable {
+    private let message: String
+
+    init(_ message: String) {
+        self.message = message
+        super.init()
+    }
+
+    override var reason: String {
+        message
+    }
+}

package/ios/MentraPhotoReceiverModule.swift

@@ -32,7 +32,7 @@ public class MentraPhotoReceiverModule: Module {
     receiverLock.lock()
     defer { receiverLock.unlock() }
 
-    guard let host = bestLocalIPv4Address() else {
+    guard let host = LocalIPv4.bestLocalIPv4Address() else {
       throw PhotoReceiverError("No Wi-Fi/LAN IPv4 address found for this phone.")
     }
 
@@ -104,66 +104,6 @@ public class MentraPhotoReceiverModule: Module {
     ])
   }
 
-  private func bestLocalIPv4Address() -> String? {
-    var interfaces: UnsafeMutablePointer<ifaddrs>?
-    guard getifaddrs(&interfaces) == 0, let first = interfaces else {
-      return nil
-    }
-    defer { freeifaddrs(interfaces) }
-
-    var preferredPrivate: String?
-    var preferred: String?
-    var privateFallback: String?
-    var fallback: String?
-    var cursor: UnsafeMutablePointer<ifaddrs>? = first
-    while let current = cursor {
-      defer { cursor = current.pointee.ifa_next }
-      let interface = current.pointee
-      guard let addressPointer = interface.ifa_addr,
-            addressPointer.pointee.sa_family == UInt8(AF_INET) else {
-        continue
-      }
-
-      let name = String(cString: interface.ifa_name)
-      let flags = interface.ifa_flags
-      guard (flags & UInt32(IFF_UP)) != 0,
-            (flags & UInt32(IFF_LOOPBACK)) == 0 else {
-        continue
-      }
-
-      var address = addressPointer.pointee
-      var hostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
-      let result = getnameinfo(
-        &address,
-        socklen_t(address.sa_len),
-        &hostname,
-        socklen_t(hostname.count),
-        nil,
-        0,
-        NI_NUMERICHOST
-      )
-      guard result == 0 else {
-        continue
-      }
-
-      let ip = String(cString: hostname)
-      guard ip != "127.0.0.1", !isLinkLocalIPv4(ip) else {
-        continue
-      }
-      if isPreferredLocalInterface(name), isPrivateIPv4(ip) {
-        preferredPrivate = preferredPrivate ?? ip
-      } else if isPreferredLocalInterface(name) {
-        preferred = preferred ?? ip
-      } else if isPrivateIPv4(ip) {
-        privateFallback = privateFallback ?? ip
-      } else {
-        fallback = fallback ?? ip
-      }
-    }
-
-    return preferredPrivate ?? preferred ?? privateFallback ?? fallback
-  }
-
   private func receiverResult(uploadUrl: String, host: String, port: UInt16) -> [String: Any] {
     [
       "uploadUrl": uploadUrl,
@@ -172,26 +112,6 @@ public class MentraPhotoReceiverModule: Module {
     ]
   }
 
-  private func isPreferredLocalInterface(_ name: String) -> Bool {
-    name == "en0" ||
-      name.hasPrefix("bridge") ||
-      name.hasPrefix("ap") ||
-      name.hasPrefix("awdl") ||
-      name.hasPrefix("llw")
-  }
-
-  private func isPrivateIPv4(_ ip: String) -> Bool {
-    if ip.hasPrefix("192.168.") || ip.hasPrefix("10.") {
-      return true
-    }
-    let parts = ip.split(separator: ".").compactMap { Int($0) }
-    return parts.count == 4 && parts[0] == 172 && (16...31).contains(parts[1])
-  }
-
-  private func isLinkLocalIPv4(_ ip: String) -> Bool {
-    ip.hasPrefix("169.254.")
-  }
-
   private let photoPorts = [8787, 8788, 8789, 8790]
 }
 

package/ios/Source/BluetoothSdkDefaults.swift

@@ -3,12 +3,15 @@ import Foundation
 /// Defaults for the public Bluetooth SDK surface.
 enum BluetoothSdkDefaults {
     static var sdkVersion: String? {
+        // Release exports replace the source placeholder; Expo builds stamp the host Info.plist.
         normalizedSdkVersion(swiftPackageSdkVersion)
+            ?? normalizedSdkVersion(Bundle.main.object(forInfoDictionaryKey: infoSdkVersionKey) as? String)
     }
 
     static let voiceActivityDetectionEnabled = false
     static let loudnessGateEnabled = true
-    private static let swiftPackageSdkVersion = "0.1.21-beta.3"
+    private static let infoSdkVersionKey = "MentraBluetoothSdkVersion"
+    private static let swiftPackageSdkVersion = "3.1.0-dev.10"
     private static let swiftPackageSdkVersionPlaceholder = "__MENTRA" + "_BLUETOOTH_SDK_VERSION__"
 
     private static func normalizedSdkVersion(_ value: String?) -> String? {

package/ios/Source/Bridge.swift

@@ -98,6 +98,23 @@ class Bridge {
         Bridge.sendTypedMessage("pair_failure", body: data)
     }
 
+    static func sendPairingInfo(
+        hadPreviousBond: Bool,
+        pairingCode: String? = nil,
+        classicBondReady: Bool = false,
+        securePairingCapable: Bool = true,
+        protocolVersion: Int = 1
+    ) {
+        var body: [String: Any] = [
+            "had_previous_bond": hadPreviousBond,
+            "classic_bond_ready": classicBondReady,
+            "secure_pairing_capable": securePairingCapable,
+            "protocol_version": protocolVersion,
+        ]
+        if let pairingCode { body["pairing_code"] = pairingCode }
+        Bridge.sendTypedMessage("pairing_info", body: body)
+    }
+
     @MainActor
     static func sendMicPcm(_ data: Data) {
         Bridge.sendTypedMessage("mic_pcm", body: micPcmEventBody(data))
@@ -108,6 +125,14 @@ class Bridge {
         Bridge.sendTypedMessage("mic_lc3", body: micLc3EventBody(data))
     }
 
+    @MainActor
+    static func sendMicHealth(_ health: MicHealth, reason: String) {
+        var body = health.dictionary
+        body["reason"] = reason
+        body["timestamp"] = Int64(Date().timeIntervalSince1970 * 1000)
+        Bridge.sendTypedMessage("mic_health", body: body)
+    }
+
     @MainActor
     private static func micPcmEventBody(_ data: Data) -> [String: Any] {
         let voiceActivityDetectionEnabled =
@@ -178,7 +203,10 @@ class Bridge {
         _ deviceName: String,
         deviceAddress: String = "",
         rssi: Int? = nil,
-        projectName: String? = nil
+        projectName: String? = nil,
+        pairingMode: Bool? = nil,
+        pairingCode: String? = nil,
+        securePairingCapable: Bool? = nil
     ) {
         Task {
             await MainActor.run {
@@ -200,6 +228,15 @@ class Bridge {
                 if let rssi {
                     newResult["rssi"] = rssi
                 }
+                if let pairingMode {
+                    newResult["pairingMode"] = pairingMode
+                }
+                if let pairingCode, !pairingCode.isEmpty {
+                    newResult["pairingCode"] = pairingCode
+                }
+                if let securePairingCapable {
+                    newResult["securePairingCapable"] = securePairingCapable
+                }
                 // Keep the public searchResults array stable as glasses are added or removed.
                 // Duplicate discoveries refresh their existing row; only new glasses append.
                 let uniqueResults = mergeStableSearchResults(
@@ -340,6 +377,11 @@ class Bridge {
         if let systemTimeMs = intValue(values["systemTimeMs"]) ?? intValue(values["system_time_ms"]) {
             body["systemTimeMs"] = systemTimeMs
         }
+        if let hotspotOtaVersion = intValue(values["hotspotOtaVersion"])
+            ?? intValue(values["hotspot_ota_version"])
+        {
+            body["hotspotOtaVersion"] = hotspotOtaVersion
+        }
         Bridge.sendTypedMessage("version_info", body: body)
     }
 
@@ -616,6 +658,3 @@ class Bridge {
 
 
 
-
-
-

package/ios/Source/DeviceManager.swift

@@ -123,6 +123,16 @@ struct ViewState {
         set { DeviceStore.shared.apply("bluetooth", "pending_wearable", newValue) }
     }
 
+    private var pendingDeviceName: String {
+        get { DeviceStore.shared.get("bluetooth", "pending_device_name") as? String ?? "" }
+        set { DeviceStore.shared.apply("bluetooth", "pending_device_name", newValue) }
+    }
+
+    private var pendingDeviceAddress: String {
+        get { DeviceStore.shared.get("bluetooth", "pending_device_address") as? String ?? "" }
+        set { DeviceStore.shared.apply("bluetooth", "pending_device_address", newValue) }
+    }
+
     private var deviceName: String {
         get { DeviceStore.shared.get("bluetooth", "device_name") as? String ?? "" }
         set { DeviceStore.shared.apply("bluetooth", "device_name", newValue) }
@@ -241,6 +251,8 @@ struct ViewState {
     }
 
     private var lastSystemTimeSyncConnectionKey = ""
+    private var pendingSystemTimeSync: DispatchWorkItem?
+    private var systemTimeSyncGeneration = 0
 
     private var systemMicUnavailable: Bool {
         get { DeviceStore.shared.get("bluetooth", "systemMicUnavailable") as? Bool ?? false }
@@ -294,6 +306,11 @@ struct ViewState {
     /// Last time we received an LC3 frame from the glasses (used by the mic
     /// inactivity watchdog).
     private var lastLc3Event: Date?
+    private var sequenceGapEvents: Int64 = 0
+    private var decodeFailures: Int64 = 0
+    private var lastLc3ReceivedAt: Int64?
+    private var lastPcmProducedAt: Int64?
+    private var lastLc3Sequence: Int?
     private var micReinitTimer: Timer?
 
     /// STT:
@@ -396,29 +413,87 @@ struct ViewState {
      * Decodes the glasses LC3 to PCM, then forwards to handlePcm for processing.
      * This matches Android behavior - glasses forward raw LC3, DeviceManager handles encoding.
      */
-    func handleGlassesMicData(_ lc3Data: Data, _ frameSize: Int = 20) {
-        lastLc3Event = Date()
+    func handleGlassesMicData(_ lc3Data: Data, _ frameSize: Int = 20, sequenceNumber: Int? = nil) {
+        recordLc3Packet(sequenceNumber: sequenceNumber)
         guard let lc3Converter = lc3Converter else {
             Bridge.log("MAN: LC3 converter not initialized")
+            recordMicDecodeFailure()
             return
         }
 
         guard lc3Data.count > 2 else {
             Bridge.log("MAN: Received invalid LC3 data size: \(lc3Data.count)")
+            recordMicDecodeFailure()
             return
         }
 
         let pcmData = lc3Converter.decode(lc3Data, frameSize: frameSize) as Data
         guard pcmData.count > 0 else {
             Bridge.log("MAN: Failed to decode glasses LC3 audio")
+            recordMicDecodeFailure()
             return
         }
         // Forward to handlePcm which handles SDK audio events and encoding.
+        lastPcmProducedAt = nowMs()
         handlePcm(pcmData)
     }
 
     func reportGlassesAudioActivity() {
         lastLc3Event = Date()
+        lastPcmProducedAt = nowMs()
+    }
+
+    private func micHealth() -> MicHealth {
+        MicHealth(
+            sequenceGapEvents: sequenceGapEvents,
+            decodeFailures: decodeFailures,
+            lastLc3ReceivedAt: lastLc3ReceivedAt,
+            lastPcmProducedAt: lastPcmProducedAt
+        )
+    }
+
+    func resetMicSequenceBaseline() {
+        lastLc3Sequence = nil
+    }
+
+    private func nowMs() -> Int64 {
+        Int64(Date().timeIntervalSince1970 * 1000)
+    }
+
+    private func resetMicHealth() {
+        sequenceGapEvents = 0
+        decodeFailures = 0
+        lastLc3ReceivedAt = nil
+        lastPcmProducedAt = nil
+        lastLc3Sequence = nil
+        lastLc3Event = nil
+    }
+
+    private func recordLc3Packet(sequenceNumber: Int?) {
+        let receivedAt = nowMs()
+        lastLc3ReceivedAt = receivedAt
+        lastLc3Event = Date()
+        var hasGap = false
+        if let sequenceNumber {
+            let normalized = sequenceNumber & 0xFF
+            if let previous = lastLc3Sequence {
+                let expected = (previous + 1) & 0xFF
+                if normalized != expected {
+                    hasGap = true
+                    sequenceGapEvents += 1
+                    Bridge.log("MAN: LC3 packet sequence mismatch. Expected: \(expected), Got: \(normalized)")
+                }
+            }
+            lastLc3Sequence = normalized
+        }
+        if hasGap {
+            Bridge.sendMicHealth(micHealth(), reason: "sequence_gap")
+        }
+    }
+
+    private func recordMicDecodeFailure() {
+        decodeFailures += 1
+        Bridge.sendMicHealth(micHealth(), reason: "decode_failure")
     }
 
     func handlePcm(_ pcmData: Data) {
@@ -613,7 +688,7 @@ struct ViewState {
             Bridge.log("MAN: Manager already initialized, cleaning up previous sgc")
             sgc?.cleanup()
             sgc = nil
-            lastSystemTimeSyncConnectionKey = ""
+            resetSystemTimeSync()
         }
 
         if sgc != nil {
@@ -704,14 +779,16 @@ struct ViewState {
             let layoutType = currentViewState.layoutType
             switch layoutType {
             case "text_wall":
-                let text = currentViewState.text
+                let text = parsePlaceholders(currentViewState.text)
                 await sgc?.sendTextWall(text)
             case "double_text_wall":
-                let topText = currentViewState.topText
-                let bottomText = currentViewState.bottomText
+                let topText = parsePlaceholders(currentViewState.topText)
+                let bottomText = parsePlaceholders(currentViewState.bottomText)
                 await sgc?.sendDoubleTextWall(topText, bottomText)
             case "reference_card":
-                await sgc?.sendTextWall(currentViewState.title + "\n\n" + currentViewState.text)
+                let title = parsePlaceholders(currentViewState.title)
+                let text = parsePlaceholders(currentViewState.text)
+                await sgc?.sendTextWall(title + "\n\n" + text)
             case "bitmap_view":
                 // Bridge.log("MAN: Processing bitmap_view layout")
                 guard let data = currentViewState.data else {
@@ -727,11 +804,12 @@ struct ViewState {
                     height: currentViewState.bmpHeight
                 )
             case "positioned_text":
+                let text = parsePlaceholders(currentViewState.text)
                 Bridge.log(
-                    "MAN: positioned_text -> text='\(currentViewState.text)' rect=\(currentViewState.bmpX ?? 0),\(currentViewState.bmpY ?? 0) \(currentViewState.bmpWidth ?? 576)x\(currentViewState.bmpHeight ?? 288)"
+                    "MAN: positioned_text -> text='\(text)' rect=\(currentViewState.bmpX ?? 0),\(currentViewState.bmpY ?? 0) \(currentViewState.bmpWidth ?? 576)x\(currentViewState.bmpHeight ?? 288)"
                 )
                 await sgc?.sendPositionedText(
-                    currentViewState.text,
+                    text,
                     x: currentViewState.bmpX ?? 0,
                     y: currentViewState.bmpY ?? 0,
                     width: currentViewState.bmpWidth ?? 576,
@@ -753,6 +831,8 @@ struct ViewState {
     }
 
     func parsePlaceholders(_ text: String) -> String {
+        guard text.contains("$") else { return text }
+
         let dateFormatter = DateFormatter()
         dateFormatter.dateFormat = "M/dd, h:mm"
         let formattedDate = dateFormatter.string(from: Date())
@@ -924,8 +1004,15 @@ struct ViewState {
             return
         }
         Bridge.log("MAN: handleDeviceReady(): \(sgc.type)")
+        resetMicHealth()
 
-        pendingWearable = ""
+        if !pendingDeviceName.isEmpty {
+            deviceName = pendingDeviceName
+        }
+        if !pendingDeviceAddress.isEmpty {
+            deviceAddress = pendingDeviceAddress
+        }
+        clearPendingConnection()
         defaultWearable = sgc.type
         searching = false
 
@@ -989,9 +1076,30 @@ struct ViewState {
         }
 
         lastSystemTimeSyncConnectionKey = connectionKey
-        let timestampMs = Int64(Date().timeIntervalSince1970 * 1000)
-        Bridge.log("MAN: Syncing glasses system time once for connection: \(timestampMs)")
-        sgc.sendSetSystemTime(timestampMs)
+        pendingSystemTimeSync?.cancel()
+        systemTimeSyncGeneration += 1
+        let generation = systemTimeSyncGeneration
+        let sync = DispatchWorkItem { [weak self] in
+            guard let self,
+                  self.lastSystemTimeSyncConnectionKey == connectionKey,
+                  self.systemTimeSyncGeneration == generation
+            else {
+                return
+            }
+            self.pendingSystemTimeSync = nil
+            let timestampMs = Int64(Date().timeIntervalSince1970 * 1000)
+            Bridge.log("MAN: Syncing glasses system time once for connection: \(timestampMs)")
+            sgc.sendSetSystemTime(timestampMs)
+        }
+        pendingSystemTimeSync = sync
+        DispatchQueue.main.asyncAfter(deadline: .now() + 3, execute: sync)
+    }
+
+    private func resetSystemTimeSync() {
+        pendingSystemTimeSync?.cancel()
+        pendingSystemTimeSync = nil
+        systemTimeSyncGeneration += 1
+        lastSystemTimeSyncConnectionKey = ""
     }
 
     func handleControllerReady() {
@@ -1038,7 +1146,8 @@ struct ViewState {
 
     func handleDeviceDisconnected() {
         Bridge.log("MAN: Device disconnected")
-        lastSystemTimeSyncConnectionKey = ""
+        resetSystemTimeSync()
+        resetMicHealth()
         DeviceStore.shared.apply("glasses", "headUp", false)
         DeviceStore.shared.apply("glasses", "voiceActivityDetectionEnabled", BluetoothSdkDefaults.voiceActivityDetectionEnabled)
         // shouldSendBootingMessage = true  // Reset for next first connect
@@ -1322,6 +1431,11 @@ struct ViewState {
         sgc?.sendHotspotState(enabled)
     }
 
+    func setWifiAdbState(_ enabled: Bool) {
+        Bridge.log("MAN: 🔧 Setting glasses Wi-Fi ADB state: \(enabled)")
+        sgc?.sendWifiAdbState(enabled)
+    }
+
     func setSystemTime(_ timestampMs: Int64) {
         Bridge.log("MAN: Setting glasses system time: \(timestampMs)")
         sgc?.sendSetSystemTime(timestampMs)
@@ -1501,6 +1615,11 @@ struct ViewState {
         )
     }
 
+    func queryVideoRecordingStatus(_ requestId: String) {
+        Bridge.log("MAN: Querying video recording status: requestId=\(requestId)")
+        sgc?.queryVideoRecordingStatus(requestId: requestId)
+    }
+
     func stopVideoRecording(_ requestId: String, _ webhookUrl: String?, _ authToken: String?) {
         Bridge.log(
             "MAN: onStopVideoRecording: requestId=\(requestId), webhook=\((webhookUrl?.isEmpty ?? true) ? "none" : "set")"
@@ -1621,6 +1740,10 @@ struct ViewState {
             return
         }
         initSGC(defaultWearable)
+        if let live = sgc as? MentraLive, live.isPairingYieldActive() {
+            Bridge.log("MAN: connectDefault skipped — Mentra Live pairing yield active")
+            return
+        }
         searching = true
         sgc?.connectById(reconnectTarget)
         connectDefaultController()
@@ -1667,13 +1790,13 @@ struct ViewState {
         }
 
         Task {
-            disconnect()
+            disconnect(clearPendingConnection: false)
             try? await Task.sleep(nanoseconds: 100 * 1_000_000) // 100ms
             self.searching = true
-            self.deviceName = name
+            self.pendingDeviceName = name
 
             initSGC(self.pendingWearable)
-            sgc?.connectById(self.deviceName)
+            sgc?.connectById(name)
         }
     }
 
@@ -1701,11 +1824,12 @@ struct ViewState {
         handleDeviceReady()
     }
 
-    func disconnect() {
+    func disconnect(clearPendingConnection: Bool = true) {
         sgc?.clearDisplay() // clear the screen
         sgc?.disconnect()
         sgc = nil // Clear the SGC reference after disconnect
-        lastSystemTimeSyncConnectionKey = ""
+        resetSystemTimeSync()
+        resetMicHealth()
         searching = false
         micEnabled = false
         updateMicState()
@@ -1716,6 +1840,7 @@ struct ViewState {
         // previously connected pair can never be reported for the next connection.
         DeviceStore.shared.apply("glasses", "serialNumber", "")
         DeviceStore.shared.apply("glasses", "bluetoothMacAddress", "")
+        DeviceStore.shared.apply("glasses", "wifiMacAddress", "")
         DeviceStore.shared.apply("glasses", "leftMacAddress", "")
         DeviceStore.shared.apply("glasses", "rightMacAddress", "")
         DeviceStore.shared.apply("glasses", "macAddress", "")
@@ -1728,6 +1853,15 @@ struct ViewState {
         DeviceStore.shared.apply("glasses", "controllerConnected", false)
         controller?.disconnect()
         controller = nil // Clear the controller reference after disconnect
+        if clearPendingConnection {
+            self.clearPendingConnection()
+        }
+    }
+
+    private func clearPendingConnection() {
+        pendingDeviceName = ""
+        pendingDeviceAddress = ""
+        pendingWearable = ""
     }
 
     func disconnectController() {
@@ -1747,6 +1881,7 @@ struct ViewState {
         defaultWearable = ""
         deviceName = ""
         deviceAddress = ""
+        clearPendingConnection()
         Bridge.saveSetting("default_wearable", "")
         Bridge.saveSetting("device_name", "")
         Bridge.saveSetting("device_address", "")