@mentra/bluetooth-sdk 0.1.2 → 0.1.4

package/build/react/useBluetoothStatus.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useBluetoothStatus.js","sourceRoot":"","sources":["../../src/react/useBluetoothStatus.ts"],"names":[],"mappings":"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","sourcesContent":["import {useEffect, useRef, useState} from \"react\"\n\nimport BluetoothSdk from \"../index\"\nimport {\n  createDisconnectedGlassesStatus,\n  isConnectedGlassesConnectionStatus,\n  isReadyGlassesConnectionStatus,\n} from \"../BluetoothSdk.types\"\nimport type {\n  BatteryStatusEvent,\n  HotspotStatus,\n  HotspotStatusChangeEvent,\n  PublicBluetoothStatus,\n  PublicGlassesStatus,\n  WifiStatus,\n  WifiStatusChangeEvent,\n} from \"../BluetoothSdk.types\"\n\nexport type UseBluetoothStatusOptions = {\n  enabled?: boolean\n  onError?: (error: unknown) => void\n}\n\nexport type BluetoothStatusHookResult = {\n  bluetoothStatus: Partial<PublicBluetoothStatus>\n  connected: boolean\n  error: unknown | null\n  glassesStatus: Partial<PublicGlassesStatus>\n  loading: boolean\n  ready: boolean\n  refresh: () => Promise<void>\n}\n\nfunction wifiStatusFromEvent(event: WifiStatusChangeEvent): WifiStatus {\n  switch (event.state) {\n    case \"connected\":\n      return {state: \"connected\", ssid: event.ssid, localIp: event.localIp}\n    case \"disconnected\":\n      return {state: \"disconnected\"}\n  }\n}\n\nfunction hotspotStatusFromEvent(event: HotspotStatusChangeEvent): HotspotStatus {\n  if (event.state === \"enabled\") {\n    return {\n      state: \"enabled\",\n      ssid: event.ssid,\n      password: event.password,\n      localIp: event.localIp,\n    }\n  }\n  return {state: event.state}\n}\n\nfunction mergeGlassesStatus(\n  current: Partial<PublicGlassesStatus>,\n  changed: Partial<PublicGlassesStatus>,\n): Partial<PublicGlassesStatus> {\n  if (changed.connection?.state === \"disconnected\") {\n    return {...createDisconnectedGlassesStatus(), ...changed}\n  }\n  return {...current, ...changed}\n}\n\nexport function useBluetoothStatus(options: UseBluetoothStatusOptions = {}): BluetoothStatusHookResult {\n  const enabled = options.enabled ?? true\n  const onErrorRef = useRef(options.onError)\n  const [bluetoothStatus, setBluetoothStatus] = useState<Partial<PublicBluetoothStatus>>({})\n  const [error, setError] = useState<unknown | null>(null)\n  const [glassesStatus, setGlassesStatus] = useState<Partial<PublicGlassesStatus>>(() =>\n    createDisconnectedGlassesStatus(),\n  )\n  const [loading, setLoading] = useState(enabled)\n\n  useEffect(() => {\n    onErrorRef.current = options.onError\n  }, [options.onError])\n\n  async function refresh() {\n    setLoading(true)\n    try {\n      const [nextGlassesStatus, nextBluetoothStatus] = await Promise.all([\n        BluetoothSdk.getGlassesStatus(),\n        BluetoothSdk.getBluetoothStatus(),\n      ])\n      setGlassesStatus(nextGlassesStatus)\n      setBluetoothStatus(nextBluetoothStatus)\n      setError(null)\n    } catch (nextError) {\n      setError(nextError)\n      onErrorRef.current?.(nextError)\n    } finally {\n      setLoading(false)\n    }\n  }\n\n  useEffect(() => {\n    if (!enabled) {\n      setLoading(false)\n      return undefined\n    }\n\n    let mounted = true\n\n    const loadInitialStatus = async () => {\n      setLoading(true)\n      try {\n        const [nextGlassesStatus, nextBluetoothStatus] = await Promise.all([\n          BluetoothSdk.getGlassesStatus(),\n          BluetoothSdk.getBluetoothStatus(),\n        ])\n        if (!mounted) {\n          return\n        }\n        setGlassesStatus(nextGlassesStatus)\n        setBluetoothStatus(nextBluetoothStatus)\n        setError(null)\n      } catch (nextError) {\n        if (!mounted) {\n          return\n        }\n        setError(nextError)\n        onErrorRef.current?.(nextError)\n      } finally {\n        if (mounted) {\n          setLoading(false)\n        }\n      }\n    }\n\n    void loadInitialStatus()\n\n    const removeGlasses = BluetoothSdk.onGlassesStatus((changed) => {\n      setGlassesStatus((current) => mergeGlassesStatus(current, changed))\n    })\n    const removeBluetooth = BluetoothSdk.onBluetoothStatus((changed) => {\n      setBluetoothStatus((current) => ({...current, ...changed}))\n    })\n    const batterySubscription = BluetoothSdk.addListener(\"battery_status\", (event: BatteryStatusEvent) => {\n      setGlassesStatus((current) => ({\n        ...current,\n        batteryLevel: event.level,\n        charging: event.charging,\n      }))\n    })\n    const wifiSubscription = BluetoothSdk.addListener(\"wifi_status_change\", (event) => {\n      setGlassesStatus((current) => ({...current, wifi: wifiStatusFromEvent(event)}))\n    })\n    const hotspotSubscription = BluetoothSdk.addListener(\"hotspot_status_change\", (event) => {\n      setGlassesStatus((current) => ({...current, hotspot: hotspotStatusFromEvent(event)}))\n    })\n    const hotspotErrorSubscription = BluetoothSdk.addListener(\"hotspot_error\", () => {\n      setGlassesStatus((current) => ({...current, hotspot: {state: \"disabled\"}}))\n    })\n\n    return () => {\n      mounted = false\n      removeGlasses()\n      removeBluetooth()\n      batterySubscription.remove()\n      wifiSubscription.remove()\n      hotspotSubscription.remove()\n      hotspotErrorSubscription.remove()\n    }\n  }, [enabled])\n\n  const connection = glassesStatus.connection\n  const connected = connection ? isConnectedGlassesConnectionStatus(connection) : false\n  const ready = connection ? isReadyGlassesConnectionStatus(connection) : false\n\n  return {\n    bluetoothStatus,\n    connected,\n    error,\n    glassesStatus,\n    loading,\n    ready,\n    refresh,\n  }\n}\n"]}

package/build/react/useGlassesConnection.d.ts

@@ -0,0 +1,29 @@
+import type { ConnectOptions, Device, DeviceModel } from "../BluetoothSdk.types";
+import { type BluetoothScanHookResult } from "./useBluetoothScan";
+import { type BluetoothStatusHookResult } from "./useBluetoothStatus";
+export type DefaultDeviceStorage = {
+    load: () => Promise<Device | null>;
+    save: (device: Device | null) => Promise<void>;
+};
+export type GlassesConnectionAction = "idle" | "scanning" | "connecting" | "disconnecting" | "forgetting";
+export type UseGlassesConnectionOptions = {
+    autoConnectDefault?: boolean;
+    defaultDeviceStorage?: DefaultDeviceStorage;
+    onError?: (error: unknown) => void;
+    scanModel?: DeviceModel;
+    scanTimeoutMs?: number;
+};
+export type GlassesConnectionHookResult = BluetoothStatusHookResult & {
+    action: GlassesConnectionAction;
+    busy: boolean;
+    clearDefaultDevice: () => Promise<void>;
+    connect: (device?: Device, options?: ConnectOptions) => Promise<void>;
+    connectDefault: (options?: ConnectOptions) => Promise<void>;
+    defaultDevice: Device | null;
+    disconnect: () => Promise<void>;
+    forget: () => Promise<void>;
+    scan: BluetoothScanHookResult;
+    setDefaultDevice: (device: Device | null) => Promise<void>;
+};
+export declare function useGlassesConnection(options?: UseGlassesConnectionOptions): GlassesConnectionHookResult;
+//# sourceMappingURL=useGlassesConnection.d.ts.map

package/build/react/useGlassesConnection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useGlassesConnection.d.ts","sourceRoot":"","sources":["../../src/react/useGlassesConnection.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAC,MAAM,uBAAuB,CAAA;AAE9E,OAAO,EAAmB,KAAK,uBAAuB,EAAC,MAAM,oBAAoB,CAAA;AACjF,OAAO,EAAqB,KAAK,yBAAyB,EAAC,MAAM,sBAAsB,CAAA;AAEvF,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAA;IAClC,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAC/C,CAAA;AAED,MAAM,MAAM,uBAAuB,GAC/B,MAAM,GACN,UAAU,GACV,YAAY,GACZ,eAAe,GACf,YAAY,CAAA;AAEhB,MAAM,MAAM,2BAA2B,GAAG;IACxC,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,oBAAoB,CAAC,EAAE,oBAAoB,CAAA;IAC3C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;IAClC,SAAS,CAAC,EAAE,WAAW,CAAA;IACvB,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,2BAA2B,GAAG,yBAAyB,GAAG;IACpE,MAAM,EAAE,uBAAuB,CAAA;IAC/B,IAAI,EAAE,OAAO,CAAA;IACb,kBAAkB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IACvC,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACrE,cAAc,EAAE,CAAC,OAAO,CAAC,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAC3D,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/B,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC3B,IAAI,EAAE,uBAAuB,CAAA;IAC7B,gBAAgB,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAC3D,CAAA;AAED,wBAAgB,oBAAoB,CAClC,OAAO,GAAE,2BAAgC,GACxC,2BAA2B,CAsJ7B"}

package/build/react/useGlassesConnection.js

@@ -0,0 +1,140 @@
+import { useEffect, useRef, useState } from "react";
+import BluetoothSdk from "../index";
+import { useBluetoothScan } from "./useBluetoothScan";
+import { useBluetoothStatus } from "./useBluetoothStatus";
+export function useGlassesConnection(options = {}) {
+    const status = useBluetoothStatus({ onError: options.onError });
+    const scan = useBluetoothScan({
+        model: options.scanModel,
+        onError: options.onError,
+        timeoutMs: options.scanTimeoutMs,
+    });
+    const [action, setAction] = useState("idle");
+    const [defaultDevice, setDefaultDeviceState] = useState(null);
+    const [operationError, setOperationError] = useState(null);
+    const autoConnectAttemptedRef = useRef(false);
+    const defaultDeviceStorageRef = useRef(options.defaultDeviceStorage);
+    const onErrorRef = useRef(options.onError);
+    useEffect(() => {
+        defaultDeviceStorageRef.current = options.defaultDeviceStorage;
+        onErrorRef.current = options.onError;
+    }, [options.defaultDeviceStorage, options.onError]);
+    useEffect(() => {
+        let mounted = true;
+        const loadDefaultDevice = async () => {
+            try {
+                const [nativeDefaultDevice, storedDefaultDevice] = await Promise.all([
+                    BluetoothSdk.getDefaultDevice(),
+                    defaultDeviceStorageRef.current?.load() ?? Promise.resolve(null),
+                ]);
+                if (!mounted) {
+                    return;
+                }
+                const nextDefaultDevice = storedDefaultDevice ?? nativeDefaultDevice;
+                if (nextDefaultDevice) {
+                    await BluetoothSdk.setDefaultDevice(nextDefaultDevice);
+                }
+                if (mounted) {
+                    setDefaultDeviceState(nextDefaultDevice);
+                    setOperationError(null);
+                }
+            }
+            catch (nextError) {
+                if (!mounted) {
+                    return;
+                }
+                setOperationError(nextError);
+                onErrorRef.current?.(nextError);
+            }
+        };
+        void loadDefaultDevice();
+        return () => {
+            mounted = false;
+        };
+    }, []);
+    useEffect(() => {
+        if (!options.autoConnectDefault || autoConnectAttemptedRef.current || status.connected || !defaultDevice) {
+            return;
+        }
+        autoConnectAttemptedRef.current = true;
+        void connectDefault().catch(() => undefined);
+    }, [defaultDevice, options.autoConnectDefault, status.connected]);
+    async function runConnectionAction(nextAction, operation) {
+        setAction(nextAction);
+        setOperationError(null);
+        try {
+            const result = await operation();
+            setOperationError(null);
+            return result;
+        }
+        catch (nextError) {
+            setOperationError(nextError);
+            onErrorRef.current?.(nextError);
+            throw nextError;
+        }
+        finally {
+            setAction("idle");
+        }
+    }
+    async function setDefaultDevice(device) {
+        await runConnectionAction("connecting", async () => {
+            await BluetoothSdk.setDefaultDevice(device);
+            await defaultDeviceStorageRef.current?.save(device);
+            setDefaultDeviceState(device);
+        });
+    }
+    async function clearDefaultDevice() {
+        await runConnectionAction("forgetting", async () => {
+            await BluetoothSdk.clearDefaultDevice();
+            await defaultDeviceStorageRef.current?.save(null);
+            setDefaultDeviceState(null);
+            scan.selectDevice(null);
+        });
+    }
+    async function connect(device, connectOptions) {
+        await runConnectionAction("connecting", async () => {
+            const targetDevice = device ?? scan.selectedDevice;
+            if (targetDevice) {
+                await BluetoothSdk.connect(targetDevice, connectOptions);
+                if (connectOptions?.saveAsDefault !== false) {
+                    await defaultDeviceStorageRef.current?.save(targetDevice);
+                    setDefaultDeviceState(targetDevice);
+                }
+                return;
+            }
+            await BluetoothSdk.connectDefault(connectOptions);
+        });
+    }
+    async function connectDefault(connectOptions) {
+        await runConnectionAction("connecting", async () => {
+            await BluetoothSdk.connectDefault(connectOptions);
+        });
+    }
+    async function disconnect() {
+        await runConnectionAction("disconnecting", async () => {
+            await BluetoothSdk.disconnect();
+        });
+    }
+    async function forget() {
+        await runConnectionAction("forgetting", async () => {
+            await BluetoothSdk.forget();
+            scan.clearResults();
+        });
+    }
+    const busy = action !== "idle" || scan.scanning || status.loading;
+    return {
+        ...status,
+        action: scan.scanning ? "scanning" : action,
+        busy,
+        clearDefaultDevice,
+        connect,
+        connectDefault,
+        defaultDevice,
+        disconnect,
+        error: operationError ?? scan.error ?? status.error,
+        forget,
+        scan,
+        setDefaultDevice,
+    };
+}
+//# sourceMappingURL=useGlassesConnection.js.map

package/build/react/useGlassesConnection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useGlassesConnection.js","sourceRoot":"","sources":["../../src/react/useGlassesConnection.ts"],"names":[],"mappings":"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","sourcesContent":["import {useEffect, useRef, useState} from \"react\"\n\nimport BluetoothSdk from \"../index\"\nimport type {ConnectOptions, Device, DeviceModel} from \"../BluetoothSdk.types\"\n\nimport {useBluetoothScan, type BluetoothScanHookResult} from \"./useBluetoothScan\"\nimport {useBluetoothStatus, type BluetoothStatusHookResult} from \"./useBluetoothStatus\"\n\nexport type DefaultDeviceStorage = {\n  load: () => Promise<Device | null>\n  save: (device: Device | null) => Promise<void>\n}\n\nexport type GlassesConnectionAction =\n  | \"idle\"\n  | \"scanning\"\n  | \"connecting\"\n  | \"disconnecting\"\n  | \"forgetting\"\n\nexport type UseGlassesConnectionOptions = {\n  autoConnectDefault?: boolean\n  defaultDeviceStorage?: DefaultDeviceStorage\n  onError?: (error: unknown) => void\n  scanModel?: DeviceModel\n  scanTimeoutMs?: number\n}\n\nexport type GlassesConnectionHookResult = BluetoothStatusHookResult & {\n  action: GlassesConnectionAction\n  busy: boolean\n  clearDefaultDevice: () => Promise<void>\n  connect: (device?: Device, options?: ConnectOptions) => Promise<void>\n  connectDefault: (options?: ConnectOptions) => Promise<void>\n  defaultDevice: Device | null\n  disconnect: () => Promise<void>\n  forget: () => Promise<void>\n  scan: BluetoothScanHookResult\n  setDefaultDevice: (device: Device | null) => Promise<void>\n}\n\nexport function useGlassesConnection(\n  options: UseGlassesConnectionOptions = {},\n): GlassesConnectionHookResult {\n  const status = useBluetoothStatus({onError: options.onError})\n  const scan = useBluetoothScan({\n    model: options.scanModel,\n    onError: options.onError,\n    timeoutMs: options.scanTimeoutMs,\n  })\n  const [action, setAction] = useState<GlassesConnectionAction>(\"idle\")\n  const [defaultDevice, setDefaultDeviceState] = useState<Device | null>(null)\n  const [operationError, setOperationError] = useState<unknown | null>(null)\n  const autoConnectAttemptedRef = useRef(false)\n  const defaultDeviceStorageRef = useRef(options.defaultDeviceStorage)\n  const onErrorRef = useRef(options.onError)\n\n  useEffect(() => {\n    defaultDeviceStorageRef.current = options.defaultDeviceStorage\n    onErrorRef.current = options.onError\n  }, [options.defaultDeviceStorage, options.onError])\n\n  useEffect(() => {\n    let mounted = true\n\n    const loadDefaultDevice = async () => {\n      try {\n        const [nativeDefaultDevice, storedDefaultDevice] = await Promise.all([\n          BluetoothSdk.getDefaultDevice(),\n          defaultDeviceStorageRef.current?.load() ?? Promise.resolve(null),\n        ])\n        if (!mounted) {\n          return\n        }\n        const nextDefaultDevice = storedDefaultDevice ?? nativeDefaultDevice\n        if (nextDefaultDevice) {\n          await BluetoothSdk.setDefaultDevice(nextDefaultDevice)\n        }\n        if (mounted) {\n          setDefaultDeviceState(nextDefaultDevice)\n          setOperationError(null)\n        }\n      } catch (nextError) {\n        if (!mounted) {\n          return\n        }\n        setOperationError(nextError)\n        onErrorRef.current?.(nextError)\n      }\n    }\n\n    void loadDefaultDevice()\n\n    return () => {\n      mounted = false\n    }\n  }, [])\n\n  useEffect(() => {\n    if (!options.autoConnectDefault || autoConnectAttemptedRef.current || status.connected || !defaultDevice) {\n      return\n    }\n\n    autoConnectAttemptedRef.current = true\n    void connectDefault().catch(() => undefined)\n  }, [defaultDevice, options.autoConnectDefault, status.connected])\n\n  async function runConnectionAction<T>(\n    nextAction: Exclude<GlassesConnectionAction, \"idle\" | \"scanning\">,\n    operation: () => Promise<T>,\n  ): Promise<T> {\n    setAction(nextAction)\n    setOperationError(null)\n    try {\n      const result = await operation()\n      setOperationError(null)\n      return result\n    } catch (nextError) {\n      setOperationError(nextError)\n      onErrorRef.current?.(nextError)\n      throw nextError\n    } finally {\n      setAction(\"idle\")\n    }\n  }\n\n  async function setDefaultDevice(device: Device | null) {\n    await runConnectionAction(\"connecting\", async () => {\n      await BluetoothSdk.setDefaultDevice(device)\n      await defaultDeviceStorageRef.current?.save(device)\n      setDefaultDeviceState(device)\n    })\n  }\n\n  async function clearDefaultDevice() {\n    await runConnectionAction(\"forgetting\", async () => {\n      await BluetoothSdk.clearDefaultDevice()\n      await defaultDeviceStorageRef.current?.save(null)\n      setDefaultDeviceState(null)\n      scan.selectDevice(null)\n    })\n  }\n\n  async function connect(device?: Device, connectOptions?: ConnectOptions) {\n    await runConnectionAction(\"connecting\", async () => {\n      const targetDevice = device ?? scan.selectedDevice\n      if (targetDevice) {\n        await BluetoothSdk.connect(targetDevice, connectOptions)\n        if (connectOptions?.saveAsDefault !== false) {\n          await defaultDeviceStorageRef.current?.save(targetDevice)\n          setDefaultDeviceState(targetDevice)\n        }\n        return\n      }\n      await BluetoothSdk.connectDefault(connectOptions)\n    })\n  }\n\n  async function connectDefault(connectOptions?: ConnectOptions) {\n    await runConnectionAction(\"connecting\", async () => {\n      await BluetoothSdk.connectDefault(connectOptions)\n    })\n  }\n\n  async function disconnect() {\n    await runConnectionAction(\"disconnecting\", async () => {\n      await BluetoothSdk.disconnect()\n    })\n  }\n\n  async function forget() {\n    await runConnectionAction(\"forgetting\", async () => {\n      await BluetoothSdk.forget()\n      scan.clearResults()\n    })\n  }\n\n  const busy = action !== \"idle\" || scan.scanning || status.loading\n\n  return {\n    ...status,\n    action: scan.scanning ? \"scanning\" : action,\n    busy,\n    clearDefaultDevice,\n    connect,\n    connectDefault,\n    defaultDevice,\n    disconnect,\n    error: operationError ?? scan.error ?? status.error,\n    forget,\n    scan,\n    setDefaultDevice,\n  }\n}\n"]}

package/ios/BluetoothSdkModule.swift

@@ -193,6 +193,12 @@ public class BluetoothSdkModule: Module, MentraBluetoothSDKDelegate {
             }
         }
 
+        AsyncFunction("stopScan") {
+            await MainActor.run {
+                self.bluetoothSdk().stopScan()
+            }
+        }
+
         AsyncFunction("cancelConnectionAttempt") {
             await MainActor.run {
                 self.bluetoothSdk().cancelConnectionAttempt()
@@ -308,10 +314,10 @@ public class BluetoothSdkModule: Module, MentraBluetoothSDKDelegate {
             }
         }
 
-        AsyncFunction("photoRequest") {
+        AsyncFunction("requestPhoto") {
             (
                 requestId: String, appId: String, size: String, webhookUrl: String?,
-                authToken: String?, compress: String?, flash: Bool, sound: Bool
+                authToken: String?, compress: String?, sound: Bool
             ) in
             await MainActor.run {
                 self.bluetoothSdk().requestPhoto(
@@ -322,7 +328,6 @@ public class BluetoothSdkModule: Module, MentraBluetoothSDKDelegate {
                         webhookUrl: webhookUrl,
                         authToken: authToken,
                         compress: compress.flatMap(PhotoCompression.init(rawValue:)),
-                        flash: flash,
                         sound: sound
                     )
                 )
@@ -367,10 +372,10 @@ public class BluetoothSdkModule: Module, MentraBluetoothSDKDelegate {
 
         // MARK: - Video Recording Commands
 
-        AsyncFunction("startVideoRecording") { (requestId: String, save: Bool, flash: Bool, sound: Bool) in
+        AsyncFunction("startVideoRecording") { (requestId: String, save: Bool, sound: Bool) in
             await MainActor.run {
                 self.bluetoothSdk().startVideoRecording(
-                    VideoRecordingRequest(requestId: requestId, save: save, flash: flash, sound: sound)
+                    VideoRecordingRequest(requestId: requestId, save: save, sound: sound)
                 )
             }
         }
@@ -422,7 +427,7 @@ public class BluetoothSdkModule: Module, MentraBluetoothSDKDelegate {
         AsyncFunction("rgbLedControl") {
             (
                 requestId: String, packageName: String?, action: String, color: String?,
-                ontime: Int, offtime: Int, count: Int
+                onDurationMs: Int, offDurationMs: Int, count: Int
             ) in
             await MainActor.run {
                 self.bluetoothSdk().rgbLedControl(
@@ -431,8 +436,8 @@ public class BluetoothSdkModule: Module, MentraBluetoothSDKDelegate {
                         packageName: packageName,
                         action: RgbLedAction(rawValue: action) ?? .off,
                         color: color.flatMap(RgbLedColor.init(rawValue:)),
-                        ontime: ontime,
-                        offtime: offtime,
+                        onDurationMs: onDurationMs,
+                        offDurationMs: offDurationMs,
                         count: count
                     )
                 )
@@ -545,7 +550,7 @@ public class BluetoothSdkModule: Module, MentraBluetoothSDKDelegate {
             "compatible_glasses_search_stop",
             [
                 "type": "compatible_glasses_search_stop",
-                "device_model": deviceModel,
+                "deviceModel": deviceModel,
             ]
         )
     }

package/ios/Source/Bridge.swift

@@ -126,18 +126,48 @@ class Bridge {
                 if let rssi {
                     newResult["rssi"] = rssi
                 }
-                let allResults = searchResults + [newResult]
-                var seen = Set<String>()
-                let uniqueResults = allResults.reversed().filter {
-                    let model = $0["model"] as? String ?? $0["deviceModel"] as? String ?? deviceModel
-                    guard let name = $0["name"] as? String ?? $0["deviceName"] as? String else { return false }
-                    return seen.insert("\(model):\(name)").inserted
-                }.reversed()
-                DeviceStore.shared.set("bluetooth", "searchResults", Array(uniqueResults))
+                // Keep the public searchResults array stable as glasses are added or removed.
+                // Duplicate discoveries refresh their existing row; only new glasses append.
+                let uniqueResults = mergeStableSearchResults(
+                    searchResults,
+                    newResult: newResult,
+                    fallbackModel: deviceModel
+                )
+                DeviceStore.shared.set("bluetooth", "searchResults", uniqueResults)
             }
         }
     }
 
+    private static func mergeStableSearchResults(
+        _ currentResults: [[String: Any]],
+        newResult: [String: Any],
+        fallbackModel: String
+    ) -> [[String: Any]] {
+        guard let newKey = searchResultKey(newResult, fallbackModel: fallbackModel) else {
+            return currentResults
+        }
+        var nextResults = currentResults
+        if let existingIndex = nextResults.firstIndex(where: {
+            searchResultKey($0, fallbackModel: fallbackModel) == newKey
+        }) {
+            nextResults[existingIndex] = newResult
+        } else {
+            nextResults.append(newResult)
+        }
+        return nextResults
+    }
+
+    private static func searchResultKey(_ result: [String: Any], fallbackModel: String) -> String? {
+        if let id = result["id"] as? String, !id.isEmpty {
+            return id
+        }
+        let model = result["model"] as? String ?? fallbackModel
+        guard let name = result["name"] as? String else {
+            return nil
+        }
+        return "\(model):\(name)"
+    }
+
     // MARK: - Hardware Events
 
     static func sendButtonPress(buttonId: String, pressType: String) {
@@ -153,8 +183,9 @@ class Bridge {
 
     static func sendTouchEvent(deviceModel: String, gestureName: String, timestamp: Int64, source: Int32? = nil) {
         var body: [String: Any] = [
-            "device_model": deviceModel,
-            "gesture_name": gestureName,
+            "type": "touch_event",
+            "deviceModel": deviceModel,
+            "gestureName": gestureName,
             "timestamp": timestamp,
         ]
         if let source {
@@ -173,8 +204,8 @@ class Bridge {
 
     static func sendSwitchStatus(switchType: Int, value: Int, timestamp: Int64) {
         let body: [String: Any] = [
-            "switch_type": switchType,
-            "switch_value": value,
+            "switchType": switchType,
+            "switchValue": value,
             "timestamp": timestamp,
         ]
         Bridge.sendTypedMessage("switch_status", body: body)
@@ -183,6 +214,7 @@ class Bridge {
     static func sendRgbLedControlResponse(requestId: String, success: Bool, error: String?) {
         guard !requestId.isEmpty else { return }
         var body: [String: Any] = [
+            "type": "rgb_led_control_response",
             "requestId": requestId,
             "state": success ? "success" : "error",
         ]

package/ios/Source/DeviceManager.swift

@@ -66,9 +66,9 @@ struct ViewState {
         if isPaired {
             // Device is paired! Don't activate it - let PhoneMic.swift activate when recording starts
             Bridge.log("Audio: ✅ Mentra Live is paired (preserving A2DP for music)")
-            glassesBtcConnected = true
+            glassesBluetoothClassicConnected = true
         } else {
-            glassesBtcConnected = false
+            glassesBluetoothClassicConnected = false
             // Not found in availableInputs - not paired yet
 
             // Start monitoring for when user pairs manually
@@ -79,10 +79,10 @@ struct ViewState {
                 if connected {
                     Bridge.log("Audio: ✅ Device paired and connected")
                     // Don't activate - let PhoneMic.swift handle that when recording starts
-                    self.glassesBtcConnected = true
+                    self.glassesBluetoothClassicConnected = true
                 } else {
                     Bridge.log("Audio: Device disconnected")
-                    self.glassesBtcConnected = false
+                    self.glassesBluetoothClassicConnected = false
                 }
             }
         }
@@ -214,9 +214,9 @@ struct ViewState {
         set { DeviceStore.shared.apply("bluetooth", "searchingController", newValue) }
     }
 
-    private var glassesBtcConnected: Bool {
-        get { DeviceStore.shared.get("glasses", "btcConnected") as? Bool ?? false }
-        set { DeviceStore.shared.apply("glasses", "btcConnected", newValue) }
+    private var glassesBluetoothClassicConnected: Bool {
+        get { DeviceStore.shared.get("glasses", "bluetoothClassicConnected") as? Bool ?? false }
+        set { DeviceStore.shared.apply("glasses", "bluetoothClassicConnected", newValue) }
     }
 
     private var micRanking: [String] {
@@ -506,8 +506,8 @@ struct ViewState {
 
         if micEnabled {
             for micMode in micRanking {
-                if micMode == MicTypes.PHONE_INTERNAL || micMode == MicTypes.BT_CLASSIC
-                    || micMode == MicTypes.BT
+                if micMode == MicTypes.PHONE_INTERNAL || micMode == MicTypes.BLUETOOTH_CLASSIC
+                    || micMode == MicTypes.BLUETOOTH
                 {
                     if PhoneMic.shared.isRecordingWithMode(micMode) {
                         micUsed = micMode
@@ -572,8 +572,8 @@ struct ViewState {
                 continue
             }
 
-            if micMode == MicTypes.PHONE_INTERNAL || micMode == MicTypes.BT_CLASSIC
-                || micMode == MicTypes.BT
+            if micMode == MicTypes.PHONE_INTERNAL || micMode == MicTypes.BLUETOOTH_CLASSIC
+                || micMode == MicTypes.BLUETOOTH
             {
                 PhoneMic.shared.stopMode(micMode)
             }
@@ -849,7 +849,7 @@ struct ViewState {
         Bridge.log("MAN: checkCurrentAudioDevice: audioDevicePattern: \(audioDevicePattern)")
 
         if audioDevicePattern.isEmpty || audioDevicePattern == DeviceTypes.SIMULATED {
-            glassesBtcConnected = false
+            glassesBluetoothClassicConnected = false
             Bridge.log("MAN: Audio device pattern is empty or simulated, returning")
             return
         }
@@ -861,7 +861,7 @@ struct ViewState {
 
         if !isConnected {
             Bridge.log("MAN: Device '\(deviceName)' disconnected")
-            glassesBtcConnected = false
+            glassesBluetoothClassicConnected = false
 
             let isOtherDeviceConnected = AudioSessionMonitor.isOtherAudioDeviceConnected(
                 devicePattern: audioDevicePattern
@@ -880,9 +880,9 @@ struct ViewState {
                 $0.portName.localizedCaseInsensitiveContains(audioDevicePattern)
             })?.portName
             Bridge.log("MAN: ✅ Successfully detected newly paired device '\(deviceName)'")
-            glassesBtcConnected = true
+            glassesBluetoothClassicConnected = true
         } else {
-            glassesBtcConnected = false
+            glassesBluetoothClassicConnected = false
         }
     }
 
@@ -1120,6 +1120,8 @@ struct ViewState {
     func dbg2() {}
 
     func startStream(_ message: [String: Any]) {
+        var message = message
+        message["flash"] = true
         Bridge.log("MAN: startStream: \(message)")
         sgc?.startStream(message)
     }
@@ -1199,11 +1201,11 @@ struct ViewState {
         sgc?.sendReboot()
     }
 
-    func startVideoRecording(_ requestId: String, _ save: Bool, _ flash: Bool, _ sound: Bool) {
+    func startVideoRecording(_ requestId: String, _ save: Bool, _ sound: Bool) {
         Bridge.log(
-            "MAN: onStartVideoRecording: requestId=\(requestId), save=\(save), flash=\(flash), sound=\(sound)"
+            "MAN: onStartVideoRecording: requestId=\(requestId), save=\(save), flash=true, sound=\(sound)"
         )
-        sgc?.startVideoRecording(requestId: requestId, save: save, flash: flash, sound: sound)
+        sgc?.startVideoRecording(requestId: requestId, save: save, flash: true, sound: sound)
     }
 
     func stopVideoRecording(_ requestId: String) {
@@ -1223,8 +1225,8 @@ struct ViewState {
         packageName: String?,
         action: String,
         color: String?,
-        ontime: Int,
-        offtime: Int,
+        onDurationMs: Int,
+        offDurationMs: Int,
         count: Int
     ) {
         sgc?.sendRgbLedControl(
@@ -1232,8 +1234,8 @@ struct ViewState {
             packageName: packageName,
             action: action,
             color: color,
-            ontime: ontime,
-            offtime: offtime,
+            onDurationMs: onDurationMs,
+            offDurationMs: offDurationMs,
             count: count
         )
     }
@@ -1272,22 +1274,21 @@ struct ViewState {
         }
     }
 
-    func photoRequest(
+    func requestPhoto(
         _ requestId: String,
         _ appId: String,
         _ size: String,
         _ webhookUrl: String?,
         _ authToken: String?,
         _ compress: String?,
-        _ flash: Bool,
         _ sound: Bool
     ) {
         Bridge.log(
-            "MAN: onPhotoRequest: \(requestId), \(appId), \(webhookUrl), size=\(size), compress=\(compress ?? "none"), flash=\(flash), sound=\(sound)"
+            "MAN: requestPhoto: \(requestId), \(appId), \(webhookUrl), size=\(size), compress=\(compress ?? "none"), flash=true, sound=\(sound)"
         )
         sgc?.requestPhoto(
             requestId, appId: appId, size: size, webhookUrl: webhookUrl, authToken: authToken,
-            compress: compress, flash: flash, sound: sound
+            compress: compress, flash: true, sound: sound
         )
     }
 

package/ios/Source/DeviceStore.swift

@@ -28,7 +28,7 @@ class DeviceStore {
         store.set("glasses", "deviceModel", "")
         store.set("glasses", "firmwareVersion", "")
         store.set("glasses", "micEnabled", false)
-        store.set("glasses", "btcConnected", false)
+        store.set("glasses", "bluetoothClassicConnected", false)
         store.set("glasses", "caseRemoved", true)
         store.set("glasses", "caseOpen", true)
         store.set("glasses", "caseCharging", false)
@@ -80,12 +80,12 @@ class DeviceStore {
         store.set("bluetooth", "dashboard_depth", 2)
         store.set("bluetooth", "head_up_angle", 30)
         store.set("bluetooth", "contextual_dashboard", true)
-        store.set("bluetooth", "gallery_mode", true)
+        store.set("bluetooth", "galleryModeAuto", true)
         store.set("bluetooth", "screen_disabled", false)
         store.set("bluetooth", "button_photo_size", "medium")
         store.set("bluetooth", "button_camera_led", true)
         store.set("bluetooth", "button_max_recording_time", 10)
-        store.set("bluetooth", "camera_fov", ["fov": 118, "roi_position": 0])
+        store.set("bluetooth", "camera_fov", ["fov": 118, "roiPosition": 0])
         store.set("bluetooth", "button_video_width", 1280)
         store.set("bluetooth", "button_video_height", 720)
         store.set("bluetooth", "button_video_fps", 30)
@@ -214,7 +214,7 @@ class DeviceStore {
                 DeviceManager.shared.sgc?.setDashboardMenu(items)
             }
 
-        case ("bluetooth", "gallery_mode"):
+        case ("bluetooth", "galleryModeAuto"):
             DeviceManager.shared.sgc?.sendGalleryMode()
 
         case ("bluetooth", "screen_disabled"):