@ovok/native 1.16.1-rc.3 → 1.16.1-rc.5

package/lib/module/modules/bt-management/services/devices/standard-gatt/standard-gatt.glucose.js

@@ -2,8 +2,10 @@
 
 import { MeasurementTypeKey } from "@ovok/core/next";
 import { byteToHex } from "../../../utils/bytes-to-hex.js";
-import { sigUuid } from "../../../utils/sig-uuid.js";
 import { defineCustomDevice } from "../../custom/define-custom-device.js";
+import { glucoseRecordDetails, hasUnusableSensorStatus } from "./standard-gatt.glucose-details.js";
+import { BASE_TIME_INDEX, byte, concentrationIndex, FLAG_CONCENTRATION, FLAG_MOL_PER_L, FLAG_TIME_OFFSET, TIME_OFFSET_INDEX, typeAndLocationFromGlucoseFrame } from "./standard-gatt.glucose-frame.js";
+import { createGlucoseSequencer, GLUCOSE_MEASUREMENT_UUID, GLUCOSE_SERVICE_UUID, RECORD_ACCESS_CONTROL_POINT_UUID } from "./standard-gatt.glucose-racp.js";
 import { littleEndian } from "./standard-gatt.profile.js";
 
 /**
@@ -11,10 +13,11 @@ import { littleEndian } from "./standard-gatt.profile.js";
  * 0x2A52.
  *
  * A glucose meter does not push its readings. The collector enables indications on the
- * control point, writes "report all stored records" (`01 01`) once, and the meter answers
- * with one Glucose Measurement per stored record followed by a control-point response
- * (`06 00 01 xx`). Every record is reported; the SDK's stable result identity keeps a
- * record seen on an earlier connection from becoming a second reading.
+ * control point and writes a request for the stored records: those after the newest one it
+ * has read (`01 03 01 nn nn`) when the manager has a `recordCursorStorage`, otherwise all of
+ * them (`01 01`). The meter answers with one Glucose Measurement per record followed by a
+ * control-point response (`06 00 01 xx`). The SDK's stable result identity, which covers the
+ * record's sequence number, keeps a record seen twice from becoming a second reading.
  *
  * Glucose Measurement layout: flags, sequence number (2), base time (7), time offset (2,
  * flag bit 0), concentration SFLOAT (2) and type/sample-location (1) (bit 1), sensor status
@@ -24,17 +27,13 @@ const MG_PER_DL_PER_KG_PER_L = 100_000;
 
 /** One mol/L of glucose (180.16 g/mol) is 18,016 mg/dL. */
 const MG_PER_DL_PER_MOL_PER_L = 18_016;
-const FLAG_TIME_OFFSET = 0x01;
-const FLAG_CONCENTRATION = 0x02;
-const FLAG_MOL_PER_L = 0x04;
-const BASE_TIME_INDEX = 3;
-const TIME_OFFSET_INDEX = 10;
+
+/** One decimal reads a mmol/L result (0.1 mmol/L is 1.8 mg/dL) back as the meter showed it. */
+const MG_PER_DL_DECIMALS = 1;
 
 /** Type 0xA and sample location 0x4 both mean a control-solution test, not a patient sample. */
 const CONTROL_SOLUTION_TYPE = 0x0a;
 const CONTROL_SOLUTION_LOCATION = 0x04;
-const REPORT_ALL_STORED_RECORDS = "0101";
-const concentrationIndex = flags => flags & FLAG_TIME_OFFSET ? TIME_OFFSET_INDEX + 2 : TIME_OFFSET_INDEX;
 
 /** Bits 5-7 are reserved; a meter that sets one still sends a readable record. */
 const ALL_FLAGS = Array.from({
@@ -45,13 +44,9 @@ const glucoseField = flags => {
   return {
     ...littleEndian("bloodGlucose", [index, index + 1], "mg/dL", "sfloat"),
     scale: flags & FLAG_MOL_PER_L ? MG_PER_DL_PER_MOL_PER_L : MG_PER_DL_PER_KG_PER_L,
-    decimals: 0
+    decimals: MG_PER_DL_DECIMALS
   };
 };
-const byte = (frame, index) => {
-  const value = Number.parseInt(frame[index] ?? "", 16);
-  return Number.isInteger(value) ? value : undefined;
-};
 
 /** The record's own time: the base time plus its offset in minutes, read as phone-local. */
 const recordedAtFromGlucoseFrame = frame => {
@@ -82,8 +77,7 @@ const recordedAtFromGlucoseFrame = frame => {
   return recordedAt;
 };
 const isControlSolution = frame => {
-  const flags = byte(frame, 0) ?? 0;
-  const typeAndLocation = byte(frame, concentrationIndex(flags) + 2);
+  const typeAndLocation = typeAndLocationFromGlucoseFrame(frame);
   return typeAndLocation !== undefined && ((typeAndLocation & 0x0f) === CONTROL_SOLUTION_TYPE || typeAndLocation >> 4 === CONTROL_SOLUTION_LOCATION);
 };
 
@@ -95,9 +89,9 @@ const standardGlucoseDevice = params => defineCustomDevice({
   oneReadingPerConnection: params.oneReadingPerConnection,
   stuckDataTimeoutMs: params.stuckDataTimeoutMs ?? 60_000,
   services: [{
-    uuid: sigUuid("1808"),
+    uuid: GLUCOSE_SERVICE_UUID,
     monitor: [{
-      uuid: sigUuid("2a18"),
+      uuid: GLUCOSE_MEASUREMENT_UUID,
       frame: {
         minLengthBytes: TIME_OFFSET_INDEX
       },
@@ -114,7 +108,7 @@ const standardGlucoseDevice = params => defineCustomDevice({
         description: "A record without a concentration"
       })
     }, {
-      uuid: sigUuid("2a52"),
+      uuid: RECORD_ACCESS_CONTROL_POINT_UUID,
       frame: {
         minLengthBytes: 2
       },
@@ -128,23 +122,22 @@ const standardGlucoseDevice = params => defineCustomDevice({
         kind: "idle",
         description: "Record access response"
       }]
-    }],
-    write: {
-      uuid: sigUuid("2a52"),
-      commandHex: REPORT_ALL_STORED_RECORDS,
-      when: "connect"
-    }
+    }]
   }]
 }, {
+  createCommandSequencer: createGlucoseSequencer,
   decorateReading: (reading, frame, recordOffset) => {
-    if (frame && isControlSolution(frame)) {
+    if (frame && (isControlSolution(frame) || hasUnusableSensorStatus(frame))) {
       return null;
     }
     const recordedAt = frame ? recordedAtFromGlucoseFrame(frame) : undefined;
-    const decorated = recordedAt ? {
+    const decorated = {
       ...reading,
-      recordedAt
-    } : reading;
+      ...(frame && glucoseRecordDetails(frame)),
+      ...(recordedAt && {
+        recordedAt
+      })
+    };
     return params.decorateReading ? params.decorateReading(decorated, frame, recordOffset) : decorated;
   }
 });

package/lib/module/modules/bt-management/services/devices/standard-gatt/standard-gatt.glucose.js.map

@@ -1 +1 @@
-{"version":3,"names":["MeasurementTypeKey","byteToHex","sigUuid","defineCustomDevice","littleEndian","MG_PER_DL_PER_KG_PER_L","MG_PER_DL_PER_MOL_PER_L","FLAG_TIME_OFFSET","FLAG_CONCENTRATION","FLAG_MOL_PER_L","BASE_TIME_INDEX","TIME_OFFSET_INDEX","CONTROL_SOLUTION_TYPE","CONTROL_SOLUTION_LOCATION","REPORT_ALL_STORED_RECORDS","concentrationIndex","flags","ALL_FLAGS","Array","from","length","_","glucoseField","index","scale","decimals","byte","frame","value","Number","parseInt","isInteger","undefined","recordedAtFromGlucoseFrame","parts","i","some","part","yearLow","yearHigh","month","day","hour","minute","second","year","recordedAt","Date","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","low","high","offsetMinutes","setMinutes","isControlSolution","typeAndLocation","standardGlucoseDevice","params","id","bloodGlucose","nameMatch","matchByService","oneReadingPerConnection","stuckDataTimeoutMs","services","uuid","monitor","minLengthBytes","caseSelectorBytes","cases","map","selector","kind","measurementTypeKey","fields","description","write","commandHex","when","decorateReading","reading","recordOffset","decorated"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/standard-gatt/standard-gatt.glucose.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["MeasurementTypeKey","byteToHex","defineCustomDevice","glucoseRecordDetails","hasUnusableSensorStatus","BASE_TIME_INDEX","byte","concentrationIndex","FLAG_CONCENTRATION","FLAG_MOL_PER_L","FLAG_TIME_OFFSET","TIME_OFFSET_INDEX","typeAndLocationFromGlucoseFrame","createGlucoseSequencer","GLUCOSE_MEASUREMENT_UUID","GLUCOSE_SERVICE_UUID","RECORD_ACCESS_CONTROL_POINT_UUID","littleEndian","MG_PER_DL_PER_KG_PER_L","MG_PER_DL_PER_MOL_PER_L","MG_PER_DL_DECIMALS","CONTROL_SOLUTION_TYPE","CONTROL_SOLUTION_LOCATION","ALL_FLAGS","Array","from","length","_","flags","glucoseField","index","scale","decimals","recordedAtFromGlucoseFrame","frame","parts","i","undefined","some","part","yearLow","yearHigh","month","day","hour","minute","second","year","recordedAt","Date","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","low","high","offsetMinutes","setMinutes","isControlSolution","typeAndLocation","standardGlucoseDevice","params","id","bloodGlucose","nameMatch","matchByService","oneReadingPerConnection","stuckDataTimeoutMs","services","uuid","monitor","minLengthBytes","caseSelectorBytes","cases","map","selector","kind","measurementTypeKey","fields","description","createCommandSequencer","decorateReading","reading","recordOffset","decorated"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/standard-gatt/standard-gatt.glucose.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/standard-gatt/standard-gatt.profile.js

@@ -1,12 +1,25 @@
 "use strict";
 
 import { BloodPressureStates } from "../../../types/blood-pressure-states.js";
+import { memorySlotForDeviceUser } from "../../../utils/device-user.js";
 import { sigUuid } from "../../../utils/sig-uuid.js";
 import { defineCustomDevice } from "../../custom/define-custom-device.js";
 import { bloodPressureStatusFromFrame } from "./standard-gatt.blood-pressure-status.js";
+import { byteAt, dateTimeAt } from "./standard-gatt.frame.js";
 
 /** Milliseconds a spot-check device may take to produce its reading. */
 const SPOT_CHECK_TIMEOUT_MS = 60_000;
+/** Runs `first`, then `second` on what it returns; either may withhold the reading. */
+const chainDecorators = (first, second) => {
+  if (!first || !second) {
+    return first ?? second;
+  }
+  return (reading, frame, recordOffset) => {
+    const decorated = first(reading, frame, recordOffset);
+    return decorated && second(decorated, frame, recordOffset);
+  };
+};
+
 /**
  * The flags byte selects the case, because it decides which optional fields are present and
  * therefore where the later ones sit. Fields common to every shape are declared once; a
@@ -43,7 +56,7 @@ const declareProfile = (params, profile) => defineCustomDevice({
     }]
   }]
 }, {
-  decorateReading: params.decorateReading
+  decorateReading: chainDecorators(profile.decorateReading, params.decorateReading)
 });
 const littleEndian = (name, byteIndexes, unit, encoding) => ({
   name,
@@ -52,27 +65,11 @@ const littleEndian = (name, byteIndexes, unit, encoding) => ({
   encoding,
   unit
 });
-const byteAt = (frame, index, offset) => {
-  const value = Number.parseInt(frame[index + offset] ?? "", 16);
-  return Number.isInteger(value) && value >= 0 && value <= 0xff ? value : undefined;
-};
 
 /** Reads the SIG blood-pressure timestamp as a phone-local date. */
 const recordedAtFromBloodPressureFrame = (frame, offset = 0) => {
   const flags = byteAt(frame, 0, offset);
-  const yearLow = byteAt(frame, 7, offset);
-  const yearHigh = byteAt(frame, 8, offset);
-  const month = byteAt(frame, 9, offset);
-  const day = byteAt(frame, 10, offset);
-  const hour = byteAt(frame, 11, offset);
-  const minute = byteAt(frame, 12, offset);
-  const second = byteAt(frame, 13, offset);
-  if (flags === undefined || (flags & 0x02) === 0 || yearLow === undefined || yearHigh === undefined || month === undefined || day === undefined || hour === undefined || minute === undefined || second === undefined) {
-    return undefined;
-  }
-  const year = yearLow | yearHigh << 8;
-  const recordedAt = new Date(year, month - 1, day, hour, minute, second);
-  return recordedAt.getFullYear() === year && recordedAt.getMonth() === month - 1 && recordedAt.getDate() === day && recordedAt.getHours() === hour && recordedAt.getMinutes() === minute && recordedAt.getSeconds() === second ? recordedAt : undefined;
+  return flags !== undefined && (flags & 0x02) !== 0 ? dateTimeAt(frame, 7, offset) : undefined;
 };
 const decorateBloodPressureReading = (reading, frame, recordOffset) => {
   if (!frame) {
@@ -99,8 +96,9 @@ const decorateBloodPressureReading = (reading, frame, recordOffset) => {
   } : {};
   if ((flags & 0x08) !== 0) {
     const userId = byteAt(frame, cursor, offset);
-    if (userId === 0 || userId === 1) {
-      metadata.memorySlot = userId + 1;
+    const memorySlot = userId === undefined ? undefined : memorySlotForDeviceUser(userId);
+    if (memorySlot !== undefined) {
+      metadata.memorySlot = memorySlot;
     }
     cursor += 1;
   }

package/lib/module/modules/bt-management/services/devices/standard-gatt/standard-gatt.profile.js.map

@@ -1 +1 @@
-{"version":3,"names":["BloodPressureStates","sigUuid","defineCustomDevice","bloodPressureStatusFromFrame","SPOT_CHECK_TIMEOUT_MS","declareProfile","params","profile","id","measurementTypeKey","nameMatch","matchByService","undefined","oneReadingPerConnection","stuckDataTimeoutMs","services","uuid","service","monitor","characteristic","frame","minLengthBytes","caseSelectorBytes","cases","selectors","map","selector","optional","optionalFields","fields","fieldsBySelector","kind","decorateReading","littleEndian","name","byteIndexes","unit","encoding","byteOrder","byteAt","index","offset","value","Number","parseInt","isInteger","recordedAtFromBloodPressureFrame","flags","yearLow","yearHigh","month","day","hour","minute","second","year","recordedAt","Date","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","decorateBloodPressureReading","reading","recordOffset","cursor","metadata","userId","memorySlot","status","DISTURB_DETECTED","LOOSE_SLEEVE","REGULAR","irregularHeartbeat","Object","keys","length"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/standard-gatt/standard-gatt.profile.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["BloodPressureStates","memorySlotForDeviceUser","sigUuid","defineCustomDevice","bloodPressureStatusFromFrame","byteAt","dateTimeAt","SPOT_CHECK_TIMEOUT_MS","chainDecorators","first","second","reading","frame","recordOffset","decorated","declareProfile","params","profile","id","measurementTypeKey","nameMatch","matchByService","undefined","oneReadingPerConnection","stuckDataTimeoutMs","services","uuid","service","monitor","characteristic","minLengthBytes","caseSelectorBytes","cases","selectors","map","selector","optional","optionalFields","fields","fieldsBySelector","kind","decorateReading","littleEndian","name","byteIndexes","unit","encoding","byteOrder","recordedAtFromBloodPressureFrame","offset","flags","decorateBloodPressureReading","recordedAt","cursor","metadata","userId","memorySlot","status","DISTURB_DETECTED","LOOSE_SLEEVE","REGULAR","irregularHeartbeat","Object","keys","length"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/standard-gatt/standard-gatt.profile.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/bt-management/services/record-cursor.js

@@ -0,0 +1,66 @@
+"use strict";
+
+import { sentryLogger } from "../../helpers/utils/sentry-logger.js";
+import { toBluetoothError } from "../types/bluetooth-error.js";
+const parseCursor = stored => {
+  const parsed = Number.parseInt(stored ?? "", 10);
+  return Number.isSafeInteger(parsed) && parsed >= 0 ? parsed : undefined;
+};
+
+/**
+ * The number of the newest stored record read from one device, kept in `storage` so the next
+ * connection asks the device for newer records only. Without storage it forgets on disconnect.
+ */
+class RecordCursor {
+  writing = false;
+  changedWhileWriting = false;
+  constructor(storage, key) {
+    this.storage = storage;
+    this.key = key;
+  }
+
+  /** What an earlier connection stored; nothing, an unreadable value or a failing store gives `undefined`. */
+  load = async () => {
+    try {
+      this.newest = parseCursor(await this.storage?.getItem(this.key));
+    } catch (error) {
+      sentryLogger("error", "RECORD_CURSOR: Could not read the stored cursor", {
+        errorCode: toBluetoothError(error).code
+      });
+      this.newest = undefined;
+    }
+    return this.newest;
+  };
+
+  /** Remembers a record number that is newer than any seen; writes to the store are coalesced. */
+  advance = recordNumber => {
+    if (this.newest !== undefined && recordNumber <= this.newest) {
+      return;
+    }
+    this.newest = recordNumber;
+    void this.persist();
+  };
+  persist = async () => {
+    if (this.writing) {
+      this.changedWhileWriting = true;
+      return;
+    }
+    this.writing = true;
+    do {
+      this.changedWhileWriting = false;
+      await this.store();
+    } while (this.changedWhileWriting);
+    this.writing = false;
+  };
+  store = async () => {
+    try {
+      await this.storage?.setItem(this.key, String(this.newest));
+    } catch (error) {
+      sentryLogger("error", "RECORD_CURSOR: Could not store the cursor", {
+        errorCode: toBluetoothError(error).code
+      });
+    }
+  };
+}
+export { RecordCursor };
+//# sourceMappingURL=record-cursor.js.map

package/lib/module/modules/bt-management/services/record-cursor.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["sentryLogger","toBluetoothError","parseCursor","stored","parsed","Number","parseInt","isSafeInteger","undefined","RecordCursor","writing","changedWhileWriting","constructor","storage","key","load","newest","getItem","error","errorCode","code","advance","recordNumber","persist","store","setItem","String"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/services/record-cursor.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,sCAAmC;AAEhE,SAASC,gBAAgB,QAAQ,6BAA0B;AAE3D,MAAMC,WAAW,GAAIC,MAAiC,IAAyB;EAC7E,MAAMC,MAAM,GAAGC,MAAM,CAACC,QAAQ,CAACH,MAAM,IAAI,EAAE,EAAE,EAAE,CAAC;EAEhD,OAAOE,MAAM,CAACE,aAAa,CAACH,MAAM,CAAC,IAAIA,MAAM,IAAI,CAAC,GAAGA,MAAM,GAAGI,SAAS;AACzE,CAAC;;AAED;AACA;AACA;AACA;AACA,MAAMC,YAAY,CAAC;EAETC,OAAO,GAAG,KAAK;EACfC,mBAAmB,GAAG,KAAK;EAE5BC,WAAWA,CACCC,OAA0C,EAC1CC,GAAW,EAC5B;IAAA,KAFiBD,OAA0C,GAA1CA,OAA0C;IAAA,KAC1CC,GAAW,GAAXA,GAAW;EAC3B;;EAEH;EACOC,IAAI,GAAG,MAAAA,CAAA,KAAyC;IACrD,IAAI;MACF,IAAI,CAACC,MAAM,GAAGd,WAAW,CAAC,MAAM,IAAI,CAACW,OAAO,EAAEI,OAAO,CAAC,IAAI,CAACH,GAAG,CAAC,CAAC;IAClE,CAAC,CAAC,OAAOI,KAAK,EAAE;MACdlB,YAAY,CAAC,OAAO,EAAE,iDAAiD,EAAE;QACvEmB,SAAS,EAAElB,gBAAgB,CAACiB,KAAK,CAAC,CAACE;MACrC,CAAC,CAAC;MACF,IAAI,CAACJ,MAAM,GAAGR,SAAS;IACzB;IAEA,OAAO,IAAI,CAACQ,MAAM;EACpB,CAAC;;EAED;EACOK,OAAO,GAAIC,YAAoB,IAAW;IAC/C,IAAI,IAAI,CAACN,MAAM,KAAKR,SAAS,IAAIc,YAAY,IAAI,IAAI,CAACN,MAAM,EAAE;MAC5D;IACF;IAEA,IAAI,CAACA,MAAM,GAAGM,YAAY;IAC1B,KAAK,IAAI,CAACC,OAAO,CAAC,CAAC;EACrB,CAAC;EAEOA,OAAO,GAAG,MAAAA,CAAA,KAA2B;IAC3C,IAAI,IAAI,CAACb,OAAO,EAAE;MAChB,IAAI,CAACC,mBAAmB,GAAG,IAAI;MAE/B;IACF;IAEA,IAAI,CAACD,OAAO,GAAG,IAAI;IAEnB,GAAG;MACD,IAAI,CAACC,mBAAmB,GAAG,KAAK;MAChC,MAAM,IAAI,CAACa,KAAK,CAAC,CAAC;IACpB,CAAC,QAAQ,IAAI,CAACb,mBAAmB;IAEjC,IAAI,CAACD,OAAO,GAAG,KAAK;EACtB,CAAC;EAEOc,KAAK,GAAG,MAAAA,CAAA,KAA2B;IACzC,IAAI;MACF,MAAM,IAAI,CAACX,OAAO,EAAEY,OAAO,CAAC,IAAI,CAACX,GAAG,EAAEY,MAAM,CAAC,IAAI,CAACV,MAAM,CAAC,CAAC;IAC5D,CAAC,CAAC,OAAOE,KAAK,EAAE;MACdlB,YAAY,CAAC,OAAO,EAAE,2CAA2C,EAAE;QACjEmB,SAAS,EAAElB,gBAAgB,CAACiB,KAAK,CAAC,CAACE;MACrC,CAAC,CAAC;IACJ;EACF,CAAC;AACH;AAEA,SAASX,YAAY","ignoreList":[]}

package/lib/module/modules/bt-management/testing/fake-ble-manager.js

@@ -2,6 +2,7 @@
 
 /* eslint-disable import/group-exports */
 
+import { Buffer } from "buffer";
 import { State } from "react-native-ble-plx";
 
 /** Options for `createFakeBleDevice`. */
@@ -13,6 +14,8 @@ import { State } from "react-native-ble-plx";
 /** A deterministic BLE manager for hook and scan integration tests. No hardware is used. */
 
 const characteristicKey = (serviceUuid, characteristicUuid) => `${serviceUuid}/${characteristicUuid}`;
+const NOTIFICATIONS_ENABLED = Buffer.from([0x01, 0x00]).toString("base64");
+const NOTIFICATIONS_DISABLED = Buffer.from([0x00, 0x00]).toString("base64");
 
 /** Creates a GATT-capable fake device for connection and notification tests. */
 export const createFakeBleDevice = ({
@@ -27,6 +30,7 @@ export const createFakeBleDevice = ({
   let connected = false;
   let currentMtu = mtu;
   const values = new Map(Object.entries(characteristics));
+  const monitoredKeys = new Set();
   const disconnectedCallbacks = new Set();
   const notificationCallbacks = new Map();
   const fake = {
@@ -62,8 +66,12 @@ export const createFakeBleDevice = ({
     readCharacteristicForService: async (serviceUuid, characteristicUuid) => ({
       value: values.get(characteristicKey(serviceUuid, characteristicUuid)) ?? null
     }),
+    readDescriptorForService: async (serviceUuid, characteristicUuid) => ({
+      value: monitoredKeys.has(characteristicKey(serviceUuid, characteristicUuid)) ? NOTIFICATIONS_ENABLED : NOTIFICATIONS_DISABLED
+    }),
     monitorCharacteristicForService: (serviceUuid, characteristicUuid, callback) => {
       const key = characteristicKey(serviceUuid, characteristicUuid);
+      monitoredKeys.add(key);
       const callbacks = notificationCallbacks.get(key) ?? new Set();
       callbacks.add(callback);
       notificationCallbacks.set(key, callbacks);

package/lib/module/modules/bt-management/testing/fake-ble-manager.js.map

@@ -1 +1 @@
-{"version":3,"names":["State","characteristicKey","serviceUuid","characteristicUuid","createFakeBleDevice","id","name","localName","manufacturerData","serviceUUIDs","mtu","characteristics","connected","currentMtu","values","Map","Object","entries","disconnectedCallbacks","Set","notificationCallbacks","fake","isConnected","connect","cancelConnection","forEach","callback","discoverAllServicesAndCharacteristics","onDisconnected","add","remove","delete","requestMTU","requestedMtu","readCharacteristicForService","value","get","monitorCharacteristicForService","key","callbacks","set","writeCharacteristicWithResponseForService","writeCharacteristicWithoutResponseForService","device","emitCharacteristic","characteristic","uuid","disconnect","createFakeBleManager","state","PoweredOn","devices","currentState","scanCallback","stateCallbacks","scannedServiceUUIDs","manager","onStateChange","emitCurrentState","startDeviceScan","_options","stopDeviceScan","undefined","createDevice","emitDevice","emitError","error","setState","nextState","getScannedServiceUUIDs"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/testing/fake-ble-manager.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Buffer","State","characteristicKey","serviceUuid","characteristicUuid","NOTIFICATIONS_ENABLED","from","toString","NOTIFICATIONS_DISABLED","createFakeBleDevice","id","name","localName","manufacturerData","serviceUUIDs","mtu","characteristics","connected","currentMtu","values","Map","Object","entries","monitoredKeys","Set","disconnectedCallbacks","notificationCallbacks","fake","isConnected","connect","cancelConnection","forEach","callback","discoverAllServicesAndCharacteristics","onDisconnected","add","remove","delete","requestMTU","requestedMtu","readCharacteristicForService","value","get","readDescriptorForService","has","monitorCharacteristicForService","key","callbacks","set","writeCharacteristicWithResponseForService","writeCharacteristicWithoutResponseForService","device","emitCharacteristic","characteristic","uuid","disconnect","createFakeBleManager","state","PoweredOn","devices","currentState","scanCallback","stateCallbacks","scannedServiceUUIDs","manager","onStateChange","emitCurrentState","startDeviceScan","_options","stopDeviceScan","undefined","createDevice","emitDevice","emitError","error","setState","nextState","getScannedServiceUUIDs"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/testing/fake-ble-manager.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/bt-management/types/custom-device-definition.js

@@ -8,6 +8,10 @@ import { CUSTOM_DEVICE_BRAND } from "../constants/custom-device-brand.js";
 
 /** Creates the per-device `CustomFrameHandler`. */
 
+/** What a declaration's command sequencer is told about the device it is about to drive. */
+
+/** Creates the command sequencer of one connection, for a declaration whose commands depend on the device or on stored state. */
+
 /**
  * A validated, ready-to-run custom device. Only defineCustomDevice produces one.
  */

package/lib/module/modules/bt-management/types/custom-device-definition.js.map

@@ -1 +1 @@
-{"version":3,"names":["CUSTOM_DEVICE_BRAND"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/types/custom-device-definition.ts"],"mappings":";;AAEA,SAASA,mBAAmB,QAAQ,qCAAkC;;AAetE;;AAeA;;AAGA;;AAGA;AACA;AACA","ignoreList":[]}
+{"version":3,"names":["CUSTOM_DEVICE_BRAND"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/types/custom-device-definition.ts"],"mappings":";;AAEA,SAASA,mBAAmB,QAAQ,qCAAkC;;AAiBtE;;AAeA;;AAGA;;AAGA;;AAUA;;AAGA;AACA;AACA","ignoreList":[]}

package/lib/module/modules/bt-management/types/glucose-record-details.js

@@ -0,0 +1,2 @@
+"use strict";
+//# sourceMappingURL=glucose-record-details.js.map

package/lib/module/modules/bt-management/types/glucose-record-details.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sourceRoot":"../../../../../src","sources":["modules/bt-management/types/glucose-record-details.ts"],"mappings":"","ignoreList":[]}

package/lib/module/modules/bt-management/utils/bluetooth-permission-list.js

@@ -0,0 +1,14 @@
+"use strict";
+
+import { Platform } from "react-native";
+import { PERMISSIONS } from "react-native-permissions";
+const ANDROID_12_API_LEVEL = 31;
+
+/** The OS permissions Bluetooth scanning and connecting need on this platform. */
+export const bluetoothPermissionList = () => {
+  if (Platform.OS === "android") {
+    return Number(Platform.Version) >= ANDROID_12_API_LEVEL ? [PERMISSIONS.ANDROID.BLUETOOTH_CONNECT, PERMISSIONS.ANDROID.BLUETOOTH_SCAN] : [PERMISSIONS.ANDROID.ACCESS_FINE_LOCATION];
+  }
+  return Platform.OS === "ios" ? [PERMISSIONS.IOS.BLUETOOTH] : [];
+};
+//# sourceMappingURL=bluetooth-permission-list.js.map

package/lib/module/modules/bt-management/utils/bluetooth-permission-list.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["Platform","PERMISSIONS","ANDROID_12_API_LEVEL","bluetoothPermissionList","OS","Number","Version","ANDROID","BLUETOOTH_CONNECT","BLUETOOTH_SCAN","ACCESS_FINE_LOCATION","IOS","BLUETOOTH"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/utils/bluetooth-permission-list.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,cAAc;AACvC,SAAqBC,WAAW,QAAQ,0BAA0B;AAElE,MAAMC,oBAAoB,GAAG,EAAE;;AAE/B;AACA,OAAO,MAAMC,uBAAuB,GAAGA,CAAA,KAAoB;EACzD,IAAIH,QAAQ,CAACI,EAAE,KAAK,SAAS,EAAE;IAC7B,OAAOC,MAAM,CAACL,QAAQ,CAACM,OAAO,CAAC,IAAIJ,oBAAoB,GACnD,CAACD,WAAW,CAACM,OAAO,CAACC,iBAAiB,EAAEP,WAAW,CAACM,OAAO,CAACE,cAAc,CAAC,GAC3E,CAACR,WAAW,CAACM,OAAO,CAACG,oBAAoB,CAAC;EAChD;EAEA,OAAOV,QAAQ,CAACI,EAAE,KAAK,KAAK,GAAG,CAACH,WAAW,CAACU,GAAG,CAACC,SAAS,CAAC,GAAG,EAAE;AACjE,CAAC","ignoreList":[]}

package/lib/module/modules/bt-management/utils/device-user.js

@@ -0,0 +1,17 @@
+"use strict";
+
+/** The Bluetooth SIG User Index that means the device does not know whose reading it is. */
+const UNKNOWN_DEVICE_USER = 0xff;
+
+/** The memory slot of a SIG device user: users count from 0, slots from 1; the unknown user has none. */
+const memorySlotForDeviceUser = userId => userId === UNKNOWN_DEVICE_USER ? undefined : userId + 1;
+
+/** Whether a reading is from one of the device users `slots`; a reading that names no device user is kept. */
+const isFromAcceptedMemorySlot = (reading, slots) => {
+  const {
+    memorySlot
+  } = reading;
+  return typeof memorySlot !== "number" || slots.includes(memorySlot);
+};
+export { isFromAcceptedMemorySlot, memorySlotForDeviceUser };
+//# sourceMappingURL=device-user.js.map

package/lib/module/modules/bt-management/utils/device-user.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["UNKNOWN_DEVICE_USER","memorySlotForDeviceUser","userId","undefined","isFromAcceptedMemorySlot","reading","slots","memorySlot","includes"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/utils/device-user.ts"],"mappings":";;AAAA;AACA,MAAMA,mBAAmB,GAAG,IAAI;;AAEhC;AACA,MAAMC,uBAAuB,GAAIC,MAAc,IAC7CA,MAAM,KAAKF,mBAAmB,GAAGG,SAAS,GAAGD,MAAM,GAAG,CAAC;;AAEzD;AACA,MAAME,wBAAwB,GAAGA,CAC/BC,OAAe,EACfC,KAAwB,KACZ;EACZ,MAAM;IAAEC;EAAW,CAAC,GAAGF,OAAmC;EAE1D,OAAO,OAAOE,UAAU,KAAK,QAAQ,IAAID,KAAK,CAACE,QAAQ,CAACD,UAAU,CAAC;AACrE,CAAC;AAED,SAASH,wBAAwB,EAAEH,uBAAuB","ignoreList":[]}

package/lib/module/modules/bt-management/utils/kpa-to-mmhg.js

@@ -0,0 +1,6 @@
+"use strict";
+
+/** Millimetres of mercury in one kilopascal. */
+const KPA_TO_MMHG = 7.50062;
+export { KPA_TO_MMHG };
+//# sourceMappingURL=kpa-to-mmhg.js.map

package/lib/module/modules/bt-management/utils/kpa-to-mmhg.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["KPA_TO_MMHG"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/utils/kpa-to-mmhg.ts"],"mappings":";;AAAA;AACA,MAAMA,WAAW,GAAG,OAAO;AAE3B,SAASA,WAAW","ignoreList":[]}

package/lib/module/modules/bt-management/utils/result-identity.js

@@ -2,42 +2,32 @@
 
 /* eslint-disable import/group-exports */
 
-const canonicalize = value => {
-  if (value instanceof Date) {
-    return value.toISOString();
-  }
-  if (Array.isArray(value)) {
-    return value.map(canonicalize);
-  }
-  if (value && typeof value === "object") {
-    return Object.fromEntries(Object.entries(value).sort(([left], [right]) => left.localeCompare(right)).map(([key, nested]) => [key, canonicalize(nested)]));
-  }
-  return value;
-};
-const hash = value => {
-  let first = 0x811c9dc5;
-  let second = 0x01000193;
-  for (let index = 0; index < value.length; index += 1) {
-    const code = value.charCodeAt(index);
-    first = Math.imul(first ^ code, 0x01000193);
-    second = Math.imul(second ^ code + index, 0x811c9dc5);
-  }
-  return `${(first >>> 0).toString(16).padStart(8, "0")}${(second >>> 0).toString(16).padStart(8, "0")}`;
-};
+import { isTimestamped } from "../../next/bluetooth/driver.js";
+import { instantStableHash, stableHash } from "../../next/bluetooth/stable-hash.js";
+/** Reading properties added after result ids were first issued; leaving them out keeps every earlier id. */
+const ADDED_READING_PROPERTIES = new Set(["sequenceNumber", "specimen", "sampleLocation", "sensorStatus", "outOfRange", "meal", "reportedUnit", "temperatureType", "rrIntervals"]);
+const identifyingData = data => Object.fromEntries(Object.entries(data).filter(([key]) => !ADDED_READING_PROPERTIES.has(key)));
+const deviceIdentityOf = deviceData => deviceData.sn || deviceData.manufacturerData || deviceData.model || deviceData.name || deviceData.id;
 
 /**
- * Creates an identity that is stable when a device sends its stored history again.
- * Recording IDs, timestamps and indexes are retained in the canonical payload; transient
- * delivery metadata is deliberately not part of the key.
+ * Creates an identity that is stable when a device sends its stored history again, in any time zone. A reading
+ * without a time of its own is a new measurement each time, so it is told apart by when it arrived.
  */
-export const createStableResultId = (deviceData, data) => {
-  const deviceIdentity = deviceData.sn || deviceData.manufacturerData || deviceData.model || deviceData.name || deviceData.id;
-  return `ovok:${hash(JSON.stringify(canonicalize({
-    device: deviceIdentity,
-    name: deviceData.name,
-    data
-  })))}`;
-};
+export const createStableResultId = (deviceData, data, receivedAt = new Date()) => `ovok:${stableHash({
+  device: deviceIdentityOf(deviceData),
+  name: deviceData.name,
+  data: identifyingData(data),
+  ...(isTimestamped(data) ? {} : {
+    receivedAt: receivedAt.toISOString()
+  })
+})}`;
+
+/** The id SDKs before 1.16.1 gave the same reading, to find what they saved. */
+export const createLegacyResultId = (deviceData, data) => `ovok:${instantStableHash({
+  device: deviceIdentityOf(deviceData),
+  name: deviceData.name,
+  data: identifyingData(data)
+})}`;
 
 /** Converts the ISO date strings of `recordedAt`, `start` and `end` fields back to `Date`s, recursively. */
 export const reviveResultDates = value => {

package/lib/module/modules/bt-management/utils/result-identity.js.map

@@ -1 +1 @@
-{"version":3,"names":["canonicalize","value","Date","toISOString","Array","isArray","map","Object","fromEntries","entries","sort","left","right","localeCompare","key","nested","hash","first","second","index","length","code","charCodeAt","Math","imul","toString","padStart","createStableResultId","deviceData","data","deviceIdentity","sn","manufacturerData","model","name","id","JSON","stringify","device","reviveResultDates","revive","current","includes","date","Number","isNaN","getTime","item","childKey","childValue"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/utils/result-identity.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["isTimestamped","instantStableHash","stableHash","ADDED_READING_PROPERTIES","Set","identifyingData","data","Object","fromEntries","entries","filter","key","has","deviceIdentityOf","deviceData","sn","manufacturerData","model","name","id","createStableResultId","receivedAt","Date","device","toISOString","createLegacyResultId","reviveResultDates","value","revive","current","includes","date","Number","isNaN","getTime","Array","isArray","map","item","childKey","childValue"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/utils/result-identity.ts"],"mappings":";;AAAA;;AAIA,SAASA,aAAa,QAAQ,gCAA6B;AAC3D,SAASC,iBAAiB,EAAEC,UAAU,QAAQ,qCAAkC;AAGhF;AACA,MAAMC,wBAAwB,GAAG,IAAIC,GAAG,CAAC,CACvC,gBAAgB,EAChB,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,MAAM,EACN,cAAc,EACd,iBAAiB,EACjB,aAAa,CACd,CAAC;AAEF,MAAMC,eAAe,GAAIC,IAAiB,IACxCC,MAAM,CAACC,WAAW,CAACD,MAAM,CAACE,OAAO,CAACH,IAAI,CAAC,CAACI,MAAM,CAAC,CAAC,CAACC,GAAG,CAAC,KAAK,CAACR,wBAAwB,CAACS,GAAG,CAACD,GAAG,CAAC,CAAC,CAAC;AAEhG,MAAME,gBAAgB,GAAIC,UAAsB,IAC9CA,UAAU,CAACC,EAAE,IACbD,UAAU,CAACE,gBAAgB,IAC3BF,UAAU,CAACG,KAAK,IAChBH,UAAU,CAACI,IAAI,IACfJ,UAAU,CAACK,EAAE;;AAEf;AACA;AACA;AACA;AACA,OAAO,MAAMC,oBAAoB,GAAGA,CAClCN,UAAsB,EACtBR,IAAiB,EACjBe,UAAgB,GAAG,IAAIC,IAAI,CAAC,CAAC,KAE7B,QAAQpB,UAAU,CAAC;EACjBqB,MAAM,EAAEV,gBAAgB,CAACC,UAAU,CAAC;EACpCI,IAAI,EAAEJ,UAAU,CAACI,IAAI;EACrBZ,IAAI,EAAED,eAAe,CAACC,IAAI,CAAC;EAC3B,IAAIN,aAAa,CAACM,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG;IAAEe,UAAU,EAAEA,UAAU,CAACG,WAAW,CAAC;EAAE,CAAC;AACzE,CAAC,CAAC,EAAE;;AAEN;AACA,OAAO,MAAMC,oBAAoB,GAAGA,CAACX,UAAsB,EAAER,IAAiB,KAC5E,QAAQL,iBAAiB,CAAC;EACxBsB,MAAM,EAAEV,gBAAgB,CAACC,UAAU,CAAC;EACpCI,IAAI,EAAEJ,UAAU,CAACI,IAAI;EACrBZ,IAAI,EAAED,eAAe,CAACC,IAAI;AAC5B,CAAC,CAAC,EAAE;;AAEN;AACA,OAAO,MAAMoB,iBAAiB,GAAOC,KAAQ,IAAQ;EACnD,MAAMC,MAAM,GAAGA,CAACC,OAAgB,EAAElB,GAAY,KAAc;IAC1D,IACE,OAAOkB,OAAO,KAAK,QAAQ,IAC3B,CAAC,YAAY,EAAE,OAAO,EAAE,KAAK,CAAC,CAACC,QAAQ,CAACnB,GAAG,IAAI,EAAE,CAAC,EAClD;MACA,MAAMoB,IAAI,GAAG,IAAIT,IAAI,CAACO,OAAO,CAAC;MAE9B,OAAOG,MAAM,CAACC,KAAK,CAACF,IAAI,CAACG,OAAO,CAAC,CAAC,CAAC,GAAGL,OAAO,GAAGE,IAAI;IACtD;IAEA,IAAII,KAAK,CAACC,OAAO,CAACP,OAAO,CAAC,EAAE;MAC1B,OAAOA,OAAO,CAACQ,GAAG,CAAEC,IAAI,IAAKV,MAAM,CAACU,IAAI,CAAC,CAAC;IAC5C;IAEA,IAAIT,OAAO,IAAI,OAAOA,OAAO,KAAK,QAAQ,EAAE;MAC1C,OAAOtB,MAAM,CAACC,WAAW,CACvBD,MAAM,CAACE,OAAO,CAACoB,OAAO,CAAC,CAACQ,GAAG,CAAC,CAAC,CAACE,QAAQ,EAAEC,UAAU,CAAC,KAAK,CACtDD,QAAQ,EACRX,MAAM,CAACY,UAAU,EAAED,QAAQ,CAAC,CAC7B,CACH,CAAC;IACH;IAEA,OAAOV,OAAO;EAChB,CAAC;EAED,OAAOD,MAAM,CAACD,KAAK,CAAC;AACtB,CAAC","ignoreList":[]}

package/lib/module/modules/bt-management/utils/rr-interval.js

@@ -0,0 +1,12 @@
+"use strict";
+
+const MILLISECONDS_PER_SECOND = 1000;
+
+/** The Bluetooth SIG heart-rate RR-Interval resolution: counts of 1/1024 s. */
+const RR_COUNTS_PER_SECOND = 1024;
+const RR_DECIMALS = 2;
+
+/** An RR-Interval count from a Heart Rate Measurement, in milliseconds. */
+const rrIntervalMilliseconds = counts => Number((counts * MILLISECONDS_PER_SECOND / RR_COUNTS_PER_SECOND).toFixed(RR_DECIMALS));
+export { rrIntervalMilliseconds };
+//# sourceMappingURL=rr-interval.js.map

package/lib/module/modules/bt-management/utils/rr-interval.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["MILLISECONDS_PER_SECOND","RR_COUNTS_PER_SECOND","RR_DECIMALS","rrIntervalMilliseconds","counts","Number","toFixed"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/utils/rr-interval.ts"],"mappings":";;AAAA,MAAMA,uBAAuB,GAAG,IAAI;;AAEpC;AACA,MAAMC,oBAAoB,GAAG,IAAI;AAEjC,MAAMC,WAAW,GAAG,CAAC;;AAErB;AACA,MAAMC,sBAAsB,GAAIC,MAAc,IAC5CC,MAAM,CACJ,CAAED,MAAM,GAAGJ,uBAAuB,GAAIC,oBAAoB,EAAEK,OAAO,CACjEJ,WACF,CACF,CAAC;AAEH,SAASC,sBAAsB","ignoreList":[]}