@mentra/bluetooth-sdk 0.1.8 → 0.1.10

package/ios/Source/ObservableStore.swift

@@ -9,7 +9,7 @@ import Foundation
 
 @MainActor
 class ObservableStore {
-    private nonisolated(unsafe) var values: [String: Any] = [:]
+    private var values: [String: Any] = [:]
     private var onEmit: ((String, [String: Any]) -> Void)?
     private var listeners: [String: (String, [String: Any]) -> Void] = [:]
 
@@ -54,10 +54,16 @@ class ObservableStore {
         }
     }
 
-    nonisolated func get(_ category: String, _ key: String) -> Any? {
+    func get(_ category: String, _ key: String) -> Any? {
         values["\(Self.normalizeCategory(category)).\(key)"]
     }
 
+    func wouldSkipSet(_ category: String, _ key: String, _ value: Any) -> Bool {
+        let fullKey = "\(Self.normalizeCategory(category)).\(key)"
+        guard let oldValue = values[fullKey] else { return false }
+        return areEqual(oldValue, value)
+    }
+
     func getCategory(_ category: String) -> [String: Any] {
         var result: [String: Any] = [:]
         let prefix = "\(Self.normalizeCategory(category))."

package/ios/Source/{Audio → audio}/AudioModels.swift

@@ -24,7 +24,7 @@ public struct LocalTranscriptionEvent: CustomStringConvertible {
 }
 
 public struct MicPcmEvent: CustomStringConvertible {
-    public static let sampleRate = 16_000
+    public static let sampleRate = 16000
     public static let bitsPerSample = 16
     public static let channels = 1
     public static let encoding = "pcm_s16le"
@@ -43,7 +43,8 @@ public struct MicPcmEvent: CustomStringConvertible {
         let bitsPerSample = intValue(values["bitsPerSample"]) ?? Self.bitsPerSample
         let channels = intValue(values["channels"]) ?? Self.channels
         let encoding = values["encoding"] as? String ?? Self.encoding
-        let voiceActivityDetectionEnabled = boolValue(values, "voiceActivityDetectionEnabled") ?? true
+        let voiceActivityDetectionEnabled =
+            boolValue(values, "voiceActivityDetectionEnabled") ?? BluetoothSdkDefaults.voiceActivityDetectionEnabled
 
         var normalized = values
         normalized["type"] = "mic_pcm"
@@ -69,7 +70,7 @@ public struct MicPcmEvent: CustomStringConvertible {
 }
 
 public struct MicLc3Event: CustomStringConvertible {
-    public static let sampleRate = 16_000
+    public static let sampleRate = 16000
     public static let channels = 1
     public static let encoding = "lc3"
     public static let frameDurationMs = 10
@@ -95,7 +96,8 @@ public struct MicLc3Event: CustomStringConvertible {
         let frameSizeBytes = intValue(values["frameSizeBytes"]) ?? Self.defaultFrameSizeBytes
         let bitrate = intValue(values["bitrate"]) ?? frameSizeBytes * 8 * (1000 / frameDurationMs)
         let packetizedFromGlasses = boolValue(values, "packetizedFromGlasses") ?? false
-        let voiceActivityDetectionEnabled = boolValue(values, "voiceActivityDetectionEnabled") ?? true
+        let voiceActivityDetectionEnabled =
+            boolValue(values, "voiceActivityDetectionEnabled") ?? BluetoothSdkDefaults.voiceActivityDetectionEnabled
 
         var normalized = values
         normalized["type"] = "mic_lc3"
@@ -132,8 +134,8 @@ public struct GlassesMediaVolumeGetResult: CustomStringConvertible {
     public let values: [String: Any]
 
     public init(values: [String: Any]) {
-        self.level = intValue(values["level"])
-        self.statusCode = intValue(values["statusCode"])
+        level = intValue(values["level"])
+        statusCode = intValue(values["statusCode"])
         self.values = values
     }
 
@@ -149,7 +151,7 @@ public struct GlassesMediaVolumeSetResult: CustomStringConvertible {
     public let values: [String: Any]
 
     public init(values: [String: Any]) {
-        self.statusCode = intValue(values["statusCode"])
+        statusCode = intValue(values["statusCode"])
         self.values = values
     }
 

package/ios/Source/{Camera → camera}/CameraModels.swift

@@ -39,24 +39,101 @@ public struct ButtonVideoRecordingSettings {
     }
 }
 
+public enum CameraRoiPosition: Int {
+    case center = 0
+    case bottom = 1
+    case top = 2
+
+    public var label: String {
+        switch self {
+        case .center:
+            return "center"
+        case .bottom:
+            return "bottom"
+        case .top:
+            return "top"
+        }
+    }
+
+    public static func from(rawValue: Int?) -> CameraRoiPosition {
+        guard let rawValue else {
+            return .center
+        }
+        return CameraRoiPosition(rawValue: rawValue) ?? .center
+    }
+}
+
 public struct CameraFov {
-    public static let minFov = 82
+    public static let minFov = 62
     public static let maxFov = 118
     public static let defaultFov = 102
-    public static let minRoiPosition = 0
-    public static let maxRoiPosition = 2
-    public static let defaultRoiPosition = 0
+    public static let narrowFov = 82
+    public static let defaultRoiPosition = CameraRoiPosition.center
+    public static let narrow = CameraFov(
+        fov: CameraFov.narrowFov,
+        roiPosition: CameraFov.defaultRoiPosition
+    )
+    public static let standard = CameraFov(
+        fov: CameraFov.defaultFov,
+        roiPosition: CameraFov.defaultRoiPosition
+    )
+    public static let wide = CameraFov(
+        fov: CameraFov.maxFov,
+        roiPosition: CameraFov.defaultRoiPosition
+    )
 
     public let fov: Int
-    public let roiPosition: Int
+    public let roiPosition: CameraRoiPosition
 
-    public init(fov: Int = CameraFov.defaultFov, roiPosition: Int = CameraFov.defaultRoiPosition) {
+    public init(fov: Int = CameraFov.defaultFov, roiPosition: CameraRoiPosition = CameraFov.defaultRoiPosition) {
         self.fov = min(max(fov, CameraFov.minFov), CameraFov.maxFov)
-        self.roiPosition = min(max(roiPosition, CameraFov.minRoiPosition), CameraFov.maxRoiPosition)
+        self.roiPosition = roiPosition
     }
 
     var value: [String: Int] {
-        ["fov": fov, "roi_position": roiPosition]
+        ["fov": fov, "roi_position": roiPosition.rawValue]
+    }
+}
+
+public struct CameraFovResult: CustomStringConvertible {
+    public let requestId: String
+    public let fov: Int
+    public let roiPosition: CameraRoiPosition
+    public let timestamp: Int
+
+    public var values: [String: Any] {
+        [
+            "requestId": requestId,
+            "fov": fov,
+            "roiPosition": roiPosition.label,
+            "timestamp": timestamp,
+        ]
+    }
+
+    public var description: String {
+        "CameraFovResult(fov: \(fov), roiPosition: \(roiPosition.label))"
+    }
+
+    static func from(ack: SettingsAckEvent, fallback: CameraFov) throws -> CameraFovResult {
+        if ack.status == "error" {
+            throw BluetoothError(
+                code: ack.errorCode ?? "camera_fov_failed",
+                message: ack.errorMessage ?? "Camera FOV request failed."
+            )
+        }
+        if !ack.hardwareApplied {
+            throw BluetoothError(
+                code: "camera_fov_not_applied",
+                message: "Camera FOV was saved but not applied to hardware."
+            )
+        }
+
+        return CameraFovResult(
+            requestId: ack.requestId,
+            fov: ack.fov ?? fallback.fov,
+            roiPosition: CameraRoiPosition.from(rawValue: ack.roiPosition ?? fallback.roiPosition.rawValue),
+            timestamp: ack.timestamp
+        )
     }
 }
 
@@ -68,6 +145,7 @@ public struct PhotoRequest {
     public let authToken: String?
     public let compress: PhotoCompression?
     public let flash: Bool
+    public let save: Bool
     public let sound: Bool
     /// Sensor exposure time for this capture only (ns), or nil for auto exposure
     public let exposureTimeNs: Double?
@@ -82,6 +160,7 @@ public struct PhotoRequest {
         authToken: String? = nil,
         compress: PhotoCompression? = nil,
         flash: Bool = true,
+        save: Bool = false,
         sound: Bool,
         exposureTimeNs: Double? = nil,
         iso: Int? = nil
@@ -93,6 +172,7 @@ public struct PhotoRequest {
         self.authToken = authToken
         self.compress = compress
         self.flash = flash
+        self.save = save
         self.sound = sound
         self.exposureTimeNs = exposureTimeNs
         self.iso = iso
@@ -144,11 +224,58 @@ public struct VideoRecordingRequest {
     public let requestId: String
     public let save: Bool
     public let sound: Bool
+    // Optional per-recording overrides; 0 means "use the saved button-video default".
+    public let width: Int
+    public let height: Int
+    public let fps: Int
 
-    public init(requestId: String, save: Bool, sound: Bool) {
+    public init(
+        requestId: String, save: Bool, sound: Bool, width: Int = 0, height: Int = 0, fps: Int = 0
+    ) {
         self.requestId = requestId
         self.save = save
         self.sound = sound
+        self.width = width
+        self.height = height
+        self.fps = fps
+    }
+}
+
+public struct VideoRecordingStatusEvent: CustomStringConvertible {
+    public let values: [String: Any]
+
+    public init(values: [String: Any]) {
+        var values = values
+        values["type"] = "video_recording_status"
+        self.values = values
+    }
+
+    public var requestId: String {
+        stringValue(values, "requestId") ?? ""
+    }
+
+    public var success: Bool {
+        boolValue(values, "success") ?? false
+    }
+
+    public var status: String {
+        stringValue(values, "status") ?? ""
+    }
+
+    public var details: String? {
+        stringValue(values, "details")
+    }
+
+    public var timestamp: Int {
+        intValue(values["timestamp"]) ?? Int(Date().timeIntervalSince1970 * 1000)
+    }
+
+    public var data: [String: Any]? {
+        values["data"] as? [String: Any]
+    }
+
+    public var description: String {
+        "VideoRecordingStatusEvent(requestId: \(requestId), status: \(status), success: \(success))"
     }
 }
 
@@ -158,24 +285,39 @@ public enum PhotoResponse: CustomStringConvertible, Equatable {
         case error
     }
 
-    case success(requestId: String, uploadUrl: String, timestamp: Int)
+    case success(
+        requestId: String,
+        uploadUrl: String,
+        photoUrl: String?,
+        statusUrl: String?,
+        contentType: String?,
+        fileSizeBytes: Int?,
+        timestamp: Int
+    )
     case error(requestId: String, errorCode: String?, errorMessage: String, timestamp: Int)
 
     public init(values: [String: Any]) {
         let requestId = stringValue(values, "requestId") ?? ""
         let timestamp = intValue(values["timestamp"]) ?? Int(Date().timeIntervalSince1970 * 1000)
         let state = stringValue(values, "state")?.lowercased()
-        if state == State.success.rawValue {
+        let success = state == State.success.rawValue || boolValue(values, "success") == true
+        if success {
             self = .success(
                 requestId: requestId,
                 uploadUrl: stringValue(values, "uploadUrl") ?? "",
+                photoUrl: stringValue(values, "photoUrl"),
+                statusUrl: stringValue(values, "statusUrl"),
+                contentType: stringValue(values, "contentType") ?? stringValue(values, "mimeType"),
+                fileSizeBytes: intValue(values["fileSizeBytes"]) ?? intValue(values["bytes"])
+                    ?? intValue(values["size"]),
                 timestamp: timestamp
             )
         } else {
             self = .error(
                 requestId: requestId,
                 errorCode: stringValue(values, "errorCode"),
-                errorMessage: stringValue(values, "errorMessage") ?? "Unknown photo error",
+                errorMessage: stringValue(values, "errorMessage") ?? stringValue(values, "error")
+                    ?? "Unknown photo error",
                 timestamp: timestamp
             )
         }
@@ -192,27 +334,40 @@ public enum PhotoResponse: CustomStringConvertible, Equatable {
 
     public var requestId: String {
         switch self {
-        case let .success(requestId, _, _), let .error(requestId, _, _, _):
+        case let .success(requestId, _, _, _, _, _, _), let .error(requestId, _, _, _):
             requestId
         }
     }
 
     public var timestamp: Int {
         switch self {
-        case let .success(_, _, timestamp), let .error(_, _, _, timestamp):
+        case let .success(_, _, _, _, _, _, timestamp), let .error(_, _, _, timestamp):
             timestamp
         }
     }
 
     public var values: [String: Any] {
         switch self {
-        case let .success(requestId, uploadUrl, timestamp):
-            return [
+        case let .success(requestId, uploadUrl, photoUrl, statusUrl, contentType, fileSizeBytes, timestamp):
+            var values: [String: Any] = [
                 "state": State.success.rawValue,
                 "requestId": requestId,
                 "uploadUrl": uploadUrl,
                 "timestamp": timestamp,
             ]
+            if let photoUrl, !photoUrl.isEmpty {
+                values["photoUrl"] = photoUrl
+            }
+            if let statusUrl, !statusUrl.isEmpty {
+                values["statusUrl"] = statusUrl
+            }
+            if let contentType, !contentType.isEmpty {
+                values["contentType"] = contentType
+            }
+            if let fileSizeBytes {
+                values["fileSizeBytes"] = fileSizeBytes
+            }
+            return values
         case let .error(requestId, errorCode, errorMessage, timestamp):
             var values: [String: Any] = [
                 "state": State.error.rawValue,
@@ -287,6 +442,18 @@ public struct PhotoStatusEvent: CustomStringConvertible {
         values["resolvedConfig"] as? [String: Any]
     }
 
+    public var requestedCaptureConfig: [String: Any]? {
+        values["requestedCaptureConfig"] as? [String: Any]
+    }
+
+    public var meteredPreview: [String: Any]? {
+        values["meteredPreview"] as? [String: Any]
+    }
+
+    public var captureMetadata: [String: Any]? {
+        values["captureMetadata"] as? [String: Any]
+    }
+
     public var errorCode: String? {
         stringValue(values, "errorCode")
     }
@@ -299,3 +466,45 @@ public struct PhotoStatusEvent: CustomStringConvertible {
         "PhotoStatusEvent(requestId: \(requestId), status: \(status))"
     }
 }
+
+public struct GalleryStatusEvent: CustomStringConvertible {
+    public let values: [String: Any]
+
+    public init(values: [String: Any]) {
+        var values = values
+        values["type"] = "gallery_status"
+        self.values = values
+    }
+
+    public var photos: Int {
+        intValue(values["photos"]) ?? 0
+    }
+
+    public var videos: Int {
+        intValue(values["videos"]) ?? 0
+    }
+
+    public var total: Int {
+        intValue(values["total"]) ?? 0
+    }
+
+    public var totalSize: Int? {
+        intValue(values["totalSize"]) ?? intValue(values["total_size"])
+    }
+
+    public var hasContent: Bool {
+        boolValue(values, "hasContent", "has_content") ?? false
+    }
+
+    public var cameraBusy: Bool {
+        boolValue(values, "cameraBusy", "camera_busy") ?? false
+    }
+
+    public var cameraBusyReason: String? {
+        stringValue(values, "cameraBusyReason", "camera_busy")
+    }
+
+    public var description: String {
+        "GalleryStatusEvent(total: \(total), photos: \(photos), videos: \(videos))"
+    }
+}

package/ios/Source/controllers/ControllerManager.swift

@@ -20,7 +20,7 @@ protocol ControllerManager {
 
     func requestPhoto(
         _ requestId: String, appId: String, size: String?, webhookUrl: String?, authToken: String?,
-        compress: String?, flash: Bool, sound: Bool, exposureTimeNs: Double?, iso: Int?
+        compress: String?, flash: Bool, save: Bool, sound: Bool, exposureTimeNs: Double?, iso: Int?
     )
     func startStream(_ message: [String: Any])
     func stopStream()
@@ -41,7 +41,7 @@ protocol ControllerManager {
     func clearDisplay()
     func sendTextWall(_ text: String)
     func sendDoubleTextWall(_ top: String, _ bottom: String)
-    func displayBitmap(base64ImageData: String) async -> Bool
+    func displayBitmap(base64ImageData: String, x: Int32?, y: Int32?, width: Int32?, height: Int32?) async -> Bool
     func showDashboard()
     func setDashboardPosition(_ height: Int, _ depth: Int)
 
@@ -154,7 +154,8 @@ extension ControllerManager {
     }
 
     var voiceActivityDetectionEnabled: Bool {
-        DeviceStore.shared.get("glasses", "voiceActivityDetectionEnabled") as? Bool ?? true
+        DeviceStore.shared.get("glasses", "voiceActivityDetectionEnabled") as? Bool
+            ?? BluetoothSdkDefaults.voiceActivityDetectionEnabled
     }
 
     var batteryLevel: Int {

package/ios/Source/controllers/R1.swift

@@ -506,7 +506,7 @@ class R1: NSObject, ControllerManager {
     func sendJson(_: [String: Any], wakeUp _: Bool, requireAck _: Bool) {}
     func requestPhoto(
         _: String, appId _: String, size _: String?, webhookUrl _: String?, authToken _: String?,
-        compress _: String?, flash _: Bool, sound _: Bool, exposureTimeNs _: Double?, iso _: Int?
+        compress _: String?, flash _: Bool, save _: Bool, sound _: Bool, exposureTimeNs _: Double?, iso _: Int?
     ) {}
     func startVideoRecording(requestId _: String, save _: Bool, flash _: Bool, sound _: Bool) {}
     func stopVideoRecording(requestId _: String) {}
@@ -521,7 +521,7 @@ class R1: NSObject, ControllerManager {
     func clearDisplay() {}
     func sendTextWall(_: String) {}
     func sendDoubleTextWall(_: String, _: String) {}
-    func displayBitmap(base64ImageData _: String) async -> Bool {
+    func displayBitmap(base64ImageData _: String, x _: Int32? = nil, y _: Int32? = nil, width _: Int32? = nil, height _: Int32? = nil) async -> Bool {
         return false
     }
 
@@ -767,7 +767,7 @@ extension R1: CBPeripheralDelegate {
     ) {
         Bridge.log("R1: didUpdateValueFor1: \(characteristic.uuid)")
         guard let data = characteristic.value, !data.isEmpty, error == nil else { return }
-        Bridge.log("R1: didUpdateValueFor: \(characteristic.uuid) data: \(data.toHexString())")
+        Bridge.log("R1: didUpdateValueFor: \(characteristic.uuid) data: \(data.hexEncodedString())")
 
         DispatchQueue.main.async { [weak self] in
             guard let self = self else { return }