@mentra/bluetooth-sdk 3.2.1-beta.480 → 3.2.1-beta.498

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

@@ -3,9 +3,9 @@ package com.mentra.bluetoothsdk
 /** Generated by release CI. Do not edit in a release checkout. */
 internal object GeneratedReleaseMetadata {
     const val FAMILY_BASE_VERSION: String = "3.2.1"
-    const val RELEASE_IDENTITY: String = "3.2.1-beta.480"
-    const val RELEASE_SET_ID: String = "mentra-3.2.1-beta.480"
-    const val SOURCE_COMMIT: String = "e7380c4149dfcc4bdd5d344bacede73f0a856213"
-    const val OTA_MANIFEST_URL: String = "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.2.1/mentra-live-ota-3.2.1-beta.480.json"
-    const val OTA_MANIFEST_SHA256: String = "ead3ee204d941bdcea7d77c9ea1d55324fef1328e24a272ba6cf52512a8acae8"
+    const val RELEASE_IDENTITY: String = "3.2.1-beta.498"
+    const val RELEASE_SET_ID: String = "mentra-3.2.1-beta.498"
+    const val SOURCE_COMMIT: String = "d0b2fd5a107a817c0584a590e75e9b5e2de05786"
+    const val OTA_MANIFEST_URL: String = "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.2.1/mentra-live-ota-3.2.1-beta.498.json"
+    const val OTA_MANIFEST_SHA256: String = "9e4e4204706f770ab58f656b3526b98a8d696230caaa0405cd3fcbf1f9abfa40"
 }

package/build/generated/releaseMetadata.js

@@ -1,10 +1,10 @@
 export const BLUETOOTH_SDK_RELEASE_METADATA = Object.freeze({
     "schemaVersion": 1,
     "familyBaseVersion": "3.2.1",
-    "releaseIdentity": "3.2.1-beta.480",
-    "releaseSetId": "mentra-3.2.1-beta.480",
-    "sourceCommit": "e7380c4149dfcc4bdd5d344bacede73f0a856213",
-    "otaManifestUrl": "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.2.1/mentra-live-ota-3.2.1-beta.480.json",
-    "otaManifestSha256": "ead3ee204d941bdcea7d77c9ea1d55324fef1328e24a272ba6cf52512a8acae8"
+    "releaseIdentity": "3.2.1-beta.498",
+    "releaseSetId": "mentra-3.2.1-beta.498",
+    "sourceCommit": "d0b2fd5a107a817c0584a590e75e9b5e2de05786",
+    "otaManifestUrl": "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.2.1/mentra-live-ota-3.2.1-beta.498.json",
+    "otaManifestSha256": "9e4e4204706f770ab58f656b3526b98a8d696230caaa0405cd3fcbf1f9abfa40"
 });
 //# sourceMappingURL=releaseMetadata.js.map

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,gBAAgB;IACnC,cAAc,EAAE,uBAAuB;IACvC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,kIAAkI;IACpJ,mBAAmB,EAAE,kEAAkE;CACxF,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\": \"3.2.1\",\n  \"releaseIdentity\": \"3.2.1-beta.480\",\n  \"releaseSetId\": \"mentra-3.2.1-beta.480\",\n  \"sourceCommit\": \"e7380c4149dfcc4bdd5d344bacede73f0a856213\",\n  \"otaManifestUrl\": \"https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.2.1/mentra-live-ota-3.2.1-beta.480.json\",\n  \"otaManifestSha256\": \"ead3ee204d941bdcea7d77c9ea1d55324fef1328e24a272ba6cf52512a8acae8\"\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,gBAAgB;IACnC,cAAc,EAAE,uBAAuB;IACvC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,kIAAkI;IACpJ,mBAAmB,EAAE,kEAAkE;CACxF,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\": \"3.2.1\",\n  \"releaseIdentity\": \"3.2.1-beta.498\",\n  \"releaseSetId\": \"mentra-3.2.1-beta.498\",\n  \"sourceCommit\": \"d0b2fd5a107a817c0584a590e75e9b5e2de05786\",\n  \"otaManifestUrl\": \"https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.2.1/mentra-live-ota-3.2.1-beta.498.json\",\n  \"otaManifestSha256\": \"9e4e4204706f770ab58f656b3526b98a8d696230caaa0405cd3fcbf1f9abfa40\"\n})\n"]}

package/ios/Source/BluetoothSdkDefaults.swift

@@ -16,7 +16,7 @@ enum BluetoothSdkDefaults {
     /// silently disable it on every pair the app touches.
     static let autoPowerOffEnabled = false
     private static let infoSdkVersionKey = "MentraBluetoothSdkVersion"
-    private static let swiftPackageSdkVersion = "3.2.1-beta.480"
+    private static let swiftPackageSdkVersion = "3.2.1-beta.498"
     private static let swiftPackageSdkVersionPlaceholder = "__MENTRA" + "_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 = "3.2.1"
-    static let releaseIdentity = "3.2.1-beta.480"
-    static let releaseSetId = "mentra-3.2.1-beta.480"
-    static let sourceCommit = "e7380c4149dfcc4bdd5d344bacede73f0a856213"
-    static let otaManifestUrl = "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.2.1/mentra-live-ota-3.2.1-beta.480.json"
-    static let otaManifestSha256 = "ead3ee204d941bdcea7d77c9ea1d55324fef1328e24a272ba6cf52512a8acae8"
+    static let releaseIdentity = "3.2.1-beta.498"
+    static let releaseSetId = "mentra-3.2.1-beta.498"
+    static let sourceCommit = "d0b2fd5a107a817c0584a590e75e9b5e2de05786"
+    static let otaManifestUrl = "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.2.1/mentra-live-ota-3.2.1-beta.498.json"
+    static let otaManifestSha256 = "9e4e4204706f770ab58f656b3526b98a8d696230caaa0405cd3fcbf1f9abfa40"
 }

package/ios/Source/sgcs/Nimo.swift

@@ -20,10 +20,6 @@ enum NimoBLE {
     static let CHAR_RX = CBUUID(string: "00002022-0000-1000-8000-00805F9B34FB")
     static let CHAR_MIC = CBUUID(string: "00002025-0000-1000-8000-00805F9B34FB")
 
-    static let NAME_PREFIX = "nimo"
-    /// iOS ANCS side-channel devices advertise "<name>_ble" — never the data channel.
-    static let BLE_NAME_SUFFIX = "_ble"
-
     static let CHUNK_SIZE = 501
     static let INTER_FRAME_DELAY_MS = 5
 }
@@ -591,6 +587,27 @@ class Nimo: NSObject, SGCManager {
     private var rxChar: CBCharacteristic?
     private var micChar: CBCharacteristic?
     private var isDisconnecting = false
+    private var scanRequested = false
+    private lazy var discovery = NimoDiscovery<CBPeripheral>(
+        register: { [weak self] in
+            #if os(iOS)
+                self?.centralManager?.registerForConnectionEvents(options: [.serviceUUIDs: [NimoBLE.SERVICE_UUID]])
+            #endif
+        }, connected: { [weak self] in
+            self?.centralManager?.retrieveConnectedPeripherals(withServices: [NimoBLE.SERVICE_UUID]) ?? []
+        }, scan: { [weak self] in
+            self?.centralManager?.scanForPeripherals(
+                withServices: nil, options: [CBCentralManagerScanOptionAllowDuplicatesKey: false]
+            )
+        }, stop: { [weak self] in
+            self?.centralManager?.stopScan()
+            #if os(iOS)
+                self?.centralManager?.registerForConnectionEvents(options: [:])
+            #endif
+        }, name: { $0.name }, found: { [weak self] peripheral, name, rssi in
+            self?.onDeviceFound(peripheral, name: name, rssi: rssi)
+        }
+    )
 
     /// Device search
     private var DEVICE_SEARCH_ID = "NOT_SET"
@@ -680,6 +697,8 @@ class Nimo: NSObject, SGCManager {
     func findCompatibleDevices() {
         Bridge.log("NIMO: findCompatibleDevices()")
         DEVICE_SEARCH_ID = "NOT_SET"
+        isDisconnecting = false
+        scanRequested = true
         DeviceStore.shared.apply("glasses", "connectionState", ConnTypes.SCANNING)
         startScan()
     }
@@ -687,6 +706,7 @@ class Nimo: NSObject, SGCManager {
     func connectById(_ id: String) {
         Bridge.log("NIMO: connectById(\(id))")
         DEVICE_SEARCH_ID = id
+        scanRequested = true
         DeviceStore.shared.apply("glasses", "connectionState", ConnTypes.CONNECTING)
         isDisconnecting = false
         startPairingTimeout()
@@ -694,7 +714,8 @@ class Nimo: NSObject, SGCManager {
     }
 
     func stopScan() {
-        centralManager?.stopScan()
+        scanRequested = false
+        discovery.cancel()
     }
 
     func disconnect() {
@@ -1061,13 +1082,9 @@ class Nimo: NSObject, SGCManager {
 
     // MARK: - BLE Scanning
 
-    private func isNimoMainDevice(_ name: String) -> Bool {
-        let lower = name.lowercased()
-        return lower.hasPrefix(NimoBLE.NAME_PREFIX) && !lower.hasSuffix(NimoBLE.BLE_NAME_SUFFIX)
-    }
-
     @discardableResult
     private func startScan() -> Bool {
+        guard scanRequested, !isDisconnecting else { return false }
         Bridge.log("NIMO: startScan()")
         if centralManager == nil {
             centralManager = CBCentralManager(
@@ -1083,17 +1100,32 @@ class Nimo: NSObject, SGCManager {
 
         // Fast path: reconnect to the cached peripheral UUID.
         if connectByUUID() {
+            stopScan()
             return true
         }
 
-        centralManager!.scanForPeripherals(
-            withServices: nil,
-            options: [CBCentralManagerScanOptionAllowDuplicatesKey: false]
-        )
+        // NIMO's Companion service is GATT over BR/EDR. The main device must
+        // first be paired in Settings; it does not appear in a BLE-only scan.
+        discovery.start()
         return true
     }
 
+    private func onDeviceFound(_ peripheral: CBPeripheral, name: String, rssi: Int?) {
+        Bridge.log("NIMO: found Companion device: \(name)")
+        Bridge.sendDiscoveredDevice(DeviceTypes.NIMO, name, rssi: rssi)
+        guard DEVICE_SEARCH_ID != "NOT_SET", name == DEVICE_SEARCH_ID,
+              self.peripheral == nil else { return }
+        Bridge.log("NIMO: Connecting to \(name)")
+        stopScan()
+        lastDeviceName = name
+        lastDeviceUUID = peripheral.identifier.uuidString
+        self.peripheral = peripheral
+        peripheral.delegate = self
+        centralManager?.connect(peripheral, options: nil)
+    }
+
     private func connectByUUID() -> Bool {
+        guard peripheral == nil else { return false }
         guard DEVICE_SEARCH_ID != "NOT_SET", !DEVICE_SEARCH_ID.isEmpty else { return false }
         guard lastDeviceName == DEVICE_SEARCH_ID,
               let uuidString = lastDeviceUUID,
@@ -1299,7 +1331,8 @@ class Nimo: NSObject, SGCManager {
                 }
                 Bridge.log("NIMO: Attempting reconnection...")
                 await MainActor.run {
-                    self.isDisconnecting = false
+                    guard !self.isDisconnecting else { return }
+                    self.scanRequested = true
                     self.startScan()
                 }
                 return false
@@ -1564,37 +1597,29 @@ extension Nimo: CBCentralManagerDelegate {
     }
 
     nonisolated func centralManager(
-        _ central: CBCentralManager,
+        _: CBCentralManager,
         didDiscover peripheral: CBPeripheral,
         advertisementData: [String: Any],
         rssi: NSNumber
     ) {
-        guard
-            let name = peripheral.name
-            ?? advertisementData[CBAdvertisementDataLocalNameKey] as? String
-        else { return }
+        let advertisedName = advertisementData[CBAdvertisementDataLocalNameKey] as? String
         let rssiValue = rssi.intValue
-
         DispatchQueue.main.async { [weak self] in
-            guard let self else { return }
-            guard self.isNimoMainDevice(name) else { return }
-
-            Bridge.sendDiscoveredDevice(DeviceTypes.NIMO, name, rssi: rssiValue)
-
-            guard self.DEVICE_SEARCH_ID != "NOT_SET" else { return }
-            guard name == self.DEVICE_SEARCH_ID else { return }
-            guard self.peripheral == nil else { return }
-
-            Bridge.log("NIMO: Connecting to \(name)")
-            self.stopScan()
-            self.lastDeviceName = name
-            self.lastDeviceUUID = peripheral.identifier.uuidString
-            self.peripheral = peripheral
-            peripheral.delegate = self
-            central.connect(peripheral, options: nil)
+            self?.discovery.receive(peripheral, advertisedName: advertisedName, rssi: rssiValue)
         }
     }
 
+    #if os(iOS)
+        nonisolated func centralManager(
+            _: CBCentralManager, connectionEventDidOccur event: CBConnectionEvent, for peripheral: CBPeripheral
+        ) {
+            guard event == .peerConnected else { return }
+            DispatchQueue.main.async { [weak self] in
+                self?.discovery.receive(peripheral)
+            }
+        }
+    #endif
+
     nonisolated func centralManager(_: CBCentralManager, didConnect peripheral: CBPeripheral) {
         DispatchQueue.main.async { [weak self] in
             guard let self else { return }

package/ios/Source/sgcs/NimoDiscovery.swift

@@ -0,0 +1,49 @@
+import Foundation
+
+/// Combines system-connected classic devices with incoming CoreBluetooth discoveries.
+/// Kept independent of the radio so discovery can be exercised without hardware.
+@MainActor
+final class NimoDiscovery<Peripheral> {
+    private(set) var active = false
+    private let register: () -> Void
+    private let connected: () -> [Peripheral]
+    private let scan: () -> Void
+    private let stop: () -> Void
+    private let name: (Peripheral) -> String?
+    private let found: (Peripheral, String, Int?) -> Void
+
+    init(register: @escaping () -> Void, connected: @escaping () -> [Peripheral],
+         scan: @escaping () -> Void, stop: @escaping () -> Void,
+         name: @escaping (Peripheral) -> String?, found: @escaping (Peripheral, String, Int?) -> Void)
+    {
+        self.register = register
+        self.connected = connected
+        self.scan = scan
+        self.stop = stop
+        self.name = name
+        self.found = found
+    }
+
+    func start() {
+        active = true
+        // Register first so pairing in Settings cannot race the connected snapshot.
+        register()
+        for peripheral in connected() {
+            receive(peripheral)
+        }
+        if active { scan() }
+    }
+
+    func cancel() {
+        active = false
+        stop()
+    }
+
+    func receive(_ peripheral: Peripheral, advertisedName: String? = nil, rssi: Int? = nil) {
+        guard active, let name = advertisedName ?? name(peripheral) else { return }
+        let lower = name.lowercased()
+        // The separate ANCS peripheral does not host the Companion data service.
+        guard lower.hasPrefix("nimo"), !lower.hasSuffix("_ble") else { return }
+        found(peripheral, name, rssi)
+    }
+}

package/ios/Tests/NimoDiscoveryTests.swift

@@ -0,0 +1,79 @@
+@testable import MentraBluetoothSDK
+import XCTest
+
+@MainActor
+final class NimoDiscoveryTests: XCTestCase {
+    @MainActor
+    private final class Radio {
+        var connected: [String] = []
+        var events: [String] = []
+        var found: [String] = []
+        var selected: String?
+        lazy var discovery: NimoDiscovery<String> = NimoDiscovery(
+            register: { [unowned self] in self.events.append("register") },
+            connected: { [unowned self] in self.events.append("retrieve"); return self.connected },
+            scan: { [unowned self] in self.events.append("scan") },
+            stop: { [unowned self] in self.events.append("stop") },
+            name: { $0 },
+            found: { [unowned self] _, name, _ in
+                found.append(name)
+                if selected == name { discovery.cancel() }
+            }
+        )
+    }
+
+    func testAlreadyConnectedClassicDeviceIsFoundWithoutAdvertisement() {
+        let radio = Radio()
+        radio.connected = ["NIMO_1234", "NIMO_1234_BLE", "Unrelated"]
+        radio.discovery.start()
+        XCTAssertEqual(radio.events, ["register", "retrieve", "scan"])
+        XCTAssertEqual(radio.found, ["NIMO_1234"])
+    }
+
+    func testPairingInSettingsAfterScanStartedDeliversDevice() {
+        let radio = Radio()
+        radio.discovery.start()
+        XCTAssertTrue(radio.found.isEmpty)
+        // Same entry point as connectionEventDidOccur(.peerConnected).
+        radio.discovery.receive("NIMO_5678")
+        XCTAssertEqual(radio.found, ["NIMO_5678"])
+    }
+
+    func testSelectionFromConnectedSnapshotStopsBeforeStartingBleScan() {
+        let radio = Radio()
+        radio.selected = "NIMO_5678"
+        radio.connected = ["NIMO_1234", "NIMO_5678", "NIMO_9999"]
+        radio.discovery.start()
+        XCTAssertEqual(radio.found, ["NIMO_1234", "NIMO_5678"])
+        XCTAssertEqual(radio.events, ["register", "retrieve", "stop"])
+        XCTAssertFalse(radio.discovery.active)
+    }
+
+    func testCancelledDiscoveryIgnoresQueuedEventsAndCanRestart() {
+        let radio = Radio()
+        radio.discovery.start()
+        radio.discovery.cancel()
+        radio.discovery.receive("NIMO_1234")
+        XCTAssertTrue(radio.found.isEmpty)
+        radio.connected = ["NIMO_1234"]
+        radio.discovery.start()
+        XCTAssertEqual(radio.found, ["NIMO_1234"])
+    }
+
+    func testBleFallbackUsesAdvertisementNameAndPreservesSignalStrength() {
+        var found: [String] = []
+        var signal: Int?
+        let discovery = NimoDiscovery<String>(
+            register: {}, connected: { [] }, scan: {}, stop: {}, name: { _ in nil },
+            found: { _, name, rssi in found.append(name); signal = rssi }
+        )
+        discovery.start()
+        discovery.receive("uuid", advertisedName: "NiMo_1234_bLe", rssi: -60)
+        discovery.receive("uuid", advertisedName: "Unrelated", rssi: -60)
+        discovery.receive("uuid")
+        XCTAssertTrue(found.isEmpty)
+        discovery.receive("uuid", advertisedName: "NiMo_1234", rssi: -55)
+        XCTAssertEqual(found, ["NiMo_1234"])
+        XCTAssertEqual(signal, -55)
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mentra/bluetooth-sdk",
-  "version": "3.2.1-beta.480",
+  "version": "3.2.1-beta.498",
   "description": "SDK for communicating with smart glasses",
   "main": "build/index.js",
   "react-native": "src/index.ts",
@@ -114,7 +114,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@mentra/cloud-protocol": "3.2.1-beta.480"
+    "@mentra/cloud-protocol": "3.2.1-beta.498"
   },
   "devDependencies": {
     "@types/node": "^25.9.3",

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": "3.2.1",
-  "releaseIdentity": "3.2.1-beta.480",
-  "releaseSetId": "mentra-3.2.1-beta.480",
-  "sourceCommit": "e7380c4149dfcc4bdd5d344bacede73f0a856213",
-  "otaManifestUrl": "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.2.1/mentra-live-ota-3.2.1-beta.480.json",
-  "otaManifestSha256": "ead3ee204d941bdcea7d77c9ea1d55324fef1328e24a272ba6cf52512a8acae8"
+  "releaseIdentity": "3.2.1-beta.498",
+  "releaseSetId": "mentra-3.2.1-beta.498",
+  "sourceCommit": "d0b2fd5a107a817c0584a590e75e9b5e2de05786",
+  "otaManifestUrl": "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.2.1/mentra-live-ota-3.2.1-beta.498.json",
+  "otaManifestSha256": "9e4e4204706f770ab58f656b3526b98a8d696230caaa0405cd3fcbf1f9abfa40"
 })