@mentra/bluetooth-sdk 3.2.0-dev.191 → 3.2.0-dev.195

package/ios/Source/utils/MessageChunker.swift

@@ -41,7 +41,7 @@ class MessageChunker {
         let needsChunking = messageBytes > MESSAGE_SIZE_THRESHOLD
 
         if needsChunking {
-            print("MessageChunker: Message size \(messageBytes) exceeds threshold \(MESSAGE_SIZE_THRESHOLD), will chunk")
+            Bridge.log("MessageChunker: Message size \(messageBytes) exceeds threshold \(MESSAGE_SIZE_THRESHOLD), will chunk")
         }
 
         return needsChunking
@@ -56,7 +56,7 @@ class MessageChunker {
      */
     static func createChunks(originalJson: String, messageId: Int64 = -1, wakeUp: Bool = false) -> [[String: Any]] {
         guard let messageData = originalJson.data(using: .utf8) else {
-            print("MessageChunker: Failed to convert message to data")
+            Bridge.log("MessageChunker: Failed to convert message to data")
             return []
         }
 
@@ -68,12 +68,12 @@ class MessageChunker {
         for chunkSize in stride(from: INITIAL_CHUNK_DATA_SIZE, through: MIN_CHUNK_DATA_SIZE, by: -1) {
             let chunks = buildChunks(messageData, chunkId: chunkId, messageId: messageId, chunkSize: chunkSize)
             if allChunksFit(chunks, wakeUp: wakeUp) {
-                print("MessageChunker: Creating \(chunks.count) chunks for message of size \(totalBytes) bytes using \(chunkSize)-byte UTF-8 slices")
+                Bridge.log("MessageChunker: Creating \(chunks.count) chunks for message of size \(totalBytes) bytes using \(chunkSize)-byte UTF-8 slices")
                 return chunks
             }
         }
 
-        print("MessageChunker: Unable to create K900 chunks within \(MAX_PACKED_CHUNK_SIZE) bytes")
+        Bridge.log("MessageChunker: Unable to create K900 chunks within \(MAX_PACKED_CHUNK_SIZE) bytes")
         return []
     }
 
@@ -101,7 +101,7 @@ class MessageChunker {
 
             chunks.append(chunk)
 
-            print("MessageChunker: Created chunk \(i)/\(totalChunks - 1) with \(chunkString.data(using: .utf8)?.count ?? 0) bytes")
+            Bridge.log("MessageChunker: Created chunk \(i)/\(totalChunks - 1) with \(chunkString.data(using: .utf8)?.count ?? 0) bytes")
         }
 
         return chunks
@@ -111,7 +111,7 @@ class MessageChunker {
         for (index, chunk) in chunks.enumerated() {
             let packedLength = packedK900Length(chunk, wakeUp: wakeUp && index == 0)
             if packedLength == nil || packedLength! > MAX_PACKED_CHUNK_SIZE {
-                print("MessageChunker: Chunk \(index) packed to \(packedLength ?? 0) bytes, exceeding \(MAX_PACKED_CHUNK_SIZE)")
+                Bridge.log("MessageChunker: Chunk \(index) packed to \(packedLength ?? 0) bytes, exceeding \(MAX_PACKED_CHUNK_SIZE)")
                 return false
             }
         }
@@ -191,7 +191,7 @@ class MessageChunker {
               let totalChunks = (json["total"] as? Int) ?? (json["n"] as? Int),
               let data = (json["data"] as? String) ?? (json["d"] as? String)
         else {
-            print("MessageChunker: Failed to extract chunk info from JSON")
+            Bridge.log("MessageChunker: Failed to extract chunk info from JSON")
             return nil
         }
 
@@ -255,7 +255,7 @@ class MessageChunker {
             )
         }
 
-        print("MessageChunker: Created \(fragments.count) binary fragments for \(payload.count) bytes")
+        Bridge.log("MessageChunker: Created \(fragments.count) binary fragments for \(payload.count) bytes")
         return fragments
     }
 

package/ios/Source/utils/Models.swift

@@ -13,7 +13,7 @@ struct AiResponseToG1Model {
     var newScreen: Bool
     var currentPage: UInt8 {
         didSet {
-            print("SET : currentPage :\(currentPage)")
+            Bridge.log("SET : currentPage :\(currentPage)")
         }
     }
 

package/ios/Tests/MentraLiveConnectionOptionsTests.swift

@@ -0,0 +1,30 @@
+import CoreBluetooth
+@testable import MentraBluetoothSDK
+import XCTest
+
+final class MentraLiveConnectionOptionsTests: XCTestCase {
+    func testConnectOptionsRequireAncsByDefault() {
+        XCTAssertTrue(ConnectOptions().requiresAncs)
+    }
+
+    func testConnectOptionsCanDisableAncsRequirement() {
+        XCTAssertFalse(ConnectOptions(requiresAncs: false).requiresAncs)
+    }
+
+    #if os(macOS)
+        func testCoreBluetoothOptionsOmitAncsOnMacOS() {
+            XCTAssertNil(MentraLiveConnectionOptions.coreBluetoothOptions(requiresAncs: true))
+        }
+    #else
+        func testCoreBluetoothOptionsRequireAncsWhenEnabled() {
+            let options = MentraLiveConnectionOptions.coreBluetoothOptions(requiresAncs: true)
+
+            XCTAssertEqual(options?.count, 1)
+            XCTAssertEqual(options?[CBConnectPeripheralOptionRequiresANCS] as? Bool, true)
+        }
+    #endif
+
+    func testCoreBluetoothOptionsAreOmittedWhenAncsIsDisabled() {
+        XCTAssertNil(MentraLiveConnectionOptions.coreBluetoothOptions(requiresAncs: false))
+    }
+}

package/ios/Tests/NativeLogTests.swift

@@ -0,0 +1,34 @@
+@testable import MentraBluetoothSDK
+import XCTest
+
+final class NativeLogTests: XCTestCase {
+    func testTracingAnEventDoesNotRecursivelyTraceTheLog() {
+        let delivered = expectation(description: "Trace and original event")
+        delivered.expectedFulfillmentCount = 2
+        delivered.assertForOverFulfill = true
+        var events: [String] = []
+        let sink = Bridge.addEventSink { event, _ in
+            events.append(event)
+            delivered.fulfill()
+        }
+        defer { Bridge.removeEventSink(sink) }
+        Bridge.sendTypedMessage("head_up", body: ["up": true])
+        wait(for: [delivered], timeout: 2)
+        XCTAssertEqual(events, ["log", "head_up"])
+    }
+
+    func testNativeDiagnosticsReachTheLogEventOnce() {
+        let delivered = expectation(description: "Native log event")
+        delivered.assertForOverFulfill = true
+        let sink = Bridge.addEventSink { event, body in
+            guard event == "log" else { return }
+            XCTAssertEqual(body["message"] as? String, "MessageChunker: diagnostic")
+            delivered.fulfill()
+        }
+        defer { Bridge.removeEventSink(sink) }
+        DispatchQueue.global().async {
+            Bridge.log("MessageChunker: diagnostic")
+        }
+        wait(for: [delivered], timeout: 2)
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mentra/bluetooth-sdk",
-  "version": "3.2.0-dev.191",
+  "version": "3.2.0-dev.195",
   "description": "SDK for communicating with smart glasses",
   "main": "build/index.js",
   "react-native": "src/index.ts",

package/src/BluetoothSdk.types.ts

@@ -1485,6 +1485,13 @@ export interface Device {
 export interface ConnectOptions {
   saveAsDefault?: boolean
   cancelExistingConnectionAttempt?: boolean
+  /**
+   * iOS Mentra Live only. When true, CoreBluetooth requires ANCS authorization
+   * as part of the connection. Set false when the app does not use notification
+   * relay and must avoid the system ANCS authorization flow. Defaults to true.
+   * Android accepts this option as a no-op.
+   */
+  requiresAncs?: boolean
 }
 
 export type ScanResultsCallback = (devices: Device[]) => void

package/src/_private/BluetoothSdkModule.ts

@@ -1,5 +1,8 @@
 import {createScanSession} from "./scanSession"
 import {NativeModule, requireNativeModule} from "expo"
+import {Platform} from "react-native"
+
+import {installNativeLogConsole} from "./nativeLogConsole"
 
 import {
   BluetoothSettingsUpdate,
@@ -287,10 +290,12 @@ export type BluetoothSdkInternalModule = BluetoothSdkNativeModule
 // This call loads the native module object from the JSI.
 // NativeModule<BluetoothSdkModuleEvents> already extends EventEmitter<BluetoothSdkModuleEvents>
 const NativeBluetoothSdkModule = requireNativeModule<BluetoothSdkNativeModule>("BluetoothSdk")
+installNativeLogConsole(NativeBluetoothSdkModule, Platform.OS)
 
 const DEFAULT_CONNECT_OPTIONS: Required<ConnectOptions> = {
   saveAsDefault: true,
   cancelExistingConnectionAttempt: true,
+  requiresAncs: true,
 }
 
 const DEFAULT_SCAN_TIMEOUT_MS = 15_000

package/src/_private/nativeLogConsole.ts

@@ -0,0 +1,24 @@
+type LogSource = {
+  addListener(event: "log", listener: (event: {message: string}) => void): {remove(): void}
+}
+
+// The native module survives Fast Refresh. Replace its previous subscription
+// when JS reloads this module, rather than printing each event more than once.
+const subscriptionKey = Symbol.for("mentra.bluetooth-sdk.native-log-console")
+type SubscribedLogSource = LogSource & {[subscriptionKey]?: {remove(): void}}
+
+const credentialPattern =
+  /(?<![A-Za-z0-9])(?:access[_-]?token|refresh[_-]?token|auth[_-]?token|id[_-]?token|client[_-]?secret|api[_-]?key)(?![A-Za-z0-9])|(?<![A-Za-z0-9])(?:token|password|secret|authorization|auth|key)(?![A-Za-z0-9])\s*["']?\s*(?:is\s*)?[:=]\s*["']?\S+|(?<![A-Za-z0-9])bearer(?![A-Za-z0-9])\s+\S+/i
+
+export function nativeLogMessage(message: string): string {
+  return credentialPattern.test(message) ? "[REDACTED]" : message.slice(0, 16_384)
+}
+
+export function installNativeLogConsole(source: SubscribedLogSource, platform: string): void {
+  source[subscriptionKey]?.remove()
+  source[subscriptionKey] = source.addListener("log", ({message}) => {
+    // Resolve console at delivery time so host console interception receives
+    // native diagnostics in the same stream as ordinary JS logs.
+    console.log(`[native:${platform}]`, nativeLogMessage(message))
+  })
+}

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.0",
-  "releaseIdentity": "3.2.0-dev.191",
-  "releaseSetId": "mentra-3.2.0-dev.191",
-  "sourceCommit": "3516939c2afd92634e7f3b3f1983f0671c8e1e27",
-  "otaManifestUrl": "https://github.com/Mentra-Community/MentraOS/releases/download/mentra-builds-v3.2.0/mentra-live-ota-3.2.0-dev.191.json",
-  "otaManifestSha256": "95911977308516fa70d367a18af66f7075440aa219285ac23d5aa72164d475c4"
+  "releaseIdentity": "3.2.0-dev.195",
+  "releaseSetId": "mentra-3.2.0-dev.195",
+  "sourceCommit": "321202ca96ec1852be19a7230ebcc3593fe87e54",
+  "otaManifestUrl": "https://github.com/Mentra-Community/MentraOS/releases/download/mentra-builds-v3.2.0/mentra-live-ota-3.2.0-dev.195.json",
+  "otaManifestSha256": "70f26063b2c281b9b046965f6f6d7ca22f8b53242c6c5be02030c5a04c7115e4"
 })

package/src/react/useGlassesConnection.ts

@@ -22,6 +22,11 @@ export type UseGlassesConnectionOptions = {
   autoConnectDefault?: boolean
   defaultDeviceStorage?: DefaultDeviceStorage
   onError?: (error: unknown) => void
+  /**
+   * Whether iOS should require ANCS authorization when automatically connecting.
+   * Defaults to true. Android accepts this option as a no-op.
+   */
+  requiresAncs?: boolean
   scanModel?: DeviceModel
   scanTimeoutMs?: number
 }
@@ -117,8 +122,8 @@ export function useGlassesConnection(
     }
 
     autoConnectAttemptedRef.current = true
-    void connectDefault().catch(() => undefined)
-  }, [defaultDevice, options.autoConnectDefault, status.connected])
+    void connectDefault({requiresAncs: options.requiresAncs ?? true}).catch(() => undefined)
+  }, [defaultDevice, options.autoConnectDefault, options.requiresAncs, status.connected])
 
   async function runConnectionAction<T>(
     nextAction: Exclude<GlassesConnectionAction, "idle" | "scanning">,

package/src/react/useMentraBluetooth.ts

@@ -121,6 +121,11 @@ export type UseMentraBluetoothOptions = {
   defaultDeviceStorage?: DefaultDeviceStorage
   defaultModel?: DeviceModel
   onError?: (error: unknown) => void
+  /**
+   * Whether iOS should require ANCS authorization when automatically connecting.
+   * Defaults to true. Android accepts this option as a no-op.
+   */
+  requiresAncs?: boolean
   scanTimeoutMs?: number
 }
 
@@ -269,6 +274,7 @@ export function useMentraBluetooth(options: UseMentraBluetoothOptions = {}): Men
     autoConnectDefault: options.autoConnectDefault,
     defaultDeviceStorage: options.defaultDeviceStorage,
     onError: options.onError,
+    requiresAncs: options.requiresAncs,
     scanModel: options.defaultModel ?? DeviceModels.MentraLive,
     scanTimeoutMs: options.scanTimeoutMs,
   })