@tempivo/sensor-beacon 0.3.3 → 0.4.7

package/ios/TempivoSensorBeaconModule.swift

@@ -1,8 +1,20 @@
 import CoreBluetooth
 import ExpoModulesCore
+import Foundation
 
-public class TempivoSensorBeaconModule: Module, TempivoSensorBeaconScannerDelegate {
+#if canImport(TempivoSensorBridge)
+import TempivoSensorBridge
+#endif
+
+public class TempivoSensorBeaconModule: Module {
+  #if canImport(TempivoSensorBridge)
+  private let scanBridge = TempivoSensorBridge()
+  private var sdkScanHandler: SensorSdkScanHandler?
+  fileprivate var sdkScanActive = false
+  private var lastSeenBySerial: [String: (deviceId: String, mac: String)] = [:]
+  #else
   private var scanner: TempivoSensorBeaconScanner?
+  #endif
   private let session = TempivoSensorSession()
 
   public func definition() -> ModuleDefinition {
@@ -10,26 +22,60 @@ public class TempivoSensorBeaconModule: Module, TempivoSensorBeaconScannerDelega
     Events("onDeviceFound")
 
     AsyncFunction("requestPermissions") { () -> [String: Any] in
-      _ = self.requireScanner()
+      #if canImport(TempivoSensorBridge)
+      self.scanBridge.initialize()
+      #else
+      _ = self.requireCbScanner()
+      #endif
       return self.permissionPayload()
     }
 
     AsyncFunction("startScan") {
-      self.requireScanner().startScanning()
+      #if canImport(TempivoSensorBridge)
+      self.scanBridge.initialize()
+      self.sdkScanActive = true
+      if self.sdkScanHandler == nil {
+        self.sdkScanHandler = SensorSdkScanHandler(module: self)
+      }
+      self.scanBridge.setDeviceScanHandler(handler: self.sdkScanHandler)
+      self.scanBridge.startDeviceScan()
+      #else
+      self.requireCbScanner().startScanning()
+      #endif
     }
 
     Function("stopScan") {
+      #if canImport(TempivoSensorBridge)
+      self.sdkScanActive = false
+      self.scanBridge.stopDeviceScan()
+      self.scanBridge.setDeviceScanHandler(handler: nil)
+      #else
       self.scanner?.stopScanning()
+      #endif
     }
 
     Function("isScanning") { () -> Bool in
-      self.scanner?.scanning ?? false
+      #if canImport(TempivoSensorBridge)
+      return self.sdkScanActive
+      #else
+      return self.scanner?.scanning ?? false
+      #endif
     }
 
     AsyncFunction("connect") { (qrJson: String) -> [String: Any] in
       do {
+        #if canImport(TempivoSensorBridge)
+        self.pauseSdkScanForGatt()
+        #else
+        self.scanner?.stopScanning()
+        #endif
         let qr = try TempivoSensorQrParser.parse(qrJson)
-        try self.session.connect(qr: qr)
+        let resolved = self.resolveConnectTarget(qr: qr)
+        try self.session.connect(
+          qr: qr,
+          deviceId: resolved.deviceId,
+          bluetoothMac: resolved.bluetoothMac
+        )
         return self.qrPayload(qr)
       } catch {
         throw self.mapError(error)
@@ -59,7 +105,7 @@ public class TempivoSensorBeaconModule: Module, TempivoSensorBeaconScannerDelega
     AsyncFunction("triggerTransmission") { () -> [String: Any] in
       do {
         let result = try self.session.triggerTransmission()
-        return ["ok": result.ok, "supported": result.supported]
+        return ["ok": result.ok]
       } catch {
         throw self.mapError(error)
       }
@@ -68,33 +114,29 @@ public class TempivoSensorBeaconModule: Module, TempivoSensorBeaconScannerDelega
     AsyncFunction("getCalibration") { () -> [String: Any] in
       do {
         let cal = try self.session.getCalibration()
-        var payload: [String: Any] = [:]
-        if let date = cal.laboratoryCalibrationDate {
-          payload["laboratoryCalibrationDate"] = date
-        }
-        if let ts = cal.laboratoryCalibrationTimestamp {
-          payload["laboratoryCalibrationTimestamp"] = Int(ts)
-        }
-        return payload
+        return [
+          "laboratoryCalibrationDate": cal.laboratoryCalibrationDate as Any,
+          "laboratoryCalibrationTimestamp": cal.laboratoryCalibrationTimestamp.map { Int($0) } as Any,
+        ]
       } catch {
         throw self.mapError(error)
       }
     }
 
     OnDestroy {
+      #if canImport(TempivoSensorBridge)
+      self.sdkScanActive = false
+      self.scanBridge.stopDeviceScan()
+      self.scanBridge.setDeviceScanHandler(handler: nil)
+      #else
       self.scanner?.stopScanning()
+      #endif
       self.session.disconnect()
     }
   }
 
-  public func sensorBeaconScanner(
-    _ scanner: TempivoSensorBeaconScanner,
-    didDiscover discovery: SensorBeaconDiscovery
-  ) {
-    sendEvent("onDeviceFound", devicePayload(discovery))
-  }
-
-  private func requireScanner() -> TempivoSensorBeaconScanner {
+  #if !canImport(TempivoSensorBridge)
+  private func requireCbScanner() -> TempivoSensorBeaconScanner {
     if let scanner {
       return scanner
     }
@@ -103,11 +145,129 @@ public class TempivoSensorBeaconModule: Module, TempivoSensorBeaconScannerDelega
     scanner = created
     return created
   }
+  #endif
+
+  #if canImport(TempivoSensorBridge)
+  fileprivate func rememberSeenDevice(_ payload: [String: Any]) {
+    guard let deviceId = payload["deviceId"] as? String,
+          let mac = payload["bluetoothMacAddress"] as? String else { return }
+    let serial = (payload["serialNumber"] as? String)?
+      .trimmingCharacters(in: .whitespacesAndNewlines)
+      .uppercased()
+    if let serial, !serial.isEmpty {
+      lastSeenBySerial[serial] = (deviceId, mac)
+    }
+    let macKey = mac.replacingOccurrences(of: ":", with: "").uppercased()
+    if macKey.count == 12 {
+      lastSeenBySerial[macKey] = (deviceId, mac)
+    }
+  }
+
+  fileprivate func pauseSdkScanForGatt() {
+    sdkScanActive = false
+    scanBridge.stopDeviceScan()
+    scanBridge.setDeviceScanHandler(handler: nil)
+  }
+
+  private func resolveConnectTarget(qr: TempivoSensorQr) -> (deviceId: String, bluetoothMac: String) {
+    let serialKey = TempivoSensorQrParser.normalizeSerial(qr.serial)
+    let seen = lastSeenBySerial[serialKey] ?? lastSeenBySerial[String(serialKey.suffix(12))]
+    let deviceId = qr.deviceId ?? seen?.deviceId ?? serialKey
+    let mac = seen?.mac ?? qr.bluetoothMac
+    return (deviceId, mac)
+  }
+
+  fileprivate func devicePayloadFromBridgeJson(_ json: String) -> [String: Any]? {
+    guard let data = json.data(using: .utf8),
+          let dict = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
+      return nil
+    }
+    guard let deviceId = dict["deviceId"] as? String else { return nil }
+    var payload: [String: Any] = ["deviceId": deviceId]
+    if let rssi = dict["rssi"] as? Int {
+      payload["rssi"] = rssi
+    } else if let rssi = dict["rssi"] as? Double {
+      payload["rssi"] = Int(rssi)
+    }
+    if let serial = dict["serialNumber"] as? String {
+      payload["serialNumber"] = serial
+    }
+    if let mac = dict["bluetoothMacAddress"] as? String {
+      payload["bluetoothMacAddress"] = mac
+    }
+    if let model = dict["model"] as? String, !model.isEmpty {
+      payload["model"] = model
+    } else if let telem = dict["advertisementTelemetry"] as? [String: Any],
+              let firmware = telem["firmware"] as? String {
+      payload["model"] = TempivoSensorModelHint.fromFirmware(firmware)
+    } else {
+      payload["model"] = TempivoSensorModelHint.defaultModel
+    }
+    if let summary = dict["advertisementSummary"] as? String, !summary.isEmpty {
+      payload["summary"] = summary
+    }
+    if let telem = dict["advertisementTelemetry"] as? [String: Any] {
+      payload["telemetry"] = telemetryPayloadFromBridge(telem)
+      if payload["summary"] == nil, let s = telem["summary"] as? String, !s.isEmpty {
+        payload["summary"] = s
+      }
+    }
+    if payload["summary"] == nil {
+      payload["summary"] = payload["serialNumber"] as? String ?? deviceId
+    }
+    rememberSeenDevice(payload)
+    return payload
+  }
+
+  private func telemetryPayloadFromBridge(_ telem: [String: Any]) -> [String: Any] {
+    var payload: [String: Any] = [:]
+    if let firmware = telem["firmware"] as? String { payload["firmware"] = firmware }
+    if let batteryOk = telem["batteryOk"] as? Bool { payload["batteryOk"] = batteryOk }
+    if let encryptionEnabled = telem["encryptionEnabled"] as? Bool {
+      payload["encryptionEnabled"] = encryptionEnabled
+    }
+    if let cellularStatus = telem["cellularStatus"] as? String {
+      payload["cellularStatus"] = cellularStatus
+    }
+    if let measurementCounter = telem["measurementCounter"] as? Int {
+      payload["measurementCounter"] = measurementCounter
+    } else if let measurementCounter = telem["measurementCounter"] as? Int64 {
+      payload["measurementCounter"] = Int(measurementCounter)
+    }
+    if let readingTimestampUnix = telem["readingTimestampUnix"] as? Int {
+      payload["readingTimestampUnix"] = readingTimestampUnix
+    } else if let readingTimestampUnix = telem["readingTimestampUnix"] as? Int64 {
+      payload["readingTimestampUnix"] = Int(readingTimestampUnix)
+    }
+    if let periodBase = telem["periodBaseSeconds"] as? Int,
+       let periodFactor = telem["periodFactor"] as? Int,
+       periodBase > 0 {
+      payload["measurementIntervalSeconds"] = periodBase * max(periodFactor, 1)
+    }
+    if let readings = telem["readings"] as? [[String: Any]] {
+      payload["readings"] = readings.map { row in
+        var out: [String: Any] = [:]
+        if let typeHex = row["typeHex"] as? String { out["typeHex"] = typeHex }
+        if let text = row["text"] as? String { out["text"] = text }
+        if let raw24 = row["raw24"] as? Int { out["raw24"] = raw24 }
+        return out
+      }
+    } else {
+      payload["readings"] = [] as [[String: Any]]
+    }
+    if let readingsCount = telem["readingsCount"] as? Int {
+      payload["readingsCount"] = readingsCount
+    }
+    if let summary = telem["summary"] as? String {
+      payload["summary"] = summary
+    }
+    return payload
+  }
+  #endif
 
   private func permissionPayload() -> [String: Any] {
     if #available(iOS 13.1, *) {
       let status = CBManager.authorization
-      let granted = status == .allowedAlways
       let statusName: String
       switch status {
       case .allowedAlways: statusName = "granted"
@@ -115,7 +275,7 @@ public class TempivoSensorBeaconModule: Module, TempivoSensorBeaconScannerDelega
       default: statusName = "denied"
       }
       return [
-        "granted": granted,
+        "granted": status == .allowedAlways || status == .notDetermined,
         "status": statusName,
         "canAskAgain": status == .notDetermined,
         "expires": "never",
@@ -156,6 +316,9 @@ public class TempivoSensorBeaconModule: Module, TempivoSensorBeaconScannerDelega
     if let reading = discovery.reading {
       payload["summary"] = reading.summary
       payload["telemetry"] = telemetryPayload(reading)
+      payload["model"] = TempivoSensorModelHint.fromFirmware(reading.firmware)
+    } else {
+      payload["model"] = TempivoSensorModelHint.defaultModel
     }
     return payload
   }
@@ -193,6 +356,33 @@ public class TempivoSensorBeaconModule: Module, TempivoSensorBeaconScannerDelega
   }
 }
 
+#if canImport(TempivoSensorBridge)
+private final class SensorSdkScanHandler: SensorDeviceScanHandler {
+  private weak var module: TempivoSensorBeaconModule?
+
+  init(module: TempivoSensorBeaconModule) {
+    self.module = module
+  }
+
+  override func onDevice(deviceJson: String) {
+    guard let module, module.sdkScanActive else { return }
+    guard let payload = module.devicePayloadFromBridgeJson(deviceJson) else { return }
+    module.sendEvent("onDeviceFound", payload)
+  }
+}
+#endif
+
+#if !canImport(TempivoSensorBridge)
+extension TempivoSensorBeaconModule: TempivoSensorBeaconScannerDelegate {
+  public func sensorBeaconScanner(
+    _ scanner: TempivoSensorBeaconScanner,
+    didDiscover discovery: SensorBeaconDiscovery
+  ) {
+    sendEvent("onDeviceFound", devicePayload(discovery))
+  }
+}
+#endif
+
 internal final class SensorBeaconException: Exception {
   private let customCode: String
   private let customReason: String

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tempivo/sensor-beacon",
-  "version": "0.3.3",
+  "version": "0.4.7",
   "description": "Tempivo sensor BLE SDK for Expo, React Native, Android, iOS, and Node.",
   "homepage": "https://app.tempivo.com/integrations",
   "repository": {
@@ -40,7 +40,8 @@
     "expo-module.config.json",
     "ios",
     "LICENSE",
-    "README.md"
+    "README.md",
+    "CHANGELOG.md"
   ],
   "publishConfig": {
     "access": "public"