@mentra/bluetooth-sdk 0.1.21-beta.3 → 3.1.0-dev.4

package/ios/Source/sgcs/SGCManager.swift

@@ -68,6 +68,7 @@ protocol SGCManager {
     func stopStream()
     func sendStreamKeepAlive(_ message: [String: Any])
     func startVideoRecording(requestId: String, save: Bool, sound: Bool)
+    func queryVideoRecordingStatus(requestId: String)
     /// Start video recording with optional per-recording resolution/fps. A width,
     /// height, or fps of 0 means "use the device's saved button-video default".
     /// Defaulted in an extension to delegate to the basic recording path; devices
@@ -189,6 +190,7 @@ protocol SGCManager {
     func sendWifiCredentials(_ ssid: String, _ password: String)
     func forgetWifiNetwork(_ ssid: String)
     func sendHotspotState(_ enabled: Bool)
+    func sendWifiAdbState(_ enabled: Bool)
     func sendOtaStart(otaVersionUrl: String?)
     func sendOtaQueryStatus()
     func sendSetSystemTime(_ timestampMs: Int64)
@@ -327,6 +329,10 @@ extension SGCManager {
         startVideoRecording(requestId: requestId, save: save, sound: sound)
     }
 
+    func queryVideoRecordingStatus(requestId _: String) {
+        Bridge.log("SGC: queryVideoRecordingStatus operation not supported")
+    }
+
     func stopVideoRecording(requestId: String, webhookUrl _: String?, authToken _: String?) {
         stopVideoRecording(requestId: requestId)
     }
@@ -378,6 +384,11 @@ extension SGCManager {
         Bridge.log("SGC: sendSetSystemTime not supported")
     }
 
+    /// Default no-op; Mentra Live overrides to enable/disable Wi-Fi ADB.
+    func sendWifiAdbState(_: Bool) {
+        Bridge.log("SGC: sendWifiAdbState not supported")
+    }
+
     // MARK: - Default DeviceStore-backed property implementations
 
     var fullyBooted: Bool {

package/ios/Source/status/DeviceStatus.swift

@@ -182,6 +182,10 @@ struct GlassesStatus: CustomStringConvertible {
         stringValue(values, "bluetoothMacAddress") ?? ""
     }
 
+    var wifiMacAddress: String {
+        stringValue(values, "wifiMacAddress") ?? ""
+    }
+
     var leftMacAddress: String {
         stringValue(values, "leftMacAddress") ?? ""
     }
@@ -206,6 +210,10 @@ struct GlassesStatus: CustomStringConvertible {
         stringValue(values, "appVersion") ?? ""
     }
 
+    var hotspotOtaVersion: Int {
+        intValue(values["hotspotOtaVersion"]) ?? 0
+    }
+
     var bluetoothName: String {
         stringValue(values, "bluetoothName") ?? ""
     }
@@ -359,6 +367,7 @@ public struct VersionInfoResult: CustomStringConvertible {
     public let systemTimeMs: Int?
     public let otaVersionUrl: String
     public let appVersion: String
+    public let hotspotOtaVersion: Int
 
     init(status: GlassesStatus) {
         androidVersion = status.androidVersion
@@ -369,6 +378,7 @@ public struct VersionInfoResult: CustomStringConvertible {
         systemTimeMs = intValue(status.values["systemTimeMs"])
         otaVersionUrl = status.otaVersionUrl
         appVersion = status.appVersion
+        hotspotOtaVersion = status.hotspotOtaVersion
     }
 
     init(values: [String: Any]) {
@@ -380,6 +390,10 @@ public struct VersionInfoResult: CustomStringConvertible {
         systemTimeMs = intValue(values["systemTimeMs"]) ?? intValue(values["system_time_ms"])
         otaVersionUrl = stringValue(values, "otaVersionUrl", "ota_version_url") ?? ""
         appVersion = stringValue(values, "appVersion", "app_version") ?? ""
+        hotspotOtaVersion =
+            intValue(values["hotspotOtaVersion"])
+                ?? intValue(values["hotspot_ota_version"])
+                ?? 0
     }
 
     public var dictionary: [String: Any] {
@@ -391,6 +405,7 @@ public struct VersionInfoResult: CustomStringConvertible {
             "buildNumber": buildNumber,
             "otaVersionUrl": otaVersionUrl,
             "appVersion": appVersion,
+            "hotspotOtaVersion": hotspotOtaVersion,
         ]
         if let systemTimeMs {
             values["systemTimeMs"] = systemTimeMs
@@ -661,6 +676,10 @@ struct GlassesStatusUpdate: CustomStringConvertible {
         optionalStringValue(values, "bluetoothMacAddress")
     }
 
+    var wifiMacAddress: String? {
+        optionalStringValue(values, "wifiMacAddress")
+    }
+
     var leftMacAddress: String? {
         optionalStringValue(values, "leftMacAddress")
     }
@@ -685,6 +704,10 @@ struct GlassesStatusUpdate: CustomStringConvertible {
         optionalStringValue(values, "appVersion")
     }
 
+    var hotspotOtaVersion: Int? {
+        optionalIntValue(values, "hotspotOtaVersion")
+    }
+
     var bluetoothName: String? {
         optionalStringValue(values, "bluetoothName")
     }

package/ios/Source/types/DeviceModels.swift

@@ -89,6 +89,9 @@ public struct Device: Identifiable, Equatable, CustomStringConvertible {
     public let rssi: Int?
     /// Stable app-facing scan-result key. Do not parse; use typed fields instead.
     public let id: String
+    public let pairingMode: Bool?
+    public let pairingCode: String?
+    public let securePairingCapable: Bool?
 
     public init(
         model: DeviceModel,
@@ -96,7 +99,10 @@ public struct Device: Identifiable, Equatable, CustomStringConvertible {
         identifier: String? = nil,
         projectName: String? = nil,
         rssi: Int? = nil,
-        id: String? = nil
+        id: String? = nil,
+        pairingMode: Bool? = nil,
+        pairingCode: String? = nil,
+        securePairingCapable: Bool? = nil
     ) {
         self.model = model
         self.name = name
@@ -104,6 +110,9 @@ public struct Device: Identifiable, Equatable, CustomStringConvertible {
         self.projectName = projectName
         self.rssi = rssi
         self.id = id ?? identifier.flatMap { $0.isEmpty ? nil : $0 } ?? "\(model.deviceType):\(name)"
+        self.pairingMode = pairingMode
+        self.pairingCode = pairingCode
+        self.securePairingCapable = securePairingCapable
     }
 
     public var description: String {
@@ -125,6 +134,15 @@ public struct Device: Identifiable, Equatable, CustomStringConvertible {
         if let rssi {
             values["rssi"] = rssi
         }
+        if let pairingMode {
+            values["pairingMode"] = pairingMode
+        }
+        if let pairingCode, !pairingCode.isEmpty {
+            values["pairingCode"] = pairingCode
+        }
+        if let securePairingCapable {
+            values["securePairingCapable"] = securePairingCapable
+        }
         return values
     }
 
@@ -140,7 +158,10 @@ public struct Device: Identifiable, Equatable, CustomStringConvertible {
             identifier: identifier,
             projectName: projectName,
             rssi: rssi,
-            id: stringValue(values, "id")
+            id: stringValue(values, "id"),
+            pairingMode: boolValue(values, "pairingMode"),
+            pairingCode: stringValue(values, "pairingCode").flatMap { $0.isEmpty ? nil : $0 },
+            securePairingCapable: boolValue(values, "securePairingCapable")
         )
     }
 }

package/ios/Source/utils/BleJsonCompact.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-/// BLE Wire Protocol v2 JSON compaction: short keys, enum ints, omitted defaults, config diff.
+/// BLE Wire Protocol v2 JSON compaction with lossless fallback for ambiguous payloads.
 enum BleJsonCompact {
     static let keyResolvedConfigHash = "rch"
 
@@ -64,8 +64,6 @@ enum BleJsonCompact {
     }()
 
     private static var sessionConnectEpochMs: Int64 = 0
-    private static var resolvedConfigSent = false
-    private static var currentSessionResolvedConfigHash: String?
     private static var resolvedConfigByHash: [String: [String: Any]] = [:]
 
     private static let highRoiMessageTypes: Set<String> = [
@@ -103,8 +101,6 @@ enum BleJsonCompact {
 
     static func resetSession() {
         sessionConnectEpochMs = 0
-        resolvedConfigSent = false
-        currentSessionResolvedConfigHash = nil
         resolvedConfigByHash.removeAll()
     }
 
@@ -125,7 +121,7 @@ enum BleJsonCompact {
             return json
         }
         let messageType = extractMessageType(json)
-        if !shouldCompactOutbound(messageType) {
+        if !shouldCompactOutbound(messageType) || !canCompactLosslessly(json, topLevel: true) {
             return json
         }
         return compactObject(json, topLevel: true)
@@ -170,48 +166,81 @@ enum BleJsonCompact {
         return decode(json)
     }
 
-    private static func compactObject(_ input: [String: Any], topLevel: Bool) -> [String: Any] {
-        var output: [String: Any] = [:]
+    /// Compact JSON reserves short keys and enum integers. Fall back to verbose JSON whenever an
+    /// otherwise valid future payload already uses one of those wire representations.
+    private static func canCompactLosslessly(
+        _ input: [String: Any],
+        topLevel: Bool
+    ) -> Bool {
         let messageType = stringValue(input["type"]) ?? stringValue(input["t"]) ?? ""
-        var skipResolvedConfig = false
-
-        if topLevel, shouldDiffResolvedConfig(messageType),
-           let resolvedConfig = input["resolvedConfig"] as? [String: Any]
-        {
-            let hash = hashConfig(resolvedConfig)
-            resolvedConfigByHash[hash] = resolvedConfig
-            if resolvedConfigSent, hash == currentSessionResolvedConfigHash {
-                output[keyResolvedConfigHash] = hash
-                skipResolvedConfig = true
-            } else {
-                currentSessionResolvedConfigHash = hash
-                resolvedConfigSent = true
+        for (key, value) in input {
+            if shortToLong[key] != nil
+                || (topLevel && key == keyResolvedConfigHash)
+                || isAmbiguousEnumValue(key: key, value: value, messageType: messageType)
+            {
+                return false
+            }
+            if let nested = value as? [String: Any],
+               !canCompactLosslessly(nested, topLevel: false)
+            {
+                return false
+            }
+            if let array = value as? [Any], !canCompactArrayLosslessly(array) {
+                return false
             }
         }
+        return true
+    }
 
-        for (key, value) in input {
-            if skipResolvedConfig, key == "resolvedConfig" { continue }
-            let shortKey = longToShort[key] ?? key
-            guard let compacted = compactValue(longKey: key, value: value, messageType: messageType),
-                  !shouldOmit(compacted)
-            else {
-                continue
+    private static func canCompactArrayLosslessly(_ array: [Any]) -> Bool {
+        for value in array {
+            if let nested = value as? [String: Any],
+               !canCompactLosslessly(nested, topLevel: false)
+            {
+                return false
+            }
+            if let nestedArray = value as? [Any],
+               !canCompactArrayLosslessly(nestedArray)
+            {
+                return false
             }
-            output[shortKey] = compacted
         }
+        return true
+    }
 
-        if topLevel {
-            compactTimestamp(&output)
+    private static func isAmbiguousEnumValue(
+        key: String,
+        value: Any,
+        messageType: String
+    ) -> Bool {
+        guard let number = value as? NSNumber,
+              CFGetTypeID(number) != CFBooleanGetTypeID()
+        else {
+            return false
         }
-        return output
+        return key == "kind"
+            || key == "source"
+            || key == "aeStateName"
+            || (key == "status" && messageType == "photo_status")
     }
 
-    private static func shouldDiffResolvedConfig(_ messageType: String) -> Bool {
-        messageType == "photo_status" || messageType == "stream_status"
+    private static func compactObject(_ input: [String: Any], topLevel: Bool) -> [String: Any] {
+        var output: [String: Any] = [:]
+        let messageType = stringValue(input["type"]) ?? stringValue(input["t"]) ?? ""
+
+        for (key, value) in input {
+            if let compacted = compactValue(longKey: key, value: value, messageType: messageType) {
+                // Legacy peers treat top-level `ts` as a session-relative delta. Preserve the
+                // verbose key so an absolute timestamp remains absolute across mixed versions.
+                let wireKey = topLevel && key == "timestamp" ? key : (longToShort[key] ?? key)
+                output[wireKey] = compacted
+            }
+        }
+        return output
     }
 
     private static func compactValue(longKey: String, value: Any, messageType: String) -> Any? {
-        if value is NSNull { return nil }
+        if value is NSNull { return NSNull() }
         if let nested = value as? [String: Any] {
             return compactObject(nested, topLevel: false)
         }
@@ -239,35 +268,6 @@ enum BleJsonCompact {
         return value
     }
 
-    private static func shouldOmit(_ value: Any) -> Bool {
-        if value is NSNull { return true }
-        if let boolValue = value as? Bool, !boolValue { return true }
-        if let dict = value as? [String: Any], dict.isEmpty { return true }
-        if let array = value as? [Any], array.isEmpty { return true }
-        return false
-    }
-
-    private static func compactTimestamp(_ output: inout [String: Any]) {
-        let tsKey: String?
-        if output["timestamp"] != nil {
-            tsKey = "timestamp"
-        } else if output["ts"] != nil {
-            tsKey = "ts"
-        } else {
-            tsKey = nil
-        }
-        guard let key = tsKey else { return }
-        let absolute = int64Value(output[key]) ?? 0
-        guard absolute > 0 else { return }
-        if sessionConnectEpochMs <= 0 {
-            sessionConnectEpochMs = absolute
-        }
-        output["ts"] = absolute - sessionConnectEpochMs
-        if key != "ts" {
-            output.removeValue(forKey: key)
-        }
-    }
-
     private static func expandObject(_ input: [String: Any], topLevel: Bool) -> [String: Any] {
         var output: [String: Any] = [:]
         let messageType = stringValue(input["type"]) ?? stringValue(input["t"]) ?? ""
@@ -278,10 +278,9 @@ enum BleJsonCompact {
                 continue
             }
             let longKey = shortToLong[key] ?? key
-            guard let expanded = expandValue(longKey: longKey, value: value, messageType: messageType) else {
-                continue
+            if let expanded = expandValue(longKey: longKey, value: value, messageType: messageType) {
+                output[longKey] = expanded
             }
-            output[longKey] = expanded
         }
 
         if topLevel {
@@ -296,8 +295,6 @@ enum BleJsonCompact {
         guard let resolvedConfig = output["resolvedConfig"] as? [String: Any] else { return }
         let hash = hashConfig(resolvedConfig)
         resolvedConfigByHash[hash] = resolvedConfig
-        currentSessionResolvedConfigHash = hash
-        resolvedConfigSent = true
     }
 
     private static func expandResolvedConfigHash(_ output: inout [String: Any]) {
@@ -312,7 +309,7 @@ enum BleJsonCompact {
     }
 
     private static func expandValue(longKey: String, value: Any, messageType: String) -> Any? {
-        if value is NSNull { return nil }
+        if value is NSNull { return NSNull() }
         if let nested = value as? [String: Any] {
             return expandObject(nested, topLevel: false)
         }
@@ -340,7 +337,12 @@ enum BleJsonCompact {
     }
 
     private static func expandTimestamp(_ output: inout [String: Any]) {
-        guard output["timestamp"] == nil, let delta = int64Value(output["ts"]) else { return }
+        guard output["timestamp"] == nil, let timestamp = output["ts"] else { return }
+        guard let delta = int64Value(timestamp) else {
+            output["timestamp"] = timestamp
+            output.removeValue(forKey: "ts")
+            return
+        }
         let absolute = sessionConnectEpochMs > 0 ? sessionConnectEpochMs + delta : delta
         output["timestamp"] = absolute
         output.removeValue(forKey: "ts")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mentra/bluetooth-sdk",
-  "version": "0.1.21-beta.3",
+  "version": "3.1.0-dev.4",
   "description": "SDK for communicating with smart glasses",
   "main": "build/index.js",
   "react-native": "src/index.ts",
@@ -73,9 +73,12 @@
     "build:plugin": "expo-module build plugin",
     "clean": "expo-module clean",
     "test": "expo-module test",
+    "test:release-metadata": "node --test scripts/*.test.mjs",
     "prepare": "expo-module prepare",
     "prepack": "node scripts/inject-ios-sdk-version.mjs",
     "postpack": "node scripts/inject-ios-sdk-version.mjs --restore",
+    "write:release-metadata": "node scripts/write-release-metadata.mjs",
+    "verify:release-package": "node scripts/verify-release-package.mjs",
     "prepublishOnly": "expo-module prepublishOnly",
     "lint": "expo-module lint",
     "expo-module": "expo-module",
@@ -105,6 +108,7 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
+  "dependencies": {},
   "devDependencies": {
     "@types/node": "^25.9.3",
     "expo-module-scripts": "^55.0.2",

package/plugin/build/withIos.d.ts

@@ -1,3 +1,5 @@
-import { type ConfigPlugin } from "expo/config-plugins";
+import { IOSConfig, type ConfigPlugin } from "expo/config-plugins";
 import { type BluetoothSdkPluginProps } from "./index";
+export declare const INFO_SDK_VERSION = "MentraBluetoothSdkVersion";
+export declare function applyBluetoothSdkInfoPlist(infoPlist: IOSConfig.InfoPlist, props: BluetoothSdkPluginProps | undefined): IOSConfig.InfoPlist;
 export declare const withIosConfiguration: ConfigPlugin<BluetoothSdkPluginProps>;

package/plugin/build/withIos.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withIosConfiguration = void 0;
+exports.withIosConfiguration = exports.INFO_SDK_VERSION = void 0;
+exports.applyBluetoothSdkInfoPlist = applyBluetoothSdkInfoPlist;
 const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -11,6 +12,7 @@ const config_plugins_1 = require("expo/config-plugins");
 const BLUETOOTH_SDK_EXPO_ADAPTER_ENV = "MENTRA_BLUETOOTH_SDK_INCLUDE_EXPO_ADAPTER";
 const BLUETOOTH_SDK_EXPO_ADAPTER_LINE = `ENV['${BLUETOOTH_SDK_EXPO_ADAPTER_ENV}'] ||= '1'`;
 const INFO_ANALYTICS_DISABLED = "MentraBluetoothSdkAnalyticsDisabled";
+exports.INFO_SDK_VERSION = "MentraBluetoothSdkVersion";
 const STALE_INFO_POSTHOG_API_KEY = "MentraBluetoothSdkPostHogApiKey";
 const STALE_INFO_POSTHOG_HOST = "MentraBluetoothSdkPostHogHost";
 const ensureBluetoothSdkExpoAdapterPodEnv = (podfile) => {
@@ -70,15 +72,25 @@ function resolveAnalyticsProps(props) {
         disabled,
     };
 }
-function withAnalyticsInfoPlist(config, props) {
+function applyBluetoothSdkInfoPlist(infoPlist, props) {
+    const packageJson = require("../../package.json");
+    const sdkVersion = typeof packageJson.version === "string" ? packageJson.version.trim() : "";
+    if (!sdkVersion) {
+        throw new Error("@mentra/bluetooth-sdk package.json is missing a version");
+    }
+    const analytics = resolveAnalyticsProps(props);
+    delete infoPlist[INFO_ANALYTICS_DISABLED];
+    delete infoPlist[STALE_INFO_POSTHOG_API_KEY];
+    delete infoPlist[STALE_INFO_POSTHOG_HOST];
+    infoPlist[exports.INFO_SDK_VERSION] = sdkVersion;
+    if (analytics.disabled !== undefined) {
+        infoPlist[INFO_ANALYTICS_DISABLED] = analytics.disabled;
+    }
+    return infoPlist;
+}
+function withBluetoothSdkInfoPlist(config, props) {
     return (0, config_plugins_1.withInfoPlist)(config, (config) => {
-        const analytics = resolveAnalyticsProps(props);
-        delete config.modResults[INFO_ANALYTICS_DISABLED];
-        delete config.modResults[STALE_INFO_POSTHOG_API_KEY];
-        delete config.modResults[STALE_INFO_POSTHOG_HOST];
-        if (analytics.disabled !== undefined) {
-            config.modResults[INFO_ANALYTICS_DISABLED] = analytics.disabled;
-        }
+        config.modResults = applyBluetoothSdkInfoPlist(config.modResults, props);
         return config;
     });
 }
@@ -87,7 +99,7 @@ const withIosConfiguration = (config, props) => {
         config.modResults.contents = ensureBluetoothSdkExpoAdapterPodEnv(config.modResults.contents);
         return config;
     });
-    config = withAnalyticsInfoPlist(config, props);
+    config = withBluetoothSdkInfoPlist(config, props);
     if (props?.node) {
         config = withXcodeEnvLocal(config);
     }

package/scripts/verify-release-package.mjs

@@ -0,0 +1,34 @@
+#!/usr/bin/env node
+import {readFileSync} from "node:fs"
+import path from "node:path"
+
+function option(name) {
+  const index = process.argv.indexOf(`--${name}`)
+  if (index < 0 || !process.argv[index + 1]) throw new Error(`Missing --${name}`)
+  return process.argv[index + 1]
+}
+
+const packageRoot = path.resolve(option("package-root"))
+const releaseIdentity = option("release-identity")
+const otaManifestUrl = option("ota-manifest-url")
+const otaManifestSha256 = option("ota-manifest-sha256")
+const packageJson = JSON.parse(readFileSync(path.join(packageRoot, "package.json"), "utf8"))
+if (packageJson.version !== releaseIdentity) {
+  throw new Error(`Packed SDK version ${JSON.stringify(packageJson.version)} does not match ${releaseIdentity}`)
+}
+
+const files = [
+  "src/generated/releaseMetadata.ts",
+  "build/generated/releaseMetadata.js",
+  "android/src/main/java/com/mentra/bluetoothsdk/GeneratedReleaseMetadata.kt",
+  "ios/Source/GeneratedReleaseMetadata.swift",
+]
+for (const relativePath of files) {
+  const contents = readFileSync(path.join(packageRoot, relativePath), "utf8")
+  if (!contents.includes(otaManifestUrl)) throw new Error(`${relativePath} does not contain the OTA manifest URL`)
+  if (!contents.includes(otaManifestSha256))
+    throw new Error(`${relativePath} does not contain the OTA manifest SHA-256`)
+  if (!contents.includes(releaseIdentity)) throw new Error(`${relativePath} does not contain the release identity`)
+}
+
+console.log(`Verified packed Bluetooth SDK ${releaseIdentity} metadata across JavaScript, Android, and iOS`)