@tempivo/sensor-beacon 0.3.2 → 0.3.3

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`. `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.
+`startScan` and `connect` request Bluetooth permission. Sticker PIN is required on `connect`. Wrong PIN is `invalidPin`.
 
 If a bundler misses native BLE, import `@tempivo/sensor-beacon/react-native`.
 
@@ -110,9 +110,11 @@ 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. Weekday windows apply on FW 7+. HC5 is always 24/7. |
+| `schedule` | `{ "always": true }` is 24/7. |
 
-Ignored over BLE: `slug`, `name`, `measurementIntervalMinutes`, `transmissionIntervalSeconds`. Do not pass `alarmRules`.
+Ignored over BLE: `slug`, `name`. Do not pass `alarmRules`.
+
+Optional intervals (same limits as Cellular API): `measurementIntervalMinutes` (60–600), `transmissionIntervalSeconds` (3600–604800). When both are set, uplink must be at most 60× the measurement interval. Omitted fields leave the device’s current intervals unchanged.
 
 **Each `temperatureAlerts[]` item**
 
@@ -142,20 +144,20 @@ Ignored over BLE: `slug`, `name`, `measurementIntervalMinutes`, `transmissionInt
 Sticker QR is JSON. Parse with `parseSensorQrJson`.
 
 ```json
-{ "sn": "282C024F0012", "pin": "111111", "model": "HC7" }
+{ "sn": "282C024F0012", "pin": "111111" }
 ```
 
 | Field | Type | Meaning |
 |------|------|---------|
 | `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. Same `connect` call works for both. |
-| `sessionType` | `modern` \| `legacy` | GATT path. HC7 / firmware 7+ is `modern`. HC5 / firmware 6.x is `legacy`. |
+| `model` | string | Optional. Firmware from the last scan wins when present. |
+| `sessionType` | `modern` \| `legacy` | GATT path. Firmware 7+ is `modern`. Firmware 6.x is `legacy`. |
 | `bluetoothMac` | string | BLE MAC with colons, derived from `serial`. |
 
 ## Scan result
 
-iOS uses the same hardware scan as Tempivo. Manufacturer ads (`0x026C`) alone often miss HC7 / FW 7+. Android still filters `0x026C`.
+Filter manufacturer data on company id **0x026C**. Active scanning is on so scan-response packets arrive.
 
 | Field | Meaning |
 |------|---------|
@@ -170,10 +172,10 @@ iOS uses the same hardware scan as Tempivo. Manufacturer ads (`0x026C`) alone of
 
 | Field | Meaning |
 |------|---------|
-| `firmware` | `major.minor.patch`, e.g. `7.3.4`. |
+| `firmware` | `major.minor.patch`, e.g. `7.3.4`. Firmware 7+ is modern GATT. |
 | `batteryOk` | Battery status flag. |
 | `encryptionEnabled` | Advertisement payload encryption flag. |
-| `cellularStatus` | Advert attachment bits only: `ble_only`, `cell_ok`, `no_server`, or `net_issue`. Not ECL, SINR, or RSSI. |
+| `cellularStatus` | `ble_only`, `cell_ok`, `no_server`, or `net_issue`. |
 | `readingTimestampUnix` | Sample time as unix seconds, or null. |
 | `readingTimestampIso` | Same instant as UTC ISO-8601, or null. |
 | `measurementIntervalSeconds` | Sample interval, in seconds. |
@@ -206,7 +208,7 @@ import {
   parseSensorConfigurationJson,
 } from '@tempivo/sensor-beacon';
 
-const qr = parseSensorQrJson('{"sn":"282C024F0012","pin":"111111","model":"HC7"}');
+const qr = parseSensorQrJson('{"sn":"282C024F0012","pin":"111111"}');
 const reading = decodeSensorBeaconPayload(normalizeManufacturerBytes(advertisementBytes));
 const cfg = parseSensorConfigurationJson(/* config JSON above */);
 ```
@@ -215,7 +217,16 @@ Invalid QR or config throws `TempivoSensorError` (`invalidQr`, `invalidPin`, `in
 
 ## Android (Kotlin)
 
-AAR: `dist/tempivo-sensor-beacon.aar` after `npm run build:android`. Sources: `android-aar/library`. Request `BLUETOOTH_SCAN` and `BLUETOOTH_CONNECT` (API 31+) or location on older APIs.
+AAR after `npm run build:android` (from `packages/tempivo-sensor-beacon`):
+
+| Path | Use |
+|------|-----|
+| `android/libs/tempivo-sensor-beacon.aar` | Expo / React Native autolinking (`android/build.gradle`) |
+| `dist/tempivo-sensor-beacon.aar` | Same file; handy for plain Android `files(...)` deps |
+
+Sources: `android-aar/library`. Request `BLUETOOTH_SCAN` and `BLUETOOTH_CONNECT` (API 31+) or location on older APIs.
+
+**Scan:** temperature and other live values are in scan-response frame **`0x04`** (`telemetry.readings`). Frame **`0x03`** alone fills firmware / battery / cellular but leaves `readings` empty until an active scan delivers `0x04` (usually within a second or two). Keep scanning; do not stop on the first event.
 
 ```kotlin
 val qr = TempivoSensorQrParser.parse(stickerQrText)

package/android/build.gradle

@@ -4,14 +4,14 @@ plugins {
 }
 
 group = 'com.tempivo.sensor.beacon'
-version = '0.3.1'
+version = '0.3.3'
 
 android {
   namespace "expo.modules.tempivosensorbeacon"
   defaultConfig {
     minSdk 26
     versionCode 1
-    versionName "0.3.1"
+    versionName "0.3.3"
   }
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_17
@@ -24,9 +24,17 @@ android {
   }
 }
 
-def aarFile = file("libs/tempivo-sensor-beacon.aar")
-if (!aarFile.exists()) {
-  throw new GradleException("Missing android/libs/tempivo-sensor-beacon.aar. From the package root run: npm run build:android")
+// Prefer android/libs (what Expo autolinking uses). Fall back to dist/ from `npm run build:android`.
+def aarCandidates = [
+  file("${projectDir}/libs/tempivo-sensor-beacon.aar"),
+  file("${projectDir}/../dist/tempivo-sensor-beacon.aar"),
+]
+def aarFile = aarCandidates.find { it.exists() }
+if (aarFile == null) {
+  throw new GradleException(
+    "Missing tempivo-sensor-beacon.aar (looked in android/libs/ and dist/). " +
+      "From packages/tempivo-sensor-beacon run: npm run build:android"
+  )
 }
 
 dependencies {

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

@@ -54,15 +54,8 @@ 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);
-      TempivoSensorBeaconScanner.SeenDevice seen = scanner != null ? scanner.lookup(qr.getSerial()) : null;
-      requireSession(context).connectBlocking(qr, seen);
+      requireSession(context).connectBlocking(qr);
       return qrMap(qr);
     } catch (Throwable error) {
       throw wrap(error);
@@ -142,14 +135,13 @@ final class SensorBeaconNative {
     }
     TempivoSensorException sensor = findSensor(error);
     if (sensor != null) {
-      return new NativeError(toJs(sensor.getCode()), TempivoSensorException.sanitizeClientMessage(sensor.getMessage()), null);
+      return new NativeError(toJs(sensor.getCode()), sensor.getMessage(), error);
     }
     if (error instanceof TempivoSensorBeaconScanner.ScanNotPermittedException) {
-      String permitted = TempivoSensorException.sanitizeClientMessage(error.getMessage());
-      return new NativeError("runtimeUnavailable", permitted.isEmpty() ? "Bluetooth permission is required." : permitted, null);
+      return new NativeError("runtimeUnavailable", error.getMessage(), error);
     }
-    String message = TempivoSensorException.sanitizeClientMessage(error.getMessage());
-    return new NativeError("unknown", message.isEmpty() ? "Sensor request failed." : message, null);
+    String message = error.getMessage();
+    return new NativeError("unknown", message != null ? message : "Sensor request failed.", error);
   }
 
   private static TempivoSensorException findSensor(Throwable error) {

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

@@ -8,7 +8,6 @@ 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()
@@ -117,8 +116,7 @@ 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, null)
+    return CodedException(native.code, native.message, this)
   }
-  val clean = TempivoSensorException.sanitizeClientMessage(message)
-  return CodedException("unknown", clean.ifEmpty { "Sensor request failed." }, null)
+  return CodedException("unknown", message ?: "Sensor request failed.", this)
 }

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

@@ -1,5 +1,6 @@
 package com.tempivo.sensor.beacon
 
+import pl.efento.mobile.bluetooth.model.MeasurementPeriod
 import pl.efento.mobile.bluetooth.model.sensor.Action
 import pl.efento.mobile.bluetooth.model.sensor.DisabledCondition
 import pl.efento.mobile.bluetooth.model.sensor.HighThresholdCondition
@@ -93,12 +94,9 @@ internal object PartnerBleRules {
         return rules to calendars
     }
 
-    fun decompile(cfg: SensorConfiguration): TempivoSensorConfiguration =
-        decompile(cfg.rules.orEmpty(), cfg.ruleCalendars)
-
-    fun decompile(rules: List<Rule>, calendars: List<RuleCalendar>? = null): TempivoSensorConfiguration {
+    fun decompile(cfg: SensorConfiguration): TempivoSensorConfiguration {
         val padded = MutableList(12) { i ->
-            rules.getOrNull(i)
+            cfg.rules.orEmpty().getOrNull(i)
                 ?: Rule(i + 1, emptySet(), DisabledCondition, Action.NO_ACTION)
         }
         val orRefs = orSelectedPairs(padded)
@@ -167,7 +165,20 @@ internal object PartnerBleRules {
             }
         }
 
-        return TempivoSensorConfiguration(alerts, decompileSchedule(calendars))
+        return TempivoSensorConfiguration(
+            alerts,
+            decompileSchedule(cfg.ruleCalendars),
+            measurementIntervalMinutes = decompileMeasurementMinutes(cfg.measurementPeriod),
+            transmissionIntervalSeconds = cfg.transmissionInterval?.value?.takeIf { it > 0 },
+        )
+    }
+
+    private fun decompileMeasurementMinutes(period: MeasurementPeriod?): Double? {
+        if (period == null) return null
+        val factor = if (period.factor == 0) 1 else period.factor
+        val sec = period.base * factor
+        if (sec <= 0) return null
+        return sec / 60.0
     }
 
     private fun orSelectedPairs(rules: List<Rule>): List<Pair<Int, Int>> {

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

@@ -2,17 +2,17 @@ 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.MeasurementPeriod
 import pl.efento.mobile.bluetooth.model.sensor.Rule
 import pl.efento.mobile.bluetooth.model.sensor.RuleCalendar
 import pl.efento.mobile.bluetooth.model.sensor.SensorConfiguration
+import pl.efento.mobile.bluetooth.model.sensor.cellular.TransmissionInterval
 
 /**
  * Internal adapter to the sensor BLE runtime. Keep vendor types inside this file.
@@ -33,26 +33,15 @@ 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.")
+                TempivoSensorException(TempivoSensorException.Code.INVALID_PIN, "Invalid PIN.", e)
             e is UnsupportedCommandException || className.contains("UnsupportedCommand") ->
-                TempivoSensorException(TempivoSensorException.Code.UNSUPPORTED_COMMAND, "Unsupported command.")
+                TempivoSensorException(TempivoSensorException.Code.UNSUPPORTED_COMMAND, "Unsupported command.", e)
             className.contains("NotConnected") ->
-                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.",
-                )
+                TempivoSensorException(TempivoSensorException.Code.NOT_CONNECTED, "Not connected.", e)
             else ->
-                TempivoSensorException(
-                    TempivoSensorException.Code.UNKNOWN,
-                    if (detail.isNotEmpty()) "Sensor request failed. $detail" else "Sensor request failed.",
-                )
+                TempivoSensorException(TempivoSensorException.Code.UNKNOWN, "Sensor request failed.", e)
         }
     }
 
@@ -62,57 +51,32 @@ internal object SensorBleRuntime {
         bluetoothMac: String,
         pin: Int,
         legacy: Boolean,
-        deviceId: String = serial,
-        encryptionKey: String = "",
     ): Session {
         initialize(application)
         val mac = BluetoothMacAddress(bluetoothMac)
-        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
-            }
+        // 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)
         }
     }
 
@@ -124,34 +88,37 @@ internal object SensorBleRuntime {
         }
     }
 
-    suspend fun readPartnerConfiguration(session: Session): TempivoSensorConfiguration {
+    suspend fun readConfiguration(session: Session): SensorConfiguration {
         return when (session) {
-            is Session.Modern -> PartnerBleRules.decompile(modernGetConfiguration(session.connection))
+            is Session.Modern -> modernGetConfiguration(session.connection)
             is Session.Legacy ->
-                PartnerBleRules.decompile(session.connection.commands.getRules { }, emptyList())
+                throw TempivoSensorException(
+                    TempivoSensorException.Code.UNSUPPORTED_COMMAND,
+                    "Configuration rules require a current-generation sensor session.",
+                )
         }
     }
 
-    suspend fun writeRules(session: Session, rules: List<Rule>, calendars: List<RuleCalendar>) {
+    suspend fun writeConfiguration(session: Session, cfg: TempivoSensorConfiguration) {
+        val (rules, calendars) = compileRules(cfg)
         when (session) {
             is Session.Modern -> {
                 val base = modernGetConfiguration(session.connection)
-                val next = base.copy(rules = rules.take(12), ruleCalendars = calendars.take(6))
+                var next = base.copy(rules = rules.take(12), ruleCalendars = calendars.take(6))
+                cfg.measurementIntervalMinutes?.let { minutes ->
+                    val baseSec = (minutes * 60.0).toInt().coerceAtLeast(1)
+                    next = next.copy(measurementPeriod = MeasurementPeriod(baseSec, 1))
+                }
+                cfg.transmissionIntervalSeconds?.let { sec ->
+                    next = next.copy(transmissionInterval = TransmissionInterval(sec))
+                }
                 session.connection.commands.setConfiguration(next) { }
             }
-            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) { } }
+            is Session.Legacy ->
+                throw TempivoSensorException(
+                    TempivoSensorException.Code.UNSUPPORTED_COMMAND,
+                    "Configuration rules require a current-generation sensor session.",
+                )
         }
     }
 

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

@@ -12,12 +12,18 @@ import kotlin.math.floor
  *
  * Android [android.bluetooth.le.ScanRecord.getManufacturerSpecificData] returns the payload **after**
  * the 2-byte company id — i.e. starts with `0x03` / `0x04`, not `6C 02`.
+ *
+ * Prefer [manufacturerPayloadsFromScanRecordBytes]: `getManufacturerSpecificData(0x026C)` can keep only
+ * one blob when both advertisement (`0x03`) and scan response (`0x04`) share the same company id.
  */
 object TempivoSensorBeaconDecoder {
 
     /** Bluetooth SIG company identifier (little-endian on air: `6C 02`). */
     const val MANUFACTURER_COMPANY_ID: Int = 0x026C
 
+    /** AD type for Manufacturer Specific Data. */
+    private const val AD_TYPE_MANUFACTURER: Int = 0xFF
+
     const val ADV_FRAME_03_LEN = 22
 
     private data class MeasureSpec(
@@ -62,20 +68,6 @@ 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
@@ -95,6 +87,35 @@ object TempivoSensorBeaconDecoder {
         return keys.toList()
     }
 
+    /**
+     * Extract every Tempivo manufacturer payload from a raw [android.bluetooth.le.ScanRecord] byte
+     * array (AD length/type structures). Each returned blob starts with frame tag `0x03` / `0x04`
+     * (company id already stripped), matching [getManufacturerSpecificData].
+     */
+    fun manufacturerPayloadsFromScanRecordBytes(scanRecordBytes: ByteArray?): List<ByteArray> {
+        if (scanRecordBytes == null || scanRecordBytes.isEmpty()) return emptyList()
+        val out = mutableListOf<ByteArray>()
+        var i = 0
+        val n = scanRecordBytes.size
+        while (i < n) {
+            val len = scanRecordBytes[i].toInt() and 0xFF
+            if (len == 0) break
+            if (i + 1 + len > n) break
+            val type = scanRecordBytes[i + 1].toInt() and 0xFF
+            if (type == AD_TYPE_MANUFACTURER && len >= 3) {
+                val company =
+                    (scanRecordBytes[i + 2].toInt() and 0xFF) or
+                        ((scanRecordBytes[i + 3].toInt() and 0xFF) shl 8)
+                if (company == MANUFACTURER_COMPANY_ID && len > 3) {
+                    // AD length counts type + company + payload; payload starts at i+4.
+                    out += scanRecordBytes.copyOfRange(i + 4, i + 1 + len)
+                }
+            }
+            i += 1 + len
+        }
+        return out
+    }
+
     /**
      * @return true if any `0x03` / `0x04` frame was stored.
      */
@@ -115,7 +136,7 @@ object TempivoSensorBeaconDecoder {
                         val frame = fr.copyOf(ADV_FRAME_03_LEN)
                         val keys = lookupKeys(primaryMacKey, serialKeyFromAdv03(frame))
                         for (key in keys) {
-                            if (last03[key] != frame) {
+                            if (!last03[key].contentEquals(frame)) {
                                 last03[key] = frame
                                 changed = true
                             }
@@ -129,16 +150,23 @@ object TempivoSensorBeaconDecoder {
                             if (existing != null && existing.isNotEmpty() && (existing[0].toInt() and 0xFF) == 0x03) {
                                 continue
                             }
-                            if (last03[key] != fr) {
+                            if (!last03[key].contentEquals(fr)) {
                                 last03[key] = fr
                                 changed = true
                             }
                         }
                     }
                 0x04 -> {
-                    val keys = lookupKeys(primaryMacKey)
+                    // Also index under any serial already learned from `0x03` for this MAC.
+                    val serialFromCached03 =
+                        lookupKeys(primaryMacKey)
+                            .asSequence()
+                            .mapNotNull { last03[it] }
+                            .mapNotNull { serialKeyFromAdv03(it) }
+                            .firstOrNull()
+                    val keys = lookupKeys(primaryMacKey, serialFromCached03)
                     for (key in keys) {
-                        if (last04[key] != fr) {
+                        if (!last04[key].contentEquals(fr)) {
                             last04[key] = fr
                             changed = true
                         }

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

@@ -27,7 +27,6 @@ class TempivoSensorBeaconScanner(
 
     class ScanNotPermittedException(message: String) : Exception(message)
 
-    private val appContext = context.applicationContext
     data class SeenDevice(
         val deviceId: String,
         val bluetoothMac: String,
@@ -36,6 +35,7 @@ class TempivoSensorBeaconScanner(
         val encryptionEnabled: Boolean?,
     )
 
+    private val appContext = context.applicationContext
     private val advLast03 = ConcurrentHashMap<String, ByteArray>()
     private val advLast04 = ConcurrentHashMap<String, ByteArray>()
     private val lastSeen = ConcurrentHashMap<String, SeenDevice>()
@@ -106,13 +106,26 @@ class TempivoSensorBeaconScanner(
     fun isScanning(): Boolean = scanning
 
     private fun handleScanResult(result: ScanResult) {
-        val md =
-            result.scanRecord?.getManufacturerSpecificData(TempivoSensorBeaconDecoder.MANUFACTURER_COMPANY_ID)
-                ?: return
+        val record = result.scanRecord ?: return
         val addr = result.device?.address ?: return
         val key = TempivoSensorBeaconDecoder.macKey(addr)
-        val changed =
-            TempivoSensorBeaconDecoder.ingestManufacturerPayload(md, key, advLast03, advLast04)
+        // Raw AD parse keeps both 0x03 and 0x04 when they share company id 0x026C.
+        // getManufacturerSpecificData(0x026C) can retain only one of the two.
+        val payloads =
+            TempivoSensorBeaconDecoder.manufacturerPayloadsFromScanRecordBytes(record.bytes)
+                .ifEmpty {
+                    val single =
+                        record.getManufacturerSpecificData(TempivoSensorBeaconDecoder.MANUFACTURER_COMPANY_ID)
+                    if (single != null) listOf(single) else emptyList()
+                }
+        if (payloads.isEmpty()) return
+
+        var changed = false
+        for (md in payloads) {
+            if (TempivoSensorBeaconDecoder.ingestManufacturerPayload(md, key, advLast03, advLast04)) {
+                changed = true
+            }
+        }
         if (!changed && !advLast03.containsKey(key) && !advLast04.containsKey(key)) {
             return
         }

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

@@ -1,27 +1,10 @@
 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,