@ovok/native 1.6.23 → 1.6.25

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

@@ -2,6 +2,7 @@
 
 import { BloodPressureStates } from "../../../types/blood-pressure-states.js";
 import { defineCustomDevice } from "../../custom/define-custom-device.js";
+import { bloodPressureStatusFromFrame } from "./standard-gatt.blood-pressure-status.js";
 
 /** Milliseconds a spot-check device may take to produce its reading. */
 const SPOT_CHECK_TIMEOUT_MS = 60_000;
@@ -105,10 +106,8 @@ const decorateBloodPressureReading = (reading, frame, recordOffset) => {
     cursor += 1;
   }
   if ((flags & 0x10) !== 0) {
-    const statusLow = byteAt(frame, cursor, offset);
-    const statusHigh = byteAt(frame, cursor + 1, offset);
-    if (statusLow !== undefined && statusHigh !== undefined) {
-      const status = statusLow | statusHigh << 8;
+    const status = bloodPressureStatusFromFrame(frame, offset);
+    if (status !== undefined) {
       metadata.status = (status & 0x01) !== 0 ? BloodPressureStates.DISTURB_DETECTED : (status & 0x02) !== 0 ? BloodPressureStates.LOOSE_SLEEVE : BloodPressureStates.REGULAR;
       if ((status & 0x04) !== 0) {
         metadata.irregularHeartbeat = true;
@@ -120,5 +119,5 @@ const decorateBloodPressureReading = (reading, frame, recordOffset) => {
     ...metadata
   } : reading;
 };
-export { decorateBloodPressureReading, declareProfile, littleEndian, recordedAtFromBloodPressureFrame, sigUuid };
+export { bloodPressureStatusFromFrame, decorateBloodPressureReading, declareProfile, littleEndian, recordedAtFromBloodPressureFrame, sigUuid };
 //# sourceMappingURL=standard-gatt.profile.js.map

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

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

package/lib/module/modules/bt-management/services/devices/veroval/veroval.bp-monitors.js

@@ -1,6 +1,7 @@
 "use strict";
 
 import { standardBloodPressureDevice } from "../standard-gatt/standard-gatt.devices.js";
+import { bloodPressureStatusFromFrame } from "../standard-gatt/standard-gatt.profile.js";
 
 /**
  * The Veroval compact+ blood-pressure monitors.
@@ -18,9 +19,36 @@ import { standardBloodPressureDevice } from "../standard-gatt/standard-gatt.devi
 
 const BPU_26 = "BPU26";
 const BPW_26 = "BPW26";
+const VEROVAL_TRIPLE_MEASUREMENT = 1 << 13;
+const VEROVAL_ATRIAL_FIBRILLATION = 1 << 14;
+const VEROVAL_RESTING_MEASUREMENT = 1 << 15;
+const verovalStatusDecorator = supportedBits => (reading, frame, recordOffset) => {
+  if (!frame) {
+    return reading;
+  }
+  const status = bloodPressureStatusFromFrame(frame, recordOffset);
+  if (status === undefined) {
+    return reading;
+  }
+  const metadata = {};
+  if ((supportedBits & VEROVAL_TRIPLE_MEASUREMENT) !== 0 && (status & VEROVAL_TRIPLE_MEASUREMENT) !== 0) {
+    metadata.tripleMeasurement = true;
+  }
+  if ((supportedBits & VEROVAL_ATRIAL_FIBRILLATION) !== 0 && (status & VEROVAL_ATRIAL_FIBRILLATION) !== 0) {
+    metadata.atrialFibrillation = true;
+  }
+  if ((supportedBits & VEROVAL_RESTING_MEASUREMENT) !== 0 && (status & VEROVAL_RESTING_MEASUREMENT) !== 0) {
+    metadata.restingMeasurement = true;
+  }
+  return Object.keys(metadata).length > 0 ? {
+    ...reading,
+    ...metadata
+  } : reading;
+};
 const verovalCompactMonitor = (advertisedName, params) => standardBloodPressureDevice({
   id: params.id ?? `veroval-${advertisedName.toLowerCase().replace(/[^a-z0-9]+/g, "-")}`,
   nameMatch: params.nameMatch ?? new RegExp(`^${advertisedName}$`, "i"),
+  decorateReading: advertisedName === BPU_26 ? verovalStatusDecorator(VEROVAL_TRIPLE_MEASUREMENT | VEROVAL_ATRIAL_FIBRILLATION | VEROVAL_RESTING_MEASUREMENT) : verovalStatusDecorator(VEROVAL_TRIPLE_MEASUREMENT),
   ...(params.stuckDataTimeoutMs === undefined ? {} : {
     stuckDataTimeoutMs: params.stuckDataTimeoutMs
   })

package/lib/module/modules/bt-management/services/devices/veroval/veroval.bp-monitors.js.map

@@ -1 +1 @@
-{"version":3,"names":["standardBloodPressureDevice","BPU_26","BPW_26","verovalCompactMonitor","advertisedName","params","id","toLowerCase","replace","nameMatch","RegExp","stuckDataTimeoutMs","undefined","bpu26Monitor","bpw26Monitor","VEROVAL_BP_MODEL_NAMES"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/veroval/veroval.bp-monitors.ts"],"mappings":";;AACA,SAASA,2BAA2B,QAAQ,2CAAwC;;AAEpF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,MAAMC,MAAM,GAAG,OAAO;AACtB,MAAMC,MAAM,GAAG,OAAO;AActB,MAAMC,qBAAqB,GAAGA,CAC5BC,cAAsB,EACtBC,MAAuB,KAEvBL,2BAA2B,CAAC;EAC1BM,EAAE,EAAED,MAAM,CAACC,EAAE,IAAI,WAAWF,cAAc,CAACG,WAAW,CAAC,CAAC,CAACC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,EAAE;EACtFC,SAAS,EAAEJ,MAAM,CAACI,SAAS,IAAI,IAAIC,MAAM,CAAC,IAAIN,cAAc,GAAG,EAAE,GAAG,CAAC;EACrE,IAAIC,MAAM,CAACM,kBAAkB,KAAKC,SAAS,GACvC,CAAC,CAAC,GACF;IAAED,kBAAkB,EAAEN,MAAM,CAACM;EAAmB,CAAC;AACvD,CAAC,CAAC;;AAEJ;AACA,MAAME,YAAY,GAAIR,MAAuB,IAC3CF,qBAAqB,CAACF,MAAM,EAAEI,MAAM,CAAC;;AAEvC;AACA,MAAMS,YAAY,GAAIT,MAAuB,IAC3CF,qBAAqB,CAACD,MAAM,EAAEG,MAAM,CAAC;;AAEvC;AACA,MAAMU,sBAAyC,GAAG,CAACd,MAAM,EAAEC,MAAM,CAAC;AAElE,SACEW,YAAY,EACZC,YAAY,EACZC,sBAAsB,EACtBZ,qBAAqB","ignoreList":[]}
+{"version":3,"names":["standardBloodPressureDevice","bloodPressureStatusFromFrame","BPU_26","BPW_26","VEROVAL_TRIPLE_MEASUREMENT","VEROVAL_ATRIAL_FIBRILLATION","VEROVAL_RESTING_MEASUREMENT","verovalStatusDecorator","supportedBits","reading","frame","recordOffset","status","undefined","metadata","tripleMeasurement","atrialFibrillation","restingMeasurement","Object","keys","length","verovalCompactMonitor","advertisedName","params","id","toLowerCase","replace","nameMatch","RegExp","decorateReading","stuckDataTimeoutMs","bpu26Monitor","bpw26Monitor","VEROVAL_BP_MODEL_NAMES"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/veroval/veroval.bp-monitors.ts"],"mappings":";;AAOA,SAASA,2BAA2B,QAAQ,2CAAwC;AACpF,SAASC,4BAA4B,QAAQ,2CAAwC;;AAErF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,MAAMC,MAAM,GAAG,OAAO;AACtB,MAAMC,MAAM,GAAG,OAAO;AAEtB,MAAMC,0BAA0B,GAAG,CAAC,IAAI,EAAE;AAC1C,MAAMC,2BAA2B,GAAG,CAAC,IAAI,EAAE;AAC3C,MAAMC,2BAA2B,GAAG,CAAC,IAAI,EAAE;AAc3C,MAAMC,sBAAsB,GAC1BC,aAAqB,IACM,CAACC,OAAO,EAAEC,KAAK,EAAEC,YAAY,KAAK;EAC7D,IAAI,CAACD,KAAK,EAAE;IACV,OAAOD,OAAO;EAChB;EAEA,MAAMG,MAAM,GAAGX,4BAA4B,CAACS,KAAK,EAAEC,YAAY,CAAC;EAEhE,IAAIC,MAAM,KAAKC,SAAS,EAAE;IACxB,OAAOJ,OAAO;EAChB;EAEA,MAAMK,QAA8C,GAAG,CAAC,CAAC;EAEzD,IAAI,CAACN,aAAa,GAAGJ,0BAA0B,MAAM,CAAC,IAClD,CAACQ,MAAM,GAAGR,0BAA0B,MAAM,CAAC,EAAE;IAC/CU,QAAQ,CAACC,iBAAiB,GAAG,IAAI;EACnC;EAEA,IAAI,CAACP,aAAa,GAAGH,2BAA2B,MAAM,CAAC,IACnD,CAACO,MAAM,GAAGP,2BAA2B,MAAM,CAAC,EAAE;IAChDS,QAAQ,CAACE,kBAAkB,GAAG,IAAI;EACpC;EAEA,IAAI,CAACR,aAAa,GAAGF,2BAA2B,MAAM,CAAC,IACnD,CAACM,MAAM,GAAGN,2BAA2B,MAAM,CAAC,EAAE;IAChDQ,QAAQ,CAACG,kBAAkB,GAAG,IAAI;EACpC;EAEA,OAAOC,MAAM,CAACC,IAAI,CAACL,QAAQ,CAAC,CAACM,MAAM,GAAG,CAAC,GACnC;IAAE,GAAGX,OAAO;IAAE,GAAGK;EAAS,CAAC,GAC3BL,OAAO;AACb,CAAC;AAcD,MAAMY,qBAAqB,GAAGA,CAC5BC,cAAsB,EACtBC,MAAuB,KAEvBvB,2BAA2B,CAAC;EAC1BwB,EAAE,EAAED,MAAM,CAACC,EAAE,IAAI,WAAWF,cAAc,CAACG,WAAW,CAAC,CAAC,CAACC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,EAAE;EACtFC,SAAS,EAAEJ,MAAM,CAACI,SAAS,IAAI,IAAIC,MAAM,CAAC,IAAIN,cAAc,GAAG,EAAE,GAAG,CAAC;EACrEO,eAAe,EACbP,cAAc,KAAKpB,MAAM,GACrBK,sBAAsB,CACpBH,0BAA0B,GACxBC,2BAA2B,GAC3BC,2BACJ,CAAC,GACDC,sBAAsB,CAACH,0BAA0B,CAAC;EACxD,IAAImB,MAAM,CAACO,kBAAkB,KAAKjB,SAAS,GACvC,CAAC,CAAC,GACF;IAAEiB,kBAAkB,EAAEP,MAAM,CAACO;EAAmB,CAAC;AACvD,CAAC,CAAC;;AAEJ;AACA,MAAMC,YAAY,GAAIR,MAAuB,IAC3CF,qBAAqB,CAACnB,MAAM,EAAEqB,MAAM,CAAC;;AAEvC;AACA,MAAMS,YAAY,GAAIT,MAAuB,IAC3CF,qBAAqB,CAAClB,MAAM,EAAEoB,MAAM,CAAC;;AAEvC;AACA,MAAMU,sBAAyC,GAAG,CAAC/B,MAAM,EAAEC,MAAM,CAAC;AAElE,SACE4B,YAAY,EACZC,YAAY,EACZC,sBAAsB,EACtBZ,qBAAqB","ignoreList":[]}

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

@@ -3,6 +3,7 @@
 import { MeasurementTypeKey } from "@ovok/core";
 import { CaseType } from "../../../types/case-type.js";
 import { BTManagedDevice } from "../bt-managed-device.js";
+import { parseVerovalBloodPressureRecord } from "./veroval.ecg-record.js";
 import { decodeVerovalEcgSamples, VEROVAL_ECG_SAMPLE_RATE_HZ } from "./veroval.ecg-samples.js";
 import { VerovalEcgTransfer } from "./veroval.ecg-transfer.js";
 const SERVICE = "0000a000-0000-1000-8000-00805f9b34fb";
@@ -60,18 +61,33 @@ export class VerovalEcgDevice extends BTManagedDevice {
       serviceUuid: SERVICE,
       characteristicUuid: CONTROL_POINT
     },
-    onRecording: this.reportRecording
+    onRecord: this.reportRecord,
+    clockSync: this.clockSync
   });
   constructor(device, params) {
     super(device, params);
+    this.clockSync = params.clockSync;
   }
 
   /** Nothing is reported per packet; the transfer reports the recording when it is whole. */
   handleSuccessResult() {
     return;
   }
-  reportRecording = bytes => {
-    const diagramPoints = decodeVerovalEcgSamples(bytes);
+  reportRecord = record => {
+    if (!record.header.isEcg) {
+      const bloodPressure = parseVerovalBloodPressureRecord(record.header);
+      if (bloodPressure) {
+        this.onResult?.({
+          caseType: CaseType.RESULT,
+          ...bloodPressure
+        });
+      }
+      return;
+    }
+    if (!record.raw || record.header.heartRate === 0) {
+      return;
+    }
+    const diagramPoints = decodeVerovalEcgSamples(record.raw, record.header.calibration);
     if (diagramPoints.length === 0) {
       this.onError?.(new Error("Veroval ECG: the recording held no samples."));
       return;
@@ -79,6 +95,11 @@ export class VerovalEcgDevice extends BTManagedDevice {
     this.onResult?.({
       measurementTypeKey: MeasurementTypeKey.ecg,
       caseType: CaseType.RESULT,
+      id: `veroval-${record.header.memorySlot}-${record.header.sequence}-${record.header.recordedAt?.getTime() ?? "unknown"}`,
+      memorySlot: record.header.memorySlot,
+      recordedAt: record.header.recordedAt,
+      heartRate: record.header.heartRate,
+      diagnosticResult: record.header.diagnosticResult,
       diagramPoints,
       duration: diagramPoints.length / VEROVAL_ECG_SAMPLE_RATE_HZ
     });

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

@@ -1 +1 @@
-{"version":3,"names":["MeasurementTypeKey","CaseType","BTManagedDevice","decodeVerovalEcgSamples","VEROVAL_ECG_SAMPLE_RATE_HZ","VerovalEcgTransfer","SERVICE","CONTROL_POINT","NOTIFY","STUCK_TIMEOUT_MS","PREFERRED_MTU","acceptEverything","caseValuePosition","cases","caseValue","caseType","OTHER","parseDefinitions","description","VerovalEcgDevice","stuckDataTimeout","preferredMtu","onStreamStart","undefined","mainServices","uuid","monitorUuids","parsingModel","validatePackage","createCommandSequencer","write","serviceUuid","characteristicUuid","onRecording","reportRecording","constructor","device","params","handleSuccessResult","bytes","diagramPoints","length","onError","Error","onResult","measurementTypeKey","ecg","RESULT","duration"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/veroval/veroval.ecg-device.ts"],"mappings":";;AAAA,SAASA,kBAAkB,QAAQ,YAAY;AAG/C,SAASC,QAAQ,QAAQ,6BAA0B;AAInD,SAASC,eAAe,QAAQ,yBAAsB;AAEtD,SACEC,uBAAuB,EACvBC,0BAA0B,QACrB,0BAAuB;AAC9B,SAASC,kBAAkB,QAAQ,2BAAwB;AAE3D,MAAMC,OAAO,GAAG,sCAAsC;;AAEtD;AACA,MAAMC,aAAa,GAAG,sCAAsC;AAC5D,MAAMC,MAAM,GAAG,sCAAsC;;AAErD;AACA,MAAMC,gBAAgB,GAAG,OAAO;AAEhC,MAAMC,aAAa,GAAG,GAAG;;AAEzB;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,gBAAgB,GAAG;EACvBC,iBAAiB,EAAE,EAAE;EACrBC,KAAK,EAAE,CACL;IACEC,SAAS,EAAE,EAAE;IACbC,QAAQ,EAAEd,QAAQ,CAACe,KAAK;IACxBC,gBAAgB,EAAE,EAAE;IACpBC,WAAW,EAAE;EACf,CAAC;AAEL,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,gBAAgB,SAASjB,eAAe,CAAgC;EACzEkB,gBAAgB,GAAGX,gBAAgB;EAC1BY,YAAY,GAAGX,aAAa;EACrCY,aAAa,GAAGC,SAAS;EAEzBC,YAAY,GAAe,CACnC;IACEC,IAAI,EAAEnB,OAAO;IACboB,YAAY,EAAE,CAAC;MAAED,IAAI,EAAEjB,MAAM;MAAEmB,YAAY,EAAEhB;IAAiB,CAAC;EACjE,CAAC,CACF;EAEkBiB,eAAe,GAAGA,CAAA,KAAe,IAAI;EAErCC,sBAAsB,GAAGA,CAAA,KAC1C,IAAIxB,kBAAkB,CAAC;IACrByB,KAAK,EAAE;MAAEC,WAAW,EAAEzB,OAAO;MAAE0B,kBAAkB,EAAEzB;IAAc,CAAC;IAClE0B,WAAW,EAAE,IAAI,CAACC;EACpB,CAAC,CAAC;EAEGC,WAAWA,CAChBC,MAAc,EACdC,MAAyD,EACzD;IACA,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;EACvB;;EAEA;EACUC,mBAAmBA,CAAA,EAAS;IACpC;EACF;EAEQJ,eAAe,GAAIK,KAAwB,IAAW;IAC5D,MAAMC,aAAa,GAAGrC,uBAAuB,CAACoC,KAAK,CAAC;IAEpD,IAAIC,aAAa,CAACC,MAAM,KAAK,CAAC,EAAE;MAC9B,IAAI,CAACC,OAAO,GAAG,IAAIC,KAAK,CAAC,6CAA6C,CAAC,CAAC;MAExE;IACF;IAEA,IAAI,CAACC,QAAQ,GAAG;MACdC,kBAAkB,EAAE7C,kBAAkB,CAAC8C,GAAG;MAC1C/B,QAAQ,EAAEd,QAAQ,CAAC8C,MAAM;MACzBP,aAAa;MACbQ,QAAQ,EAAER,aAAa,CAACC,MAAM,GAAGrC;IACnC,CAAC,CAAC;EACJ,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["MeasurementTypeKey","CaseType","BTManagedDevice","parseVerovalBloodPressureRecord","decodeVerovalEcgSamples","VEROVAL_ECG_SAMPLE_RATE_HZ","VerovalEcgTransfer","SERVICE","CONTROL_POINT","NOTIFY","STUCK_TIMEOUT_MS","PREFERRED_MTU","acceptEverything","caseValuePosition","cases","caseValue","caseType","OTHER","parseDefinitions","description","VerovalEcgDevice","stuckDataTimeout","preferredMtu","onStreamStart","undefined","mainServices","uuid","monitorUuids","parsingModel","validatePackage","createCommandSequencer","write","serviceUuid","characteristicUuid","onRecord","reportRecord","clockSync","constructor","device","params","handleSuccessResult","record","header","isEcg","bloodPressure","onResult","RESULT","raw","heartRate","diagramPoints","calibration","length","onError","Error","measurementTypeKey","ecg","id","memorySlot","sequence","recordedAt","getTime","diagnosticResult","duration"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/veroval/veroval.ecg-device.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/veroval/veroval.ecg-record.js

@@ -0,0 +1,92 @@
+"use strict";
+
+import { EcgDiagnosticFlag, MeasurementTypeKey } from "@ovok/core";
+import { hexToByte } from "../../../utils/hex-to-byte.js";
+const HEADER_BYTES = 80;
+const ECG_RECORD_TYPE = 38;
+const ECG_ERROR_OFFSET = 30;
+const RECORD_TYPE_OFFSET = 71;
+const RAW_SIZE_OFFSET = 40;
+const USER_OFFSET = 44;
+const HEART_RATE_OFFSET = 47;
+const BP_ERROR_OFFSET = 62;
+const BP_PULSE_OFFSET = 63;
+const BP_SYSTOLIC_OFFSET = 64;
+const BP_DIASTOLIC_OFFSET = 66;
+const TIMESTAMP_OFFSET = 20;
+const TIMESTAMP_BYTES = 6;
+const byteAt = (bytes, offset) => {
+  const value = hexToByte(bytes[offset] ?? "00");
+  return Number.isFinite(value) ? value : 0;
+};
+const littleEndianAt = (bytes, offset, count) => bytes.slice(offset, offset + count).reduce((value, byte, index) => value | byteAt([byte], 0) << index * 8, 0);
+const signed16At = (bytes, offset) => {
+  const value = littleEndianAt(bytes, offset, 2);
+  return value & 0x8000 ? value - 0x10000 : value;
+};
+const dateFromHeader = bytes => {
+  const [year = 0, month = 0, day = 0, hours = 0, minutes = 0, seconds = 0] = Array.from({
+    length: TIMESTAMP_BYTES
+  }, (_, index) => byteAt(bytes, TIMESTAMP_OFFSET + index));
+  const recordedAt = new Date(2000 + year, month - 1, day, hours, minutes, seconds);
+  return recordedAt.getFullYear() === 2000 + year && recordedAt.getMonth() === month - 1 && recordedAt.getDate() === day && recordedAt.getHours() === hours && recordedAt.getMinutes() === minutes && recordedAt.getSeconds() === seconds ? recordedAt : undefined;
+};
+const diagnosticFromHeader = bytes => {
+  if (byteAt(bytes, 48) > 0 || littleEndianAt(bytes, 56, 2) > 0) {
+    return EcgDiagnosticFlag.HIGH_HR;
+  }
+  if (byteAt(bytes, 49) > 0 || littleEndianAt(bytes, 58, 2) > 0) {
+    return EcgDiagnosticFlag.LOW_HR;
+  }
+  if (byteAt(bytes, 50) > 0 || byteAt(bytes, 52) > 0) {
+    return EcgDiagnosticFlag.RR_IRREGULAR;
+  }
+  return byteAt(bytes, 53) > 0 ? EcgDiagnosticFlag.POOR_WAVEFORM : undefined;
+};
+const calibrationFromHeader = bytes => {
+  const physicalMinimumMicrovolts = signed16At(bytes, 31);
+  const physicalMaximumMicrovolts = signed16At(bytes, 33);
+  const digitalMinimum = signed16At(bytes, 35);
+  const digitalMaximum = signed16At(bytes, 37);
+  return physicalMinimumMicrovolts < physicalMaximumMicrovolts && digitalMinimum < digitalMaximum ? {
+    physicalMinimumMicrovolts,
+    physicalMaximumMicrovolts,
+    digitalMinimum,
+    digitalMaximum
+  } : undefined;
+};
+const parseVerovalEcgHeader = bytes => {
+  if (bytes.length < HEADER_BYTES) {
+    return undefined;
+  }
+  const isEcg = byteAt(bytes, RECORD_TYPE_OFFSET) === ECG_RECORD_TYPE;
+  return {
+    bytes: [...bytes.slice(0, HEADER_BYTES)],
+    sequence: byteAt(bytes, 0),
+    recordedAt: dateFromHeader(bytes),
+    memorySlot: byteAt(bytes, USER_OFFSET) === 0 ? 1 : 2,
+    rawSize: littleEndianAt(bytes, RAW_SIZE_OFFSET, 4),
+    heartRate: byteAt(bytes, HEART_RATE_OFFSET),
+    diagnosticResult: diagnosticFromHeader(bytes),
+    calibration: calibrationFromHeader(bytes),
+    isEcg,
+    hasError: isEcg ? byteAt(bytes, ECG_ERROR_OFFSET) !== 0 : byteAt(bytes, BP_ERROR_OFFSET) !== 0
+  };
+};
+const verovalRecordId = header => `veroval-${header.memorySlot}-${header.sequence}-${header.recordedAt?.getTime() ?? "unknown"}`;
+const parseVerovalBloodPressureRecord = header => {
+  if (header.isEcg || header.hasError) {
+    return undefined;
+  }
+  return {
+    id: verovalRecordId(header),
+    measurementTypeKey: MeasurementTypeKey.bloodPressure,
+    systolic: littleEndianAt(header.bytes, BP_SYSTOLIC_OFFSET, 2),
+    diastolic: littleEndianAt(header.bytes, BP_DIASTOLIC_OFFSET, 2),
+    heartRate: byteAt(header.bytes, BP_PULSE_OFFSET),
+    recordedAt: header.recordedAt,
+    memorySlot: header.memorySlot
+  };
+};
+export { BP_DIASTOLIC_OFFSET, BP_ERROR_OFFSET, BP_PULSE_OFFSET, BP_SYSTOLIC_OFFSET, ECG_RECORD_TYPE, HEADER_BYTES, parseVerovalBloodPressureRecord, parseVerovalEcgHeader, RECORD_TYPE_OFFSET, RAW_SIZE_OFFSET, USER_OFFSET, verovalRecordId };
+//# sourceMappingURL=veroval.ecg-record.js.map

package/lib/module/modules/bt-management/services/devices/veroval/veroval.ecg-record.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["EcgDiagnosticFlag","MeasurementTypeKey","hexToByte","HEADER_BYTES","ECG_RECORD_TYPE","ECG_ERROR_OFFSET","RECORD_TYPE_OFFSET","RAW_SIZE_OFFSET","USER_OFFSET","HEART_RATE_OFFSET","BP_ERROR_OFFSET","BP_PULSE_OFFSET","BP_SYSTOLIC_OFFSET","BP_DIASTOLIC_OFFSET","TIMESTAMP_OFFSET","TIMESTAMP_BYTES","byteAt","bytes","offset","value","Number","isFinite","littleEndianAt","count","slice","reduce","byte","index","signed16At","dateFromHeader","year","month","day","hours","minutes","seconds","Array","from","length","_","recordedAt","Date","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","undefined","diagnosticFromHeader","HIGH_HR","LOW_HR","RR_IRREGULAR","POOR_WAVEFORM","calibrationFromHeader","physicalMinimumMicrovolts","physicalMaximumMicrovolts","digitalMinimum","digitalMaximum","parseVerovalEcgHeader","isEcg","sequence","memorySlot","rawSize","heartRate","diagnosticResult","calibration","hasError","verovalRecordId","header","getTime","parseVerovalBloodPressureRecord","id","measurementTypeKey","bloodPressure","systolic","diastolic"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/veroval/veroval.ecg-record.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/veroval/veroval.ecg-transfer.js

@@ -1,32 +1,49 @@
 "use strict";
 
-/** Every request is a fixed twenty-byte packet, zero filled but for its group and command. */
+/* eslint-disable max-lines */
+import { getClockParts, isClockSyncEnabled } from "../../../types/clock-sync.js";
+import { hexToByte } from "../../../utils/hex-to-byte.js";
+import { parseVerovalEcgHeader } from "./veroval.ecg-record.js";
+
+/** Every request is a fixed twenty-byte packet, zero filled after its command data. */
 const PACKET_BYTES = 20;
 const GROUP_INDEX = 1;
 const COMMAND_INDEX = 2;
 const PARAMETER_INDEX = 3;
 const DOWNLOAD_GROUP = 4;
+const DOWNLOAD_WAIT = 0;
 const DOWNLOAD_MODE = 1;
 const DOWNLOAD_HEADER = 2;
 const DOWNLOAD_RAW = 3;
+const SETTINGS_GROUP = 7;
+const SET_TIME_GROUP = 5;
+const SETTINGS_COMMAND = 2;
 const FRAME_GROUP_INDEX = 1;
 const FRAME_COMMAND_INDEX = 2;
 const FRAME_PACKET_INDEX = 3;
+const MODE_USER_ONE_COUNT_INDEX = 3;
+const MODE_USER_TWO_COUNT_INDEX = 4;
 
-/** The transfer's shape, from the vendor's own device table. */
+/** The device answers a header with five notifications of sixteen bytes each. */
 const PAYLOAD_FROM = 4;
 const PAYLOAD_BYTES = 16;
 const HEADER_PACKETS = 5;
 const PACKETS_PER_SEGMENT = 16;
-const SEGMENTS = 34;
+const SEGMENT_BYTES = PAYLOAD_BYTES * PACKETS_PER_SEGMENT;
+const COMMAND_TIMEOUT_MS = 3_000;
+const RAW_TIMEOUT_MS = 2_000;
+const MAX_RETRIES = 2;
+const SET_TIME_DELAY_MS = 1_500;
 const BYTE_MASK = 0xff;
-const BYTE_BITS = 8;
+const byteAt = (frame, index) => {
+  const value = hexToByte(frame[index] ?? "00");
+  return Number.isFinite(value) ? value : 0;
+};
 const toHex = byte => (byte & BYTE_MASK).toString(16).padStart(2, "0");
-const isDownloadFrame = (frame, command) => frame[FRAME_GROUP_INDEX]?.toLowerCase() === toHex(DOWNLOAD_GROUP) && frame[FRAME_COMMAND_INDEX]?.toLowerCase() === toHex(command);
-const isExpectedRawPacket = (frame, packetIndex) => isDownloadFrame(frame, DOWNLOAD_RAW) && frame[FRAME_PACKET_INDEX]?.toLowerCase() === toHex(packetIndex);
-const packet = (write, command, parameters = []) => {
+const isFrame = (frame, group, command) => byteAt(frame, FRAME_GROUP_INDEX) === group && byteAt(frame, FRAME_COMMAND_INDEX) === command;
+const packet = (write, group, command, parameters = [], delayBeforeWriteMs) => {
   const bytes = new Array(PACKET_BYTES).fill(0);
-  bytes[GROUP_INDEX] = DOWNLOAD_GROUP;
+  bytes[GROUP_INDEX] = group;
   bytes[COMMAND_INDEX] = command;
   parameters.forEach((value, index) => {
     bytes[PARAMETER_INDEX + index] = value;
@@ -34,72 +51,216 @@ const packet = (write, command, parameters = []) => {
   return {
     ...write,
     frame: bytes.map(toHex),
-    withoutResponse: true
+    withoutResponse: true,
+    ...(delayBeforeWriteMs === undefined ? {} : {
+      delayBeforeWriteMs
+    })
   };
 };
-const segmentParameters = segment => [segment & BYTE_MASK, segment >> BYTE_BITS & BYTE_MASK, segment >> BYTE_BITS * 2 & BYTE_MASK];
+const payloadOf = frame => [...frame.slice(PAYLOAD_FROM, PAYLOAD_FROM + PAYLOAD_BYTES)];
+const settingsCommand = write => packet(write, SETTINGS_GROUP, SETTINGS_COMMAND, [], SET_TIME_DELAY_MS);
+const setTimeCommand = (write, clockSync, settings) => {
+  const parts = getClockParts(clockSync?.now?.() ?? new Date(), clockSync?.timezone);
+  return packet(write, SET_TIME_GROUP, SETTINGS_COMMAND, [parts.year % 100, parts.month, parts.day, parts.hours, parts.minutes, parts.seconds, settings[0] ?? 0, settings[1] ?? 0, settings[2] ?? 0]);
+};
 /**
- * Downloads a recording from the Veroval ECG.
- *
- * The exchange is a fixed walk rather than a conversation: ask for the download mode, then
- * the header, then each second of the recording in turn. The device answers each request
- * with a known number of twenty-byte packets, sixteen payload bytes each, so the transfer is
- * paced by counting them. Notifications for live measurements, standby and device settings
- * share the characteristic, so only the download group and command advance the transfer.
+ * Downloads all records from the Veroval ECG/BP monitor.
  *
- * A recording is thirty-four seconds at 128 Hz. Nothing is reported until all of it has
- * arrived: a partial ECG that looked whole would be worse than none, and the count is what
- * says it is whole.
+ * The mode reply gives the number of records in each user memory. Headers are collected first;
+ * only then does the device enter raw-download mode. This matters because a blood-pressure
+ * record is complete in its header while an ECG needs one or more raw segments.
  */
-export class VerovalEcgTransfer {
-  phase = "mode";
-  packets = 0;
-  segment = 0;
-  recording = [];
+class VerovalEcgTransfer {
+  headerPacket = 0;
+  headerBytes = [];
+  recordIndex = 0;
+  expectedRecords = 0;
+  headers = [];
+  ecgHeaders = [];
+  ecgIndex = 0;
+  segment = 1;
+  rawPacket = 0;
+  segmentBytes = [];
+  rawBytes = [];
+  pendingTimeout = COMMAND_TIMEOUT_MS;
+  retries = 0;
+  settings = [0, 0, 0];
   constructor(params) {
     this.params = params;
+    this.phase = isClockSyncEnabled(params.clockSync) ? "settings" : "mode";
   }
-  initialCommands = () => [packet(this.params.write, DOWNLOAD_MODE)];
+  initialCommands = () => this.phase === "settings" ? this.remember([settingsCommand(this.params.write)], COMMAND_TIMEOUT_MS, true) : this.requestMode();
   nextCommand = frame => {
     if (this.phase === "done") {
       return undefined;
     }
+    if (this.phase === "settings") {
+      return this.nextSettings(frame);
+    }
     if (this.phase === "mode") {
-      if (!isDownloadFrame(frame, DOWNLOAD_MODE)) {
-        return undefined;
-      }
-      this.phase = "header";
-      this.packets = 0;
-      return [packet(this.params.write, DOWNLOAD_HEADER)];
+      return this.nextMode(frame);
     }
     if (this.phase === "header") {
-      if (!isDownloadFrame(frame, DOWNLOAD_HEADER)) {
-        return undefined;
+      return this.nextHeader(frame);
+    }
+    return this.nextRaw(frame);
+  };
+  commandTimeoutMs = () => this.phase === "done" ? undefined : this.pendingTimeout;
+  onCommandTimeout = () => {
+    if (!this.lastCommand || this.phase === "done") {
+      return {
+        terminal: true
+      };
+    }
+    if (this.retries >= MAX_RETRIES) {
+      this.phase = "done";
+      return {
+        terminal: true
+      };
+    }
+    this.retries += 1;
+    if (this.phase === "header") {
+      this.headerPacket = 0;
+      this.headerBytes = [];
+    }
+    if (this.phase === "raw") {
+      this.rawPacket = 0;
+      this.segmentBytes = [];
+    }
+    return {
+      commands: [this.lastCommand]
+    };
+  };
+  commandProgress = frame => {
+    if (this.phase === "settings") {
+      return isFrame(frame, SETTINGS_GROUP, SETTINGS_COMMAND) ? "complete" : "ignored";
+    }
+    if (this.phase === "mode") {
+      return isFrame(frame, DOWNLOAD_GROUP, DOWNLOAD_MODE) ? "complete" : "ignored";
+    }
+    if (this.phase === "header") {
+      if (!isFrame(frame, DOWNLOAD_GROUP, DOWNLOAD_HEADER) || byteAt(frame, FRAME_PACKET_INDEX) !== this.headerPacket) {
+        return "ignored";
       }
-      this.packets += 1;
-      return this.packets < HEADER_PACKETS ? undefined : this.requestSegment(0);
+      return this.headerPacket + 1 === HEADER_PACKETS ? "complete" : "partial";
+    }
+    if (!isFrame(frame, DOWNLOAD_GROUP, DOWNLOAD_RAW) || byteAt(frame, FRAME_PACKET_INDEX) !== this.rawPacket) {
+      return "ignored";
     }
-    if (!isExpectedRawPacket(frame, this.packets)) {
+    return this.rawPacket + 1 === PACKETS_PER_SEGMENT ? "complete" : "partial";
+  };
+  nextSettings = frame => {
+    if (!isFrame(frame, SETTINGS_GROUP, SETTINGS_COMMAND)) {
       return undefined;
     }
-    this.packets += 1;
-    this.recording.push(...frame.slice(PAYLOAD_FROM, PAYLOAD_FROM + PAYLOAD_BYTES));
-    return this.packets < PACKETS_PER_SEGMENT ? undefined : this.finishSegment();
+    this.settings = [byteAt(frame, 5), byteAt(frame, 6), byteAt(frame, 7)];
+    this.phase = "mode";
+    return this.remember([setTimeCommand(this.params.write, this.params.clockSync, this.settings), packet(this.params.write, DOWNLOAD_GROUP, DOWNLOAD_MODE)], COMMAND_TIMEOUT_MS);
   };
-  finishSegment = () => {
+  nextMode = frame => {
+    if (!isFrame(frame, DOWNLOAD_GROUP, DOWNLOAD_MODE)) {
+      return undefined;
+    }
+    const userOne = byteAt(frame, MODE_USER_ONE_COUNT_INDEX);
+    const userTwo = byteAt(frame, MODE_USER_TWO_COUNT_INDEX);
+    this.expectedRecords = userOne + userTwo;
+    if (this.expectedRecords === 0) {
+      this.phase = "done";
+      return undefined;
+    }
+    this.headers = [];
+    this.recordIndex = 0;
+    return this.requestHeader(this.recordIndex);
+  };
+  nextHeader = frame => {
+    if (!isFrame(frame, DOWNLOAD_GROUP, DOWNLOAD_HEADER) || byteAt(frame, FRAME_PACKET_INDEX) !== this.headerPacket) {
+      return undefined;
+    }
+    this.headerBytes.push(...payloadOf(frame));
+    this.headerPacket += 1;
+    if (this.headerPacket < HEADER_PACKETS) {
+      return undefined;
+    }
+    const header = parseVerovalEcgHeader(this.headerBytes);
+    if (header) {
+      this.headers.push(header);
+    }
+    this.recordIndex += 1;
+    if (this.recordIndex < this.expectedRecords) {
+      return this.requestHeader(this.recordIndex);
+    }
+    this.ecgHeaders = this.headers.filter(candidate => candidate.isEcg && !candidate.hasError && candidate.rawSize > 0);
+    this.headers.filter(candidate => !candidate.isEcg && !candidate.hasError).forEach(candidate => this.params.onRecord({
+      header: candidate
+    }));
+    if (this.ecgHeaders.length === 0) {
+      this.phase = "done";
+      return undefined;
+    }
+    this.ecgIndex = 0;
+    return this.remember([packet(this.params.write, DOWNLOAD_GROUP, DOWNLOAD_WAIT), ...this.requestRaw(this.ecgHeaders[0])], RAW_TIMEOUT_MS);
+  };
+  nextRaw = frame => {
+    if (!isFrame(frame, DOWNLOAD_GROUP, DOWNLOAD_RAW) || byteAt(frame, FRAME_PACKET_INDEX) !== this.rawPacket) {
+      return undefined;
+    }
+    this.segmentBytes.push(...payloadOf(frame));
+    this.rawPacket += 1;
+    if (this.rawPacket < PACKETS_PER_SEGMENT) {
+      return undefined;
+    }
+    this.rawBytes.push(...this.segmentBytes);
+    const header = this.ecgHeaders[this.ecgIndex];
+    if (!header) {
+      this.phase = "done";
+      return undefined;
+    }
+    if (this.rawBytes.length >= header.rawSize) {
+      this.params.onRecord({
+        header,
+        raw: this.rawBytes.slice(0, header.rawSize)
+      });
+      this.ecgIndex += 1;
+      if (this.ecgIndex >= this.ecgHeaders.length) {
+        this.phase = "done";
+        return undefined;
+      }
+      return this.remember(this.requestRaw(this.ecgHeaders[this.ecgIndex]), RAW_TIMEOUT_MS);
+    }
     this.segment += 1;
-    if (this.segment < SEGMENTS) {
-      return this.requestSegment(this.segment);
+    return this.remember(this.requestSegment(header), RAW_TIMEOUT_MS);
+  };
+  requestMode = () => this.remember([packet(this.params.write, DOWNLOAD_GROUP, DOWNLOAD_MODE)], COMMAND_TIMEOUT_MS);
+  requestHeader = index => {
+    this.phase = "header";
+    this.headerPacket = 0;
+    this.headerBytes = [];
+    return this.remember([packet(this.params.write, DOWNLOAD_GROUP, DOWNLOAD_HEADER, [index])], COMMAND_TIMEOUT_MS);
+  };
+  requestRaw = header => {
+    if (!header) {
+      this.phase = "done";
+      return [];
     }
-    this.phase = "done";
-    this.params.onRecording(this.recording);
-    return undefined;
+    this.segment = 1;
+    this.rawBytes = [];
+    return this.requestSegment(header);
   };
-  requestSegment = segment => {
+  requestSegment = header => {
     this.phase = "raw";
-    this.packets = 0;
-    this.segment = segment;
-    return [packet(this.params.write, DOWNLOAD_RAW, segmentParameters(segment))];
+    this.rawPacket = 0;
+    this.segmentBytes = [];
+    return [packet(this.params.write, DOWNLOAD_GROUP, DOWNLOAD_RAW, [header.memorySlot - 1, header.sequence, this.segment])];
+  };
+  remember = (commands, timeout, preserveRetryCount = false) => {
+    const last = commands[commands.length - 1];
+    this.lastCommand = last;
+    this.pendingTimeout = timeout;
+    if (!preserveRetryCount) {
+      this.retries = 0;
+    }
+    return commands;
   };
 }
+export { COMMAND_TIMEOUT_MS, DOWNLOAD_HEADER, DOWNLOAD_MODE, DOWNLOAD_RAW, DOWNLOAD_WAIT, HEADER_PACKETS, PACKETS_PER_SEGMENT, RAW_TIMEOUT_MS, SEGMENT_BYTES, SET_TIME_DELAY_MS, VerovalEcgTransfer };
 //# sourceMappingURL=veroval.ecg-transfer.js.map