@tempivo/sensor-beacon 0.4.3 → 0.4.7

package/dist/session-types.d.ts

@@ -60,6 +60,8 @@ export type TempivoSensorQr = {
     /** Always `modern` (HC7 GATT). */
     sessionType: TempivoSensorSessionType;
     bluetoothMac: string;
+    /** SDK scan `deviceId` when it differs from sticker serial. */
+    deviceId?: string;
 };
 export type TempivoSensorCalibration = {
     laboratoryCalibrationDate: string | null;
@@ -67,5 +69,4 @@ export type TempivoSensorCalibration = {
 };
 export type TempivoTriggerTransmissionResult = {
     ok: boolean;
-    supported: boolean;
 };

package/ios/Frameworks/TempivoSensorBridge.xcframework/ios-arm64/TempivoSensorBridge.framework/Headers/TempivoSensorBridge.h

@@ -6,6 +6,8 @@
 #import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 
+@class TSBSensorDeviceScanHandler;
+
 NS_ASSUME_NONNULL_BEGIN
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunknown-warning-option"
@@ -140,17 +142,42 @@ __attribute__((swift_name("KotlinBoolean")))
 + (instancetype)numberWithBool:(BOOL)value;
 @end
 
+
+/**
+ * Swift receives [TempivoSensorBridge.startDeviceScan] events here.
+ * JSON matches the inner device object from Android scan (MAC, serial, advertisementTelemetry).
+ */
+__attribute__((swift_name("SensorDeviceScanHandler")))
+@interface TSBSensorDeviceScanHandler : TSBBase
+
+/**
+ * Swift receives [TempivoSensorBridge.startDeviceScan] events here.
+ * JSON matches the inner device object from Android scan (MAC, serial, advertisementTelemetry).
+ */
+- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
+
+/**
+ * Swift receives [TempivoSensorBridge.startDeviceScan] events here.
+ * JSON matches the inner device object from Android scan (MAC, serial, advertisementTelemetry).
+ */
++ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
+- (void)onDeviceDeviceJson:(NSString *)deviceJson __attribute__((swift_name("onDevice(deviceJson:)")));
+@end
+
 __attribute__((objc_subclassing_restricted))
 __attribute__((swift_name("TempivoSensorBridge")))
 @interface TSBTempivoSensorBridge : TSBBase
 - (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
 + (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
-- (NSString *)connectPayloadJsonSerial:(NSString *)serial bluetoothMac:(NSString *)bluetoothMac pin:(int32_t)pin legacy:(BOOL)legacy __attribute__((swift_name("connectPayloadJson(serial:bluetoothMac:pin:legacy:)")));
+- (NSString *)connectPayloadJsonDeviceId:(NSString *)deviceId bluetoothMac:(NSString *)bluetoothMac pin:(NSString *)pin legacy:(BOOL)legacy __attribute__((swift_name("connectPayloadJson(deviceId:bluetoothMac:pin:legacy:)")));
 - (void)disconnect __attribute__((swift_name("disconnect()")));
 - (NSString *)getCalibrationPayloadJson __attribute__((swift_name("getCalibrationPayloadJson()")));
 - (NSString *)getConfigurationPayloadJson __attribute__((swift_name("getConfigurationPayloadJson()")));
 - (void)initialize __attribute__((swift_name("initialize()")));
 - (NSString *)setConfigurationPayloadJsonJson:(NSString *)json __attribute__((swift_name("setConfigurationPayloadJson(json:)")));
+- (void)setDeviceScanHandlerHandler:(TSBSensorDeviceScanHandler * _Nullable)handler __attribute__((swift_name("setDeviceScanHandler(handler:)")));
+- (void)startDeviceScan __attribute__((swift_name("startDeviceScan()")));
+- (void)stopDeviceScan __attribute__((swift_name("stopDeviceScan()")));
 - (NSString *)triggerTransmissionPayloadJson __attribute__((swift_name("triggerTransmissionPayloadJson()")));
 @end
 

package/ios/Frameworks/TempivoSensorBridge.xcframework/ios-arm64-simulator/TempivoSensorBridge.framework/Headers/TempivoSensorBridge.h

@@ -6,6 +6,8 @@
 #import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 
+@class TSBSensorDeviceScanHandler;
+
 NS_ASSUME_NONNULL_BEGIN
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunknown-warning-option"
@@ -140,17 +142,42 @@ __attribute__((swift_name("KotlinBoolean")))
 + (instancetype)numberWithBool:(BOOL)value;
 @end
 
+
+/**
+ * Swift receives [TempivoSensorBridge.startDeviceScan] events here.
+ * JSON matches the inner device object from Android scan (MAC, serial, advertisementTelemetry).
+ */
+__attribute__((swift_name("SensorDeviceScanHandler")))
+@interface TSBSensorDeviceScanHandler : TSBBase
+
+/**
+ * Swift receives [TempivoSensorBridge.startDeviceScan] events here.
+ * JSON matches the inner device object from Android scan (MAC, serial, advertisementTelemetry).
+ */
+- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
+
+/**
+ * Swift receives [TempivoSensorBridge.startDeviceScan] events here.
+ * JSON matches the inner device object from Android scan (MAC, serial, advertisementTelemetry).
+ */
++ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
+- (void)onDeviceDeviceJson:(NSString *)deviceJson __attribute__((swift_name("onDevice(deviceJson:)")));
+@end
+
 __attribute__((objc_subclassing_restricted))
 __attribute__((swift_name("TempivoSensorBridge")))
 @interface TSBTempivoSensorBridge : TSBBase
 - (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
 + (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
-- (NSString *)connectPayloadJsonSerial:(NSString *)serial bluetoothMac:(NSString *)bluetoothMac pin:(int32_t)pin legacy:(BOOL)legacy __attribute__((swift_name("connectPayloadJson(serial:bluetoothMac:pin:legacy:)")));
+- (NSString *)connectPayloadJsonDeviceId:(NSString *)deviceId bluetoothMac:(NSString *)bluetoothMac pin:(NSString *)pin legacy:(BOOL)legacy __attribute__((swift_name("connectPayloadJson(deviceId:bluetoothMac:pin:legacy:)")));
 - (void)disconnect __attribute__((swift_name("disconnect()")));
 - (NSString *)getCalibrationPayloadJson __attribute__((swift_name("getCalibrationPayloadJson()")));
 - (NSString *)getConfigurationPayloadJson __attribute__((swift_name("getConfigurationPayloadJson()")));
 - (void)initialize __attribute__((swift_name("initialize()")));
 - (NSString *)setConfigurationPayloadJsonJson:(NSString *)json __attribute__((swift_name("setConfigurationPayloadJson(json:)")));
+- (void)setDeviceScanHandlerHandler:(TSBSensorDeviceScanHandler * _Nullable)handler __attribute__((swift_name("setDeviceScanHandler(handler:)")));
+- (void)startDeviceScan __attribute__((swift_name("startDeviceScan()")));
+- (void)stopDeviceScan __attribute__((swift_name("stopDeviceScan()")));
 - (NSString *)triggerTransmissionPayloadJson __attribute__((swift_name("triggerTransmissionPayloadJson()")));
 @end
 

package/ios/Sources/TempivoSensorBeacon/TempivoSensorBeaconDecoder.swift

@@ -250,6 +250,13 @@ public enum TempivoSensorBeaconDecoder {
         return (n >> 1) ^ (-(n & 1))
     }
 
+    private static func measurementTypeLabel(_ mtype: UInt8) -> String {
+        guard let spec = measureTypes[mtype] else {
+            return "type_\(String(format: "%02x", mtype))"
+        }
+        return spec.name.lowercased()
+    }
+
     private static func decodeSlot(mtype: UInt8, raw24: UInt32) -> String {
         guard let spec = measureTypes[mtype] else {
             return String(format: "0x%02X: 0x%06X", mtype, raw24)
@@ -356,7 +363,7 @@ public enum TempivoSensorBeaconDecoder {
                 summaryParts.append(text)
                 readings.append(
                     SensorBeaconMeasurement(
-                        typeHex: String(format: "0x%02X", mtype),
+                        typeHex: measurementTypeLabel(mtype),
                         raw24: Int(raw24 & 0xFFFFFF),
                         text: text
                     )

package/ios/Sources/TempivoSensorBeacon/TempivoSensorBeaconScanner.swift

@@ -17,6 +17,7 @@ public final class TempivoSensorBeaconScanner: NSObject {
 
     private var central: CBCentralManager!
     private var frameCache = SensorBeaconFrameCache()
+    private var peripheralIdToSerialKey: [String: String] = [:]
     private var isScanning = false
     private var pendingStart = false
 
@@ -36,6 +37,7 @@ public final class TempivoSensorBeaconScanner: NSObject {
     /// Clears cached `0x03` / `0x04` frames. Does not stop an active scan.
     public func clearCache() {
         frameCache.clear()
+        peripheralIdToSerialKey.removeAll(keepingCapacity: false)
     }
 
     /// Starts an active scan (duplicate advertisements allowed). Requires Bluetooth powered on.
@@ -109,13 +111,20 @@ public final class TempivoSensorBeaconScanner: NSObject {
             if let mac = TempivoSensorBeaconDecoder.macFromManufacturerData(mdata) {
                 bluetoothMacAddress = mac
                 serialNumber = TempivoSensorBeaconDecoder.macKey(mac)
+                if let serialNumber {
+                    peripheralIdToSerialKey[deviceId] = serialNumber.uppercased()
+                }
             }
-            let primaryKey = serialNumber ?? deviceId
+            let serialHint = serialNumber ?? peripheralIdToSerialKey[deviceId]
+            let primaryKey = serialHint ?? deviceId
             _ = TempivoSensorBeaconDecoder.ingestManufacturerData(
                 mdata,
                 primaryMacKey: primaryKey,
                 cache: &frameCache
             )
+            if serialNumber == nil {
+                serialNumber = serialHint
+            }
         }
 
         let keys = cacheKeys(serial: serialNumber, macWithColons: bluetoothMacAddress, deviceId: deviceId)

package/ios/Sources/TempivoSensorBeacon/TempivoSensorModelHint.swift

@@ -0,0 +1,29 @@
+import Foundation
+
+enum TempivoSensorModelHint {
+    static let defaultModel = "HC7"
+
+    static func isMissingFirmware(_ firmware: String?) -> Bool {
+        let t = firmware?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        return t.isEmpty || t == "0.0.0"
+    }
+
+    static func fromFirmware(_ firmware: String?) -> String {
+        if isMissingFirmware(firmware) { return defaultModel }
+        let t = firmware!.trimmingCharacters(in: .whitespacesAndNewlines)
+        if t.range(of: "^FW 5", options: [.regularExpression, .caseInsensitive]) != nil {
+            return "HC5"
+        }
+        let pattern = #"^(?:FW\s*)?(\d+)\.\d+"#
+        guard let regex = try? NSRegularExpression(pattern: pattern, options: .caseInsensitive),
+              let match = regex.firstMatch(in: t, range: NSRange(t.startIndex..., in: t)),
+              match.numberOfRanges > 1,
+              let majorRange = Range(match.range(at: 1), in: t),
+              let major = Int(t[majorRange]) else {
+            return defaultModel
+        }
+        if major >= 7 { return "HC7" }
+        if major >= 1 { return "HC5" }
+        return defaultModel
+    }
+}

package/ios/Sources/TempivoSensorBeacon/TempivoSensorProfile.swift

@@ -10,7 +10,24 @@ public enum TempivoSensorProfile {
         return try parse(obj)
     }
 
+    public static func parseFromDevice(_ obj: [String: Any]) throws -> TempivoSensorConfiguration {
+        try parseBody(obj, validatePartnerLimits: false)
+    }
+
+    public static func parseFromDevice(json: String) throws -> TempivoSensorConfiguration {
+        guard let data = json.data(using: .utf8),
+              let obj = try? JSONSerialization.jsonObject(with: data) as? [String: Any]
+        else {
+            throw TempivoSensorError(.invalidConfig, "Configuration is not valid JSON.")
+        }
+        return try parseFromDevice(obj)
+    }
+
     public static func parse(_ obj: [String: Any]) throws -> TempivoSensorConfiguration {
+        try parseBody(obj, validatePartnerLimits: true)
+    }
+
+    private static func parseBody(_ obj: [String: Any], validatePartnerLimits: Bool) throws -> TempivoSensorConfiguration {
         if obj["profiles"] is [Any] {
             throw TempivoSensorError(.invalidConfig, "Pass one profile from GET /devices/config-profiles/{slug}, not the list.")
         }
@@ -30,7 +47,7 @@ public enum TempivoSensorProfile {
         }
         let rawAlerts = body["temperatureAlerts"] as? [Any] ?? []
         let alerts = try rawAlerts.enumerated().map { try parseAlert($0.element, index: $0.offset) }
-        let intervals = try parseOptionalIntervals(body)
+        let intervals = try parseOptionalIntervals(body, validatePartnerLimits: validatePartnerLimits)
         return TempivoSensorConfiguration(
             temperatureAlerts: alerts,
             schedule: try parseSchedule(body["schedule"] as? [String: Any]),
@@ -78,18 +95,23 @@ public enum TempivoSensorProfile {
     private static let minTransmissionSeconds = 3600
     private static let maxTransmissionSeconds = 604_800
 
-    private static func parseOptionalIntervals(_ body: [String: Any]) throws -> (measurement: Double?, transmission: Int?) {
+    private static func parseOptionalIntervals(
+        _ body: [String: Any],
+        validatePartnerLimits: Bool
+    ) throws -> (measurement: Double?, transmission: Int?) {
         var measurement: Double?
         var transmission: Int?
         if body["measurementIntervalMinutes"] != nil {
             guard let n = number(body["measurementIntervalMinutes"]), n > 0 else {
                 throw TempivoSensorError(.invalidConfig, "measurementIntervalMinutes must be a positive number.")
             }
-            if n < minMeasurementMinutes {
-                throw TempivoSensorError(.invalidConfig, "measurementIntervalMinutes must be at least \(Int(minMeasurementMinutes)) (1 hour).")
-            }
-            if n > maxMeasurementMinutes {
-                throw TempivoSensorError(.invalidConfig, "measurementIntervalMinutes must be at most \(Int(maxMeasurementMinutes)).")
+            if validatePartnerLimits {
+                if n < minMeasurementMinutes {
+                    throw TempivoSensorError(.invalidConfig, "measurementIntervalMinutes must be at least \(Int(minMeasurementMinutes)) (1 hour).")
+                }
+                if n > maxMeasurementMinutes {
+                    throw TempivoSensorError(.invalidConfig, "measurementIntervalMinutes must be at most \(Int(maxMeasurementMinutes)).")
+                }
             }
             measurement = n
         }
@@ -98,15 +120,17 @@ public enum TempivoSensorProfile {
                 throw TempivoSensorError(.invalidConfig, "transmissionIntervalSeconds must be a positive integer.")
             }
             let sec = Int(n)
-            if sec < minTransmissionSeconds {
-                throw TempivoSensorError(.invalidConfig, "transmissionIntervalSeconds must be at least \(minTransmissionSeconds) (1 hour).")
-            }
-            if sec > maxTransmissionSeconds {
-                throw TempivoSensorError(.invalidConfig, "transmissionIntervalSeconds must be at most \(maxTransmissionSeconds).")
+            if validatePartnerLimits {
+                if sec < minTransmissionSeconds {
+                    throw TempivoSensorError(.invalidConfig, "transmissionIntervalSeconds must be at least \(minTransmissionSeconds) (1 hour).")
+                }
+                if sec > maxTransmissionSeconds {
+                    throw TempivoSensorError(.invalidConfig, "transmissionIntervalSeconds must be at most \(maxTransmissionSeconds).")
+                }
             }
             transmission = sec
         }
-        if let measurement, let transmission {
+        if validatePartnerLimits, let measurement, let transmission {
             let maxTx = measurement * 60 * 60
             if Double(transmission) > maxTx {
                 throw TempivoSensorError(.invalidConfig, "transmissionIntervalSeconds must be at most 60 times the measurement interval.")

package/ios/Sources/TempivoSensorBeacon/TempivoSensorQr.swift

@@ -6,6 +6,23 @@ public struct TempivoSensorQr: Sendable, Equatable {
     public let model: String?
     public let sessionType: TempivoSensorSessionType
     public let bluetoothMac: String
+    public let deviceId: String?
+
+    public init(
+        serial: String,
+        pin: String,
+        model: String?,
+        sessionType: TempivoSensorSessionType,
+        bluetoothMac: String,
+        deviceId: String? = nil
+    ) {
+        self.serial = serial
+        self.pin = pin
+        self.model = model
+        self.sessionType = sessionType
+        self.bluetoothMac = bluetoothMac
+        self.deviceId = deviceId
+    }
 }
 
 public enum TempivoSensorQrParser {
@@ -27,6 +44,14 @@ public enum TempivoSensorQrParser {
         }.joined(separator: ":")
     }
 
+    public static func normalizeMac(_ value: String) throws -> String {
+        let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines)
+        if trimmed.contains(":") {
+            return try bluetoothMacFromSerial(trimmed.replacingOccurrences(of: ":", with: ""))
+        }
+        return try bluetoothMacFromSerial(trimmed)
+    }
+
     public static let defaultModel = "HC7"
 
     public static func assertSupportedModel(_ model: String) throws {
@@ -63,12 +88,24 @@ public enum TempivoSensorQrParser {
         let model = rawModel.isEmpty ? defaultModel : rawModel
         try assertSupportedModel(model)
         let hex = serial.count == 12 ? serial : String(serial.suffix(12))
+        let macOverride =
+            (["bluetoothMac", "bluetoothMacAddress", "mac"] as [String])
+            .compactMap { key -> String? in
+                guard let raw = obj[key] as? String else { return nil }
+                let t = raw.trimmingCharacters(in: .whitespacesAndNewlines)
+                return t.isEmpty ? nil : t
+            }
+            .first
+        let deviceIdRaw = (obj["deviceId"] as? String)?
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+        let deviceId = (deviceIdRaw?.isEmpty == false) ? deviceIdRaw : nil
         return TempivoSensorQr(
             serial: serial,
             pin: pin,
             model: model,
             sessionType: .modern,
-            bluetoothMac: try bluetoothMacFromSerial(hex)
+            bluetoothMac: try macOverride.map(normalizeMac) ?? bluetoothMacFromSerial(hex),
+            deviceId: deviceId
         )
     }
 

package/ios/Sources/TempivoSensorBeacon/TempivoSensorSession.swift

@@ -15,22 +15,30 @@ public final class TempivoSensorSession: @unchecked Sendable {
 
     public init() {}
 
-    public func connect(serial: String, bluetoothMac: String, pin: String) throws {
-        guard let pinInt = Int32(pin.trimmingCharacters(in: .whitespacesAndNewlines)) else {
+    public func connect(
+        serial: String,
+        bluetoothMac: String,
+        pin: String,
+        deviceId: String? = nil
+    ) throws {
+        let pinValue = pin.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !pinValue.isEmpty, pinValue.range(of: "^[0-9]+$", options: .regularExpression) != nil else {
             throw TempivoSensorError(.invalidPin, "PIN must be numeric.")
         }
+        let trimmedDeviceId = deviceId?.trimmingCharacters(in: .whitespacesAndNewlines)
+        let resolvedDeviceId =
+            (trimmedDeviceId?.isEmpty == false ? trimmedDeviceId : nil)
+            ?? TempivoSensorQrParser.normalizeSerial(serial)
         #if canImport(TempivoSensorBridge)
         lock.lock()
         defer { lock.unlock() }
         bridge.initialize()
         let result = parseBridgeJson(
             bridge.connectPayloadJson(
-                serial: TempivoSensorQrParser.normalizeSerial(serial),
+                deviceId: resolvedDeviceId,
                 bluetoothMac: bluetoothMac,
-                pin: pinInt,
-                legacy: false,
-                deviceId: TempivoSensorQrParser.normalizeSerial(serial),
-                encryptionKey: ""
+                pin: pinValue,
+                legacy: false
             )
         )
         try throwIfBridgeError(result)
@@ -40,8 +48,13 @@ public final class TempivoSensorSession: @unchecked Sendable {
         #endif
     }
 
-    public func connect(qr: TempivoSensorQr) throws {
-        try connect(serial: qr.serial, bluetoothMac: qr.bluetoothMac, pin: qr.pin)
+    public func connect(qr: TempivoSensorQr, deviceId: String? = nil, bluetoothMac: String? = nil) throws {
+        try connect(
+            serial: qr.serial,
+            bluetoothMac: bluetoothMac ?? qr.bluetoothMac,
+            pin: qr.pin,
+            deviceId: deviceId ?? qr.deviceId
+        )
     }
 
     public func disconnect() {
@@ -58,7 +71,7 @@ public final class TempivoSensorSession: @unchecked Sendable {
     }
 
     public func getConfiguration() throws -> TempivoSensorConfiguration {
-        try TempivoSensorProfile.parse(json: getConfigurationJson())
+        try TempivoSensorProfile.parseFromDevice(json: getConfigurationJson())
     }
 
     public func getConfigurationJson() throws -> String {
@@ -98,8 +111,7 @@ public final class TempivoSensorSession: @unchecked Sendable {
             try throwIfBridgeError(result)
         }
         return TempivoTriggerTransmissionResult(
-            ok: (result["ok"] as? Bool) ?? false,
-            supported: (result["supported"] as? Bool) ?? false
+            ok: (result["ok"] as? Bool) ?? false
         )
         #else
         throw TempivoSensorError(.runtimeUnavailable, "Sensor GATT requires a physical device with the native runtime.")

package/ios/Sources/TempivoSensorBeacon/TempivoSensorSessionTypes.swift

@@ -92,10 +92,8 @@ public struct TempivoSensorCalibration: Sendable, Equatable {
 
 public struct TempivoTriggerTransmissionResult: Sendable, Equatable {
     public var ok: Bool
-    public var supported: Bool
 
-    public init(ok: Bool, supported: Bool) {
+    public init(ok: Bool) {
         self.ok = ok
-        self.supported = supported
     }
 }

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,6 +1,6 @@
 {
   "name": "@tempivo/sensor-beacon",
-  "version": "0.4.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"