@tempivo/sensor-beacon 0.4.3 → 1.1.0

package/ios/TempivoSensorBeaconModule.swift

@@ -9,7 +9,9 @@ import TempivoSensorBridge
 public class TempivoSensorBeaconModule: Module {
   #if canImport(TempivoSensorBridge)
   private let scanBridge = TempivoSensorBridge()
-  private var sdkScanActive = false
+  private var sdkScanHandler: SensorSdkScanHandler?
+  fileprivate var sdkScanActive = false
+  private var lastSeenBySerial: [String: (deviceId: String, mac: String)] = [:]
   #else
   private var scanner: TempivoSensorBeaconScanner?
   #endif
@@ -32,11 +34,11 @@ public class TempivoSensorBeaconModule: Module {
       #if canImport(TempivoSensorBridge)
       self.scanBridge.initialize()
       self.sdkScanActive = true
-      self.scanBridge.startDeviceScan { json in
-        guard self.sdkScanActive else { return }
-        guard let payload = self.devicePayloadFromBridgeJson(json) else { return }
-        self.sendEvent("onDeviceFound", payload)
+      if self.sdkScanHandler == nil {
+        self.sdkScanHandler = SensorSdkScanHandler(module: self)
       }
+      self.scanBridge.setDeviceScanHandler(handler: self.sdkScanHandler)
+      self.scanBridge.startDeviceScan()
       #else
       self.requireCbScanner().startScanning()
       #endif
@@ -46,6 +48,7 @@ public class TempivoSensorBeaconModule: Module {
       #if canImport(TempivoSensorBridge)
       self.sdkScanActive = false
       self.scanBridge.stopDeviceScan()
+      self.scanBridge.setDeviceScanHandler(handler: nil)
       #else
       self.scanner?.stopScanning()
       #endif
@@ -61,8 +64,18 @@ public class TempivoSensorBeaconModule: Module {
 
     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)
@@ -92,7 +105,7 @@ public class TempivoSensorBeaconModule: Module {
     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)
       }
@@ -101,14 +114,10 @@ public class TempivoSensorBeaconModule: Module {
     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)
       }
@@ -118,6 +127,7 @@ public class TempivoSensorBeaconModule: Module {
       #if canImport(TempivoSensorBridge)
       self.sdkScanActive = false
       self.scanBridge.stopDeviceScan()
+      self.scanBridge.setDeviceScanHandler(handler: nil)
       #else
       self.scanner?.stopScanning()
       #endif
@@ -138,7 +148,36 @@ public class TempivoSensorBeaconModule: Module {
   #endif
 
   #if canImport(TempivoSensorBridge)
-  private func devicePayloadFromBridgeJson(_ json: String) -> [String: Any]? {
+  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
@@ -156,6 +195,14 @@ public class TempivoSensorBeaconModule: Module {
     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
     }
@@ -168,6 +215,7 @@ public class TempivoSensorBeaconModule: Module {
     if payload["summary"] == nil {
       payload["summary"] = payload["serialNumber"] as? String ?? deviceId
     }
+    rememberSeenDevice(payload)
     return payload
   }
 
@@ -268,6 +316,9 @@ public class TempivoSensorBeaconModule: Module {
     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
   }
@@ -305,6 +356,22 @@ public class TempivoSensorBeaconModule: Module {
   }
 }
 
+#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(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tempivo/sensor-beacon",
-  "version": "0.4.3",
-  "description": "Tempivo sensor BLE SDK for Expo, React Native, Android, iOS, and Node.",
+  "version": "1.1.0",
+  "description": "Tempivo sensor BLE SDK. Native scan and GATT for Expo, React Native, Android, and iOS. Node helpers decode advertisements and parse QR or config (no radio).",
   "homepage": "https://app.tempivo.com/integrations",
   "repository": {
     "type": "git",
@@ -40,7 +40,8 @@
     "expo-module.config.json",
     "ios",
     "LICENSE",
-    "README.md"
+    "README.md",
+    "CHANGELOG.md"
   ],
   "publishConfig": {
     "access": "public"