@tempivo/sensor-beacon 1.1.2 → 1.1.5

package/ios/Sources/TempivoSensorBeacon/TempivoSensorSession.swift

@@ -4,10 +4,16 @@ import Foundation
 import TempivoSensorBridge
 #endif
 
-/// GATT session: connect, read/write alert rules and schedule, trigger uplink, read lab calibration date.
+/// GATT session: connect (SDK), alert rules via raw ProtoConfig 0x0C/0x0D, trigger/calibration via SDK.
 public final class TempivoSensorSession: @unchecked Sendable {
     private let lock = NSLock()
-    private var connected = false
+    /// Vendor SDK GATT held (needed for trigger / calibration).
+    private var sdkConnected = false
+    /// Credentials from last successful `connect` (enough for raw config).
+    private var lastSerial = ""
+    private var lastMac = ""
+    private var lastPin = ""
+    private var lastDeviceId = ""
 
     #if canImport(TempivoSensorBridge)
     private let bridge = TempivoSensorBridge()
@@ -42,7 +48,11 @@ public final class TempivoSensorSession: @unchecked Sendable {
             )
         )
         try throwIfBridgeError(result)
-        connected = true
+        sdkConnected = true
+        lastSerial = serial
+        lastMac = bluetoothMac
+        lastPin = pinValue
+        lastDeviceId = resolvedDeviceId
         #else
         throw TempivoSensorError(.runtimeUnavailable, "Sensor GATT requires a physical device with the native runtime.")
         #endif
@@ -58,14 +68,19 @@ public final class TempivoSensorSession: @unchecked Sendable {
     }
 
     public func disconnect() {
+        EfentoRawConfigTransfer.closeLink()
         #if canImport(TempivoSensorBridge)
         lock.lock()
         defer { lock.unlock() }
         bridge.disconnect()
-        connected = false
+        sdkConnected = false
+        lastSerial = ""
+        lastMac = ""
+        lastPin = ""
+        lastDeviceId = ""
         #else
         lock.lock()
-        connected = false
+        sdkConnected = false
         lock.unlock()
         #endif
     }
@@ -74,38 +89,51 @@ public final class TempivoSensorSession: @unchecked Sendable {
         try TempivoSensorProfile.parseFromDevice(json: getConfigurationJson())
     }
 
+    /// Always raw GATT ProtoConfig get (0x0C). Vendor SDK getConfiguration is not used for rules.
     public func getConfigurationJson() throws -> String {
-        #if canImport(TempivoSensorBridge)
-        try requireConnected()
-        let result = parseBridgeJson(bridge.getConfigurationPayloadJson())
-        try throwIfBridgeError(result)
-        guard let json = result["configurationJson"] as? String else {
-            throw TempivoSensorError(.unknown, "Could not read configuration.")
+        let proto = try withRawConfigLink {
+            try EfentoRawConfigTransfer.readProtoConfig(
+                peripheralId: $0,
+                bluetoothMac: lastMac,
+                pin: lastPin
+            )
         }
-        return json
-        #else
-        throw TempivoSensorError(.runtimeUnavailable, "Sensor GATT requires a physical device with the native runtime.")
-        #endif
+        let b64 = proto.base64EncodedString()
+        return #"{"temperatureAlerts":[],"schedule":{"always":true},"protoBase64":"\#(b64)","configSource":"rawGatt"}"#
     }
 
     public func setConfiguration(_ configuration: TempivoSensorConfiguration) throws {
         try setConfigurationJson(TempivoSensorProfile.jsonString(configuration))
     }
 
+    /// Partner JSON is not written via vendor SDK. Use `writeProtoConfigBase64` from JS after encode.
     public func setConfigurationJson(_ json: String) throws {
         _ = try TempivoSensorProfile.parse(json: json)
-        #if canImport(TempivoSensorBridge)
-        try requireConnected()
-        let result = parseBridgeJson(bridge.setConfigurationPayloadJson(json: json))
-        try throwIfBridgeError(result)
-        #else
-        throw TempivoSensorError(.runtimeUnavailable, "Sensor GATT requires a physical device with the native runtime.")
-        #endif
+        throw TempivoSensorError(
+            .unsupportedCommand,
+            "Use writeProtoConfigBase64 after encoding partner config to ProtoConfig."
+        )
+    }
+
+    /// Raw GATT set (0x0D): full ProtoConfig bytes as base64.
+    public func writeProtoConfigBase64(_ base64: String) throws {
+        guard let proto = Data(base64Encoded: base64), !proto.isEmpty else {
+            throw TempivoSensorError(.invalidConfig, "protoBase64 is missing or invalid.")
+        }
+        _ = try withRawConfigLink {
+            try EfentoRawConfigTransfer.writeProtoConfig(
+                peripheralId: $0,
+                bluetoothMac: lastMac,
+                pin: lastPin,
+                proto: proto
+            )
+            return Data()
+        }
     }
 
     public func triggerTransmission() throws -> TempivoTriggerTransmissionResult {
         #if canImport(TempivoSensorBridge)
-        try requireConnected()
+        try ensureSdkConnected()
         let result = parseBridgeJson(bridge.triggerTransmissionPayloadJson())
         if let code = intValue(result["errorCode"]), code != 0 {
             try throwIfBridgeError(result)
@@ -120,7 +148,7 @@ public final class TempivoSensorSession: @unchecked Sendable {
 
     public func getCalibration() throws -> TempivoSensorCalibration {
         #if canImport(TempivoSensorBridge)
-        try requireConnected()
+        try ensureSdkConnected()
         let result = parseBridgeJson(bridge.getCalibrationPayloadJson())
         try throwIfBridgeError(result)
         let ts = int64Value(result["laboratoryCalibrationTimestamp"])
@@ -130,14 +158,48 @@ public final class TempivoSensorSession: @unchecked Sendable {
         #endif
     }
 
-    private func requireConnected() throws {
+    // MARK: - Raw link helpers
+
+    private func withRawConfigLink(_ body: (UUID) throws -> Data) throws -> Data {
+        guard !lastDeviceId.isEmpty, !lastMac.isEmpty, !lastPin.isEmpty,
+              let uuid = UUID(uuidString: lastDeviceId)
+        else {
+            throw TempivoSensorError(.notConnected, "Not connected. Scan and connect first.")
+        }
+        releaseSdkForRaw()
+        return try body(uuid)
+    }
+
+    private func releaseSdkForRaw() {
+        #if canImport(TempivoSensorBridge)
+        lock.lock()
+        let didDisconnect = sdkConnected
+        if sdkConnected {
+            bridge.disconnect()
+            sdkConnected = false
+        }
+        lock.unlock()
+        // Only wait when the SDK actually held the link; the raw link is reused after that.
+        if didDisconnect { Thread.sleep(forTimeInterval: 1.0) }
+        #endif
+    }
+
+    #if canImport(TempivoSensorBridge)
+    private func ensureSdkConnected() throws {
         lock.lock()
-        let ok = connected
+        let ok = sdkConnected
+        let serial = lastSerial
+        let mac = lastMac
+        let pin = lastPin
+        let deviceId = lastDeviceId
         lock.unlock()
-        if !ok {
+        if ok { return }
+        guard !serial.isEmpty, !mac.isEmpty, !pin.isEmpty, !deviceId.isEmpty else {
             throw TempivoSensorError(.notConnected, "Not connected.")
         }
+        try connect(serial: serial, bluetoothMac: mac, pin: pin, deviceId: deviceId)
     }
+    #endif
 
     private func parseBridgeJson(_ raw: String) -> [String: Any] {
         guard let data = raw.data(using: .utf8),
@@ -163,13 +225,21 @@ public final class TempivoSensorSession: @unchecked Sendable {
     private func throwIfBridgeError(_ result: [String: Any]) throws {
         guard let code = intValue(result["errorCode"]), code != 0 else { return }
         switch code {
-        case 1: throw TempivoSensorError(.invalidPin, "Invalid PIN.")
+        case 1:
+            throw TempivoSensorError(
+                .invalidPin,
+                "Invalid PIN. Forget this sensor in iOS Settings → Bluetooth, then scan and connect again."
+            )
         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, "Could not connect.")
         case 6: throw TempivoSensorError(.invalidConfig, (result["message"] as? String) ?? "Invalid configuration.")
-        default: throw TempivoSensorError(.unknown, "Sensor request failed.")
+        default:
+            throw TempivoSensorError(
+                .unknown,
+                (result["message"] as? String) ?? "Sensor request failed."
+            )
         }
     }
 }

package/ios/TempivoSensorBeaconModule.swift

@@ -94,8 +94,17 @@ public class TempivoSensorBeaconModule: Module {
       }
     }
 
+    AsyncFunction("writeProtoConfigBase64") { (base64: String) in
+      do {
+        try self.session.writeProtoConfigBase64(base64)
+      } catch {
+        throw self.mapError(error)
+      }
+    }
+
     AsyncFunction("setConfigurationJson") { (json: String) in
       do {
+        // Legacy name: partner JSON must be encoded in JS then written via writeProtoConfigBase64.
         try self.session.setConfigurationJson(json)
       } catch {
         throw self.mapError(error)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tempivo/sensor-beacon",
-  "version": "1.1.2",
+  "version": "1.1.5",
   "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": {
@@ -58,7 +58,8 @@
     "build:all": "npm run build:ts && npm run build:android",
     "prepare": "npm run build:ts",
     "test": "npm run test:all",
-    "test:unit": "node --experimental-vm-modules node_modules/jest/bin/jest.js --config jest.config.mjs",
+    "test:unit": "node --experimental-vm-modules node_modules/jest/bin/jest.js --config jest.config.mjs --testPathIgnorePatterns=ble.integration",
+    "test:ble": "TEMPIVO_BLE_INTEGRATION=1 node --experimental-vm-modules node_modules/jest/bin/jest.js --config jest.config.mjs --testPathPattern=ble.integration",
     "test:python": "PYTHONPATH=python python3 -m pytest python/tests -q",
     "test:all": "npm run test:unit && npm run test:python",
     "test:smoke": "node scripts/smoke-test.mjs",
@@ -98,6 +99,9 @@
       "optional": true
     }
   },
+  "dependencies": {
+    "protobufjs": "^7.6.6"
+  },
   "devDependencies": {
     "@types/jest": "^29.5.14",
     "jest": "^29.7.0",