@glassly/bluetooth-sdk 0.3.1-dev.537 → 0.3.1-dev.538

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.537"
-    const val RELEASE_SET_ID: String = "glassly-0.3.1-dev.537"
-    const val SOURCE_COMMIT: String = "2cb6ba96b1141a7d23dc38cb1ce44e6ede4f305a"
+    const val RELEASE_IDENTITY: String = "0.3.1-dev.538"
+    const val RELEASE_SET_ID: String = "glassly-0.3.1-dev.538"
+    const val SOURCE_COMMIT: String = "3c004fd397951d67d68c6a6dcfda389afb5a2bc0"
     const val OTA_MANIFEST_URL: String = ""
     const val OTA_MANIFEST_SHA256: String = ""
 }

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

@@ -49,6 +49,31 @@ private object R1BLE {
     /** `source` on emitted touch events; the same value the G2 CFW tags
      *  ring input it relays with, so JS treats both paths alike. */
     const val RING_SOURCE = 2
+
+    /**
+     * 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).
+     */
+    fun macAddress(mfgBytes: ByteArray, ringId: String?): String? {
+        if (mfgBytes.size < 6) return null
+        val addr = mfgBytes.copyOfRange(0, 6)
+        val hex = { b: ByteArray -> b.joinToString("") { String.format("%02X", it) } }
+        val id = ringId?.uppercase()
+        val chosen = when {
+            id.isNullOrEmpty() -> addr
+            hex(byteArrayOf(addr[3], addr[2], addr[1])) == id -> addr
+            else -> {
+                val flipped = addr.reversedArray()
+                if (hex(byteArrayOf(flipped[3], flipped[2], flipped[1])) == id) flipped else return null
+            }
+        }
+        return chosen.joinToString(":") { String.format("%02X", it) }
+    }
 }
 
 // MARK: - Ring → phone touch report (channel 1)
@@ -483,14 +508,14 @@ class R1 : ControllerManager() {
             val mfgHex = mfgBytes?.joinToString(" ") { String.format("%02X", it) } ?: "none"
             Bridge.log("R1: Discovered: ${deviceName ?: "?"} (RSSI: ${result.rssi}) mfgData: $mfgHex")
 
-            // Extract ring MAC from manufacturer data (last 6 bytes) and store name->MAC map.
-            // Android's manufacturerSpecificData strips the 2-byte company ID; iOS keeps it. The
-            // resulting "last 6 bytes" land in reversed byte order between platforms (verified in
-            // the field), so reverse here to match iOS's stored string ("1B:08:26:8E:0E:E6").
-            if (deviceName != null && mfgBytes != null && mfgBytes.size >= 6) {
-                val tail = mfgBytes.copyOfRange(mfgBytes.size - 6, mfgBytes.size)
-                val macStr = tail.joinToString(":") { String.format("%02X", it) }
-                putRingMacInMap(deviceName, macStr)
+            // Extract the ring MAC from manufacturer data and store name->MAC map.
+            if (deviceName != null && mfgBytes != null) {
+                val macStr = R1BLE.macAddress(mfgBytes, extractRingId(deviceName))
+                if (macStr != null) {
+                    putRingMacInMap(deviceName, macStr)
+                } else {
+                    Bridge.log("R1: mfgData carries no address matching $deviceName")
+                }
             }
 
             // Emit discovered device
@@ -640,15 +665,11 @@ class R1 : ControllerManager() {
     }
 
     /**
-     * One emit path for both direct parsers: dropped while the ring is
-     * debug-routed via the glasses so a lingering phone-side report can't
-     * double up with the CFW relay.
+     * One emit path for both direct parsers. The ring reports touch to a
+     * single peer, so whatever arrives here is the only copy — forward it
+     * whichever route is configured.
      */
     private fun emitGesture(gestureName: String, timestamp: Long, via: String) {
-        if (routeViaGlasses) {
-            Bridge.log("R1: $via $gestureName ignored (ring routed via glasses)")
-            return
-        }
         Bridge.log("R1: $via: $gestureName")
         Bridge.sendTouchEvent(ControllerTypes.R1, gestureName, timestamp, R1BLE.RING_SOURCE)
     }

package/android/src/main/java/com/glassly/bluetoothsdk/sgcs/G2.kt

@@ -5605,6 +5605,9 @@ class G2 : SGCManager() {
     private val ringViaGlasses: Boolean
         get() = DeviceStore.get("bluetooth", "ring_via_glasses") as? Boolean ?: false
 
+    private var lastRingReleaseAt = 0L
+    private val RING_RELEASE_INTERVAL_MS = 5_000L
+
     /** RING_CONNECT_INFO for the paired ring. False when the glasses aren't
      *  booted or no ring MAC is known. */
     private fun sendRingConnectInfo(connect: Boolean, tag: String): Boolean {
@@ -6788,11 +6791,15 @@ class G2 : SGCManager() {
             // source unspecified, so the id alone also marks the ring.
             val fromRing = eventSource == 2 || eventType == OsEventType.RING_TOUCH_DOWN
             if (fromRing && !ringViaGlasses) {
-                // The phone link owns ring input; the glasses shouldn't hold
-                // the ring at all, so this is a stale link — drop it again.
-                Bridge.log("G2: ring $gestureName via glasses ignored (ring routed via phone)")
-                releaseController()
-                return@let
+                // The ring only reports touch to one peer, so this input is
+                // real and must flow — but the glasses shouldn't hold the ring
+                // while it is phone-routed. Ask them to let go (not per event).
+                val now = System.currentTimeMillis()
+                if (now - lastRingReleaseAt > RING_RELEASE_INTERVAL_MS) {
+                    lastRingReleaseAt = now
+                    Bridge.log("G2: ring $gestureName via glasses while phone-routed — releasing ring")
+                    releaseController()
+                }
             }
 
             Bridge.sendTouchEvent(DeviceTypes.G2, gestureName, timestamp, eventSource)

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.537",
-    "releaseSetId": "glassly-0.3.1-dev.537",
-    "sourceCommit": "2cb6ba96b1141a7d23dc38cb1ce44e6ede4f305a",
+    "releaseIdentity": "0.3.1-dev.538",
+    "releaseSetId": "glassly-0.3.1-dev.538",
+    "sourceCommit": "3c004fd397951d67d68c6a6dcfda389afb5a2bc0",
     "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.537\",\n  \"releaseSetId\": \"glassly-0.3.1-dev.537\",\n  \"sourceCommit\": \"2cb6ba96b1141a7d23dc38cb1ce44e6ede4f305a\",\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.538\",\n  \"releaseSetId\": \"glassly-0.3.1-dev.538\",\n  \"sourceCommit\": \"3c004fd397951d67d68c6a6dcfda389afb5a2bc0\",\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.537"
+    private static let swiftPackageSdkVersion = "0.3.1-dev.538"
     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.537"
-    static let releaseSetId = "glassly-0.3.1-dev.537"
-    static let sourceCommit = "2cb6ba96b1141a7d23dc38cb1ce44e6ede4f305a"
+    static let releaseIdentity = "0.3.1-dev.538"
+    static let releaseSetId = "glassly-0.3.1-dev.538"
+    static let sourceCommit = "3c004fd397951d67d68c6a6dcfda389afb5a2bc0"
     static let otaManifestUrl = ""
     static let otaManifestSha256 = ""
 }

package/ios/Source/controllers/R1.swift

@@ -12,6 +12,24 @@ import Foundation
 // MARK: - R1 BLE Constants
 
 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).
+    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) }
+        let flipped = Array(addr.reversed())
+        if hex([flipped[3], flipped[2], flipped[1]]) == ringId.uppercased() { return Data(flipped) }
+        return nil
+    }
+
     /// Ring custom service
     static let SERVICE_UUID = CBUUID(string: "BAE80001-4F05-4503-8E65-3AF1F7329D1F")
 
@@ -491,14 +509,10 @@ class R1: NSObject, ControllerManager {
         applyRoute(viaGlasses: viaGlasses)
     }
 
-    /// One emit path for both direct parsers: dropped while the ring is
-    /// debug-routed via the glasses so a lingering phone-side report can't
-    /// double up with the CFW relay.
+    /// One emit path for both direct parsers. The ring reports touch to a
+    /// single peer, so whatever arrives here is the only copy — forward it
+    /// whichever route is configured.
     private func emitGesture(_ gestureName: String, timestamp: Int64, via: String) {
-        guard !routeViaGlasses else {
-            Bridge.log("R1: \(via) \(gestureName) ignored (ring routed via glasses)")
-            return
-        }
         Bridge.log("R1: \(via): \(gestureName)")
         Bridge.sendTouchEvent(
             deviceModel: ControllerTypes.R1,
@@ -761,8 +775,10 @@ extension R1: CBCentralManagerDelegate {
                 Bridge.log(
                     "R1: mfgData: \(mfgData.map { String(format: "%02X", $0) }.joined(separator: " "))"
                 )
-                if mfgData.count >= 6 {
-                    self.ringMacAddressMap[name ?? ""] = Data(mfgData.suffix(6))
+                if let mac = R1BLE.macAddress(mfgData: mfgData, ringId: name.flatMap(self.extractRingId)) {
+                    self.ringMacAddressMap[name ?? ""] = mac
+                } else {
+                    Bridge.log("R1: mfgData carries no address matching \(name ?? "?")")
                 }
             }
 

package/ios/Source/sgcs/G2.swift

@@ -5820,6 +5820,9 @@ final class G2: NSObject, SGCManager {
         DeviceStore.shared.get("bluetooth", "ring_via_glasses") as? Bool ?? false
     }
 
+    private var lastRingReleaseAt: TimeInterval = 0
+    private let RING_RELEASE_INTERVAL_S: TimeInterval = 5
+
     /// RING_CONNECT_INFO for the paired ring. False when the glasses aren't
     /// booted or no ring MAC is known.
     @discardableResult
@@ -7095,11 +7098,15 @@ final class G2: NSObject, SGCManager {
             // source unspecified, so the id alone also marks the ring.
             let fromRing = eventSource == 2 || eventType == .ringTouchDown
             if fromRing, !ringViaGlasses {
-                // The phone link owns ring input; the glasses shouldn't hold
-                // the ring at all, so this is a stale link — drop it again.
-                Bridge.log("G2: ring \(gestureName) via glasses ignored (ring routed via phone)")
-                releaseController()
-                return
+                // The ring only reports touch to one peer, so this input is
+                // real and must flow — but the glasses shouldn't hold the ring
+                // while it is phone-routed. Ask them to let go (not per event).
+                let now = Date().timeIntervalSince1970
+                if now - lastRingReleaseAt > RING_RELEASE_INTERVAL_S {
+                    lastRingReleaseAt = now
+                    Bridge.log("G2: ring \(gestureName) via glasses while phone-routed — releasing ring")
+                    releaseController()
+                }
             }
 
             Bridge.sendTouchEvent(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glassly/bluetooth-sdk",
-  "version": "0.3.1-dev.537",
+  "version": "0.3.1-dev.538",
   "description": "SDK for communicating with smart glasses",
   "main": "build/index.js",
   "react-native": "src/index.ts",

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.537",
-  "releaseSetId": "glassly-0.3.1-dev.537",
-  "sourceCommit": "2cb6ba96b1141a7d23dc38cb1ce44e6ede4f305a",
+  "releaseIdentity": "0.3.1-dev.538",
+  "releaseSetId": "glassly-0.3.1-dev.538",
+  "sourceCommit": "3c004fd397951d67d68c6a6dcfda389afb5a2bc0",
   "otaManifestUrl": null,
   "otaManifestSha256": null
 })