@glassly/bluetooth-sdk 0.1.0-dev.102 → 0.1.0-dev.103

package/android/src/main/java/com/glassly/bluetoothsdk/GeneratedReleaseMetadata.kt

@@ -3,9 +3,9 @@ package com.glassly.bluetoothsdk
 /** Generated by release CI. Do not edit in a release checkout. */
 internal object GeneratedReleaseMetadata {
     const val FAMILY_BASE_VERSION: String = "0.1.0"
-    const val RELEASE_IDENTITY: String = "0.1.0-dev.102"
-    const val RELEASE_SET_ID: String = "glassly-0.1.0-dev.102"
-    const val SOURCE_COMMIT: String = "25f1ae8ddfcd46216e222643d54f498d21e01d59"
+    const val RELEASE_IDENTITY: String = "0.1.0-dev.103"
+    const val RELEASE_SET_ID: String = "glassly-0.1.0-dev.103"
+    const val SOURCE_COMMIT: String = "ba3c3655d8255014fc9292896ef73dd34f12afff"
     const val OTA_MANIFEST_URL: String = ""
     const val OTA_MANIFEST_SHA256: String = ""
 }

package/android/src/main/java/com/glassly/bluetoothsdk/sgcs/G2.kt

@@ -1734,9 +1734,9 @@ class G2 : SGCManager() {
     private var recoveryInFlight = false
     private var lastRecoveryRebuildMs: Long = 0
     private val RECOVERY_DEBOUNCE_MS: Long = 1500
-    // Debug hold (dbg1/dbg2): page rebuilds, fbguard lease and CFW frames stay
-    // down so the stock UI can be exercised without EvenHub sends interfering.
-    @Volatile private var debugPageHold = false
+    // Stock notifications panel hold: page rebuilds, fbguard lease and CFW frames stay
+    // down while the panel opens so EvenHub sends cannot snatch the screen back.
+    @Volatile private var notificationsPanelHold = false
 
     // Dashboard menu state
     private var menuAppIdToPackageName: MutableMap<Int, String> = mutableMapOf()
@@ -2889,7 +2889,7 @@ class G2 : SGCManager() {
     /** Install the single carrier and render the whole scene through CFW mode 3. */
     private suspend fun applyCfwScene(frame: SceneFrame) {
         // Held: retain the frame so the post-hold rebuild re-sends it, but paint nothing now.
-        if (debugPageHold) {
+        if (notificationsPanelHold) {
             cfwLastFrame = frame
             return
         }
@@ -2974,7 +2974,7 @@ class G2 : SGCManager() {
      * under a preserved direct frame.
      */
     private fun startFbLease() {
-        if (fbLeaseJob != null || debugPageHold) return
+        if (fbLeaseJob != null || notificationsPanelHold) return
         sendFaceclawFbControl(acquire = true)
         fbLeaseJob =
             displayScope.launch {
@@ -3664,8 +3664,8 @@ class G2 : SGCManager() {
             Bridge.log("G2: rebuildState() skipped — navigation mode owns the screen")
             return
         }
-        if (debugPageHold) {
-            Bridge.log("G2: rebuildState() skipped — debug page hold (dbg1)")
+        if (notificationsPanelHold) {
+            Bridge.log("G2: rebuildState() skipped — notifications panel hold")
             return
         }
         Bridge.log("G2: rebuildState()")
@@ -4186,9 +4186,20 @@ class G2 : SGCManager() {
      *   3. SKILL{skillId=NOTIFICATION, skillParam=show, ...} — dispatches the intent
      * The SKILL step alone is ignored by firmware; the preceding ENTER+ASK
      * supply the session context that lets the glasses act on the SKILL.
+     * Our EvenHub page is torn down first and every path that would bring it
+     * back (recovery rebuilds, fbguard lease, CFW frames, mic re-arm) is held
+     * for 3 s, or the sends race the stock panel for the screen.
      */
     override suspend fun showNotificationsPanel() {
         Bridge.log("G2: showNotificationsPanel()")
+
+        notificationsPanelHold = true
+        stopFbLease(sendRelease = true)
+        sendEvenHubCommand(EvenHubProto.shutdownMessage())
+        pageCreated = false
+        // Page death takes the mic with it; intent is untouched so the post-hold rebuild re-arms.
+        DeviceStore.apply("glasses", "micEnabled", false)
+
         val enterPayload = EvenAIProto.aiCtrl(
             magicRandom = sendManager.nextMagicRandom(),
             status = 2 // EVEN_AI_ENTER
@@ -4213,6 +4224,10 @@ class G2 : SGCManager() {
             fTextEnd = 1
         )
         sendEvenAICommand(skillPayload)
+
+        delay(3_000)
+        notificationsPanelHold = false
+        Bridge.log("G2: notifications resurrect re-enabled")
     }
 
     override fun setBrightness(level: Int, autoMode: Boolean) {
@@ -4527,7 +4542,7 @@ class G2 : SGCManager() {
         // off then back on (the firmware needs the off→on edge to re-arm).
         evenHubMicIntent = true
         // Held: intent is recorded; the post-hold rebuild re-arms the mic.
-        if (debugPageHold) return
+        if (notificationsPanelHold) return
         DeviceStore.apply("glasses", "micEnabled", true)
         val msg = EvenHubProto.audioControlMessage(false)
         sendEvenHubCommand(msg)
@@ -4680,7 +4695,7 @@ class G2 : SGCManager() {
         textContainers.clear()
         dashboardShowing = 0
         dashboardOpening = false
-        debugPageHold = false
+        notificationsPanelHold = false
         heartbeatCounter = 0
         currentBitmapBase64 = ""
         menuAppIdToPackageName.clear()
@@ -4727,33 +4742,9 @@ class G2 : SGCManager() {
         sendEvenHubHeartbeat()
     }
 
-    /**
-     * Tear down the EvenHub page and hold every path that would bring it back
-     * (recovery rebuilds, fbguard lease, CFW frames, mic re-arm) until [dbg2]
-     * lifts the hold. Isolates the stock notifications UI from our sends.
-     */
-    override fun dbg1() {
-        Bridge.log("G2: dbg1() — EvenHub page down, resurrect held")
-        debugPageHold = true
-        stopFbLease(sendRelease = true)
-        sendEvenHubCommand(EvenHubProto.shutdownMessage())
-        pageCreated = false
-        // Page death takes the mic with it; intent is untouched so the post-hold rebuild re-arms.
-        DeviceStore.apply("glasses", "micEnabled", false)
-    }
+    override fun dbg1() {}
 
-    /**
-     * Open the stock notifications panel, then lift the dbg1 hold 1 s later so
-     * recovery resumes on the next firmware event / pending content.
-     */
-    override fun dbg2() {
-        displayScope.launch {
-            showNotificationsPanel()
-            delay(1_000)
-            debugPageHold = false
-            Bridge.log("G2: dbg2() — resurrect re-enabled")
-        }
-    }
+    override fun dbg2() {}
 
     /** Raw wake lease start — no durable intent; a reconnect drops it. */
     override fun dbg3() {

package/build/generated/releaseMetadata.js

@@ -1,9 +1,9 @@
 export const BLUETOOTH_SDK_RELEASE_METADATA = Object.freeze({
     "schemaVersion": 1,
     "familyBaseVersion": "0.1.0",
-    "releaseIdentity": "0.1.0-dev.102",
-    "releaseSetId": "glassly-0.1.0-dev.102",
-    "sourceCommit": "25f1ae8ddfcd46216e222643d54f498d21e01d59",
+    "releaseIdentity": "0.1.0-dev.103",
+    "releaseSetId": "glassly-0.1.0-dev.103",
+    "sourceCommit": "ba3c3655d8255014fc9292896ef73dd34f12afff",
     "otaManifestUrl": null,
     "otaManifestSha256": null
 });

package/build/generated/releaseMetadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"releaseMetadata.js","sourceRoot":"","sources":["../../src/generated/releaseMetadata.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,8BAA8B,GAA0C,MAAM,CAAC,MAAM,CAAC;IACjG,eAAe,EAAE,CAAC;IAClB,mBAAmB,EAAE,OAAO;IAC5B,iBAAiB,EAAE,eAAe;IAClC,cAAc,EAAE,uBAAuB;IACvC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,IAAI;IACtB,mBAAmB,EAAE,IAAI;CAC1B,CAAC,CAAA","sourcesContent":["/** Generated by release CI. Do not edit in a release checkout. */\nexport interface BluetoothSdkReleaseMetadata {\n  schemaVersion: 1\n  familyBaseVersion: string | null\n  releaseIdentity: string | null\n  releaseSetId: string | null\n  sourceCommit: string | null\n  otaManifestUrl: string | null\n  otaManifestSha256: string | null\n}\n\nexport const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({\n  \"schemaVersion\": 1,\n  \"familyBaseVersion\": \"0.1.0\",\n  \"releaseIdentity\": \"0.1.0-dev.102\",\n  \"releaseSetId\": \"glassly-0.1.0-dev.102\",\n  \"sourceCommit\": \"25f1ae8ddfcd46216e222643d54f498d21e01d59\",\n  \"otaManifestUrl\": null,\n  \"otaManifestSha256\": null\n})\n"]}
+{"version":3,"file":"releaseMetadata.js","sourceRoot":"","sources":["../../src/generated/releaseMetadata.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,8BAA8B,GAA0C,MAAM,CAAC,MAAM,CAAC;IACjG,eAAe,EAAE,CAAC;IAClB,mBAAmB,EAAE,OAAO;IAC5B,iBAAiB,EAAE,eAAe;IAClC,cAAc,EAAE,uBAAuB;IACvC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,IAAI;IACtB,mBAAmB,EAAE,IAAI;CAC1B,CAAC,CAAA","sourcesContent":["/** Generated by release CI. Do not edit in a release checkout. */\nexport interface BluetoothSdkReleaseMetadata {\n  schemaVersion: 1\n  familyBaseVersion: string | null\n  releaseIdentity: string | null\n  releaseSetId: string | null\n  sourceCommit: string | null\n  otaManifestUrl: string | null\n  otaManifestSha256: string | null\n}\n\nexport const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({\n  \"schemaVersion\": 1,\n  \"familyBaseVersion\": \"0.1.0\",\n  \"releaseIdentity\": \"0.1.0-dev.103\",\n  \"releaseSetId\": \"glassly-0.1.0-dev.103\",\n  \"sourceCommit\": \"ba3c3655d8255014fc9292896ef73dd34f12afff\",\n  \"otaManifestUrl\": null,\n  \"otaManifestSha256\": null\n})\n"]}

package/ios/BluetoothSdkModule.swift

@@ -61,6 +61,7 @@ public class BluetoothSdkModule: Module, BluetoothSDKDelegate {
             "speaker_enroll_result",
             "phone_notification",
             "phone_notification_dismissed",
+            "notification_app_seen",
             "ws_text",
             "ws_bin",
             "mic_pcm",

package/ios/Source/BluetoothSdkDefaults.swift

@@ -11,7 +11,7 @@ enum BluetoothSdkDefaults {
     static let voiceActivityDetectionEnabled = false
     static let loudnessGateEnabled = true
     private static let infoSdkVersionKey = "BluetoothSdkVersion"
-    private static let swiftPackageSdkVersion = "0.1.0-dev.102"
+    private static let swiftPackageSdkVersion = "0.1.0-dev.103"
     private static let swiftPackageSdkVersionPlaceholder = "__GLASSLY" + "_BLUETOOTH_SDK_VERSION__"
 
     private static func normalizedSdkVersion(_ value: String?) -> String? {

package/ios/Source/GeneratedReleaseMetadata.swift

@@ -3,9 +3,9 @@ import Foundation
 /// Generated by release CI. Do not edit in a release checkout.
 enum GeneratedReleaseMetadata {
     static let familyBaseVersion = "0.1.0"
-    static let releaseIdentity = "0.1.0-dev.102"
-    static let releaseSetId = "glassly-0.1.0-dev.102"
-    static let sourceCommit = "25f1ae8ddfcd46216e222643d54f498d21e01d59"
+    static let releaseIdentity = "0.1.0-dev.103"
+    static let releaseSetId = "glassly-0.1.0-dev.103"
+    static let sourceCommit = "ba3c3655d8255014fc9292896ef73dd34f12afff"
     static let otaManifestUrl = ""
     static let otaManifestSha256 = ""
 }

package/ios/Source/ObservableStore.swift

@@ -106,13 +106,26 @@ class ObservableStore {
         if let l = lhs as? Double, let r = rhs as? Double { return l == r }
         if let l = lhs as? [String], let r = rhs as? [String] { return l == r }
         if let l = lhs as? [[String: Any]], let r = rhs as? [[String: Any]] {
-            return toJson(l) == toJson(r)
+            return jsonEqual(l, r)
+        }
+        // Dict-valued settings (notification_ctrl / notification_filter) — without this every
+        // apply re-fires the subscriber, e.g. a full whitelist file push to both arms.
+        if let l = lhs as? [String: Any], let r = rhs as? [String: Any] {
+            return jsonEqual(l, r)
         }
         return false
     }
 
+    /// Unserializable on either side is "changed" — nil == nil must not read as equal.
+    private func jsonEqual(_ lhs: Any, _ rhs: Any) -> Bool {
+        guard let l = toJson(lhs), let r = toJson(rhs) else { return false }
+        return l == r
+    }
+
     private func toJson(_ value: Any) -> String? {
-        guard let data = try? JSONSerialization.data(withJSONObject: value) else { return nil }
+        guard JSONSerialization.isValidJSONObject(value),
+              let data = try? JSONSerialization.data(withJSONObject: value, options: [.sortedKeys])
+        else { return nil }
         return String(data: data, encoding: .utf8)
     }
 }

package/ios/Source/sgcs/G2.swift

@@ -1841,9 +1841,9 @@ final class G2: NSObject, SGCManager {
     private var recoveryInFlight = false
     private var lastRecoveryRebuildMs: Int64 = 0
     private let RECOVERY_DEBOUNCE_MS: Int64 = 1500
-    // Debug hold (dbg1/dbg2): page rebuilds, fbguard lease and CFW frames stay
-    // down so the stock UI can be exercised without EvenHub sends interfering.
-    private var debugPageHold = false
+    // Stock notifications panel hold: page rebuilds, fbguard lease and CFW frames stay
+    // down while the panel opens so EvenHub sends cannot snatch the screen back.
+    private var notificationsPanelHold = false
     // A systemExit that arrives while the page acked a carrier fragment this
     // recently is a phantom (the firmware emits exits even for healthy pages)
     // and is dropped entirely — see the SysEvent handler.
@@ -2582,7 +2582,8 @@ final class G2: NSObject, SGCManager {
         let ctrl = DeviceStore.shared.get("bluetooth", "notification_ctrl") as? [String: Any] ?? [:]
         let enabled = ctrl["enabled"] as? Bool ?? true
         let autoDisplay = ctrl["auto_display"] as? Bool ?? true
-        let dispTime = ctrl["disp_time"] as? Int ?? 5
+        // Nested numbers cross the Expo bridge as Double; `as? Int` would silently fall back to 5.
+        let dispTime = (ctrl["disp_time"] as? NSNumber)?.intValue ?? 5
         let avoidDisturb = ctrl["avoid_disturb"] as? Bool ?? true
 
         var ctrlW = ProtobufWriter()
@@ -2623,7 +2624,14 @@ final class G2: NSObject, SGCManager {
         // The file is written even when filtering is off so a later enable
         // toggles against the user's current list, not a stale one.
         let json = G2NotifyFile.whitelistJson(filterEnabled: enabled, apps: entries)
-        await sendNotifyFile(named: G2NotifyFile.whitelistFilename, content: json)
+        let pushed = await sendNotifyFile(named: G2NotifyFile.whitelistFilename, content: json)
+        // Enabling against a list that never landed (flash in progress, file characteristic not
+        // yet discovered) would filter on whatever is on flash — absent means every notification
+        // is dropped. Leave the firmware toggle alone; device-ready re-pushes the whole config.
+        if enabled, !pushed {
+            Bridge.log("G2: notification filter enable deferred — whitelist file not pushed")
+            return
+        }
 
         var wlW = ProtobufWriter()
         wlW.writeInt32Field(1, enabled ? 0 : 1) // whitelistDisable (disabled = fail-open)
@@ -2639,14 +2647,20 @@ final class G2: NSObject, SGCManager {
     /// characteristic): FILE_CHECK header → START → DATA → END, per arm. The
     /// glasses cache by checksum but still expect the data packets either way,
     /// so no branching on the CACHE_HIT/MISS response is needed.
-    private func sendNotifyFile(named filename: String, content: Data) async {
-        guard !firmwareFlashLifecycleActive, !firmwareFlasher.isActive else { return }
+    /// Returns false when the file was skipped for any connected arm (flash in
+    /// progress, file characteristic not discovered) so callers don't act on it.
+    @discardableResult
+    private func sendNotifyFile(named filename: String, content: Data) async -> Bool {
+        guard !firmwareFlashLifecycleActive, !firmwareFlasher.isActive else { return false }
         let header = G2NotifyFile.fileCheckHeader(filename: filename, content: content)
         var pushedSides: [String] = []
+        var skippedArm = false
         for right in [true, false] {
-            guard let peripheral = right ? rightPeripheral : leftPeripheral,
-                  let char = right ? rightFileWriteChar : leftFileWriteChar
-            else { continue }
+            guard let peripheral = right ? rightPeripheral : leftPeripheral else { continue }
+            guard let char = right ? rightFileWriteChar : leftFileWriteChar else {
+                skippedArm = true
+                continue
+            }
             let writeType: CBCharacteristicWriteType =
                 char.properties.contains(.writeWithoutResponse) ? .withoutResponse : .withResponse
 
@@ -2670,6 +2684,7 @@ final class G2: NSObject, SGCManager {
         Bridge.log(
             "G2: Pushed \(filename) (\(content.count) bytes) to [\(pushedSides.joined(separator: ","))]"
         )
+        return !pushedSides.isEmpty && !skippedArm
     }
 
     // MARK: - SGCManager: Display Control
@@ -2924,7 +2939,7 @@ final class G2: NSObject, SGCManager {
     /// `cfwLastFrame` once the new page is up.
     private func applyCfwScene(_ frame: SceneFrame) async {
         // Held: retain the frame so the post-hold rebuild re-sends it, but paint nothing now.
-        if debugPageHold {
+        if notificationsPanelHold {
             cfwLastFrame = frame
             return
         }
@@ -3001,7 +3016,7 @@ final class G2: NSObject, SGCManager {
     /// is inactive or the page went down, so a stock surface (dashboard, nav)
     /// is never frozen under a preserved direct frame.
     private func startFbLease() {
-        guard fbLeaseTask == nil, !debugPageHold else { return }
+        guard fbLeaseTask == nil, !notificationsPanelHold else { return }
         sendFaceclawFbControl(acquire: true)
         fbLeaseTask = Task { @MainActor [weak self] in
             while !Task.isCancelled {
@@ -4085,8 +4100,8 @@ final class G2: NSObject, SGCManager {
             Bridge.log("G2: rebuildState() skipped — navigation mode owns the screen")
             return
         }
-        if debugPageHold {
-            Bridge.log("G2: rebuildState() skipped — debug page hold (dbg1)")
+        if notificationsPanelHold {
+            Bridge.log("G2: rebuildState() skipped — notifications panel hold")
             return
         }
         Bridge.log("G2: rebuildState()")
@@ -4766,7 +4781,7 @@ final class G2: NSObject, SGCManager {
         // toggle it off then back on (the firmware needs the off→on edge to re-arm).
         evenHubMicIntent = true
         // Held: intent is recorded; the post-hold rebuild re-arms the mic.
-        if debugPageHold { return }
+        if notificationsPanelHold { return }
         DeviceStore.shared.apply("glasses", "micEnabled", true)
         let msg = EvenHubProto.audioControlMessage(enable: false)
         sendEvenHubCommand(msg)
@@ -4890,7 +4905,7 @@ final class G2: NSObject, SGCManager {
         stockImageStreamWarmedUp = false
         dashboardShowing = 0
         dashboardOpening = false
-        debugPageHold = false
+        notificationsPanelHold = false
         heartbeatCounter = 0
         cfwCapabilityString = nil
         cfwClassified = false
@@ -5031,9 +5046,19 @@ final class G2: NSObject, SGCManager {
     ///   3. SKILL{skillId=NOTIFICATION, skillParam=show, ...} — dispatches the intent
     /// The SKILL step alone is ignored by firmware; the preceding ENTER+ASK
     /// supply the session context that lets the glasses act on the SKILL.
+    /// Our EvenHub page is torn down first and every path that would bring it
+    /// back (recovery rebuilds, fbguard lease, CFW frames, mic re-arm) is held
+    /// for 3 s, or the sends race the stock panel for the screen.
     func showNotificationsPanel() async {
         Bridge.log("G2: showNotificationsPanel()")
 
+        notificationsPanelHold = true
+        stopFbLease(sendRelease: true)
+        sendEvenHubCommand(EvenHubProto.shutdownMessage())
+        pageCreated = false
+        // Page death takes the mic with it; intent is untouched so the post-hold rebuild re-arms.
+        DeviceStore.shared.apply("glasses", "micEnabled", false)
+
         let enterPayload = EvenAIProto.aiCtrl(
             magicRandom: sendManager.nextMagicRandom(),
             status: 2 // EVEN_AI_ENTER
@@ -5054,32 +5079,15 @@ final class G2: NSObject, SGCManager {
             text: " ",
             streamEnable: 1, fTextEnd: 1
         )
-    }
 
-    /// Tear down the EvenHub page and hold every path that would bring it
-    /// back (recovery rebuilds, fbguard lease, CFW frames, mic re-arm) until
-    /// `dbg2` lifts the hold. Isolates the stock notifications UI from our sends.
-    func dbg1() {
-        Bridge.log("G2: dbg1() — EvenHub page down, resurrect held")
-        debugPageHold = true
-        stopFbLease(sendRelease: true)
-        sendEvenHubCommand(EvenHubProto.shutdownMessage())
-        pageCreated = false
-        // Page death takes the mic with it; intent is untouched so the post-hold rebuild re-arms.
-        DeviceStore.shared.apply("glasses", "micEnabled", false)
+        try? await Task.sleep(nanoseconds: 3_000_000_000)
+        notificationsPanelHold = false
+        Bridge.log("G2: notifications resurrect re-enabled")
     }
 
-    /// Open the stock notifications panel, then lift the dbg1 hold 1 s later
-    /// so recovery resumes on the next firmware event / pending content.
-    func dbg2() {
-        Task { [weak self] in
-            await self?.showNotificationsPanel()
-            try? await Task.sleep(nanoseconds: 1_000_000_000)
-            guard let self else { return }
-            self.debugPageHold = false
-            Bridge.log("G2: dbg2() — resurrect re-enabled")
-        }
-    }
+    func dbg1() {}
+
+    func dbg2() {}
 
     /// Raw wake lease start — no durable intent; a reconnect drops it.
     func dbg3() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glassly/bluetooth-sdk",
-  "version": "0.1.0-dev.102",
+  "version": "0.1.0-dev.103",
   "description": "SDK for communicating with smart glasses",
   "main": "build/index.js",
   "react-native": "src/index.ts",

package/src/generated/releaseMetadata.ts

@@ -12,9 +12,9 @@ export interface BluetoothSdkReleaseMetadata {
 export const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({
   "schemaVersion": 1,
   "familyBaseVersion": "0.1.0",
-  "releaseIdentity": "0.1.0-dev.102",
-  "releaseSetId": "glassly-0.1.0-dev.102",
-  "sourceCommit": "25f1ae8ddfcd46216e222643d54f498d21e01d59",
+  "releaseIdentity": "0.1.0-dev.103",
+  "releaseSetId": "glassly-0.1.0-dev.103",
+  "sourceCommit": "ba3c3655d8255014fc9292896ef73dd34f12afff",
   "otaManifestUrl": null,
   "otaManifestSha256": null
 })