@ovok/native 1.10.13 → 1.10.15

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

@@ -1,6 +1,6 @@
 "use strict";
 
-import { FrameReadStatus } from "../../../types/frame-read-status.js";
+import { complete, corrupt, incomplete, noFrameStart } from "../../../utils/frame-read-results.js";
 import { hexToByte } from "../../../utils/hex-to-byte.js";
 const START = 0x26;
 const TYPE_GET = 0x43;
@@ -13,37 +13,21 @@ export class A606FrameReader {
   readFrame(buffer) {
     const start = this.findStart(buffer);
     if (start < 0) {
-      return {
-        status: FrameReadStatus.INCOMPLETE,
-        consumedBytes: Math.max(0, buffer.length - 1)
-      };
+      return noFrameStart(buffer);
     }
     const type = hexToByte(buffer[start + TYPE_INDEX] ?? "00");
     const frameLength = type === TYPE_UPLOAD ? 16 : type === TYPE_GET ? 7 : 0;
     if (frameLength === 0) {
-      return {
-        status: FrameReadStatus.CORRUPT,
-        consumedBytes: start + 1
-      };
+      return corrupt(start + 1);
     }
     if (start + frameLength > buffer.length) {
-      return {
-        status: FrameReadStatus.INCOMPLETE,
-        consumedBytes: start
-      };
+      return incomplete(start);
     }
     const frame = buffer.slice(start, start + frameLength);
     if (!this.hasValidChecksum(frame)) {
-      return {
-        status: FrameReadStatus.CORRUPT,
-        consumedBytes: start + 1
-      };
+      return corrupt(start + 1);
     }
-    return {
-      status: FrameReadStatus.COMPLETE,
-      consumedBytes: start + frameLength,
-      frame
-    };
+    return complete(frame, start + frameLength);
   }
   findStart(buffer) {
     for (let index = 0; index + 2 < buffer.length; index++) {

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

@@ -1 +1 @@
-{"version":3,"names":["FrameReadStatus","hexToByte","START","TYPE_GET","TYPE_UPLOAD","TYPE_INDEX","CHECKSUM_BYTES","A606FrameReader","readFrame","buffer","start","findStart","status","INCOMPLETE","consumedBytes","Math","max","length","type","frameLength","CORRUPT","frame","slice","hasValidChecksum","COMPLETE","index","checksumIndex","checksum","reduce","sum","byte"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/a606/a606.frame-reader.ts"],"mappings":";;AACA,SAASA,eAAe,QAAQ,qCAAkC;AAElE,SAASC,SAAS,QAAQ,+BAA4B;AAEtD,MAAMC,KAAK,GAAG,IAAI;AAClB,MAAMC,QAAQ,GAAG,IAAI;AACrB,MAAMC,WAAW,GAAG,IAAI;AACxB,MAAMC,UAAU,GAAG,CAAC;AACpB,MAAMC,cAAc,GAAG,CAAC;;AAExB;AACA,OAAO,MAAMC,eAAe,CAAwB;EAC3CC,SAASA,CAACC,MAAyB,EAAmB;IAC3D,MAAMC,KAAK,GAAG,IAAI,CAACC,SAAS,CAACF,MAAM,CAAC;IAEpC,IAAIC,KAAK,GAAG,CAAC,EAAE;MACb,OAAO;QACLE,MAAM,EAAEZ,eAAe,CAACa,UAAU;QAClCC,aAAa,EAAEC,IAAI,CAACC,GAAG,CAAC,CAAC,EAAEP,MAAM,CAACQ,MAAM,GAAG,CAAC;MAC9C,CAAC;IACH;IAEA,MAAMC,IAAI,GAAGjB,SAAS,CAACQ,MAAM,CAACC,KAAK,GAAGL,UAAU,CAAC,IAAI,IAAI,CAAC;IAC1D,MAAMc,WAAW,GAAGD,IAAI,KAAKd,WAAW,GAAG,EAAE,GAAGc,IAAI,KAAKf,QAAQ,GAAG,CAAC,GAAG,CAAC;IAEzE,IAAIgB,WAAW,KAAK,CAAC,EAAE;MAErB,OAAO;QACLP,MAAM,EAAEZ,eAAe,CAACoB,OAAO;QAC/BN,aAAa,EAAEJ,KAAK,GAAG;MACzB,CAAC;IACH;IAEA,IAAIA,KAAK,GAAGS,WAAW,GAAGV,MAAM,CAACQ,MAAM,EAAE;MACvC,OAAO;QAAEL,MAAM,EAAEZ,eAAe,CAACa,UAAU;QAAEC,aAAa,EAAEJ;MAAM,CAAC;IACrE;IAEA,MAAMW,KAAK,GAAGZ,MAAM,CAACa,KAAK,CAACZ,KAAK,EAAEA,KAAK,GAAGS,WAAW,CAAC;IAEtD,IAAI,CAAC,IAAI,CAACI,gBAAgB,CAACF,KAAK,CAAC,EAAE;MACjC,OAAO;QACLT,MAAM,EAAEZ,eAAe,CAACoB,OAAO;QAC/BN,aAAa,EAAEJ,KAAK,GAAG;MACzB,CAAC;IACH;IAEA,OAAO;MACLE,MAAM,EAAEZ,eAAe,CAACwB,QAAQ;MAChCV,aAAa,EAAEJ,KAAK,GAAGS,WAAW;MAClCE;IACF,CAAC;EACH;EAEQV,SAASA,CAACF,MAAyB,EAAU;IACnD,KAAK,IAAIgB,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAG,CAAC,GAAGhB,MAAM,CAACQ,MAAM,EAAEQ,KAAK,EAAE,EAAE;MACtD,MAAMP,IAAI,GAAGjB,SAAS,CAACQ,MAAM,CAACgB,KAAK,GAAGpB,UAAU,CAAC,IAAI,IAAI,CAAC;MAE1D,IAAIJ,SAAS,CAACQ,MAAM,CAACgB,KAAK,CAAC,IAAI,IAAI,CAAC,KAAKvB,KAAK,KAAKgB,IAAI,KAAKf,QAAQ,IAAIe,IAAI,KAAKd,WAAW,CAAC,EAAE;QAC7F,OAAOqB,KAAK;MACd;IACF;IAEA,OAAO,CAAC,CAAC;EACX;EAEQF,gBAAgBA,CAACF,KAAwB,EAAW;IAC1D,MAAMK,aAAa,GAAGL,KAAK,CAACJ,MAAM,GAAGX,cAAc;IAEnD,MAAMqB,QAAQ,GAAGN,KAAK,CACnBC,KAAK,CAAC,CAAC,EAAEI,aAAa,CAAC,CACvBE,MAAM,CAAC,CAACC,GAAG,EAAEC,IAAI,KAAMD,GAAG,GAAG5B,SAAS,CAAC6B,IAAI,CAAC,GAAI,IAAI,EAAE,CAAC,CAAC;IAE3D,OAAOH,QAAQ,KAAK1B,SAAS,CAACoB,KAAK,CAACK,aAAa,CAAC,IAAI,IAAI,CAAC;EAC7D;AACF","ignoreList":[]}
+{"version":3,"names":["complete","corrupt","incomplete","noFrameStart","hexToByte","START","TYPE_GET","TYPE_UPLOAD","TYPE_INDEX","CHECKSUM_BYTES","A606FrameReader","readFrame","buffer","start","findStart","type","frameLength","length","frame","slice","hasValidChecksum","index","checksumIndex","checksum","reduce","sum","byte"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/a606/a606.frame-reader.ts"],"mappings":";;AAEA,SAASA,QAAQ,EAAEC,OAAO,EAAEC,UAAU,EAAEC,YAAY,QAAQ,sCAAmC;AAC/F,SAASC,SAAS,QAAQ,+BAA4B;AAEtD,MAAMC,KAAK,GAAG,IAAI;AAClB,MAAMC,QAAQ,GAAG,IAAI;AACrB,MAAMC,WAAW,GAAG,IAAI;AACxB,MAAMC,UAAU,GAAG,CAAC;AACpB,MAAMC,cAAc,GAAG,CAAC;;AAExB;AACA,OAAO,MAAMC,eAAe,CAAwB;EAC3CC,SAASA,CAACC,MAAyB,EAAmB;IAC3D,MAAMC,KAAK,GAAG,IAAI,CAACC,SAAS,CAACF,MAAM,CAAC;IAEpC,IAAIC,KAAK,GAAG,CAAC,EAAE;MACb,OAAOV,YAAY,CAACS,MAAM,CAAC;IAC7B;IAEA,MAAMG,IAAI,GAAGX,SAAS,CAACQ,MAAM,CAACC,KAAK,GAAGL,UAAU,CAAC,IAAI,IAAI,CAAC;IAC1D,MAAMQ,WAAW,GAAGD,IAAI,KAAKR,WAAW,GAAG,EAAE,GAAGQ,IAAI,KAAKT,QAAQ,GAAG,CAAC,GAAG,CAAC;IAEzE,IAAIU,WAAW,KAAK,CAAC,EAAE;MAErB,OAAOf,OAAO,CAACY,KAAK,GAAG,CAAC,CAAC;IAC3B;IAEA,IAAIA,KAAK,GAAGG,WAAW,GAAGJ,MAAM,CAACK,MAAM,EAAE;MACvC,OAAOf,UAAU,CAACW,KAAK,CAAC;IAC1B;IAEA,MAAMK,KAAK,GAAGN,MAAM,CAACO,KAAK,CAACN,KAAK,EAAEA,KAAK,GAAGG,WAAW,CAAC;IAEtD,IAAI,CAAC,IAAI,CAACI,gBAAgB,CAACF,KAAK,CAAC,EAAE;MACjC,OAAOjB,OAAO,CAACY,KAAK,GAAG,CAAC,CAAC;IAC3B;IAEA,OAAOb,QAAQ,CAACkB,KAAK,EAAEL,KAAK,GAAGG,WAAW,CAAC;EAC7C;EAEQF,SAASA,CAACF,MAAyB,EAAU;IACnD,KAAK,IAAIS,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAG,CAAC,GAAGT,MAAM,CAACK,MAAM,EAAEI,KAAK,EAAE,EAAE;MACtD,MAAMN,IAAI,GAAGX,SAAS,CAACQ,MAAM,CAACS,KAAK,GAAGb,UAAU,CAAC,IAAI,IAAI,CAAC;MAE1D,IAAIJ,SAAS,CAACQ,MAAM,CAACS,KAAK,CAAC,IAAI,IAAI,CAAC,KAAKhB,KAAK,KAAKU,IAAI,KAAKT,QAAQ,IAAIS,IAAI,KAAKR,WAAW,CAAC,EAAE;QAC7F,OAAOc,KAAK;MACd;IACF;IAEA,OAAO,CAAC,CAAC;EACX;EAEQD,gBAAgBA,CAACF,KAAwB,EAAW;IAC1D,MAAMI,aAAa,GAAGJ,KAAK,CAACD,MAAM,GAAGR,cAAc;IAEnD,MAAMc,QAAQ,GAAGL,KAAK,CACnBC,KAAK,CAAC,CAAC,EAAEG,aAAa,CAAC,CACvBE,MAAM,CAAC,CAACC,GAAG,EAAEC,IAAI,KAAMD,GAAG,GAAGrB,SAAS,CAACsB,IAAI,CAAC,GAAI,IAAI,EAAE,CAAC,CAAC;IAE3D,OAAOH,QAAQ,KAAKnB,SAAS,CAACc,KAAK,CAACI,aAAa,CAAC,IAAI,IAAI,CAAC;EAC7D;AACF","ignoreList":[]}

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

@@ -2,31 +2,22 @@
 
 import { IntegratedDevices } from "../../../types/integrated-devices.js";
 import { BTManagedDevice } from "../bt-managed-device.js";
+import { monitorService } from "../monitor-service.js";
 import { AND_MEDICAL } from "./and-medical.protocol.js";
 import { AndMedicalSequencer } from "./and-medical.sequencer.js";
-const noCases = {
-  caseValuePosition: [],
-  cases: []
-};
-const monitorServices = [{
+const monitorServices = [monitorService({
   uuid: AND_MEDICAL.bloodPressureService,
-  monitorUuids: [{
-    uuid: AND_MEDICAL.bloodPressureMeasurement,
-    parsingModel: noCases
-  }]
-}];
+  notify: AND_MEDICAL.bloodPressureMeasurement
+})];
 
 /**
  * MedM enables the record indication just after the clock write; the SDK subscribes every
  * declared characteristic at discovery, so here it is enabled just before it.
  */
-const scaleServices = [{
+const scaleServices = [monitorService({
   uuid: AND_MEDICAL.scaleService,
-  monitorUuids: [{
-    uuid: AND_MEDICAL.scaleRecord,
-    parsingModel: noCases
-  }]
-}];
+  notify: AND_MEDICAL.scaleRecord
+})];
 const KIND = {
   [IntegratedDevices.AND_BPM]: "bpm",
   [IntegratedDevices.AND_BPM_CTS]: "bpmCts",
@@ -36,22 +27,18 @@ const KIND = {
 /** A&D Medical blood-pressure monitors and the UC-352BLE scale. */
 class AndMedicalDeviceClass extends BTManagedDevice {
   stuckDataTimeout = 90_000;
-  onStreamStart = undefined;
   constructor(device, params) {
     super(device, params);
     const kind = KIND[params.deviceName];
     this.mainServices = kind === "scale" ? scaleServices : monitorServices;
     this.createCommandSequencer = () => new AndMedicalSequencer({
       kind,
-      onResult: result => this.onResult?.(result)
+      onResult: this.reportResult
     });
   }
 
   /** One indication is one record. */
   validatePackage = () => true;
-  handleSuccessResult() {
-    return;
-  }
 }
 export { AndMedicalDeviceClass as AndMedicalDevice };
 //# sourceMappingURL=and-medical.device.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["IntegratedDevices","BTManagedDevice","AND_MEDICAL","AndMedicalSequencer","noCases","caseValuePosition","cases","monitorServices","uuid","bloodPressureService","monitorUuids","bloodPressureMeasurement","parsingModel","scaleServices","scaleService","scaleRecord","KIND","AND_BPM","AND_BPM_CTS","AND_SCALE","AndMedicalDeviceClass","stuckDataTimeout","onStreamStart","undefined","constructor","device","params","kind","deviceName","mainServices","createCommandSequencer","onResult","result","validatePackage","handleSuccessResult","AndMedicalDevice"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/and-medical/and-medical.device.ts"],"mappings":";;AAIA,SAASA,iBAAiB,QAAQ,sCAAmC;AAGrE,SAASC,eAAe,QAAQ,yBAAsB;AAEtD,SAASC,WAAW,QAAQ,2BAAwB;AACpD,SAAyBC,mBAAmB,QAAQ,4BAAyB;AAO7E,MAAMC,OAAO,GAAG;EAAEC,iBAAiB,EAAE,EAAE;EAAEC,KAAK,EAAE;AAAG,CAAC;AAEpD,MAAMC,eAA2B,GAAG,CAClC;EACEC,IAAI,EAAEN,WAAW,CAACO,oBAAoB;EACtCC,YAAY,EAAE,CAAC;IAAEF,IAAI,EAAEN,WAAW,CAACS,wBAAwB;IAAEC,YAAY,EAAER;EAAQ,CAAC;AACtF,CAAC,CACF;;AAED;AACA;AACA;AACA;AACA,MAAMS,aAAyB,GAAG,CAChC;EACEL,IAAI,EAAEN,WAAW,CAACY,YAAY;EAC9BJ,YAAY,EAAE,CAAC;IAAEF,IAAI,EAAEN,WAAW,CAACa,WAAW;IAAEH,YAAY,EAAER;EAAQ,CAAC;AACzE,CAAC,CACF;AAED,MAAMY,IAA8C,GAAG;EACrD,CAAChB,iBAAiB,CAACiB,OAAO,GAAG,KAAK;EAClC,CAACjB,iBAAiB,CAACkB,WAAW,GAAG,QAAQ;EACzC,CAAClB,iBAAiB,CAACmB,SAAS,GAAG;AACjC,CAAC;;AAED;AACA,MAAMC,qBAAqB,SAASnB,eAAe,CAAmB;EAE1DoB,gBAAgB,GAAG,MAAM;EACzBC,aAAa,GAAGC,SAAS;EAE5BC,WAAWA,CAACC,MAAc,EAAEC,MAA4C,EAAE;IAC/E,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IACrB,MAAMC,IAAI,GAAGX,IAAI,CAACU,MAAM,CAACE,UAAU,CAAC;IAEpC,IAAI,CAACC,YAAY,GAAGF,IAAI,KAAK,OAAO,GAAGd,aAAa,GAAGN,eAAe;IACtE,IAAI,CAACuB,sBAAsB,GAAG,MAC5B,IAAI3B,mBAAmB,CAAC;MACtBwB,IAAI;MACJI,QAAQ,EAAGC,MAAM,IACf,IAAI,CAACD,QAAQ,GACXC,MACF;IACJ,CAAC,CAAC;EACN;;EAEA;EACUC,eAAe,GAAGA,CAAA,KAAe,IAAI;EAErCC,mBAAmBA,CAAA,EAAS;IACpC;EACF;AACF;AAEA,SAASd,qBAAqB,IAAIe,gBAAgB","ignoreList":[]}
+{"version":3,"names":["IntegratedDevices","BTManagedDevice","monitorService","AND_MEDICAL","AndMedicalSequencer","monitorServices","uuid","bloodPressureService","notify","bloodPressureMeasurement","scaleServices","scaleService","scaleRecord","KIND","AND_BPM","AND_BPM_CTS","AND_SCALE","AndMedicalDeviceClass","stuckDataTimeout","constructor","device","params","kind","deviceName","mainServices","createCommandSequencer","onResult","reportResult","validatePackage","AndMedicalDevice"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/and-medical/and-medical.device.ts"],"mappings":";;AAGA,SAASA,iBAAiB,QAAQ,sCAAmC;AAErE,SAASC,eAAe,QAAQ,yBAAsB;AACtD,SAASC,cAAc,QAAQ,uBAAoB;AAEnD,SAASC,WAAW,QAAQ,2BAAwB;AACpD,SAAyBC,mBAAmB,QAAQ,4BAAyB;AAO7E,MAAMC,eAA2B,GAAG,CAClCH,cAAc,CAAC;EAAEI,IAAI,EAAEH,WAAW,CAACI,oBAAoB;EAAEC,MAAM,EAAEL,WAAW,CAACM;AAAyB,CAAC,CAAC,CACzG;;AAED;AACA;AACA;AACA;AACA,MAAMC,aAAyB,GAAG,CAChCR,cAAc,CAAC;EAAEI,IAAI,EAAEH,WAAW,CAACQ,YAAY;EAAEH,MAAM,EAAEL,WAAW,CAACS;AAAY,CAAC,CAAC,CACpF;AAED,MAAMC,IAA8C,GAAG;EACrD,CAACb,iBAAiB,CAACc,OAAO,GAAG,KAAK;EAClC,CAACd,iBAAiB,CAACe,WAAW,GAAG,QAAQ;EACzC,CAACf,iBAAiB,CAACgB,SAAS,GAAG;AACjC,CAAC;;AAED;AACA,MAAMC,qBAAqB,SAAShB,eAAe,CAAmB;EAE1DiB,gBAAgB,GAAG,MAAM;EAE5BC,WAAWA,CAACC,MAAc,EAAEC,MAA4C,EAAE;IAC/E,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IACrB,MAAMC,IAAI,GAAGT,IAAI,CAACQ,MAAM,CAACE,UAAU,CAAC;IAEpC,IAAI,CAACC,YAAY,GAAGF,IAAI,KAAK,OAAO,GAAGZ,aAAa,GAAGL,eAAe;IACtE,IAAI,CAACoB,sBAAsB,GAAG,MAC5B,IAAIrB,mBAAmB,CAAC;MACtBkB,IAAI;MACJI,QAAQ,EAAE,IAAI,CAACC;IACjB,CAAC,CAAC;EACN;;EAEA;EACUC,eAAe,GAAGA,CAAA,KAAe,IAAI;AAEjD;AAEA,SAASX,qBAAqB,IAAIY,gBAAgB","ignoreList":[]}

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

@@ -2,8 +2,10 @@
 
 /* eslint-disable import/group-exports */
 
+import { bytesToHex } from "../../../utils/bytes-to-hex.js";
 import { decodeMedicalFloat } from "../../../utils/decode-medical-float.js";
-import { hexToByte } from "../../../utils/hex-to-byte.js";
+import { frameBytes } from "../../../utils/frame-bytes.js";
+import { sigUuid } from "../../../utils/sig-uuid.js";
 import { bloodPressureStatusFromFrame, recordedAtFromBloodPressureFrame } from "../standard-gatt/standard-gatt.profile.js";
 
 /**
@@ -15,13 +17,12 @@ import { bloodPressureStatusFromFrame, recordedAtFromBloodPressureFrame } from "
  * the UA-1200BLE/UB-1100BLE. The scale takes A&D command frames (`length type command payload`,
  * no checksum) on 233bf001 and indicates 10-byte weight records on 23434101.
  */
-const sig16 = assigned => `0000${assigned}-0000-1000-8000-00805f9b34fb`;
 export const AND_MEDICAL = {
-  bloodPressureService: sig16("1810"),
-  bloodPressureMeasurement: sig16("2a35"),
-  dateTime: sig16("2a08"),
-  currentTimeService: sig16("1805"),
-  currentTime: sig16("2a2b"),
+  bloodPressureService: sigUuid("1810"),
+  bloodPressureMeasurement: sigUuid("2a35"),
+  dateTime: sigUuid("2a08"),
+  currentTimeService: sigUuid("1805"),
+  currentTime: sigUuid("2a2b"),
   commandService: "233bf000-5a34-1b6d-975c-000d5690abe4",
   command: "233bf001-5a34-1b6d-975c-000d5690abe4",
   scaleService: "23434100-1fe4-1eff-80cb-00ff78297d8b",
@@ -29,13 +30,12 @@ export const AND_MEDICAL = {
 };
 const POUND_IN_KG = 0.45359237;
 const KPA_IN_MMHG = 7.500617;
-const toHex = bytes => bytes.map(value => (value & 0xff).toString(16).padStart(2, "0"));
 
 /** SIG Date Time, phone-local: year (u16 LE), month, day, hour, minute, second. */
-export const dateTimeCommand = now => toHex([now.getFullYear() & 0xff, now.getFullYear() >> 8, now.getMonth() + 1, now.getDate(), now.getHours(), now.getMinutes(), now.getSeconds()]);
+export const dateTimeCommand = now => bytesToHex([now.getFullYear() & 0xff, now.getFullYear() >> 8, now.getMonth() + 1, now.getDate(), now.getHours(), now.getMinutes(), now.getSeconds()]);
 
 /** A&D set-time frame for the scale: `08 01 01 YY MM DD hh mm ss`, binary, phone-local. */
-export const scaleSetTimeCommand = now => toHex([0x08, 0x01, 0x01, now.getFullYear() % 100, now.getMonth() + 1, now.getDate(), now.getHours(), now.getMinutes(), now.getSeconds()]);
+export const scaleSetTimeCommand = now => bytesToHex([0x08, 0x01, 0x01, now.getFullYear() % 100, now.getMonth() + 1, now.getDate(), now.getHours(), now.getMinutes(), now.getSeconds()]);
 const sfloat = (bytes, at) => at + 1 < bytes.length ? decodeMedicalFloat((bytes[at] ?? 0) | (bytes[at + 1] ?? 0) << 8, 4, 12) : undefined;
 
 /**
@@ -44,7 +44,7 @@ const sfloat = (bytes, at) => at + 1 < bytes.length ? decodeMedicalFloat((bytes[
  * status bit 2 is the irregular pulse. A record without both pressures is dropped.
  */
 export const readBloodPressure = frame => {
-  const bytes = frame.map(byte => hexToByte(byte));
+  const bytes = frameBytes(frame);
   const flags = bytes[0] ?? 0;
   const unit = (flags & 0x01) !== 0 ? KPA_IN_MMHG : 1;
   const systolic = sfloat(bytes, 1);
@@ -89,7 +89,7 @@ const readDateTime = (bytes, at) => {
  * are converted to kilograms. A record too short to carry a time uses the phone's, as MedM does.
  */
 export const readWeight = (frame, now) => {
-  const bytes = frame.map(byte => hexToByte(byte));
+  const bytes = frameBytes(frame);
   const raw = (bytes[1] ?? 0) | (bytes[2] ?? 0) << 8;
   if (bytes.length < 3 || raw === 0 || raw === 0xffff) {
     return undefined;

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

@@ -1 +1 @@
-{"version":3,"names":["decodeMedicalFloat","hexToByte","bloodPressureStatusFromFrame","recordedAtFromBloodPressureFrame","sig16","assigned","AND_MEDICAL","bloodPressureService","bloodPressureMeasurement","dateTime","currentTimeService","currentTime","commandService","command","scaleService","scaleRecord","POUND_IN_KG","KPA_IN_MMHG","toHex","bytes","map","value","toString","padStart","dateTimeCommand","now","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","scaleSetTimeCommand","sfloat","at","length","undefined","readBloodPressure","frame","byte","flags","unit","systolic","diastolic","recordedAt","cursor","heartRate","user","status","Math","round","irregularHeartbeat","memorySlot","readDateTime","low","high","month","day","hour","minute","second","slice","year","date","Date","readWeight","raw","bodyWeight"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/and-medical/and-medical.protocol.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["bytesToHex","decodeMedicalFloat","frameBytes","sigUuid","bloodPressureStatusFromFrame","recordedAtFromBloodPressureFrame","AND_MEDICAL","bloodPressureService","bloodPressureMeasurement","dateTime","currentTimeService","currentTime","commandService","command","scaleService","scaleRecord","POUND_IN_KG","KPA_IN_MMHG","dateTimeCommand","now","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","scaleSetTimeCommand","sfloat","bytes","at","length","undefined","readBloodPressure","frame","flags","unit","systolic","diastolic","recordedAt","cursor","heartRate","user","status","Math","round","irregularHeartbeat","memorySlot","readDateTime","low","high","month","day","hour","minute","second","slice","year","date","Date","readWeight","raw","value","bodyWeight"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/and-medical/and-medical.protocol.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/aoj/aoj-70b.device.js

@@ -2,36 +2,27 @@
 
 import { BTManagedDevice } from "../bt-managed-device.js";
 import { AOJ_VALUES, LiveOximeterSequencer, readOximeterData } from "../live-oximeter.sequencer.js";
+import { monitorService } from "../monitor-service.js";
 import { AOJ_BP } from "./aoj-bp.protocol.js";
-const aoj70bMainServices = [{
+const aoj70bMainServices = [monitorService({
   uuid: AOJ_BP.service,
-  monitorUuids: [{
-    uuid: AOJ_BP.notify,
-    parsingModel: {
-      caseValuePosition: [],
-      cases: []
-    }
-  }]
-}];
+  notify: AOJ_BP.notify
+})];
 
 /** The AOJ-70A/70B pulse oximeter: live values only, reported as one spot reading. */
 class Aoj70bDevice extends BTManagedDevice {
   mainServices = aoj70bMainServices;
   stuckDataTimeout = 120_000;
-  onStreamStart = undefined;
   constructor(device, params) {
     super(device, params);
     this.createCommandSequencer = () => new LiveOximeterSequencer({
       readValues: frame => readOximeterData(frame, AOJ_VALUES),
-      onResult: result => this.onResult?.(result)
+      onResult: this.reportResult
     });
   }
 
   /** One notification is one packet. */
   validatePackage = () => true;
-  handleSuccessResult() {
-    return;
-  }
 }
 export { Aoj70bDevice };
 //# sourceMappingURL=aoj-70b.device.js.map

package/lib/module/modules/bt-management/services/devices/aoj/aoj-70b.device.js.map

@@ -1 +1 @@
-{"version":3,"names":["BTManagedDevice","AOJ_VALUES","LiveOximeterSequencer","readOximeterData","AOJ_BP","aoj70bMainServices","uuid","service","monitorUuids","notify","parsingModel","caseValuePosition","cases","Aoj70bDevice","mainServices","stuckDataTimeout","onStreamStart","undefined","constructor","device","params","createCommandSequencer","readValues","frame","onResult","result","validatePackage","handleSuccessResult"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj-70b.device.ts"],"mappings":";;AAOA,SAASA,eAAe,QAAQ,yBAAsB;AACtD,SAASC,UAAU,EAAEC,qBAAqB,EAAEC,gBAAgB,QAAQ,+BAA4B;AAEhG,SAASC,MAAM,QAAQ,sBAAmB;AAE1C,MAAMC,kBAA8B,GAAG,CACrC;EACEC,IAAI,EAAEF,MAAM,CAACG,OAAO;EACpBC,YAAY,EAAE,CAAC;IAAEF,IAAI,EAAEF,MAAM,CAACK,MAAM;IAAEC,YAAY,EAAE;MAAEC,iBAAiB,EAAE,EAAE;MAAEC,KAAK,EAAE;IAAG;EAAE,CAAC;AAC5F,CAAC,CACF;;AAED;AACA,MAAMC,YAAY,SAASb,eAAe,CAA4B;EAC1Dc,YAAY,GAAGT,kBAAkB;EACjCU,gBAAgB,GAAG,OAAO;EAC1BC,aAAa,GAAGC,SAAS;EAE5BC,WAAWA,CAACC,MAAc,EAAEC,MAAqD,EAAE;IACxF,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IACrB,IAAI,CAACC,sBAAsB,GAAG,MAC5B,IAAInB,qBAAqB,CAAC;MACxBoB,UAAU,EAAGC,KAAK,IAAKpB,gBAAgB,CAACoB,KAAK,EAAEtB,UAAU,CAAC;MAC1DuB,QAAQ,EAAGC,MAAM,IACf,IAAI,CAACD,QAAQ,GACXC,MAGF;IACJ,CAAC,CAAC;EACN;;EAEA;EACUC,eAAe,GAAGA,CAAA,KAAe,IAAI;EAErCC,mBAAmBA,CAAA,EAAS;IACpC;EACF;AACF;AAEA,SAASd,YAAY","ignoreList":[]}
+{"version":3,"names":["BTManagedDevice","AOJ_VALUES","LiveOximeterSequencer","readOximeterData","monitorService","AOJ_BP","aoj70bMainServices","uuid","service","notify","Aoj70bDevice","mainServices","stuckDataTimeout","constructor","device","params","createCommandSequencer","readValues","frame","onResult","reportResult","validatePackage"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj-70b.device.ts"],"mappings":";;AAKA,SAASA,eAAe,QAAQ,yBAAsB;AACtD,SAASC,UAAU,EAAEC,qBAAqB,EAAEC,gBAAgB,QAAQ,+BAA4B;AAChG,SAASC,cAAc,QAAQ,uBAAoB;AAEnD,SAASC,MAAM,QAAQ,sBAAmB;AAE1C,MAAMC,kBAA8B,GAAG,CACrCF,cAAc,CAAC;EAAEG,IAAI,EAAEF,MAAM,CAACG,OAAO;EAAEC,MAAM,EAAEJ,MAAM,CAACI;AAAO,CAAC,CAAC,CAChE;;AAED;AACA,MAAMC,YAAY,SAASV,eAAe,CAA4B;EAC1DW,YAAY,GAAGL,kBAAkB;EACjCM,gBAAgB,GAAG,OAAO;EAE7BC,WAAWA,CAACC,MAAc,EAAEC,MAAqD,EAAE;IACxF,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IACrB,IAAI,CAACC,sBAAsB,GAAG,MAC5B,IAAId,qBAAqB,CAAC;MACxBe,UAAU,EAAGC,KAAK,IAAKf,gBAAgB,CAACe,KAAK,EAAEjB,UAAU,CAAC;MAC1DkB,QAAQ,EAAE,IAAI,CAACC;IACjB,CAAC,CAAC;EACN;;EAEA;EACUC,eAAe,GAAGA,CAAA,KAAe,IAAI;AAEjD;AAEA,SAASX,YAAY","ignoreList":[]}

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

@@ -2,24 +2,17 @@
 
 import { IntegratedDevices } from "../../../types/integrated-devices.js";
 import { BTManagedDevice } from "../bt-managed-device.js";
+import { monitorService } from "../monitor-service.js";
 import { AOJ_BP, AOJ_BP_FFF0, AojBpFrameReader } from "./aoj-bp.protocol.js";
 import { AojBpSequencer } from "./aoj-bp.sequencer.js";
-const passThrough = {
-  caseValuePosition: [],
-  cases: []
-};
-const servicesFor = gatt => [{
+const servicesFor = gatt => [monitorService({
   uuid: gatt.service,
-  monitorUuids: [{
-    uuid: gatt.notify,
-    parsingModel: passThrough
-  }]
-}];
+  notify: gatt.notify
+})];
 
 /** AOJ Medical blood-pressure monitors; the FFF0 variant is the Cazon BSX530B. */
 class AojBpDeviceClass extends BTManagedDevice {
   stuckDataTimeout = 90_000;
-  onStreamStart = undefined;
   constructor(device, params) {
     super(device, params);
     const fff0 = params.deviceName === IntegratedDevices.AOJ_BPM_FFF0;
@@ -30,12 +23,9 @@ class AojBpDeviceClass extends BTManagedDevice {
       service: gatt.service,
       write: gatt.write,
       listenOnly: fff0,
-      onResult: result => this.onResult?.(result)
+      onResult: this.reportResult
     });
   }
-  handleSuccessResult() {
-    return;
-  }
 }
 export { AojBpDeviceClass as AojBpDevice };
 //# sourceMappingURL=aoj-bp.device.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["IntegratedDevices","BTManagedDevice","AOJ_BP","AOJ_BP_FFF0","AojBpFrameReader","AojBpSequencer","passThrough","caseValuePosition","cases","servicesFor","gatt","uuid","service","monitorUuids","notify","parsingModel","AojBpDeviceClass","stuckDataTimeout","onStreamStart","undefined","constructor","device","params","fff0","deviceName","AOJ_BPM_FFF0","mainServices","frameReader","createCommandSequencer","write","listenOnly","onResult","result","handleSuccessResult","AojBpDevice"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj-bp.device.ts"],"mappings":";;AAIA,SAASA,iBAAiB,QAAQ,sCAAmC;AAGrE,SAASC,eAAe,QAAQ,yBAAsB;AAEtD,SAASC,MAAM,EAAEC,WAAW,EAAEC,gBAAgB,QAAQ,sBAAmB;AACzE,SAASC,cAAc,QAAQ,uBAAoB;AAInD,MAAMC,WAAW,GAAG;EAAEC,iBAAiB,EAAE,EAAE;EAAEC,KAAK,EAAE;AAAG,CAAC;AAExD,MAAMC,WAAW,GAAIC,IAAyC,IAAiB,CAC7E;EAAEC,IAAI,EAAED,IAAI,CAACE,OAAO;EAAEC,YAAY,EAAE,CAAC;IAAEF,IAAI,EAAED,IAAI,CAACI,MAAM;IAAEC,YAAY,EAAET;EAAY,CAAC;AAAE,CAAC,CACzF;;AAED;AACA,MAAMU,gBAAgB,SAASf,eAAe,CAAc;EAEhDgB,gBAAgB,GAAG,MAAM;EACzBC,aAAa,GAAGC,SAAS;EAE5BC,WAAWA,CAACC,MAAc,EAAEC,MAAuC,EAAE;IAC1E,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IAErB,MAAMC,IAAI,GAAGD,MAAM,CAACE,UAAU,KAAKxB,iBAAiB,CAACyB,YAAY;IACjE,MAAMf,IAAI,GAAGa,IAAI,GAAGpB,WAAW,GAAGD,MAAM;IAExC,IAAI,CAACwB,YAAY,GAAGjB,WAAW,CAACC,IAAI,CAAC;IACrC,IAAI,CAACiB,WAAW,GAAG,IAAIvB,gBAAgB,CAAC,CAAC;IACzC,IAAI,CAACwB,sBAAsB,GAAG,MAC5B,IAAIvB,cAAc,CAAC;MACjBO,OAAO,EAAEF,IAAI,CAACE,OAAO;MACrBiB,KAAK,EAAEnB,IAAI,CAACmB,KAAK;MACjBC,UAAU,EAAEP,IAAI;MAChBQ,QAAQ,EAAGC,MAAM,IACf,IAAI,CAACD,QAAQ,GACXC,MACF;IACJ,CAAC,CAAC;EACN;EAEUC,mBAAmBA,CAAA,EAAS;IACpC;EACF;AACF;AAEA,SAASjB,gBAAgB,IAAIkB,WAAW","ignoreList":[]}
+{"version":3,"names":["IntegratedDevices","BTManagedDevice","monitorService","AOJ_BP","AOJ_BP_FFF0","AojBpFrameReader","AojBpSequencer","servicesFor","gatt","uuid","service","notify","AojBpDeviceClass","stuckDataTimeout","constructor","device","params","fff0","deviceName","AOJ_BPM_FFF0","mainServices","frameReader","createCommandSequencer","write","listenOnly","onResult","reportResult","AojBpDevice"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj-bp.device.ts"],"mappings":";;AAGA,SAASA,iBAAiB,QAAQ,sCAAmC;AAErE,SAASC,eAAe,QAAQ,yBAAsB;AACtD,SAASC,cAAc,QAAQ,uBAAoB;AAEnD,SAASC,MAAM,EAAEC,WAAW,EAAEC,gBAAgB,QAAQ,sBAAmB;AACzE,SAASC,cAAc,QAAQ,uBAAoB;AAInD,MAAMC,WAAW,GAAIC,IAAyC,IAAiB,CAC7EN,cAAc,CAAC;EAAEO,IAAI,EAAED,IAAI,CAACE,OAAO;EAAEC,MAAM,EAAEH,IAAI,CAACG;AAAO,CAAC,CAAC,CAC5D;;AAED;AACA,MAAMC,gBAAgB,SAASX,eAAe,CAAc;EAEhDY,gBAAgB,GAAG,MAAM;EAE5BC,WAAWA,CAACC,MAAc,EAAEC,MAAuC,EAAE;IAC1E,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IAErB,MAAMC,IAAI,GAAGD,MAAM,CAACE,UAAU,KAAKlB,iBAAiB,CAACmB,YAAY;IACjE,MAAMX,IAAI,GAAGS,IAAI,GAAGb,WAAW,GAAGD,MAAM;IAExC,IAAI,CAACiB,YAAY,GAAGb,WAAW,CAACC,IAAI,CAAC;IACrC,IAAI,CAACa,WAAW,GAAG,IAAIhB,gBAAgB,CAAC,CAAC;IACzC,IAAI,CAACiB,sBAAsB,GAAG,MAC5B,IAAIhB,cAAc,CAAC;MACjBI,OAAO,EAAEF,IAAI,CAACE,OAAO;MACrBa,KAAK,EAAEf,IAAI,CAACe,KAAK;MACjBC,UAAU,EAAEP,IAAI;MAChBQ,QAAQ,EAAE,IAAI,CAACC;IACjB,CAAC,CAAC;EACN;AAEF;AAEA,SAASd,gBAAgB,IAAIe,WAAW","ignoreList":[]}

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

@@ -2,9 +2,12 @@
 
 /* eslint-disable import/group-exports */
 
-import { FrameReadStatus } from "../../../types/frame-read-status.js";
+import { bytesToHex } from "../../../utils/bytes-to-hex.js";
 import { calculateCrc8Maxim } from "../../../utils/calculate-crc-8-maxim.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 { sigUuid } from "../../../utils/sig-uuid.js";
 
 /**
  * AOJ Medical's blood-pressure protocol (AOJ-30x/33x, ARM-111, WRS-35E and rebrands), from
@@ -13,18 +16,17 @@ import { hexToByte } from "../../../utils/hex-to-byte.js";
  * Frames are `BE B0` (app to device) or `D0 C2` (device to app), a length counting the command
  * and payload, the command, the payload, and CRC-8/MAXIM over every byte before it.
  */
-const sig16 = assigned => `0000${assigned}-0000-1000-8000-00805f9b34fb`;
 export const AOJ_BP = {
-  service: sig16("ffe0"),
-  notify: sig16("ffe1"),
-  write: sig16("ffe2")
+  service: sigUuid("ffe0"),
+  notify: sigUuid("ffe1"),
+  write: sigUuid("ffe2")
 };
 
 /** The Cazon BSX530B variant: one characteristic for both directions, and a listen-only session. */
 export const AOJ_BP_FFF0 = {
-  service: sig16("fff0"),
-  notify: sig16("fff6"),
-  write: sig16("fff6")
+  service: sigUuid("fff0"),
+  notify: sigUuid("fff6"),
+  write: sigUuid("fff6")
 };
 export const AOJ_COMMAND = {
   ack: 0x00,
@@ -34,13 +36,12 @@ export const AOJ_COMMAND = {
   record: 0xcc
 };
 const DEVICE_HEADER = [0xd0, 0xc2];
-const toHex = bytes => bytes.map(value => (value & 0xff).toString(16).padStart(2, "0"));
 export const frame = (command, payload = []) => {
-  const bytes = toHex([0xbe, 0xb0, payload.length + 1, command, ...payload]);
-  return [...bytes, ...toHex([calculateCrc8Maxim(bytes, bytes.length)])];
+  const bytes = bytesToHex([0xbe, 0xb0, payload.length + 1, command, ...payload]);
+  return [...bytes, ...bytesToHex([calculateCrc8Maxim(bytes, bytes.length)])];
 };
 export const commandOf = received => hexToByte(received[3] ?? "00");
-export const payloadOf = received => received.slice(4, -1).map(byte => hexToByte(byte));
+export const payloadOf = received => frameBytes(received.slice(4, -1));
 export const updateStatusCommand = () => frame(0xb2);
 export const setTimeCommand = now => frame(0xb1, [now.getFullYear() >> 8, now.getFullYear() & 0xff, now.getMonth() + 1, now.getDate(), now.getHours(), now.getMinutes(), now.getSeconds()]);
 export const getSerialCommand = () => frame(0xd6, [0x00]);
@@ -59,36 +60,20 @@ export class AojBpFrameReader {
   readFrame(buffer) {
     const start = buffer.findIndex((byte, index) => hexToByte(byte) === DEVICE_HEADER[0] && (index + 1 >= buffer.length || hexToByte(buffer[index + 1] ?? "00") === DEVICE_HEADER[1]));
     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 = hexToByte(buffer[start + 2] ?? "00") + 4;
     if (start + length > buffer.length) {
-      return {
-        status: FrameReadStatus.INCOMPLETE,
-        consumedBytes: start
-      };
+      return incomplete(start);
     }
     const received = buffer.slice(start, start + length);
     if (calculateCrc8Maxim(received, length - 1) !== hexToByte(received[length - 1] ?? "00")) {
-      return {
-        status: FrameReadStatus.CORRUPT,
-        consumedBytes: start + 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/aoj/aoj-bp.protocol.js.map

@@ -1 +1 @@
-{"version":3,"names":["FrameReadStatus","calculateCrc8Maxim","hexToByte","sig16","assigned","AOJ_BP","service","notify","write","AOJ_BP_FFF0","AOJ_COMMAND","ack","serial","systemInfo","voice","record","DEVICE_HEADER","toHex","bytes","map","value","toString","padStart","frame","command","payload","length","commandOf","received","payloadOf","slice","byte","updateStatusCommand","setTimeCommand","now","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","getSerialCommand","getSystemInfoCommand","setVoiceCommand","getDataCommand","ackCommand","turnOffCommand","AojBpFrameReader","readFrame","buffer","start","findIndex","index","status","INCOMPLETE","consumedBytes","CORRUPT","COMPLETE","readUnsentCount","readBloodPressure","undefined","systolic","diastolic","heartRate","flags","year","user","irregularHeartbeat","recordedAt","Date","memorySlot"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj-bp.protocol.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["bytesToHex","calculateCrc8Maxim","frameBytes","complete","corrupt","incomplete","hexToByte","sigUuid","AOJ_BP","service","notify","write","AOJ_BP_FFF0","AOJ_COMMAND","ack","serial","systemInfo","voice","record","DEVICE_HEADER","frame","command","payload","bytes","length","commandOf","received","payloadOf","slice","updateStatusCommand","setTimeCommand","now","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","getSerialCommand","getSystemInfoCommand","setVoiceCommand","getDataCommand","ackCommand","turnOffCommand","AojBpFrameReader","readFrame","buffer","start","findIndex","byte","index","readUnsentCount","readBloodPressure","undefined","systolic","diastolic","heartRate","flags","year","user","irregularHeartbeat","recordedAt","Date","memorySlot"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj-bp.protocol.ts"],"mappings":"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","ignoreList":[]}

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

@@ -1,6 +1,7 @@
 "use strict";
 
 import { getClockParts, isClockSyncEnabled } from "../../../types/clock-sync.js";
+import { byteToHex } from "../../../utils/bytes-to-hex.js";
 import { hexToByte } from "../../../utils/hex-to-byte.js";
 const COMMAND = {
   SET_TIME: 0xd2,
@@ -14,14 +15,13 @@ const RESPONSE = {
   HISTORY: 0xc3,
   CLEAR_HISTORY: 0xc4
 };
-const toHex = value => (value & 0xff).toString(16).padStart(2, "0");
 const frameFor = (command, payload = []) => {
-  const frame = ["aa", "01", toHex(command), toHex(payload.length), ...payload.map(toHex)];
+  const frame = ["aa", "01", byteToHex(command), byteToHex(payload.length), ...payload.map(byteToHex)];
   let checksum = 0;
   for (let index = 1; index < frame.length; index++) {
     checksum ^= hexToByte(frame[index] ?? "00");
   }
-  return [...frame, toHex(checksum)];
+  return [...frame, byteToHex(checksum)];
 };
 /** Walks AOJ's clock, metadata, history and optional clear exchange. */
 class AojCommandSequencer {

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

@@ -1 +1 @@
-{"version":3,"names":["getClockParts","isClockSyncEnabled","hexToByte","COMMAND","SET_TIME","GET_INFO","GET_HISTORY","CLEAR_HISTORY","RESPONSE","HISTORY","toHex","value","toString","padStart","frameFor","command","payload","frame","length","map","checksum","index","AojCommandSequencer","constructor","params","phase","clockSync","initialCommands","clockPayload","isHistoryTransfer","commandProgress","response","nextCommand","firmwareVersion","finishOrClear","payloadLength","undefined","clearHistory","opcode","write","parts","now","Date","timezone","year","month","day","hours","minutes","AOJ_COMMAND","AOJ_RESPONSE","buildAojFrame"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj.command-sequencer.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["getClockParts","isClockSyncEnabled","byteToHex","hexToByte","COMMAND","SET_TIME","GET_INFO","GET_HISTORY","CLEAR_HISTORY","RESPONSE","HISTORY","frameFor","command","payload","frame","length","map","checksum","index","AojCommandSequencer","constructor","params","phase","clockSync","initialCommands","clockPayload","isHistoryTransfer","commandProgress","response","nextCommand","firmwareVersion","finishOrClear","payloadLength","undefined","clearHistory","opcode","write","parts","now","Date","timezone","year","month","day","hours","minutes","AOJ_COMMAND","AOJ_RESPONSE","buildAojFrame"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj.command-sequencer.ts"],"mappings":"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","ignoreList":[]}

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

@@ -86,7 +86,6 @@ const aojMainServices = [{
 class Aoj20aDevice extends BTManagedDevice {
   mainServices = aojMainServices;
   stuckDataTimeout = STUCK_TIMEOUT_MS;
-  onStreamStart = undefined;
   frameReader = new AojFrameReader();
   constructor(device, params) {
     super(device, params);

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

@@ -1 +1 @@
-{"version":3,"names":["MeasurementTypeKey","CaseType","hexToByte","BTManagedDevice","AojCommandSequencer","AojFrameReader","aojCommandByte","BASE_UUID_SUFFIX","SERVICE","NOTIFY","WRITE","STUCK_TIMEOUT_MS","parseRecordedAt","frame","year","month","day","hours","minutes","recordedAt","Date","every","Number","isFinite","getFullYear","getMonth","getDate","getHours","getMinutes","undefined","decodeAojError","code","messages","acceptEverything","caseValuePosition","cases","caseValue","caseType","RESULT","measurementTypeKey","temperature","parseDefinitions","name","parseType","byteIndexes","customParserDefinition","value","parseInt","minLengthBytes","map","OTHER","aojMainServices","uuid","monitorUuids","parsingModel","writeUuid","mainCommandUuid","Aoj20aDevice","mainServices","stuckDataTimeout","onStreamStart","frameReader","constructor","device","params","clearHistory","clearDeviceHistory","clockSync","createCommandSequencer","write","serviceUuid","characteristicUuid","handleSuccessResult","successResult","collectedValues","command","errorCode","message","onError","Error","onResult","recordingId","getTime"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj.device.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["MeasurementTypeKey","CaseType","hexToByte","BTManagedDevice","AojCommandSequencer","AojFrameReader","aojCommandByte","BASE_UUID_SUFFIX","SERVICE","NOTIFY","WRITE","STUCK_TIMEOUT_MS","parseRecordedAt","frame","year","month","day","hours","minutes","recordedAt","Date","every","Number","isFinite","getFullYear","getMonth","getDate","getHours","getMinutes","undefined","decodeAojError","code","messages","acceptEverything","caseValuePosition","cases","caseValue","caseType","RESULT","measurementTypeKey","temperature","parseDefinitions","name","parseType","byteIndexes","customParserDefinition","value","parseInt","minLengthBytes","map","OTHER","aojMainServices","uuid","monitorUuids","parsingModel","writeUuid","mainCommandUuid","Aoj20aDevice","mainServices","stuckDataTimeout","frameReader","constructor","device","params","clearHistory","clearDeviceHistory","clockSync","createCommandSequencer","write","serviceUuid","characteristicUuid","handleSuccessResult","successResult","collectedValues","command","errorCode","message","onError","Error","onResult","recordingId","getTime"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj.device.ts"],"mappings":"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","ignoreList":[]}