@glassly/bluetooth-sdk 0.3.1-dev.540 → 0.3.1-dev.548

package/android/build.gradle

@@ -364,8 +364,8 @@ afterEvaluate {
           url = 'https://github.com/tetramo-labs/glassly'
           licenses {
             license {
-              name = 'GNU Affero General Public License v3.0'
-              url = 'https://www.gnu.org/licenses/agpl-3.0.txt'
+              name = 'MIT License'
+              url = 'https://opensource.org/licenses/MIT'
             }
           }
           developers {

package/android/lc3Lib/build.gradle

@@ -159,8 +159,8 @@ afterEvaluate {
                     url = 'https://github.com/tetramo-labs/glassly'
                     licenses {
                         license {
-                            name = 'GNU Affero General Public License v3.0'
-                            url = 'https://www.gnu.org/licenses/agpl-3.0.txt'
+                            name = 'MIT License'
+                            url = 'https://opensource.org/licenses/MIT'
                         }
                     }
                     developers {

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

@@ -3,9 +3,9 @@ package com.glassly.bluetoothsdk
 /** Generated by release CI. Do not edit in a release checkout. */
 internal object GeneratedReleaseMetadata {
     const val FAMILY_BASE_VERSION: String = "0.3.1"
-    const val RELEASE_IDENTITY: String = "0.3.1-dev.540"
-    const val RELEASE_SET_ID: String = "glassly-0.3.1-dev.540"
-    const val SOURCE_COMMIT: String = "b019d32a3c71f3a39cb27c93265e667b4469cdc0"
+    const val RELEASE_IDENTITY: String = "0.3.1-dev.548"
+    const val RELEASE_SET_ID: String = "glassly-0.3.1-dev.548"
+    const val SOURCE_COMMIT: String = "8de673988aed75061b39b243d324fcf0b5050224"
     const val OTA_MANIFEST_URL: String = ""
     const val OTA_MANIFEST_SHA256: String = ""
 }

package/android/src/main/java/com/glassly/bluetoothsdk/controllers/R1.kt

@@ -54,10 +54,11 @@ private object R1BLE {
      * Scan-response manufacturer data (openCFW: `0x5245` company id, the six
      * address bytes in SoftDevice order, then an optional 15-byte serial).
      * Android hands us the payload with the company id already stripped. The
-     * GAP name is `EVEN R1_` + address bytes 3,2,1, which pins the byte order;
-     * the returned string keeps SoftDevice order, the form the glasses have
-     * accepted in RING_CONNECT_INFO. Taking the LAST six bytes was wrong for
-     * rings with a serial (it returned ASCII digits).
+     * GAP name is `EVEN R1_` + the first three address bytes reversed
+     * (`R1_26081B` ↔ `1B 08 26 …`), which pins the byte order; the returned
+     * string keeps SoftDevice order, the form the glasses have accepted in
+     * RING_CONNECT_INFO. Taking the LAST six bytes was wrong for rings with a
+     * serial (it returned ASCII digits).
      */
     fun macAddress(mfgBytes: ByteArray, ringId: String?): String? {
         if (mfgBytes.size < 6) return null
@@ -66,14 +67,22 @@ private object R1BLE {
         val id = ringId?.uppercase()
         val chosen = when {
             id.isNullOrEmpty() -> addr
-            hex(byteArrayOf(addr[3], addr[2], addr[1])) == id -> addr
+            hex(byteArrayOf(addr[2], addr[1], addr[0])) == id -> addr
             else -> {
                 val flipped = addr.reversedArray()
-                if (hex(byteArrayOf(flipped[3], flipped[2], flipped[1])) == id) flipped else return null
+                if (hex(byteArrayOf(flipped[2], flipped[1], flipped[0])) == id) flipped else return null
             }
         }
         return chosen.joinToString(":") { String.format("%02X", it) }
     }
+
+    /** A stored "AA:BB:…" address is only trusted when it still agrees with the
+     *  ring's name; older builds persisted serial digits as the address. */
+    fun macMatches(mac: String, ringId: String): Boolean {
+        val parts = mac.split(":")
+        if (parts.size != 6) return false
+        return (parts[2] + parts[1] + parts[0]).uppercase() == ringId.uppercase()
+    }
 }
 
 // MARK: - Ring → phone touch report (channel 1)
@@ -140,12 +149,20 @@ private object R1Eus {
      *  the ring stores both targets and fast-advertises for them */
     const val SUBCMD_ADV_START = 0x0A
     /** system subcommand 0x82 (removeRingNotify): one-byte SET erases both
-     *  stored glasses targets and the "glasses paired" flag. While the ring
-     *  holds glasses targets its touch reports go to the glasses and the
-     *  phone link carries telemetry only, so this is what puts input on the
-     *  phone link. */
+     *  stored glasses targets and the "glasses paired" flag — the stock
+     *  "unpair" state, in which the ring accepts ANY glasses that connect. */
     const val SUBCMD_REMOVE_RING = 0x82
 
+    /** Two targets no glasses will ever present. The ring's advStart consumer
+     *  compares the connected glasses peer with the supplied targets, drops a
+     *  mismatch (after a ~20 s firmware delay), stores both targets, and from
+     *  then on admits a glasses peer only when it equals one of them. That is
+     *  the only ring-side lever that makes it refuse the glasses: with the
+     *  targets erased (removeRingNotify) it accepts every glasses peer, and
+     *  the glasses reconnect on their own. Non-zero and non-FF, which the
+     *  firmware treats as "configured". */
+    val DECOY_TARGETS = byteArrayOf(0x02, 0, 0, 0, 0, 0x01, 0x02, 0, 0, 0, 0, 0x02)
+
     private fun crc16Step(crc: Int, byte: Int): Int {
         var c = ((crc shr 8) or (crc shl 8)) and 0xFFFF
         c = c xor (byte and 0xFF)
@@ -321,6 +338,11 @@ class R1 : ControllerManager() {
 
     private fun getRingMacFromMap(name: String): String? = loadRingMacAddressMap()[name]
 
+    private fun removeRingMacFromMap(name: String) {
+        val map = loadRingMacAddressMap()
+        if (map.remove(name) != null) saveRingMacAddressMap(map)
+    }
+
     // Reconnection
     private val reconnectionManager = R1ReconnectionManager()
 
@@ -639,10 +661,10 @@ class R1 : ControllerManager() {
         get() = DeviceStore.get("bluetooth", "ring_via_glasses") as? Boolean ?: false
 
     /**
-     * Phone route (default): erase the ring's stored glasses targets so its
-     * touch reports come to this link, and have the glasses drop any ring
-     * link they still hold. Glasses route (debug): hand the ring the glasses
-     * MACs, then ask the glasses to connect.
+     * Phone route (default): point the ring at decoy glasses targets so it
+     * drops and then refuses the real glasses, which puts its touch reports
+     * on this link; also ask the glasses to let go. Glasses route (debug):
+     * hand the ring the glasses MACs, then ask the glasses to connect.
      */
     private fun applyRoute(viaGlasses: Boolean) {
         if (viaGlasses) {
@@ -653,7 +675,7 @@ class R1 : ControllerManager() {
                 DeviceManager.getInstance().sgc?.connectController()
             }
         } else {
-            sendEusCommand(R1Eus.SUBCMD_REMOVE_RING, byteArrayOf(0x01), "removeRingNotify")
+            sendEusCommand(R1Eus.SUBCMD_ADV_START, R1Eus.DECOY_TARGETS, "advStart(decoy targets)")
             DeviceManager.getInstance().sgc?.releaseController()
         }
     }
@@ -761,6 +783,17 @@ class R1 : ControllerManager() {
 
         val timestamp = System.currentTimeMillis()
 
+        // EUS reply on channel 2: [seq][crc32][12-byte model header][payload].
+        // The model status byte is 0x03 | (result << 2); result 0 = success,
+        // 1 = error, 2 = refused (needs the bonded phone role), 3 = unsupported.
+        if (characteristic.uuid == R1BLE.NOTIFY_CHAR_2 && data.size >= 17 && data[0] == 0.toByte()) {
+            val subcmd = data[12].toInt() and 0xFF
+            val result = (data[10].toInt() and 0xFF) shr 2
+            val len = (data[13].toInt() and 0xFF) or ((data[14].toInt() and 0xFF) shl 8)
+            Bridge.log("R1: EUS reply subcmd=0x%02X result=%d len=%d".format(subcmd, result, len))
+            return
+        }
+
         // Touch report: [00 09 61 00 wireType aux speed 00 tick4]
         R1TouchReport.parse(data)?.let { (gesture, wireType) ->
             if (gesture != null) {
@@ -850,7 +883,13 @@ class R1 : ControllerManager() {
                     // peripheral isn't in the map we don't have its true public MAC — drop the
                     // connection and rescan rather than publishing a stale/wrong MAC. Mirrors
                     // iOS R1.swift didConnect.
-                    val mappedMac = name?.let { getRingMacFromMap(it) }
+                    var mappedMac = name?.let { getRingMacFromMap(it) }
+                    val ringId = name?.let { extractRingId(it) }
+                    if (mappedMac != null && ringId != null && !R1BLE.macMatches(mappedMac, ringId)) {
+                        Bridge.log("R1: Stored MAC for $name does not match its name; rescanning for the advertisement")
+                        removeRingMacFromMap(name)
+                        mappedMac = null
+                    }
                     if (mappedMac == null) {
                         Bridge.log("R1: No MAC stored in map found for ${name ?: "ring"}")
                         mainHandler.post {
@@ -1056,6 +1095,12 @@ class R1 : ControllerManager() {
     }
 
     override fun forget() {
+        // Hand the ring back in its stock unpaired state: erase the glasses
+        // targets (the phone route left decoys behind) so the Even app, or a
+        // later pairing here, starts clean.
+        if (DeviceStore.get("glasses", "controllerConnected") as? Boolean == true) {
+            sendEusCommand(R1Eus.SUBCMD_REMOVE_RING, byteArrayOf(0x01), "removeRingNotify")
+        }
         disconnect()
         ringMacAddress = null
         ringBleAddress = null

package/build/generated/releaseMetadata.js

@@ -1,9 +1,9 @@
 export const BLUETOOTH_SDK_RELEASE_METADATA = Object.freeze({
     "schemaVersion": 1,
     "familyBaseVersion": "0.3.1",
-    "releaseIdentity": "0.3.1-dev.540",
-    "releaseSetId": "glassly-0.3.1-dev.540",
-    "sourceCommit": "b019d32a3c71f3a39cb27c93265e667b4469cdc0",
+    "releaseIdentity": "0.3.1-dev.548",
+    "releaseSetId": "glassly-0.3.1-dev.548",
+    "sourceCommit": "8de673988aed75061b39b243d324fcf0b5050224",
     "otaManifestUrl": null,
     "otaManifestSha256": null
 });

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,eAAe;IAClC,cAAc,EAAE,uBAAuB;IACvC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,IAAI;IACtB,mBAAmB,EAAE,IAAI;CAC1B,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\": \"0.3.1\",\n  \"releaseIdentity\": \"0.3.1-dev.540\",\n  \"releaseSetId\": \"glassly-0.3.1-dev.540\",\n  \"sourceCommit\": \"b019d32a3c71f3a39cb27c93265e667b4469cdc0\",\n  \"otaManifestUrl\": null,\n  \"otaManifestSha256\": null\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,eAAe;IAClC,cAAc,EAAE,uBAAuB;IACvC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,IAAI;IACtB,mBAAmB,EAAE,IAAI;CAC1B,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\": \"0.3.1\",\n  \"releaseIdentity\": \"0.3.1-dev.548\",\n  \"releaseSetId\": \"glassly-0.3.1-dev.548\",\n  \"sourceCommit\": \"8de673988aed75061b39b243d324fcf0b5050224\",\n  \"otaManifestUrl\": null,\n  \"otaManifestSha256\": null\n})\n"]}

package/ios/Source/BluetoothSdkDefaults.swift

@@ -11,7 +11,7 @@ enum BluetoothSdkDefaults {
     static let voiceActivityDetectionEnabled = false
     static let loudnessGateEnabled = true
     private static let infoSdkVersionKey = "BluetoothSdkVersion"
-    private static let swiftPackageSdkVersion = "0.3.1-dev.540"
+    private static let swiftPackageSdkVersion = "0.3.1-dev.548"
     private static let swiftPackageSdkVersionPlaceholder = "__GLASSLY" + "_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 = "0.3.1"
-    static let releaseIdentity = "0.3.1-dev.540"
-    static let releaseSetId = "glassly-0.3.1-dev.540"
-    static let sourceCommit = "b019d32a3c71f3a39cb27c93265e667b4469cdc0"
+    static let releaseIdentity = "0.3.1-dev.548"
+    static let releaseSetId = "glassly-0.3.1-dev.548"
+    static let sourceCommit = "8de673988aed75061b39b243d324fcf0b5050224"
     static let otaManifestUrl = ""
     static let otaManifestSha256 = ""
 }

package/ios/Source/controllers/R1.swift

@@ -14,22 +14,31 @@ import Foundation
 private enum R1BLE {
     /// Scan-response manufacturer data (openCFW: `0x5245` company id, the six
     /// address bytes in SoftDevice order, then an optional 15-byte serial).
-    /// The GAP name is `EVEN R1_` + address bytes 3,2,1, which pins the byte
-    /// order; the stored string keeps SoftDevice order, the form the glasses
-    /// have accepted in RING_CONNECT_INFO. Taking the LAST six bytes was wrong
-    /// for rings with a serial (it returned ASCII digits).
+    /// The GAP name is `EVEN R1_` + the first three address bytes reversed
+    /// (`R1_26081B` ↔ `1B 08 26 …`), which pins the byte order; the stored
+    /// string keeps SoftDevice order, the form the glasses have accepted in
+    /// RING_CONNECT_INFO. Taking the LAST six bytes was wrong for rings with
+    /// a serial (it returned ASCII digits).
     static func macAddress(mfgData: Data, ringId: String?) -> Data? {
         let bytes = [UInt8](mfgData)
         guard bytes.count >= 8, bytes[0] == 0x45, bytes[1] == 0x52 else { return nil }
         let addr = Array(bytes[2 ..< 8])
         guard let ringId, !ringId.isEmpty else { return Data(addr) }
         let hex = { (b: [UInt8]) in b.map { String(format: "%02X", $0) }.joined() }
-        if hex([addr[3], addr[2], addr[1]]) == ringId.uppercased() { return Data(addr) }
+        if hex([addr[2], addr[1], addr[0]]) == ringId.uppercased() { return Data(addr) }
         let flipped = Array(addr.reversed())
-        if hex([flipped[3], flipped[2], flipped[1]]) == ringId.uppercased() { return Data(flipped) }
+        if hex([flipped[2], flipped[1], flipped[0]]) == ringId.uppercased() { return Data(flipped) }
         return nil
     }
 
+    /// A stored address is only trusted when it still agrees with the ring's
+    /// name; older builds persisted serial digits as the address.
+    static func macMatches(_ mac: Data, ringId: String) -> Bool {
+        let b = [UInt8](mac)
+        guard b.count == 6 else { return false }
+        return [b[2], b[1], b[0]].map { String(format: "%02X", $0) }.joined() == ringId.uppercased()
+    }
+
     /// Ring custom service
     static let SERVICE_UUID = CBUUID(string: "BAE80001-4F05-4503-8E65-3AF1F7329D1F")
 
@@ -117,12 +126,20 @@ private enum R1Eus {
     /// the ring stores both targets and fast-advertises for them
     static let SUBCMD_ADV_START: UInt8 = 0x0A
     /// system subcommand 0x82 (removeRingNotify): one-byte SET erases both
-    /// stored glasses targets and the "glasses paired" flag. While the ring
-    /// holds glasses targets its touch reports go to the glasses and the
-    /// phone link carries telemetry only, so this is what puts input on the
-    /// phone link.
+    /// stored glasses targets and the "glasses paired" flag — the stock
+    /// "unpair" state, in which the ring accepts ANY glasses that connect.
     static let SUBCMD_REMOVE_RING: UInt8 = 0x82
 
+    /// Two targets no glasses will ever present. The ring's advStart consumer
+    /// compares the connected glasses peer with the supplied targets, drops a
+    /// mismatch (after a ~20 s firmware delay), stores both targets, and from
+    /// then on admits a glasses peer only when it equals one of them. That is
+    /// the only ring-side lever that makes it refuse the glasses: with the
+    /// targets erased (removeRingNotify) it accepts every glasses peer, and
+    /// the glasses reconnect on their own. Non-zero and non-FF, which the
+    /// firmware treats as "configured".
+    static let DECOY_TARGETS = Data([0x02, 0, 0, 0, 0, 0x01, 0x02, 0, 0, 0, 0, 0x02])
+
     private static func crc16Step(_ crc: UInt16, _ byte: UInt8) -> UInt16 {
         var c = (crc >> 8) | (crc << 8)
         c ^= UInt16(byte)
@@ -485,10 +502,10 @@ class R1: NSObject, ControllerManager {
         startHeartbeat()
     }
 
-    /// Phone route (default): erase the ring's stored glasses targets so its
-    /// touch reports come to this link, and have the glasses drop any ring
-    /// link they still hold. Glasses route (debug): hand the ring the glasses
-    /// MACs, then ask the glasses to connect.
+    /// Phone route (default): point the ring at decoy glasses targets so it
+    /// drops and then refuses the real glasses, which puts its touch reports
+    /// on this link; also ask the glasses to let go. Glasses route (debug):
+    /// hand the ring the glasses MACs, then ask the glasses to connect.
     private func applyRoute(viaGlasses: Bool) {
         if viaGlasses {
             connectToGlasses()
@@ -498,7 +515,7 @@ class R1: NSObject, ControllerManager {
                 await DeviceManager.shared.sgc?.connectController()
             }
         } else {
-            sendEusCommand(R1Eus.SUBCMD_REMOVE_RING, payload: Data([0x01]), log: "removeRingNotify")
+            sendEusCommand(R1Eus.SUBCMD_ADV_START, payload: R1Eus.DECOY_TARGETS, log: "advStart(decoy targets)")
             Task { await DeviceManager.shared.sgc?.releaseController() }
         }
     }
@@ -552,6 +569,15 @@ class R1: NSObject, ControllerManager {
 
         let timestamp = Int64(Date().timeIntervalSince1970 * 1000)
 
+        // EUS reply on channel 2: [seq][crc32][12-byte model header][payload].
+        // The model status byte is 0x03 | (result << 2); result 0 = success,
+        // 1 = error, 2 = refused (needs the bonded phone role), 3 = unsupported.
+        if characteristic.uuid == R1BLE.NOTIFY_CHAR_2, data.count >= 17, data[0] == 0 {
+            let b = [UInt8](data)
+            Bridge.log("R1: EUS reply subcmd=0x\(String(format: "%02X", b[12])) result=\(b[10] >> 2) len=\(Int(b[13]) | Int(b[14]) << 8)")
+            return
+        }
+
         // Touch report: [00 09 61 00 wireType aux speed 00 tick4]
         if let report = R1TouchReport.parse(data) {
             if let gesture = report.gesture {
@@ -660,6 +686,12 @@ class R1: NSObject, ControllerManager {
     }
 
     func forget() {
+        // Hand the ring back in its stock unpaired state: erase the glasses
+        // targets (the phone route left decoys behind) so the Even app, or a
+        // later pairing here, starts clean.
+        if DeviceStore.shared.get("glasses", "controllerConnected") as? Bool ?? false {
+            sendEusCommand(R1Eus.SUBCMD_REMOVE_RING, payload: Data([0x01]), log: "removeRingNotify")
+        }
         disconnect()
         ringUUID = nil
         ringMacAddress = nil
@@ -816,7 +848,14 @@ extension R1: CBCentralManagerDelegate {
 
             self.ringUUID = peripheral.identifier
 
-            guard let name = peripheral.name, let mac = self.ringMacAddressMap[name] else {
+            let storedMac = peripheral.name.flatMap { name -> Data? in
+                guard let mac = self.ringMacAddressMap[name] else { return nil }
+                guard let id = self.extractRingId(name), !R1BLE.macMatches(mac, ringId: id) else { return mac }
+                Bridge.log("R1: Stored MAC for \(name) does not match its name; rescanning for the advertisement")
+                self.ringMacAddressMap[name] = nil
+                return nil
+            }
+            guard let name = peripheral.name, let mac = storedMac else {
                 Bridge.log("R1: No MAC stored in map found for \(peripheral.name ?? "ring")")
                 // stop the scan, disconnect, remove the uuid, and try again as we need the mac address to connect:
                 self.disconnect()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glassly/bluetooth-sdk",
-  "version": "0.3.1-dev.540",
+  "version": "0.3.1-dev.548",
   "description": "SDK for communicating with smart glasses",
   "main": "build/index.js",
   "react-native": "src/index.ts",
@@ -107,7 +107,7 @@
     "url": "https://github.com/tetramo-labs/glassly/issues"
   },
   "author": "Glassly",
-  "license": "AGPL-3.0-only",
+  "license": "MIT",
   "homepage": "https://github.com/tetramo-labs/glassly/tree/main/mobile/modules/bluetooth-sdk#readme",
   "publishConfig": {
     "access": "public",

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": "0.3.1",
-  "releaseIdentity": "0.3.1-dev.540",
-  "releaseSetId": "glassly-0.3.1-dev.540",
-  "sourceCommit": "b019d32a3c71f3a39cb27c93265e667b4469cdc0",
+  "releaseIdentity": "0.3.1-dev.548",
+  "releaseSetId": "glassly-0.3.1-dev.548",
+  "sourceCommit": "8de673988aed75061b39b243d324fcf0b5050224",
   "otaManifestUrl": null,
   "otaManifestSha256": null
 })