@tempivo/sensor-beacon 0.3.0 → 0.3.2

package/README.md

@@ -82,7 +82,7 @@ stopScan();
 sub.remove();
 ```
 
-`startScan` and `connect` request Bluetooth permission. Sticker PIN is required on `connect`. Wrong PIN is `invalidPin`.
+`startScan` and `connect` request Bluetooth permission. Sticker PIN is required on `connect`. Wrong PIN is `invalidPin`. `connect` stops an active scan first. HC5 (legacy GATT) and HC7 use the same call. If the first GATT path fails, the native layer retries the other. `setConfigurationJson` / `getConfiguration` use the same JSON on both. HC5 writes each rule over GATT (`setRule`). Weekly `schedule` windows apply on FW 7+ only. On HC5, rules stay on 24/7.
 
 If a bundler misses native BLE, import `@tempivo/sensor-beacon/react-native`.
 
@@ -110,7 +110,7 @@ Same as Cellular API config profiles (`temperatureAlerts` + `schedule`). You can
 | Field | Meaning |
 |------|---------|
 | `temperatureAlerts` | Alert list. Empty array is valid. |
-| `schedule` | `{ "always": true }` is 24/7. |
+| `schedule` | `{ "always": true }` is 24/7. Weekday windows apply on FW 7+. HC5 is always 24/7. |
 
 Ignored over BLE: `slug`, `name`, `measurementIntervalMinutes`, `transmissionIntervalSeconds`. Do not pass `alarmRules`.
 
@@ -149,13 +149,13 @@ Sticker QR is JSON. Parse with `parseSensorQrJson`.
 |------|------|---------|
 | `serial` | string | Device serial, 12 hex chars, no colons. From QR `sn`. |
 | `pin` | string | Sticker PIN. Required on `connect`. Also accepted as QR `resetCode`. |
-| `model` | string | Sticker model. Omitted QR `model` becomes **HC7**. `HC5` selects legacy GATT. |
+| `model` | string | Sticker model. Omitted QR `model` becomes **HC7**. `HC5` selects legacy GATT. Same `connect` call works for both. |
 | `sessionType` | `modern` \| `legacy` | GATT path. HC7 / firmware 7+ is `modern`. HC5 / firmware 6.x is `legacy`. |
 | `bluetoothMac` | string | BLE MAC with colons, derived from `serial`. |
 
 ## Scan result
 
-Filter manufacturer data on company id **0x026C**. Active scanning is on so scan-response packets arrive.
+iOS uses the same hardware scan as Tempivo. Manufacturer ads (`0x026C`) alone often miss HC7 / FW 7+. Android still filters `0x026C`.
 
 | Field | Meaning |
 |------|---------|
@@ -173,7 +173,7 @@ Filter manufacturer data on company id **0x026C**. Active scanning is on so scan
 | `firmware` | `major.minor.patch`, e.g. `7.3.4`. |
 | `batteryOk` | Battery status flag. |
 | `encryptionEnabled` | Advertisement payload encryption flag. |
-| `cellularStatus` | `ble_only`, `cell_ok`, `no_server`, or `net_issue`. |
+| `cellularStatus` | Advert attachment bits only: `ble_only`, `cell_ok`, `no_server`, or `net_issue`. Not ECL, SINR, or RSSI. |
 | `readingTimestampUnix` | Sample time as unix seconds, or null. |
 | `readingTimestampIso` | Same instant as UTC ISO-8601, or null. |
 | `measurementIntervalSeconds` | Sample interval, in seconds. |

package/android/build.gradle

@@ -4,14 +4,14 @@ plugins {
 }
 
 group = 'com.tempivo.sensor.beacon'
-version = '0.3.0'
+version = '0.3.1'
 
 android {
   namespace "expo.modules.tempivosensorbeacon"
   defaultConfig {
     minSdk 26
     versionCode 1
-    versionName "0.3.0"
+    versionName "0.3.1"
   }
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_17

package/android/src/main/java/expo/modules/tempivosensorbeacon/SensorBeaconNative.java

@@ -54,8 +54,15 @@ final class SensorBeaconNative {
 
   Map<String, Object> connect(Context context, String qrJson) {
     try {
+      stopScan();
+      try {
+        Thread.sleep(200);
+      } catch (InterruptedException ignored) {
+        Thread.currentThread().interrupt();
+      }
       TempivoSensorQr qr = TempivoSensorQrParser.INSTANCE.parse(qrJson);
-      requireSession(context).connectBlocking(qr);
+      TempivoSensorBeaconScanner.SeenDevice seen = scanner != null ? scanner.lookup(qr.getSerial()) : null;
+      requireSession(context).connectBlocking(qr, seen);
       return qrMap(qr);
     } catch (Throwable error) {
       throw wrap(error);
@@ -135,13 +142,14 @@ final class SensorBeaconNative {
     }
     TempivoSensorException sensor = findSensor(error);
     if (sensor != null) {
-      return new NativeError(toJs(sensor.getCode()), sensor.getMessage(), error);
+      return new NativeError(toJs(sensor.getCode()), TempivoSensorException.sanitizeClientMessage(sensor.getMessage()), null);
     }
     if (error instanceof TempivoSensorBeaconScanner.ScanNotPermittedException) {
-      return new NativeError("runtimeUnavailable", error.getMessage(), error);
+      String permitted = TempivoSensorException.sanitizeClientMessage(error.getMessage());
+      return new NativeError("runtimeUnavailable", permitted.isEmpty() ? "Bluetooth permission is required." : permitted, null);
     }
-    String message = error.getMessage();
-    return new NativeError("unknown", message != null ? message : "Sensor request failed.", error);
+    String message = TempivoSensorException.sanitizeClientMessage(error.getMessage());
+    return new NativeError("unknown", message.isEmpty() ? "Sensor request failed." : message, null);
   }
 
   private static TempivoSensorException findSensor(Throwable error) {

package/android/src/main/java/expo/modules/tempivosensorbeacon/TempivoSensorBeaconModule.kt

@@ -8,6 +8,7 @@ import expo.modules.kotlin.Promise
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
+import com.tempivo.sensor.beacon.TempivoSensorException
 
 class TempivoSensorBeaconModule : Module() {
   private val native = SensorBeaconNative()
@@ -116,7 +117,8 @@ private fun Throwable.toSensorException(): CodedException {
   if (this is CodedException) return this
   val native = this as? SensorBeaconNative.NativeError ?: cause as? SensorBeaconNative.NativeError
   if (native != null) {
-    return CodedException(native.code, native.message, this)
+    return CodedException(native.code, native.message, null)
   }
-  return CodedException("unknown", message ?: "Sensor request failed.", this)
+  val clean = TempivoSensorException.sanitizeClientMessage(message)
+  return CodedException("unknown", clean.ifEmpty { "Sensor request failed." }, null)
 }

package/android-aar/library/src/main/java/com/tempivo/sensor/beacon/PartnerBleRules.kt

@@ -93,9 +93,12 @@ internal object PartnerBleRules {
         return rules to calendars
     }
 
-    fun decompile(cfg: SensorConfiguration): TempivoSensorConfiguration {
+    fun decompile(cfg: SensorConfiguration): TempivoSensorConfiguration =
+        decompile(cfg.rules.orEmpty(), cfg.ruleCalendars)
+
+    fun decompile(rules: List<Rule>, calendars: List<RuleCalendar>? = null): TempivoSensorConfiguration {
         val padded = MutableList(12) { i ->
-            cfg.rules.orEmpty().getOrNull(i)
+            rules.getOrNull(i)
                 ?: Rule(i + 1, emptySet(), DisabledCondition, Action.NO_ACTION)
         }
         val orRefs = orSelectedPairs(padded)
@@ -164,7 +167,7 @@ internal object PartnerBleRules {
             }
         }
 
-        return TempivoSensorConfiguration(alerts, decompileSchedule(cfg.ruleCalendars))
+        return TempivoSensorConfiguration(alerts, decompileSchedule(calendars))
     }
 
     private fun orSelectedPairs(rules: List<Rule>): List<Pair<Int, Int>> {

package/android-aar/library/src/main/java/com/tempivo/sensor/beacon/SensorBleRuntime.kt

@@ -2,12 +2,14 @@ package com.tempivo.sensor.beacon
 
 import android.app.Application
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.withTimeout
 import pl.efento.mobile.bluetooth.EfentoBluetooth
 import pl.efento.mobile.bluetooth.api.SensorConnection
 import pl.efento.mobile.bluetooth.api.SensorLegacyConnection
 import pl.efento.mobile.bluetooth.exception.InvalidResetCodeException
 import pl.efento.mobile.bluetooth.exception.UnsupportedCommandException
 import pl.efento.mobile.bluetooth.model.BluetoothMacAddress
+import pl.efento.mobile.bluetooth.model.sensor.DisabledCondition
 import pl.efento.mobile.bluetooth.model.sensor.Rule
 import pl.efento.mobile.bluetooth.model.sensor.RuleCalendar
 import pl.efento.mobile.bluetooth.model.sensor.SensorConfiguration
@@ -31,15 +33,26 @@ internal object SensorBleRuntime {
     fun mapError(e: Throwable): TempivoSensorException {
         if (e is TempivoSensorException) return e
         val className = e.javaClass.name
+        val detail = clientSafeDetail(e.message)
         return when {
             e is InvalidResetCodeException || className.contains("InvalidResetCode") ->
-                TempivoSensorException(TempivoSensorException.Code.INVALID_PIN, "Invalid PIN.", e)
+                TempivoSensorException(TempivoSensorException.Code.INVALID_PIN, "Invalid PIN.")
             e is UnsupportedCommandException || className.contains("UnsupportedCommand") ->
-                TempivoSensorException(TempivoSensorException.Code.UNSUPPORTED_COMMAND, "Unsupported command.", e)
+                TempivoSensorException(TempivoSensorException.Code.UNSUPPORTED_COMMAND, "Unsupported command.")
             className.contains("NotConnected") ->
-                TempivoSensorException(TempivoSensorException.Code.NOT_CONNECTED, "Not connected.", e)
+                TempivoSensorException(TempivoSensorException.Code.NOT_CONNECTED, "Not connected.")
+            className.contains("Connect", ignoreCase = true) ||
+                detail.contains("connect", ignoreCase = true) ||
+                detail.contains("timeout", ignoreCase = true) ->
+                TempivoSensorException(
+                    TempivoSensorException.Code.CONNECT_FAILED,
+                    if (detail.isNotEmpty()) "Could not connect. $detail" else "Could not connect.",
+                )
             else ->
-                TempivoSensorException(TempivoSensorException.Code.UNKNOWN, "Sensor request failed.", e)
+                TempivoSensorException(
+                    TempivoSensorException.Code.UNKNOWN,
+                    if (detail.isNotEmpty()) "Sensor request failed. $detail" else "Sensor request failed.",
+                )
         }
     }
 
@@ -49,32 +62,57 @@ internal object SensorBleRuntime {
         bluetoothMac: String,
         pin: Int,
         legacy: Boolean,
+        deviceId: String = serial,
+        encryptionKey: String = "",
     ): Session {
         initialize(application)
         val mac = BluetoothMacAddress(bluetoothMac)
-        // PIN stays on the connection: set, trigger, calibration writes, and many other commands check it.
-        return if (legacy) {
-            val c =
-                EfentoBluetooth.sensorLegacyConnection(
-                    deviceID = serial,
-                    bluetoothMacAddress = mac,
-                    resetCode = pin,
-                    encryptionKey = "",
-                )
-            c.connect()
-            if (pin >= 0) c.resetCode = pin
-            Session.Legacy(c)
-        } else {
-            val c =
-                EfentoBluetooth.sensorConnection(
-                    deviceID = serial,
-                    bluetoothMacAddress = mac,
-                    resetCode = pin,
-                    encryptionKey = "",
-                )
-            c.connect()
-            if (pin >= 0) c.resetCode = pin
-            Session.Modern(c)
+        val id = deviceId.ifBlank { serial }
+        suspend fun open(useLegacy: Boolean): Session {
+            return if (useLegacy) {
+                val c =
+                    EfentoBluetooth.sensorLegacyConnection(
+                        deviceID = id,
+                        bluetoothMacAddress = mac,
+                        resetCode = pin,
+                        encryptionKey = encryptionKey,
+                    )
+                c.connect()
+                if (pin >= 0) c.resetCode = pin
+                if (encryptionKey.isNotEmpty()) c.encryptionKey = encryptionKey
+                Session.Legacy(c)
+            } else {
+                val c =
+                    EfentoBluetooth.sensorConnection(
+                        deviceID = id,
+                        bluetoothMacAddress = mac,
+                        resetCode = pin,
+                        encryptionKey = encryptionKey,
+                    )
+                c.connect()
+                if (pin >= 0) c.resetCode = pin
+                if (encryptionKey.isNotEmpty()) c.encryptionKey = encryptionKey
+                Session.Modern(c)
+            }
+        }
+        return try {
+            open(legacy)
+        } catch (first: Throwable) {
+            val mapped = mapError(first)
+            if (mapped.code == TempivoSensorException.Code.INVALID_PIN) throw mapped
+            try {
+                open(!legacy)
+            } catch (second: Throwable) {
+                val mappedSecond = mapError(second)
+                if (mappedSecond.code == TempivoSensorException.Code.UNKNOWN) {
+                    throw TempivoSensorException(
+                        TempivoSensorException.Code.CONNECT_FAILED,
+                        mapped.message + " Then " + mappedSecond.message,
+                        second,
+                    )
+                }
+                throw mappedSecond
+            }
         }
     }
 
@@ -86,14 +124,11 @@ internal object SensorBleRuntime {
         }
     }
 
-    suspend fun readConfiguration(session: Session): SensorConfiguration {
+    suspend fun readPartnerConfiguration(session: Session): TempivoSensorConfiguration {
         return when (session) {
-            is Session.Modern -> modernGetConfiguration(session.connection)
+            is Session.Modern -> PartnerBleRules.decompile(modernGetConfiguration(session.connection))
             is Session.Legacy ->
-                throw TempivoSensorException(
-                    TempivoSensorException.Code.UNSUPPORTED_COMMAND,
-                    "Configuration rules require a current-generation sensor session.",
-                )
+                PartnerBleRules.decompile(session.connection.commands.getRules { }, emptyList())
         }
     }
 
@@ -104,11 +139,19 @@ internal object SensorBleRuntime {
                 val next = base.copy(rules = rules.take(12), ruleCalendars = calendars.take(6))
                 session.connection.commands.setConfiguration(next) { }
             }
-            is Session.Legacy ->
-                throw TempivoSensorException(
-                    TempivoSensorException.Code.UNSUPPORTED_COMMAND,
-                    "Configuration rules require a current-generation sensor session.",
-                )
+            is Session.Legacy -> writeLegacyRules(session.connection, rules)
+        }
+    }
+
+    private suspend fun writeLegacyRules(legacy: SensorLegacyConnection, rules: List<Rule>) {
+        val cmd = legacy.commands
+        val current = runCatching { cmd.getRules { } }.getOrNull().orEmpty()
+        val currentActive =
+            current.filter { it.condition !is DisabledCondition }.map { it.id }.toSet()
+        for (rule in rules.take(12)) {
+            val disabled = rule.condition is DisabledCondition
+            if (disabled && rule.id !in currentActive) continue
+            withTimeout(20_000) { cmd.setRule(rule) { } }
         }
     }
 

package/android-aar/library/src/main/java/com/tempivo/sensor/beacon/TempivoSensorBeaconDecoder.kt

@@ -62,6 +62,20 @@ object TempivoSensorBeaconDecoder {
             0x22 to MeasureSpec("Current", 0.01, 1, true),
         )
 
+    /** FW 7+ → modern (`false`); FW 6.x / 5.x → legacy (`true`). */
+    fun legacyHintFromFirmware(firmware: String?): Boolean? {
+        val t = firmware?.trim().orEmpty()
+        if (t.isEmpty()) return null
+        if (t.startsWith("FW 5", ignoreCase = true) || t.startsWith("FW5", ignoreCase = true)) return true
+        val m = Regex("^(\\d+)\\.\\d+").find(t) ?: return null
+        val major = m.groupValues[1].toIntOrNull() ?: return null
+        return when {
+            major >= 7 -> false
+            major >= 1 -> true
+            else -> null
+        }
+    }
+
     /** 12-hex serial from FW6 `0x03` bytes 1–6 (same as BLE MAC on supported firmware). */
     fun serialKeyFromAdv03(frame: ByteArray): String? {
         if (frame.size < 7 || (frame[0].toInt() and 0xFF) != 0x03) return null

package/android-aar/library/src/main/java/com/tempivo/sensor/beacon/TempivoSensorBeaconScanner.kt

@@ -28,8 +28,17 @@ class TempivoSensorBeaconScanner(
     class ScanNotPermittedException(message: String) : Exception(message)
 
     private val appContext = context.applicationContext
+    data class SeenDevice(
+        val deviceId: String,
+        val bluetoothMac: String,
+        val serial: String,
+        val firmware: String?,
+        val encryptionEnabled: Boolean?,
+    )
+
     private val advLast03 = ConcurrentHashMap<String, ByteArray>()
     private val advLast04 = ConcurrentHashMap<String, ByteArray>()
+    private val lastSeen = ConcurrentHashMap<String, SeenDevice>()
     private var listener: Listener? = null
     private var scanning = false
 
@@ -50,6 +59,12 @@ class TempivoSensorBeaconScanner(
     fun clearCache() {
         advLast03.clear()
         advLast04.clear()
+        lastSeen.clear()
+    }
+
+    fun lookup(serial: String): SeenDevice? {
+        val key = TempivoSensorBeaconDecoder.macKey(serial)
+        return lastSeen[key]
     }
 
     fun startScan(listener: Listener) {
@@ -107,25 +122,39 @@ class TempivoSensorBeaconScanner(
 
     private fun buildDevice(result: ScanResult, key: String): TempivoSensorBeaconDevice? {
         val addr = result.device?.address ?: return null
-        val serial = key.uppercase(Locale.US)
-        val macColons = macWithColonsFromKey(serial)
+        val frame = advLast03[key]
+        val advSerial = frame?.let { TempivoSensorBeaconDecoder.serialKeyFromAdv03(it) }
+        val serial = (advSerial ?: key).uppercase(Locale.US)
+        val macColons = macWithColonsFromKey(if (key.length == 12) key else serial)
         val telemetry =
             TempivoSensorBeaconDecoder.buildTelemetry(
-                TempivoSensorBeaconDecoder.lookupKeys(serial),
+                TempivoSensorBeaconDecoder.lookupKeys(key, advSerial),
                 advLast03,
                 advLast04,
             )
         val summary =
             telemetry?.summary?.takeIf { it.isNotEmpty() }
                 ?: serial
-        return TempivoSensorBeaconDevice(
-            deviceId = addr,
-            bluetoothMacAddress = macColons,
-            serialNumber = serial,
-            rssi = result.rssi,
-            telemetry = telemetry,
-            summary = summary,
-        )
+        val device =
+            TempivoSensorBeaconDevice(
+                deviceId = addr,
+                bluetoothMacAddress = macColons,
+                serialNumber = serial,
+                rssi = result.rssi,
+                telemetry = telemetry,
+                summary = summary,
+            )
+        val seen =
+            SeenDevice(
+                deviceId = addr,
+                bluetoothMac = macColons,
+                serial = serial,
+                firmware = telemetry?.firmware,
+                encryptionEnabled = telemetry?.encryptionEnabled,
+            )
+        lastSeen[serial] = seen
+        lastSeen[key.uppercase(Locale.US)] = seen
+        return device
     }
 
     private fun bluetoothLeScanner() =

package/android-aar/library/src/main/java/com/tempivo/sensor/beacon/TempivoSensorError.kt

@@ -1,10 +1,27 @@
 package com.tempivo.sensor.beacon
 
+internal fun clientSafeDetail(raw: String?): String {
+    if (raw.isNullOrBlank()) return ""
+    return raw
+        .replace(VENDOR_PKG.toRegex(), "")
+        .replace(VENDOR_WORD.toRegex(), "")
+        .replace(Regex("\\s+"), " ")
+        .trim(' ', ':', '-', '.', '\n', '\t', '/')
+}
+
+private const val VENDOR_PKG = """(?i)pl\.[A-Za-z][A-Za-z0-9_.$]*"""
+private const val VENDOR_WORD = """(?i)\befento[A-Za-z0-9_$]*"""
+
 class TempivoSensorException(
     val code: Code,
     message: String,
     cause: Throwable? = null,
 ) : Exception(message, cause) {
+    companion object {
+        @JvmStatic
+        fun sanitizeClientMessage(raw: String?): String = clientSafeDetail(raw)
+    }
+
     enum class Code {
         INVALID_PIN,
         INVALID_QR,

package/android-aar/library/src/main/java/com/tempivo/sensor/beacon/TempivoSensorQr.kt

@@ -40,6 +40,15 @@ object TempivoSensorQrParser {
         }
     }
 
+    fun resolveSessionType(model: String?, firmware: String?): TempivoSensorSession.SessionType {
+        val hint = TempivoSensorBeaconDecoder.legacyHintFromFirmware(firmware)
+        return when (hint) {
+            true -> TempivoSensorSession.SessionType.LEGACY
+            false -> TempivoSensorSession.SessionType.MODERN
+            null -> sessionTypeFromModel(model)
+        }
+    }
+
     fun parse(json: String): TempivoSensorQr {
         val rec =
             try {

package/android-aar/library/src/main/java/com/tempivo/sensor/beacon/TempivoSensorSession.kt

@@ -33,10 +33,17 @@ class TempivoSensorSession(
         bluetoothMac: String,
         pin: String,
         sessionType: SessionType = SessionType.MODERN,
+        deviceId: String? = null,
+        firmware: String? = null,
     ) {
         val pinInt =
             pin.trim().toIntOrNull()
                 ?: throw TempivoSensorException(TempivoSensorException.Code.INVALID_PIN, "PIN must be numeric.")
+        val resolved =
+            TempivoSensorQrParser.resolveSessionType(
+                if (sessionType == SessionType.LEGACY) "HC5" else "HC7",
+                firmware,
+            )
         try {
             mutex.withLock {
                 SensorBleRuntime.disconnect(session)
@@ -48,14 +55,20 @@ class TempivoSensorSession(
                             serial = TempivoSensorQrParser.normalizeSerial(serial),
                             bluetoothMac = bluetoothMac,
                             pin = pinInt,
-                            legacy = sessionType == SessionType.LEGACY,
+                            legacy = resolved == SessionType.LEGACY,
+                            deviceId = deviceId?.ifBlank { null } ?: serial,
+                            encryptionKey = pin.trim(),
                         )
                     }
             }
         } catch (e: Throwable) {
             throw SensorBleRuntime.mapError(e).let {
                 if (it.code == TempivoSensorException.Code.UNKNOWN) {
-                    TempivoSensorException(TempivoSensorException.Code.CONNECT_FAILED, "Could not connect.", e)
+                    TempivoSensorException(
+                        TempivoSensorException.Code.CONNECT_FAILED,
+                        it.message ?: "Could not connect.",
+                        e,
+                    )
                 } else {
                     it
                 }
@@ -63,8 +76,15 @@ class TempivoSensorSession(
         }
     }
 
-    suspend fun connect(qr: TempivoSensorQr) {
-        connect(qr.serial, qr.bluetoothMac, qr.pin, qr.sessionType)
+    suspend fun connect(qr: TempivoSensorQr, seen: TempivoSensorBeaconScanner.SeenDevice? = null) {
+        connect(
+            serial = qr.serial,
+            bluetoothMac = seen?.bluetoothMac ?: qr.bluetoothMac,
+            pin = qr.pin,
+            sessionType = qr.sessionType,
+            deviceId = seen?.deviceId,
+            firmware = seen?.firmware,
+        )
     }
 
     suspend fun disconnect() {
@@ -75,9 +95,7 @@ class TempivoSensorSession(
     }
 
     suspend fun getConfiguration(): TempivoSensorConfiguration {
-        return runGatt {
-            SensorBleRuntime.decompile(SensorBleRuntime.readConfiguration(requireSession()))
-        }
+        return runGatt { SensorBleRuntime.readPartnerConfiguration(requireSession()) }
     }
 
     suspend fun getConfigurationJson(): String = TempivoSensorProfile.toJson(getConfiguration())
@@ -101,7 +119,9 @@ class TempivoSensorSession(
         return runGatt { SensorBleRuntime.readCalibration(requireSession()) }
     }
 
-    fun connectBlocking(qr: TempivoSensorQr) = runBlocking { connect(qr) }
+    @JvmOverloads
+    fun connectBlocking(qr: TempivoSensorQr, seen: TempivoSensorBeaconScanner.SeenDevice? = null) =
+        runBlocking { connect(qr, seen) }
 
     fun disconnectBlocking() = runBlocking { disconnect() }
 

package/dist/index.d.ts

@@ -4,7 +4,7 @@ export { dataViewToUint8Array, normalizeManufacturerBytes } from './normalize.js
 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 { DEFAULT_SENSOR_MODEL, bluetoothMacFromSerial, normalizeSensorSerial, encodeSensorPinPayload, parseSensorQrJson, resolveConnectSessionType, sessionTypeFromModel, } from './qr.js';
 export { calibrationFromExtendedJson, decodeLaboratoryCalibrationTimestamp, } from './calibration.js';
 export { DEFAULT_ALERT_HYSTERESIS_C, compileSensorProfileToBleJson, configurationFromApiProfile, parseSensorConfiguration, parseSensorConfigurationJson, pickPartnerConfigurationJson, } from './profile.js';
 export type { TempivoSchedule, TempivoScheduleAlways, TempivoScheduleWeek, TempivoSensorCalibration, TempivoSensorConfiguration, TempivoSensorQr, TempivoSensorSessionType, TempivoTemperatureAlert, TempivoTemperatureChannel, TempivoTemperatureMaxAlert, TempivoTemperatureMinAlert, TempivoTemperatureRangeAlert, TempivoTriggerTransmissionResult, } from './session-types.js';

package/dist/index.js

@@ -4,7 +4,7 @@ export { dataViewToUint8Array, normalizeManufacturerBytes } from './normalize.js
 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 { DEFAULT_SENSOR_MODEL, bluetoothMacFromSerial, normalizeSensorSerial, encodeSensorPinPayload, parseSensorQrJson, resolveConnectSessionType, sessionTypeFromModel, } from './qr.js';
 export { calibrationFromExtendedJson, decodeLaboratoryCalibrationTimestamp, } from './calibration.js';
 export { DEFAULT_ALERT_HYSTERESIS_C, compileSensorProfileToBleJson, configurationFromApiProfile, parseSensorConfiguration, parseSensorConfigurationJson, pickPartnerConfigurationJson, } from './profile.js';
 export { addDeviceFoundListener, connect, disconnect, getCalibration, getConfiguration, isNativeSensorBeaconAvailable, isScanning, requestPermissions, setConfigurationJson, startScan, stopScan, triggerTransmission, } from './native-bridge.js';

package/dist/native-helpers.d.ts

@@ -2,4 +2,5 @@ import { TempivoSensorError } from './errors.js';
 import type { TempivoSensorConfiguration, TempivoSensorQr } from './session-types.js';
 export declare function qrToConnectJson(qr: string | TempivoSensorQr): string;
 export declare function configToJson(config: string | TempivoSensorConfiguration): string;
+export declare function sanitizePartnerErrorText(text: string): string;
 export declare function mapNativeError(error: unknown): TempivoSensorError;

package/dist/native-helpers.js

@@ -24,10 +24,25 @@ export function configToJson(config) {
 function isSensorCode(value) {
     return !!value && SENSOR_CODES.includes(value);
 }
+export function sanitizePartnerErrorText(text) {
+    return text
+        .replace(/\bpl\.[A-Za-z][A-Za-z0-9_.$]*/gi, '')
+        .replace(/\befento[A-Za-z0-9_$]*/gi, '')
+        .replace(/\s+/g, ' ')
+        .replace(/^[:\s.\-/]+|[:\s.\-/]+$/g, '')
+        .trim();
+}
 export function mapNativeError(error) {
-    if (error instanceof TempivoSensorError)
-        return error;
+    if (error instanceof TempivoSensorError) {
+        const clean = sanitizePartnerErrorText(error.message);
+        return new TempivoSensorError(error.code, clean || 'Sensor request failed.');
+    }
     const raw = error;
     const code = isSensorCode(raw?.code) ? raw.code : 'unknown';
-    return new TempivoSensorError(code, raw?.message || 'Sensor request failed.');
+    let message = raw?.message || 'Sensor request failed.';
+    const caused = /Caused by:\s*(.+)$/s.exec(message);
+    if (caused?.[1])
+        message = caused[1].trim();
+    message = sanitizePartnerErrorText(message) || 'Sensor request failed.';
+    return new TempivoSensorError(code, message);
 }

package/dist/native-module.js

@@ -55,6 +55,7 @@ export function addDeviceFoundListener(listener) {
 export async function connect(qr) {
     await ensureBlePermission();
     try {
+        getNative().stopScan();
         return await getNative().connect(qrToConnectJson(qr));
     }
     catch (error) {

package/dist/qr.d.ts

@@ -5,6 +5,10 @@ export declare function bluetoothMacFromSerial(serial: string): string;
 /** BLE default when QR omits `model`. HC5 / FW 6.x still select legacy. */
 export declare const DEFAULT_SENSOR_MODEL = "HC7";
 export declare function sessionTypeFromModel(model: string | undefined | null): TempivoSensorSessionType;
+/**
+ * Advertisement firmware wins over sticker model. FW 7+ is modern. FW 6.x / 5.x is legacy (HC5).
+ */
+export declare function resolveConnectSessionType(model: string | undefined | null, firmware?: string | null): TempivoSensorSessionType;
 /**
  * 3-byte big-endian numeric PIN for GATT command payloads that check a reset code
  * (`setConfiguration`, trigger, and many other privileged writes).

package/dist/qr.js

@@ -23,6 +23,23 @@ export function sessionTypeFromModel(model) {
         return 'legacy';
     return 'modern';
 }
+/**
+ * Advertisement firmware wins over sticker model. FW 7+ is modern. FW 6.x / 5.x is legacy (HC5).
+ */
+export function resolveConnectSessionType(model, firmware) {
+    const t = firmware?.trim() ?? '';
+    if (/^FW\s*5/i.test(t))
+        return 'legacy';
+    const m = /^(\d+)\.\d+/.exec(t);
+    if (m) {
+        const major = Number.parseInt(m[1], 10);
+        if (major >= 7)
+            return 'modern';
+        if (major >= 1)
+            return 'legacy';
+    }
+    return sessionTypeFromModel(model);
+}
 /**
  * 3-byte big-endian numeric PIN for GATT command payloads that check a reset code
  * (`setConfiguration`, trigger, and many other privileged writes).

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

@@ -145,12 +145,14 @@ __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 *)connectPayloadJsonSerial:(NSString *)serial bluetoothMac:(NSString *)bluetoothMac pin:(int32_t)pin legacy:(BOOL)legacy deviceId:(NSString *)deviceId encryptionKey:(NSString *)encryptionKey __attribute__((swift_name("connectPayloadJson(serial:bluetoothMac:pin:legacy:deviceId:encryptionKey:)")));
 - (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)startDeviceScanOnDeviceJson:(void (^)(NSString *))onDeviceJson __attribute__((swift_name("startDeviceScan(onDeviceJson:)")));
+- (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

@@ -145,12 +145,14 @@ __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 *)connectPayloadJsonSerial:(NSString *)serial bluetoothMac:(NSString *)bluetoothMac pin:(int32_t)pin legacy:(BOOL)legacy deviceId:(NSString *)deviceId encryptionKey:(NSString *)encryptionKey __attribute__((swift_name("connectPayloadJson(serial:bluetoothMac:pin:legacy:deviceId:encryptionKey:)")));
 - (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)startDeviceScanOnDeviceJson:(void (^)(NSString *))onDeviceJson __attribute__((swift_name("startDeviceScan(onDeviceJson:)")));
+- (void)stopDeviceScan __attribute__((swift_name("stopDeviceScan()")));
 - (NSString *)triggerTransmissionPayloadJson __attribute__((swift_name("triggerTransmissionPayloadJson()")));
 @end
 

package/ios/Sources/TempivoSensorBeacon/TempivoSensorBeaconScanner.swift

@@ -1,6 +1,10 @@
 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)
@@ -10,15 +14,21 @@ public extension TempivoSensorBeaconScannerDelegate {
     func sensorBeaconScanner(_ scanner: TempivoSensorBeaconScanner, didUpdateState state: CBManagerState) {}
 }
 
-/// Active BLE scan for Tempivo sensor beacons (manufacturer `0x026C`). Advertising only. No GATT or connect.
+/// Active BLE scan. iPhone uses the same hardware runtime scan as Tempivo.
+/// Manufacturer-only CoreBluetooth misses HC7 / FW 7+ on iPhone.
 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()
@@ -36,10 +46,25 @@ 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 (duplicate advertisements allowed). Requires Bluetooth powered on.
+    /// Starts an active scan. iPhone: hardware runtime. Mac: manufacturer advertisements.
     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()
@@ -49,8 +74,12 @@ public final class TempivoSensorBeaconScanner: NSObject {
     /// Stops scanning and clears pending start.
     public func stopScanning() {
         pendingStart = false
-        guard isScanning else { return }
-        central.stopScan()
+        #if canImport(TempivoSensorBridge)
+        runtime.stopDeviceScan()
+        #endif
+        if isScanning {
+            central.stopScan()
+        }
         isScanning = false
     }
 
@@ -133,8 +162,55 @@ 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,3 +101,18 @@ 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,7 +17,21 @@ public struct TempivoSensorError: Error, LocalizedError, Sendable {
 
     public init(_ code: TempivoSensorErrorCode, _ message: String) {
         self.code = code
-        self.message = message
+        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/"))
     }
 
     public var errorDescription: String? { message }

package/ios/Sources/TempivoSensorBeacon/TempivoSensorQr.swift

@@ -30,6 +30,23 @@ 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,10 +15,19 @@ public final class TempivoSensorSession: @unchecked Sendable {
 
     public init() {}
 
-    public func connect(serial: String, bluetoothMac: String, pin: String, sessionType: TempivoSensorSessionType = .modern) throws {
-        guard let pinInt = Int32(pin.trimmingCharacters(in: .whitespacesAndNewlines)) else {
+    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 {
             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() }
@@ -28,7 +37,9 @@ public final class TempivoSensorSession: @unchecked Sendable {
                 serial: TempivoSensorQrParser.normalizeSerial(serial),
                 bluetoothMac: bluetoothMac,
                 pin: pinInt,
-                legacy: sessionType == .legacy
+                legacy: resolved == .legacy,
+                deviceId: deviceId?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "",
+                encryptionKey: trimmedPin
             )
         )
         try throwIfBridgeError(result)
@@ -38,8 +49,22 @@ public final class TempivoSensorSession: @unchecked Sendable {
         #endif
     }
 
-    public func connect(qr: TempivoSensorQr) throws {
-        try connect(serial: qr.serial, bluetoothMac: qr.bluetoothMac, pin: qr.pin, sessionType: qr.sessionType)
+    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 disconnect() {
@@ -148,14 +173,17 @@ 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, "Could not connect.")
-        case 6: throw TempivoSensorError(.invalidConfig, (result["message"] as? String) ?? "Invalid configuration.")
-        default: throw TempivoSensorError(.unknown, "Sensor request failed.")
+        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)")
         }
     }
 }

package/ios/TempivoSensorBeaconModule.swift

@@ -28,8 +28,13 @@ 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)
-        try self.session.connect(qr: qr)
+        let seen = self.scanner?.lookup(serial: qr.serial)
+        try self.session.connect(qr: qr, seen: seen)
         return self.qrPayload(qr)
       } catch {
         throw self.mapError(error)
@@ -189,7 +194,11 @@ public class TempivoSensorBeaconModule: Module, TempivoSensorBeaconScannerDelega
     if let sensor = error as? TempivoSensorError {
       return SensorBeaconException(code: sensor.code.rawValue, reason: sensor.message)
     }
-    return SensorBeaconException(code: "unknown", reason: error.localizedDescription)
+    let reason = TempivoSensorError.sanitizeClientMessage(error.localizedDescription)
+    return SensorBeaconException(
+      code: "unknown",
+      reason: reason.isEmpty ? "Sensor request failed." : reason
+    )
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tempivo/sensor-beacon",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Tempivo sensor BLE SDK for Expo, React Native, Android, iOS, and Node.",
   "homepage": "https://app.tempivo.com/integrations",
   "author": "Tempivo",