@mentra/bluetooth-sdk 0.1.21-beta.2 → 0.1.21-beta.5

package/README.md

@@ -158,7 +158,7 @@ enterprise device deployments:
 
 - `bluetooth_sdk_started`: sent once per app runtime after the native SDK starts.
 - `bluetooth_sdk_glasses_connected`: sent when SDK status transitions from not connected to connected.
-- `bluetooth_sdk_glasses_identified`: sent once per connection after the SDK receives a valid manufacturing serial from the glasses. This fires for every supported model that reports a serial. G1 and Ar99 decode the serial from the glasses' BLE advertisement, so they emit this event as soon as this SDK version ships. Mentra Live instead reports the serial provisioned in BES NV storage, which requires compatible BES firmware and `asg_client` software.
+- `bluetooth_sdk_glasses_identified`: sent once per connection after the SDK receives a valid manufacturing serial from the glasses. This fires for every supported model that reports a serial. G1 and Ar99 decode the serial from the glasses' BLE advertisement. Mentra Live reports the product serial provisioned by its Android firmware through `asg_client`.
 
 Analytics delivery is fire-and-forget: events are submitted asynchronously, do
 not block Bluetooth SDK behavior, and are not retried if delivery fails.

package/android/src/main/java/com/mentra/bluetoothsdk/DeviceManager.kt

@@ -948,15 +948,20 @@ class DeviceManager {
 
         when (currentViewState.layoutType) {
             "text_wall" -> {
-                sgc?.sendTextWall(currentViewState.text)
+                sgc?.sendTextWall(parsePlaceholders(currentViewState.text))
             }
 
             "double_text_wall" -> {
-                sgc?.sendDoubleTextWall(currentViewState.topText, currentViewState.bottomText)
+                sgc?.sendDoubleTextWall(
+                    parsePlaceholders(currentViewState.topText),
+                    parsePlaceholders(currentViewState.bottomText)
+                )
             }
 
             "reference_card" -> {
-                sgc?.sendTextWall("${currentViewState.title}\n\n${currentViewState.text}")
+                val title = parsePlaceholders(currentViewState.title)
+                val text = parsePlaceholders(currentViewState.text)
+                sgc?.sendTextWall("$title\n\n$text")
             }
 
             "bitmap_view" -> {
@@ -973,7 +978,7 @@ class DeviceManager {
 
             "positioned_text" -> {
                 sgc?.sendPositionedText(
-                    currentViewState.text,
+                    parsePlaceholders(currentViewState.text),
                     currentViewState.bmpX ?: 0,
                     currentViewState.bmpY ?: 0,
                     currentViewState.bmpWidth ?: 576,
@@ -994,6 +999,8 @@ class DeviceManager {
     }
 
     private fun parsePlaceholders(text: String): String {
+        if (!text.contains('$')) return text
+
         val dateFormatter = SimpleDateFormat("M/dd, h:mm", Locale.getDefault())
         val formattedDate = dateFormatter.format(Date())
 
@@ -2050,11 +2057,13 @@ class DeviceManager {
         shouldSendBootingMessage = true // Reset for next first connect
         // clear glasses properties:
         DeviceStore.apply("glasses", "deviceModel", "")
-        // A manufacturing serial is session-bound. Clear it on every disconnect so a
-        // previously connected pair's serial can never be reported for the next
-        // connection (e.g. switching from G1/Ar99, which populate it from the
-        // advertisement, to a model that never writes it, like G2).
+        // Device identifiers are session-bound. Clear them on every disconnect so a
+        // previously connected pair can never be reported for the next connection.
         DeviceStore.apply("glasses", "serialNumber", "")
+        DeviceStore.apply("glasses", "bluetoothMacAddress", "")
+        DeviceStore.apply("glasses", "leftMacAddress", "")
+        DeviceStore.apply("glasses", "rightMacAddress", "")
+        DeviceStore.apply("glasses", "macAddress", "")
         DeviceStore.apply("glasses", "fullyBooted", false)
         DeviceStore.apply("glasses", "connected", false)
         DeviceStore.apply(
@@ -2164,4 +2173,3 @@ class DeviceManager {
         }
     }
 }
-

package/android/src/main/java/com/mentra/bluetoothsdk/DeviceStore.kt

@@ -73,6 +73,10 @@ object DeviceStore {
         store.set("glasses", "caseCharging", false)
         store.set("glasses", "caseBatteryLevel", -1)
         store.set("glasses", "headUp", false)
+        store.set("glasses", "bluetoothMacAddress", "")
+        store.set("glasses", "leftMacAddress", "")
+        store.set("glasses", "rightMacAddress", "")
+        store.set("glasses", "macAddress", "")
         store.set("glasses", "serialNumber", "")
         store.set("glasses", "style", "")
         store.set("glasses", "color", "")

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

@@ -0,0 +1,49 @@
+package com.mentra.bluetoothsdk.sgcs
+
+import java.util.Locale
+
+/**
+ * Temporarily suppresses phone heartbeats while BES OTA owns the ASG-to-BES UART.
+ *
+ * The lease is renewable so a lost terminal status cannot disable heartbeats permanently. It is
+ * deliberately longer than ASG's 30-second BES response watchdog: after the lease expires, the
+ * raw transfer has already completed or failed and ordinary UART liveness traffic is safe again.
+ */
+internal class BesOtaHeartbeatGuard(
+    private val leaseDurationMs: Long = DEFAULT_LEASE_DURATION_MS,
+) {
+    @Volatile private var suppressionDeadlineMs = 0L
+
+    init {
+        require(leaseDurationMs > 0) { "leaseDurationMs must be positive" }
+    }
+
+    fun refresh(nowMs: Long) {
+        suppressionDeadlineMs =
+            if (nowMs > Long.MAX_VALUE - leaseDurationMs) Long.MAX_VALUE
+            else nowMs + leaseDurationMs
+    }
+
+    fun clear() {
+        suppressionDeadlineMs = 0L
+    }
+
+    fun observeOtaStatus(stepType: String, phase: String, status: String, nowMs: Long) {
+        if (!stepType.equals("bes", ignoreCase = true) ||
+            !phase.equals("install", ignoreCase = true)
+        ) {
+            return
+        }
+
+        when (status.lowercase(Locale.US)) {
+            "failed", "complete", "step_complete", "finished", "success" -> clear()
+            else -> refresh(nowMs)
+        }
+    }
+
+    fun shouldSuppress(nowMs: Long): Boolean = nowMs < suppressionDeadlineMs
+
+    companion object {
+        internal const val DEFAULT_LEASE_DURATION_MS = 120_000L
+    }
+}

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

@@ -0,0 +1,27 @@
+package com.mentra.bluetoothsdk.sgcs
+
+internal data class BesOtaProgressMapping(
+    val status: String,
+    val progress: Int,
+    val errorMessage: String? = null,
+)
+
+/** Map the BES sr_adota protocol without inferring terminal state from transfer progress. */
+internal fun mapBesOtaProgress(
+    type: String,
+    rawProgress: Int,
+    message: String?,
+): BesOtaProgressMapping {
+    val roundedProgress = (((rawProgress.coerceIn(0, 100) + 2) / 5) * 5).coerceAtMost(100)
+    return when {
+        type == "success" -> BesOtaProgressMapping("FINISHED", 100)
+        type == "error" || type == "fail" ->
+            BesOtaProgressMapping(
+                "FAILED",
+                roundedProgress,
+                message?.takeIf { it.isNotBlank() } ?: "BES update failed",
+            )
+        // A raw update:100 is emitted before whole-image CRC/apply and is not terminal.
+        else -> BesOtaProgressMapping("PROGRESS", minOf(roundedProgress, 95))
+    }
+}