@ovok/native 1.10.14 → 1.11.0

package/lib/module/modules/bt-management/services/devices/spo/pc60fw.frame-reader.js

@@ -1,7 +1,7 @@
 "use strict";
 
-import { FrameReadStatus } from "../../../types/frame-read-status.js";
 import { calculateCrc8Maxim } from "../../../utils/calculate-crc-8-maxim.js";
+import { complete, corrupt, incomplete, noFrameStart } from "../../../utils/frame-read-results.js";
 import { hexToByte } from "../../../utils/hex-to-byte.js";
 const HEADER = ["aa", "55"];
 const LENGTH_INDEX = 3;
@@ -14,45 +14,26 @@ export class Pc60FwFrameReader {
   readFrame(buffer) {
     const start = this.findHeader(buffer);
     if (start === -1) {
-      return {
-        status: FrameReadStatus.INCOMPLETE,
-        consumedBytes: Math.max(0, buffer.length - 1)
-      };
+      return noFrameStart(buffer);
     }
     if (start + HEADER_BYTES > buffer.length) {
-      return {
-        status: FrameReadStatus.INCOMPLETE,
-        consumedBytes: start
-      };
+      return incomplete(start);
     }
     const payloadLength = byteAt(buffer, start + LENGTH_INDEX);
     const frameLength = HEADER_BYTES + payloadLength;
     if (payloadLength < CHECKSUM_BYTES) {
-      return {
-        status: FrameReadStatus.CORRUPT,
-        consumedBytes: start + HEADER.length
-      };
+      return corrupt(start + HEADER.length);
     }
     if (start + frameLength > buffer.length) {
-      return {
-        status: FrameReadStatus.INCOMPLETE,
-        consumedBytes: start
-      };
+      return incomplete(start);
     }
     const frame = buffer.slice(start, start + frameLength);
     const declared = byteAt(frame, frame.length - CHECKSUM_BYTES);
     const actual = calculateCrc8Maxim(frame, frame.length - CHECKSUM_BYTES);
     if (declared !== actual) {
-      return {
-        status: FrameReadStatus.CORRUPT,
-        consumedBytes: start + HEADER.length
-      };
+      return corrupt(start + HEADER.length);
     }
-    return {
-      status: FrameReadStatus.COMPLETE,
-      consumedBytes: start + frameLength,
-      frame
-    };
+    return complete(frame, start + frameLength);
   }
   findHeader(buffer) {
     for (let index = 0; index < buffer.length - 1; index++) {

package/lib/module/modules/bt-management/services/devices/spo/pc60fw.frame-reader.js.map

@@ -1 +1 @@
-{"version":3,"names":["FrameReadStatus","calculateCrc8Maxim","hexToByte","HEADER","LENGTH_INDEX","HEADER_BYTES","CHECKSUM_BYTES","byteAt","buffer","index","Pc60FwFrameReader","readFrame","start","findHeader","status","INCOMPLETE","consumedBytes","Math","max","length","payloadLength","frameLength","CORRUPT","frame","slice","declared","actual","COMPLETE","toLowerCase"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/spo/pc60fw.frame-reader.ts"],"mappings":";;AACA,SAASA,eAAe,QAAQ,qCAAkC;AAElE,SAASC,kBAAkB,QAAQ,yCAAsC;AACzE,SAASC,SAAS,QAAQ,+BAA4B;AAEtD,MAAMC,MAAM,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC;AAC3B,MAAMC,YAAY,GAAG,CAAC;AACtB,MAAMC,YAAY,GAAG,CAAC;AACtB,MAAMC,cAAc,GAAG,CAAC;AAExB,MAAMC,MAAM,GAAGA,CAACC,MAAyB,EAAEC,KAAa,KACtDP,SAAS,CAACM,MAAM,CAACC,KAAK,CAAC,IAAI,GAAG,CAAC;;AAEjC;AACA,OAAO,MAAMC,iBAAiB,CAAwB;EAC7CC,SAASA,CAACH,MAAyB,EAAmB;IAC3D,MAAMI,KAAK,GAAG,IAAI,CAACC,UAAU,CAACL,MAAM,CAAC;IAErC,IAAII,KAAK,KAAK,CAAC,CAAC,EAAE;MAChB,OAAO;QACLE,MAAM,EAAEd,eAAe,CAACe,UAAU;QAClCC,aAAa,EAAEC,IAAI,CAACC,GAAG,CAAC,CAAC,EAAEV,MAAM,CAACW,MAAM,GAAG,CAAC;MAC9C,CAAC;IACH;IAEA,IAAIP,KAAK,GAAGP,YAAY,GAAGG,MAAM,CAACW,MAAM,EAAE;MACxC,OAAO;QAAEL,MAAM,EAAEd,eAAe,CAACe,UAAU;QAAEC,aAAa,EAAEJ;MAAM,CAAC;IACrE;IAEA,MAAMQ,aAAa,GAAGb,MAAM,CAACC,MAAM,EAAEI,KAAK,GAAGR,YAAY,CAAC;IAC1D,MAAMiB,WAAW,GAAGhB,YAAY,GAAGe,aAAa;IAEhD,IAAIA,aAAa,GAAGd,cAAc,EAAE;MAClC,OAAO;QACLQ,MAAM,EAAEd,eAAe,CAACsB,OAAO;QAC/BN,aAAa,EAAEJ,KAAK,GAAGT,MAAM,CAACgB;MAChC,CAAC;IACH;IAEA,IAAIP,KAAK,GAAGS,WAAW,GAAGb,MAAM,CAACW,MAAM,EAAE;MACvC,OAAO;QAAEL,MAAM,EAAEd,eAAe,CAACe,UAAU;QAAEC,aAAa,EAAEJ;MAAM,CAAC;IACrE;IAEA,MAAMW,KAAK,GAAGf,MAAM,CAACgB,KAAK,CAACZ,KAAK,EAAEA,KAAK,GAAGS,WAAW,CAAC;IACtD,MAAMI,QAAQ,GAAGlB,MAAM,CAACgB,KAAK,EAAEA,KAAK,CAACJ,MAAM,GAAGb,cAAc,CAAC;IAC7D,MAAMoB,MAAM,GAAGzB,kBAAkB,CAACsB,KAAK,EAAEA,KAAK,CAACJ,MAAM,GAAGb,cAAc,CAAC;IAEvE,IAAImB,QAAQ,KAAKC,MAAM,EAAE;MACvB,OAAO;QACLZ,MAAM,EAAEd,eAAe,CAACsB,OAAO;QAC/BN,aAAa,EAAEJ,KAAK,GAAGT,MAAM,CAACgB;MAChC,CAAC;IACH;IAEA,OAAO;MACLL,MAAM,EAAEd,eAAe,CAAC2B,QAAQ;MAChCX,aAAa,EAAEJ,KAAK,GAAGS,WAAW;MAClCE;IACF,CAAC;EACH;EAEQV,UAAUA,CAACL,MAAyB,EAAU;IACpD,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGD,MAAM,CAACW,MAAM,GAAG,CAAC,EAAEV,KAAK,EAAE,EAAE;MACtD,IACED,MAAM,CAACC,KAAK,CAAC,EAAEmB,WAAW,CAAC,CAAC,KAAKzB,MAAM,CAAC,CAAC,CAAC,IAC1CK,MAAM,CAACC,KAAK,GAAG,CAAC,CAAC,EAAEmB,WAAW,CAAC,CAAC,KAAKzB,MAAM,CAAC,CAAC,CAAC,EAC9C;QACA,OAAOM,KAAK;MACd;IACF;IAEA,OAAO,CAAC,CAAC;EACX;AACF","ignoreList":[]}
+{"version":3,"names":["calculateCrc8Maxim","complete","corrupt","incomplete","noFrameStart","hexToByte","HEADER","LENGTH_INDEX","HEADER_BYTES","CHECKSUM_BYTES","byteAt","buffer","index","Pc60FwFrameReader","readFrame","start","findHeader","length","payloadLength","frameLength","frame","slice","declared","actual","toLowerCase"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/spo/pc60fw.frame-reader.ts"],"mappings":";;AAEA,SAASA,kBAAkB,QAAQ,yCAAsC;AACzE,SAASC,QAAQ,EAAEC,OAAO,EAAEC,UAAU,EAAEC,YAAY,QAAQ,sCAAmC;AAC/F,SAASC,SAAS,QAAQ,+BAA4B;AAEtD,MAAMC,MAAM,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC;AAC3B,MAAMC,YAAY,GAAG,CAAC;AACtB,MAAMC,YAAY,GAAG,CAAC;AACtB,MAAMC,cAAc,GAAG,CAAC;AAExB,MAAMC,MAAM,GAAGA,CAACC,MAAyB,EAAEC,KAAa,KACtDP,SAAS,CAACM,MAAM,CAACC,KAAK,CAAC,IAAI,GAAG,CAAC;;AAEjC;AACA,OAAO,MAAMC,iBAAiB,CAAwB;EAC7CC,SAASA,CAACH,MAAyB,EAAmB;IAC3D,MAAMI,KAAK,GAAG,IAAI,CAACC,UAAU,CAACL,MAAM,CAAC;IAErC,IAAII,KAAK,KAAK,CAAC,CAAC,EAAE;MAChB,OAAOX,YAAY,CAACO,MAAM,CAAC;IAC7B;IAEA,IAAII,KAAK,GAAGP,YAAY,GAAGG,MAAM,CAACM,MAAM,EAAE;MACxC,OAAOd,UAAU,CAACY,KAAK,CAAC;IAC1B;IAEA,MAAMG,aAAa,GAAGR,MAAM,CAACC,MAAM,EAAEI,KAAK,GAAGR,YAAY,CAAC;IAC1D,MAAMY,WAAW,GAAGX,YAAY,GAAGU,aAAa;IAEhD,IAAIA,aAAa,GAAGT,cAAc,EAAE;MAClC,OAAOP,OAAO,CAACa,KAAK,GAAGT,MAAM,CAACW,MAAM,CAAC;IACvC;IAEA,IAAIF,KAAK,GAAGI,WAAW,GAAGR,MAAM,CAACM,MAAM,EAAE;MACvC,OAAOd,UAAU,CAACY,KAAK,CAAC;IAC1B;IAEA,MAAMK,KAAK,GAAGT,MAAM,CAACU,KAAK,CAACN,KAAK,EAAEA,KAAK,GAAGI,WAAW,CAAC;IACtD,MAAMG,QAAQ,GAAGZ,MAAM,CAACU,KAAK,EAAEA,KAAK,CAACH,MAAM,GAAGR,cAAc,CAAC;IAC7D,MAAMc,MAAM,GAAGvB,kBAAkB,CAACoB,KAAK,EAAEA,KAAK,CAACH,MAAM,GAAGR,cAAc,CAAC;IAEvE,IAAIa,QAAQ,KAAKC,MAAM,EAAE;MACvB,OAAOrB,OAAO,CAACa,KAAK,GAAGT,MAAM,CAACW,MAAM,CAAC;IACvC;IAEA,OAAOhB,QAAQ,CAACmB,KAAK,EAAEL,KAAK,GAAGI,WAAW,CAAC;EAC7C;EAEQH,UAAUA,CAACL,MAAyB,EAAU;IACpD,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGD,MAAM,CAACM,MAAM,GAAG,CAAC,EAAEL,KAAK,EAAE,EAAE;MACtD,IACED,MAAM,CAACC,KAAK,CAAC,EAAEY,WAAW,CAAC,CAAC,KAAKlB,MAAM,CAAC,CAAC,CAAC,IAC1CK,MAAM,CAACC,KAAK,GAAG,CAAC,CAAC,EAAEY,WAAW,CAAC,CAAC,KAAKlB,MAAM,CAAC,CAAC,CAAC,EAC9C;QACA,OAAOM,KAAK;MACd;IACF;IAEA,OAAO,CAAC,CAAC;EACX;AACF","ignoreList":[]}

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

@@ -3,6 +3,7 @@
 /* eslint-disable max-lines */
 
 import { MeasurementTypeKey } from "@ovok/core";
+import { byteToHex } from "../../../utils/bytes-to-hex.js";
 import { standardGlucoseDevice } from "./standard-gatt.glucose.js";
 import { decorateBloodPressureReading, declareProfile, littleEndian } from "./standard-gatt.profile.js";
 
@@ -128,7 +129,7 @@ const standardWeightScaleDevice = params => declareProfile(params, {
   /** Unit, timestamp, user-id and BMI/height flags may all follow the value. */
   selectors: Array.from({
     length: 16
-  }, (_, flags) => flags.toString(16).padStart(2, "0")),
+  }, (_, flags) => byteToHex(flags)),
   fields: [{
     ...littleEndian("bodyWeight", [1, 2], "kg", "uint"),
     scale: WEIGHT_KG_PER_COUNT,
@@ -137,7 +138,7 @@ const standardWeightScaleDevice = params => declareProfile(params, {
   fieldsBySelector: Object.fromEntries(Array.from({
     length: 16
   }, (_, flags) => {
-    const selector = flags.toString(16).padStart(2, "0");
+    const selector = byteToHex(flags);
     return [selector, [{
       ...littleEndian("bodyWeight", [1, 2], "kg", "uint"),
       scale: flags & 1 ? 0.01 * 0.45359237 : WEIGHT_KG_PER_COUNT,
@@ -161,6 +162,14 @@ const standardPulseOximeterDevice = params => declareProfile(params, {
   fields: [littleEndian("bloodOxygen", [1, 2], "%", "sfloat"), littleEndian("pulseRate", [3, 4], "bpm", "sfloat")]
 });
 
+/** Heart-rate flag bytes, minus the reserved sensor-contact value 0b10 in bits 1-2. */
+const HEART_RATE_FLAGS = Array.from({
+  length: 32
+}, (_, flags) => flags).filter(flags => (flags & 0x06) !== 0x04);
+
+/** The heart-rate flags whose value is a 16-bit field (bit 0 set). */
+const UINT16_HEART_RATE_FLAGS = HEART_RATE_FLAGS.filter(flags => (flags & 0x01) === 0x01);
+
 /**
  * Heart Rate Service 0x180D, Heart Rate Measurement 0x2A37.
  *
@@ -172,27 +181,21 @@ const standardHeartRateDevice = params => declareProfile(params, {
   characteristic: "2a37",
   minLengthBytes: 2,
   measurementTypeKey: MeasurementTypeKey.heartRate,
-  selectors: Array.from({
-    length: 32
-  }, (_, flags) => flags).filter(flags => (flags & 0x06) !== 0x04).map(flags => flags.toString(16).padStart(2, "0")),
+  selectors: HEART_RATE_FLAGS.map(byteToHex),
   fields: [{
     name: "heartRate",
     byteIndexes: [1],
     encoding: "uint",
     unit: "bpm"
   }],
-  fieldsBySelector: Object.fromEntries(Array.from({
-    length: 32
-  }, (_, flags) => flags).filter(flags => (flags & 0x01) === 0x01).filter(flags => (flags & 0x06) !== 0x04).map(flags => [flags.toString(16).padStart(2, "0"), [{
+  fieldsBySelector: Object.fromEntries(UINT16_HEART_RATE_FLAGS.map(flags => [byteToHex(flags), [{
     name: "heartRate",
     byteIndexes: [1, 2],
     byteOrder: "little",
     encoding: "uint",
     unit: "bpm"
   }]])),
-  optionalFields: Object.fromEntries(Array.from({
-    length: 32
-  }, (_, flags) => flags).filter(flags => (flags & 0x01) === 0x01).filter(flags => (flags & 0x06) !== 0x04).map(flags => [flags.toString(16).padStart(2, "0"), {
+  optionalFields: Object.fromEntries(UINT16_HEART_RATE_FLAGS.map(flags => [byteToHex(flags), {
     fields: [],
     minLengthBytes: 3
   }]))

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

@@ -1 +1 @@
-{"version":3,"names":["MeasurementTypeKey","standardGlucoseDevice","decorateBloodPressureReading","declareProfile","littleEndian","pulseAfterMeanPressure","fields","minLengthBytes","pulseAfterTimestamp","standardBloodPressureDevice","params","decorateReading","reading","frame","recordOffset","decorated","service","characteristic","measurementTypeKey","bloodPressure","selectors","optionalFields","standardThermometerDevice","temperature","fieldsBySelector","scale","offset","decimals","WEIGHT_KG_PER_COUNT","standardWeightScaleDevice","bodyWeight","Array","from","length","_","flags","toString","padStart","Object","fromEntries","selector","standardPulseOximeterDevice","bloodOxygenPulseRate","standardHeartRateDevice","heartRate","filter","map","name","byteIndexes","encoding","unit","byteOrder"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/standard-gatt/standard-gatt.devices.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["MeasurementTypeKey","byteToHex","standardGlucoseDevice","decorateBloodPressureReading","declareProfile","littleEndian","pulseAfterMeanPressure","fields","minLengthBytes","pulseAfterTimestamp","standardBloodPressureDevice","params","decorateReading","reading","frame","recordOffset","decorated","service","characteristic","measurementTypeKey","bloodPressure","selectors","optionalFields","standardThermometerDevice","temperature","fieldsBySelector","scale","offset","decimals","WEIGHT_KG_PER_COUNT","standardWeightScaleDevice","bodyWeight","Array","from","length","_","flags","Object","fromEntries","selector","standardPulseOximeterDevice","bloodOxygenPulseRate","HEART_RATE_FLAGS","filter","UINT16_HEART_RATE_FLAGS","standardHeartRateDevice","heartRate","map","name","byteIndexes","encoding","unit","byteOrder"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/standard-gatt/standard-gatt.devices.ts"],"mappings":"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","ignoreList":[]}

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

@@ -1,6 +1,7 @@
 "use strict";
 
 import { MeasurementTypeKey } from "@ovok/core";
+import { byteToHex } from "../../../utils/bytes-to-hex.js";
 import { sigUuid } from "../../../utils/sig-uuid.js";
 import { defineCustomDevice } from "../../custom/define-custom-device.js";
 import { littleEndian } from "./standard-gatt.profile.js";
@@ -34,7 +35,6 @@ 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;
-const selector = flags => flags.toString(16).padStart(2, "0");
 
 /** Bits 5-7 are reserved; a meter that sets one still sends a readable record. */
 const ALL_FLAGS = Array.from({
@@ -101,13 +101,13 @@ const standardGlucoseDevice = params => defineCustomDevice({
       },
       caseSelectorBytes: [0],
       cases: ALL_FLAGS.map(flags => flags & FLAG_CONCENTRATION ? {
-        selector: selector(flags),
+        selector: byteToHex(flags),
         kind: "result",
         measurementTypeKey: MeasurementTypeKey.bloodGlucose,
         fields: [glucoseField(flags)],
         minLengthBytes: concentrationIndex(flags) + 3
       } : {
-        selector: selector(flags),
+        selector: byteToHex(flags),
         kind: "idle",
         description: "A record without a concentration"
       })

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

@@ -1 +1 @@
-{"version":3,"names":["MeasurementTypeKey","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","selector","toString","padStart","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","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","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":[]}

package/lib/module/modules/bt-management/services/devices/taidoc/taidoc.device.js

@@ -1,8 +1,8 @@
 "use strict";
 
-import { NO_PARSING_CASES } from "../../../constants/no-parsing-cases.js";
 import { IntegratedDevices } from "../../../types/integrated-devices.js";
 import { BTManagedDevice } from "../bt-managed-device.js";
+import { monitorService } from "../monitor-service.js";
 import { TAIDOC_CHARACTERISTIC, TAIDOC_SERVICE, TaidocFrameReader } from "./taidoc.protocol.js";
 import { TaidocSequencer } from "./taidoc.sequencer.js";
 const KIND = {
@@ -15,13 +15,10 @@ const KIND = {
 
 /** The sequencer decodes records itself; the declarative parser only passes frames on. */
 
-const taidocMainServices = [{
+const taidocMainServices = [monitorService({
   uuid: TAIDOC_SERVICE,
-  monitorUuids: [{
-    uuid: TAIDOC_CHARACTERISTIC,
-    parsingModel: NO_PARSING_CASES
-  }]
-}];
+  notify: TAIDOC_CHARACTERISTIC
+})];
 
 /** TaiDoc and FORA meters on the 0x51 command protocol: history download of every device user. */
 class TaidocDeviceClass extends BTManagedDevice {
@@ -32,7 +29,7 @@ class TaidocDeviceClass extends BTManagedDevice {
     this.frameReader = new TaidocFrameReader();
     this.createCommandSequencer = () => new TaidocSequencer({
       kind: KIND[params.deviceName],
-      onResult: result => this.onResult?.(result)
+      onResult: this.reportResult
     });
   }
 }

package/lib/module/modules/bt-management/services/devices/taidoc/taidoc.device.js.map

@@ -1 +1 @@
-{"version":3,"names":["NO_PARSING_CASES","IntegratedDevices","BTManagedDevice","TAIDOC_CHARACTERISTIC","TAIDOC_SERVICE","TaidocFrameReader","TaidocSequencer","KIND","TAIDOC_MULTI","TAIDOC_BPM","TAIDOC_THERMOMETER","TAIDOC_OXIMETER","TAIDOC_SCALE","taidocMainServices","uuid","monitorUuids","parsingModel","TaidocDeviceClass","mainServices","stuckDataTimeout","constructor","device","params","frameReader","createCommandSequencer","kind","deviceName","onResult","result","TaidocDevice"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/taidoc/taidoc.device.ts"],"mappings":";;AAEA,SAASA,gBAAgB,QAAQ,wCAAqC;AAGtE,SAASC,iBAAiB,QAAQ,sCAAmC;AAGrE,SAASC,eAAe,QAAQ,yBAAsB;AAEtD,SAASC,qBAAqB,EAAEC,cAAc,EAAEC,iBAAiB,QAAQ,sBAAmB;AAE5F,SAASC,eAAe,QAAQ,uBAAoB;AASpD,MAAMC,IAAsC,GAAG;EAC7C,CAACN,iBAAiB,CAACO,YAAY,GAAG,OAAO;EACzC,CAACP,iBAAiB,CAACQ,UAAU,GAAG,KAAK;EACrC,CAACR,iBAAiB,CAACS,kBAAkB,GAAG,aAAa;EACrD,CAACT,iBAAiB,CAACU,eAAe,GAAG,UAAU;EAC/C,CAACV,iBAAiB,CAACW,YAAY,GAAG;AACpC,CAAC;;AAED;;AAEA,MAAMC,kBAA8B,GAAG,CACrC;EACEC,IAAI,EAAEV,cAAc;EACpBW,YAAY,EAAE,CAAC;IAAED,IAAI,EAAEX,qBAAqB;IAAEa,YAAY,EAAEhB;EAAiB,CAAC;AAChF,CAAC,CACF;;AAED;AACA,MAAMiB,iBAAiB,SAASf,eAAe,CAAe;EAClDgB,YAAY,GAAGL,kBAAkB;EACjCM,gBAAgB,GAAG,MAAM;EAE5BC,WAAWA,CAACC,MAAc,EAAEC,MAAwC,EAAE;IAC3E,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IACrB,IAAI,CAACC,WAAW,GAAG,IAAIlB,iBAAiB,CAAC,CAAC;IAC1C,IAAI,CAACmB,sBAAsB,GAAG,MAC5B,IAAIlB,eAAe,CAAC;MAClBmB,IAAI,EAAElB,IAAI,CAACe,MAAM,CAACI,UAAU,CAAC;MAC7BC,QAAQ,EAAGC,MAAM,IACf,IAAI,CAACD,QAAQ,GACXC,MAGF;IACJ,CAAC,CAAC;EACN;AAEF;AAEA,SAASX,iBAAiB,IAAIY,YAAY","ignoreList":[]}
+{"version":3,"names":["IntegratedDevices","BTManagedDevice","monitorService","TAIDOC_CHARACTERISTIC","TAIDOC_SERVICE","TaidocFrameReader","TaidocSequencer","KIND","TAIDOC_MULTI","TAIDOC_BPM","TAIDOC_THERMOMETER","TAIDOC_OXIMETER","TAIDOC_SCALE","taidocMainServices","uuid","notify","TaidocDeviceClass","mainServices","stuckDataTimeout","constructor","device","params","frameReader","createCommandSequencer","kind","deviceName","onResult","reportResult","TaidocDevice"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/taidoc/taidoc.device.ts"],"mappings":";;AAGA,SAASA,iBAAiB,QAAQ,sCAAmC;AAErE,SAASC,eAAe,QAAQ,yBAAsB;AACtD,SAASC,cAAc,QAAQ,uBAAoB;AAEnD,SAASC,qBAAqB,EAAEC,cAAc,EAAEC,iBAAiB,QAAQ,sBAAmB;AAE5F,SAASC,eAAe,QAAQ,uBAAoB;AASpD,MAAMC,IAAsC,GAAG;EAC7C,CAACP,iBAAiB,CAACQ,YAAY,GAAG,OAAO;EACzC,CAACR,iBAAiB,CAACS,UAAU,GAAG,KAAK;EACrC,CAACT,iBAAiB,CAACU,kBAAkB,GAAG,aAAa;EACrD,CAACV,iBAAiB,CAACW,eAAe,GAAG,UAAU;EAC/C,CAACX,iBAAiB,CAACY,YAAY,GAAG;AACpC,CAAC;;AAED;;AAEA,MAAMC,kBAA8B,GAAG,CACrCX,cAAc,CAAC;EAAEY,IAAI,EAAEV,cAAc;EAAEW,MAAM,EAAEZ;AAAsB,CAAC,CAAC,CACxE;;AAED;AACA,MAAMa,iBAAiB,SAASf,eAAe,CAAe;EAClDgB,YAAY,GAAGJ,kBAAkB;EACjCK,gBAAgB,GAAG,MAAM;EAE5BC,WAAWA,CAACC,MAAc,EAAEC,MAAwC,EAAE;IAC3E,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IACrB,IAAI,CAACC,WAAW,GAAG,IAAIjB,iBAAiB,CAAC,CAAC;IAC1C,IAAI,CAACkB,sBAAsB,GAAG,MAC5B,IAAIjB,eAAe,CAAC;MAClBkB,IAAI,EAAEjB,IAAI,CAACc,MAAM,CAACI,UAAU,CAAC;MAC7BC,QAAQ,EAAE,IAAI,CAACC;IACjB,CAAC,CAAC;EACN;AAEF;AAEA,SAASX,iBAAiB,IAAIY,YAAY","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/taidoc/taidoc.protocol.js

@@ -2,10 +2,11 @@
 
 /* eslint-disable import/group-exports */
 
-import { FrameReadStatus } from "../../../types/frame-read-status.js";
 import { bytesToHex } from "../../../utils/bytes-to-hex.js";
 import { frameBytes } from "../../../utils/frame-bytes.js";
+import { complete, corrupt, incomplete } from "../../../utils/frame-read-results.js";
 import { hexToByte } from "../../../utils/hex-to-byte.js";
+import { sumBytes } from "../../../utils/sum-bytes.js";
 
 /**
  * TaiDoc's "0x51" command protocol, shared by its glucose meters, blood-pressure monitors,
@@ -42,8 +43,7 @@ const DEVICE_END = 0xa5;
 const FIXED_FRAME_BYTES = 8;
 const VARIABLE_COMMANDS = [TAIDOC.weightRecord, TAIDOC.setUser];
 const byteAt = (frame, index) => hexToByte(frame[index] ?? "00");
-const sum = bytes => bytes.reduce((total, value) => total + value, 0) & 0xff;
-const withChecksum = bytes => bytesToHex([...bytes, sum(bytes)]);
+const withChecksum = bytes => bytesToHex([...bytes, sumBytes(bytes)]);
 export const commandOf = frame => byteAt(frame, 1);
 
 /** `51 cmd a b c d A3 cs`. */
@@ -68,38 +68,22 @@ export class TaidocFrameReader {
   readFrame(buffer) {
     const start = buffer.findIndex(byte => hexToByte(byte) === START);
     if (start === -1) {
-      return {
-        status: FrameReadStatus.INCOMPLETE,
-        consumedBytes: buffer.length
-      };
+      return incomplete(buffer.length);
     }
     if (start + 3 > buffer.length) {
-      return {
-        status: FrameReadStatus.INCOMPLETE,
-        consumedBytes: start
-      };
+      return incomplete(start);
     }
     const length = VARIABLE_COMMANDS.includes(byteAt(buffer, start + 1)) ? byteAt(buffer, start + 2) + 5 : FIXED_FRAME_BYTES;
     if (start + length > buffer.length) {
-      return {
-        status: FrameReadStatus.INCOMPLETE,
-        consumedBytes: start
-      };
+      return incomplete(start);
     }
     const received = buffer.slice(start, start + length);
     const bytes = frameBytes(received);
     const end = bytes[length - 2];
-    if (end !== HOST_END && end !== DEVICE_END || sum(bytes.slice(0, -1)) !== bytes[length - 1]) {
-      return {
-        status: FrameReadStatus.CORRUPT,
-        consumedBytes: start + 1
-      };
+    if (end !== HOST_END && end !== DEVICE_END || sumBytes(bytes.slice(0, -1)) !== bytes[length - 1]) {
+      return corrupt(start + 1);
     }
-    return {
-      status: FrameReadStatus.COMPLETE,
-      consumedBytes: start + length,
-      frame: received
-    };
+    return complete(received, start + length);
   }
 }
 

package/lib/module/modules/bt-management/services/devices/taidoc/taidoc.protocol.js.map

@@ -1 +1 @@
-{"version":3,"names":["FrameReadStatus","bytesToHex","frameBytes","hexToByte","TAIDOC_SERVICE","TAIDOC_CHARACTERISTIC","TAIDOC","wakeUp","deviceTime","model","readingTime","readingResult","serial1","serial2","oximeterAfterTime","readingCount","setTime","shutdown","wakeNotice","weightRecord","setUser","busy","START","HOST_END","DEVICE_END","FIXED_FRAME_BYTES","VARIABLE_COMMANDS","byteAt","frame","index","sum","bytes","reduce","total","value","withChecksum","commandOf","taidocCommand","command","a","b","c","d","readingCountCommand","user","readingCommand","setTimeCommand","now","date","getFullYear","getMonth","getDate","getMinutes","getHours","weightRecordCommand","isHostFrame","length","TaidocFrameReader","readFrame","buffer","start","findIndex","byte","status","INCOMPLETE","consumedBytes","includes","received","slice","end","CORRUPT","COMPLETE","MULTI_USER_CODES","Set","usersFor","has","readCount"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/taidoc/taidoc.protocol.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["bytesToHex","frameBytes","complete","corrupt","incomplete","hexToByte","sumBytes","TAIDOC_SERVICE","TAIDOC_CHARACTERISTIC","TAIDOC","wakeUp","deviceTime","model","readingTime","readingResult","serial1","serial2","oximeterAfterTime","readingCount","setTime","shutdown","wakeNotice","weightRecord","setUser","busy","START","HOST_END","DEVICE_END","FIXED_FRAME_BYTES","VARIABLE_COMMANDS","byteAt","frame","index","withChecksum","bytes","commandOf","taidocCommand","command","a","b","c","d","readingCountCommand","user","readingCommand","setTimeCommand","now","date","getFullYear","getMonth","getDate","getMinutes","getHours","weightRecordCommand","isHostFrame","length","TaidocFrameReader","readFrame","buffer","start","findIndex","byte","includes","received","slice","end","MULTI_USER_CODES","Set","usersFor","has","readCount"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/taidoc/taidoc.protocol.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/tmb/tmb.command-sequencer.js

@@ -1,6 +1,8 @@
 "use strict";
 
 import { isClockSyncEnabled } from "../../../types/clock-sync.js";
+import { byteToHex } from "../../../utils/bytes-to-hex.js";
+import { frameBytes } from "../../../utils/frame-bytes.js";
 import { hexToByte } from "../../../utils/hex-to-byte.js";
 const TMB_EPOCH_SECONDS = 1_262_304_000;
 const LOGIN_RESPONSE = 7;
@@ -9,11 +11,9 @@ const SET_TIME = 0x1102;
 const GET_RECORD = 0x4901;
 const GET_RECORD_RESPONSE = 0x4902;
 const ACK_SUCCESS = ["00", "01", "01"];
-const bytes = frame => frame.map(hexToByte);
-const byte = value => (value & 0xff).toString(16).padStart(2, "0");
 const command = (opcode, content) => {
   const payload = [opcode >> 8 & 0xff, opcode & 0xff, ...content];
-  return [0x10, payload.length, ...payload].map(byte);
+  return [0x10, payload.length, ...payload].map(byteToHex);
 };
 const responseCommand = frame => {
   const head = hexToByte(frame[0] ?? "00");
@@ -24,7 +24,7 @@ const responseCommand = frame => {
 };
 const content = frame => {
   const head = hexToByte(frame[0] ?? "00");
-  return bytes(frame.slice(head === 0x21 || head === 0 ? 2 : 4));
+  return frameBytes(frame.slice(head === 0x21 || head === 0 ? 2 : 4));
 };
 const nowSeconds = clockSync => {
   const now = clockSync?.now?.() ?? new Date();

package/lib/module/modules/bt-management/services/devices/tmb/tmb.command-sequencer.js.map

@@ -1 +1 @@
-{"version":3,"names":["isClockSyncEnabled","hexToByte","TMB_EPOCH_SECONDS","LOGIN_RESPONSE","SETTING_RESPONSE","SET_TIME","GET_RECORD","GET_RECORD_RESPONSE","ACK_SUCCESS","bytes","frame","map","byte","value","toString","padStart","command","opcode","content","payload","length","responseCommand","head","slice","nowSeconds","clockSync","now","Date","offsetSeconds","timezone","getTimezoneOffset","Math","floor","getTime","syncTime","seconds","TmbCommandSequencer","phase","userId","constructor","params","initialCommands","nextCommand","frameContent","ack","write","history","setting","success","undefined","commandTimeoutMs","onCommandTimeout","terminal","commandProgress","isHistoryTransfer","serviceUuid","protocol","characteristicUuid","writeUuid","ackUuid"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/tmb/tmb.command-sequencer.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["isClockSyncEnabled","byteToHex","frameBytes","hexToByte","TMB_EPOCH_SECONDS","LOGIN_RESPONSE","SETTING_RESPONSE","SET_TIME","GET_RECORD","GET_RECORD_RESPONSE","ACK_SUCCESS","command","opcode","content","payload","length","map","responseCommand","frame","head","slice","nowSeconds","clockSync","now","Date","offsetSeconds","timezone","getTimezoneOffset","Math","floor","getTime","syncTime","seconds","TmbCommandSequencer","phase","userId","constructor","params","initialCommands","nextCommand","frameContent","ack","write","history","setting","success","undefined","commandTimeoutMs","onCommandTimeout","terminal","commandProgress","isHistoryTransfer","serviceUuid","protocol","characteristicUuid","writeUuid","ackUuid"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/tmb/tmb.command-sequencer.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/tmb/tmb.frame-reader.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { FrameReadStatus } from "../../../types/frame-read-status.js";
+import { complete, incomplete, noFrameStart } from "../../../utils/frame-read-results.js";
 import { hexToByte } from "../../../utils/hex-to-byte.js";
 const HEADS = new Set([0x10, 0x20, 0x21]);
 const isHead = (buffer, index) => {
@@ -13,29 +13,16 @@ export class TmbFrameReader {
   readFrame(buffer) {
     const start = this.findStart(buffer);
     if (start < 0) {
-      return {
-        status: FrameReadStatus.INCOMPLETE,
-        consumedBytes: Math.max(0, buffer.length - 1)
-      };
+      return noFrameStart(buffer);
     }
     if (start + 2 > buffer.length) {
-      return {
-        status: FrameReadStatus.INCOMPLETE,
-        consumedBytes: start
-      };
+      return incomplete(start);
     }
     const frameLength = 2 + hexToByte(buffer[start + 1] ?? "00");
     if (start + frameLength > buffer.length) {
-      return {
-        status: FrameReadStatus.INCOMPLETE,
-        consumedBytes: start
-      };
+      return incomplete(start);
     }
-    return {
-      status: FrameReadStatus.COMPLETE,
-      consumedBytes: start + frameLength,
-      frame: buffer.slice(start, start + frameLength)
-    };
+    return complete(buffer.slice(start, start + frameLength), start + frameLength);
   }
   findStart(buffer) {
     for (let index = 0; index < buffer.length; index++) {

package/lib/module/modules/bt-management/services/devices/tmb/tmb.frame-reader.js.map

@@ -1 +1 @@
-{"version":3,"names":["FrameReadStatus","hexToByte","HEADS","Set","isHead","buffer","index","head","has","TmbFrameReader","readFrame","start","findStart","status","INCOMPLETE","consumedBytes","Math","max","length","frameLength","COMPLETE","frame","slice"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/tmb/tmb.frame-reader.ts"],"mappings":";;AACA,SAASA,eAAe,QAAQ,qCAAkC;AAElE,SAASC,SAAS,QAAQ,+BAA4B;AAEtD,MAAMC,KAAK,GAAG,IAAIC,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAEzC,MAAMC,MAAM,GAAGA,CAACC,MAAyB,EAAEC,KAAa,KAAc;EACpE,MAAMC,IAAI,GAAGN,SAAS,CAACI,MAAM,CAACC,KAAK,CAAC,IAAI,IAAI,CAAC;EAE7C,OAAOJ,KAAK,CAACM,GAAG,CAACD,IAAI,CAAC,IAAKA,IAAI,KAAK,CAAC,IAAIN,SAAS,CAACI,MAAM,CAACC,KAAK,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAE;AACtF,CAAC;;AAED;AACA,OAAO,MAAMG,cAAc,CAAwB;EAC1CC,SAASA,CAACL,MAAyB,EAAmB;IAC3D,MAAMM,KAAK,GAAG,IAAI,CAACC,SAAS,CAACP,MAAM,CAAC;IAEpC,IAAIM,KAAK,GAAG,CAAC,EAAE;MACb,OAAO;QACLE,MAAM,EAAEb,eAAe,CAACc,UAAU;QAClCC,aAAa,EAAEC,IAAI,CAACC,GAAG,CAAC,CAAC,EAAEZ,MAAM,CAACa,MAAM,GAAG,CAAC;MAC9C,CAAC;IACH;IAEA,IAAIP,KAAK,GAAG,CAAC,GAAGN,MAAM,CAACa,MAAM,EAAE;MAC7B,OAAO;QAAEL,MAAM,EAAEb,eAAe,CAACc,UAAU;QAAEC,aAAa,EAAEJ;MAAM,CAAC;IACrE;IAEA,MAAMQ,WAAW,GAAG,CAAC,GAAGlB,SAAS,CAACI,MAAM,CAACM,KAAK,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC;IAE5D,IAAIA,KAAK,GAAGQ,WAAW,GAAGd,MAAM,CAACa,MAAM,EAAE;MACvC,OAAO;QAAEL,MAAM,EAAEb,eAAe,CAACc,UAAU;QAAEC,aAAa,EAAEJ;MAAM,CAAC;IACrE;IAEA,OAAO;MACLE,MAAM,EAAEb,eAAe,CAACoB,QAAQ;MAChCL,aAAa,EAAEJ,KAAK,GAAGQ,WAAW;MAClCE,KAAK,EAAEhB,MAAM,CAACiB,KAAK,CAACX,KAAK,EAAEA,KAAK,GAAGQ,WAAW;IAChD,CAAC;EACH;EAEQP,SAASA,CAACP,MAAyB,EAAU;IACnD,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGD,MAAM,CAACa,MAAM,EAAEZ,KAAK,EAAE,EAAE;MAClD,IAAIF,MAAM,CAACC,MAAM,EAAEC,KAAK,CAAC,EAAE;QACzB,OAAOA,KAAK;MACd;IACF;IAEA,OAAO,CAAC,CAAC;EACX;AACF","ignoreList":[]}
+{"version":3,"names":["complete","incomplete","noFrameStart","hexToByte","HEADS","Set","isHead","buffer","index","head","has","TmbFrameReader","readFrame","start","findStart","length","frameLength","slice"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/tmb/tmb.frame-reader.ts"],"mappings":";;AAEA,SAASA,QAAQ,EAAEC,UAAU,EAAEC,YAAY,QAAQ,sCAAmC;AACtF,SAASC,SAAS,QAAQ,+BAA4B;AAEtD,MAAMC,KAAK,GAAG,IAAIC,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAEzC,MAAMC,MAAM,GAAGA,CAACC,MAAyB,EAAEC,KAAa,KAAc;EACpE,MAAMC,IAAI,GAAGN,SAAS,CAACI,MAAM,CAACC,KAAK,CAAC,IAAI,IAAI,CAAC;EAE7C,OAAOJ,KAAK,CAACM,GAAG,CAACD,IAAI,CAAC,IAAKA,IAAI,KAAK,CAAC,IAAIN,SAAS,CAACI,MAAM,CAACC,KAAK,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAE;AACtF,CAAC;;AAED;AACA,OAAO,MAAMG,cAAc,CAAwB;EAC1CC,SAASA,CAACL,MAAyB,EAAmB;IAC3D,MAAMM,KAAK,GAAG,IAAI,CAACC,SAAS,CAACP,MAAM,CAAC;IAEpC,IAAIM,KAAK,GAAG,CAAC,EAAE;MACb,OAAOX,YAAY,CAACK,MAAM,CAAC;IAC7B;IAEA,IAAIM,KAAK,GAAG,CAAC,GAAGN,MAAM,CAACQ,MAAM,EAAE;MAC7B,OAAOd,UAAU,CAACY,KAAK,CAAC;IAC1B;IAEA,MAAMG,WAAW,GAAG,CAAC,GAAGb,SAAS,CAACI,MAAM,CAACM,KAAK,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC;IAE5D,IAAIA,KAAK,GAAGG,WAAW,GAAGT,MAAM,CAACQ,MAAM,EAAE;MACvC,OAAOd,UAAU,CAACY,KAAK,CAAC;IAC1B;IAEA,OAAOb,QAAQ,CAACO,MAAM,CAACU,KAAK,CAACJ,KAAK,EAAEA,KAAK,GAAGG,WAAW,CAAC,EAAEH,KAAK,GAAGG,WAAW,CAAC;EAChF;EAEQF,SAASA,CAACP,MAAyB,EAAU;IACnD,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGD,MAAM,CAACQ,MAAM,EAAEP,KAAK,EAAE,EAAE;MAClD,IAAIF,MAAM,CAACC,MAAM,EAAEC,KAAK,CAAC,EAAE;QACzB,OAAOA,KAAK;MACd;IACF;IAEA,OAAO,CAAC,CAAC;EACX;AACF","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/transtek/a6-blood-pressure.measurements.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import { bytesToHex } from "../../../utils/bytes-to-hex.js";
 import { readA6Uint } from "./a6-scale.protocol.js";
 const A6_BPM_EPOCH_MS = Date.UTC(2009, 11, 31, 16, 0, 0);
 const KPA_TO_MMHG = 7.500617;
@@ -20,7 +21,7 @@ export const parseA6BloodPressure = body => {
   if (body.length < 14) {
     return undefined;
   }
-  const bytes = body.map(value => (value & 0xff).toString(16).padStart(2, "0"));
+  const bytes = bytesToHex(body);
   const flags = readA6Uint(bytes, 2, 4);
   if ((flags & ~RECORD_FLAGS) !== 0) {
     return undefined;

package/lib/module/modules/bt-management/services/devices/transtek/a6-blood-pressure.measurements.js.map

@@ -1 +1 @@
-{"version":3,"names":["readA6Uint","A6_BPM_EPOCH_MS","Date","UTC","KPA_TO_MMHG","RECORD_FLAGS","readA6Int16","bytes","offset","value","parseA6BloodPressure","body","length","undefined","map","toString","padStart","flags","rawSystolic","rawDiastolic","rawMeanPressure","status","multiplier","systolic","Math","round","diastolic","meanArterialPressure","heartRate","memorySlot","recordedAt","vendorSeconds","irregularHeartbeat"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/transtek/a6-blood-pressure.measurements.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["bytesToHex","readA6Uint","A6_BPM_EPOCH_MS","Date","UTC","KPA_TO_MMHG","RECORD_FLAGS","readA6Int16","bytes","offset","value","parseA6BloodPressure","body","length","undefined","flags","rawSystolic","rawDiastolic","rawMeanPressure","status","multiplier","systolic","Math","round","diastolic","meanArterialPressure","heartRate","memorySlot","recordedAt","vendorSeconds","irregularHeartbeat"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/transtek/a6-blood-pressure.measurements.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/transtek/a6-blood-pressure.sequencer.js

@@ -3,11 +3,11 @@
 import { MeasurementTypeKey } from "@ovok/core";
 import { CaseType } from "../../../types/case-type.js";
 import { getClockParts, isClockSyncEnabled } from "../../../types/clock-sync.js";
+import { byteToHex } from "../../../utils/bytes-to-hex.js";
 import { parseA6BloodPressure } from "./a6-blood-pressure.measurements.js";
 import { A6_BPM_MEASUREMENT, A6_BPM_SERVICE, A6_BPM_SETTING_RESPONSE, A6_BPM_START_MEASURING_RESPONSE, A6_BPM_SYNC, A6_BPM_TIME, A6_SCALE_WRITE, decodeA6Command, encodeA6Command, readA6Uint } from "./a6-scale.protocol.js";
 import { A6Sequencer } from "./a6.sequencer.js";
 const vendorEpochSeconds = Date.UTC(2010, 0, 1) / 1000;
-const byte = value => (value & 0xff).toString(16).padStart(2, "0");
 
 /** Vendor BP time is wall-clock seconds from 2010-01-01, encoded big-endian. */
 const buildA6BloodPressureTimeBody = (now, timezone = "local") => {
@@ -61,7 +61,7 @@ class A6BloodPressureSequencer extends A6Sequencer {
       return this.startHistorySync(500);
     }
     if (message.command === A6_BPM_MEASUREMENT || message.command === A6_BPM_START_MEASURING_RESPONSE) {
-      if (message.command === A6_BPM_START_MEASURING_RESPONSE && readA6Uint(message.body.map(byte), 0, 2) === 1) {
+      if (message.command === A6_BPM_START_MEASURING_RESPONSE && readA6Uint(message.body.map(byteToHex), 0, 2) === 1) {
         return [];
       }
       const reading = parseA6BloodPressure(message.body);