@ovok/native 1.10.14 → 1.10.15

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

@@ -1,8 +1,10 @@
 "use strict";
 
-import { FrameReadStatus } from "../../../types/frame-read-status.js";
+import { byteToHex } from "../../../utils/bytes-to-hex.js";
 import { calculateCrc8Pc } from "../../../utils/calculate-crc-8-pc.js";
+import { complete, corrupt, incomplete, noFrameStart } from "../../../utils/frame-read-results.js";
 import { hexToByte } from "../../../utils/hex-to-byte.js";
+import { le16FromHex } from "../../../utils/le-16-from-hex.js";
 const PC80B_SERVICE = "0000fff0-0000-1000-8000-00805f9b34fb";
 const PC80B_WRITE = "0000fff2-0000-1000-8000-00805f9b34fb";
 const PC80B_NOTIFY = "0000fff1-0000-1000-8000-00805f9b34fb";
@@ -12,15 +14,14 @@ const Pc80Command = {
   transfer: 0x55,
   data: 0xaa
 };
-const byte = value => (value & 0xff).toString(16).padStart(2, "0");
 const pc80Command = (command, payload = []) => {
-  const frame = ["a5", byte(command), byte(payload.length), ...payload, "00"];
-  frame[frame.length - 1] = byte(calculateCrc8Pc(frame));
+  const frame = ["a5", byteToHex(command), byteToHex(payload.length), ...payload, "00"];
+  frame[frame.length - 1] = byteToHex(calculateCrc8Pc(frame));
   return frame;
 };
 const pc80Info = () => pc80Command(Pc80Command.info, ["00", "00", "00", "00", "00", "00"]);
-const pc80TransferAck = status => pc80Command(Pc80Command.transfer, [byte(status)]);
-const pc80DataAck = (sequence, status) => pc80Command(Pc80Command.data, [byte(sequence), byte(status)]);
+const pc80TransferAck = status => pc80Command(Pc80Command.transfer, [byteToHex(status)]);
+const pc80DataAck = (sequence, status) => pc80Command(Pc80Command.data, [byteToHex(sequence), byteToHex(status)]);
 const decodePc80Response = frame => {
   if (hexToByte(frame[0] ?? "00") !== 0xa5) {
     return undefined;
@@ -34,9 +35,8 @@ const decodePc80Response = frame => {
     content: frame.slice(3, 3 + length)
   };
 };
-const littleEndian16 = (bytes, offset) => hexToByte(bytes[offset] ?? "00") | (hexToByte(bytes[offset + 1] ?? "00") & 0xff) << 8;
 const validDate = bytes => {
-  const year = littleEndian16(bytes, 0);
+  const year = le16FromHex(bytes, 0);
   const month = hexToByte(bytes[2] ?? "00");
   const day = hexToByte(bytes[3] ?? "00");
   const hour = hexToByte(bytes[7] ?? "00");
@@ -59,7 +59,7 @@ const decodePc80EcgFile = bytes => {
     diagramPoints.push(sample / 330);
   }
   return {
-    heartRate: littleEndian16(bytes, 9_215),
+    heartRate: le16FromHex(bytes, 9_215),
     diagnosticResult: hexToByte(bytes[9_224] ?? "00"),
     recordedAt: validDate(bytes.slice(101, 111)),
     duration: diagramPoints.length / 150,
@@ -70,36 +70,20 @@ class Pc80FrameReader {
   readFrame(buffer) {
     const start = buffer.findIndex(value => hexToByte(value) === 0xa5);
     if (start < 0) {
-      return {
-        status: FrameReadStatus.INCOMPLETE,
-        consumedBytes: Math.max(0, buffer.length - 1)
-      };
+      return noFrameStart(buffer);
     }
     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 frame = buffer.slice(start, start + length);
     if (decodePc80Response(frame) === undefined) {
-      return {
-        status: FrameReadStatus.CORRUPT,
-        consumedBytes: start + 1
-      };
+      return corrupt(start + 1);
     }
-    return {
-      status: FrameReadStatus.COMPLETE,
-      consumedBytes: start + length,
-      frame
-    };
+    return complete(frame, start + length);
   }
 }
 export { PC80B_ECG_LENGTH, PC80B_NOTIFY, PC80B_SERVICE, PC80B_WRITE, Pc80Command, Pc80FrameReader, decodePc80EcgFile, decodePc80Response, pc80Command, pc80DataAck, pc80Info, pc80TransferAck };

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

@@ -1 +1 @@
-{"version":3,"names":["FrameReadStatus","calculateCrc8Pc","hexToByte","PC80B_SERVICE","PC80B_WRITE","PC80B_NOTIFY","PC80B_ECG_LENGTH","Pc80Command","info","transfer","data","byte","value","toString","padStart","pc80Command","command","payload","frame","length","pc80Info","pc80TransferAck","status","pc80DataAck","sequence","decodePc80Response","undefined","at","content","slice","littleEndian16","bytes","offset","validDate","year","month","day","hour","minute","second","date","Date","getFullYear","decodePc80EcgFile","waveStart","waveEnd","diagramPoints","sample","push","heartRate","diagnosticResult","recordedAt","duration","Pc80FrameReader","readFrame","buffer","start","findIndex","INCOMPLETE","consumedBytes","Math","max","CORRUPT","COMPLETE"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/pc80b.protocol.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["byteToHex","calculateCrc8Pc","complete","corrupt","incomplete","noFrameStart","hexToByte","le16FromHex","PC80B_SERVICE","PC80B_WRITE","PC80B_NOTIFY","PC80B_ECG_LENGTH","Pc80Command","info","transfer","data","pc80Command","command","payload","frame","length","pc80Info","pc80TransferAck","status","pc80DataAck","sequence","decodePc80Response","undefined","at","content","slice","validDate","bytes","year","month","day","hour","minute","second","date","Date","getFullYear","decodePc80EcgFile","waveStart","waveEnd","diagramPoints","offset","sample","push","heartRate","diagnosticResult","recordedAt","duration","Pc80FrameReader","readFrame","buffer","start","findIndex","value"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/pc80b.protocol.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/viatom/pc80b.sequencer.js

@@ -3,14 +3,10 @@
 import { MeasurementTypeKey } from "@ovok/core";
 import { CaseType } from "../../../types/case-type.js";
 import { convertEcgDiagnosticFlag } from "../../../utils/convert-ecg-diagnostic-flag.js";
+import { withoutResponseCommand } from "../write-command.js";
 import { decodePc80EcgFile, decodePc80Response, Pc80Command, pc80DataAck, pc80Info, pc80TransferAck, PC80B_ECG_LENGTH } from "./pc80b.protocol.js";
 const READ_TIMEOUT_MS = 5_000;
 const MAX_RETRIES = 2;
-const command = (write, frame) => ({
-  ...write,
-  frame,
-  withoutResponse: true
-});
 
 /** Handles PC80B's info, transfer acknowledgement and fixed-size SCP ECG download. */
 export class Pc80bSequencer {
@@ -73,7 +69,7 @@ export class Pc80bSequencer {
     this.content.push(...response.content.slice(1));
     return this.remember(this.write(pc80DataAck(sequence, this.content.length > PC80B_ECG_LENGTH ? 1 : 0)));
   };
-  write = frame => command(this.params.write, frame);
+  write = frame => withoutResponseCommand(this.params.write, frame);
   remember = next => {
     this.lastCommand = next;
     return [next];

package/lib/module/modules/bt-management/services/devices/viatom/pc80b.sequencer.js.map

@@ -1 +1 @@
-{"version":3,"names":["MeasurementTypeKey","CaseType","convertEcgDiagnosticFlag","decodePc80EcgFile","decodePc80Response","Pc80Command","pc80DataAck","pc80Info","pc80TransferAck","PC80B_ECG_LENGTH","READ_TIMEOUT_MS","MAX_RETRIES","command","write","frame","withoutResponse","Pc80bSequencer","recording","done","content","retries","constructor","params","initialCommands","remember","isHistoryTransfer","commandTimeoutMs","undefined","onCommandTimeout","lastCommand","terminal","commands","isNormalDisconnect","nextCommand","response","transfer","Number","parseInt","data","sequence","length","onResult","caseType","RESULT","measurementTypeKey","ecg","heartRate","diagnosticResult","toString","padStart","recordedAt","duration","diagramPoints","push","slice","next"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/pc80b.sequencer.ts"],"mappings":";;AAAA,SAAyBA,kBAAkB,QAAQ,YAAY;AAE/D,SAASC,QAAQ,QAAQ,6BAA0B;AAMnD,SAASC,wBAAwB,QAAQ,+CAA4C;AAErF,SACEC,iBAAiB,EACjBC,kBAAkB,EAClBC,WAAW,EACXC,WAAW,EACXC,QAAQ,EACRC,eAAe,EACfC,gBAAgB,QACX,qBAAkB;AASzB,MAAMC,eAAe,GAAG,KAAK;AAC7B,MAAMC,WAAW,GAAG,CAAC;AAErB,MAAMC,OAAO,GAAGA,CACdC,KAAmC,EACnCC,KAAwB,MACL;EAAE,GAAGD,KAAK;EAAEC,KAAK;EAAEC,eAAe,EAAE;AAAK,CAAC,CAAC;;AAEhE;AACA,OAAO,MAAMC,cAAc,CAA6B;EAC9CC,SAAS,GAAG,KAAK;EACjBC,IAAI,GAAG,KAAK;EACZC,OAAO,GAAa,EAAE;EACtBC,OAAO,GAAG,CAAC;EAGZC,WAAWA,CAAkBC,MAA2B,EAAE;IAAA,KAA7BA,MAA2B,GAA3BA,MAA2B;EAAG;EAE3DC,eAAe,GAAGA,CAAA,KACvB,IAAI,CAACC,QAAQ,CAAC,IAAI,CAACX,KAAK,CAACN,QAAQ,CAAC,CAAC,CAAC,CAAC;EAEhCkB,iBAAiB,GAAGA,CAAA,KAAe,IAAI;EAEvCC,gBAAgB,GAAGA,CAAA,KACxB,IAAI,CAACR,IAAI,GAAGS,SAAS,GAAGjB,eAAe;EAElCkB,gBAAgB,GAAGA,CAAA,KAA4B;IACpD,IAAI,CAAC,IAAI,CAACC,WAAW,IAAI,IAAI,CAACT,OAAO,IAAIT,WAAW,EAAE;MACpD,IAAI,CAACO,IAAI,GAAG,IAAI;MAEhB,OAAO;QAAEY,QAAQ,EAAE;MAAK,CAAC;IAC3B;IAEA,IAAI,CAACV,OAAO,IAAI,CAAC;IAEjB,OAAO;MAAEW,QAAQ,EAAE,CAAC,IAAI,CAACF,WAAW;IAAE,CAAC;EACzC,CAAC;EAEMG,kBAAkB,GAAGA,CAAA,KAAe,IAAI,CAACd,IAAI;EAE7Ce,WAAW,GAChBnB,KAAwB,IACiB;IACzC,MAAMoB,QAAQ,GAAG9B,kBAAkB,CAACU,KAAK,CAAC;IAE1C,IAAI,CAACoB,QAAQ,IAAI,IAAI,CAAChB,IAAI,EAAE;MAC1B,OAAOS,SAAS;IAClB;IAEA,IAAI,CAACP,OAAO,GAAG,CAAC;IAEhB,IAAIc,QAAQ,CAACtB,OAAO,KAAKP,WAAW,CAAC8B,QAAQ,EAAE;MAC7C,IAAI,CAACD,QAAQ,CAACf,OAAO,CAAC,CAAC,CAAC,GAAGiB,MAAM,CAACC,QAAQ,CAACH,QAAQ,CAACf,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QAC9E,IAAI,CAACF,SAAS,GAAG,IAAI;QACrB,IAAI,CAACE,OAAO,GAAG,EAAE;MACnB;MAEA,OAAO,IAAI,CAACK,QAAQ,CAAC,IAAI,CAACX,KAAK,CAACL,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;IACtD;IAEA,IAAI0B,QAAQ,CAACtB,OAAO,KAAKP,WAAW,CAACiC,IAAI,IAAI,CAAC,IAAI,CAACrB,SAAS,EAAE;MAC5D,OAAOU,SAAS;IAClB;IAEA,MAAMY,QAAQ,GAAGH,MAAM,CAACC,QAAQ,CAACH,QAAQ,CAACf,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC;IAEjE,IAAIe,QAAQ,CAACf,OAAO,CAACqB,MAAM,KAAK,CAAC,EAAE;MACjC,MAAMvB,SAAS,GAAGd,iBAAiB,CAAC,IAAI,CAACgB,OAAO,CAAC;MAEjD,IAAIF,SAAS,EAAE;QACb,IAAI,CAACK,MAAM,CAACmB,QAAQ,CAAC;UACnBC,QAAQ,EAAEzC,QAAQ,CAAC0C,MAAM;UACzBC,kBAAkB,EAAE5C,kBAAkB,CAAC6C,GAAG;UAC1CC,SAAS,EAAE7B,SAAS,CAAC6B,SAAS;UAC9BC,gBAAgB,EAAE7C,wBAAwB,CACxC,GAAGe,SAAS,CAAC8B,gBAAgB,CAACC,QAAQ,CAAC,EAAE,CAAC,CAACC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,QAC7D,CAAC;UACDC,UAAU,EAAEjC,SAAS,CAACiC,UAAU;UAChCC,QAAQ,EAAElC,SAAS,CAACkC,QAAQ;UAC5BC,aAAa,EAAEnC,SAAS,CAACmC;QAC3B,CAAC,CAAC;MACJ;MAEA,IAAI,CAAClC,IAAI,GAAG,IAAI;MAEhB,OAAO,IAAI,CAACM,QAAQ,CAAC,IAAI,CAACX,KAAK,CAACP,WAAW,CAACiC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5D;IAEA,IAAI,CAACpB,OAAO,CAACkC,IAAI,CAAC,GAAGnB,QAAQ,CAACf,OAAO,CAACmC,KAAK,CAAC,CAAC,CAAC,CAAC;IAE/C,OAAO,IAAI,CAAC9B,QAAQ,CAClB,IAAI,CAACX,KAAK,CAACP,WAAW,CAACiC,QAAQ,EAAE,IAAI,CAACpB,OAAO,CAACqB,MAAM,GAAG/B,gBAAgB,GAAG,CAAC,GAAG,CAAC,CAAC,CAClF,CAAC;EACH,CAAC;EAEOI,KAAK,GAAIC,KAAwB,IACvCF,OAAO,CAAC,IAAI,CAACU,MAAM,CAACT,KAAK,EAAEC,KAAK,CAAC;EAE3BU,QAAQ,GAAI+B,IAAmB,IAA+B;IACpE,IAAI,CAAC1B,WAAW,GAAG0B,IAAI;IAEvB,OAAO,CAACA,IAAI,CAAC;EACf,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["MeasurementTypeKey","CaseType","convertEcgDiagnosticFlag","withoutResponseCommand","decodePc80EcgFile","decodePc80Response","Pc80Command","pc80DataAck","pc80Info","pc80TransferAck","PC80B_ECG_LENGTH","READ_TIMEOUT_MS","MAX_RETRIES","Pc80bSequencer","recording","done","content","retries","constructor","params","initialCommands","remember","write","isHistoryTransfer","commandTimeoutMs","undefined","onCommandTimeout","lastCommand","terminal","commands","isNormalDisconnect","nextCommand","frame","response","command","transfer","Number","parseInt","data","sequence","length","onResult","caseType","RESULT","measurementTypeKey","ecg","heartRate","diagnosticResult","toString","padStart","recordedAt","duration","diagramPoints","push","slice","next"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/pc80b.sequencer.ts"],"mappings":"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","ignoreList":[]}

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

@@ -2,30 +2,23 @@
 
 /* eslint-disable import/group-exports */
 
-import { MeasurementTypeKey } from "@ovok/core";
-import { NO_PARSING_CASES } from "../../../constants/no-parsing-cases.js";
 import { BTManagedDevice } from "../bt-managed-device.js";
+import { monitorService } from "../monitor-service.js";
 import { PF10AW1_NOTIFY, PF10AW1_SERVICE, PF10AW1_WRITE, Pf10Aw1FrameReader } from "./pf10aw1.protocol.js";
 import { Pf10Aw1Sequencer } from "./pf10aw1.sequencer.js";
-export const pf10Aw1MainServices = [{
+export const pf10Aw1MainServices = [monitorService({
   uuid: PF10AW1_SERVICE,
-  monitorUuids: [{
-    uuid: PF10AW1_NOTIFY,
-    parsingModel: NO_PARSING_CASES
-  }],
-  writeUuid: {
+  notify: PF10AW1_NOTIFY,
+  write: {
     uuid: PF10AW1_WRITE,
     mainCommandUuid: "a5"
   }
-}];
+})];
 
 /** ViHealth PF10AW-ME, SA10AW-PU, and PF10BW-VE encrypted oximeter driver. */
 export class Pf10Aw1Device extends BTManagedDevice {
   mainServices = pf10Aw1MainServices;
   stuckDataTimeout = 60_000;
-  getSupportedMeasurementTypeKeys() {
-    return [MeasurementTypeKey.bloodOxygenPulseRate];
-  }
   constructor(device, params) {
     super(device, params);
     this.frameReader = new Pf10Aw1FrameReader();
@@ -34,7 +27,7 @@ export class Pf10Aw1Device extends BTManagedDevice {
         serviceUuid: PF10AW1_SERVICE,
         characteristicUuid: PF10AW1_WRITE
       },
-      onResult: result => this.onResult?.(result)
+      onResult: this.reportResult
     });
   }
 }

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

@@ -1 +1 @@
-{"version":3,"names":["MeasurementTypeKey","NO_PARSING_CASES","BTManagedDevice","PF10AW1_NOTIFY","PF10AW1_SERVICE","PF10AW1_WRITE","Pf10Aw1FrameReader","Pf10Aw1Sequencer","pf10Aw1MainServices","uuid","monitorUuids","parsingModel","writeUuid","mainCommandUuid","Pf10Aw1Device","mainServices","stuckDataTimeout","getSupportedMeasurementTypeKeys","bloodOxygenPulseRate","constructor","device","params","frameReader","createCommandSequencer","write","serviceUuid","characteristicUuid","onResult","result"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/pf10aw1.device.ts"],"mappings":";;AAAA;;AAEA,SAASA,kBAAkB,QAAQ,YAAY;AAG/C,SAASC,gBAAgB,QAAQ,wCAAqC;AAMtE,SAASC,eAAe,QAAQ,yBAAsB;AAEtD,SACEC,cAAc,EACdC,eAAe,EACfC,aAAa,EACbC,kBAAkB,QACb,uBAAoB;AAC3B,SAASC,gBAAgB,QAAQ,wBAAqB;AAOtD,OAAO,MAAMC,mBAA+B,GAAG,CAC7C;EACEC,IAAI,EAAEL,eAAe;EACrBM,YAAY,EAAE,CAAC;IAAED,IAAI,EAAEN,cAAc;IAAEQ,YAAY,EAAEV;EAAiB,CAAC,CAAC;EACxEW,SAAS,EAAE;IAAEH,IAAI,EAAEJ,aAAa;IAAEQ,eAAe,EAAE;EAAK;AAC1D,CAAC,CACF;;AAED;AACA,OAAO,MAAMC,aAAa,SAASZ,eAAe,CAAkB;EACxDa,YAAY,GAAGP,mBAAmB;EAClCQ,gBAAgB,GAAG,MAAM;EAEhBC,+BAA+BA,CAAA,EAAyB;IACzE,OAAO,CAACjB,kBAAkB,CAACkB,oBAAoB,CAAC;EAClD;EAEOC,WAAWA,CAChBC,MAAc,EACdC,MAA2C,EAC3C;IACA,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IACrB,IAAI,CAACC,WAAW,GAAG,IAAIhB,kBAAkB,CAAC,CAAC;IAC3C,IAAI,CAACiB,sBAAsB,GAAG,MAC5B,IAAIhB,gBAAgB,CAAC;MACnBiB,KAAK,EAAE;QACLC,WAAW,EAAErB,eAAe;QAC5BsB,kBAAkB,EAAErB;MACtB,CAAC;MACDsB,QAAQ,EAAGC,MAAM,IACf,IAAI,CAACD,QAAQ,GACXC,MAGF;IACJ,CAAC,CAAC;EACN;AAEF","ignoreList":[]}
+{"version":3,"names":["BTManagedDevice","monitorService","PF10AW1_NOTIFY","PF10AW1_SERVICE","PF10AW1_WRITE","Pf10Aw1FrameReader","Pf10Aw1Sequencer","pf10Aw1MainServices","uuid","notify","write","mainCommandUuid","Pf10Aw1Device","mainServices","stuckDataTimeout","constructor","device","params","frameReader","createCommandSequencer","serviceUuid","characteristicUuid","onResult","reportResult"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/pf10aw1.device.ts"],"mappings":";;AAAA;;AAOA,SAASA,eAAe,QAAQ,yBAAsB;AACtD,SAASC,cAAc,QAAQ,uBAAoB;AAEnD,SACEC,cAAc,EACdC,eAAe,EACfC,aAAa,EACbC,kBAAkB,QACb,uBAAoB;AAC3B,SAASC,gBAAgB,QAAQ,wBAAqB;AAOtD,OAAO,MAAMC,mBAA+B,GAAG,CAC7CN,cAAc,CAAC;EAAEO,IAAI,EAAEL,eAAe;EAAEM,MAAM,EAAEP,cAAc;EAAEQ,KAAK,EAAE;IAAEF,IAAI,EAAEJ,aAAa;IAAEO,eAAe,EAAE;EAAK;AAAE,CAAC,CAAC,CACzH;;AAED;AACA,OAAO,MAAMC,aAAa,SAASZ,eAAe,CAAkB;EACxDa,YAAY,GAAGN,mBAAmB;EAClCO,gBAAgB,GAAG,MAAM;EAE5BC,WAAWA,CAChBC,MAAc,EACdC,MAA2C,EAC3C;IACA,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IACrB,IAAI,CAACC,WAAW,GAAG,IAAIb,kBAAkB,CAAC,CAAC;IAC3C,IAAI,CAACc,sBAAsB,GAAG,MAC5B,IAAIb,gBAAgB,CAAC;MACnBI,KAAK,EAAE;QACLU,WAAW,EAAEjB,eAAe;QAC5BkB,kBAAkB,EAAEjB;MACtB,CAAC;MACDkB,QAAQ,EAAE,IAAI,CAACC;IACjB,CAAC,CAAC;EACN;AACF","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/viatom/poctor.m3102.device.js

@@ -2,17 +2,14 @@
 
 /* eslint-disable import/group-exports */
 
-import { NO_PARSING_CASES } from "../../../constants/no-parsing-cases.js";
 import { BTManagedDevice } from "../bt-managed-device.js";
+import { monitorService } from "../monitor-service.js";
 import { POCTOR_NOTIFY, POCTOR_SERVICE, PoctorFrameReader } from "./poctor.m3102.protocol.js";
 import { PoctorSequencer } from "./poctor.m3102.sequencer.js";
-export const poctorM3102MainServices = [{
+export const poctorM3102MainServices = [monitorService({
   uuid: POCTOR_SERVICE,
-  monitorUuids: [{
-    uuid: POCTOR_NOTIFY,
-    parsingModel: NO_PARSING_CASES
-  }]
-}];
+  notify: POCTOR_NOTIFY
+})];
 
 /** Poctor M3102 unsolicited glucose and uric-acid records. */
 export class PoctorM3102Device extends BTManagedDevice {
@@ -22,7 +19,7 @@ export class PoctorM3102Device extends BTManagedDevice {
     super(device, params);
     this.frameReader = new PoctorFrameReader();
     this.createCommandSequencer = () => new PoctorSequencer({
-      onResult: result => this.onResult?.(result)
+      onResult: this.reportResult
     });
   }
 }

package/lib/module/modules/bt-management/services/devices/viatom/poctor.m3102.device.js.map

@@ -1 +1 @@
-{"version":3,"names":["NO_PARSING_CASES","BTManagedDevice","POCTOR_NOTIFY","POCTOR_SERVICE","PoctorFrameReader","PoctorSequencer","poctorM3102MainServices","uuid","monitorUuids","parsingModel","PoctorM3102Device","mainServices","stuckDataTimeout","constructor","device","params","frameReader","createCommandSequencer","onResult","result"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/poctor.m3102.device.ts"],"mappings":";;AAAA;;AAIA,SAASA,gBAAgB,QAAQ,wCAAqC;AAMtE,SAASC,eAAe,QAAQ,yBAAsB;AAEtD,SACEC,aAAa,EACbC,cAAc,EACdC,iBAAiB,QACZ,4BAAyB;AAChC,SAASC,eAAe,QAAQ,6BAA0B;AAE1D,OAAO,MAAMC,uBAAmC,GAAG,CACjD;EACEC,IAAI,EAAEJ,cAAc;EACpBK,YAAY,EAAE,CAAC;IAAED,IAAI,EAAEL,aAAa;IAAEO,YAAY,EAAET;EAAiB,CAAC;AACxE,CAAC,CACF;;AAED;AACA,OAAO,MAAMU,iBAAiB,SAAST,eAAe,CAAiC;EAC3EU,YAAY,GAAGL,uBAAuB;EACtCM,gBAAgB,GAAG,MAAM;EAE5BC,WAAWA,CAChBC,MAAc,EACdC,MAA0D,EAC1D;IACA,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IACrB,IAAI,CAACC,WAAW,GAAG,IAAIZ,iBAAiB,CAAC,CAAC;IAC1C,IAAI,CAACa,sBAAsB,GAAG,MAC5B,IAAIZ,eAAe,CAAC;MAClBa,QAAQ,EAAGC,MAAM,IACf,IAAI,CAACD,QAAQ,GACXC,MAGF;IACJ,CAAC,CAAC;EACN;AAEF","ignoreList":[]}
+{"version":3,"names":["BTManagedDevice","monitorService","POCTOR_NOTIFY","POCTOR_SERVICE","PoctorFrameReader","PoctorSequencer","poctorM3102MainServices","uuid","notify","PoctorM3102Device","mainServices","stuckDataTimeout","constructor","device","params","frameReader","createCommandSequencer","onResult","reportResult"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/poctor.m3102.device.ts"],"mappings":";;AAAA;;AAOA,SAASA,eAAe,QAAQ,yBAAsB;AACtD,SAASC,cAAc,QAAQ,uBAAoB;AAEnD,SACEC,aAAa,EACbC,cAAc,EACdC,iBAAiB,QACZ,4BAAyB;AAChC,SAASC,eAAe,QAAQ,6BAA0B;AAE1D,OAAO,MAAMC,uBAAmC,GAAG,CACjDL,cAAc,CAAC;EAAEM,IAAI,EAAEJ,cAAc;EAAEK,MAAM,EAAEN;AAAc,CAAC,CAAC,CAChE;;AAED;AACA,OAAO,MAAMO,iBAAiB,SAAST,eAAe,CAAiC;EAC3EU,YAAY,GAAGJ,uBAAuB;EACtCK,gBAAgB,GAAG,MAAM;EAE5BC,WAAWA,CAChBC,MAAc,EACdC,MAA0D,EAC1D;IACA,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IACrB,IAAI,CAACC,WAAW,GAAG,IAAIX,iBAAiB,CAAC,CAAC;IAC1C,IAAI,CAACY,sBAAsB,GAAG,MAC5B,IAAIX,eAAe,CAAC;MAClBY,QAAQ,EAAE,IAAI,CAACC;IACjB,CAAC,CAAC;EACN;AAEF","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/viatom/poctor.m3102.protocol.js

@@ -2,7 +2,7 @@
 
 /* eslint-disable import/group-exports */
 
-import { FrameReadStatus } from "../../../types/frame-read-status.js";
+import { complete, incomplete } from "../../../utils/frame-read-results.js";
 import { hexToByte } from "../../../utils/hex-to-byte.js";
 export const POCTOR_SERVICE = "00010203-0405-0607-0809-0a0b0c0d1910";
 export const POCTOR_WRITE = "00010203-0405-0607-0809-0a0b0c0d2b11";
@@ -39,17 +39,10 @@ export class PoctorFrameReader {
   readFrame(buffer) {
     const carriageReturn = buffer.indexOf("0d");
     if (carriageReturn < 0 || buffer[carriageReturn + 1] !== "0a") {
-      return {
-        status: FrameReadStatus.INCOMPLETE,
-        consumedBytes: 0
-      };
+      return incomplete(0);
     }
     const end = carriageReturn + 2;
-    return {
-      status: FrameReadStatus.COMPLETE,
-      consumedBytes: end,
-      frame: buffer.slice(0, end)
-    };
+    return complete(buffer.slice(0, end), end);
   }
 }
 //# sourceMappingURL=poctor.m3102.protocol.js.map

package/lib/module/modules/bt-management/services/devices/viatom/poctor.m3102.protocol.js.map

@@ -1 +1 @@
-{"version":3,"names":["FrameReadStatus","hexToByte","POCTOR_SERVICE","POCTOR_WRITE","POCTOR_NOTIFY","fromHex","value","fromAscii","bytes","map","String","fromCharCode","join","parsePoctorResult","frame","text","trim","fields","split","length","undefined","type","Number","parseInt","yearValue","month","day","hour","minute","rawValue","year","recordedAt","Date","isFinite","getFullYear","getMonth","getDate","PoctorFrameReader","readFrame","buffer","carriageReturn","indexOf","status","INCOMPLETE","consumedBytes","end","COMPLETE","slice"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/poctor.m3102.protocol.ts"],"mappings":";;AAAA;;AAGA,SAASA,eAAe,QAAQ,qCAAkC;AAElE,SAASC,SAAS,QAAQ,+BAA4B;AAEtD,OAAO,MAAMC,cAAc,GAAG,sCAAsC;AACpE,OAAO,MAAMC,YAAY,GAAG,sCAAsC;AAClE,OAAO,MAAMC,aAAa,GAAG,sCAAsC;AAQnE,MAAMC,OAAO,GAAIC,KAAa,IAAaL,SAAS,CAACK,KAAK,CAAC;AAE3D,MAAMC,SAAS,GAAIC,KAAwB,IACzCA,KAAK,CAACC,GAAG,CAAEH,KAAK,IAAKI,MAAM,CAACC,YAAY,CAACN,OAAO,CAACC,KAAK,CAAC,CAAC,CAAC,CAACM,IAAI,CAAC,EAAE,CAAC;AAEpE,OAAO,MAAMC,iBAAiB,GAC5BC,KAAwB,IACK;EAC7B,MAAMC,IAAI,GAAGR,SAAS,CAACO,KAAK,CAAC,CAACE,IAAI,CAAC,CAAC;EACpC,MAAMC,MAAM,GAAGF,IAAI,CAACG,KAAK,CAAC,GAAG,CAAC;EAE9B,IAAID,MAAM,CAACE,MAAM,GAAG,CAAC,EAAE;IACrB,OAAOC,SAAS;EAClB;EAEA,MAAMC,IAAI,GAAGC,MAAM,CAACC,QAAQ,CAACN,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC;EACjD,MAAMO,SAAS,GAAGF,MAAM,CAACC,QAAQ,CAACN,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC;EACtD,MAAMQ,KAAK,GAAGH,MAAM,CAACC,QAAQ,CAACN,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC;EAClD,MAAMS,GAAG,GAAGJ,MAAM,CAACC,QAAQ,CAACN,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC;EAChD,MAAMU,IAAI,GAAGL,MAAM,CAACC,QAAQ,CAACN,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC;EACjD,MAAMW,MAAM,GAAGN,MAAM,CAACC,QAAQ,CAACN,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC;EACnD,MAAMY,QAAQ,GAAGP,MAAM,CAACC,QAAQ,CAACN,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC;EACrD,MAAMa,IAAI,GAAGN,SAAS,GAAG,GAAG,GAAGA,SAAS,GAAG,KAAK,GAAGA,SAAS;EAC5D,MAAMO,UAAU,GAAG,IAAIC,IAAI,CAACF,IAAI,EAAEL,KAAK,GAAG,CAAC,EAAEC,GAAG,EAAEC,IAAI,EAAEC,MAAM,CAAC;EAE/D,IACGP,IAAI,KAAK,CAAC,IAAIA,IAAI,KAAK,CAAC,IACzB,CAACC,MAAM,CAACW,QAAQ,CAACJ,QAAQ,CAAC,IAC1BJ,KAAK,GAAG,CAAC,IACTA,KAAK,GAAG,EAAE,IACVC,GAAG,GAAG,CAAC,IACPA,GAAG,GAAG,EAAE,IACRC,IAAI,GAAG,CAAC,IACRA,IAAI,GAAG,EAAE,IACTC,MAAM,GAAG,CAAC,IACVA,MAAM,GAAG,EAAE,IACXG,UAAU,CAACG,WAAW,CAAC,CAAC,KAAKJ,IAAI,IACjCC,UAAU,CAACI,QAAQ,CAAC,CAAC,KAAKV,KAAK,GAAG,CAAC,IACnCM,UAAU,CAACK,OAAO,CAAC,CAAC,KAAKV,GAAG,EAC5B;IACA,OAAON,SAAS;EAClB;EAEA,OAAO;IACLC,IAAI,EAAEA,IAAa;IACnBf,KAAK,EAAEe,IAAI,KAAK,CAAC,GAAGQ,QAAQ,GAAG,EAAE,GAAGA,QAAQ;IAC5CE;EACF,CAAC;AACH,CAAC;;AAED;AACA,OAAO,MAAMM,iBAAiB,CAAwB;EAC7CC,SAASA,CAACC,MAAyB,EAAmB;IAC3D,MAAMC,cAAc,GAAGD,MAAM,CAACE,OAAO,CAAC,IAAI,CAAC;IAE3C,IAAID,cAAc,GAAG,CAAC,IAAID,MAAM,CAACC,cAAc,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE;MAC7D,OAAO;QACLE,MAAM,EAAE1C,eAAe,CAAC2C,UAAU;QAClCC,aAAa,EAAE;MACjB,CAAC;IACH;IAEA,MAAMC,GAAG,GAAGL,cAAc,GAAG,CAAC;IAE9B,OAAO;MACLE,MAAM,EAAE1C,eAAe,CAAC8C,QAAQ;MAChCF,aAAa,EAAEC,GAAG;MAClB/B,KAAK,EAAEyB,MAAM,CAACQ,KAAK,CAAC,CAAC,EAAEF,GAAG;IAC5B,CAAC;EACH;AACF","ignoreList":[]}
+{"version":3,"names":["complete","incomplete","hexToByte","POCTOR_SERVICE","POCTOR_WRITE","POCTOR_NOTIFY","fromHex","value","fromAscii","bytes","map","String","fromCharCode","join","parsePoctorResult","frame","text","trim","fields","split","length","undefined","type","Number","parseInt","yearValue","month","day","hour","minute","rawValue","year","recordedAt","Date","isFinite","getFullYear","getMonth","getDate","PoctorFrameReader","readFrame","buffer","carriageReturn","indexOf","end","slice"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/poctor.m3102.protocol.ts"],"mappings":"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","ignoreList":[]}

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

@@ -2,31 +2,25 @@
 
 /* eslint-disable import/group-exports */
 
-import { MeasurementTypeKey } from "@ovok/core";
-import { NO_PARSING_CASES } from "../../../constants/no-parsing-cases.js";
+import { PREFERRED_MTU } from "../../../constants/preferred-mtu.js";
 import { BTManagedDevice } from "../bt-managed-device.js";
+import { monitorService } from "../monitor-service.js";
 import { SP20_NOTIFY, SP20_SERVICE, SP20_WRITE, Sp20FrameReader } from "./sp20.protocol.js";
 import { Sp20Sequencer } from "./sp20.sequencer.js";
-export const sp20MainServices = [{
+export const sp20MainServices = [monitorService({
   uuid: SP20_SERVICE,
-  monitorUuids: [{
-    uuid: SP20_NOTIFY,
-    parsingModel: NO_PARSING_CASES
-  }],
-  writeUuid: {
+  notify: SP20_NOTIFY,
+  write: {
     uuid: SP20_WRITE,
     mainCommandUuid: "aa55"
   }
-}];
+})];
 
 /** ViHealth SP-20, SP-20-BLE, and SP-20-WPS encrypted realtime oximeter. */
 export class Sp20Device extends BTManagedDevice {
   mainServices = sp20MainServices;
   stuckDataTimeout = 60_000;
-  preferredMtu = 247;
-  getSupportedMeasurementTypeKeys() {
-    return [MeasurementTypeKey.bloodOxygenPulseRate];
-  }
+  preferredMtu = PREFERRED_MTU;
   constructor(device, params) {
     super(device, params);
     this.frameReader = new Sp20FrameReader();
@@ -35,7 +29,7 @@ export class Sp20Device extends BTManagedDevice {
         serviceUuid: SP20_SERVICE,
         characteristicUuid: SP20_WRITE
       },
-      onResult: result => this.onResult?.(result)
+      onResult: this.reportResult
     });
   }
 }

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

@@ -1 +1 @@
-{"version":3,"names":["MeasurementTypeKey","NO_PARSING_CASES","BTManagedDevice","SP20_NOTIFY","SP20_SERVICE","SP20_WRITE","Sp20FrameReader","Sp20Sequencer","sp20MainServices","uuid","monitorUuids","parsingModel","writeUuid","mainCommandUuid","Sp20Device","mainServices","stuckDataTimeout","preferredMtu","getSupportedMeasurementTypeKeys","bloodOxygenPulseRate","constructor","device","params","frameReader","createCommandSequencer","write","serviceUuid","characteristicUuid","onResult","result"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/sp20.device.ts"],"mappings":";;AAAA;;AAEA,SAASA,kBAAkB,QAAQ,YAAY;AAG/C,SAASC,gBAAgB,QAAQ,wCAAqC;AAMtE,SAASC,eAAe,QAAQ,yBAAsB;AAEtD,SACEC,WAAW,EACXC,YAAY,EACZC,UAAU,EACVC,eAAe,QACV,oBAAiB;AACxB,SAASC,aAAa,QAAQ,qBAAkB;AAOhD,OAAO,MAAMC,gBAA4B,GAAG,CAC1C;EACEC,IAAI,EAAEL,YAAY;EAClBM,YAAY,EAAE,CAAC;IAAED,IAAI,EAAEN,WAAW;IAAEQ,YAAY,EAAEV;EAAiB,CAAC,CAAC;EACrEW,SAAS,EAAE;IAAEH,IAAI,EAAEJ,UAAU;IAAEQ,eAAe,EAAE;EAAO;AACzD,CAAC,CACF;;AAED;AACA,OAAO,MAAMC,UAAU,SAASZ,eAAe,CAAe;EAClDa,YAAY,GAAGP,gBAAgB;EAC/BQ,gBAAgB,GAAG,MAAM;EAChBC,YAAY,GAAG,GAAG;EAClBC,+BAA+BA,CAAA,EAAyB;IACzE,OAAO,CAAClB,kBAAkB,CAACmB,oBAAoB,CAAC;EAClD;EAEOC,WAAWA,CAChBC,MAAc,EACdC,MAAwC,EACxC;IACA,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IACrB,IAAI,CAACC,WAAW,GAAG,IAAIjB,eAAe,CAAC,CAAC;IACxC,IAAI,CAACkB,sBAAsB,GAAG,MAC5B,IAAIjB,aAAa,CAAC;MAChBkB,KAAK,EAAE;QAAEC,WAAW,EAAEtB,YAAY;QAAEuB,kBAAkB,EAAEtB;MAAW,CAAC;MACpEuB,QAAQ,EAAGC,MAAM,IACf,IAAI,CAACD,QAAQ,GACXC,MAGF;IACJ,CAAC,CAAC;EACN;AAEF","ignoreList":[]}
+{"version":3,"names":["PREFERRED_MTU","BTManagedDevice","monitorService","SP20_NOTIFY","SP20_SERVICE","SP20_WRITE","Sp20FrameReader","Sp20Sequencer","sp20MainServices","uuid","notify","write","mainCommandUuid","Sp20Device","mainServices","stuckDataTimeout","preferredMtu","constructor","device","params","frameReader","createCommandSequencer","serviceUuid","characteristicUuid","onResult","reportResult"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/sp20.device.ts"],"mappings":";;AAAA;;AAIA,SAASA,aAAa,QAAQ,qCAAkC;AAIhE,SAASC,eAAe,QAAQ,yBAAsB;AACtD,SAASC,cAAc,QAAQ,uBAAoB;AAEnD,SACEC,WAAW,EACXC,YAAY,EACZC,UAAU,EACVC,eAAe,QACV,oBAAiB;AACxB,SAASC,aAAa,QAAQ,qBAAkB;AAOhD,OAAO,MAAMC,gBAA4B,GAAG,CAC1CN,cAAc,CAAC;EAAEO,IAAI,EAAEL,YAAY;EAAEM,MAAM,EAAEP,WAAW;EAAEQ,KAAK,EAAE;IAAEF,IAAI,EAAEJ,UAAU;IAAEO,eAAe,EAAE;EAAO;AAAE,CAAC,CAAC,CAClH;;AAED;AACA,OAAO,MAAMC,UAAU,SAASZ,eAAe,CAAe;EAClDa,YAAY,GAAGN,gBAAgB;EAC/BO,gBAAgB,GAAG,MAAM;EAChBC,YAAY,GAAGhB,aAAa;EAExCiB,WAAWA,CAChBC,MAAc,EACdC,MAAwC,EACxC;IACA,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IACrB,IAAI,CAACC,WAAW,GAAG,IAAId,eAAe,CAAC,CAAC;IACxC,IAAI,CAACe,sBAAsB,GAAG,MAC5B,IAAId,aAAa,CAAC;MAChBI,KAAK,EAAE;QAAEW,WAAW,EAAElB,YAAY;QAAEmB,kBAAkB,EAAElB;MAAW,CAAC;MACpEmB,QAAQ,EAAE,IAAI,CAACC;IACjB,CAAC,CAAC;EACN;AACF","ignoreList":[]}

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

@@ -2,16 +2,16 @@
 
 /* eslint-disable import/group-exports */
 
-import { FrameReadStatus } from "../../../types/frame-read-status.js";
+import { byteToHex } from "../../../utils/bytes-to-hex.js";
 import { calculateCrc8Pc } from "../../../utils/calculate-crc-8-pc.js";
+import { complete, corrupt, incomplete, noFrameStart } from "../../../utils/frame-read-results.js";
 import { hexToByte } from "../../../utils/hex-to-byte.js";
 export const SP20_SERVICE = "0000fff0-0000-1000-8000-00805f9b34fb";
 export const SP20_NOTIFY = "0000fff1-0000-1000-8000-00805f9b34fb";
 export const SP20_WRITE = "0000fff2-0000-1000-8000-00805f9b34fb";
-const byte = value => (value & 0xff).toString(16).padStart(2, "0");
 export const buildSp20Frame = (token, type, payload = []) => {
-  const frame = ["aa", "55", byte(token), byte(payload.length + 2), byte(type), ...payload.map(byte), "00"];
-  frame[frame.length - 1] = byte(calculateCrc8Pc(frame));
+  const frame = ["aa", "55", byteToHex(token), byteToHex(payload.length + 2), byteToHex(type), ...payload.map(byteToHex), "00"];
+  frame[frame.length - 1] = byteToHex(calculateCrc8Pc(frame));
   return frame;
 };
 export const decodeSp20Frame = frame => {
@@ -45,42 +45,23 @@ export class Sp20FrameReader {
   readFrame(buffer) {
     const start = this.findHeader(buffer);
     if (start < 0) {
-      return {
-        status: FrameReadStatus.INCOMPLETE,
-        consumedBytes: Math.max(0, buffer.length - 1)
-      };
+      return noFrameStart(buffer);
     }
     if (start + 4 > buffer.length) {
-      return {
-        status: FrameReadStatus.INCOMPLETE,
-        consumedBytes: start
-      };
+      return incomplete(start);
     }
     const length = hexToByte(buffer[start + 3] ?? "00") + 4;
     if (length < 6) {
-      return {
-        status: FrameReadStatus.CORRUPT,
-        consumedBytes: start + 2
-      };
+      return corrupt(start + 2);
     }
     if (start + length > buffer.length) {
-      return {
-        status: FrameReadStatus.INCOMPLETE,
-        consumedBytes: start
-      };
+      return incomplete(start);
     }
     const frame = buffer.slice(start, start + length);
     if (calculateCrc8Pc(frame) !== hexToByte(frame.at(-1) ?? "00")) {
-      return {
-        status: FrameReadStatus.CORRUPT,
-        consumedBytes: start + 2
-      };
+      return corrupt(start + 2);
     }
-    return {
-      status: FrameReadStatus.COMPLETE,
-      consumedBytes: start + length,
-      frame
-    };
+    return complete(frame, start + length);
   }
   findHeader = buffer => {
     for (let index = 0; index < buffer.length - 1; index += 1) {

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

@@ -1 +1 @@
-{"version":3,"names":["FrameReadStatus","calculateCrc8Pc","hexToByte","SP20_SERVICE","SP20_NOTIFY","SP20_WRITE","byte","value","toString","padStart","buildSp20Frame","token","type","payload","frame","length","map","decodeSp20Frame","at","undefined","content","slice","cipherText","parseSp20OximeterReading","flags","bloodOxygen","pulseRate","perfusionIndex","probeOff","pulseSearching","checkProbe","Sp20FrameReader","readFrame","buffer","start","findHeader","status","INCOMPLETE","consumedBytes","Math","max","CORRUPT","COMPLETE","index"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/sp20.protocol.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["byteToHex","calculateCrc8Pc","complete","corrupt","incomplete","noFrameStart","hexToByte","SP20_SERVICE","SP20_NOTIFY","SP20_WRITE","buildSp20Frame","token","type","payload","frame","length","map","decodeSp20Frame","at","undefined","content","slice","value","cipherText","parseSp20OximeterReading","flags","bloodOxygen","pulseRate","perfusionIndex","probeOff","pulseSearching","checkProbe","Sp20FrameReader","readFrame","buffer","start","findHeader","index"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/sp20.protocol.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/viatom/sp20.sequencer.js

@@ -3,13 +3,9 @@
 import { MeasurementTypeKey } from "@ovok/core";
 import { CaseType } from "../../../types/case-type.js";
 import { calculateCrc8Pc } from "../../../utils/calculate-crc-8-pc.js";
+import { withoutResponseCommand } from "../write-command.js";
 import { buildSp20Frame, decodeSp20Frame, parseSp20OximeterReading } from "./sp20.protocol.js";
 import { decryptLepuHandshake, decryptLepuPayload, encryptLepuPayload, parseLepuSessionKey, createLepuAccessToken } from "./viatom-lepu-crypto.js";
-const command = (write, frame) => ({
-  ...write,
-  frame,
-  withoutResponse: true
-});
 const validOxygen = value => value >= 50 && value <= 100;
 const validPulse = value => value > 0 && value <= 300;
 
@@ -105,6 +101,6 @@ export class Sp20Sequencer {
       recordedAt: this.params.now?.() ?? new Date()
     });
   };
-  write = frame => command(this.params.write, frame);
+  write = frame => withoutResponseCommand(this.params.write, frame);
 }
 //# sourceMappingURL=sp20.sequencer.js.map

package/lib/module/modules/bt-management/services/devices/viatom/sp20.sequencer.js.map

@@ -1 +1 @@
-{"version":3,"names":["MeasurementTypeKey","CaseType","calculateCrc8Pc","buildSp20Frame","decodeSp20Frame","parseSp20OximeterReading","decryptLepuHandshake","decryptLepuPayload","encryptLepuPayload","parseLepuSessionKey","createLepuAccessToken","command","write","frame","withoutResponse","validOxygen","value","validPulse","Sp20Sequencer","phase","constructor","params","initialCommands","token","now","Date","nextCommand","raw","undefined","response","decodePayload","acceptHandshake","type","encryptedCommand","report","content","sessionKey","decrypted","cipherText","length","slice","key","timePayload","payload","encrypted","toString","padStart","map","date","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","reading","probeOff","pulseSearching","checkProbe","bloodOxygen","pulseRate","onResult","caseType","RESULT","measurementTypeKey","bloodOxygenPulseRate","perfusionIndex","recordedAt"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/sp20.sequencer.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["MeasurementTypeKey","CaseType","calculateCrc8Pc","withoutResponseCommand","buildSp20Frame","decodeSp20Frame","parseSp20OximeterReading","decryptLepuHandshake","decryptLepuPayload","encryptLepuPayload","parseLepuSessionKey","createLepuAccessToken","validOxygen","value","validPulse","Sp20Sequencer","phase","constructor","params","initialCommands","token","now","Date","write","nextCommand","frame","raw","undefined","response","decodePayload","acceptHandshake","type","encryptedCommand","report","content","sessionKey","decrypted","cipherText","length","slice","key","timePayload","payload","encrypted","toString","padStart","map","date","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","reading","probeOff","pulseSearching","checkProbe","bloodOxygen","pulseRate","onResult","caseType","RESULT","measurementTypeKey","bloodOxygenPulseRate","perfusionIndex","recordedAt"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/sp20.sequencer.ts"],"mappings":"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","ignoreList":[]}