@mentra/bluetooth-sdk 0.1.6 → 0.1.8

package/ios/Source/Streaming/StreamModels.swift

@@ -4,18 +4,18 @@ public struct StreamVideoConfig {
     public let width: Int?
     public let height: Int?
     public let bitrate: Int?
-    public let frameRate: Int?
+    public let fps: Int?
 
     public init(
         width: Int? = nil,
         height: Int? = nil,
         bitrate: Int? = nil,
-        frameRate: Int? = nil
+        fps: Int? = nil
     ) {
         self.width = width
         self.height = height
         self.bitrate = bitrate
-        self.frameRate = frameRate
+        self.fps = fps
     }
 
     var dictionary: [String: Any] {
@@ -23,7 +23,7 @@ public struct StreamVideoConfig {
         if let width { values["width"] = width }
         if let height { values["height"] = height }
         if let bitrate { values["bitrate"] = bitrate }
-        if let frameRate { values["frameRate"] = frameRate }
+        if let fps { values["frameRate"] = fps }
         return values
     }
 
@@ -33,7 +33,7 @@ public struct StreamVideoConfig {
             width: intValue(values["width"]),
             height: intValue(values["height"]),
             bitrate: intValue(values["bitrate"]),
-            frameRate: intValue(values["frameRate"])
+            fps: intValue(values["fps"])
         )
     }
 }
@@ -76,6 +76,139 @@ public struct StreamAudioConfig {
     }
 }
 
+public struct StreamResolvedVideoConfig: Equatable {
+    public let width: Int
+    public let height: Int
+    public let captureWidth: Int?
+    public let captureHeight: Int?
+    public let bitrate: Int
+    public let fps: Int
+
+    public init(
+        width: Int,
+        height: Int,
+        captureWidth: Int? = nil,
+        captureHeight: Int? = nil,
+        bitrate: Int,
+        fps: Int
+    ) {
+        self.width = width
+        self.height = height
+        self.captureWidth = captureWidth
+        self.captureHeight = captureHeight
+        self.bitrate = bitrate
+        self.fps = fps
+    }
+
+    init?(values: [String: Any]?) {
+        guard let values,
+              let width = intValue(values["width"]),
+              let height = intValue(values["height"]),
+              let bitrate = intValue(values["bitrate"]),
+              let fps = intValue(values["fps"])
+        else {
+            return nil
+        }
+        self.init(
+            width: width,
+            height: height,
+            captureWidth: intValue(values["captureWidth"]),
+            captureHeight: intValue(values["captureHeight"]),
+            bitrate: bitrate,
+            fps: fps
+        )
+    }
+
+    var values: [String: Any] {
+        var values: [String: Any] = [
+            "width": width,
+            "height": height,
+            "bitrate": bitrate,
+            "fps": fps,
+        ]
+        if let captureWidth { values["captureWidth"] = captureWidth }
+        if let captureHeight { values["captureHeight"] = captureHeight }
+        return values
+    }
+}
+
+public struct StreamResolvedAudioConfig: Equatable {
+    public let bitrate: Int?
+    public let sampleRate: Int?
+    public let echoCancellation: Bool?
+    public let noiseSuppression: Bool?
+
+    public init(
+        bitrate: Int? = nil,
+        sampleRate: Int? = nil,
+        echoCancellation: Bool? = nil,
+        noiseSuppression: Bool? = nil
+    ) {
+        self.bitrate = bitrate
+        self.sampleRate = sampleRate
+        self.echoCancellation = echoCancellation
+        self.noiseSuppression = noiseSuppression
+    }
+
+    init?(values: [String: Any]?) {
+        guard let values else { return nil }
+        self.init(
+            bitrate: intValue(values["bitrate"]),
+            sampleRate: intValue(values["sampleRate"]),
+            echoCancellation: boolValue(values, "echoCancellation"),
+            noiseSuppression: boolValue(values, "noiseSuppression")
+        )
+    }
+
+    var values: [String: Any] {
+        var values: [String: Any] = [:]
+        if let bitrate { values["bitrate"] = bitrate }
+        if let sampleRate { values["sampleRate"] = sampleRate }
+        if let echoCancellation { values["echoCancellation"] = echoCancellation }
+        if let noiseSuppression { values["noiseSuppression"] = noiseSuppression }
+        return values
+    }
+}
+
+public enum StreamTransport: String, Equatable {
+    case rtmp
+    case srt
+    case whip
+}
+
+public struct StreamResolvedConfig: Equatable {
+    public let transport: StreamTransport?
+    public let video: StreamResolvedVideoConfig?
+    public let audio: StreamResolvedAudioConfig?
+
+    public init(
+        transport: StreamTransport? = nil,
+        video: StreamResolvedVideoConfig? = nil,
+        audio: StreamResolvedAudioConfig? = nil
+    ) {
+        self.transport = transport
+        self.video = video
+        self.audio = audio
+    }
+
+    init?(values: [String: Any]?) {
+        guard let values else { return nil }
+        self.init(
+            transport: stringValue(values, "transport").flatMap(StreamTransport.init(rawValue:)),
+            video: StreamResolvedVideoConfig(values: values["video"] as? [String: Any]),
+            audio: StreamResolvedAudioConfig(values: values["audio"] as? [String: Any])
+        )
+    }
+
+    var values: [String: Any] {
+        var values: [String: Any] = [:]
+        if let transport { values["transport"] = transport.rawValue }
+        if let video { values["video"] = video.values }
+        if let audio { values["audio"] = audio.values }
+        return values
+    }
+}
+
 public struct StreamRequest {
     public let streamUrl: String
     public let streamId: String
@@ -90,7 +223,7 @@ public struct StreamRequest {
         streamUrl: String,
         streamId: String = "",
         keepAlive: Bool = true,
-        keepAliveIntervalSeconds: Int = 15,
+        keepAliveIntervalSeconds: Int = 5,
         sound: Bool = true,
         video: StreamVideoConfig? = nil,
         audio: StreamAudioConfig? = nil,
@@ -115,7 +248,7 @@ public struct StreamRequest {
                 ?? "",
             streamId: values["streamId"] as? String ?? "",
             keepAlive: values["keepAlive"] as? Bool ?? true,
-            keepAliveIntervalSeconds: intValue(values["keepAliveIntervalSeconds"]) ?? 15,
+            keepAliveIntervalSeconds: intValue(values["keepAliveIntervalSeconds"]) ?? 5,
             sound: values["sound"] as? Bool ?? true,
             video: StreamVideoConfig(values: values["video"] as? [String: Any]),
             audio: StreamAudioConfig(values: values["audio"] as? [String: Any]),
@@ -125,6 +258,7 @@ public struct StreamRequest {
 
     public var values: [String: Any] {
         var values = extraValues
+        values.removeValue(forKey: "keepAliveMode")
         values["type"] = "start_stream"
         values["streamUrl"] = streamUrl
         values["streamId"] = streamId
@@ -143,12 +277,18 @@ public struct StreamRequest {
     }
 }
 
-public struct StreamKeepAliveRequest {
-    public let streamId: String
-    public let ackId: String
-    public let extraValues: [String: Any]
+extension StreamRequest {
+    var isExternallyManagedKeepAlive: Bool {
+        stringValue(extraValues, "keepAliveMode") == "external"
+    }
+}
+
+struct StreamKeepAliveRequest {
+    let streamId: String
+    let ackId: String
+    let extraValues: [String: Any]
 
-    public init(streamId: String, ackId: String, extraValues: [String: Any] = [:]) {
+    init(streamId: String, ackId: String, extraValues: [String: Any] = [:]) {
         self.streamId = streamId
         self.ackId = ackId
         self.extraValues = extraValues
@@ -162,7 +302,7 @@ public struct StreamKeepAliveRequest {
         )
     }
 
-    public var values: [String: Any] {
+    var values: [String: Any] {
         var values = extraValues
         values["type"] = "keep_stream_alive"
         values["streamId"] = streamId
@@ -213,17 +353,33 @@ public enum StreamStatusKind: String, Equatable {
 }
 
 public enum StreamStatus: CustomStringConvertible, Equatable {
-    case lifecycle(state: StreamState, streamId: String?, timestamp: Int?)
-    case reconnecting(streamId: String?, attempt: Int, maxAttempts: Int, reason: String, timestamp: Int?)
-    case reconnected(streamId: String?, attempt: Int, timestamp: Int?)
-    case reconnectFailed(streamId: String?, maxAttempts: Int, timestamp: Int?)
-    case error(streamId: String?, errorDetails: String, timestamp: Int?)
-    case snapshot(state: StreamState, streaming: Bool, reconnecting: Bool, streamId: String?, attempt: Int?, timestamp: Int?)
+    case lifecycle(state: StreamState, streamId: String?, timestamp: Int?, resolvedConfig: StreamResolvedConfig?)
+    case reconnecting(
+        streamId: String?,
+        attempt: Int,
+        maxAttempts: Int,
+        reason: String,
+        timestamp: Int?,
+        resolvedConfig: StreamResolvedConfig?
+    )
+    case reconnected(streamId: String?, attempt: Int, timestamp: Int?, resolvedConfig: StreamResolvedConfig?)
+    case reconnectFailed(streamId: String?, maxAttempts: Int, timestamp: Int?, resolvedConfig: StreamResolvedConfig?)
+    case error(streamId: String?, errorDetails: String, timestamp: Int?, resolvedConfig: StreamResolvedConfig?)
+    case snapshot(
+        state: StreamState,
+        streaming: Bool,
+        reconnecting: Bool,
+        streamId: String?,
+        attempt: Int?,
+        timestamp: Int?,
+        resolvedConfig: StreamResolvedConfig?
+    )
 
     public init(values: [String: Any]) {
         let rawState = stringValue(values, "status")
         let streamId = stringValue(values, "streamId")
         let timestamp = intValue(values["timestamp"])
+        let resolvedConfig = StreamResolvedConfig(values: values["resolvedConfig"] as? [String: Any])
         let attempt = optionalIntValue(values, "attempt")
         let maxAttempts = optionalIntValue(values, "maxAttempts") ?? 0
 
@@ -237,7 +393,8 @@ public enum StreamStatus: CustomStringConvertible, Equatable {
                 reconnecting: reconnecting,
                 streamId: streamId,
                 attempt: attempt,
-                timestamp: timestamp
+                timestamp: timestamp,
+                resolvedConfig: resolvedConfig
             )
             return
         }
@@ -246,7 +403,8 @@ public enum StreamStatus: CustomStringConvertible, Equatable {
             self = .error(
                 streamId: streamId,
                 errorDetails: rawState.map { "Unknown stream status: \($0)" } ?? "Missing stream status",
-                timestamp: timestamp
+                timestamp: timestamp,
+                resolvedConfig: resolvedConfig
             )
             return
         }
@@ -258,21 +416,38 @@ public enum StreamStatus: CustomStringConvertible, Equatable {
                 attempt: attempt ?? 0,
                 maxAttempts: maxAttempts,
                 reason: stringValue(values, "reason") ?? "",
-                timestamp: timestamp
+                timestamp: timestamp,
+                resolvedConfig: resolvedConfig
             )
         case .reconnected:
-            self = .reconnected(streamId: streamId, attempt: attempt ?? 0, timestamp: timestamp)
+            self = .reconnected(
+                streamId: streamId,
+                attempt: attempt ?? 0,
+                timestamp: timestamp,
+                resolvedConfig: resolvedConfig
+            )
         case .reconnectFailed:
-            self = .reconnectFailed(streamId: streamId, maxAttempts: maxAttempts, timestamp: timestamp)
+            self = .reconnectFailed(
+                streamId: streamId,
+                maxAttempts: maxAttempts,
+                timestamp: timestamp,
+                resolvedConfig: resolvedConfig
+            )
         case .error:
             self = .error(
                 streamId: streamId,
                 errorDetails: stringValue(values, "errorDetails")
                     ?? (rawState == "error_not_streaming" ? "not_streaming" : "Unknown stream error"),
-                timestamp: timestamp
+                timestamp: timestamp,
+                resolvedConfig: resolvedConfig
             )
         default:
-            self = .lifecycle(state: state, streamId: streamId, timestamp: timestamp)
+            self = .lifecycle(
+                state: state,
+                streamId: streamId,
+                timestamp: timestamp,
+                resolvedConfig: resolvedConfig
+            )
         }
     }
 
@@ -291,7 +466,7 @@ public enum StreamStatus: CustomStringConvertible, Equatable {
 
     public var state: StreamState {
         switch self {
-        case let .lifecycle(state, _, _):
+        case let .lifecycle(state, _, _, _):
             state
         case .reconnecting:
             .reconnecting
@@ -301,35 +476,47 @@ public enum StreamStatus: CustomStringConvertible, Equatable {
             .reconnectFailed
         case .error:
             .error
-        case let .snapshot(state, _, _, _, _, _):
+        case let .snapshot(state, _, _, _, _, _, _):
             state
         }
     }
 
     public var streamId: String? {
         switch self {
-        case let .lifecycle(_, streamId, _),
-             let .reconnecting(streamId, _, _, _, _),
-             let .reconnected(streamId, _, _),
-             let .reconnectFailed(streamId, _, _),
-             let .error(streamId, _, _),
-             let .snapshot(_, _, _, streamId, _, _):
+        case let .lifecycle(_, streamId, _, _),
+             let .reconnecting(streamId, _, _, _, _, _),
+             let .reconnected(streamId, _, _, _),
+             let .reconnectFailed(streamId, _, _, _),
+             let .error(streamId, _, _, _),
+             let .snapshot(_, _, _, streamId, _, _, _):
             streamId
         }
     }
 
     public var timestamp: Int? {
         switch self {
-        case let .lifecycle(_, _, timestamp),
-             let .reconnecting(_, _, _, _, timestamp),
-             let .reconnected(_, _, timestamp),
-             let .reconnectFailed(_, _, timestamp),
-             let .error(_, _, timestamp),
-             let .snapshot(_, _, _, _, _, timestamp):
+        case let .lifecycle(_, _, timestamp, _),
+             let .reconnecting(_, _, _, _, timestamp, _),
+             let .reconnected(_, _, timestamp, _),
+             let .reconnectFailed(_, _, timestamp, _),
+             let .error(_, _, timestamp, _),
+             let .snapshot(_, _, _, _, _, timestamp, _):
             timestamp
         }
     }
 
+    public var resolvedConfig: StreamResolvedConfig? {
+        switch self {
+        case let .lifecycle(_, _, _, resolvedConfig),
+             let .reconnecting(_, _, _, _, _, resolvedConfig),
+             let .reconnected(_, _, _, resolvedConfig),
+             let .reconnectFailed(_, _, _, resolvedConfig),
+             let .error(_, _, _, resolvedConfig),
+             let .snapshot(_, _, _, _, _, _, resolvedConfig):
+            resolvedConfig
+        }
+    }
+
     public var values: [String: Any] {
         var values: [String: Any] = [
             "kind": kind.rawValue,
@@ -341,21 +528,24 @@ public enum StreamStatus: CustomStringConvertible, Equatable {
         if let timestamp {
             values["timestamp"] = timestamp
         }
+        if let resolvedConfig {
+            values["resolvedConfig"] = resolvedConfig.values
+        }
 
         switch self {
         case .lifecycle:
             break
-        case let .reconnecting(_, attempt, maxAttempts, reason, _):
+        case let .reconnecting(_, attempt, maxAttempts, reason, _, _):
             values["attempt"] = attempt
             values["maxAttempts"] = maxAttempts
             values["reason"] = reason
-        case let .reconnected(_, attempt, _):
+        case let .reconnected(_, attempt, _, _):
             values["attempt"] = attempt
-        case let .reconnectFailed(_, maxAttempts, _):
+        case let .reconnectFailed(_, maxAttempts, _, _):
             values["maxAttempts"] = maxAttempts
-        case let .error(_, errorDetails, _):
+        case let .error(_, errorDetails, _, _):
             values["errorDetails"] = errorDetails
-        case let .snapshot(_, streaming, reconnecting, _, attempt, _):
+        case let .snapshot(_, streaming, reconnecting, _, attempt, _, _):
             values["streaming"] = streaming
             values["reconnecting"] = reconnecting
             if let attempt {
@@ -390,6 +580,10 @@ public struct StreamStatusEvent: CustomStringConvertible {
         status.streamId
     }
 
+    public var resolvedConfig: StreamResolvedConfig? {
+        status.resolvedConfig
+    }
+
     public var values: [String: Any] {
         var values = status.values
         values["type"] = "stream_status"

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
+        compress: String?, flash: Bool, sound: Bool, exposureTimeNs: Double?, iso: Int?
     )
     func startStream(_ message: [String: Any])
     func stopStream()
@@ -153,8 +153,8 @@ extension ControllerManager {
         DeviceStore.shared.get("glasses", "micEnabled") as? Bool ?? false
     }
 
-    var vadEnabled: Bool {
-        DeviceStore.shared.get("glasses", "vadEnabled") as? Bool ?? false
+    var voiceActivityDetectionEnabled: Bool {
+        DeviceStore.shared.get("glasses", "voiceActivityDetectionEnabled") as? Bool ?? true
     }
 
     var batteryLevel: Int {

package/ios/Source/controllers/R1.swift

@@ -499,11 +499,14 @@ class R1: NSObject, ControllerManager {
 
     func sendIncidentId(_: String, apiBaseUrl _: String?) {}
     func setMicEnabled(_: Bool) {}
-    func sortMicRanking(list: [String]) -> [String] { return list }
+    func sortMicRanking(list: [String]) -> [String] {
+        return list
+    }
+
     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
+        compress _: String?, flash _: Bool, sound _: Bool, exposureTimeNs _: Double?, iso _: Int?
     ) {}
     func startVideoRecording(requestId _: String, save _: Bool, flash _: Bool, sound _: Bool) {}
     func stopVideoRecording(requestId _: String) {}
@@ -518,7 +521,10 @@ class R1: NSObject, ControllerManager {
     func clearDisplay() {}
     func sendTextWall(_: String) {}
     func sendDoubleTextWall(_: String, _: String) {}
-    func displayBitmap(base64ImageData _: String) async -> Bool { return false }
+    func displayBitmap(base64ImageData _: String) async -> Bool {
+        return false
+    }
+
     func showDashboard() {}
     func setDashboardPosition(_: Int, _: Int) {}
     func setHeadUpAngle(_: Int) {}

package/ios/Source/sgcs/G1.swift

@@ -278,7 +278,7 @@ class G1: NSObject, SGCManager {
 
     func requestPhoto(
         _: String, appId _: String, size _: String?, webhookUrl _: String?, authToken _: String?,
-        compress _: String?, flash _: Bool, sound _: Bool
+        compress _: String?, flash _: Bool, sound _: Bool, exposureTimeNs _: Double?, iso _: Int?
     ) {}
 
     func startStream(_: [String: Any]) {}
@@ -1813,7 +1813,8 @@ extension G1 {
         ctx.draw(cgImage, in: CGRect(x: offsetX, y: offsetY, width: scaledW, height: scaledH))
 
         guard let renderedImage = ctx.makeImage(),
-              let pixels = renderedImage.dataProvider?.data as Data? else {
+              let pixels = renderedImage.dataProvider?.data as Data?
+        else {
             Bridge.log("G1: convertToG1Bmp - failed to get pixel data")
             return nil
         }
@@ -1850,9 +1851,9 @@ extension G1 {
         bmp.append(contentsOf: [0xFF, 0xFF, 0xFF, 0x00]) // white
 
         // Pixel data (bottom-up row order for BMP)
-        for row in (0..<height).reversed() {
+        for row in (0 ..< height).reversed() {
             var rowData = [UInt8](repeating: 0, count: rowBytes)
-            for col in 0..<width {
+            for col in 0 ..< width {
                 let pixelIndex = row * width + col
                 let gray = pixels[pixelIndex]
                 if gray >= 128 {

package/ios/Source/sgcs/G2.swift

@@ -1454,8 +1454,7 @@ class G2: NSObject, SGCManager {
                     DeviceStore.shared.apply("glasses", "bluetoothName", btName)
                     DeviceStore.shared.apply("glasses", "deviceModel", DeviceTypes.G2)
 
-                    DeviceStore.shared.apply("glasses", "connected", true)
-                    DeviceStore.shared.apply("glasses", "fullyBooted", true)
+                    self.setFullyConnected()
 
                     // connnect a controller if we have one:
                     self.connectController()
@@ -2332,8 +2331,8 @@ class G2: NSObject, SGCManager {
             if useNativeDashboard && dashboardShowing > 0 {
                 return
             }
-            if (!pageCreated || !pageHasTextContainer) {
-                DeviceManager.shared.sendCurrentState()// should re-create the page if needed
+            if !pageCreated || !pageHasTextContainer {
+                DeviceManager.shared.sendCurrentState() // should re-create the page if needed
             }
             let msg = EvenHubProto.audioControlMessage(enable: true)
             self.sendEvenHubCommand(msg)
@@ -2648,7 +2647,7 @@ class G2: NSObject, SGCManager {
 
     func requestPhoto(
         _: String, appId _: String, size _: String?, webhookUrl _: String?, authToken _: String?,
-        compress _: String?, flash _: Bool, sound _: Bool
+        compress _: String?, flash _: Bool, sound _: Bool, exposureTimeNs _: Double?, iso _: Int?
     ) {}
     func startVideoRecording(requestId _: String, save _: Bool, flash _: Bool, sound _: Bool) {}
     func startStream(_: [String: Any]) {}
@@ -3442,7 +3441,7 @@ class G2: NSObject, SGCManager {
                 }
                 // do nothing this time since we just closed the dashboard
                 dashboardShowing -= 1
-                if (dashboardShowing < 0) {
+                if dashboardShowing < 0 {
                     dashboardShowing = 0
                 }
             }

package/ios/Source/sgcs/Mach1.swift

@@ -17,7 +17,7 @@ class Mach1: UltraliteBaseViewController, SGCManager {
 
     func requestPhoto(
         _: String, appId _: String, size _: String?, webhookUrl _: String?, authToken _: String?,
-        compress _: String?, flash _: Bool, sound _: Bool
+        compress _: String?, flash _: Bool, sound _: Bool, exposureTimeNs _: Double?, iso _: Int?
     ) {}
 
     func sendGalleryMode() {}