@tempivo/sensor-beacon 0.3.0 → 0.3.3

package/README.md

@@ -112,7 +112,9 @@ Same as Cellular API config profiles (`temperatureAlerts` + `schedule`). You can
 | `temperatureAlerts` | Alert list. Empty array is valid. |
 | `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,15 +144,15 @@ 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. |
-| `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
@@ -170,7 +172,7 @@ Filter manufacturer data on company id **0x026C**. Active scanning is on so scan
 
 | 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` | `ble_only`, `cell_ok`, `no_server`, or `net_issue`. |
@@ -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.0'
+version = '0.3.3'
 
 android {
   namespace "expo.modules.tempivosensorbeacon"
   defaultConfig {
     minSdk 26
     versionCode 1
-    versionName "0.3.0"
+    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-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
@@ -164,7 +165,20 @@ internal object PartnerBleRules {
             }
         }
 
-        return TempivoSensorConfiguration(alerts, decompileSchedule(cfg.ruleCalendars))
+        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

@@ -8,9 +8,11 @@ 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.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.
@@ -97,11 +99,19 @@ internal object SensorBleRuntime {
         }
     }
 
-    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 ->

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(
@@ -81,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.
      */
@@ -101,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
                             }
@@ -115,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,9 +27,18 @@ class TempivoSensorBeaconScanner(
 
     class ScanNotPermittedException(message: String) : Exception(message)
 
+    data class SeenDevice(
+        val deviceId: String,
+        val bluetoothMac: String,
+        val serial: String,
+        val firmware: String?,
+        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>()
     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) {
@@ -91,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
         }
@@ -107,25 +135,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/TempivoSensorProfile.kt

@@ -26,10 +26,16 @@ data class TempivoSchedule(
 data class TempivoSensorConfiguration(
     val temperatureAlerts: List<TempivoTemperatureAlert>,
     val schedule: TempivoSchedule,
+    val measurementIntervalMinutes: Double? = null,
+    val transmissionIntervalSeconds: Int? = null,
 )
 
 object TempivoSensorProfile {
     private val timeRe = Regex("^([01]\\d|2[0-3]):([0-5]\\d)$")
+    private const val MIN_MEASUREMENT_MINUTES = 60.0
+    private const val MAX_MEASUREMENT_MINUTES = 600.0
+    private const val MIN_TRANSMISSION_SECONDS = 3600
+    private const val MAX_TRANSMISSION_SECONDS = 604_800
 
     fun parseJson(json: String): TempivoSensorConfiguration {
         val root =
@@ -47,7 +53,11 @@ object TempivoSensorProfile {
         }
         val body =
             root.optJSONObject("profile")?.takeIf {
-                it.has("temperatureAlerts") || it.has("schedule") || it.has("slug")
+                it.has("temperatureAlerts") ||
+                    it.has("schedule") ||
+                    it.has("slug") ||
+                    it.has("measurementIntervalMinutes") ||
+                    it.has("transmissionIntervalSeconds")
             } ?: root
         if (!body.has("temperatureAlerts") && body.has("alarmRules")) {
             throw invalid("Use a config profile with temperatureAlerts (GET /devices/config-profiles/{slug}), not alarmRules.")
@@ -58,7 +68,13 @@ object TempivoSensorProfile {
             val item = arr.optJSONObject(i) ?: throw invalid("temperatureAlerts[$i] must be an object.")
             alerts.add(parseAlert(item, i))
         }
-        return TempivoSensorConfiguration(alerts, parseSchedule(body.optJSONObject("schedule")))
+        val intervals = parseOptionalIntervals(body)
+        return TempivoSensorConfiguration(
+            alerts,
+            parseSchedule(body.optJSONObject("schedule")),
+            measurementIntervalMinutes = intervals.first,
+            transmissionIntervalSeconds = intervals.second,
+        )
     }
 
     fun toJson(cfg: TempivoSensorConfiguration): String {
@@ -90,9 +106,50 @@ object TempivoSensorProfile {
             s.put("utcOffsetMinutes", cfg.schedule.utcOffsetMinutes)
         }
         root.put("schedule", s)
+        cfg.measurementIntervalMinutes?.let { root.put("measurementIntervalMinutes", it) }
+        cfg.transmissionIntervalSeconds?.let { root.put("transmissionIntervalSeconds", it) }
         return root.toString()
     }
 
+    private fun parseOptionalIntervals(body: JSONObject): Pair<Double?, Int?> {
+        var measurement: Double? = null
+        var transmission: Int? = null
+        if (body.has("measurementIntervalMinutes") && !body.isNull("measurementIntervalMinutes")) {
+            val n = body.optDouble("measurementIntervalMinutes")
+            if (!n.isFinite() || n <= 0) {
+                throw invalid("measurementIntervalMinutes must be a positive number.")
+            }
+            if (n < MIN_MEASUREMENT_MINUTES) {
+                throw invalid("measurementIntervalMinutes must be at least $MIN_MEASUREMENT_MINUTES (1 hour).")
+            }
+            if (n > MAX_MEASUREMENT_MINUTES) {
+                throw invalid("measurementIntervalMinutes must be at most $MAX_MEASUREMENT_MINUTES.")
+            }
+            measurement = n
+        }
+        if (body.has("transmissionIntervalSeconds") && !body.isNull("transmissionIntervalSeconds")) {
+            val asDouble = body.optDouble("transmissionIntervalSeconds")
+            if (!asDouble.isFinite() || asDouble <= 0 || asDouble != kotlin.math.floor(asDouble)) {
+                throw invalid("transmissionIntervalSeconds must be a positive integer.")
+            }
+            val n = asDouble.toInt()
+            if (n < MIN_TRANSMISSION_SECONDS) {
+                throw invalid("transmissionIntervalSeconds must be at least $MIN_TRANSMISSION_SECONDS (1 hour).")
+            }
+            if (n > MAX_TRANSMISSION_SECONDS) {
+                throw invalid("transmissionIntervalSeconds must be at most $MAX_TRANSMISSION_SECONDS.")
+            }
+            transmission = n
+        }
+        if (measurement != null && transmission != null) {
+            val maxTx = measurement * 60.0 * 60.0
+            if (transmission > maxTx) {
+                throw invalid("transmissionIntervalSeconds must be at most 60 times the measurement interval.")
+            }
+        }
+        return measurement to transmission
+    }
+
     private fun parseAlert(item: JSONObject, index: Int): TempivoTemperatureAlert {
         val channel = item.optString("channel")
         if (channel != "ambient" && channel != "probe") {

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

@@ -83,9 +83,8 @@ class TempivoSensorSession(
     suspend fun getConfigurationJson(): String = TempivoSensorProfile.toJson(getConfiguration())
 
     suspend fun setConfiguration(configuration: TempivoSensorConfiguration) {
-        val (rules, calendars) = SensorBleRuntime.compileRules(configuration)
         runGatt {
-            SensorBleRuntime.writeRules(requireSession(), rules, calendars)
+            SensorBleRuntime.writeConfiguration(requireSession(), configuration)
         }
     }
 

package/dist/index.d.ts

@@ -1,12 +1,12 @@
 export { ADV_FRAME_03_LEN, TEMPVO_SENSOR_MANUFACTURER_ID, buildSensorBeaconReading, decodeMeasurementSlot, decodeSensorBeaconPayload, lookupDeviceKeys, macKeyFromAddress, serialKeyFromAdv03Frame, splitSensorBeaconFrames, } from './decoder.js';
 export { ingestManufacturerPayload } from './ingest.js';
-export { dataViewToUint8Array, normalizeManufacturerBytes } from './normalize.js';
+export { dataViewToUint8Array, manufacturerPayloadsFromScanRecordBytes, 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 { calibrationFromExtendedJson, decodeLaboratoryCalibrationTimestamp, } from './calibration.js';
-export { DEFAULT_ALERT_HYSTERESIS_C, compileSensorProfileToBleJson, configurationFromApiProfile, parseSensorConfiguration, parseSensorConfigurationJson, pickPartnerConfigurationJson, } from './profile.js';
+export { BLE_MAX_MEASUREMENT_INTERVAL_MINUTES, BLE_MAX_TRANSMISSION_INTERVAL_SECONDS, BLE_MIN_MEASUREMENT_INTERVAL_MINUTES, BLE_MIN_TRANSMISSION_INTERVAL_SECONDS, DEFAULT_ALERT_HYSTERESIS_C, compileSensorProfileToBleJson, configurationFromApiProfile, parseSensorConfiguration, parseSensorConfigurationJson, pickPartnerConfigurationJson, } from './profile.js';
 export type { TempivoSchedule, TempivoScheduleAlways, TempivoScheduleWeek, TempivoSensorCalibration, TempivoSensorConfiguration, TempivoSensorQr, TempivoSensorSessionType, TempivoTemperatureAlert, TempivoTemperatureChannel, TempivoTemperatureMaxAlert, TempivoTemperatureMinAlert, TempivoTemperatureRangeAlert, TempivoTriggerTransmissionResult, } from './session-types.js';
 export { addDeviceFoundListener, connect, disconnect, getCalibration, getConfiguration, isNativeSensorBeaconAvailable, isScanning, requestPermissions, setConfigurationJson, startScan, stopScan, triggerTransmission, } from './native-bridge.js';
 export type { TempivoDeviceFoundSubscription, TempivoNativeCalibration, TempivoNativeMeasurement, TempivoNativePermissionResponse, TempivoNativePermissionStatus, TempivoNativeQr, TempivoNativeTelemetry, TempivoSensorBeaconDevice, } from './native-types.js';

package/dist/index.js

@@ -1,10 +1,10 @@
 export { ADV_FRAME_03_LEN, TEMPVO_SENSOR_MANUFACTURER_ID, buildSensorBeaconReading, decodeMeasurementSlot, decodeSensorBeaconPayload, lookupDeviceKeys, macKeyFromAddress, serialKeyFromAdv03Frame, splitSensorBeaconFrames, } from './decoder.js';
 export { ingestManufacturerPayload } from './ingest.js';
-export { dataViewToUint8Array, normalizeManufacturerBytes } from './normalize.js';
+export { dataViewToUint8Array, manufacturerPayloadsFromScanRecordBytes, 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 { calibrationFromExtendedJson, decodeLaboratoryCalibrationTimestamp, } from './calibration.js';
-export { DEFAULT_ALERT_HYSTERESIS_C, compileSensorProfileToBleJson, configurationFromApiProfile, parseSensorConfiguration, parseSensorConfigurationJson, pickPartnerConfigurationJson, } from './profile.js';
+export { BLE_MAX_MEASUREMENT_INTERVAL_MINUTES, BLE_MAX_TRANSMISSION_INTERVAL_SECONDS, BLE_MIN_MEASUREMENT_INTERVAL_MINUTES, BLE_MIN_TRANSMISSION_INTERVAL_SECONDS, DEFAULT_ALERT_HYSTERESIS_C, compileSensorProfileToBleJson, configurationFromApiProfile, parseSensorConfiguration, parseSensorConfigurationJson, pickPartnerConfigurationJson, } from './profile.js';
 export { addDeviceFoundListener, connect, disconnect, getCalibration, getConfiguration, isNativeSensorBeaconAvailable, isScanning, requestPermissions, setConfigurationJson, startScan, stopScan, triggerTransmission, } from './native-bridge.js';

package/dist/normalize.d.ts

@@ -4,3 +4,9 @@ export declare function dataViewToUint8Array(dv: DataView): Uint8Array;
  * Web Bluetooth and Android often already return payload **without** the prefix.
  */
 export declare function normalizeManufacturerBytes(data: Uint8Array | DataView | ArrayBuffer): Uint8Array;
+/**
+ * Parse Android-style `ScanRecord.getBytes()` AD structures and return every Tempivo
+ * manufacturer payload (company id stripped). Use this when both `0x03` and `0x04` share
+ * company `0x026C` — `getManufacturerSpecificData(0x026C)` can keep only one blob.
+ */
+export declare function manufacturerPayloadsFromScanRecordBytes(scanRecordBytes: Uint8Array | null | undefined): Uint8Array[];

package/dist/normalize.js

@@ -28,3 +28,32 @@ export function normalizeManufacturerBytes(data) {
     }
     return bytes;
 }
+const AD_TYPE_MANUFACTURER = 0xff;
+/**
+ * Parse Android-style `ScanRecord.getBytes()` AD structures and return every Tempivo
+ * manufacturer payload (company id stripped). Use this when both `0x03` and `0x04` share
+ * company `0x026C` — `getManufacturerSpecificData(0x026C)` can keep only one blob.
+ */
+export function manufacturerPayloadsFromScanRecordBytes(scanRecordBytes) {
+    if (!scanRecordBytes || scanRecordBytes.length === 0)
+        return [];
+    const out = [];
+    let i = 0;
+    const n = scanRecordBytes.length;
+    while (i < n) {
+        const len = scanRecordBytes[i] & 0xff;
+        if (len === 0)
+            break;
+        if (i + 1 + len > n)
+            break;
+        const type = scanRecordBytes[i + 1] & 0xff;
+        if (type === AD_TYPE_MANUFACTURER && len >= 3) {
+            const company = (scanRecordBytes[i + 2] & 0xff) | ((scanRecordBytes[i + 3] & 0xff) << 8);
+            if (company === TEMPVO_SENSOR_MANUFACTURER_ID && len > 3) {
+                out.push(scanRecordBytes.subarray(i + 4, i + 1 + len));
+            }
+        }
+        i += 1 + len;
+    }
+    return out;
+}

package/dist/profile.d.ts

@@ -1,6 +1,11 @@
 import type { TempivoSensorConfiguration } from './session-types.js';
 /** Same default as Cellular API config profiles. */
 export declare const DEFAULT_ALERT_HYSTERESIS_C = 1;
+/** Same limits as Cellular API simple profiles. */
+export declare const BLE_MIN_MEASUREMENT_INTERVAL_MINUTES = 60;
+export declare const BLE_MAX_MEASUREMENT_INTERVAL_MINUTES = 600;
+export declare const BLE_MIN_TRANSMISSION_INTERVAL_SECONDS = 3600;
+export declare const BLE_MAX_TRANSMISSION_INTERVAL_SECONDS = 604800;
 /** Validate Cellular API config-profile JSON for BLE setConfiguration. */
 export declare function parseSensorConfiguration(input: unknown): TempivoSensorConfiguration;
 /** Same as {@link parseSensorConfiguration}: GET `{ profile }` or the profile object. */

package/dist/profile.js

@@ -168,7 +168,9 @@ function parseAlert(item, index) {
 function looksLikeSimpleProfile(rec) {
     return (rec.temperatureAlerts !== undefined ||
         rec.schedule !== undefined ||
-        typeof rec.slug === 'string');
+        typeof rec.slug === 'string' ||
+        rec.measurementIntervalMinutes !== undefined ||
+        rec.transmissionIntervalSeconds !== undefined);
 }
 /**
  * GET /devices/config-profiles/{slug} returns `{ profile }`. Also accepts the profile object.
@@ -188,6 +190,48 @@ function rejectWireAlarmRules(rec) {
         throw new TempivoSensorError('invalidConfig', 'Use a config profile with temperatureAlerts (GET /devices/config-profiles/{slug}), not alarmRules.');
     }
 }
+/** Same limits as Cellular API simple profiles. */
+export const BLE_MIN_MEASUREMENT_INTERVAL_MINUTES = 60;
+export const BLE_MAX_MEASUREMENT_INTERVAL_MINUTES = 600;
+export const BLE_MIN_TRANSMISSION_INTERVAL_SECONDS = 3600;
+export const BLE_MAX_TRANSMISSION_INTERVAL_SECONDS = 604_800;
+function parseOptionalIntervals(body) {
+    const out = {};
+    if (body.measurementIntervalMinutes !== undefined) {
+        const n = parseFiniteNumber(body.measurementIntervalMinutes);
+        if (n === undefined || !Number.isFinite(n) || n <= 0) {
+            throw new TempivoSensorError('invalidConfig', 'measurementIntervalMinutes must be a positive number.');
+        }
+        if (n < BLE_MIN_MEASUREMENT_INTERVAL_MINUTES) {
+            throw new TempivoSensorError('invalidConfig', `measurementIntervalMinutes must be at least ${BLE_MIN_MEASUREMENT_INTERVAL_MINUTES} (1 hour).`);
+        }
+        if (n > BLE_MAX_MEASUREMENT_INTERVAL_MINUTES) {
+            throw new TempivoSensorError('invalidConfig', `measurementIntervalMinutes must be at most ${BLE_MAX_MEASUREMENT_INTERVAL_MINUTES}.`);
+        }
+        out.measurementIntervalMinutes = n;
+    }
+    if (body.transmissionIntervalSeconds !== undefined) {
+        const n = parseFiniteNumber(body.transmissionIntervalSeconds);
+        if (n === undefined || !Number.isInteger(n) || n <= 0) {
+            throw new TempivoSensorError('invalidConfig', 'transmissionIntervalSeconds must be a positive integer.');
+        }
+        if (n < BLE_MIN_TRANSMISSION_INTERVAL_SECONDS) {
+            throw new TempivoSensorError('invalidConfig', `transmissionIntervalSeconds must be at least ${BLE_MIN_TRANSMISSION_INTERVAL_SECONDS} (1 hour).`);
+        }
+        if (n > BLE_MAX_TRANSMISSION_INTERVAL_SECONDS) {
+            throw new TempivoSensorError('invalidConfig', `transmissionIntervalSeconds must be at most ${BLE_MAX_TRANSMISSION_INTERVAL_SECONDS}.`);
+        }
+        out.transmissionIntervalSeconds = n;
+    }
+    if (out.measurementIntervalMinutes != null &&
+        out.transmissionIntervalSeconds != null) {
+        const maxTx = out.measurementIntervalMinutes * 60 * 60;
+        if (out.transmissionIntervalSeconds > maxTx) {
+            throw new TempivoSensorError('invalidConfig', 'transmissionIntervalSeconds must be at most 60 times the measurement interval.');
+        }
+    }
+    return out;
+}
 /** Validate Cellular API config-profile JSON for BLE setConfiguration. */
 export function parseSensorConfiguration(input) {
     if (!isRecord(input)) {
@@ -201,9 +245,11 @@ export function parseSensorConfiguration(input) {
     }
     const temperatureAlerts = (alertsRaw ?? []).map((item, i) => parseAlert(item, i));
     assertAlertSlotBudget(temperatureAlerts);
+    const intervals = parseOptionalIntervals(body);
     return {
         temperatureAlerts,
         schedule: parseSchedule(body.schedule),
+        ...intervals,
     };
 }
 /** Same as {@link parseSensorConfiguration}: GET `{ profile }` or the profile object. */

package/dist/qr.d.ts

@@ -2,7 +2,7 @@ import type { TempivoSensorQr, TempivoSensorSessionType } from './session-types.
 export declare function normalizeSensorSerial(value: string): string;
 /** `282C024F0012` → `28:2C:02:4F:00:12`. */
 export declare function bluetoothMacFromSerial(serial: string): string;
-/** BLE default when QR omits `model`. HC5 / FW 6.x still select legacy. */
+/** BLE default when QR omits `model`. Firmware 6.x still selects legacy. */
 export declare const DEFAULT_SENSOR_MODEL = "HC7";
 export declare function sessionTypeFromModel(model: string | undefined | null): TempivoSensorSessionType;
 /**
@@ -11,6 +11,6 @@ export declare function sessionTypeFromModel(model: string | undefined | null):
  */
 export declare function encodeSensorPinPayload(pin: string): Uint8Array;
 /**
- * Parse sensor label QR JSON: `{"sn":"…","pin":"…","model":"HC7"}`.
+ * Parse sensor label QR JSON: `{"sn":"…","pin":"…"}`.
  */
 export declare function parseSensorQrJson(text: string): TempivoSensorQr;

package/dist/qr.js

@@ -13,7 +13,7 @@ export function bluetoothMacFromSerial(serial) {
         parts.push(key.slice(i, i + 2));
     return parts.join(':');
 }
-/** BLE default when QR omits `model`. HC5 / FW 6.x still select legacy. */
+/** BLE default when QR omits `model`. Firmware 6.x still selects legacy. */
 export const DEFAULT_SENSOR_MODEL = 'HC7';
 export function sessionTypeFromModel(model) {
     if (model == null || model.trim() === '')
@@ -49,7 +49,7 @@ function pinFromRecord(rec) {
     return undefined;
 }
 /**
- * Parse sensor label QR JSON: `{"sn":"…","pin":"…","model":"HC7"}`.
+ * Parse sensor label QR JSON: `{"sn":"…","pin":"…"}`.
  */
 export function parseSensorQrJson(text) {
     let rec;

package/dist/session-types.d.ts

@@ -39,17 +39,22 @@ export type TempivoScheduleWeek = {
 };
 export type TempivoSchedule = TempivoScheduleAlways | TempivoScheduleWeek;
 /**
- * Same JSON as Cellular API `POST /api/v1/devices/config-profiles`
- * (`temperatureAlerts` + `schedule`). Extra profile fields (`slug`, `name`, intervals) are ignored over BLE.
+ * Same JSON as Cellular API config profiles (`temperatureAlerts` + `schedule`),
+ * plus optional `measurementIntervalMinutes` / `transmissionIntervalSeconds` for BLE.
+ * Extra profile fields (`slug`, `name`) are ignored over BLE.
  */
 export type TempivoSensorConfiguration = {
     temperatureAlerts: TempivoTemperatureAlert[];
     schedule: TempivoSchedule;
+    /** Sampling interval in minutes (Cellular API). Optional. */
+    measurementIntervalMinutes?: number;
+    /** Uplink interval in seconds (Cellular API). Optional. */
+    transmissionIntervalSeconds?: number;
 };
 export type TempivoSensorQr = {
     serial: string;
     pin: string;
-    /** Sticker model. Omitted QR `model` parses as HC7. */
+    /** Optional sticker field. Firmware from the last scan wins. Firmware 7+ is modern GATT. */
     model?: string;
     sessionType: TempivoSensorSessionType;
     bluetoothMac: string;

package/ios/Sources/TempivoSensorBeacon/TempivoSensorBeaconDecoder.swift

@@ -154,7 +154,12 @@ public enum TempivoSensorBeaconDecoder {
         let bytes = [UInt8](manufacturerData)
         guard bytes.count >= 3 else { return false }
         let company = UInt16(bytes[0]) | (UInt16(bytes[1]) << 8)
-        guard company == TEMPVO_SENSOR_MANUFACTURER_ID else { return false }
+        guard company == TEMPVO_SENSOR_MANUFACTURER_ID else {
+            // Already-normalized payload (no company id).
+            return ingestNormalizedPayload(bytes, primaryMacKey: primaryMacKey, last03: &last03, last04: &last04)
+        }
+        // ADV + SCAN_RSP may be concatenated as `6C02`+frame03+`6C02`+frame04.
+        // strip once then let splitSensorFrames skip the second company id bytes.
         return ingestNormalizedPayload(Array(bytes.dropFirst(2)), primaryMacKey: primaryMacKey, last03: &last03, last04: &last04)
     }
 
@@ -180,7 +185,12 @@ public enum TempivoSensorBeaconDecoder {
                     }
                 }
             } else if tag == 0x04 {
-                let keys = lookupKeys(primaryMacKey: primaryMacKey)
+                let serialFromCached03 =
+                    lookupKeys(primaryMacKey: primaryMacKey)
+                    .compactMap { last03[$0] }
+                    .compactMap { serialKeyFromAdv03([UInt8]($0)) }
+                    .first
+                let keys = lookupKeys(primaryMacKey: primaryMacKey, extraSerialKey: serialFromCached03)
                 let data = Data(fr)
                 for key in keys {
                     if last04[key] != data {

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/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/package.json

@@ -1,8 +1,13 @@
 {
   "name": "@tempivo/sensor-beacon",
-  "version": "0.3.0",
+  "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",