@tempivo/sensor-beacon 0.3.2 → 0.3.3

package/ios/Sources/TempivoSensorBeacon/TempivoSensorBeaconScanner.swift

@@ -1,10 +1,6 @@
 import CoreBluetooth
 import Foundation
 
-#if canImport(TempivoSensorBridge)
-import TempivoSensorBridge
-#endif
-
 public protocol TempivoSensorBeaconScannerDelegate: AnyObject {
     func sensorBeaconScanner(_ scanner: TempivoSensorBeaconScanner, didDiscover discovery: SensorBeaconDiscovery)
     func sensorBeaconScanner(_ scanner: TempivoSensorBeaconScanner, didUpdateState state: CBManagerState)
@@ -14,21 +10,15 @@ public extension TempivoSensorBeaconScannerDelegate {
     func sensorBeaconScanner(_ scanner: TempivoSensorBeaconScanner, didUpdateState state: CBManagerState) {}
 }
 
-/// Active BLE scan. iPhone uses the same hardware runtime scan as Tempivo.
-/// Manufacturer-only CoreBluetooth misses HC7 / FW 7+ on iPhone.
+/// Active BLE scan for Tempivo sensor beacons (manufacturer `0x026C`). Advertising only. No GATT or connect.
 public final class TempivoSensorBeaconScanner: NSObject {
 
     public weak var delegate: TempivoSensorBeaconScannerDelegate?
 
     private var central: CBCentralManager!
     private var frameCache = SensorBeaconFrameCache()
-    private var lastSeen: [String: TempivoSensorSeenDevice] = [:]
     private var isScanning = false
     private var pendingStart = false
-    #if canImport(TempivoSensorBridge)
-    private let runtime = TempivoSensorBridge()
-    private var useRuntimeScan: Bool { !ProcessInfo.processInfo.isiOSAppOnMac }
-    #endif
 
     public override init() {
         super.init()
@@ -46,25 +36,10 @@ public final class TempivoSensorBeaconScanner: NSObject {
     /// Clears cached `0x03` / `0x04` frames. Does not stop an active scan.
     public func clearCache() {
         frameCache.clear()
-        lastSeen.removeAll()
-    }
-
-    public func lookup(serial: String) -> TempivoSensorSeenDevice? {
-        lastSeen[TempivoSensorBeaconDecoder.macKey(serial)]
     }
 
-    /// Starts an active scan. iPhone: hardware runtime. Mac: manufacturer advertisements.
+    /// Starts an active scan (duplicate advertisements allowed). Requires Bluetooth powered on.
     public func startScanning() {
-        #if canImport(TempivoSensorBridge)
-        if useRuntimeScan {
-            runtime.initialize()
-            isScanning = true
-            runtime.startDeviceScan { [weak self] json in
-                self?.handleRuntimeScanJson(json)
-            }
-            return
-        }
-        #endif
         pendingStart = true
         if central.state == .poweredOn {
             beginScanningIfNeeded()
@@ -74,12 +49,8 @@ public final class TempivoSensorBeaconScanner: NSObject {
     /// Stops scanning and clears pending start.
     public func stopScanning() {
         pendingStart = false
-        #if canImport(TempivoSensorBridge)
-        runtime.stopDeviceScan()
-        #endif
-        if isScanning {
-            central.stopScan()
-        }
+        guard isScanning else { return }
+        central.stopScan()
         isScanning = false
     }
 
@@ -162,55 +133,8 @@ public final class TempivoSensorBeaconScanner: NSObject {
             bluetoothMacAddress: bluetoothMacAddress,
             reading: reading
         )
-        if let serial = (serialNumber ?? reading?.serialNumber).map({ TempivoSensorBeaconDecoder.macKey($0) }),
-           !serial.isEmpty {
-            let seen = TempivoSensorSeenDevice(
-                deviceId: deviceId,
-                bluetoothMac: bluetoothMacAddress ?? reading?.bluetoothMacAddress,
-                serial: serial,
-                firmware: reading?.firmware
-            )
-            lastSeen[serial] = seen
-        }
         delegate?.sensorBeaconScanner(self, didDiscover: discovery)
     }
-
-    private func handleRuntimeScanJson(_ raw: String) {
-        guard let data = raw.data(using: .utf8),
-              let obj = try? JSONSerialization.jsonObject(with: data) as? [String: Any]
-        else { return }
-        let deviceId = (obj["deviceId"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        let serial = (obj["serialNumber"] as? String).map { TempivoSensorBeaconDecoder.macKey($0) } ?? ""
-        guard !deviceId.isEmpty, !serial.isEmpty else { return }
-        let mac = obj["bluetoothMacAddress"] as? String
-        let rssi = (obj["rssi"] as? NSNumber)?.intValue ?? (obj["rssi"] as? Int) ?? 0
-        let firmware = obj["firmware"] as? String
-        let reading = SensorBeaconReading(
-            serialNumber: serial,
-            bluetoothMacAddress: mac,
-            firmware: firmware
-        )
-        rememberSeen(deviceId: deviceId, bluetoothMac: mac, serial: serial, firmware: firmware)
-        delegate?.sensorBeaconScanner(
-            self,
-            didDiscover: SensorBeaconDiscovery(
-                deviceId: deviceId,
-                rssi: rssi,
-                serialNumber: serial,
-                bluetoothMacAddress: mac,
-                reading: reading
-            )
-        )
-    }
-
-    private func rememberSeen(deviceId: String, bluetoothMac: String?, serial: String, firmware: String?) {
-        lastSeen[serial] = TempivoSensorSeenDevice(
-            deviceId: deviceId,
-            bluetoothMac: bluetoothMac,
-            serial: serial,
-            firmware: firmware
-        )
-    }
 }
 
 extension TempivoSensorBeaconScanner: CBCentralManagerDelegate {

package/ios/Sources/TempivoSensorBeacon/TempivoSensorBeaconTypes.swift

@@ -101,18 +101,3 @@ public struct SensorBeaconDiscovery: Sendable, Equatable {
         self.reading = reading
     }
 }
-
-/// Last advertisement used to resolve GATT connect (scan device id + firmware).
-public struct TempivoSensorSeenDevice: Sendable, Equatable {
-    public let deviceId: String
-    public let bluetoothMac: String?
-    public let serial: String
-    public let firmware: String?
-
-    public init(deviceId: String, bluetoothMac: String?, serial: String, firmware: String?) {
-        self.deviceId = deviceId
-        self.bluetoothMac = bluetoothMac
-        self.serial = serial
-        self.firmware = firmware
-    }
-}

package/ios/Sources/TempivoSensorBeacon/TempivoSensorError.swift

@@ -17,21 +17,7 @@ public struct TempivoSensorError: Error, LocalizedError, Sendable {
 
     public init(_ code: TempivoSensorErrorCode, _ message: String) {
         self.code = code
-        self.message = Self.sanitizeClientMessage(message)
-    }
-
-    public static func sanitizeClientMessage(_ raw: String) -> String {
-        var text = raw
-        let full = NSRange(location: 0, length: text.utf16.count)
-        if let regex = try? NSRegularExpression(pattern: #"(?i)pl\.[A-Za-z][A-Za-z0-9_.$]*"#) {
-            text = regex.stringByReplacingMatches(in: text, range: full, withTemplate: "")
-        }
-        let full2 = NSRange(location: 0, length: text.utf16.count)
-        if let regex = try? NSRegularExpression(pattern: #"(?i)\befento[A-Za-z0-9_$]*"#) {
-            text = regex.stringByReplacingMatches(in: text, range: full2, withTemplate: "")
-        }
-        text = text.replacingOccurrences(of: #"\s+"#, with: " ", options: .regularExpression)
-        return text.trimmingCharacters(in: CharacterSet(charactersIn: " :-.\n\t/"))
+        self.message = message
     }
 
     public var errorDescription: String? { message }

package/ios/Sources/TempivoSensorBeacon/TempivoSensorProfile.swift

@@ -16,7 +16,11 @@ public enum TempivoSensorProfile {
         }
         let body: [String: Any]
         if let nested = obj["profile"] as? [String: Any],
-           nested["temperatureAlerts"] != nil || nested["schedule"] != nil || nested["slug"] != nil {
+           nested["temperatureAlerts"] != nil ||
+           nested["schedule"] != nil ||
+           nested["slug"] != nil ||
+           nested["measurementIntervalMinutes"] != nil ||
+           nested["transmissionIntervalSeconds"] != nil {
             body = nested
         } else {
             body = obj
@@ -26,7 +30,13 @@ public enum TempivoSensorProfile {
         }
         let rawAlerts = body["temperatureAlerts"] as? [Any] ?? []
         let alerts = try rawAlerts.enumerated().map { try parseAlert($0.element, index: $0.offset) }
-        return TempivoSensorConfiguration(temperatureAlerts: alerts, schedule: try parseSchedule(body["schedule"] as? [String: Any]))
+        let intervals = try parseOptionalIntervals(body)
+        return TempivoSensorConfiguration(
+            temperatureAlerts: alerts,
+            schedule: try parseSchedule(body["schedule"] as? [String: Any]),
+            measurementIntervalMinutes: intervals.measurement,
+            transmissionIntervalSeconds: intervals.transmission
+        )
     }
 
     public static func jsonString(_ cfg: TempivoSensorConfiguration) throws -> String {
@@ -56,11 +66,55 @@ public enum TempivoSensorProfile {
                 "utcOffsetMinutes": cfg.schedule.utcOffsetMinutes,
             ]
         }
-        let root: [String: Any] = ["temperatureAlerts": alerts, "schedule": schedule]
+        var root: [String: Any] = ["temperatureAlerts": alerts, "schedule": schedule]
+        if let m = cfg.measurementIntervalMinutes { root["measurementIntervalMinutes"] = m }
+        if let t = cfg.transmissionIntervalSeconds { root["transmissionIntervalSeconds"] = t }
         let data = try JSONSerialization.data(withJSONObject: root, options: [])
         return String(data: data, encoding: .utf8) ?? "{}"
     }
 
+    private static let minMeasurementMinutes: Double = 60
+    private static let maxMeasurementMinutes: Double = 600
+    private static let minTransmissionSeconds = 3600
+    private static let maxTransmissionSeconds = 604_800
+
+    private static func parseOptionalIntervals(_ body: [String: Any]) 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)).")
+            }
+            measurement = n
+        }
+        if body["transmissionIntervalSeconds"] != nil {
+            guard let n = number(body["transmissionIntervalSeconds"]), n > 0, n == floor(n) else {
+                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).")
+            }
+            transmission = sec
+        }
+        if 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.")
+            }
+        }
+        return (measurement, transmission)
+    }
+
     private static func parseAlert(_ raw: Any, index: Int) throws -> TempivoTemperatureAlert {
         guard let item = raw as? [String: Any] else {
             throw TempivoSensorError(.invalidConfig, "temperatureAlerts[\(index)] must be an object.")

package/ios/Sources/TempivoSensorBeacon/TempivoSensorQr.swift

@@ -30,23 +30,6 @@ public enum TempivoSensorQrParser {
     public static let defaultModel = "HC7"
 
     public static func sessionType(fromModel model: String?) -> TempivoSensorSessionType {
-        sessionType(fromModel: model, firmware: nil)
-    }
-
-    public static func sessionType(fromModel model: String?, firmware: String?) -> TempivoSensorSessionType {
-        if let firmware {
-            let t = firmware.trimmingCharacters(in: .whitespacesAndNewlines)
-            if t.range(of: "^FW\\s*5", options: [.regularExpression, .caseInsensitive]) != nil {
-                return .legacy
-            }
-            if let match = t.range(of: "^(\\d+)\\.\\d+", options: .regularExpression) {
-                let majorStr = String(t[match]).split(separator: ".").first.flatMap { Int($0) }
-                if let major = majorStr {
-                    if major >= 7 { return .modern }
-                    if major >= 1 { return .legacy }
-                }
-            }
-        }
         guard let model, !model.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
             return .modern
         }

package/ios/Sources/TempivoSensorBeacon/TempivoSensorSession.swift

@@ -15,19 +15,10 @@ public final class TempivoSensorSession: @unchecked Sendable {
 
     public init() {}
 
-    public func connect(
-        serial: String,
-        bluetoothMac: String,
-        pin: String,
-        sessionType: TempivoSensorSessionType = .modern,
-        deviceId: String? = nil,
-        firmware: String? = nil
-    ) throws {
-        let trimmedPin = pin.trimmingCharacters(in: .whitespacesAndNewlines)
-        guard let pinInt = Int32(trimmedPin) else {
+    public func connect(serial: String, bluetoothMac: String, pin: String, sessionType: TempivoSensorSessionType = .modern) throws {
+        guard let pinInt = Int32(pin.trimmingCharacters(in: .whitespacesAndNewlines)) else {
             throw TempivoSensorError(.invalidPin, "PIN must be numeric.")
         }
-        let resolved = TempivoSensorQrParser.sessionType(fromModel: sessionType == .legacy ? "HC5" : "HC7", firmware: firmware)
         #if canImport(TempivoSensorBridge)
         lock.lock()
         defer { lock.unlock() }
@@ -37,9 +28,7 @@ public final class TempivoSensorSession: @unchecked Sendable {
                 serial: TempivoSensorQrParser.normalizeSerial(serial),
                 bluetoothMac: bluetoothMac,
                 pin: pinInt,
-                legacy: resolved == .legacy,
-                deviceId: deviceId?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "",
-                encryptionKey: trimmedPin
+                legacy: sessionType == .legacy
             )
         )
         try throwIfBridgeError(result)
@@ -49,22 +38,8 @@ public final class TempivoSensorSession: @unchecked Sendable {
         #endif
     }
 
-    public func connect(qr: TempivoSensorQr, seen: TempivoSensorSeenDevice? = nil) throws {
-        let deviceId = seen?.deviceId.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        if deviceId.isEmpty {
-            throw TempivoSensorError(
-                .connectFailed,
-                "Sensor not in last scan. Scan first, then connect."
-            )
-        }
-        try connect(
-            serial: qr.serial,
-            bluetoothMac: seen?.bluetoothMac ?? qr.bluetoothMac,
-            pin: qr.pin,
-            sessionType: qr.sessionType,
-            deviceId: deviceId,
-            firmware: seen?.firmware
-        )
+    public func connect(qr: TempivoSensorQr) throws {
+        try connect(serial: qr.serial, bluetoothMac: qr.bluetoothMac, pin: qr.pin, sessionType: qr.sessionType)
     }
 
     public func disconnect() {
@@ -173,17 +148,14 @@ public final class TempivoSensorSession: @unchecked Sendable {
 
     private func throwIfBridgeError(_ result: [String: Any]) throws {
         guard let code = intValue(result["errorCode"]), code != 0 else { return }
-        let detail = TempivoSensorError.sanitizeClientMessage(
-            (result["message"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        )
         switch code {
         case 1: throw TempivoSensorError(.invalidPin, "Invalid PIN.")
         case 2: throw TempivoSensorError(.notConnected, "Not connected.")
         case 3: throw TempivoSensorError(.unsupportedCommand, "Unsupported command.")
         case 4: throw TempivoSensorError(.runtimeUnavailable, "Sensor GATT is not available on this device.")
-        case 5: throw TempivoSensorError(.connectFailed, detail.isEmpty ? "Could not connect." : "Could not connect. \(detail)")
-        case 6: throw TempivoSensorError(.invalidConfig, detail.isEmpty ? "Invalid configuration." : detail)
-        default: throw TempivoSensorError(.unknown, detail.isEmpty ? "Sensor request failed." : "Sensor request failed. \(detail)")
+        case 5: throw TempivoSensorError(.connectFailed, "Could not connect.")
+        case 6: throw TempivoSensorError(.invalidConfig, (result["message"] as? String) ?? "Invalid configuration.")
+        default: throw TempivoSensorError(.unknown, "Sensor request failed.")
         }
     }
 }

package/ios/Sources/TempivoSensorBeacon/TempivoSensorSessionTypes.swift

@@ -65,10 +65,19 @@ public struct TempivoSchedule: Sendable, Equatable {
 public struct TempivoSensorConfiguration: Sendable, Equatable {
     public var temperatureAlerts: [TempivoTemperatureAlert]
     public var schedule: TempivoSchedule
+    public var measurementIntervalMinutes: Double?
+    public var transmissionIntervalSeconds: Int?
 
-    public init(temperatureAlerts: [TempivoTemperatureAlert], schedule: TempivoSchedule) {
+    public init(
+        temperatureAlerts: [TempivoTemperatureAlert],
+        schedule: TempivoSchedule,
+        measurementIntervalMinutes: Double? = nil,
+        transmissionIntervalSeconds: Int? = nil
+    ) {
         self.temperatureAlerts = temperatureAlerts
         self.schedule = schedule
+        self.measurementIntervalMinutes = measurementIntervalMinutes
+        self.transmissionIntervalSeconds = transmissionIntervalSeconds
     }
 }
 

package/ios/TempivoSensorBeaconModule.swift

@@ -28,13 +28,8 @@ public class TempivoSensorBeaconModule: Module, TempivoSensorBeaconScannerDelega
 
     AsyncFunction("connect") { (qrJson: String) -> [String: Any] in
       do {
-        self.scanner?.stopScanning()
-        if !Thread.isMainThread {
-          Thread.sleep(forTimeInterval: 0.2)
-        }
         let qr = try TempivoSensorQrParser.parse(qrJson)
-        let seen = self.scanner?.lookup(serial: qr.serial)
-        try self.session.connect(qr: qr, seen: seen)
+        try self.session.connect(qr: qr)
         return self.qrPayload(qr)
       } catch {
         throw self.mapError(error)
@@ -194,11 +189,7 @@ public class TempivoSensorBeaconModule: Module, TempivoSensorBeaconScannerDelega
     if let sensor = error as? TempivoSensorError {
       return SensorBeaconException(code: sensor.code.rawValue, reason: sensor.message)
     }
-    let reason = TempivoSensorError.sanitizeClientMessage(error.localizedDescription)
-    return SensorBeaconException(
-      code: "unknown",
-      reason: reason.isEmpty ? "Sensor request failed." : reason
-    )
+    return SensorBeaconException(code: "unknown", reason: error.localizedDescription)
   }
 }
 

package/package.json

@@ -1,8 +1,13 @@
 {
   "name": "@tempivo/sensor-beacon",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Tempivo sensor BLE SDK for Expo, React Native, Android, iOS, and Node.",
   "homepage": "https://app.tempivo.com/integrations",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tempivo/tempivo-app.git",
+    "directory": "packages/tempivo-sensor-beacon"
+  },
   "author": "Tempivo",
   "type": "module",
   "main": "dist/index.js",