@mentra/bluetooth-sdk 3.2.0-dev.180 → 3.2.0-dev.187

package/src/_private/scanSession.ts

@@ -0,0 +1,88 @@
+import type {Device, DeviceModel, ScanDiagnostic} from "../BluetoothSdk.types"
+
+interface ScanTransport {
+  start: (model: DeviceModel) => Promise<void>
+  stop: () => Promise<void>
+  subscribe: (onResults: (devices: Device[]) => void) => () => void
+  getResults: () => Promise<Device[]>
+  getDiagnostic?: () => Promise<ScanDiagnostic | null>
+}
+
+interface ScanSessionOptions {
+  model: DeviceModel
+  timeoutMs: number
+  onResults?: (devices: Device[]) => void
+  onDiagnostic?: (diagnostic: ScanDiagnostic) => void
+}
+
+/** A scan has one completion; optional diagnostics cannot turn it into a failure. */
+export function createScanSession(transport: ScanTransport, options: ScanSessionOptions) {
+  let cancel: () => Promise<void> = async () => {}
+  const result = new Promise<Device[]>((resolve, reject) => {
+    let latestResults: Device[] = []
+    let ending = false
+    let cancelled = false
+    let startTask: Promise<void> | undefined
+    let stopTask: Promise<void> = Promise.resolve()
+    let removeListener = () => {}
+    let timeout: ReturnType<typeof setTimeout> | undefined
+
+    const emit = (devices: Device[]) => {
+      if (ending) return
+      latestResults = devices
+      options.onResults?.([...devices])
+    }
+
+    const finish = async (error?: unknown) => {
+      if (ending) return
+      ending = true
+      clearTimeout(timeout)
+      removeListener()
+      stopTask = (async () => {
+        try {
+          await startTask
+          await transport.stop()
+        } catch {
+          // Failed starts and stops do not change the completion contract.
+        }
+      })()
+      await stopTask
+      if (error !== undefined) {
+        reject(error)
+        return
+      }
+      // Query only at natural, empty completion. A cancellation during the
+      // native lookup must also suppress the pending advisory.
+      if (!cancelled && latestResults.length === 0 && options.onDiagnostic && transport.getDiagnostic) {
+        try {
+          const diagnostic = await transport.getDiagnostic()
+          if (!cancelled && diagnostic) options.onDiagnostic(diagnostic)
+        } catch {
+          // Optional platform access or advisory handling cannot fail a scan.
+        }
+      }
+      resolve([...latestResults])
+    }
+
+    cancel = () => {
+      cancelled = true
+      void finish()
+      return stopTask
+    }
+
+    void (async () => {
+      try {
+        removeListener = transport.subscribe(emit)
+        emit([])
+        timeout = setTimeout(() => void finish(), options.timeoutMs)
+        startTask = Promise.resolve().then(() => transport.start(options.model))
+        await startTask
+        if (ending) return
+        emit(await transport.getResults())
+      } catch (error) {
+        void finish(error)
+      }
+    })()
+  })
+  return {result, cancel: () => cancel()}
+}

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.180",
-  "releaseSetId": "mentra-3.2.0-dev.180",
-  "sourceCommit": "1f24e462561fef37b7082204847a541db4a87c41",
-  "otaManifestUrl": "https://github.com/Mentra-Community/MentraOS/releases/download/mentra-builds-v3.2.0/mentra-live-ota-3.2.0-dev.180.json",
-  "otaManifestSha256": "cbf2a1b81430bd34942e2a1764138f6d79197767b4434a2d8c44311768f8b873"
+  "releaseIdentity": "3.2.0-dev.187",
+  "releaseSetId": "mentra-3.2.0-dev.187",
+  "sourceCommit": "d8b34892f11593baa3c075b94380253b06eb874d",
+  "otaManifestUrl": "https://github.com/Mentra-Community/MentraOS/releases/download/mentra-builds-v3.2.0/mentra-live-ota-3.2.0-dev.187.json",
+  "otaManifestSha256": "cf21f4ab6347acb12eefa38d2f0a3b433bc0e05428c527bcda57a8693d7a72f9"
 })

package/src/index.ts

@@ -10,6 +10,8 @@ import type {
 import {getReleaseChangelogs} from "./changelogs"
 
 const PUBLIC_EVENT_NAMES = new Set<BluetoothSdkEventName>([
+  "native_notification_status",
+  "native_notification_delivery",
   "log",
   "device_discovered",
   "default_device_changed",
@@ -85,6 +87,8 @@ const bindPublicMethod = <K extends keyof BluetoothSdkPublicModule>(name: K): Bl
 }
 
 export const BluetoothSdk: BluetoothSdkPublicModule = Object.freeze({
+  configureNativeNotifications: bindPublicMethod("configureNativeNotifications"),
+  getNativeNotificationStatus: bindPublicMethod("getNativeNotificationStatus"),
   addListener,
   getGlassesStatus: bindPublicMethod("getGlassesStatus"),
   getBluetoothStatus: bindPublicMethod("getBluetoothStatus"),
@@ -276,6 +280,7 @@ export type {
   RgbLedControlResponseEvent,
   RgbLedControlSuccessResponseEvent,
   ScanModelOptions,
+  ScanDiagnostic,
   ScanOptions,
   ScanResultsCallback,
   SpeakingStatusEvent,
@@ -309,3 +314,5 @@ export type {
   WifiStatus,
   WifiStatusChangeEvent,
 } from "./BluetoothSdk.types"
+
+export type {NativeNotificationConfig, NativeNotificationStatus, NativeNotificationDelivery} from "./BluetoothSdk.types"

package/src/react/useBluetoothScan.ts

@@ -1,7 +1,7 @@
 import {useEffect, useRef, useState} from "react"
 
 import BluetoothSdk, {DeviceModels} from "../index"
-import type {Device, DeviceModel} from "../BluetoothSdk.types"
+import type {Device, DeviceModel, ScanDiagnostic} from "../BluetoothSdk.types"
 
 export type BluetoothScanDedupe = "id" | "name" | ((device: Device) => string)
 
@@ -15,6 +15,7 @@ export type UseBluetoothScanOptions = {
 export type BluetoothScanHookResult = {
   clearResults: () => void
   devices: Device[]
+  diagnostic: ScanDiagnostic | null
   error: unknown | null
   model: DeviceModel
   scanning: boolean
@@ -61,6 +62,7 @@ function hasDevice(devices: Device[], selectedDevice: Device | null, dedupe: Blu
 
 export function useBluetoothScan(options: UseBluetoothScanOptions = {}): BluetoothScanHookResult {
   const [devices, setDevices] = useState<Device[]>([])
+  const [diagnostic, setDiagnostic] = useState<ScanDiagnostic | null>(null)
   const [error, setError] = useState<unknown | null>(null)
   const [model, setModelState] = useState<DeviceModel>(options.model ?? DeviceModels.MentraLive)
   const [scanning, setScanning] = useState(false)
@@ -98,11 +100,13 @@ export function useBluetoothScan(options: UseBluetoothScanOptions = {}): Bluetoo
   }, [])
 
   function clearResults() {
+    setDiagnostic(null)
     setDevices([])
     selectDevice(null)
   }
 
   function setModel(nextModel: DeviceModel) {
+    if (scanningRef.current) void stopScan()
     setModelState(nextModel)
     clearResults()
   }
@@ -116,6 +120,7 @@ export function useBluetoothScan(options: UseBluetoothScanOptions = {}): Bluetoo
     }
 
     setError(null)
+    setDiagnostic(null)
     setScanning(true)
     scanningRef.current = true
     setDevices([])
@@ -124,10 +129,14 @@ export function useBluetoothScan(options: UseBluetoothScanOptions = {}): Bluetoo
     try {
       const nextDevices = await BluetoothSdk.scan(scanModel, {
         ...(timeoutMsRef.current == null ? {} : {timeoutMs: timeoutMsRef.current}),
+        onDiagnostic: (hint) => {
+          if (activeScanRef.current === scanId) setDiagnostic(hint)
+        },
         onResults: (results) => {
           if (activeScanRef.current !== scanId) {
             return
           }
+          if (results.length > 0) setDiagnostic(null)
           setDevices(dedupeDevices(results, dedupeRef.current))
         },
       })
@@ -152,6 +161,7 @@ export function useBluetoothScan(options: UseBluetoothScanOptions = {}): Bluetoo
   }
 
   async function stopScan() {
+    setDiagnostic(null)
     activeScanRef.current += 1
     setScanning(false)
     scanningRef.current = false
@@ -161,6 +171,7 @@ export function useBluetoothScan(options: UseBluetoothScanOptions = {}): Bluetoo
   return {
     clearResults,
     devices,
+    diagnostic,
     error,
     model,
     scanning,

package/src/react/useMentraBluetooth.ts

@@ -106,6 +106,7 @@ export type ScanController = {
   active: boolean
   clear: () => void
   devices: Device[]
+  diagnostic: GlassesConnectionHookResult["scan"]["diagnostic"]
   error: unknown | null
   model: DeviceModel
   selectedDevice: Device | null
@@ -252,6 +253,7 @@ function scanController(connection: GlassesConnectionHookResult): ScanController
     active: connection.scan.scanning,
     clear: connection.scan.clearResults,
     devices: connection.scan.devices,
+    diagnostic: connection.scan.diagnostic,
     error: connection.scan.error,
     model: connection.scan.model,
     selectedDevice: connection.scan.selectedDevice,