@tempivo/sensor-beacon 0.3.2 → 0.3.3

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/TempivoSensorQr.kt

@@ -40,15 +40,6 @@ 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,17 +33,10 @@ 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)
@@ -55,20 +48,14 @@ class TempivoSensorSession(
                             serial = TempivoSensorQrParser.normalizeSerial(serial),
                             bluetoothMac = bluetoothMac,
                             pin = pinInt,
-                            legacy = resolved == SessionType.LEGACY,
-                            deviceId = deviceId?.ifBlank { null } ?: serial,
-                            encryptionKey = pin.trim(),
+                            legacy = sessionType == SessionType.LEGACY,
                         )
                     }
             }
         } catch (e: Throwable) {
             throw SensorBleRuntime.mapError(e).let {
                 if (it.code == TempivoSensorException.Code.UNKNOWN) {
-                    TempivoSensorException(
-                        TempivoSensorException.Code.CONNECT_FAILED,
-                        it.message ?: "Could not connect.",
-                        e,
-                    )
+                    TempivoSensorException(TempivoSensorException.Code.CONNECT_FAILED, "Could not connect.", e)
                 } else {
                     it
                 }
@@ -76,15 +63,8 @@ class TempivoSensorSession(
         }
     }
 
-    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 connect(qr: TempivoSensorQr) {
+        connect(qr.serial, qr.bluetoothMac, qr.pin, qr.sessionType)
     }
 
     suspend fun disconnect() {
@@ -95,15 +75,16 @@ class TempivoSensorSession(
     }
 
     suspend fun getConfiguration(): TempivoSensorConfiguration {
-        return runGatt { SensorBleRuntime.readPartnerConfiguration(requireSession()) }
+        return runGatt {
+            SensorBleRuntime.decompile(SensorBleRuntime.readConfiguration(requireSession()))
+        }
     }
 
     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)
         }
     }
 
@@ -119,9 +100,7 @@ class TempivoSensorSession(
         return runGatt { SensorBleRuntime.readCalibration(requireSession()) }
     }
 
-    @JvmOverloads
-    fun connectBlocking(qr: TempivoSensorQr, seen: TempivoSensorBeaconScanner.SeenDevice? = null) =
-        runBlocking { connect(qr, seen) }
+    fun connectBlocking(qr: TempivoSensorQr) = runBlocking { connect(qr) }
 
     fun disconnectBlocking() = runBlocking { disconnect() }
 

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, resolveConnectSessionType, sessionTypeFromModel, } from './qr.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, resolveConnectSessionType, sessionTypeFromModel, } from './qr.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/native-helpers.d.ts

@@ -2,5 +2,4 @@ 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,25 +24,10 @@ 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) {
-        const clean = sanitizePartnerErrorText(error.message);
-        return new TempivoSensorError(error.code, clean || 'Sensor request failed.');
-    }
+    if (error instanceof TempivoSensorError)
+        return error;
     const raw = error;
     const code = isSensorCode(raw?.code) ? raw.code : 'unknown';
-    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);
+    return new TempivoSensorError(code, raw?.message || 'Sensor request failed.');
 }

package/dist/native-module.js

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

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,19 +2,15 @@ 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;
-/**
- * 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).
  */
 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() === '')
@@ -23,23 +23,6 @@ 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).
@@ -66,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/Frameworks/TempivoSensorBridge.xcframework/ios-arm64/TempivoSensorBridge.framework/Headers/TempivoSensorBridge.h

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