@mentra/bluetooth-sdk 0.1.13 → 0.1.16

package/android/src/main/java/com/mentra/bluetoothsdk/sgcs/SGCManager.kt

@@ -20,7 +20,7 @@ abstract class SGCManager {
     abstract fun startStream(message: MutableMap<String, Any>)
     abstract fun stopStream()
     abstract fun sendStreamKeepAlive(message: MutableMap<String, Any>)
-    abstract fun startVideoRecording(requestId: String, save: Boolean, flash: Boolean, sound: Boolean)
+    abstract fun startVideoRecording(requestId: String, save: Boolean, sound: Boolean)
 
     /**
      * Start video recording with optional per-recording resolution/fps. A width,
@@ -32,14 +32,13 @@ abstract class SGCManager {
     open fun startVideoRecording(
         requestId: String,
         save: Boolean,
-        flash: Boolean,
         sound: Boolean,
         width: Int,
         height: Int,
         fps: Int,
         maxRecordingTimeMinutes: Int,
     ) {
-        startVideoRecording(requestId, save, flash, sound)
+        startVideoRecording(requestId, save, sound)
     }
 
     abstract fun stopVideoRecording(requestId: String)
@@ -59,7 +58,6 @@ abstract class SGCManager {
     abstract fun sendButtonPhotoSettings()
     abstract fun sendButtonVideoRecordingSettings()
     abstract fun sendButtonMaxRecordingTime()
-    abstract fun sendButtonCameraLedSetting()
     abstract fun sendCameraFovSetting()
 
     // Display Control
@@ -79,6 +77,20 @@ abstract class SGCManager {
             width: Int? = null,
             height: Int? = null
     ): Boolean
+
+    /**
+     * Show text in a positioned container with an optional rounded border.
+     * G2-only capability; default no-op so other glasses ignore it.
+     */
+    open fun sendPositionedText(
+            text: String,
+            x: Int,
+            y: Int,
+            width: Int,
+            height: Int,
+            borderWidth: Int = 0,
+            borderRadius: Int = 0
+    ) {}
     abstract fun showDashboard()
     abstract fun setDashboardPosition(height: Int, depth: Int)
 
@@ -173,7 +185,7 @@ abstract class SGCManager {
     // Voice Activity Detection
     open fun sendVoiceActivityDetectionSetting() {}
 
-    // Start/stop LC3 audio playback from glasses based on the nex_audio_playback flag.
+    // Start/stop LC3 audio playback from glasses based on the nex_lc3_audio_playback flag.
     open fun applyNexAudioPlaybackSetting() {}
 
     // Version info

package/android/src/main/java/com/mentra/bluetoothsdk/sgcs/Simulated.kt

@@ -34,7 +34,7 @@ class Simulated : SGCManager() {
 
     // Camera & Media
     override fun requestPhoto(request: PhotoRequest) {
-        Bridge.log("requestPhoto flash=${request.flash}, save=${request.save}, sound=${request.sound}")
+        Bridge.log("requestPhoto save=${request.save}, sound=${request.sound}")
     }
 
     override fun startStream(message: MutableMap<String, Any>) {
@@ -49,8 +49,8 @@ class Simulated : SGCManager() {
         Bridge.log("sendStreamKeepAlive")
     }
 
-    override fun startVideoRecording(requestId: String, save: Boolean, flash: Boolean, sound: Boolean) {
-        Bridge.log("startVideoRecording flash=$flash, sound=$sound")
+    override fun startVideoRecording(requestId: String, save: Boolean, sound: Boolean) {
+        Bridge.log("startVideoRecording sound=$sound")
     }
 
     override fun stopVideoRecording(requestId: String) {
@@ -70,10 +70,6 @@ class Simulated : SGCManager() {
         Bridge.log("sendButtonMaxRecordingTime")
     }
 
-    override fun sendButtonCameraLedSetting() {
-        Bridge.log("sendButtonCameraLedSetting")
-    }
-
     override fun sendCameraFovSetting() {
         Bridge.log("sendCameraFovSetting")
     }

package/android/src/main/java/com/mentra/bluetoothsdk/status/DeviceStatus.kt

@@ -248,7 +248,6 @@ internal data class BluetoothStatus(
     val contextualDashboard: Boolean,
     val galleryModeEnabled: Boolean,
     val buttonPhotoSize: ButtonPhotoSize,
-    val buttonCameraLed: Boolean,
     val buttonMaxRecordingTime: Int,
     val buttonVideoWidth: Int,
     val buttonVideoHeight: Int,
@@ -301,7 +300,6 @@ internal data class BluetoothStatus(
             "contextual_dashboard" to contextualDashboard,
             "galleryModeEnabled" to galleryModeEnabled,
             "button_photo_size" to buttonPhotoSize.value,
-            "button_camera_led" to buttonCameraLed,
             "button_max_recording_time" to buttonMaxRecordingTime,
             "button_video_width" to buttonVideoWidth,
             "button_video_height" to buttonVideoHeight,
@@ -349,7 +347,6 @@ internal data class BluetoothStatus(
                 galleryModeEnabled =
                     boolValue(values, "gallery_mode") ?: boolValue(values, "galleryModeEnabled") ?: true,
                 buttonPhotoSize = ButtonPhotoSize.fromValue(stringValue(values, "button_photo_size")),
-                buttonCameraLed = boolValue(values, "button_camera_led") ?: true,
                 buttonMaxRecordingTime = numberValue(values, "button_max_recording_time") ?: 10,
                 buttonVideoWidth = numberValue(values, "button_video_width") ?: 1280,
                 buttonVideoHeight = numberValue(values, "button_video_height") ?: 720,
@@ -554,7 +551,6 @@ internal data class BluetoothStatusUpdate(
     val contextualDashboard: Boolean? = null,
     val galleryModeEnabled: Boolean? = null,
     val buttonPhotoSize: ButtonPhotoSize? = null,
-    val buttonCameraLed: Boolean? = null,
     val buttonMaxRecordingTime: Int? = null,
     val buttonVideoWidth: Int? = null,
     val buttonVideoHeight: Int? = null,
@@ -597,7 +593,6 @@ internal data class BluetoothStatusUpdate(
             putIfNotNull("contextual_dashboard", contextualDashboard)
             putIfNotNull("galleryModeEnabled", galleryModeEnabled)
             buttonPhotoSize?.let { put("button_photo_size", it.value) }
-            putIfNotNull("button_camera_led", buttonCameraLed)
             putIfNotNull("button_max_recording_time", buttonMaxRecordingTime)
             putIfNotNull("button_video_width", buttonVideoWidth)
             putIfNotNull("button_video_height", buttonVideoHeight)
@@ -648,7 +643,6 @@ internal data class BluetoothStatusUpdate(
                     optionalBoolValue(values, "gallery_mode") ?: optionalBoolValue(values, "galleryModeEnabled"),
                 buttonPhotoSize =
                     optionalStringValue(values, "button_photo_size")?.let(ButtonPhotoSize::fromValue),
-                buttonCameraLed = optionalBoolValue(values, "button_camera_led"),
                 buttonMaxRecordingTime = optionalNumberValue(values, "button_max_recording_time"),
                 buttonVideoWidth = optionalNumberValue(values, "button_video_width"),
                 buttonVideoHeight = optionalNumberValue(values, "button_video_height"),

package/android/src/main/java/com/mentra/bluetoothsdk/streaming/StreamModels.kt

@@ -11,6 +11,7 @@ data class StreamVideoConfig @JvmOverloads constructor(
             width?.let { "width" to it },
             height?.let { "height" to it },
             bitrate?.let { "bitrate" to it },
+            // ASG stream parsers shipped with the BLE key named "frameRate".
             fps?.let { "frameRate" to it },
         ).toMap()
 
@@ -170,28 +171,19 @@ data class StreamResolvedConfig @JvmOverloads constructor(
 data class StreamRequest @JvmOverloads constructor(
     val streamUrl: String,
     val streamId: String = "",
-    val keepAlive: Boolean = true,
-    val keepAliveIntervalSeconds: Int = 5,
     val sound: Boolean = true,
     val video: StreamVideoConfig? = null,
     val audio: StreamAudioConfig? = null,
-    val extraValues: Map<String, Any> = emptyMap(),
 ) {
-    fun toMap(): Map<String, Any> {
-        val values = extraValues.toMutableMap()
-        values.remove("keepAliveMode")
-        values["type"] = "start_stream"
-        values["streamUrl"] = streamUrl
-        values["streamId"] = streamId
-        values["keepAlive"] = keepAlive
-        values["keepAliveIntervalSeconds"] = keepAliveIntervalSeconds
-        // The camera light is a privacy indicator and cannot be disabled by SDK callers.
-        values["flash"] = true
-        values["sound"] = sound
-        video?.toMap()?.takeIf { it.isNotEmpty() }?.let { values["video"] = it }
-        audio?.toMap()?.takeIf { it.isNotEmpty() }?.let { values["audio"] = it }
-        return values
-    }
+    fun toMap(): Map<String, Any> =
+        buildMap {
+            put("type", "start_stream")
+            put("streamUrl", streamUrl)
+            put("streamId", streamId)
+            put("sound", sound)
+            video?.toMap()?.takeIf { it.isNotEmpty() }?.let { put("video", it) }
+            audio?.toMap()?.takeIf { it.isNotEmpty() }?.let { put("audio", it) }
+        }
 
     companion object {
         @JvmStatic
@@ -201,31 +193,23 @@ data class StreamRequest @JvmOverloads constructor(
                     (values["streamUrl"] ?: values["rtmpUrl"] ?: values["srtUrl"] ?: values["whipUrl"]) as? String
                         ?: "",
                 streamId = values["streamId"] as? String ?: "",
-                keepAlive = values["keepAlive"] as? Boolean ?: true,
-                keepAliveIntervalSeconds = (values["keepAliveIntervalSeconds"] as? Number)?.toInt() ?: 5,
                 sound = values["sound"] as? Boolean ?: true,
                 video = StreamVideoConfig.fromMap(stringMapValue(values["video"])),
                 audio = StreamAudioConfig.fromMap(stringMapValue(values["audio"])),
-                extraValues = values,
             )
     }
 }
 
-internal fun StreamRequest.isExternallyManagedKeepAlive(): Boolean =
-    stringValue(extraValues, "keepAliveMode") == "external"
-
 internal data class StreamKeepAliveRequest @JvmOverloads constructor(
     val streamId: String,
     val ackId: String,
-    val extraValues: Map<String, Any> = emptyMap(),
 ) {
-    fun toMap(): Map<String, Any> {
-        val values = extraValues.toMutableMap()
-        values["type"] = "keep_stream_alive"
-        values["streamId"] = streamId
-        values["ackId"] = ackId
-        return values
-    }
+    fun toMap(): Map<String, Any> =
+        mapOf(
+            "type" to "keep_stream_alive",
+            "streamId" to streamId,
+            "ackId" to ackId,
+        )
 
     companion object {
         @JvmStatic
@@ -233,7 +217,6 @@ internal data class StreamKeepAliveRequest @JvmOverloads constructor(
             StreamKeepAliveRequest(
                 streamId = values["streamId"] as? String ?: "",
                 ackId = values["ackId"] as? String ?: "",
-                extraValues = values,
             )
     }
 }

package/android/src/main/java/com/mentra/bluetoothsdk/types/DeviceModels.kt

@@ -2,17 +2,18 @@ package com.mentra.bluetoothsdk
 
 import com.mentra.bluetoothsdk.utils.ControllerTypes
 import com.mentra.bluetoothsdk.utils.DeviceTypes
+import expo.modules.kotlin.exception.CodedException
 
 data class MentraBluetoothSdkConfig @JvmOverloads constructor(
     val deliverCallbacksOnMainThread: Boolean = true,
     val analytics: BluetoothSdkAnalyticsConfig = BluetoothSdkAnalyticsConfig(),
 )
 
-class BluetoothException(
-    val code: String,
+class BluetoothSdkException(
+    code: String,
     message: String,
     cause: Throwable? = null,
-) : IllegalStateException(message, cause)
+) : CodedException(code, message, cause)
 
 enum class DeviceModel(val deviceType: String) {
     G1(DeviceTypes.G1),
@@ -22,6 +23,7 @@ enum class DeviceModel(val deviceType: String) {
     MACH1(DeviceTypes.MACH1),
     Z100(DeviceTypes.Z100),
     FRAME(DeviceTypes.FRAME),
+    NIMO(DeviceTypes.NIMO),
     SIMULATED(DeviceTypes.SIMULATED),
     R1(ControllerTypes.R1);
 

package/android/src/main/java/com/mentra/bluetoothsdk/utils/Constants.kt

@@ -9,7 +9,8 @@ object DeviceTypes {
     const val Z100 = "Vuzix Z100"
     const val FRAME = "Brilliant Frame"
     const val G2 = "Even Realities G2"
-    val ALL = arrayOf(SIMULATED, G1, G2, MACH1, LIVE, Z100, FRAME, NEX)
+    const val NIMO = "NIMO"
+    val ALL = arrayOf(SIMULATED, G1, G2, MACH1, LIVE, Z100, FRAME, NEX, NIMO)
 }
 
 object ControllerTypes {

package/android/src/test/java/com/mentra/bluetoothsdk/camera/PhotoRequestTest.kt

@@ -1,16 +1,33 @@
 package com.mentra.bluetoothsdk.camera
 
+import com.mentra.bluetoothsdk.PhotoCompression
+import com.mentra.bluetoothsdk.PhotoRequest
+import com.mentra.bluetoothsdk.PhotoSize
 import kotlin.test.Test
+import kotlin.test.assertEquals
 import kotlin.test.assertNull
+import kotlin.test.assertTrue
 
 class PhotoRequestTest {
+    @Test
+    fun `constructor generates requestId when omitted`() {
+        val request =
+            PhotoRequest(
+                size = PhotoSize.MEDIUM,
+                webhookUrl = "https://example.com/upload",
+                compress = PhotoCompression.NONE,
+                sound = true,
+            )
+
+        assertTrue(request.requestId.startsWith("photo-"))
+    }
+
     @Test
     fun `fromMap defaults exposureTimeNs null`() {
         val request =
             PhotoRequest.fromMap(
                 mapOf(
                     "requestId" to "photo-1",
-                    "appId" to "com.test.app",
                     "size" to "medium",
                     "webhookUrl" to "https://example.com/upload",
                     "compress" to "none",
@@ -20,4 +37,46 @@ class PhotoRequestTest {
 
         assertNull(request.exposureTimeNs)
     }
+
+    @Test
+    fun `fromMap generates requestId when omitted or blank`() {
+        val withoutRequestId =
+            PhotoRequest.fromMap(
+                mapOf(
+                    "size" to "medium",
+                    "webhookUrl" to "https://example.com/upload",
+                    "compress" to "none",
+                    "sound" to true,
+                )
+            )
+        val blankRequestId =
+            PhotoRequest.fromMap(
+                mapOf(
+                    "requestId" to "  ",
+                    "size" to "medium",
+                    "webhookUrl" to "https://example.com/upload",
+                    "compress" to "none",
+                    "sound" to true,
+                )
+            )
+
+        assertTrue(withoutRequestId.requestId.startsWith("photo-"))
+        assertTrue(blankRequestId.requestId.startsWith("photo-"))
+    }
+
+    @Test
+    fun `fromMap preserves explicit requestId`() {
+        val request =
+            PhotoRequest.fromMap(
+                mapOf(
+                    "requestId" to "photo-1",
+                    "size" to "medium",
+                    "webhookUrl" to "https://example.com/upload",
+                    "compress" to "none",
+                    "sound" to true,
+                )
+            )
+
+        assertEquals("photo-1", request.requestId)
+    }
 }