@ovok/native 1.10.14 → 1.11.0

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

@@ -2,6 +2,7 @@
 
 /* eslint-disable import/group-exports */
 
+import { byteToHex } from "../../../utils/bytes-to-hex.js";
 import { calculateCrc8 } from "../../../utils/calculate-crc-8.js";
 import { hexToByte } from "../../../utils/hex-to-byte.js";
 import { le16FromHex } from "../../../utils/le-16-from-hex.js";
@@ -21,8 +22,6 @@ export const OxyS3Command = {
   legacySyncTime: 0x16,
   legacyRealtimeParameters: 0x17
 };
-const byte = value => (value & 0xff).toString(16).padStart(2, "0");
-
 /** The app selects V2 from manufacturer byte 4, otherwise it uses byte 3. */
 export const parseOxyS3Advertisement = manufacturerData => {
   const bytes = manufacturerBytes(manufacturerData ?? undefined);
@@ -67,8 +66,8 @@ export const decodeOxyS3Response = (frame, protocol) => {
 
 /** Builds an Oxy V1 AA request; unlike the A5 family, its response does not echo opcodes. */
 export const buildOxyS3LegacyFrame = (command, payload = []) => {
-  const frame = ["aa", byte(command), byte(~command), "00", "00", byte(payload.length), byte(payload.length >>> 8), ...payload.map(byte), "00"];
-  frame[frame.length - 1] = byte(calculateCrc8(frame, frame.length - 1));
+  const frame = ["aa", byteToHex(command), byteToHex(~command), "00", "00", byteToHex(payload.length), byteToHex(payload.length >>> 8), ...payload.map(byteToHex), "00"];
+  frame[frame.length - 1] = byteToHex(calculateCrc8(frame, frame.length - 1));
   return frame;
 };
 export const parseOxyS3Reading = (payload, protocol) => {

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

@@ -1 +1 @@
-{"version":3,"names":["calculateCrc8","hexToByte","le16FromHex","manufacturerBytes","LepuFrameReader","OXY_S3_V1_SERVICE","OXY_S3_V1_WRITE","OXY_S3_V1_NOTIFY","OXY_S3_V2_SERVICE","OXY_S3_V2_WRITE","OXY_S3_V2_NOTIFY","OxyS3Command","authenticate","syncTime","enableRealtimeParameters","realtimeParameters","legacySyncTime","legacyRealtimeParameters","byte","value","toString","padStart","parseOxyS3Advertisement","manufacturerData","bytes","undefined","v2","protocolByte","encryptionLevel","protocol","encrypted","OxyS3FrameReader","reader","readFrame","buffer","decodeOxyS3Response","frame","startByte","length","commandOrStatus","payloadLength","checksumIndex","command","status","payload","slice","map","buildOxyS3LegacyFrame","parseOxyS3Reading","bloodOxygen","pulseRate","perfusionIndex"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/oxy-s3.protocol.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["byteToHex","calculateCrc8","hexToByte","le16FromHex","manufacturerBytes","LepuFrameReader","OXY_S3_V1_SERVICE","OXY_S3_V1_WRITE","OXY_S3_V1_NOTIFY","OXY_S3_V2_SERVICE","OXY_S3_V2_WRITE","OXY_S3_V2_NOTIFY","OxyS3Command","authenticate","syncTime","enableRealtimeParameters","realtimeParameters","legacySyncTime","legacyRealtimeParameters","parseOxyS3Advertisement","manufacturerData","bytes","undefined","v2","protocolByte","encryptionLevel","protocol","encrypted","OxyS3FrameReader","reader","readFrame","buffer","decodeOxyS3Response","frame","startByte","length","commandOrStatus","payloadLength","checksumIndex","command","status","payload","slice","map","value","buildOxyS3LegacyFrame","parseOxyS3Reading","bloodOxygen","pulseRate","perfusionIndex"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/oxy-s3.protocol.ts"],"mappings":"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","ignoreList":[]}

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

@@ -2,27 +2,25 @@
 
 /* eslint-disable import/group-exports */
 
-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 { VIATOM_AA55_NOTIFY, VIATOM_AA55_SERVICE, VIATOM_AA55_WRITE, ViatomAa55FrameReader } from "./viatom-aa55.protocol.js";
 import { ViatomAa55Sequencer } from "./viatom-aa55.sequencer.js";
-export const pc68bMainServices = [{
+export const pc68bMainServices = [monitorService({
   uuid: VIATOM_AA55_SERVICE,
-  monitorUuids: [{
-    uuid: VIATOM_AA55_NOTIFY,
-    parsingModel: NO_PARSING_CASES
-  }],
-  writeUuid: {
+  notify: VIATOM_AA55_NOTIFY,
+  write: {
     uuid: VIATOM_AA55_WRITE,
     mainCommandUuid: "aa55"
   }
-}];
+})];
 
 /** Viatom PC-68B realtime oximeter driver. */
 export class Pc68bDevice extends BTManagedDevice {
   mainServices = pc68bMainServices;
   stuckDataTimeout = 60_000;
-  preferredMtu = 247;
+  preferredMtu = PREFERRED_MTU;
   constructor(device, params) {
     super(device, params);
     this.frameReader = new ViatomAa55FrameReader();
@@ -32,7 +30,7 @@ export class Pc68bDevice extends BTManagedDevice {
         characteristicUuid: VIATOM_AA55_WRITE
       },
       perfusionScale: 0.1,
-      onResult: result => this.onResult?.(result)
+      onResult: this.reportResult
     });
   }
 }

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

@@ -1 +1 @@
-{"version":3,"names":["NO_PARSING_CASES","BTManagedDevice","VIATOM_AA55_NOTIFY","VIATOM_AA55_SERVICE","VIATOM_AA55_WRITE","ViatomAa55FrameReader","ViatomAa55Sequencer","pc68bMainServices","uuid","monitorUuids","parsingModel","writeUuid","mainCommandUuid","Pc68bDevice","mainServices","stuckDataTimeout","preferredMtu","constructor","device","params","frameReader","createCommandSequencer","write","serviceUuid","characteristicUuid","perfusionScale","onResult","result"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/pc68b.device.ts"],"mappings":";;AAAA;;AAIA,SAASA,gBAAgB,QAAQ,wCAAqC;AAMtE,SAASC,eAAe,QAAQ,yBAAsB;AAEtD,SACEC,kBAAkB,EAClBC,mBAAmB,EACnBC,iBAAiB,EACjBC,qBAAqB,QAChB,2BAAwB;AAC/B,SAASC,mBAAmB,QAAQ,4BAAyB;AAE7D,OAAO,MAAMC,iBAA6B,GAAG,CAC3C;EACEC,IAAI,EAAEL,mBAAmB;EACzBM,YAAY,EAAE,CAAC;IAAED,IAAI,EAAEN,kBAAkB;IAAEQ,YAAY,EAAEV;EAAiB,CAAC,CAAC;EAC5EW,SAAS,EAAE;IACTH,IAAI,EAAEJ,iBAAiB;IACvBQ,eAAe,EAAE;EACnB;AACF,CAAC,CACF;;AAED;AACA,OAAO,MAAMC,WAAW,SAASZ,eAAe,CAA0B;EAC9Da,YAAY,GAAGP,iBAAiB;EAChCQ,gBAAgB,GAAG,MAAM;EAChBC,YAAY,GAAG,GAAG;EAE9BC,WAAWA,CAChBC,MAAc,EACdC,MAAmD,EACnD;IACA,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IACrB,IAAI,CAACC,WAAW,GAAG,IAAIf,qBAAqB,CAAC,CAAC;IAC9C,IAAI,CAACgB,sBAAsB,GAAG,MAC5B,IAAIf,mBAAmB,CAAC;MACtBgB,KAAK,EAAE;QACLC,WAAW,EAAEpB,mBAAmB;QAChCqB,kBAAkB,EAAEpB;MACtB,CAAC;MACDqB,cAAc,EAAE,GAAG;MACnBC,QAAQ,EAAGC,MAAM,IACf,IAAI,CAACD,QAAQ,GACXC,MAGF;IACJ,CAAC,CAAC;EACN;AAEF","ignoreList":[]}
+{"version":3,"names":["PREFERRED_MTU","BTManagedDevice","monitorService","VIATOM_AA55_NOTIFY","VIATOM_AA55_SERVICE","VIATOM_AA55_WRITE","ViatomAa55FrameReader","ViatomAa55Sequencer","pc68bMainServices","uuid","notify","write","mainCommandUuid","Pc68bDevice","mainServices","stuckDataTimeout","preferredMtu","constructor","device","params","frameReader","createCommandSequencer","serviceUuid","characteristicUuid","perfusionScale","onResult","reportResult"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/pc68b.device.ts"],"mappings":";;AAAA;;AAIA,SAASA,aAAa,QAAQ,qCAAkC;AAIhE,SAASC,eAAe,QAAQ,yBAAsB;AACtD,SAASC,cAAc,QAAQ,uBAAoB;AAEnD,SACEC,kBAAkB,EAClBC,mBAAmB,EACnBC,iBAAiB,EACjBC,qBAAqB,QAChB,2BAAwB;AAC/B,SAASC,mBAAmB,QAAQ,4BAAyB;AAE7D,OAAO,MAAMC,iBAA6B,GAAG,CAC3CN,cAAc,CAAC;EAAEO,IAAI,EAAEL,mBAAmB;EAAEM,MAAM,EAAEP,kBAAkB;EAAEQ,KAAK,EAAE;IAAEF,IAAI,EAAEJ,iBAAiB;IAAEO,eAAe,EAAE;EAAQ;AAAE,CAAC,CAAC,CACxI;;AAED;AACA,OAAO,MAAMC,WAAW,SAASZ,eAAe,CAA0B;EAC9Da,YAAY,GAAGN,iBAAiB;EAChCO,gBAAgB,GAAG,MAAM;EAChBC,YAAY,GAAGhB,aAAa;EAExCiB,WAAWA,CAChBC,MAAc,EACdC,MAAmD,EACnD;IACA,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IACrB,IAAI,CAACC,WAAW,GAAG,IAAId,qBAAqB,CAAC,CAAC;IAC9C,IAAI,CAACe,sBAAsB,GAAG,MAC5B,IAAId,mBAAmB,CAAC;MACtBI,KAAK,EAAE;QACLW,WAAW,EAAElB,mBAAmB;QAChCmB,kBAAkB,EAAElB;MACtB,CAAC;MACDmB,cAAc,EAAE,GAAG;MACnBC,QAAQ,EAAE,IAAI,CAACC;IACjB,CAAC,CAAC;EACN;AAEF","ignoreList":[]}

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

@@ -1,25 +1,22 @@
 "use strict";
 
-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 { PC80B_NOTIFY, PC80B_SERVICE, PC80B_WRITE, Pc80FrameReader } from "./pc80b.protocol.js";
 import { Pc80bSequencer } from "./pc80b.sequencer.js";
-const pc80bMainServices = [{
+const pc80bMainServices = [monitorService({
   uuid: PC80B_SERVICE,
-  monitorUuids: [{
-    uuid: PC80B_NOTIFY,
-    parsingModel: NO_PARSING_CASES
-  }],
-  writeUuid: {
+  notify: PC80B_NOTIFY,
+  write: {
     uuid: PC80B_WRITE,
     mainCommandUuid: "a5"
   }
-}];
+})];
 class Pc80bDevice extends BTManagedDevice {
   mainServices = pc80bMainServices;
   stuckDataTimeout = 180_000;
-  preferredMtu = 247;
-  validatePackage = () => true;
+  preferredMtu = PREFERRED_MTU;
   constructor(device, params) {
     super(device, params);
     this.frameReader = new Pc80FrameReader();
@@ -28,7 +25,7 @@ class Pc80bDevice extends BTManagedDevice {
         serviceUuid: PC80B_SERVICE,
         characteristicUuid: PC80B_WRITE
       },
-      onResult: result => this.onResult?.(result)
+      onResult: this.reportResult
     });
   }
 }

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

@@ -1 +1 @@
-{"version":3,"names":["NO_PARSING_CASES","BTManagedDevice","PC80B_NOTIFY","PC80B_SERVICE","PC80B_WRITE","Pc80FrameReader","Pc80bSequencer","pc80bMainServices","uuid","monitorUuids","parsingModel","writeUuid","mainCommandUuid","Pc80bDevice","mainServices","stuckDataTimeout","preferredMtu","validatePackage","constructor","device","params","frameReader","createCommandSequencer","write","serviceUuid","characteristicUuid","onResult","result"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/pc80b.device.ts"],"mappings":";;AAEA,SAASA,gBAAgB,QAAQ,wCAAqC;AAMtE,SAASC,eAAe,QAAQ,yBAAsB;AAEtD,SACEC,YAAY,EACZC,aAAa,EACbC,WAAW,EACXC,eAAe,QACV,qBAAkB;AACzB,SAASC,cAAc,QAAQ,sBAAmB;AAElD,MAAMC,iBAA6B,GAAG,CACpC;EACEC,IAAI,EAAEL,aAAa;EACnBM,YAAY,EAAE,CAAC;IAAED,IAAI,EAAEN,YAAY;IAAEQ,YAAY,EAAEV;EAAiB,CAAC,CAAC;EACtEW,SAAS,EAAE;IACTH,IAAI,EAAEJ,WAAW;IACjBQ,eAAe,EAAE;EACnB;AACF,CAAC,CACF;AAED,MAAMC,WAAW,SAASZ,eAAe,CAA0B;EACvDa,YAAY,GAAGP,iBAAiB;EAChCQ,gBAAgB,GAAG,OAAO;EACjBC,YAAY,GAAG,GAAG;EAClBC,eAAe,GAAGA,CAAA,KAAe,IAAI;EAEjDC,WAAWA,CAChBC,MAAc,EACdC,MAAmD,EACnD;IACA,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IACrB,IAAI,CAACC,WAAW,GAAG,IAAIhB,eAAe,CAAC,CAAC;IACxC,IAAI,CAACiB,sBAAsB,GAAG,MAC5B,IAAIhB,cAAc,CAAC;MACjBiB,KAAK,EAAE;QACLC,WAAW,EAAErB,aAAa;QAC1BsB,kBAAkB,EAAErB;MACtB,CAAC;MACDsB,QAAQ,EAAGC,MAAM,IACf,IAAI,CAACD,QAAQ,GACXC,MAGF;IACJ,CAAC,CAAC;EACN;AAEF;AAEA,SAASd,WAAW,EAAEN,iBAAiB","ignoreList":[]}
+{"version":3,"names":["PREFERRED_MTU","BTManagedDevice","monitorService","PC80B_NOTIFY","PC80B_SERVICE","PC80B_WRITE","Pc80FrameReader","Pc80bSequencer","pc80bMainServices","uuid","notify","write","mainCommandUuid","Pc80bDevice","mainServices","stuckDataTimeout","preferredMtu","constructor","device","params","frameReader","createCommandSequencer","serviceUuid","characteristicUuid","onResult","reportResult"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/viatom/pc80b.device.ts"],"mappings":";;AAEA,SAASA,aAAa,QAAQ,qCAAkC;AAIhE,SAASC,eAAe,QAAQ,yBAAsB;AACtD,SAASC,cAAc,QAAQ,uBAAoB;AAEnD,SACEC,YAAY,EACZC,aAAa,EACbC,WAAW,EACXC,eAAe,QACV,qBAAkB;AACzB,SAASC,cAAc,QAAQ,sBAAmB;AAElD,MAAMC,iBAA6B,GAAG,CACpCN,cAAc,CAAC;EAAEO,IAAI,EAAEL,aAAa;EAAEM,MAAM,EAAEP,YAAY;EAAEQ,KAAK,EAAE;IAAEF,IAAI,EAAEJ,WAAW;IAAEO,eAAe,EAAE;EAAM;AAAE,CAAC,CAAC,CACpH;AAED,MAAMC,WAAW,SAASZ,eAAe,CAA0B;EACvDa,YAAY,GAAGN,iBAAiB;EAChCO,gBAAgB,GAAG,OAAO;EACjBC,YAAY,GAAGhB,aAAa;EAExCiB,WAAWA,CAChBC,MAAc,EACdC,MAAmD,EACnD;IACA,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IACrB,IAAI,CAACC,WAAW,GAAG,IAAId,eAAe,CAAC,CAAC;IACxC,IAAI,CAACe,sBAAsB,GAAG,MAC5B,IAAId,cAAc,CAAC;MACjBI,KAAK,EAAE;QACLW,WAAW,EAAElB,aAAa;QAC1BmB,kBAAkB,EAAElB;MACtB,CAAC;MACDmB,QAAQ,EAAE,IAAI,CAACC;IACjB,CAAC,CAAC;EACN;AAEF;AAEA,SAASZ,WAAW,EAAEL,iBAAiB","ignoreList":[]}

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":"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","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":"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","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":[]}