@mentra/bluetooth-sdk 0.1.20 → 0.1.21-beta.0

package/ios/Source/Bridge.swift

@@ -400,7 +400,10 @@ class Bridge {
         Bridge.sendTypedMessage("glasses_serial_number", body: body)
     }
 
-    static func sendWifiStatusChange(connected: Bool, ssid: String?, localIp: String?) {
+    /// `error` is the glasses' provisioning failure reason (e.g. "connect_timeout",
+    /// "connected_to_other_network") when this status is the verdict of a failed
+    /// connect attempt; nil for routine link-state updates.
+    static func sendWifiStatusChange(connected: Bool, ssid: String?, localIp: String?, error: String? = nil) {
         guard let status = WifiStatus.fromStoreFields(
             connected: connected,
             ssid: ssid,
@@ -408,27 +411,78 @@ class Bridge {
         ) else {
             return
         }
-        Bridge.sendTypedMessage("wifi_status_change", body: status.values)
+        var body = status.values
+        if let error {
+            body["error"] = error
+        }
+        Bridge.sendTypedMessage("wifi_status_change", body: body)
     }
 
-    static func updateWifiScanResults(_ networks: [[String: Any]], scanComplete: Bool) {
-        Task {
-            await MainActor.run {
-                var storedNetworks: [[String: Any]] =
-                    DeviceStore.shared.get("bluetooth", "wifiScanResults") as? [[String: Any]] ?? []
-                // add the networks to the storedNetworks array, removing duplicates by ssid
-                for network in networks {
-                    if !storedNetworks.contains(where: {
-                        $0["ssid"] as? String == network["ssid"] as? String
-                    }) {
-                        storedNetworks.append(network)
+    /// Claim the WiFi scan-results store for a newly requested scan. Called by the
+    /// SDK when it generates the scanId, BEFORE the scan command goes out: store
+    /// ownership is decided at request time, not by whichever chunk arrives first,
+    /// so a delayed chunk from an older, abandoned scan can never reset or clobber
+    /// the current scan's accumulator.
+    @MainActor
+    static func claimWifiScanResults(scanId: String) {
+        DeviceStore.shared.apply("bluetooth", "wifiScanActiveScanId", scanId)
+    }
+
+    static func updateWifiScanResults(
+        _ networks: [[String: Any]],
+        scanComplete: Bool,
+        scanId: String? = nil
+    ) {
+        // Correlated scans accumulate chunks until the terminal scan_complete, so
+        // chunks must reach the SDK in receive order. A Task per message can reach
+        // the MainActor out of creation order; DispatchQueue.main keeps the FIFO
+        // order of the serial bluetooth queue that delivers these.
+        DispatchQueue.main.async {
+            MainActor.assumeIsolated {
+                // Only chunks echoing the active scanId claimed at request time may
+                // mutate the store; foreign chunks are still forwarded to the SDK
+                // sink, which drops stale ids itself. Scan-id-less chunks (old
+                // firmware) keep the legacy accumulate-forever store behavior.
+                let ownsStore: Bool
+                if let scanId {
+                    ownsStore =
+                        scanId == DeviceStore.shared.get("bluetooth", "wifiScanActiveScanId") as? String
+                } else {
+                    ownsStore = true
+                }
+                var updatedNetworks: [[String: Any]] = networks
+                if ownsStore {
+                    var storedNetworks: [[String: Any]] =
+                        DeviceStore.shared.get("bluetooth", "wifiScanResults") as? [[String: Any]] ?? []
+                    if let scanId,
+                       scanId != DeviceStore.shared.get("bluetooth", "wifiScanResultsScanId") as? String
+                    {
+                        // First chunk of a new scan: drop networks accumulated for a previous scan
+                        // so stale entries never carry over into this scan's store.
+                        storedNetworks = []
+                        DeviceStore.shared.apply("bluetooth", "wifiScanResultsScanId", scanId)
+                    }
+                    // add the networks to the storedNetworks array, removing duplicates by ssid
+                    for network in networks {
+                        if !storedNetworks.contains(where: {
+                            $0["ssid"] as? String == network["ssid"] as? String
+                        }) {
+                            storedNetworks.append(network)
+                        }
                     }
+                    DeviceStore.shared.apply("bluetooth", "wifiScanResults", storedNetworks)
+                    updatedNetworks = storedNetworks
                 }
-                DeviceStore.shared.apply("bluetooth", "wifiScanResults", storedNetworks)
-                Bridge.sendTypedMessage(
-                    "wifi_scan_result",
-                    body: ["networks": storedNetworks, "scanComplete": scanComplete]
-                )
+                // Correlated scans: the SDK accumulates and dedupes chunks per scanId itself,
+                // so forward only this chunk; the merged store list is for UI consumers.
+                var body: [String: Any] = [
+                    "networks": scanId != nil ? networks : updatedNetworks,
+                    "scanComplete": scanComplete,
+                ]
+                if let scanId {
+                    body["scanId"] = scanId
+                }
+                Bridge.sendTypedMessage("wifi_scan_result", body: body)
             }
         }
     }

package/ios/Source/DeviceManager.swift

@@ -799,6 +799,11 @@ struct ViewState {
             return
         }
 
+        if sgc?.isMicSuspendedForAudio == true {
+            Bridge.log("MAN: Glasses mic intentionally suspended for phone audio; skipping mic recovery")
+            return
+        }
+
         let timeSinceLastLc3Event = Date().timeIntervalSince(lastLc3Event ?? Date())
         if timeSinceLastLc3Event > 5 {
             Bridge.log("MAN: No audio activity in the last 5 seconds from glasses, reinitializing glasses mic")
@@ -1276,10 +1281,10 @@ struct ViewState {
         sgc?.sendStreamKeepAlive(message)
     }
 
-    func requestWifiScan() {
+    func requestWifiScan(scanId: String? = nil) {
         Bridge.log("MAN: Requesting wifi scan")
         DeviceStore.shared.apply("bluetooth", "wifiScanResults", [])
-        sgc?.requestWifiScan()
+        sgc?.requestWifiScan(scanId: scanId)
     }
 
     func sendIncidentId(_ incidentId: String, apiBaseUrl: String? = nil) {
@@ -1359,6 +1364,42 @@ struct ViewState {
         try liveSgc().sendCameraFovSetting(requestId: requestId, fov: fov, roiPosition: roiPosition)
     }
 
+    func sendLegacyCameraFovSetting(fov: Int, roiPosition: Int) throws {
+        let glassesConnected = DeviceStore.shared.get("glasses", "connected") as? Bool ?? false
+        guard glassesConnected else {
+            throw BluetoothSdkError(code: "not_connected", message: "Mentra Live glasses are not connected.")
+        }
+        try liveSgc().sendCameraFovSetting(requestId: nil, fov: fov, roiPosition: roiPosition)
+    }
+
+    func restoreLegacyCameraFovSetting() throws {
+        let glassesConnected = DeviceStore.shared.get("glasses", "connected") as? Bool ?? false
+        guard glassesConnected else {
+            throw BluetoothSdkError(code: "not_connected", message: "Mentra Live glasses are not connected.")
+        }
+        try liveSgc().sendCameraFovSetting()
+    }
+
+    func sendCameraFovOverride(
+        requestId: String,
+        leaseId: String,
+        fov: Int,
+        roiPosition: Int,
+        ttlMs: Int
+    ) throws {
+        try liveSgc().sendCameraFovOverride(
+            requestId: requestId,
+            leaseId: leaseId,
+            fov: fov,
+            roiPosition: roiPosition,
+            ttlMs: ttlMs
+        )
+    }
+
+    func releaseCameraFovOverride(requestId: String, leaseId: String) throws {
+        try liveSgc().releaseCameraFovOverride(requestId: requestId, leaseId: leaseId)
+    }
+
     func sendCameraTuningConfig(requestId: String, anrOn: Bool, gainOn: Bool) throws {
         try liveSgc().sendCameraTuningConfig(requestId: requestId, anrOn: anrOn, gainOn: gainOn)
     }
@@ -1366,6 +1407,7 @@ struct ViewState {
     func warmUpCamera(
         requestId: String,
         size: PhotoSize,
+        mode: PhotoMode = .photo,
         exposureTimeNs: Double?,
         durationMs: Int
     ) throws {
@@ -1378,11 +1420,16 @@ struct ViewState {
         live.warmUpCamera(
             requestId: requestId,
             size: size,
+            mode: mode,
             exposureTimeNs: exposureTimeNs,
             durationMs: durationMs
         )
     }
 
+    func stopCameraWarmUp(requestId: String) throws {
+        try liveSgc().stopCameraWarmUp(requestId: requestId)
+    }
+
     /// Request version info from glasses.
     /// Glasses will respond with version_info message containing build number, firmware version, etc.
     func requestVersionInfo() {
@@ -1506,7 +1553,8 @@ struct ViewState {
             zsl: request.zsl,
             ispDigitalGain: request.ispDigitalGain,
             ispAnalogGain: request.ispAnalogGain,
-            mode: request.mode
+            mode: request.mode,
+            transferMethod: request.transferMethod
         )
         Bridge.log(
             "MAN: PHOTO PIPELINE [4/6] DeviceManager.requestPhoto requestId=\(routed.requestId) webhookUrl=\(routed.webhookUrl ?? "nil") size=\(routed.size.rawValue) compress=\(routed.compress?.rawValue ?? "none") save=\(routed.save) sound=\(routed.sound) exposureTimeNs=\(manualExposureNs.map { String($0) } ?? "nil") iso=\(manualIso.map { String($0) } ?? "auto") aeDivisor=\(routed.aeExposureDivisor.map { String($0) } ?? "nil") isoCap=\(routed.isoCap.map { String($0) } ?? "nil") sgc=\(sgc != nil ? String(describing: type(of: sgc!)) : "null")"

package/ios/Source/DeviceStore.swift

@@ -93,7 +93,7 @@ class DeviceStore {
         store.set("bluetooth", "screen_disabled", false)
         store.set("bluetooth", "button_photo_size", "max")
         store.set("bluetooth", "button_max_recording_time", 10)
-        store.set("bluetooth", "camera_fov", ["fov": 118, "roi_position": 0])
+        store.set("bluetooth", "camera_fov", ["fov": 102, "roi_position": 0])
         store.set("bluetooth", "button_video_width", 1280)
         store.set("bluetooth", "button_video_height", 720)
         store.set("bluetooth", "button_video_fps", 30)