@tempivo/sensor-beacon 0.4.3 → 1.1.0

package/dist/react-native.d.ts

@@ -5,8 +5,12 @@ export { MEASURE_SPECS, type MeasureSpec } from './measure-specs.js';
 export { createSensorBeaconFrameCache, type SensorBeaconFrameCache, type SensorBeaconMeasurement, type SensorBeaconReading, } from './types.js';
 export { TempivoSensorError, type TempivoSensorErrorCode } from './errors.js';
 export { DEFAULT_SENSOR_MODEL, bluetoothMacFromSerial, normalizeSensorSerial, encodeSensorPinPayload, parseSensorQrJson, sessionTypeFromModel, } from './qr.js';
+export { isMissingAdvertisementFirmware, sensorModelFromFirmware } from './model.js';
+export type { SensorStickerModel } from './model.js';
+export { buildSensorQrConnectJson, draftSensorQrConnectJsonFromScanDevice, formatSensorReadingLine, mergeScanTargetIntoSensorQr, normalizeSensorStickerModel, parseSensorQrForConnect, pinFromSensorQrRecord, resolveSensorBleConnectCredentialsFromPin, sensorQrConnectJsonFromLoose, sensorQrSerialMatchesSelected, serialHexFromSensorQrScan, tryParseSensorQrJson, } from './connect-helpers.js';
+export type { ParsedSensorQrLoose, SensorBleConnectCredentials } from './connect-helpers.js';
 export { calibrationFromExtendedJson, decodeLaboratoryCalibrationTimestamp, } from './calibration.js';
-export { BLE_MAX_MEASUREMENT_INTERVAL_MINUTES, BLE_MAX_TRANSMISSION_INTERVAL_SECONDS, BLE_MIN_MEASUREMENT_INTERVAL_MINUTES, BLE_MIN_TRANSMISSION_INTERVAL_SECONDS, DEFAULT_ALERT_HYSTERESIS_C, compileSensorProfileToBleJson, configurationFromApiProfile, parseSensorConfiguration, parseSensorConfigurationJson, pickPartnerConfigurationJson, } from './profile.js';
+export { BLE_MAX_MEASUREMENT_INTERVAL_MINUTES, BLE_MAX_TRANSMISSION_INTERVAL_SECONDS, BLE_MIN_MEASUREMENT_INTERVAL_MINUTES, BLE_MIN_TRANSMISSION_INTERVAL_SECONDS, DEFAULT_ALERT_HYSTERESIS_C, compileSensorProfileToBleJson, configurationFromApiProfile, parseSensorConfiguration, parseSensorConfigurationFromDevice, parseSensorConfigurationFromDeviceJson, parseSensorConfigurationJson, pickPartnerConfigurationJson, } from './profile.js';
 export type { TempivoSchedule, TempivoScheduleAlways, TempivoScheduleWeek, TempivoSensorCalibration, TempivoSensorConfiguration, TempivoSensorQr, TempivoSensorSessionType, TempivoTemperatureAlert, TempivoTemperatureChannel, TempivoTemperatureMaxAlert, TempivoTemperatureMinAlert, TempivoTemperatureRangeAlert, TempivoTriggerTransmissionResult, } from './session-types.js';
 export type { TempivoDeviceFoundSubscription, TempivoNativeCalibration, TempivoNativeMeasurement, TempivoNativePermissionResponse, TempivoNativePermissionStatus, TempivoNativeQr, TempivoNativeTelemetry, TempivoSensorBeaconDevice, } from './native-types.js';
 import * as native from './native-module.js';

package/dist/react-native.js

@@ -5,8 +5,10 @@ export { MEASURE_SPECS } from './measure-specs.js';
 export { createSensorBeaconFrameCache, } from './types.js';
 export { TempivoSensorError } from './errors.js';
 export { DEFAULT_SENSOR_MODEL, bluetoothMacFromSerial, normalizeSensorSerial, encodeSensorPinPayload, parseSensorQrJson, sessionTypeFromModel, } from './qr.js';
+export { isMissingAdvertisementFirmware, sensorModelFromFirmware } from './model.js';
+export { buildSensorQrConnectJson, draftSensorQrConnectJsonFromScanDevice, formatSensorReadingLine, mergeScanTargetIntoSensorQr, normalizeSensorStickerModel, parseSensorQrForConnect, pinFromSensorQrRecord, resolveSensorBleConnectCredentialsFromPin, sensorQrConnectJsonFromLoose, sensorQrSerialMatchesSelected, serialHexFromSensorQrScan, tryParseSensorQrJson, } from './connect-helpers.js';
 export { calibrationFromExtendedJson, decodeLaboratoryCalibrationTimestamp, } from './calibration.js';
-export { BLE_MAX_MEASUREMENT_INTERVAL_MINUTES, BLE_MAX_TRANSMISSION_INTERVAL_SECONDS, BLE_MIN_MEASUREMENT_INTERVAL_MINUTES, BLE_MIN_TRANSMISSION_INTERVAL_SECONDS, DEFAULT_ALERT_HYSTERESIS_C, compileSensorProfileToBleJson, configurationFromApiProfile, parseSensorConfiguration, parseSensorConfigurationJson, pickPartnerConfigurationJson, } from './profile.js';
+export { BLE_MAX_MEASUREMENT_INTERVAL_MINUTES, BLE_MAX_TRANSMISSION_INTERVAL_SECONDS, BLE_MIN_MEASUREMENT_INTERVAL_MINUTES, BLE_MIN_TRANSMISSION_INTERVAL_SECONDS, DEFAULT_ALERT_HYSTERESIS_C, compileSensorProfileToBleJson, configurationFromApiProfile, parseSensorConfiguration, parseSensorConfigurationFromDevice, parseSensorConfigurationFromDeviceJson, parseSensorConfigurationJson, pickPartnerConfigurationJson, } from './profile.js';
 import * as native from './native-module.js';
 export const isNativeSensorBeaconAvailable = native.isNativeSensorBeaconAvailable;
 export const requestPermissions = native.requestPermissions;

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/Info.plist

@@ -8,7 +8,7 @@
 			<key>BinaryPath</key>
 			<string>TempivoSensorBridge.framework/TempivoSensorBridge</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64-simulator</string>
 			<key>LibraryPath</key>
 			<string>TempivoSensorBridge.framework</string>
 			<key>SupportedArchitectures</key>
@@ -17,12 +17,14 @@
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>TempivoSensorBridge.framework/TempivoSensorBridge</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>TempivoSensorBridge.framework</string>
 			<key>SupportedArchitectures</key>
@@ -31,8 +33,6 @@
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

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
     }
 }