@mentra/bluetooth-sdk 0.1.2 → 0.1.4

package/ios/Source/MentraBluetoothSDK.swift

@@ -197,10 +197,10 @@ public struct Device: Identifiable, Equatable, CustomStringConvertible {
     }
 
     init?(values: [String: Any]) {
-        guard let model = stringValue(values, "model", "deviceModel", "device_model") else { return nil }
-        guard let name = stringValue(values, "name", "deviceName", "device_name") else { return nil }
-        let identifier = stringValue(values, "address", "deviceAddress", "device_address").flatMap { $0.isEmpty ? nil : $0 }
-        let rssi = intValue(values["rssi"]) ?? intValue(values["signalStrength"]) ?? intValue(values["signal_strength"])
+        guard let model = stringValue(values, "model") else { return nil }
+        guard let name = stringValue(values, "name") else { return nil }
+        let identifier = stringValue(values, "address").flatMap { $0.isEmpty ? nil : $0 }
+        let rssi = intValue(values["rssi"])
         self.init(
             model: DeviceModel.fromDeviceType(model),
             name: name,
@@ -236,8 +236,8 @@ public struct WifiScanResult: CustomStringConvertible {
 
     init(values: [String: Any]) {
         ssid = stringValue(values, "ssid") ?? ""
-        requiresPassword = boolValue(values, "requiresPassword", "requires_password", "auth_required") ?? false
-        signalStrength = intValue(values["signalStrength"] ?? values["signal_strength"] ?? values["rssi"]) ?? -1
+        requiresPassword = boolValue(values, "requiresPassword") ?? false
+        signalStrength = intValue(values["signalStrength"]) ?? -1
         frequency = intValue(values["frequency"])
     }
 
@@ -355,15 +355,15 @@ public struct GlassesStatus: CustomStringConvertible {
     public var connected: Bool { boolValue(values, "connected") ?? false }
     public var micEnabled: Bool { boolValue(values, "micEnabled") ?? false }
     public var connectionState: GlassesConnectionState { GlassesConnectionState(stringValue(values, "connectionState")) }
-    public var btcConnected: Bool { boolValue(values, "btcConnected") ?? false }
+    public var bluetoothClassicConnected: Bool { boolValue(values, "bluetoothClassicConnected") ?? false }
     public var signalStrength: Int { intValue(values["signalStrength"]) ?? -1 }
     public var signalStrengthUpdatedAt: Int { intValue(values["signalStrengthUpdatedAt"]) ?? 0 }
     public var deviceModel: String { stringValue(values, "deviceModel") ?? "" }
     public var androidVersion: String { stringValue(values, "androidVersion") ?? "" }
-    public var firmwareVersion: String { stringValue(values, "firmwareVersion", "fwVersion") ?? "" }
-    public var besFirmwareVersion: String { stringValue(values, "besFwVersion", "besFirmwareVersion") ?? "" }
-    public var mtkFirmwareVersion: String { stringValue(values, "mtkFwVersion", "mtkFirmwareVersion") ?? "" }
-    public var btMacAddress: String { stringValue(values, "btMacAddress") ?? "" }
+    public var firmwareVersion: String { stringValue(values, "firmwareVersion") ?? "" }
+    public var besFirmwareVersion: String { stringValue(values, "besFirmwareVersion") ?? "" }
+    public var mtkFirmwareVersion: String { stringValue(values, "mtkFirmwareVersion") ?? "" }
+    public var bluetoothMacAddress: String { stringValue(values, "bluetoothMacAddress") ?? "" }
     public var leftMacAddress: String { stringValue(values, "leftMacAddress") ?? "" }
     public var rightMacAddress: String { stringValue(values, "rightMacAddress") ?? "" }
     public var macAddress: String { stringValue(values, "macAddress") ?? "" }
@@ -413,7 +413,6 @@ public struct GlassesStatus: CustomStringConvertible {
         dictionary.removeValue(forKey: "hotspotSsid")
         dictionary.removeValue(forKey: "hotspotPassword")
         dictionary.removeValue(forKey: "hotspotGatewayIp")
-        dictionary.removeValue(forKey: "hotspotLocalIp")
         return dictionary
     }
 
@@ -443,7 +442,7 @@ public struct GlassesStatus: CustomStringConvertible {
             if let hotspot = (values["hotspot"] as? [String: Any]).flatMap(HotspotStatus.init(values:)) {
                 dictionary["hotspot"] = hotspot.values
             }
-        } else if hasAnyKey(values, "hotspotEnabled", "hotspotSsid", "hotspotPassword", "hotspotGatewayIp", "hotspotLocalIp") {
+        } else if hasAnyKey(values, "hotspotEnabled", "hotspotSsid", "hotspotPassword", "hotspotGatewayIp") {
             if let hotspot = HotspotStatus.fromStoreValues(values) {
                 dictionary["hotspot"] = hotspot.values
             }
@@ -451,7 +450,6 @@ public struct GlassesStatus: CustomStringConvertible {
             dictionary.removeValue(forKey: "hotspotSsid")
             dictionary.removeValue(forKey: "hotspotPassword")
             dictionary.removeValue(forKey: "hotspotGatewayIp")
-            dictionary.removeValue(forKey: "hotspotLocalIp")
         }
         return dictionary
     }
@@ -490,6 +488,8 @@ public struct BluetoothStatus: CustomStringConvertible {
     public var micEnabled: Bool { boolValue(values, "micEnabled") ?? false }
     public var currentMic: String { stringValue(values, "currentMic") ?? "" }
     public var micRanking: [String] { stringListValue(values, "micRanking") }
+    /// Nearby glasses in stable discovery order. Existing entries keep their array position as
+    /// details refresh; new glasses append at the end, and removals should not reorder remaining entries.
     public var searchResults: [Device] {
         dictionaryListValue(values, "searchResults").compactMap(Device.init(values:))
     }
@@ -515,7 +515,7 @@ public struct BluetoothStatus: CustomStringConvertible {
     public var dashboardDepth: Int { intValue(values["dashboard_depth"]) ?? 2 }
     public var headUpAngle: Int { intValue(values["head_up_angle"]) ?? 30 }
     public var contextualDashboard: Bool { boolValue(values, "contextual_dashboard") ?? true }
-    public var galleryModeAuto: Bool { boolValue(values, "gallery_mode") ?? true }
+    public var galleryModeAuto: Bool { boolValue(values, "galleryModeAuto") ?? true }
     public var buttonPhotoSize: ButtonPhotoSize {
         ButtonPhotoSize(rawValue: stringValue(values, "button_photo_size") ?? "") ?? .medium
     }
@@ -523,7 +523,7 @@ public struct BluetoothStatus: CustomStringConvertible {
     public var buttonMaxRecordingTime: Int { intValue(values["button_max_recording_time"]) ?? 10 }
     public var buttonVideoWidth: Int { intValue(values["button_video_width"]) ?? 1280 }
     public var buttonVideoHeight: Int { intValue(values["button_video_height"]) ?? 720 }
-    public var buttonVideoFps: Int { intValue(values["button_video_fps"]) ?? 30 }
+    public var buttonVideoFrameRate: Int { intValue(values["button_video_fps"]) ?? 30 }
     public var shouldSendPcm: Bool { boolValue(values, "should_send_pcm") ?? false }
     public var shouldSendLc3: Bool { boolValue(values, "should_send_lc3") ?? false }
     public var shouldSendTranscript: Bool { boolValue(values, "should_send_transcript") ?? false }
@@ -559,15 +559,15 @@ public struct GlassesStatusUpdate: CustomStringConvertible {
     public var connectionState: GlassesConnectionState? {
         GlassesConnectionState.fromValue(optionalStringValue(values, "connectionState"))
     }
-    public var btcConnected: Bool? { optionalBoolValue(values, "btcConnected") }
+    public var bluetoothClassicConnected: Bool? { optionalBoolValue(values, "bluetoothClassicConnected") }
     public var signalStrength: Int? { optionalIntValue(values, "signalStrength") }
     public var signalStrengthUpdatedAt: Int? { optionalIntValue(values, "signalStrengthUpdatedAt") }
     public var deviceModel: String? { optionalStringValue(values, "deviceModel") }
     public var androidVersion: String? { optionalStringValue(values, "androidVersion") }
-    public var firmwareVersion: String? { optionalStringValue(values, "firmwareVersion", "fwVersion") }
-    public var besFirmwareVersion: String? { optionalStringValue(values, "besFwVersion", "besFirmwareVersion") }
-    public var mtkFirmwareVersion: String? { optionalStringValue(values, "mtkFwVersion", "mtkFirmwareVersion") }
-    public var btMacAddress: String? { optionalStringValue(values, "btMacAddress") }
+    public var firmwareVersion: String? { optionalStringValue(values, "firmwareVersion") }
+    public var besFirmwareVersion: String? { optionalStringValue(values, "besFirmwareVersion") }
+    public var mtkFirmwareVersion: String? { optionalStringValue(values, "mtkFirmwareVersion") }
+    public var bluetoothMacAddress: String? { optionalStringValue(values, "bluetoothMacAddress") }
     public var leftMacAddress: String? { optionalStringValue(values, "leftMacAddress") }
     public var rightMacAddress: String? { optionalStringValue(values, "rightMacAddress") }
     public var macAddress: String? { optionalStringValue(values, "macAddress") }
@@ -591,7 +591,7 @@ public struct GlassesStatusUpdate: CustomStringConvertible {
         if let hotspot = values["hotspot"] as? [String: Any] {
             return HotspotStatus(values: hotspot)
         }
-        if hasAnyKey(values, "hotspotEnabled", "hotspotSsid", "hotspotPassword", "hotspotGatewayIp", "hotspotLocalIp") {
+        if hasAnyKey(values, "hotspotEnabled", "hotspotSsid", "hotspotPassword", "hotspotGatewayIp") {
             return HotspotStatus.fromStoreValues(values)
         }
         return nil
@@ -633,6 +633,9 @@ public struct BluetoothStatusUpdate: CustomStringConvertible {
     public var micEnabled: Bool? { optionalBoolValue(values, "micEnabled") }
     public var currentMic: String? { optionalStringValue(values, "currentMic") }
     public var micRanking: [String]? { optionalStringListValue(values, "micRanking") }
+    /// Nearby glasses in stable discovery order when included in an update. Existing entries keep their
+    /// array position as details refresh; new glasses append at the end, and removals should not reorder
+    /// remaining entries.
     public var searchResults: [Device]? {
         optionalDictionaryListValue(values, "searchResults")?.compactMap(Device.init(values:))
     }
@@ -658,7 +661,7 @@ public struct BluetoothStatusUpdate: CustomStringConvertible {
     public var dashboardDepth: Int? { optionalIntValue(values, "dashboard_depth") }
     public var headUpAngle: Int? { optionalIntValue(values, "head_up_angle") }
     public var contextualDashboard: Bool? { optionalBoolValue(values, "contextual_dashboard") }
-    public var galleryModeAuto: Bool? { optionalBoolValue(values, "gallery_mode") }
+    public var galleryModeAuto: Bool? { optionalBoolValue(values, "galleryModeAuto") }
     public var buttonPhotoSize: ButtonPhotoSize? {
         optionalStringValue(values, "button_photo_size").flatMap(ButtonPhotoSize.init(rawValue:))
     }
@@ -666,7 +669,7 @@ public struct BluetoothStatusUpdate: CustomStringConvertible {
     public var buttonMaxRecordingTime: Int? { optionalIntValue(values, "button_max_recording_time") }
     public var buttonVideoWidth: Int? { optionalIntValue(values, "button_video_width") }
     public var buttonVideoHeight: Int? { optionalIntValue(values, "button_video_height") }
-    public var buttonVideoFps: Int? { optionalIntValue(values, "button_video_fps") }
+    public var buttonVideoFrameRate: Int? { optionalIntValue(values, "button_video_fps") }
     public var shouldSendPcm: Bool? { optionalBoolValue(values, "should_send_pcm") }
     public var shouldSendLc3: Bool? { optionalBoolValue(values, "should_send_lc3") }
     public var shouldSendTranscript: Bool? { optionalBoolValue(values, "should_send_transcript") }
@@ -703,10 +706,10 @@ public struct DisplayTextRequest {
     }
 }
 
-public struct DisplayEventRequest {
-    public let values: [String: Any]
+struct DisplayEventRequest {
+    let values: [String: Any]
 
-    public init(values: [String: Any]) {
+    init(values: [String: Any]) {
         self.values = values
     }
 }
@@ -721,12 +724,12 @@ public struct DashboardPositionRequest {
     }
 }
 
-public struct DashboardMenuItem {
-    public let title: String
-    public let packageName: String
-    public let values: [String: Any]
+struct DashboardMenuItem {
+    let title: String
+    let packageName: String
+    let values: [String: Any]
 
-    public init(title: String, packageName: String, values: [String: Any] = [:]) {
+    init(title: String, packageName: String, values: [String: Any] = [:]) {
         self.title = title
         self.packageName = packageName
         self.values = values
@@ -772,12 +775,12 @@ public struct ButtonPhotoSettings {
 public struct ButtonVideoRecordingSettings {
     public let width: Int
     public let height: Int
-    public let fps: Int
+    public let frameRate: Int
 
-    public init(width: Int, height: Int, fps: Int) {
+    public init(width: Int, height: Int, frameRate: Int) {
         self.width = width
         self.height = height
-        self.fps = fps
+        self.frameRate = frameRate
     }
 }
 
@@ -788,32 +791,13 @@ public enum CameraFov {
     var value: [String: Int] {
         switch self {
         case .standard:
-            ["fov": 118, "roi_position": 0]
+            ["fov": 118, "roiPosition": 0]
         case .wide:
-            ["fov": 118, "roi_position": 0]
+            ["fov": 118, "roiPosition": 0]
         }
     }
 }
 
-public struct MicConfiguration {
-    public let sendPcmData: Bool
-    public let sendTranscript: Bool
-    public let bypassVad: Bool
-    public let sendLc3Data: Bool
-
-    public init(
-        sendPcmData: Bool,
-        sendTranscript: Bool,
-        bypassVad: Bool,
-        sendLc3Data: Bool = false
-    ) {
-        self.sendPcmData = sendPcmData
-        self.sendTranscript = sendTranscript
-        self.bypassVad = bypassVad
-        self.sendLc3Data = sendLc3Data
-    }
-}
-
 public enum MicPreference: String {
     case auto
     case phone
@@ -828,7 +812,6 @@ public struct PhotoRequest {
     public let webhookUrl: String?
     public let authToken: String?
     public let compress: PhotoCompression?
-    public let flash: Bool
     public let sound: Bool
 
     public init(
@@ -838,7 +821,6 @@ public struct PhotoRequest {
         webhookUrl: String? = nil,
         authToken: String? = nil,
         compress: PhotoCompression? = nil,
-        flash: Bool,
         sound: Bool
     ) {
         self.requestId = requestId
@@ -847,7 +829,6 @@ public struct PhotoRequest {
         self.webhookUrl = webhookUrl
         self.authToken = authToken
         self.compress = compress
-        self.flash = flash
         self.sound = sound
     }
 }
@@ -882,10 +863,10 @@ public struct StreamVideoConfig {
     init?(values: [String: Any]?) {
         guard let values else { return nil }
         self.init(
-            width: intValue(values["width"] ?? values["w"]),
-            height: intValue(values["height"] ?? values["h"]),
-            bitrate: intValue(values["bitrate"] ?? values["br"]),
-            frameRate: intValue(values["frameRate"] ?? values["fr"])
+            width: intValue(values["width"]),
+            height: intValue(values["height"]),
+            bitrate: intValue(values["bitrate"]),
+            frameRate: intValue(values["frameRate"])
         )
     }
 }
@@ -920,10 +901,10 @@ public struct StreamAudioConfig {
     init?(values: [String: Any]?) {
         guard let values else { return nil }
         self.init(
-            bitrate: intValue(values["bitrate"] ?? values["br"]),
-            sampleRate: intValue(values["sampleRate"] ?? values["sr"]),
-            echoCancellation: values["echoCancellation"] as? Bool ?? values["ec"] as? Bool,
-            noiseSuppression: values["noiseSuppression"] as? Bool ?? values["ns"] as? Bool
+            bitrate: intValue(values["bitrate"]),
+            sampleRate: intValue(values["sampleRate"]),
+            echoCancellation: values["echoCancellation"] as? Bool,
+            noiseSuppression: values["noiseSuppression"] as? Bool
         )
     }
 }
@@ -933,7 +914,6 @@ public struct StreamRequest {
     public let streamId: String
     public let keepAlive: Bool
     public let keepAliveIntervalSeconds: Int
-    public let flash: Bool
     public let sound: Bool
     public let video: StreamVideoConfig?
     public let audio: StreamAudioConfig?
@@ -944,7 +924,6 @@ public struct StreamRequest {
         streamId: String = "",
         keepAlive: Bool = true,
         keepAliveIntervalSeconds: Int = 15,
-        flash: Bool = true,
         sound: Bool = true,
         video: StreamVideoConfig? = nil,
         audio: StreamAudioConfig? = nil,
@@ -954,7 +933,6 @@ public struct StreamRequest {
         self.streamId = streamId
         self.keepAlive = keepAlive
         self.keepAliveIntervalSeconds = keepAliveIntervalSeconds
-        self.flash = flash
         self.sound = sound
         self.video = video
         self.audio = audio
@@ -971,10 +949,9 @@ public struct StreamRequest {
             streamId: values["streamId"] as? String ?? "",
             keepAlive: values["keepAlive"] as? Bool ?? true,
             keepAliveIntervalSeconds: intValue(values["keepAliveIntervalSeconds"]) ?? 15,
-            flash: values["flash"] as? Bool ?? true,
             sound: values["sound"] as? Bool ?? true,
-            video: StreamVideoConfig(values: (values["video"] ?? values["v"]) as? [String: Any]),
-            audio: StreamAudioConfig(values: (values["audio"] ?? values["a"]) as? [String: Any]),
+            video: StreamVideoConfig(values: values["video"] as? [String: Any]),
+            audio: StreamAudioConfig(values: values["audio"] as? [String: Any]),
             extraValues: values
         )
     }
@@ -986,7 +963,8 @@ public struct StreamRequest {
         values["streamId"] = streamId
         values["keepAlive"] = keepAlive
         values["keepAliveIntervalSeconds"] = keepAliveIntervalSeconds
-        values["flash"] = flash
+        // The camera light is a privacy indicator and cannot be disabled by SDK callers.
+        values["flash"] = true
         values["sound"] = sound
         if let videoValues = video?.dictionary, !videoValues.isEmpty {
             values["video"] = videoValues
@@ -1044,8 +1022,8 @@ public struct RgbLedRequest {
     public let packageName: String?
     public let action: RgbLedAction
     public let color: RgbLedColor?
-    public let ontime: Int
-    public let offtime: Int
+    public let onDurationMs: Int
+    public let offDurationMs: Int
     public let count: Int
 
     public init(
@@ -1053,16 +1031,16 @@ public struct RgbLedRequest {
         packageName: String?,
         action: RgbLedAction,
         color: RgbLedColor?,
-        ontime: Int,
-        offtime: Int,
+        onDurationMs: Int,
+        offDurationMs: Int,
         count: Int
     ) {
         self.requestId = requestId
         self.packageName = packageName
         self.action = action
         self.color = color
-        self.ontime = ontime
-        self.offtime = offtime
+        self.onDurationMs = onDurationMs
+        self.offDurationMs = offDurationMs
         self.count = count
     }
 }
@@ -1070,13 +1048,11 @@ public struct RgbLedRequest {
 public struct VideoRecordingRequest {
     public let requestId: String
     public let save: Bool
-    public let flash: Bool
     public let sound: Bool
 
-    public init(requestId: String, save: Bool, flash: Bool, sound: Bool) {
+    public init(requestId: String, save: Bool, sound: Bool) {
         self.requestId = requestId
         self.save = save
-        self.flash = flash
         self.sound = sound
     }
 }
@@ -1105,11 +1081,11 @@ public struct TouchEvent: CustomStringConvertible {
     }
 
     public var deviceModel: String? {
-        stringValue(values, "device_model", "deviceModel")
+        stringValue(values, "deviceModel")
     }
 
     public var gestureName: String? {
-        stringValue(values, "gesture_name", "gestureName")
+        stringValue(values, "gestureName")
     }
 
     public var timestamp: Int? {
@@ -1339,7 +1315,7 @@ public enum HotspotStatus: CustomStringConvertible, Equatable {
             enabled: enabled,
             ssid: nonEmptyStringValue(values, "hotspotSsid"),
             password: nonEmptyStringValue(values, "hotspotPassword"),
-            localIp: nonEmptyStringValue(values, "hotspotGatewayIp", "hotspotLocalIp")
+            localIp: nonEmptyStringValue(values, "hotspotGatewayIp")
         )
     }
 
@@ -1438,7 +1414,7 @@ public struct HotspotErrorEvent: CustomStringConvertible {
     }
 
     public var message: String? {
-        stringValue(values, "error_message", "message", "error")
+        stringValue(values, "errorMessage")
     }
 
     public var timestamp: Int? {
@@ -1456,24 +1432,24 @@ public enum PhotoResponse: CustomStringConvertible, Equatable {
         case error
     }
 
-    case success(requestId: String, photoUrl: String, timestamp: Int)
+    case success(requestId: String, uploadUrl: String, timestamp: Int)
     case error(requestId: String, errorCode: String?, errorMessage: String, timestamp: Int)
 
     public init(values: [String: Any]) {
-        let requestId = stringValue(values, "requestId", "request_id") ?? ""
+        let requestId = stringValue(values, "requestId") ?? ""
         let timestamp = intValue(values["timestamp"]) ?? Int(Date().timeIntervalSince1970 * 1000)
-        let state = stringValue(values, "state", "status")?.lowercased()
-        if state == State.success.rawValue || boolValue(values, "success") == true {
+        let state = stringValue(values, "state")?.lowercased()
+        if state == State.success.rawValue {
             self = .success(
                 requestId: requestId,
-                photoUrl: stringValue(values, "photoUrl", "photo_url") ?? "",
+                uploadUrl: stringValue(values, "uploadUrl") ?? "",
                 timestamp: timestamp
             )
         } else {
             self = .error(
                 requestId: requestId,
-                errorCode: stringValue(values, "errorCode", "error_code"),
-                errorMessage: stringValue(values, "errorMessage", "error_message", "error") ?? "Unknown photo error",
+                errorCode: stringValue(values, "errorCode"),
+                errorMessage: stringValue(values, "errorMessage") ?? "Unknown photo error",
                 timestamp: timestamp
             )
         }
@@ -1504,11 +1480,11 @@ public enum PhotoResponse: CustomStringConvertible, Equatable {
 
     public var values: [String: Any] {
         switch self {
-        case let .success(requestId, photoUrl, timestamp):
+        case let .success(requestId, uploadUrl, timestamp):
             return [
                 "state": State.success.rawValue,
                 "requestId": requestId,
-                "photoUrl": photoUrl,
+                "uploadUrl": uploadUrl,
                 "timestamp": timestamp,
             ]
         case let .error(requestId, errorCode, errorMessage, timestamp):
@@ -1607,10 +1583,10 @@ public enum StreamStatus: CustomStringConvertible, Equatable {
 
     public init(values: [String: Any]) {
         let rawState = stringValue(values, "status")
-        let streamId = stringValue(values, "streamId", "stream_id")
+        let streamId = stringValue(values, "streamId")
         let timestamp = intValue(values["timestamp"])
         let attempt = optionalIntValue(values, "attempt")
-        let maxAttempts = optionalIntValue(values, "maxAttempts", "max_attempts") ?? 0
+        let maxAttempts = optionalIntValue(values, "maxAttempts") ?? 0
 
         if hasAnyKey(values, "streaming") || hasAnyKey(values, "reconnecting") {
             let streaming = boolValue(values, "streaming") == true
@@ -1652,7 +1628,7 @@ public enum StreamStatus: CustomStringConvertible, Equatable {
         case .error:
             self = .error(
                 streamId: streamId,
-                errorDetails: stringValue(values, "errorDetails", "error_details", "details", "error", "errorMessage")
+                errorDetails: stringValue(values, "errorDetails")
                     ?? (rawState == "error_not_streaming" ? "not_streaming" : "Unknown stream error"),
                 timestamp: timestamp
             )
@@ -1798,8 +1774,8 @@ public struct KeepAliveAckEvent: CustomStringConvertible, Equatable {
     }
 
     public init(values: [String: Any]) {
-        self.streamId = stringValue(values, "streamId", "stream_id") ?? ""
-        self.ackId = stringValue(values, "ackId", "ack_id") ?? ""
+        self.streamId = stringValue(values, "streamId") ?? ""
+        self.ackId = stringValue(values, "ackId") ?? ""
         self.timestamp = intValue(values["timestamp"])
     }
 
@@ -1900,6 +1876,26 @@ public enum ScanStopReason {
     case error
 }
 
+@MainActor
+public final class ScanSession {
+    private let stopAction: () -> Void
+    private var stopped = false
+
+    init(stopAction: @escaping () -> Void) {
+        self.stopAction = stopAction
+    }
+
+    public func stop() {
+        guard !stopped else { return }
+        stopped = true
+        stopAction()
+    }
+
+    fileprivate func markStopped() {
+        stopped = true
+    }
+}
+
 public struct LocalTranscriptionEvent: CustomStringConvertible {
     public let text: String
     public let isFinal: Bool
@@ -1916,6 +1912,38 @@ public struct LocalTranscriptionEvent: CustomStringConvertible {
     }
 }
 
+public struct GlassesMediaVolumeGetResult: CustomStringConvertible {
+    public let level: Int?
+    public let statusCode: Int?
+    public let values: [String: Any]
+
+    public init(values: [String: Any]) {
+        self.level = intValue(values["level"])
+        self.statusCode = intValue(values["statusCode"])
+        self.values = values
+    }
+
+    public var description: String {
+        let levelText = level.map(String.init) ?? "unknown"
+        let statusCodeText = statusCode.map(String.init) ?? "unknown"
+        return "GlassesMediaVolumeGetResult(level: \(levelText), statusCode: \(statusCodeText))"
+    }
+}
+
+public struct GlassesMediaVolumeSetResult: CustomStringConvertible {
+    public let statusCode: Int?
+    public let values: [String: Any]
+
+    public init(values: [String: Any]) {
+        self.statusCode = intValue(values["statusCode"])
+        self.values = values
+    }
+
+    public var description: String {
+        "GlassesMediaVolumeSetResult(statusCode: \(statusCode.map(String.init) ?? "unknown"))"
+    }
+}
+
 public enum BluetoothEvent: CustomStringConvertible {
     case buttonPress(ButtonPressEvent)
     case touch(TouchEvent)
@@ -1982,6 +2010,26 @@ public extension MentraBluetoothSDKDelegate {
     func mentraBluetoothSDK(_: MentraBluetoothSDK, didFail _: BluetoothError) {}
 }
 
+@MainActor
+private final class ActiveScanSession {
+    let model: DeviceModel
+    let onResults: ([Device]) -> Void
+    let onComplete: ([Device]) -> Void
+    var latestResults: [Device] = []
+    var timeoutTask: Task<Void, Never>?
+    weak var publicSession: ScanSession?
+
+    init(
+        model: DeviceModel,
+        onResults: @escaping ([Device]) -> Void,
+        onComplete: @escaping ([Device]) -> Void
+    ) {
+        self.model = model
+        self.onResults = onResults
+        self.onComplete = onComplete
+    }
+}
+
 @MainActor
 public final class MentraBluetoothSDK {
     public weak var delegate: MentraBluetoothSDKDelegate?
@@ -1993,6 +2041,7 @@ public final class MentraBluetoothSDK {
     private let defaultDeviceKeys: Set<String> = ["default_wearable", "device_name", "device_address"]
     private var suppressDefaultDeviceEvents = false
     private var defaultDeviceApplyGeneration = 0
+    private var activeScanSessions: [UUID: ActiveScanSession] = [:]
 
     public init(configuration: MentraBluetoothSDKConfiguration = .default) {
         self.configuration = configuration
@@ -2059,9 +2108,50 @@ public final class MentraBluetoothSDK {
     }
 
     public func stopScan() {
+        stopScan(reason: .cancelled)
+    }
+
+    private func stopScan(reason: ScanStopReason) {
         DeviceManager.shared.stopScan()
         DeviceStore.shared.apply(ObservableStore.bluetoothCategory, "searching", false)
-        delegate?.mentraBluetoothSDK(self, didStopScan: .cancelled)
+        delegate?.mentraBluetoothSDK(self, didStopScan: reason)
+    }
+
+    @discardableResult
+    public func scan(
+        model: DeviceModel,
+        timeout: TimeInterval = 15,
+        onResults: @escaping ([Device]) -> Void,
+        onComplete: @escaping ([Device]) -> Void = { _ in }
+    ) throws -> ScanSession {
+        let normalizedTimeout = timeout > 0 && timeout.isFinite ? timeout : 15
+        let id = UUID()
+        let activeSession = ActiveScanSession(
+            model: model,
+            onResults: onResults,
+            onComplete: onComplete
+        )
+        let publicSession = ScanSession { [weak self] in
+            self?.finishScanSession(id, reason: .cancelled, shouldStopScan: true)
+        }
+        activeSession.publicSession = publicSession
+        activeScanSessions[id] = activeSession
+
+        do {
+            emitScanResults([], forSession: id)
+            try startScan(model: model)
+            emitScanResults(bluetoothStatus.searchResults.filter { $0.model == model }, forSession: id)
+            activeSession.timeoutTask = Task { [weak self] in
+                let nanoseconds = UInt64(normalizedTimeout * 1_000_000_000)
+                try? await Task.sleep(nanoseconds: nanoseconds)
+                await self?.finishScanSession(id, reason: .completed, shouldStopScan: true)
+            }
+            return publicSession
+        } catch {
+            activeScanSessions[id] = nil
+            publicSession.markStopped()
+            throw error
+        }
     }
 
     public func connect(to device: Device, options: ConnectOptions = ConnectOptions()) throws {
@@ -2103,7 +2193,7 @@ public final class MentraBluetoothSDK {
         DeviceManager.shared.disconnect()
     }
 
-    public func connectSimulated() {
+    func connectSimulated() {
         DeviceManager.shared.connectSimulated()
     }
 
@@ -2123,7 +2213,7 @@ public final class MentraBluetoothSDK {
         DeviceManager.shared.displayText(request.dictionary)
     }
 
-    public func displayEvent(_ request: DisplayEventRequest) async throws {
+    func displayEvent(_ request: DisplayEventRequest) async throws {
         DeviceManager.shared.displayEvent(request.values)
     }
 
@@ -2135,14 +2225,14 @@ public final class MentraBluetoothSDK {
         DeviceManager.shared.showDashboard()
     }
 
-    public func setBrightness(_ level: Int, autoMode: Bool? = nil) async throws {
+    func setBrightness(_ level: Int, autoMode: Bool? = nil) async throws {
         if let autoMode {
             DeviceStore.shared.apply(ObservableStore.bluetoothCategory, "auto_brightness", autoMode)
         }
         DeviceStore.shared.apply(ObservableStore.bluetoothCategory, "brightness", level)
     }
 
-    public func setAutoBrightness(enabled: Bool) async throws {
+    func setAutoBrightness(enabled: Bool) async throws {
         DeviceStore.shared.apply(ObservableStore.bluetoothCategory, "auto_brightness", enabled)
     }
 
@@ -2155,7 +2245,7 @@ public final class MentraBluetoothSDK {
         try await setDashboardPosition(height: request.height, depth: request.depth)
     }
 
-    public func setDashboardMenu(_ items: [DashboardMenuItem]) async throws {
+    func setDashboardMenu(_ items: [DashboardMenuItem]) async throws {
         DeviceStore.shared.apply(
             ObservableStore.bluetoothCategory,
             "menu_apps",
@@ -2172,7 +2262,7 @@ public final class MentraBluetoothSDK {
     }
 
     public func setGalleryMode(_ mode: GalleryMode) async throws {
-        DeviceStore.shared.apply(ObservableStore.bluetoothCategory, "gallery_mode", mode == .auto)
+        DeviceStore.shared.apply(ObservableStore.bluetoothCategory, "galleryModeAuto", mode == .auto)
     }
 
     public func setButtonPhotoSettings(size: ButtonPhotoSize) async throws {
@@ -2183,14 +2273,14 @@ public final class MentraBluetoothSDK {
         try await setButtonPhotoSettings(size: settings.size)
     }
 
-    public func setButtonVideoRecordingSettings(width: Int, height: Int, fps: Int) async throws {
+    public func setButtonVideoRecordingSettings(width: Int, height: Int, frameRate: Int) async throws {
         DeviceStore.shared.apply(ObservableStore.bluetoothCategory, "button_video_width", width)
         DeviceStore.shared.apply(ObservableStore.bluetoothCategory, "button_video_height", height)
-        DeviceStore.shared.apply(ObservableStore.bluetoothCategory, "button_video_fps", fps)
+        DeviceStore.shared.apply(ObservableStore.bluetoothCategory, "button_video_fps", frameRate)
     }
 
     public func setButtonVideoRecordingSettings(_ settings: ButtonVideoRecordingSettings) async throws {
-        try await setButtonVideoRecordingSettings(width: settings.width, height: settings.height, fps: settings.fps)
+        try await setButtonVideoRecordingSettings(width: settings.width, height: settings.height, frameRate: settings.frameRate)
     }
 
     public func setButtonCameraLed(enabled: Bool) async throws {
@@ -2227,16 +2317,6 @@ public final class MentraBluetoothSDK {
         )
     }
 
-    @available(*, deprecated, message: "Use setMicState(enabled:useGlassesMic:bypassVad:) instead.")
-    public func setMicState(_ config: MicConfiguration) {
-        applyMicState(
-            sendPcmData: config.sendPcmData,
-            sendTranscript: config.sendTranscript,
-            bypassVad: config.bypassVad,
-            sendLc3Data: config.sendLc3Data
-        )
-    }
-
     private func applyMicState(
         sendPcmData: Bool,
         sendTranscript: Bool,
@@ -2258,6 +2338,20 @@ public final class MentraBluetoothSDK {
         PhoneAudioMonitor.getInstance().setOwnAppAudioPlaying(playing)
     }
 
+    public func getGlassesMediaVolume() async throws -> GlassesMediaVolumeGetResult {
+        GlassesMediaVolumeGetResult(values: try await DeviceManager.shared.getGlassesMediaVolume())
+    }
+
+    public func setGlassesMediaVolume(_ level: Int) async throws -> GlassesMediaVolumeSetResult {
+        guard (0...15).contains(level) else {
+            throw BluetoothError(
+                code: "invalid_volume_level",
+                message: "Glasses media volume must be between 0 and 15."
+            )
+        }
+        return GlassesMediaVolumeSetResult(values: try await DeviceManager.shared.setGlassesMediaVolume(level: level))
+    }
+
     public func requestWifiScan() {
         DeviceManager.shared.requestWifiScan()
     }
@@ -2275,14 +2369,13 @@ public final class MentraBluetoothSDK {
     }
 
     public func requestPhoto(_ request: PhotoRequest) {
-        DeviceManager.shared.photoRequest(
+        DeviceManager.shared.requestPhoto(
             request.requestId,
             request.appId,
             request.size.rawValue,
             request.webhookUrl,
             request.authToken,
             request.compress?.rawValue,
-            request.flash,
             request.sound
         )
     }
@@ -2305,8 +2398,8 @@ public final class MentraBluetoothSDK {
             packageName: request.packageName,
             action: request.action.rawValue,
             color: request.color?.rawValue,
-            ontime: request.ontime,
-            offtime: request.offtime,
+            onDurationMs: request.onDurationMs,
+            offDurationMs: request.offDurationMs,
             count: request.count
         )
     }
@@ -2319,7 +2412,6 @@ public final class MentraBluetoothSDK {
         DeviceManager.shared.startVideoRecording(
             request.requestId,
             request.save,
-            request.flash,
             request.sound
         )
     }
@@ -2332,23 +2424,23 @@ public final class MentraBluetoothSDK {
         DeviceManager.shared.requestVersionInfo()
     }
 
-    public func sendOtaStart() {
+    func sendOtaStart() {
         DeviceManager.shared.sendOtaStart()
     }
 
-    public func sendOtaQueryStatus() {
+    func sendOtaQueryStatus() {
         DeviceManager.shared.sendOtaQueryStatus()
     }
 
-    public func sendShutdown() {
+    func sendShutdown() {
         DeviceManager.shared.sendShutdown()
     }
 
-    public func sendReboot() {
+    func sendReboot() {
         DeviceManager.shared.sendReboot()
     }
 
-    public func sendIncidentId(_ incidentId: String, apiBaseUrl: String? = nil) {
+    func sendIncidentId(_ incidentId: String, apiBaseUrl: String? = nil) {
         DeviceManager.shared.sendIncidentId(incidentId, apiBaseUrl: apiBaseUrl)
     }
 
@@ -2374,6 +2466,7 @@ public final class MentraBluetoothSDK {
                 dispatchDefaultDeviceChanged()
             }
             dispatchDiscoveredDevices(changes["searchResults"])
+            dispatchScanResults(changes["searchResults"])
         default:
             break
         }
@@ -2428,13 +2521,38 @@ public final class MentraBluetoothSDK {
     private func dispatchDiscoveredDevices(_ rawSearchResults: Any?) {
         guard let results = rawSearchResults as? [[String: Any]] else { return }
         for result in results {
-            guard let name = result["deviceName"] as? String ?? result["name"] as? String else { continue }
+            guard let name = result["name"] as? String else { continue }
             guard discoveredDeviceNames.insert(name).inserted else { continue }
             guard let device = Device(values: result) else { continue }
             delegate?.mentraBluetoothSDK(self, didDiscover: device)
         }
     }
 
+    private func dispatchScanResults(_ rawSearchResults: Any?) {
+        guard let results = rawSearchResults as? [[String: Any]] else { return }
+        let devices = results.compactMap(Device.init(values:))
+        for id in Array(activeScanSessions.keys) {
+            guard let activeSession = activeScanSessions[id] else { continue }
+            emitScanResults(devices.filter { $0.model == activeSession.model }, forSession: id)
+        }
+    }
+
+    private func emitScanResults(_ devices: [Device], forSession id: UUID) {
+        guard let activeSession = activeScanSessions[id] else { return }
+        activeSession.latestResults = devices
+        activeSession.onResults(devices)
+    }
+
+    private func finishScanSession(_ id: UUID, reason: ScanStopReason, shouldStopScan: Bool) {
+        guard let activeSession = activeScanSessions.removeValue(forKey: id) else { return }
+        activeSession.timeoutTask?.cancel()
+        activeSession.publicSession?.markStopped()
+        if shouldStopScan {
+            stopScan(reason: reason)
+        }
+        activeSession.onComplete(activeSession.latestResults)
+    }
+
     private func dispatchBridgeEvent(_ eventName: String, _ data: [String: Any]) {
         switch eventName {
         case "log":