@ovok/native 1.3.0 → 1.5.0

package/lib/commonjs/modules/bt-management/services/custom/define-custom-device.js

@@ -20,7 +20,7 @@ const MAX_MTU = 517;
 const MAX_STUCK_TIMEOUT_MS = 6_000_000;
 const HEX_BYTES = /^([0-9a-f]{2})+$/;
 const assertIdentity = spec => {
-  const id = typeof spec?.id === "string" ? spec.id.trim() : "";
+  const id = typeof spec?.id === "string" ? spec.id.trim() : "ovok-custom-device";
   if (!id) {
     throw (0, _customDeviceError.customDeviceError)(String(spec?.id), "id", "must not be empty");
   }
@@ -39,9 +39,12 @@ const compileNameMatch = (id, spec) => {
     return nameMatch;
   }
   const exact = typeof nameMatch === "string" ? nameMatch.trim() : "";
-  if (!exact) {
+  if (typeof nameMatch === "string" && !exact) {
     throw (0, _customDeviceError.customDeviceError)(id, "nameMatch", "must not be empty");
   }
+  if (!exact) {
+    return /.*/;
+  }
   return new RegExp(`^${exact.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}$`);
 };
 const assertStuckTimeout = (id, spec) => {
@@ -127,6 +130,7 @@ const defineCustomDevice = spec => {
     id: id,
     spec,
     nameMatch,
+    matchByService: spec.matchByService === true,
     mainServices,
     stuckDataTimeout,
     fields,

package/lib/commonjs/modules/bt-management/services/custom/define-custom-device.js.map

@@ -1 +1 @@
-{"version":3,"names":["_customDeviceBrand","require","_integratedDevices","_compileCustomLepu","_compileCustomMonitor","_customDeviceError","_normalizeBleUuid","MIN_STUCK_TIMEOUT_MS","MIN_MTU","MAX_MTU","MAX_STUCK_TIMEOUT_MS","HEX_BYTES","assertIdentity","spec","id","trim","customDeviceError","String","builtIn","Object","values","IntegratedDevices","find","name","toLowerCase","compileNameMatch","nameMatch","RegExp","global","sticky","exact","replace","assertStuckTimeout","timeout","stuckDataTimeoutMs","Number","isInteger","assertPreferredMtu","mtu","preferredMtu","undefined","compileWrite","path","write","commandHex","test","uuid","normalizeBleUuid","mainCommandUuid","defineCustomDevice","stuckDataTimeout","Array","isArray","services","length","fields","Map","frames","seenCharacteristics","Set","mainServices","map","service","serviceIndex","monitor","monitorUuids","monitorIndex","monitorPath","characteristic","frame","compileCustomMonitor","has","add","set","writeUuid","lepu","compileCustomLepu","CUSTOM_DEVICE_BRAND","exports"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/custom/define-custom-device.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_customDeviceBrand","require","_integratedDevices","_compileCustomLepu","_compileCustomMonitor","_customDeviceError","_normalizeBleUuid","MIN_STUCK_TIMEOUT_MS","MIN_MTU","MAX_MTU","MAX_STUCK_TIMEOUT_MS","HEX_BYTES","assertIdentity","spec","id","trim","customDeviceError","String","builtIn","Object","values","IntegratedDevices","find","name","toLowerCase","compileNameMatch","nameMatch","RegExp","global","sticky","exact","replace","assertStuckTimeout","timeout","stuckDataTimeoutMs","Number","isInteger","assertPreferredMtu","mtu","preferredMtu","undefined","compileWrite","path","write","commandHex","test","uuid","normalizeBleUuid","mainCommandUuid","defineCustomDevice","stuckDataTimeout","Array","isArray","services","length","fields","Map","frames","seenCharacteristics","Set","mainServices","map","service","serviceIndex","monitor","monitorUuids","monitorIndex","monitorPath","characteristic","frame","compileCustomMonitor","has","add","set","writeUuid","lepu","compileCustomLepu","CUSTOM_DEVICE_BRAND","matchByService","exports"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/custom/define-custom-device.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/modules/bt-management/services/device-creator.js

@@ -8,10 +8,13 @@ var _integratedDevicesMap = require("../constants/integrated-devices-map.js");
 var _integratedDevices = require("../types/integrated-devices.js");
 var _isCustomDeviceDefinition = require("../utils/is-custom-device-definition.js");
 var _bc01Device = require("./devices/bc01/bc01.device.js");
+var _bloodGlucoseDevice = require("./devices/blood-glucose/blood-glucose.device.js");
 var _bp2Device = require("./devices/bp2/bp2.device.js");
 var _customDevice = require("./devices/custom/custom.device.js");
 var _f4Device = require("./devices/f4/f4.device.js");
+var _oxyfitDevice = require("./devices/spo/oxyfit.device.js");
 var _spo2Device = require("./devices/spo/spo2.device.js");
+var _mysenseDevice = require("./devices/uebe/mysense.device.js");
 var _verovalDuoControlDevice = require("./devices/veroval/veroval.duo-control-device.js");
 var _verovalEcgDevice = require("./devices/veroval/veroval.ecg-device.js");
 /**
@@ -25,7 +28,12 @@ const DEVICE_CLASSES = {
   [_integratedDevices.IntegratedDevices.BP2]: _bp2Device.BP2Device,
   [_integratedDevices.IntegratedDevices.F4]: _f4Device.F4Device,
   [_integratedDevices.IntegratedDevices.PC60WF]: _spo2Device.SPO2Device,
+  [_integratedDevices.IntegratedDevices.SPO2]: _oxyfitDevice.OxyfitDevice,
+  [_integratedDevices.IntegratedDevices.MYSENSE]: _mysenseDevice.MySenseDevice,
   [_integratedDevices.IntegratedDevices.BC01]: _bc01Device.BC01Device,
+  [_integratedDevices.IntegratedDevices.TAIDOC_GLUCOSE]: _bloodGlucoseDevice.BloodGlucoseDevice,
+  [_integratedDevices.IntegratedDevices.GLUCOCHECK]: _bloodGlucoseDevice.BloodGlucoseDevice,
+  [_integratedDevices.IntegratedDevices.BGM]: _bloodGlucoseDevice.BloodGlucoseDevice,
   [_integratedDevices.IntegratedDevices.VEROVAL_DUO_CONTROL]: _verovalDuoControlDevice.VerovalDuoControlDevice,
   [_integratedDevices.IntegratedDevices.VEROVAL_ECG]: _verovalEcgDevice.VerovalEcgDevice
 };
@@ -42,11 +50,13 @@ const collectCustomDevices = acceptedDevices => {
     if (customDevices.has(entry.id)) {
       throw new Error(`acceptedDevices[${index}] registers the custom device "${entry.id}" twice`);
     }
-    if (matchers.has(entry.nameMatch.source)) {
+    if (!entry.matchByService && matchers.has(entry.nameMatch.source)) {
       throw new Error(`acceptedDevices[${index}] ("${entry.id}") matches the same advertised name as an earlier custom device, so one would silently shadow the other`);
     }
     customDevices.set(entry.id, entry);
-    matchers.add(entry.nameMatch.source);
+    if (!entry.matchByService) {
+      matchers.add(entry.nameMatch.source);
+    }
   });
   return customDevices;
 };
@@ -57,14 +67,18 @@ class DeviceCreator {
     this.acceptedDeviceNames = acceptedDeviceNames;
     this.customDevices = collectCustomDevices(acceptedDeviceNames);
   }
-  getDeviceName = foundName => {
-    if (!foundName) {
+  getDeviceName = (foundName, serviceUUIDs = []) => {
+    const normalizedServices = new Set(serviceUUIDs.map(uuid => uuid.toLowerCase()));
+    if (!foundName && normalizedServices.size === 0) {
       return undefined;
     }
+    if (!foundName && normalizedServices.size > 0) {
+      return this.matchDeviceName(foundName, normalizedServices);
+    }
     if (this.deviceNameCache.has(foundName)) {
       return this.deviceNameCache.get(foundName) ?? undefined;
     }
-    const matched = this.matchDeviceName(foundName);
+    const matched = this.matchDeviceName(foundName, normalizedServices);
 
     // Cache the result (store null for non-matches to avoid repeated tests)
     this.cacheDeviceName(foundName, matched ?? null);
@@ -83,7 +97,7 @@ class DeviceCreator {
      * `localName` carries the advertised name instead. Accept either so a scan-time
      * `createDevice` call for a real iOS ad is not rejected before it can connect.
      */
-    if (!params.device.name?.trim() && !params.device.localName?.trim()) {
+    if (!params.device.name?.trim() && !params.device.localName?.trim() && !this.customDevices.get(params.deviceName)?.matchByService) {
       throw new Error("Device name is required");
     }
     if (!params.device.id) {
@@ -110,14 +124,15 @@ class DeviceCreator {
    * A built-in device always wins over a declaration: its decoder is compiled and tested,
    * and a declaration that happens to match the same advertised name must not displace it.
    */
-  matchDeviceName = deviceName => {
+  matchDeviceName = (deviceName, serviceUUIDs) => {
     for (const [regex, deviceType] of _integratedDevicesMap.integratedDevicesMap) {
       if (regex.test(deviceName) && this.acceptedDeviceNames.some(name => name === deviceType)) {
         return deviceType;
       }
     }
     for (const custom of this.customDevices.values()) {
-      if (custom.nameMatch.test(deviceName)) {
+      const serviceMatch = custom.matchByService && custom.mainServices.some(service => serviceUUIDs.has(service.uuid.toLowerCase()));
+      if (serviceMatch || deviceName && custom.nameMatch.test(deviceName)) {
         return custom.id;
       }
     }

package/lib/commonjs/modules/bt-management/services/device-creator.js.map

@@ -1 +1 @@
-{"version":3,"names":["_integratedDevicesMap","require","_integratedDevices","_isCustomDeviceDefinition","_bc01Device","_bp2Device","_customDevice","_f4Device","_spo2Device","_verovalDuoControlDevice","_verovalEcgDevice","DEVICE_CLASSES","IntegratedDevices","BP2","BP2Device","F4","F4Device","PC60WF","SPO2Device","BC01","BC01Device","VEROVAL_DUO_CONTROL","VerovalDuoControlDevice","VEROVAL_ECG","VerovalEcgDevice","collectCustomDevices","acceptedDevices","customDevices","Map","matchers","Set","forEach","entry","index","isCustomDeviceDefinition","Error","has","id","nameMatch","source","set","add","DeviceCreator","deviceNameCache","CACHE_MAX_SIZE","constructor","acceptedDeviceNames","getDeviceName","foundName","undefined","get","matched","matchDeviceName","cacheDeviceName","createDevice","params","String","deviceName","trim","device","name","localName","custom","CustomDevice","deviceClass","Object","keys","join","destroy","clear","regex","deviceType","integratedDevicesMap","test","some","values","size","firstKey","next","value","delete","exports"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/services/device-creator.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_integratedDevicesMap","require","_integratedDevices","_isCustomDeviceDefinition","_bc01Device","_bloodGlucoseDevice","_bp2Device","_customDevice","_f4Device","_oxyfitDevice","_spo2Device","_mysenseDevice","_verovalDuoControlDevice","_verovalEcgDevice","DEVICE_CLASSES","IntegratedDevices","BP2","BP2Device","F4","F4Device","PC60WF","SPO2Device","SPO2","OxyfitDevice","MYSENSE","MySenseDevice","BC01","BC01Device","TAIDOC_GLUCOSE","BloodGlucoseDevice","GLUCOCHECK","BGM","VEROVAL_DUO_CONTROL","VerovalDuoControlDevice","VEROVAL_ECG","VerovalEcgDevice","collectCustomDevices","acceptedDevices","customDevices","Map","matchers","Set","forEach","entry","index","isCustomDeviceDefinition","Error","has","id","matchByService","nameMatch","source","set","add","DeviceCreator","deviceNameCache","CACHE_MAX_SIZE","constructor","acceptedDeviceNames","getDeviceName","foundName","serviceUUIDs","normalizedServices","map","uuid","toLowerCase","size","undefined","matchDeviceName","get","matched","cacheDeviceName","createDevice","params","String","deviceName","trim","device","name","localName","custom","CustomDevice","deviceClass","Object","keys","join","destroy","clear","regex","deviceType","integratedDevicesMap","test","some","values","serviceMatch","mainServices","service","firstKey","next","value","delete","exports"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/services/device-creator.ts"],"mappings":";;;;;;AAAA,IAAAA,qBAAA,GAAAC,OAAA;AAMA,IAAAC,kBAAA,GAAAD,OAAA;AACA,IAAAE,yBAAA,GAAAF,OAAA;AAEA,IAAAG,WAAA,GAAAH,OAAA;AACA,IAAAI,mBAAA,GAAAJ,OAAA;AACA,IAAAK,UAAA,GAAAL,OAAA;AAEA,IAAAM,aAAA,GAAAN,OAAA;AACA,IAAAO,SAAA,GAAAP,OAAA;AACA,IAAAQ,aAAA,GAAAR,OAAA;AACA,IAAAS,WAAA,GAAAT,OAAA;AACA,IAAAU,cAAA,GAAAV,OAAA;AACA,IAAAW,wBAAA,GAAAX,OAAA;AACA,IAAAY,iBAAA,GAAAZ,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMa,cAAc,GAAG;EACrB,CAACC,oCAAiB,CAACC,GAAG,GAAGC,oBAAS;EAClC,CAACF,oCAAiB,CAACG,EAAE,GAAGC,kBAAQ;EAChC,CAACJ,oCAAiB,CAACK,MAAM,GAAGC,sBAAU;EACtC,CAACN,oCAAiB,CAACO,IAAI,GAAGC,0BAAY;EACtC,CAACR,oCAAiB,CAACS,OAAO,GAAGC,4BAAa;EAC1C,CAACV,oCAAiB,CAACW,IAAI,GAAGC,sBAAU;EACpC,CAACZ,oCAAiB,CAACa,cAAc,GAAGC,sCAAkB;EACtD,CAACd,oCAAiB,CAACe,UAAU,GAAGD,sCAAkB;EAClD,CAACd,oCAAiB,CAACgB,GAAG,GAAGF,sCAAkB;EAC3C,CAACd,oCAAiB,CAACiB,mBAAmB,GAAGC,gDAAuB;EAChE,CAAClB,oCAAiB,CAACmB,WAAW,GAAGC;AACnC,CAAC;AAID,MAAMC,oBAAoB,GACxBC,eAA0C,IACF;EACxC,MAAMC,aAAa,GAAG,IAAIC,GAAG,CAAiC,CAAC;EAC/D,MAAMC,QAAQ,GAAG,IAAIC,GAAG,CAAS,CAAC;EAElCJ,eAAe,CAACK,OAAO,CAAC,CAACC,KAAK,EAAEC,KAAK,KAAK;IACxC,IAAI,OAAOD,KAAK,KAAK,QAAQ,EAAE;MAC7B;IACF;IAEA,IAAI,CAAC,IAAAE,kDAAwB,EAACF,KAAK,CAAC,EAAE;MACpC,MAAM,IAAIG,KAAK,CACb,mBAAmBF,KAAK,sDAC1B,CAAC;IACH;IAEA,IAAIN,aAAa,CAACS,GAAG,CAACJ,KAAK,CAACK,EAAE,CAAC,EAAE;MAC/B,MAAM,IAAIF,KAAK,CACb,mBAAmBF,KAAK,kCAAkCD,KAAK,CAACK,EAAE,SACpE,CAAC;IACH;IAEA,IAAI,CAACL,KAAK,CAACM,cAAc,IAAIT,QAAQ,CAACO,GAAG,CAACJ,KAAK,CAACO,SAAS,CAACC,MAAM,CAAC,EAAE;MACjE,MAAM,IAAIL,KAAK,CACb,mBAAmBF,KAAK,OAAOD,KAAK,CAACK,EAAE,yGACzC,CAAC;IACH;IAEAV,aAAa,CAACc,GAAG,CAACT,KAAK,CAACK,EAAE,EAAEL,KAAK,CAAC;IAClC,IAAI,CAACA,KAAK,CAACM,cAAc,EAAE;MACzBT,QAAQ,CAACa,GAAG,CAACV,KAAK,CAACO,SAAS,CAACC,MAAM,CAAC;IACtC;EACF,CAAC,CAAC;EAEF,OAAOb,aAAa;AACtB,CAAC;AAEM,MAAMgB,aAAa,CAAsC;EACtDC,eAAe,GAAG,IAAIhB,GAAG,CAA2B,CAAC;EAC5CiB,cAAc,GAAG,GAAG;EAGrCC,WAAWA,CAAkBC,mBAAsB,EAAE;IAAA,KAAxBA,mBAAsB,GAAtBA,mBAAsB;IACjD,IAAI,CAACpB,aAAa,GAAGF,oBAAoB,CAACsB,mBAAmB,CAAC;EAChE;EAEOC,aAAa,GAAGA,CACrBC,SAAiB,EACjBC,YAA+B,GAAG,EAAE,KACL;IAC/B,MAAMC,kBAAkB,GAAG,IAAIrB,GAAG,CAACoB,YAAY,CAACE,GAAG,CAAEC,IAAI,IAAKA,IAAI,CAACC,WAAW,CAAC,CAAC,CAAC,CAAC;IAElF,IAAI,CAACL,SAAS,IAAIE,kBAAkB,CAACI,IAAI,KAAK,CAAC,EAAE;MAC/C,OAAOC,SAAS;IAClB;IAEA,IAAI,CAACP,SAAS,IAAIE,kBAAkB,CAACI,IAAI,GAAG,CAAC,EAAE;MAC7C,OAAO,IAAI,CAACE,eAAe,CAACR,SAAS,EAAEE,kBAAkB,CAAC;IAC5D;IAEA,IAAI,IAAI,CAACP,eAAe,CAACR,GAAG,CAACa,SAAS,CAAC,EAAE;MACvC,OACG,IAAI,CAACL,eAAe,CAACc,GAAG,CAACT,SAAS,CAAC,IACpCO,SAAS;IAEb;IAEA,MAAMG,OAAO,GAAG,IAAI,CAACF,eAAe,CAACR,SAAS,EAAEE,kBAAkB,CAAC;;IAEnE;IACA,IAAI,CAACS,eAAe,CAACX,SAAS,EAAEU,OAAO,IAAI,IAAI,CAAC;IAEhD,OAAOA,OAAO;EAChB,CAAC;EAEME,YAAYA,CACjBC,MAA6B,EACT;IACpB,IAAI,CAACC,MAAM,CAACD,MAAM,CAACE,UAAU,IAAI,EAAE,CAAC,CAACC,IAAI,CAAC,CAAC,EAAE;MAC3C,MAAM,IAAI9B,KAAK,CAAC,yBAAyB,CAAC;IAC5C;IAEA,IAAI,CAAC2B,MAAM,CAACI,MAAM,EAAE;MAClB,MAAM,IAAI/B,KAAK,CAAC,oBAAoB,CAAC;IACvC;;IAEA;AACJ;AACA;AACA;AACA;IACI,IACE,CAAC2B,MAAM,CAACI,MAAM,CAACC,IAAI,EAAEF,IAAI,CAAC,CAAC,IAC3B,CAACH,MAAM,CAACI,MAAM,CAACE,SAAS,EAAEH,IAAI,CAAC,CAAC,IAChC,CAAC,IAAI,CAACtC,aAAa,CAAC+B,GAAG,CAACI,MAAM,CAACE,UAAU,CAAC,EAAE1B,cAAc,EAC1D;MACA,MAAM,IAAIH,KAAK,CAAC,yBAAyB,CAAC;IAC5C;IACA,IAAI,CAAC2B,MAAM,CAACI,MAAM,CAAC7B,EAAE,EAAE;MACrB,MAAM,IAAIF,KAAK,CAAC,uBAAuB,CAAC;IAC1C;IAEA,MAAMkC,MAAM,GAAG,IAAI,CAAC1C,aAAa,CAAC+B,GAAG,CAACI,MAAM,CAACE,UAAU,CAAC;IAExD,IAAIK,MAAM,EAAE;MACV;MACA,OAAO,IAAIC,0BAAY,CAACR,MAAM,CAACI,MAAM,EAAEJ,MAAM,EAAEO,MAAM,CAAC;IACxD;IAEA,MAAME,WAAW,GAAGpE,cAAc,CAAC2D,MAAM,CAACE,UAAU,CAAqB;IAEzE,IAAI,CAACO,WAAW,EAAE;MAChB,MAAM,IAAIpC,KAAK,CACb,IAAI2B,MAAM,CAACE,UAAU,yEAAyEF,MAAM,CAACI,MAAM,CAACC,IAAI,sDAAsDK,MAAM,CAACC,IAAI,CAACtE,cAAc,CAAC,CAACuE,IAAI,CAAC,IAAI,CAAC,uGAC9M,CAAC;IACH;;IAEA;IACA,OAAO,IAAIH,WAAW,CAACT,MAAM,CAACI,MAAM,EAAEJ,MAAM,CAAC;EAC/C;EAEOa,OAAO,GAAGA,CAAA,KAAM;IACrB,IAAI,CAAC/B,eAAe,CAACgC,KAAK,CAAC,CAAC;EAC9B,CAAC;;EAED;AACF;AACA;AACA;EACUnB,eAAe,GAAGA,CACxBO,UAAkB,EAClBd,YAAiC,KACF;IAC/B,KAAK,MAAM,CAAC2B,KAAK,EAAEC,UAAU,CAAC,IAAIC,0CAAoB,EAAE;MACtD,IACEF,KAAK,CAACG,IAAI,CAAChB,UAAU,CAAC,IACtB,IAAI,CAACjB,mBAAmB,CAACkC,IAAI,CAAEd,IAAI,IAAKA,IAAI,KAAKW,UAAU,CAAC,EAC5D;QACA,OAAOA,UAAU;MACnB;IACF;IAEA,KAAK,MAAMT,MAAM,IAAI,IAAI,CAAC1C,aAAa,CAACuD,MAAM,CAAC,CAAC,EAAE;MAChD,MAAMC,YAAY,GAChBd,MAAM,CAAC/B,cAAc,IACrB+B,MAAM,CAACe,YAAY,CAACH,IAAI,CAAEI,OAAO,IAC/BnC,YAAY,CAACd,GAAG,CAACiD,OAAO,CAAChC,IAAI,CAACC,WAAW,CAAC,CAAC,CAC7C,CAAC;MAEH,IAAI6B,YAAY,IAAKnB,UAAU,IAAIK,MAAM,CAAC9B,SAAS,CAACyC,IAAI,CAAChB,UAAU,CAAE,EAAE;QACrE,OAAOK,MAAM,CAAChC,EAAE;MAClB;IACF;IAEA,OAAOmB,SAAS;EAClB,CAAC;EAEOI,eAAeA,CACrBI,UAAkB,EAClBc,UAA4B,EACtB;IACN;IACA,IAAI,IAAI,CAAClC,eAAe,CAACW,IAAI,IAAI,IAAI,CAACV,cAAc,EAAE;MACpD,MAAMyC,QAAQ,GAAG,IAAI,CAAC1C,eAAe,CAAC6B,IAAI,CAAC,CAAC,CAACc,IAAI,CAAC,CAAC,CAACC,KAAK;MAEzD,IAAIF,QAAQ,KAAK9B,SAAS,EAAE;QAC1B,IAAI,CAACZ,eAAe,CAAC6C,MAAM,CAACH,QAAQ,CAAC;MACvC;IACF;IAEA,IAAI,CAAC1C,eAAe,CAACH,GAAG,CAACuB,UAAU,EAAEc,UAAU,CAAC;EAClD;AACF;AAACY,OAAA,CAAA/C,aAAA,GAAAA,aAAA","ignoreList":[]}

package/lib/commonjs/modules/bt-management/services/devices/aoj/aoj.thermometers.js

@@ -48,7 +48,7 @@ const SPOT_CHECK_TIMEOUT_MS = 60_000;
  * measurement would post old readings as though they had just been taken.
  */
 const aoj20aThermometer = params => (0, _defineCustomDevice.defineCustomDevice)({
-  id: params.id,
+  id: params.id ?? "aoj-20a-thermometer",
   nameMatch: params.nameMatch,
   stuckDataTimeoutMs: params.stuckDataTimeoutMs ?? SPOT_CHECK_TIMEOUT_MS,
   services: [{

package/lib/commonjs/modules/bt-management/services/devices/aoj/aoj.thermometers.js.map

@@ -1 +1 @@
-{"version":3,"names":["_core","require","_defineCustomDevice","FRAME_HEADER","COMMAND_BYTE","FRAME_BYTES","CHECKSUM_INDEX","CHECKSUM_FROM","PAYLOAD","TEMPERATURE_REPLY","TEMPERATURE_SCALE","TEMPERATURE_DECIMALS","SPOT_CHECK_TIMEOUT_MS","aoj20aThermometer","params","defineCustomDevice","id","nameMatch","stuckDataTimeoutMs","services","uuid","monitor","frame","header","minLengthBytes","checksum","algorithm","index","from","caseSelectorBytes","cases","selector","kind","measurementTypeKey","MeasurementTypeKey","temperature","fields","name","byteIndexes","byteOrder","unit","scale","decimals","exports"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj.thermometers.ts"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAGA,IAAAC,mBAAA,GAAAD,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,MAAME,YAAY,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC;AAEjC,MAAMC,YAAY,GAAG,CAAC;;AAEtB;AACA,MAAMC,WAAW,GAAG,CAAC;AACrB,MAAMC,cAAc,GAAG,CAAC;;AAExB;AACA,MAAMC,aAAa,GAAG,CAAC;AAEvB,MAAMC,OAAO,GAAG,CAAC;;AAEjB;AACA,MAAMC,iBAAiB,GAAG,IAAI;;AAE9B;AACA,MAAMC,iBAAiB,GAAG,IAAI;AAC9B,MAAMC,oBAAoB,GAAG,CAAC;AAE9B,MAAMC,qBAAqB,GAAG,MAAM;AAapC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,iBAAiB,GAC5BC,MAAuB,IAEvB,IAAAC,sCAAkB,EAAC;EACjBC,EAAE,EAAEF,MAAM,CAACE,EAAE;EACbC,SAAS,EAAEH,MAAM,CAACG,SAAS;EAC3BC,kBAAkB,EAAEJ,MAAM,CAACI,kBAAkB,IAAIN,qBAAqB;EACtEO,QAAQ,EAAE,CACR;IACEC,IAAI,EAAE,MAAM;IACZC,OAAO,EAAE,CACP;MACED,IAAI,EAAE,MAAM;MACZE,KAAK,EAAE;QACLC,MAAM,EAAEpB,YAAY;QACpBqB,cAAc,EAAEnB,WAAW;QAC3BoB,QAAQ,EAAE;UACRC,SAAS,EAAE,KAAK;UAChBC,KAAK,EAAErB,cAAc;UACrBsB,IAAI,EAAErB;QACR;MACF,CAAC;MACDsB,iBAAiB,EAAE,CAACzB,YAAY,CAAC;MACjC0B,KAAK,EAAE,CACL;QACEC,QAAQ,EAAEtB,iBAAiB;QAC3BuB,IAAI,EAAE,QAAQ;QACdC,kBAAkB,EAAEC,wBAAkB,CAACC,WAAW;QAClDC,MAAM,EAAE,CACN;UACEC,IAAI,EAAE,UAAU;UAChBC,WAAW,EAAE,CAAC9B,OAAO,EAAEA,OAAO,GAAG,CAAC,CAAC;UACnC+B,SAAS,EAAE,KAAK;UAChBC,IAAI,EAAE,KAAK;UACXC,KAAK,EAAE/B,iBAAiB;UACxBgC,QAAQ,EAAE/B;QACZ,CAAC;MAEL,CAAC;IAEL,CAAC;EAEL,CAAC;AAEL,CAAC,CAAC;AAACgC,OAAA,CAAA9B,iBAAA,GAAAA,iBAAA","ignoreList":[]}
+{"version":3,"names":["_core","require","_defineCustomDevice","FRAME_HEADER","COMMAND_BYTE","FRAME_BYTES","CHECKSUM_INDEX","CHECKSUM_FROM","PAYLOAD","TEMPERATURE_REPLY","TEMPERATURE_SCALE","TEMPERATURE_DECIMALS","SPOT_CHECK_TIMEOUT_MS","aoj20aThermometer","params","defineCustomDevice","id","nameMatch","stuckDataTimeoutMs","services","uuid","monitor","frame","header","minLengthBytes","checksum","algorithm","index","from","caseSelectorBytes","cases","selector","kind","measurementTypeKey","MeasurementTypeKey","temperature","fields","name","byteIndexes","byteOrder","unit","scale","decimals","exports"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj.thermometers.ts"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAGA,IAAAC,mBAAA,GAAAD,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,MAAME,YAAY,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC;AAEjC,MAAMC,YAAY,GAAG,CAAC;;AAEtB;AACA,MAAMC,WAAW,GAAG,CAAC;AACrB,MAAMC,cAAc,GAAG,CAAC;;AAExB;AACA,MAAMC,aAAa,GAAG,CAAC;AAEvB,MAAMC,OAAO,GAAG,CAAC;;AAEjB;AACA,MAAMC,iBAAiB,GAAG,IAAI;;AAE9B;AACA,MAAMC,iBAAiB,GAAG,IAAI;AAC9B,MAAMC,oBAAoB,GAAG,CAAC;AAE9B,MAAMC,qBAAqB,GAAG,MAAM;AAapC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,iBAAiB,GAC5BC,MAAuB,IAEvB,IAAAC,sCAAkB,EAAC;EACjBC,EAAE,EAAEF,MAAM,CAACE,EAAE,IAAI,qBAAqB;EACtCC,SAAS,EAAEH,MAAM,CAACG,SAAS;EAC3BC,kBAAkB,EAAEJ,MAAM,CAACI,kBAAkB,IAAIN,qBAAqB;EACtEO,QAAQ,EAAE,CACR;IACEC,IAAI,EAAE,MAAM;IACZC,OAAO,EAAE,CACP;MACED,IAAI,EAAE,MAAM;MACZE,KAAK,EAAE;QACLC,MAAM,EAAEpB,YAAY;QACpBqB,cAAc,EAAEnB,WAAW;QAC3BoB,QAAQ,EAAE;UACRC,SAAS,EAAE,KAAK;UAChBC,KAAK,EAAErB,cAAc;UACrBsB,IAAI,EAAErB;QACR;MACF,CAAC;MACDsB,iBAAiB,EAAE,CAACzB,YAAY,CAAC;MACjC0B,KAAK,EAAE,CACL;QACEC,QAAQ,EAAEtB,iBAAiB;QAC3BuB,IAAI,EAAE,QAAQ;QACdC,kBAAkB,EAAEC,wBAAkB,CAACC,WAAW;QAClDC,MAAM,EAAE,CACN;UACEC,IAAI,EAAE,UAAU;UAChBC,WAAW,EAAE,CAAC9B,OAAO,EAAEA,OAAO,GAAG,CAAC,CAAC;UACnC+B,SAAS,EAAE,KAAK;UAChBC,IAAI,EAAE,KAAK;UACXC,KAAK,EAAE/B,iBAAiB;UACxBgC,QAAQ,EAAE/B;QACZ,CAAC;MAEL,CAAC;IAEL,CAAC;EAEL,CAAC;AAEL,CAAC,CAAC;AAACgC,OAAA,CAAA9B,iBAAA,GAAAA,iBAAA","ignoreList":[]}

package/lib/commonjs/modules/bt-management/services/devices/bc01/bc01-command-builders.js

@@ -0,0 +1,50 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildSetTimeCommand = exports.buildResetCommand = exports.buildRequestVersionCommand = exports.buildDeleteCommand = exports.buildCommand = exports.bc401Checksum = exports.asHex = exports.RX = exports.RETRY_RECORD_GROUP = exports.RESET_DELAY_MS = exports.REQUEST_NEXT_RECORD_GROUP = exports.REQUEST_ALL = exports.RECORD_LAST_OF_SET_BIT = exports.RECORD_FLAGS_INDEX = exports.OP_REQUEST_RECORDS = exports.OP_REQUEST_QUANTITATIVE_RECORDS = exports.OP_REQUEST_COUNT = exports.FINAL_RECORD_DELAY_MS = exports.ACK_LAST_OF_SET = void 0;
+/** Wire constants and frame builders shared by the BC401 command sequencer. */
+const OP_RESET = 0x80;
+const OP_REQUEST_VERSION = 0x82;
+const OP_SET_TIME = 0x83;
+const OP_REQUEST_COUNT = exports.OP_REQUEST_COUNT = 0x90;
+const OP_REQUEST_RECORDS = exports.OP_REQUEST_RECORDS = 0x92;
+const OP_REQUEST_QUANTITATIVE_RECORDS = exports.OP_REQUEST_QUANTITATIVE_RECORDS = 0x95;
+const ACK_LAST_OF_SET = exports.ACK_LAST_OF_SET = 0x7e;
+const REQUEST_ALL = exports.REQUEST_ALL = 0x00;
+const REQUEST_NEXT_RECORD_GROUP = exports.REQUEST_NEXT_RECORD_GROUP = 0x01;
+const RETRY_RECORD_GROUP = exports.RETRY_RECORD_GROUP = 0x02;
+const FINAL_RECORD_DELAY_MS = exports.FINAL_RECORD_DELAY_MS = 200;
+const RESET_DELAY_MS = exports.RESET_DELAY_MS = 100;
+const RX = exports.RX = {
+  ACK: 0xf0,
+  VERSION_REPLY: 0xf2,
+  TIME_SYNC_ACK: 0xf3,
+  COUNT_REPLY: 0xe0,
+  STORED_RECORD_URS: 0xe1,
+  STORED_RECORD_PAGED: 0xe2,
+  FINISH: 0xe3,
+  STORED_QUANTITATIVE: 0xe4,
+  STORED_QUANTITATIVE_PAGED: 0xe5
+};
+const RECORD_FLAGS_INDEX = exports.RECORD_FLAGS_INDEX = 1;
+const RECORD_LAST_OF_SET_BIT = exports.RECORD_LAST_OF_SET_BIT = 0x40;
+const asHex = byte => (byte & 0xff).toString(16).padStart(2, "0");
+exports.asHex = asHex;
+const bc401Checksum = bytes => bytes.reduce((acc, byte) => acc + (byte & 0x7f), 0) & 0x7f;
+exports.bc401Checksum = bc401Checksum;
+const buildCommand = (opcode, arg) => [opcode, arg, bc401Checksum([opcode, arg])];
+exports.buildCommand = buildCommand;
+const buildResetCommand = () => [OP_RESET, 0x00];
+exports.buildResetCommand = buildResetCommand;
+const buildRequestVersionCommand = () => [OP_REQUEST_VERSION, bc401Checksum([OP_REQUEST_VERSION])];
+exports.buildRequestVersionCommand = buildRequestVersionCommand;
+const buildSetTimeCommand = now => {
+  const payload = [OP_SET_TIME, now.getFullYear() - 2000, now.getMonth() + 1, now.getDate(), now.getHours(), now.getMinutes(), now.getSeconds(), now.getMilliseconds() & 0xff, now.getMilliseconds() >> 8 & 0xff];
+  return [...payload, bc401Checksum(payload)];
+};
+exports.buildSetTimeCommand = buildSetTimeCommand;
+const buildDeleteCommand = () => [0x93, 0x13];
+exports.buildDeleteCommand = buildDeleteCommand;
+//# sourceMappingURL=bc01-command-builders.js.map

package/lib/commonjs/modules/bt-management/services/devices/bc01/bc01-command-builders.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["OP_RESET","OP_REQUEST_VERSION","OP_SET_TIME","OP_REQUEST_COUNT","exports","OP_REQUEST_RECORDS","OP_REQUEST_QUANTITATIVE_RECORDS","ACK_LAST_OF_SET","REQUEST_ALL","REQUEST_NEXT_RECORD_GROUP","RETRY_RECORD_GROUP","FINAL_RECORD_DELAY_MS","RESET_DELAY_MS","RX","ACK","VERSION_REPLY","TIME_SYNC_ACK","COUNT_REPLY","STORED_RECORD_URS","STORED_RECORD_PAGED","FINISH","STORED_QUANTITATIVE","STORED_QUANTITATIVE_PAGED","RECORD_FLAGS_INDEX","RECORD_LAST_OF_SET_BIT","asHex","byte","toString","padStart","bc401Checksum","bytes","reduce","acc","buildCommand","opcode","arg","buildResetCommand","buildRequestVersionCommand","buildSetTimeCommand","now","payload","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","getMilliseconds","buildDeleteCommand"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bc01/bc01-command-builders.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/modules/bt-management/services/devices/bc01/bc01-command-sequencer.js

@@ -5,102 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.bc01CommandSequencerInternals = exports.Bc01CommandSequencer = void 0;
 var _hexToByte = require("../../../utils/hex-to-byte.js");
-/**
- * The FF01/FF02 opcodes the BC401 firmware speaks, as reverse-engineered from
- * PHMS 3.0.03 (`I1/b.java` for the switch, `B3/B5.java` for the builders and
- * checksum, `L1/f.java` for the reset write).
- */
-const OP_RESET = 0x80;
-const OP_REQUEST_VERSION = 0x82;
-const OP_SET_TIME = 0x83;
-const OP_REQUEST_COUNT = 0x90;
-const OP_REQUEST_RECORDS = 0x92;
-
-/** Payload byte for `OP_REQUEST_RECORDS` that acknowledges the last record of the set. */
-const ACK_LAST_OF_SET = 0x7e;
-
-/** Payload byte for `OP_REQUEST_COUNT` and the initial `OP_REQUEST_RECORDS`. */
-const REQUEST_ALL = 0x00;
-
-/**
- * Device-to-host frame prefixes the FSM keys on. Values are decimal opcodes as
- * they appear in the decompiled Java (`switch(bArr[0])`), rendered here as
- * their real hex opcodes.
- */
-const RX = {
-  ACK: 0xf0,
-  VERSION_REPLY: 0xf2,
-  TIME_SYNC_ACK: 0xf3,
-  COUNT_REPLY: 0xe0,
-  STORED_RECORD_URS: 0xe1,
-  STORED_RECORD_PAGED: 0xe2,
-  FINISH: 0xe3
-};
-
-/** Position in a 16-byte URS record where the flags byte sits; bit 0x40 marks the last of a set. */
-const RECORD_FLAGS_INDEX = 1;
-const RECORD_LAST_OF_SET_BIT = 0x40;
-/**
- * Formats one byte as a two-digit lowercase hex string, matching the way the
- * SDK's transport already spells raw bytes.
- */
-const asHex = byte => (byte & 0xff).toString(16).padStart(2, "0");
-
-/**
- * BC401 checksum: sum of the low 7 bits of every byte, folded back into 7 bits.
- * Matches `B5.a` in the decompiled Java exactly.
- */
-const bc401Checksum = bytes => bytes.reduce((acc, byte) => acc + (byte & 0x7f), 0) & 0x7f;
-
-/**
- * Builds a "one payload byte plus checksum" command frame. This is the shape
- * of every BC401 host-to-device command that carries an argument: opcode,
- * argument, checksum-over-both.
- */
-const buildCommand = (opcode, arg) => {
-  const chk = bc401Checksum([opcode, arg]);
-  return [opcode, arg, chk];
-};
-
-/**
- * Builds the two-byte reset frame. It is the one command that does not carry
- * an argument or a checksum — PHMS writes it as `[0x80, 0x00]` verbatim
- * (`L1/f.java:694`).
- */
-const buildResetCommand = () => [OP_RESET, 0x00];
-
-/**
- * Builds the request-version reply. The Java sends it as `[0x82, 0x02]` where
- * `0x02` doubles as the checksum of `0x82` under the BC401 rule
- * (`0x82 & 0x7f = 0x02`), so the same formula that guards every other command
- * produces the right byte here.
- */
-const buildRequestVersionCommand = () => {
-  const chk = bc401Checksum([OP_REQUEST_VERSION]);
-  return [OP_REQUEST_VERSION, chk];
-};
-
-/**
- * Builds the `SET_TIME` frame for the moment the sequencer receives it. The
- * device does not run its own clock across power cycles, so timestamps on
- * stored records only make sense once the app tells it what "now" is.
- * Millisecond field is written little-endian, matching `I1/b.java`.
- */
-const buildSetTimeCommand = now => {
-  const yy = now.getFullYear() - 2000;
-  const mo = now.getMonth() + 1;
-  const dd = now.getDate();
-  const hh = now.getHours();
-  const mi = now.getMinutes();
-  const ss = now.getSeconds();
-  const ms = now.getMilliseconds();
-  const msLo = ms & 0xff;
-  const msHi = ms >> 8 & 0xff;
-  const payload = [OP_SET_TIME, yy, mo, dd, hh, mi, ss, msLo, msHi];
-  const chk = bc401Checksum(payload);
-  return [...payload, chk];
-};
-
+var _bc01CommandBuilders = require("./bc01-command-builders.js");
 /**
  * Walks the BC401 through its post-reset handshake and pulls every stored
  * record.
@@ -121,64 +26,110 @@ const buildSetTimeCommand = now => {
 class Bc01CommandSequencer {
   isDone = false;
 
+  /** Ten standard pages per request group; 10 means a new group. */
+  standardPage = 10;
+
+  /** Five quantitative pages per request group; 5 means a new group. */
+  quantitativePage = 5;
+
   /** Injectable for tests; production reads `Date.now()`. */
 
   constructor(params, clock = () => new Date()) {
     this.params = params;
     this.clock = clock;
   }
-  initialCommands = () => [this.commandFor(buildResetCommand())];
+  initialCommands = () => [this.commandFor((0, _bc01CommandBuilders.buildResetCommand)(), _bc01CommandBuilders.RESET_DELAY_MS)];
   nextCommand = frame => {
     if (this.isDone || frame.length === 0) {
       return undefined;
     }
     const opcode = (0, _hexToByte.hexToByte)(frame[0] ?? "0");
     switch (opcode) {
-      case RX.ACK:
-        return [this.commandFor(buildRequestVersionCommand())];
-      case RX.VERSION_REPLY:
-        return [this.commandFor(buildSetTimeCommand(this.clock()))];
-      case RX.TIME_SYNC_ACK:
-        return [this.commandFor(buildCommand(OP_REQUEST_COUNT, REQUEST_ALL))];
-      case RX.COUNT_REPLY:
-        return [this.commandFor(buildCommand(OP_REQUEST_RECORDS, REQUEST_ALL))];
-      case RX.STORED_RECORD_URS:
-      case RX.STORED_RECORD_PAGED:
-        return this.answerStoredRecord(frame);
-      case RX.FINISH:
+      case _bc01CommandBuilders.RX.ACK:
+        return [this.commandFor((0, _bc01CommandBuilders.buildRequestVersionCommand)())];
+      case _bc01CommandBuilders.RX.VERSION_REPLY:
+        return [this.commandFor((0, _bc01CommandBuilders.buildSetTimeCommand)(this.clock()))];
+      case _bc01CommandBuilders.RX.TIME_SYNC_ACK:
+        return [this.commandFor((0, _bc01CommandBuilders.buildCommand)(_bc01CommandBuilders.OP_REQUEST_COUNT, _bc01CommandBuilders.REQUEST_ALL))];
+      case _bc01CommandBuilders.RX.COUNT_REPLY:
+        return [this.commandFor((0, _bc01CommandBuilders.buildCommand)(_bc01CommandBuilders.OP_REQUEST_RECORDS, _bc01CommandBuilders.REQUEST_ALL))];
+      case _bc01CommandBuilders.RX.STORED_RECORD_URS:
+      case _bc01CommandBuilders.RX.STORED_RECORD_PAGED:
+        return this.answerStoredRecord(opcode, frame);
+      case _bc01CommandBuilders.RX.STORED_QUANTITATIVE:
+      case _bc01CommandBuilders.RX.STORED_QUANTITATIVE_PAGED:
+        return this.answerQuantitativeRecord(opcode, frame);
+      case _bc01CommandBuilders.RX.FINISH:
         this.isDone = true;
         return undefined;
       default:
         return undefined;
     }
   };
-
-  /**
-   * The device pages every record it holds, one 16-byte frame at a time. Only
-   * the frame whose flags byte carries `0x40` needs an acknowledgement; every
-   * other page is a status update we let ride while the transfer continues.
-   */
-  answerStoredRecord = frame => {
-    const flags = (0, _hexToByte.hexToByte)(frame[RECORD_FLAGS_INDEX] ?? "0");
-    if ((flags & RECORD_LAST_OF_SET_BIT) === 0) {
+  answerStoredRecord = (opcode, frame) => {
+    const flags = (0, _hexToByte.hexToByte)(frame[_bc01CommandBuilders.RECORD_FLAGS_INDEX] ?? "0");
+    if (opcode === _bc01CommandBuilders.RX.STORED_RECORD_URS) {
+      return this.finishStoredRecords(_bc01CommandBuilders.OP_REQUEST_RECORDS);
+    }
+    const page = flags & 0x0f;
+    if (this.standardPage === 10) {
+      this.standardPage = 0;
+    }
+    if (page !== this.standardPage) {
+      this.standardPage = 10;
+      return [this.commandFor((0, _bc01CommandBuilders.buildCommand)(_bc01CommandBuilders.OP_REQUEST_RECORDS, _bc01CommandBuilders.RETRY_RECORD_GROUP))];
+    }
+    this.standardPage += 1;
+    if (this.standardPage === 10 && (flags & _bc01CommandBuilders.RECORD_LAST_OF_SET_BIT) === 0) {
+      return [this.commandFor((0, _bc01CommandBuilders.buildCommand)(_bc01CommandBuilders.OP_REQUEST_RECORDS, _bc01CommandBuilders.REQUEST_NEXT_RECORD_GROUP))];
+    }
+    if ((flags & _bc01CommandBuilders.RECORD_LAST_OF_SET_BIT) === 0) {
       return undefined;
     }
-    return [this.commandFor(buildCommand(OP_REQUEST_RECORDS, ACK_LAST_OF_SET))];
+    this.standardPage = 10;
+    return this.finishStoredRecords(_bc01CommandBuilders.OP_REQUEST_RECORDS);
+  };
+  answerQuantitativeRecord = (opcode, frame) => {
+    const flags = (0, _hexToByte.hexToByte)(frame[_bc01CommandBuilders.RECORD_FLAGS_INDEX] ?? "0");
+    if (opcode === _bc01CommandBuilders.RX.STORED_QUANTITATIVE) {
+      return this.finishStoredRecords(_bc01CommandBuilders.OP_REQUEST_QUANTITATIVE_RECORDS);
+    }
+    const page = flags & 0x0f;
+    if (this.quantitativePage === 5) {
+      this.quantitativePage = 0;
+    }
+    if (page !== this.quantitativePage) {
+      this.quantitativePage = 5;
+      return [this.commandFor((0, _bc01CommandBuilders.buildCommand)(_bc01CommandBuilders.OP_REQUEST_QUANTITATIVE_RECORDS, _bc01CommandBuilders.RETRY_RECORD_GROUP))];
+    }
+    this.quantitativePage += 1;
+    if (this.quantitativePage === 5 && (flags & _bc01CommandBuilders.RECORD_LAST_OF_SET_BIT) === 0) {
+      return [this.commandFor((0, _bc01CommandBuilders.buildCommand)(_bc01CommandBuilders.OP_REQUEST_QUANTITATIVE_RECORDS, _bc01CommandBuilders.REQUEST_NEXT_RECORD_GROUP))];
+    }
+    if ((flags & _bc01CommandBuilders.RECORD_LAST_OF_SET_BIT) === 0) {
+      return undefined;
+    }
+    this.quantitativePage = 5;
+    return this.finishStoredRecords(_bc01CommandBuilders.OP_REQUEST_QUANTITATIVE_RECORDS);
+  };
+  finishStoredRecords = opcode => {
+    this.isDone = true;
+    return [this.commandFor((0, _bc01CommandBuilders.buildCommand)(opcode, _bc01CommandBuilders.ACK_LAST_OF_SET)), this.commandFor((0, _bc01CommandBuilders.buildDeleteCommand)(), _bc01CommandBuilders.FINAL_RECORD_DELAY_MS)];
   };
-  commandFor = bytes => ({
+  commandFor = (bytes, delayBeforeWriteMs = 0) => ({
     ...this.params.write,
-    frame: bytes.map(asHex),
-    withoutResponse: true
+    frame: bytes.map(_bc01CommandBuilders.asHex),
+    delayBeforeWriteMs
   });
 }
 
 // eslint-disable-next-line import/group-exports
 exports.Bc01CommandSequencer = Bc01CommandSequencer;
 const bc01CommandSequencerInternals = exports.bc01CommandSequencerInternals = {
-  bc401Checksum,
-  buildCommand,
-  buildResetCommand,
-  buildRequestVersionCommand,
-  buildSetTimeCommand
+  bc401Checksum: _bc01CommandBuilders.bc401Checksum,
+  buildCommand: _bc01CommandBuilders.buildCommand,
+  buildResetCommand: _bc01CommandBuilders.buildResetCommand,
+  buildRequestVersionCommand: _bc01CommandBuilders.buildRequestVersionCommand,
+  buildSetTimeCommand: _bc01CommandBuilders.buildSetTimeCommand
 };
 //# sourceMappingURL=bc01-command-sequencer.js.map

package/lib/commonjs/modules/bt-management/services/devices/bc01/bc01-command-sequencer.js.map

@@ -1 +1 @@
-{"version":3,"names":["_hexToByte","require","OP_RESET","OP_REQUEST_VERSION","OP_SET_TIME","OP_REQUEST_COUNT","OP_REQUEST_RECORDS","ACK_LAST_OF_SET","REQUEST_ALL","RX","ACK","VERSION_REPLY","TIME_SYNC_ACK","COUNT_REPLY","STORED_RECORD_URS","STORED_RECORD_PAGED","FINISH","RECORD_FLAGS_INDEX","RECORD_LAST_OF_SET_BIT","asHex","byte","toString","padStart","bc401Checksum","bytes","reduce","acc","buildCommand","opcode","arg","chk","buildResetCommand","buildRequestVersionCommand","buildSetTimeCommand","now","yy","getFullYear","mo","getMonth","dd","getDate","hh","getHours","mi","getMinutes","ss","getSeconds","ms","getMilliseconds","msLo","msHi","payload","Bc01CommandSequencer","isDone","constructor","params","clock","Date","initialCommands","commandFor","nextCommand","frame","length","undefined","hexToByte","answerStoredRecord","flags","write","map","withoutResponse","exports","bc01CommandSequencerInternals"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bc01/bc01-command-sequencer.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_hexToByte","require","_bc01CommandBuilders","Bc01CommandSequencer","isDone","standardPage","quantitativePage","constructor","params","clock","Date","initialCommands","commandFor","buildResetCommand","RESET_DELAY_MS","nextCommand","frame","length","undefined","opcode","hexToByte","RX","ACK","buildRequestVersionCommand","VERSION_REPLY","buildSetTimeCommand","TIME_SYNC_ACK","buildCommand","OP_REQUEST_COUNT","REQUEST_ALL","COUNT_REPLY","OP_REQUEST_RECORDS","STORED_RECORD_URS","STORED_RECORD_PAGED","answerStoredRecord","STORED_QUANTITATIVE","STORED_QUANTITATIVE_PAGED","answerQuantitativeRecord","FINISH","flags","RECORD_FLAGS_INDEX","finishStoredRecords","page","RETRY_RECORD_GROUP","RECORD_LAST_OF_SET_BIT","REQUEST_NEXT_RECORD_GROUP","OP_REQUEST_QUANTITATIVE_RECORDS","ACK_LAST_OF_SET","buildDeleteCommand","FINAL_RECORD_DELAY_MS","bytes","delayBeforeWriteMs","write","map","asHex","exports","bc01CommandSequencerInternals","bc401Checksum"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bc01/bc01-command-sequencer.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/modules/bt-management/services/devices/bc01/bc01.device.js

@@ -10,6 +10,7 @@ var _hexToByte = require("../../../utils/hex-to-byte.js");
 var _btManagedDevice = require("../bt-managed-device.js");
 var _bc01CommandSequencer = require("./bc01-command-sequencer.js");
 var _bc01FrameParser = require("./bc01-frame-parser.js");
+var _bc01FrameReader = require("./bc01.frame-reader.js");
 var _bc01MainServices = require("./bc01.main-services.js");
 /** Minimum bytes a complete frame carries, keyed by its opening opcode. */
 const BC01_FRAME_MIN_LENGTH = {
@@ -45,6 +46,7 @@ const BC01_FRAME_MIN_LENGTH = {
 class BC01Device extends _btManagedDevice.BTManagedDevice {
   onStreamStart = () => {};
   mainServices = _bc01MainServices.bc01MainServices;
+  frameReader = new _bc01FrameReader.Bc01FrameReader();
 
   /**
    * 90 s covers the maximum firmware-side reagent-pad settle time on a URS-7

package/lib/commonjs/modules/bt-management/services/devices/bc01/bc01.device.js.map

@@ -1 +1 @@
-{"version":3,"names":["_core","require","_caseType","_hexToByte","_btManagedDevice","_bc01CommandSequencer","_bc01FrameParser","_bc01MainServices","BC01_FRAME_MIN_LENGTH","BC01Device","BTManagedDevice","onStreamStart","mainServices","bc01MainServices","stuckDataTimeout","constructor","device","params","createCommandSequencer","Bc01CommandSequencer","write","serviceUuid","uuid","characteristicUuid","writeUuid","onRefused","reason","onError","Error","validatePackage","pkg","length","opcode","hexToByte","minLength","undefined","handleDependentResult","data","frame","reportUrsRecord","parsingCase","caseType","CaseType","OTHER","handleSuccessResult","parsed","parseBc01Record","measuredValues","BC01_ANALYTE_ORDER","reduce","acc","analyte","value","values","Object","keys","reading","RESULT","measurementTypeKey","MeasurementTypeKey","uricAcid","urineValues","recordedAt","timestamp","onResult","exports"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bc01/bc01.device.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_core","require","_caseType","_hexToByte","_btManagedDevice","_bc01CommandSequencer","_bc01FrameParser","_bc01FrameReader","_bc01MainServices","BC01_FRAME_MIN_LENGTH","BC01Device","BTManagedDevice","onStreamStart","mainServices","bc01MainServices","frameReader","Bc01FrameReader","stuckDataTimeout","constructor","device","params","createCommandSequencer","Bc01CommandSequencer","write","serviceUuid","uuid","characteristicUuid","writeUuid","onRefused","reason","onError","Error","validatePackage","pkg","length","opcode","hexToByte","minLength","undefined","handleDependentResult","data","frame","reportUrsRecord","parsingCase","caseType","CaseType","OTHER","handleSuccessResult","parsed","parseBc01Record","measuredValues","BC01_ANALYTE_ORDER","reduce","acc","analyte","value","values","Object","keys","reading","RESULT","measurementTypeKey","MeasurementTypeKey","uricAcid","urineValues","recordedAt","timestamp","onResult","exports"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bc01/bc01.device.ts"],"mappings":"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","ignoreList":[]}