@ovok/native 1.10.9 → 1.10.10

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

@@ -0,0 +1,134 @@
+"use strict";
+
+import { MeasurementTypeKey } from "@ovok/core";
+import { CaseType } from "../../../types/case-type.js";
+import { ackCommand, AOJ_COMMAND, commandOf, getDataCommand, getSerialCommand, getSystemInfoCommand, payloadOf, readBloodPressure, readUnsentCount, setTimeCommand, setVoiceCommand, turnOffCommand, updateStatusCommand } from "./aoj-bp.protocol.js";
+/** MedM re-sends the time every 5 s, five times, then turns the monitor off. */
+const TIME_RETRY_MS = 5_000;
+const TIME_ATTEMPTS = 5;
+const SYSTEM_INFO_RETRY_MS = 2_000;
+
+/** Quiet time after the last record before the monitor is turned off. */
+const END_AFTER_MS = 30_000;
+
+/**
+ * The AOJ blood-pressure session: status, time, serial, system info, voice, then "send stored
+ * data", acknowledging every record. Records stay on the monitor - the SDK never sends MedM's
+ * optional delete - and the monitor is turned off after the upload goes quiet.
+ */
+class AojBpSequencer {
+  phase = "time";
+  timeAttempts = 0;
+  recorded = false;
+  turnedOff = false;
+  unsent = 0;
+  constructor(params) {
+    this.params = params;
+  }
+  initialCommands = () => {
+    if (this.params.listenOnly) {
+      this.phase = "data";
+      return [];
+    }
+    this.timeAttempts = 1;
+    return [this.command(updateStatusCommand()), this.command(setTimeCommand(this.now()), 1_000)];
+  };
+  isNormalDisconnect = () => this.turnedOff || this.recorded;
+  commandTimeoutMs = () => {
+    switch (this.phase) {
+      case "time":
+        return this.params.listenOnly ? undefined : TIME_RETRY_MS;
+      case "system-info":
+        return SYSTEM_INFO_RETRY_MS;
+      case "data":
+        return this.recorded && !this.params.listenOnly ? END_AFTER_MS : undefined;
+      default:
+        return undefined;
+    }
+  };
+  onCommandTimeout = () => {
+    if (this.phase === "time") {
+      if (this.timeAttempts >= TIME_ATTEMPTS) {
+        return this.turnOff();
+      }
+      this.timeAttempts += 1;
+      return {
+        commands: [this.command(setTimeCommand(this.now()))]
+      };
+    }
+    if (this.phase === "system-info") {
+      return {
+        commands: [this.command(getSystemInfoCommand())]
+      };
+    }
+    return this.phase === "data" ? this.turnOff() : {};
+  };
+  commandProgress = frame => commandOf(frame) === AOJ_COMMAND.record ? "partial" : "complete";
+  nextCommand = frame => {
+    const command = commandOf(frame);
+    if (command === AOJ_COMMAND.record) {
+      return this.record(payloadOf(frame));
+    }
+    if (this.phase === "time" && command === AOJ_COMMAND.ack) {
+      this.phase = "serial";
+      return [this.command(getSerialCommand())];
+    }
+    if (this.phase === "serial" && command === AOJ_COMMAND.serial) {
+      this.phase = "system-info";
+      return [this.command(getSystemInfoCommand())];
+    }
+    if (this.phase === "system-info" && command === AOJ_COMMAND.systemInfo) {
+      this.unsent = readUnsentCount(payloadOf(frame));
+      this.phase = "voice";
+      return [this.command(setVoiceCommand())];
+    }
+    if (this.phase === "voice" && command === AOJ_COMMAND.voice) {
+      this.phase = "data";
+      return [this.command(getDataCommand())];
+    }
+    return undefined;
+  };
+  record = payload => {
+    this.unsent -= 1;
+    const reading = readBloodPressure(payload);
+
+    // MedM acknowledges only a readable record; an error record is left unanswered.
+    if (!reading) {
+      return undefined;
+    }
+    this.recorded = true;
+    this.params.onResult({
+      caseType: CaseType.RESULT,
+      measurementTypeKey: MeasurementTypeKey.bloodPressure,
+      systolic: reading.systolic,
+      diastolic: reading.diastolic,
+      heartRate: reading.heartRate,
+      recordedAt: reading.recordedAt,
+      ...(reading.memorySlot ? {
+        memorySlot: reading.memorySlot
+      } : {}),
+      ...(reading.irregularHeartbeat ? {
+        irregularHeartbeat: true
+      } : {})
+    });
+    return [this.command(ackCommand())];
+  };
+  turnOff = () => {
+    this.phase = "done";
+    this.turnedOff = true;
+    return {
+      commands: [this.command(turnOffCommand())]
+    };
+  };
+  now = () => this.params.now?.() ?? new Date();
+  command = (frame, delayBeforeWriteMs) => ({
+    serviceUuid: this.params.service,
+    characteristicUuid: this.params.write,
+    frame,
+    ...(delayBeforeWriteMs ? {
+      delayBeforeWriteMs
+    } : {})
+  });
+}
+export { AojBpSequencer };
+//# sourceMappingURL=aoj-bp.sequencer.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["MeasurementTypeKey","CaseType","ackCommand","AOJ_COMMAND","commandOf","getDataCommand","getSerialCommand","getSystemInfoCommand","payloadOf","readBloodPressure","readUnsentCount","setTimeCommand","setVoiceCommand","turnOffCommand","updateStatusCommand","TIME_RETRY_MS","TIME_ATTEMPTS","SYSTEM_INFO_RETRY_MS","END_AFTER_MS","AojBpSequencer","phase","timeAttempts","recorded","turnedOff","unsent","constructor","params","initialCommands","listenOnly","command","now","isNormalDisconnect","commandTimeoutMs","undefined","onCommandTimeout","turnOff","commands","commandProgress","frame","record","nextCommand","ack","serial","systemInfo","voice","payload","reading","onResult","caseType","RESULT","measurementTypeKey","bloodPressure","systolic","diastolic","heartRate","recordedAt","memorySlot","irregularHeartbeat","Date","delayBeforeWriteMs","serviceUuid","service","characteristicUuid","write"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj-bp.sequencer.ts"],"mappings":"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","ignoreList":[]}

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

@@ -10,6 +10,24 @@ const LEGACY_CHARACTERISTIC = "00001524-1212-efde-1523-785feabcd123";
 const BGM_SERVICE = "0003cdd0-0000-1000-8000-00805f9b0131";
 const BGM_CHARACTERISTIC = "0003cdd1-0000-1000-8000-00805f9b0131";
 const GLUCOSE_REQUEST = "512600000000a31a";
+
+/**
+ * Frame byte 5 of the TaiDoc `0x26` stored-result reply (`51 26 d0 d1 d2 d3 a5 cs`) is d3:
+ * bits 6-7 the meal flag, where `11` marks a control-solution test, and on multi-parameter
+ * meters bits 2-5 the parameter - 0 glucose; 6 haematocrit, 7 ketone, 8 uric acid,
+ * 9 cholesterol, 11 haemoglobin, 12 lactate, 13 triglycerides. Single-parameter TaiDoc meters
+ * keep the strip code in bits 2-5 instead, so this check holds only for multi-parameter ones;
+ * the TD-4216 and GlucoCheck Gold behind these two parsers both are.
+ */
+const RECORD_FLAGS_BYTE = 5;
+const CONTROL_SOLUTION_FLAG = 0b11;
+const GLUCOSE_PARAMETER = 0;
+
+/** A stored TaiDoc result is a patient glucose reading, not another analyte or a control test. */
+const isPatientGlucoseRecord = frame => {
+  const flags = hexToByte(frame[RECORD_FLAGS_BYTE] ?? "00");
+  return flags >> 6 !== CONTROL_SOLUTION_FLAG && (flags >> 2 & 0x0f) === GLUCOSE_PARAMETER;
+};
 const servicesFor = device => {
   const isBgm = device === IntegratedDevices.BGM;
   return [{
@@ -59,10 +77,15 @@ export class BloodGlucoseDevice extends BTManagedDevice {
     this.mainServices = servicesFor(params.deviceName);
   }
   validatePackage = pkg => pkg.length >= (this.deviceData.name === IntegratedDevices.BGM ? 12 : 8);
-  handleSuccessResult(result) {
+  handleSuccessResult(result, frame) {
     if (result.caseType !== CaseType.RESULT || result.bloodGlucose === 0) {
       return;
     }
+
+    // A ketone, cholesterol or control-solution record decodes to a number too; it is not glucose.
+    if (this.deviceData.name !== IntegratedDevices.BGM && !isPatientGlucoseRecord(frame)) {
+      return;
+    }
     this.onResult?.(result);
   }
 }

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

@@ -1 +1 @@
-{"version":3,"names":["MeasurementTypeKey","CaseType","IntegratedDevices","hexToByte","BTManagedDevice","LEGACY_SERVICE","LEGACY_CHARACTERISTIC","BGM_SERVICE","BGM_CHARACTERISTIC","GLUCOSE_REQUEST","servicesFor","device","isBgm","BGM","uuid","monitorUuids","parsingModel","caseValuePosition","cases","GLUCOCHECK","map","caseValue","caseType","OTHER","parseDefinitions","measurementTypeKey","bloodGlucose","RESULT","name","parseType","byteIndexes","parseReference","customParserDefinition","value","slice","raw","parseInt","TAIDOC_GLUCOSE","Number","toFixed","writeUuid","mainCommandUuid","BloodGlucoseDevice","stuckDataTimeout","constructor","params","mainServices","deviceName","validatePackage","pkg","length","deviceData","handleSuccessResult","result","onResult"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/blood-glucose/blood-glucose.device.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["MeasurementTypeKey","CaseType","IntegratedDevices","hexToByte","BTManagedDevice","LEGACY_SERVICE","LEGACY_CHARACTERISTIC","BGM_SERVICE","BGM_CHARACTERISTIC","GLUCOSE_REQUEST","RECORD_FLAGS_BYTE","CONTROL_SOLUTION_FLAG","GLUCOSE_PARAMETER","isPatientGlucoseRecord","frame","flags","servicesFor","device","isBgm","BGM","uuid","monitorUuids","parsingModel","caseValuePosition","cases","GLUCOCHECK","map","caseValue","caseType","OTHER","parseDefinitions","measurementTypeKey","bloodGlucose","RESULT","name","parseType","byteIndexes","parseReference","customParserDefinition","value","slice","raw","parseInt","TAIDOC_GLUCOSE","Number","toFixed","writeUuid","mainCommandUuid","BloodGlucoseDevice","stuckDataTimeout","constructor","params","mainServices","deviceName","validatePackage","pkg","length","deviceData","handleSuccessResult","result","onResult"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/blood-glucose/blood-glucose.device.ts"],"mappings":";;AAAA,SAAkCA,kBAAkB,QAAQ,YAAY;AAGxE,SAASC,QAAQ,QAAQ,6BAA0B;AAGnD,SAASC,iBAAiB,QAAQ,sCAAmC;AAGrE,SAASC,SAAS,QAAQ,+BAA4B;AACtD,SAASC,eAAe,QAAQ,yBAAsB;AAEtD,MAAMC,cAAc,GAAG,sCAAsC;AAC7D,MAAMC,qBAAqB,GAAG,sCAAsC;AACpE,MAAMC,WAAW,GAAG,sCAAsC;AAC1D,MAAMC,kBAAkB,GAAG,sCAAsC;AACjE,MAAMC,eAAe,GAAG,kBAAkB;;AAE1C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,iBAAiB,GAAG,CAAC;AAC3B,MAAMC,qBAAqB,GAAG,IAAI;AAClC,MAAMC,iBAAiB,GAAG,CAAC;;AAE3B;AACA,MAAMC,sBAAsB,GAAIC,KAAwB,IAAc;EACpE,MAAMC,KAAK,GAAGZ,SAAS,CAACW,KAAK,CAACJ,iBAAiB,CAAC,IAAI,IAAI,CAAC;EAEzD,OACEK,KAAK,IAAI,CAAC,KAAKJ,qBAAqB,IACpC,CAAEI,KAAK,IAAI,CAAC,GAAI,IAAI,MAAMH,iBAAiB;AAE/C,CAAC;AAOD,MAAMI,WAAW,GAAIC,MAAqB,IAAiB;EACzD,MAAMC,KAAK,GAAGD,MAAM,KAAKf,iBAAiB,CAACiB,GAAG;EAE9C,OAAO,CACL;IACEC,IAAI,EAAEF,KAAK,GAAGX,WAAW,GAAGF,cAAc;IAC1CgB,YAAY,EAAE,CACZ;MACED,IAAI,EAAEF,KAAK,GAAGV,kBAAkB,GAAGF,qBAAqB;MACxDgB,YAAY,EAAE;QACZC,iBAAiB,EAAE,CAACL,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC;QAClCM,KAAK,EAAE,CACL,GAAG,CAACN,KAAK,GACL,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,GAChD,CAAC,IAAI,EAAE,IAAID,MAAM,KAAKf,iBAAiB,CAACuB,UAAU,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EACpEC,GAAG,CAAEC,SAAS,KAAM;UACpBC,QAAQ,EAAE3B,QAAQ,CAAC4B,KAAK;UACxBF,SAAS;UACTG,gBAAgB,EAAE;QACpB,CAAC,CAAC,CAAC,EACH;UACEC,kBAAkB,EAAE/B,kBAAkB,CAACgC,YAAY;UACnDJ,QAAQ,EAAE3B,QAAQ,CAACgC,MAAM;UACzBN,SAAS,EAAET,KAAK,GAAG,IAAI,GAAG,IAAI;UAC9BY,gBAAgB,EAAE,CAChB;YACEI,IAAI,EAAE,cAAc;YACpBC,SAAS,EAAE,QAAiB;YAC5BC,WAAW,EAAElB,KAAK,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;YACtCmB,cAAc,EAAE,EAAE;YAClBC,sBAAsB,EAAGC,KAAa,IAAa;cACjD,IAAIrB,KAAK,EAAE;gBACT,OAAOf,SAAS,CAACoC,KAAK,CAACC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,GAAGrC,SAAS,CAACoC,KAAK,CAACC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;cAC1E;cAEA,MAAMC,GAAG,GAAGC,QAAQ,CAACH,KAAK,EAAE,EAAE,CAAC;cAE/B,OAAOtB,MAAM,KAAKf,iBAAiB,CAACyC,cAAc,GAC9CC,MAAM,CAAC,CAACH,GAAG,GAAG,EAAE,EAAEI,OAAO,CAAC,CAAC,CAAC,CAAC,GAC7BJ,GAAG;YACT;UACF,CAAC;QAEL,CAAC;MAEL;IACF,CAAC,CACF;IACD,IAAIvB,KAAK,GACL,CAAC,CAAC,GACF;MACE4B,SAAS,EAAE;QACT1B,IAAI,EAAEd,qBAAqB;QAC3ByC,eAAe,EAAEtC;MACnB;IACF,CAAC;EACP,CAAC,CACF;AACH,CAAC;;AAED;AACA,OAAO,MAAMuC,kBAAkB,SAAS5C,eAAe,CAAgB;EAE3D6C,gBAAgB,GAAG,MAAM;EAG5BC,WAAWA,CAChBjC,MAAc,EACdkC,MAAyC,EACzC;IACA,KAAK,CAAClC,MAAM,EAAEkC,MAAM,CAAC;IACrB,IAAI,CAACC,YAAY,GAAGpC,WAAW,CAACmC,MAAM,CAACE,UAAU,CAAC;EACpD;EAEUC,eAAe,GAAIC,GAAa,IACxCA,GAAG,CAACC,MAAM,KAAK,IAAI,CAACC,UAAU,CAACvB,IAAI,KAAKhC,iBAAiB,CAACiB,GAAG,GAAG,EAAE,GAAG,CAAC,CAAC;EAE/DuC,mBAAmBA,CAC3BC,MAA2E,EAC3E7C,KAAe,EACT;IACN,IAAI6C,MAAM,CAAC/B,QAAQ,KAAK3B,QAAQ,CAACgC,MAAM,IAAI0B,MAAM,CAAC3B,YAAY,KAAK,CAAC,EAAE;MACpE;IACF;;IAEA;IACA,IACE,IAAI,CAACyB,UAAU,CAACvB,IAAI,KAAKhC,iBAAiB,CAACiB,GAAG,IAC9C,CAACN,sBAAsB,CAACC,KAAK,CAAC,EAC9B;MACA;IACF;IAEA,IAAI,CAAC8C,QAAQ,GAAGD,MAA0D,CAAC;EAC7E;AACF","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/bt-connection-handler.js

@@ -178,9 +178,35 @@ export class BTConnectionHandler {
     this.callbacks.onStatusChanged?.(DeviceStatus.DISCONNECTED);
     this.destroy();
   };
+
+  /** Declared services minus any optional one discovery did not find. */
+  servicesPresent = async () => {
+    if (!this.mainServices.some(({
+      optional
+    }) => optional) || typeof this.device.services !== "function") {
+      return this.mainServices;
+    }
+    let discovered;
+    try {
+      discovered = new Set((await this.device.services()).map(({
+        uuid
+      }) => uuid.toLowerCase()));
+    } catch {
+      // Without a service list, subscribe as declared rather than not at all.
+      return this.mainServices;
+    }
+    return this.mainServices.filter(({
+      uuid,
+      optional
+    }) => !optional || discovered.has(uuid.toLowerCase()));
+  };
   subscribeToAllCharacteristics = async () => {
     try {
-      for (const mainService of this.mainServices) {
+      const services = await this.servicesPresent();
+      this.callbacks.onServicesDiscovered?.(services.map(({
+        uuid
+      }) => uuid));
+      for (const mainService of services) {
         for (const monitorUuid of mainService.monitorUuids) {
           const subscription = this.device.monitorCharacteristicForService(mainService.uuid, monitorUuid.uuid, (error, result) => {
             if (error) {

package/lib/module/modules/bt-management/services/devices/bt-connection-handler.js.map

@@ -1 +1 @@
-{"version":3,"names":["sentryLogger","addOvokSpanEvent","recordOvokDuration","recordOvokMetric","startOvokSpan","BluetoothErrorCode","toBluetoothError","DeviceStatus","base64ToHex","BTCommandWriter","readDeviceInformation","BTConnectionHandler","characteristicSubscriptions","disconnectObserved","constructor","device","mainServices","callbacks","preferredMtu","writer","onError","isNormalDisconnect","connect","startedAt","Date","now","span","connectWithRetries","requestPreferredMtu","discoverAllServicesAndCharacteristics","onDeviceInfo","readBatteryLevel","isConnected","Error","onStatusChanged","CONNECTED","subscribeToAllCharacteristics","setStatus","code","error","errorCode","PAIRING_REQUIRED","onConnectionEvent","kind","pairingCodeRequired","DISCONNECTED","message","end","destroy","forEach","sub","remove","reset","onDisconnectSubscription","undefined","sendCommands","commands","send","negotiated","requestMTU","useNegotiatedMtu","mtu","requestedMtu","characteristic","readCharacteristicForService","value","Number","parseInt","isFinite","batteryLevel","maxRetries","retryDelay","maxDelay","connected","retryCount","listenForDisconnect","willRetry","Promise","resolve","setTimeout","Math","min","pow","onDisconnected","onDeviceDisconnected","mainService","monitorUuid","monitorUuids","subscription","monitorCharacteristicForService","uuid","result","processData","hexValue","onDataReceived","push","initialCommands","length","onCommandSent"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-connection-handler.ts"],"mappings":";;AAAA;;AAIA,SAASA,YAAY,QAAQ,yCAAsC;AACnE,SACEC,gBAAgB,EAChBC,kBAAkB,EAClBC,gBAAgB,EAChBC,aAAa,QACR,qCAAkC;AACzC,SAASC,kBAAkB,EAAEC,gBAAgB,QAAQ,gCAA6B;AAGlF,SAASC,YAAY,QAAQ,8BAA2B;AAExD,SAASC,WAAW,QAAQ,+BAA4B;AAExD,SAASC,eAAe,QAAQ,wBAAqB;AACrD,SAASC,qBAAqB,QAAQ,4BAAyB;AAqB/D,OAAO,MAAMC,mBAAmB,CAAC;EAEvBC,2BAA2B,GAAmB,EAAE;EAChDC,kBAAkB,GAAG,KAAK;EAGlCC,WAAWA,CACQC,MAAc,EACdC,YAA2C,EAC3CC,SAAqC,EACrCC,YAAqB,EACtC;IAAA,KAJiBH,MAAc,GAAdA,MAAc;IAAA,KACdC,YAA2C,GAA3CA,YAA2C;IAAA,KAC3CC,SAAqC,GAArCA,SAAqC;IAAA,KACrCC,YAAqB,GAArBA,YAAqB;IAEtC,IAAI,CAACC,MAAM,GAAG,IAAIV,eAAe,CAC/BM,MAAM,EACNE,SAAS,CAACG,OAAO,EACjBH,SAAS,CAACI,kBACZ,CAAC;EACH;EAEOC,OAAO,GAAG,MAAAA,CAAA,KAAY;IAC3B,MAAMC,SAAS,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC;IAE5B,IAAI,CAACZ,kBAAkB,GAAG,KAAK;IAE/B,MAAMa,IAAI,GAAGtB,aAAa,CAAC,mBAAmB,CAAC;IAE/C,IAAI;MACF,MAAM,IAAI,CAACuB,kBAAkB,CAAC,CAAC;MAE/B,MAAM,IAAI,CAACC,mBAAmB,CAAC,CAAC;MAEhC,MAAM,IAAI,CAACb,MAAM,CAACc,qCAAqC,CAAC,CAAC;MACzD,MAAMnB,qBAAqB,CAAC,IAAI,CAACK,MAAM,EAAE,IAAI,CAACE,SAAS,CAACa,YAAY,CAAC;MACrE,MAAM,IAAI,CAACC,gBAAgB,CAAC,CAAC;MAE7B,IAAI,IAAI,CAAClB,kBAAkB,IAAI,EAAE,MAAM,IAAI,CAACE,MAAM,CAACiB,WAAW,CAAC,CAAC,CAAC,EAAE;QACjE,MAAM,IAAIC,KAAK,CAAC,6CAA6C,CAAC;MAChE;MAEA,IAAI,CAAChB,SAAS,CAACiB,eAAe,GAAG3B,YAAY,CAAC4B,SAAS,CAAC;MAExD,MAAM,IAAI,CAACC,6BAA6B,CAAC,CAAC;MAC1CV,IAAI,EAAEW,SAAS,GAAG;QAAEC,IAAI,EAAE;MAAE,CAAC,CAAC;IAChC,CAAC,CAAC,OAAOC,KAAK,EAAE;MACd,MAAMC,SAAS,GAAGlC,gBAAgB,CAACiC,KAAK,CAAC,CAACD,IAAI;MAE9CtC,YAAY,CAAC,OAAO,EAAE,wCAAwC,EAAE;QAC9DwC;MACF,CAAC,CAAC;MACF,IAAI,CAACvB,SAAS,CAACG,OAAO,GAAGmB,KAAyB,CAAC;MACnD,IAAIjC,gBAAgB,CAACiC,KAAK,CAAC,CAACD,IAAI,KAAKjC,kBAAkB,CAACoC,gBAAgB,EAAE;QACxEtC,gBAAgB,CAAC,uBAAuB,EAAE,CAAC,EAAE;UAC3CqC;QACF,CAAC,CAAC;QACFvC,gBAAgB,CAAC,gBAAgB,EAAE;UAAEuC;QAAU,CAAC,EAAEd,IAAI,CAAC;QACvD,IAAI,CAACT,SAAS,CAACyB,iBAAiB,GAAG;UACjCC,IAAI,EAAE,SAAS;UACfC,mBAAmB,EAAE;QACvB,CAAC,CAAC;MACJ;MACA,IAAI,CAAC,IAAI,CAAC/B,kBAAkB,EAAE;QAC5B,IAAI,CAACI,SAAS,CAACiB,eAAe,GAAG3B,YAAY,CAACsC,YAAY,CAAC;MAC7D;MACAnB,IAAI,EAAEW,SAAS,GAAG;QAChBC,IAAI,EAAE,CAAC;QACPQ,OAAO,EAAEN;MACX,CAAC,CAAC;MACF,MAAMD,KAAK;IACb,CAAC,SAAS;MACRrC,kBAAkB,CAAC,iCAAiC,EAAEsB,IAAI,CAACC,GAAG,CAAC,CAAC,GAAGF,SAAS,CAAC;MAC7EG,IAAI,EAAEqB,GAAG,CAAC,CAAC;IACb;EACF,CAAC;EAEMC,OAAO,GAAGA,CAAA,KAAM;IACrB,IAAI,CAACpC,2BAA2B,CAACqC,OAAO,CAAEC,GAAG,IAAKA,GAAG,EAAEC,MAAM,CAAC,CAAC,CAAC;IAChE,IAAI,CAACvC,2BAA2B,GAAG,EAAE;IACrC,IAAI,CAACO,MAAM,CAACiC,KAAK,CAAC,CAAC;IAEnB,IAAI,CAACC,wBAAwB,EAAEF,MAAM,CAAC,CAAC;IACvC,IAAI,CAACE,wBAAwB,GAAGC,SAAS;EAC3C,CAAC;;EAED;EACOC,YAAY,GAAIC,QAAkC,IACvD,IAAI,CAACrC,MAAM,CAACsC,IAAI,CAACD,QAAQ,CAAC;;EAE5B;AACF;AACA;AACA;AACA;AACA;EACU5B,mBAAmB,GAAG,MAAAA,CAAA,KAA2B;IACvD,IAAI,CAAC,IAAI,CAACV,YAAY,EAAE;MACtB;IACF;IAEA,IAAI;MACF,MAAMwC,UAAU,GAAG,MAAM,IAAI,CAAC3C,MAAM,CAAC4C,UAAU,CAAC,IAAI,CAACzC,YAAY,CAAC;MAElE,IAAI,CAACC,MAAM,CAACyC,gBAAgB,CAACF,UAAU,EAAEG,GAAG,IAAI,IAAI,CAAC9C,MAAM,CAAC8C,GAAG,CAAC;IAClE,CAAC,CAAC,OAAOtB,KAAK,EAAE;MACd,MAAMC,SAAS,GAAGlC,gBAAgB,CAACiC,KAAK,CAAC,CAACD,IAAI;MAE9CtC,YAAY,CAAC,MAAM,EAAE,qCAAqC,EAAE;QAC1D8D,YAAY,EAAE,IAAI,CAAC5C,YAAY;QAC/BsB;MACF,CAAC,CAAC;IACJ;EACF,CAAC;;EAED;EACQT,gBAAgB,GAAG,MAAAA,CAAA,KAA2B;IACpD,IAAI;MACF,MAAMgC,cAAc,GAAG,MAAM,IAAI,CAAChD,MAAM,CAACiD,4BAA4B,CACnE,MAAM,EACN,MACF,CAAC;MAED,IAAI,CAACD,cAAc,CAACE,KAAK,EAAE;QACzB;MACF;MAEA,MAAMA,KAAK,GAAGC,MAAM,CAACC,QAAQ,CAAC3D,WAAW,CAACuD,cAAc,CAACE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC;MAE7E,IAAI,CAACC,MAAM,CAACE,QAAQ,CAACH,KAAK,CAAC,IAAIA,KAAK,GAAG,CAAC,IAAIA,KAAK,GAAG,GAAG,EAAE;QACvD;MACF;MAEA,IAAI,CAAChD,SAAS,CAACyB,iBAAiB,GAAG;QACjCC,IAAI,EAAE,SAAS;QACf0B,YAAY,EAAEJ;MAChB,CAAC,CAAC;IACJ,CAAC,CAAC,MAAM;MACN;IAAA;EAEJ,CAAC;EAEOtC,kBAAkB,GAAG,MAAAA,CAAA,KAAY;IACvC,MAAM2C,UAAU,GAAG,CAAC;IACpB,MAAMC,UAAU,GAAG,IAAI;IACvB,MAAMC,QAAQ,GAAG,KAAK;IACtB,IAAIC,SAAS,GAAG,KAAK;IACrB,IAAIC,UAAU,GAAG,CAAC;IAElB,OAAO,CAACD,SAAS,IAAIC,UAAU,GAAGJ,UAAU,EAAE;MAC5CG,SAAS,GAAG,MAAM,IAAI,CAAC1D,MAAM,CAACiB,WAAW,CAAC,CAAC;MAC3C,IAAIyC,SAAS,EAAE;QACb,IAAI,CAACE,mBAAmB,CAAC,CAAC;QAE1B;MACF;MACA,IAAI;QACF,MAAM,IAAI,CAAC5D,MAAM,CAACO,OAAO,CAAC,CAAC;QAC3B,IAAI,CAACqD,mBAAmB,CAAC,CAAC;QAC1BF,SAAS,GAAG,IAAI;MAClB,CAAC,CAAC,OAAOlC,KAAK,EAAE;QACdmC,UAAU,EAAE;QACZ,MAAMlC,SAAS,GAAGlC,gBAAgB,CAACiC,KAAK,CAAC,CAACD,IAAI;QAE9CtC,YAAY,CAAC,OAAO,EAAE,2BAA2B,EAAE;UACjDwC,SAAS;UACTkC;QACF,CAAC,CAAC;QACF,IAAIA,UAAU,IAAIJ,UAAU,EAAE;UAC5BtE,YAAY,CAAC,OAAO,EAAE,6CAA6C,EAAE;YACnEwC,SAAS;YACToC,SAAS,EAAEF,UAAU,GAAGJ;UAC1B,CAAC,CAAC;UACF,MAAM/B,KAAK;QACb;QAEA,MAAM,IAAIsC,OAAO,CAAEC,OAAO,IACxBC,UAAU,CACRD,OAAO,EACPE,IAAI,CAACC,GAAG,CAACV,UAAU,GAAGS,IAAI,CAACE,GAAG,CAAC,CAAC,EAAER,UAAU,GAAG,CAAC,CAAC,EAAEF,QAAQ,CAC7D,CACF,CAAC;MACH;IACF;EACF,CAAC;EAEOG,mBAAmB,GAAGA,CAAA,KAAM;IAClC,IAAI,CAACtB,wBAAwB,EAAEF,MAAM,CAAC,CAAC;IACvC,IAAI,CAACE,wBAAwB,GAAG,IAAI,CAACtC,MAAM,CAACoE,cAAc,CACxD,IAAI,CAACC,oBACP,CAAC;EACH,CAAC;EAEOA,oBAAoB,GAAI7C,KAAsB,IAAK;IACzD,IAAI,CAAC1B,kBAAkB,GAAG,IAAI;IAC9Bb,YAAY,CAAC,MAAM,EAAE,oCAAoC,EAAE;MACzD,IAAIuC,KAAK,GAAG;QAAEC,SAAS,EAAElC,gBAAgB,CAACiC,KAAK,CAAC,CAACD;MAAK,CAAC,GAAG,CAAC,CAAC;IAC9D,CAAC,CAAC;IACF,IAAIC,KAAK,IAAI,CAAC,IAAI,CAACtB,SAAS,CAACI,kBAAkB,GAAG,CAAC,EAAE;MACnD,IAAI,CAACJ,SAAS,CAACG,OAAO,GAAGmB,KAAK,CAAC;IACjC;;IAEA;AACJ;AACA;AACA;AACA;AACA;IACI,IAAI,CAACtB,SAAS,CAACiB,eAAe,GAAG3B,YAAY,CAACsC,YAAY,CAAC;IAC3D,IAAI,CAACG,OAAO,CAAC,CAAC;EAChB,CAAC;EAEOZ,6BAA6B,GAAG,MAAAA,CAAA,KAAY;IAClD,IAAI;MACF,KAAK,MAAMiD,WAAW,IAAI,IAAI,CAACrE,YAAY,EAAE;QAC3C,KAAK,MAAMsE,WAAW,IAAID,WAAW,CAACE,YAAY,EAAE;UAClD,MAAMC,YAAY,GAAG,IAAI,CAACzE,MAAM,CAAC0E,+BAA+B,CAC9DJ,WAAW,CAACK,IAAI,EAChBJ,WAAW,CAACI,IAAI,EAChB,CAACnD,KAAK,EAAEoD,MAAM,KAAK;YACjB,IAAIpD,KAAK,EAAE;cACT,IAAI,CAACtB,SAAS,CAACG,OAAO,GAAGmB,KAAK,CAAC;cAE/B;YACF;YAEA,IAAI,CAACoD,MAAM,IAAI,CAACA,MAAM,CAAC1B,KAAK,EAAE;cAC5B,IAAI,CAAChD,SAAS,CAACG,OAAO,GACpB,IAAIa,KAAK,CAAC,iCAAiC,CAC7C,CAAC;cAED;YACF;YAEA,IAAIqD,WAAW,CAACM,WAAW,KAAK,KAAK,EAAE;cACrC,MAAMC,QAAQ,GAAGrF,WAAW,CAACmF,MAAM,CAAC1B,KAAK,CAAC;cAE1C,IAAI,CAAChD,SAAS,CAAC6E,cAAc,GAAGH,MAAM,CAACD,IAAI,EAAEG,QAAQ,CAAC;YACxD;UACF,CACF,CAAC;UAED,IAAI,CAACjF,2BAA2B,CAACmF,IAAI,CAACP,YAAY,CAAC;QACrD;MACF;MAEA,MAAMQ,eAAe,GAAG,IAAI,CAAC/E,SAAS,CAAC+E,eAAe,GAAG,CAAC,IAAI,EAAE;MAEhE,IAAIA,eAAe,CAACC,MAAM,GAAG,CAAC,EAAE;QAC9B,MAAM,IAAI,CAAC1C,YAAY,CAACyC,eAAe,CAAC;QACxC,IAAI,CAAC/E,SAAS,CAACiF,aAAa,GAAG,CAAC;MAClC;IACF,CAAC,CAAC,OAAO3D,KAAK,EAAE;MACd,MAAMC,SAAS,GAAGlC,gBAAgB,CAACiC,KAAK,CAAC,CAACD,IAAI;MAE9CtC,YAAY,CACV,OAAO,EACP,kDAAkD,EAClD;QACEwC;MACF,CACF,CAAC;MACD,IAAI,CAACvB,SAAS,CAACG,OAAO,GAAGmB,KAAyB,CAAC;IACrD;EACF,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["sentryLogger","addOvokSpanEvent","recordOvokDuration","recordOvokMetric","startOvokSpan","BluetoothErrorCode","toBluetoothError","DeviceStatus","base64ToHex","BTCommandWriter","readDeviceInformation","BTConnectionHandler","characteristicSubscriptions","disconnectObserved","constructor","device","mainServices","callbacks","preferredMtu","writer","onError","isNormalDisconnect","connect","startedAt","Date","now","span","connectWithRetries","requestPreferredMtu","discoverAllServicesAndCharacteristics","onDeviceInfo","readBatteryLevel","isConnected","Error","onStatusChanged","CONNECTED","subscribeToAllCharacteristics","setStatus","code","error","errorCode","PAIRING_REQUIRED","onConnectionEvent","kind","pairingCodeRequired","DISCONNECTED","message","end","destroy","forEach","sub","remove","reset","onDisconnectSubscription","undefined","sendCommands","commands","send","negotiated","requestMTU","useNegotiatedMtu","mtu","requestedMtu","characteristic","readCharacteristicForService","value","Number","parseInt","isFinite","batteryLevel","maxRetries","retryDelay","maxDelay","connected","retryCount","listenForDisconnect","willRetry","Promise","resolve","setTimeout","Math","min","pow","onDisconnected","onDeviceDisconnected","servicesPresent","some","optional","services","discovered","Set","map","uuid","toLowerCase","filter","has","onServicesDiscovered","mainService","monitorUuid","monitorUuids","subscription","monitorCharacteristicForService","result","processData","hexValue","onDataReceived","push","initialCommands","length","onCommandSent"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-connection-handler.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/bt-data-processor.js

@@ -78,7 +78,7 @@ export class BTDataProcessor {
       buffer.splice(0, result.consumedBytes);
       if (result.status === FrameReadStatus.COMPLETE) {
         this.handleFrame(uuid, result.frame);
-        this.answerFrame(result.frame);
+        this.answerFrame(result.frame, uuid);
         continue;
       }
       if (result.status === FrameReadStatus.CORRUPT) {
@@ -99,7 +99,7 @@ export class BTDataProcessor {
     }
     this.handleFrame(uuid, buffer);
     this.buffers.set(this.currentUuid, []);
-    this.answerFrame(buffer);
+    this.answerFrame(buffer, uuid);
   };
 
   /**
@@ -110,9 +110,9 @@ export class BTDataProcessor {
    * could not take the step that follows - the exchange would stop dead on the first frame
    * that was protocol rather than data.
    */
-  answerFrame = frame => {
+  answerFrame = (frame, uuid) => {
     const progress = this.callbacks.commandProgress?.(frame) ?? "complete";
-    const commands = this.callbacks.nextCommand?.(frame);
+    const commands = this.callbacks.nextCommand?.(frame, uuid);
     if (progress === "complete") {
       clearTimeout(this.commandTimeout);
       this.commandTimeout = undefined;

package/lib/module/modules/bt-management/services/devices/bt-data-processor.js.map

@@ -1 +1 @@
-{"version":3,"names":["sentryLogger","CaseType","FrameReadStatus","FrameParser","MeasurementStateMachine","BTDataProcessor","buffers","Map","constructor","device","mainServices","stuckDataTimeoutDuration","callbacks","frameReader","frameParser","measurementState","onStatusChanged","onStreamStart","onMeasurementEnd","onResult","currentUuid","destroy","clear","reset","clearTimeout","stuckDataTimeout","undefined","commandTimeout","processData","uuid","hexValue","String","toLowerCase","buffer","get","push","set","startStuckTimeout","readFramesFromBuffer","readWholeBuffer","armStuckTimeout","armCommandTimeout","startCommandTimeout","reader","length","result","readFrame","hasProgressed","consumedBytes","splice","status","COMPLETE","handleFrame","frame","answerFrame","CORRUPT","reportCorruptFrame","INCOMPLETE","validatePackage","progress","commandProgress","commands","nextCommand","sendCommands","data","parse","frameLength","dependentData","parsingCase","caseType","DEPENDENT","handleDependentResult","isMeasuring","measuring","advance","onError","Error","cause","message","setTimeout","cancelConnection","duration","commandTimeoutMs","onCommandTimeout","terminal"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-data-processor.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["sentryLogger","CaseType","FrameReadStatus","FrameParser","MeasurementStateMachine","BTDataProcessor","buffers","Map","constructor","device","mainServices","stuckDataTimeoutDuration","callbacks","frameReader","frameParser","measurementState","onStatusChanged","onStreamStart","onMeasurementEnd","onResult","currentUuid","destroy","clear","reset","clearTimeout","stuckDataTimeout","undefined","commandTimeout","processData","uuid","hexValue","String","toLowerCase","buffer","get","push","set","startStuckTimeout","readFramesFromBuffer","readWholeBuffer","armStuckTimeout","armCommandTimeout","startCommandTimeout","reader","length","result","readFrame","hasProgressed","consumedBytes","splice","status","COMPLETE","handleFrame","frame","answerFrame","CORRUPT","reportCorruptFrame","INCOMPLETE","validatePackage","progress","commandProgress","commands","nextCommand","sendCommands","data","parse","frameLength","dependentData","parsingCase","caseType","DEPENDENT","handleDependentResult","isMeasuring","measuring","advance","onError","Error","cause","message","setTimeout","cancelConnection","duration","commandTimeoutMs","onCommandTimeout","terminal"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-data-processor.ts"],"mappings":"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","ignoreList":[]}

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

@@ -4,6 +4,7 @@
 
 import { sentryLogger } from "../../../helpers/utils/sentry-logger.js";
 import { addOvokSpanEvent, recordOvokMetric } from "../../../helpers/utils/telemetry.js";
+import { findDeviceVariant } from "../../constants/device-variants.js";
 import { toBluetoothError } from "../../types/bluetooth-error.js";
 import { clockSyncCapabilityForDevice } from "../../types/clock-sync.js";
 import { DeviceStatus } from "../../types/device-status.js";
@@ -102,6 +103,15 @@ export class BTManagedDevice {
       measurementTypes: [],
       clockSync: clockSyncCapabilityForDevice(deviceName)
     };
+
+    // The scan matched the parser on `name` first and `localName` second; Android can report two different strings.
+    const variant = findDeviceVariant(String(deviceName), device.name ?? "") ?? findDeviceVariant(String(deviceName), device.localName ?? "");
+    if (variant) {
+      this.deviceData.variant = {
+        manufacturer: variant.manufacturer,
+        model: variant.model
+      };
+    }
     this.id = device.id;
     this.onDeviceStatusChanged = (status, measurementTypeKey) => {
       sentryLogger("info", "BT_MANAGER: Calling onDeviceStatusChanged callback", {
@@ -282,6 +292,7 @@ export class BTManagedDevice {
           this.deviceData.sn = info.serialNumber;
         }
       },
+      onServicesDiscovered: uuids => sequencer.onServicesDiscovered?.(uuids),
       initialCommands: () => sequencer.initialCommands(),
       onCommandSent: () => {
         this.dataProcessor?.armStuckTimeout();
@@ -301,7 +312,7 @@ export class BTManagedDevice {
           this.onError?.bind(this)(error);
         }
       },
-      nextCommand: frame => sequencer.nextCommand(frame),
+      nextCommand: (frame, uuid) => sequencer.nextCommand(frame, uuid),
       sendCommands: commands => void this.connectionHandler?.sendCommands(commands),
       commandTimeoutMs: () => sequencer.commandTimeoutMs?.(),
       onCommandTimeout: () => sequencer.onCommandTimeout?.() ?? {},

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

@@ -1 +1 @@
-{"version":3,"names":["sentryLogger","addOvokSpanEvent","recordOvokMetric","toBluetoothError","clockSyncCapabilityForDevice","DeviceStatus","createStableResultId","supportedMeasurementTypeKeys","BTConnectionHandler","BTDataProcessor","pollingSequencerFor","BTManagedDevice","connected","destroyed","resultReportedThisConnection","historyTransferActive","bondedEventReported","reportedMeasurementKinds","Set","reportedDailyTotals","historyResultCount","getSupportedMeasurementTypeKeys","mainServices","reportsBondedEvent","handleMeasurementEnd","constructor","device","deviceName","onError","onErrorCallback","onDeviceStatusChanged","onDeviceStatusChangedCallback","onResult","onResultCallback","onConnectionEvent","onConnectionEventCallback","onDeviceDisconnected","onDeviceDisconnectedCallback","oneReadingPerConnection","resultPolicy","deviceData","id","name","localName","manufacturerData","sn","measurementTypes","clockSync","status","measurementTypeKey","model","error","normalized","errorCode","code","originalError","translationKey","Error","caseType","_","data","policy","byMeasurement","default","has","add","temporal","end","Date","undefined","now","getTime","day","start","recordedAt","key","toISOString","slice","kind","progress","current","result","Object","defineProperty","value","enumerable","writable","destroy","connectionHandler","dataProcessor","disconnect","cancelConnection","connectInternal","clear","sequencer","createCommandSequencer","isHistoryTransfer","onStatusChanged","CONNECTED","bind","DISCONNECTED","event","onDataReceived","uuid","hexValue","processData","onDeviceInfo","info","manufacturerName","serialNumber","initialCommands","onCommandSent","armStuckTimeout","armCommandTimeout","isNormalDisconnect","preferredMtu","stuckDataTimeout","onStreamStart","onMeasurementEnd","validatePackage","parsedData","collectedValues","handleSuccessResult","nextCommand","frame","sendCommands","commands","commandTimeoutMs","onCommandTimeout","commandProgress","handleDependentResult","frameReader","connect","Promise","reject","connectionPromise","resolve","finally"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-managed-device.ts"],"mappings":";;AAAA;;AAKA,SAASA,YAAY,QAAQ,yCAAsC;AACnE,SAASC,gBAAgB,EAAEC,gBAAgB,QAAQ,qCAAkC;AACrF,SAASC,gBAAgB,QAAQ,gCAA6B;AAC9D,SAASC,4BAA4B,QAAQ,2BAAwB;AAQrE,SAASC,YAAY,QAAQ,8BAA2B;AAQxD,SAASC,oBAAoB,QAAQ,gCAA6B;AAClE,SAASC,4BAA4B,QAAQ,gDAA6C;AAE1F,SAASC,mBAAmB,QAAQ,4BAAyB;AAC7D,SAASC,eAAe,QAAQ,wBAAqB;AACrD,SAASC,mBAAmB,QAAQ,gCAA6B;AAEjE,OAAO,MAAeC,eAAe,CAErC;EAKUC,SAAS,GAAG,KAAK;EACjBC,SAAS,GAAG,KAAK;EAMjBC,4BAA4B,GAAG,KAAK;EACpCC,qBAAqB,GAAG,KAAK;EAC7BC,mBAAmB,GAAG,KAAK;EAC3BC,wBAAwB,GAAG,IAAIC,GAAG,CAAqB,CAAC;EACxDC,mBAAmB,GAAG,IAAID,GAAG,CAAS,CAAC;EACvCE,kBAAkB,GAAG,CAAC;;EAG9B;AACF;AACA;;EAGE;EACUC,+BAA+BA,CAAA,EAAyB;IAChE,OAAOd,4BAA4B,CAAC,IAAI,CAACe,YAAY,CAAC;EACxD;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;;EAOE;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;EAGE;AACF;AACA;AACA;AACA;AACA;AACA;;EAGE;AACF;AACA;AACA;AACA;AACA;;EAGE;EACUC,kBAAkB,GAAG,KAAK;;EAEpC;AACF;AACA;AACA;AACA;AACA;;EAQE;EACUC,oBAAoBA,CAAA,EAAS,CAAC;EAYxCC,WAAWA,CACOC,MAAc,EAE9B;IACEC,UAAU;IACVC,OAAO,EAAEC,eAAe;IACxBC,qBAAqB,EAAEC,6BAA6B;IACpDC,QAAQ,EAAEC,gBAAgB;IAC1BC,iBAAiB,EAAEC,yBAAyB;IAC5CC,oBAAoB,EAAEC,4BAA4B;IAClDC,uBAAuB;IACvBC;EACqB,CAAC,EACxB;IAAA,KAZgBb,MAAc,GAAdA,MAAc;IAa9B,IAAI,CAACY,uBAAuB,GAAGA,uBAAuB,KAAK,IAAI;IAC/D,IAAI,CAACC,YAAY,GAAGA,YAAY;IAChCvC,YAAY,CAAC,MAAM,EAAE,sCAAsC,CAAC;IAC5D,IAAI,CAACwC,UAAU,GAAG;MAChBC,EAAE,EAAEf,MAAM,CAACe,EAAE;MACbC,IAAI,EAAEf,UAAU;MAChBgB,SAAS,EAAEjB,MAAM,CAACiB,SAAS,IAAI,EAAE;MACjCC,gBAAgB,EAAElB,MAAM,CAACkB,gBAAgB,IAAI,EAAE;MAC/CC,EAAE,EAAE,EAAE;MAEN;MACAC,gBAAgB,EAAE,EAAE;MACpBC,SAAS,EAAE3C,4BAA4B,CAACuB,UAAU;IACpD,CAAC;IAED,IAAI,CAACc,EAAE,GAAGf,MAAM,CAACe,EAAE;IAEnB,IAAI,CAACX,qBAAqB,GAAG,CAC3BkB,MAAoB,EACpBC,kBAAuC,KACpC;MACHjD,YAAY,CACV,MAAM,EACN,oDAAoD,EACpD;QACEgD,MAAM;QACNC;MACF,CACF,CAAC;MACDhD,gBAAgB,CAAC,uBAAuB,EAAE;QACxCiD,KAAK,EAAE,IAAI,CAACV,UAAU,CAACE,IAAI;QAC3BM,MAAM;QACNC,kBAAkB,EAAEA,kBAAkB,IAAI;MAC5C,CAAC,CAAC;MACFlB,6BAA6B,GAAG;QAC9BS,UAAU,EAAE,IAAI,CAACA,UAAU;QAC3BQ,MAAM,EAAEA,MAAM;QACdC;MACF,CAAC,CAAC;IACJ,CAAC;IACD,IAAI,CAACrB,OAAO,GAAIuB,KAAgC,IAAK;MACnD,MAAMC,UAAU,GAAGjD,gBAAgB,CAACgD,KAAK,CAAC;MAE1CnD,YAAY,CAAC,OAAO,EAAE,sCAAsC,EAAE;QAC5DqD,SAAS,EAAED,UAAU,CAACE;MACxB,CAAC,CAAC;MACF,MAAMC,aAAa,GAAGH,UAAU,CAACG,aAAa;MAE9C1B,eAAe,GAAG;QAChBW,UAAU,EAAE,IAAI,CAACA,UAAU;QAE3B;QACA;QACAW,KAAK,EACHC,UAAU,CAACI,cAAc,KACxBD,aAAa,YAAYE,KAAK,IAAI,OAAOF,aAAa,KAAK,QAAQ,GAChEA,aAAa,GACbH,UAAU,CAAC;QACjBE,IAAI,EAAEF,UAAU,CAACE;MACnB,CAAC,CAAC;IACJ,CAAC;IACD,IAAI,CAACtB,QAAQ,GAAG,CAAC;MACf0B,QAAQ,EAAEC,CAAC;MACX,GAAGC;IAC2B,CAAC,KAAK;MACpC,MAAMX,kBAAkB,GAAGW,IAAI,CAACX,kBAAkB;MAElD,MAAMY,MAAM,GACV,IAAI,CAACtB,YAAY,EAAEuB,aAAa,GAAGb,kBAAkB,CAAC,IACtD,IAAI,CAACV,YAAY,EAAEwB,OAAO,IAC1B,KAAK;MAEP,IACE,IAAI,CAACzB,uBAAuB,IAC5B,CAAC,IAAI,CAACC,YAAY,IAClB,IAAI,CAACzB,4BAA4B,EACjC;QACA;MACF;MAEA,IAAI+C,MAAM,KAAK,uCAAuC,EAAE;QACtD,IAAI,IAAI,CAAC5C,wBAAwB,CAAC+C,GAAG,CAACf,kBAAkB,CAAC,EAAE;UACzD;QACF;QACA,IAAI,CAAChC,wBAAwB,CAACgD,GAAG,CAAChB,kBAAkB,CAAC;MACvD;MAEA,IAAIY,MAAM,KAAK,mBAAmB,EAAE;QAClC,MAAMK,QAAQ,GAAGN,IAIhB;QAED,MAAMO,GAAG,GAAGD,QAAQ,CAACC,GAAG,YAAYC,IAAI,GAAGF,QAAQ,CAACC,GAAG,GAAGE,SAAS;QAEnE,MAAMC,GAAG,GAAG,IAAIF,IAAI,CAAC,CAAC;;QAEtB;QACA;QACA,IAAID,GAAG,IAAIA,GAAG,CAACI,OAAO,CAAC,CAAC,GAAGD,GAAG,CAACC,OAAO,CAAC,CAAC,EAAE;UACxC;QACF;QAEA,MAAMC,GAAG,GAAGN,QAAQ,CAACC,GAAG,IAAID,QAAQ,CAACO,KAAK,IAAIP,QAAQ,CAACQ,UAAU;QAEjE,IAAIF,GAAG,YAAYJ,IAAI,EAAE;UACvB,MAAMO,GAAG,GAAG,GAAG1B,kBAAkB,IAAIuB,GAAG,CAACI,WAAW,CAAC,CAAC,CAACC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE;UAErE,IAAI,IAAI,CAAC1D,mBAAmB,CAAC6C,GAAG,CAACW,GAAG,CAAC,EAAE;YACrC;UACF;UAEA,IAAI,CAACxD,mBAAmB,CAAC8C,GAAG,CAACU,GAAG,CAAC;QACnC;MACF;MAEA,IAAI,CAAC7D,4BAA4B,GAAG,IAAI;MACxC,IAAI,CAACM,kBAAkB,IAAI,CAAC;MAC5BlB,gBAAgB,CAAC,wBAAwB,EAAE,CAAC,EAAE;QAC5CgD,KAAK,EAAE,IAAI,CAACV,UAAU,CAACE,IAAI;QAC3BO;MACF,CAAC,CAAC;MACFhD,gBAAgB,CAAC,kBAAkB,EAAE;QACnCiD,KAAK,EAAE,IAAI,CAACV,UAAU,CAACE,IAAI;QAC3BO;MACF,CAAC,CAAC;MACFjD,YAAY,CAAC,MAAM,EAAE,uCAAuC,EAAE;QAC5DiD;MACF,CAAC,CAAC;MACF,IAAI,IAAI,CAAClC,qBAAqB,EAAE;QAC9BoB,yBAAyB,GAAG;UAC1BK,UAAU,EAAE,IAAI,CAACA,UAAU;UAC3BsC,IAAI,EAAE,kBAAkB;UACxBC,QAAQ,EAAE;YAAEC,OAAO,EAAE,IAAI,CAAC5D;UAAmB;QAC/C,CAAC,CAAC;MACJ;MACA,MAAM6D,MAAM,GAAG;QAAEzC,UAAU,EAAE,IAAI,CAACA,UAAU;QAAEoB;MAAK,CAIlD;MAGDsB,MAAM,CAACC,cAAc,CAACF,MAAM,EAAE,IAAI,EAAE;QAClCG,KAAK,EAAE9E,oBAAoB,CAAC,IAAI,CAACkC,UAAU,EAAEoB,IAAmB,CAAC;QACjEyB,UAAU,EAAE,IAAI;QAChBC,QAAQ,EAAE;MACZ,CAAC,CAAC;MACFrD,gBAAgB,GAAGgD,MAAM,CAAC;IAC5B,CAAC;IACD,IAAI,CAAC7C,oBAAoB,GAAGC,4BAA4B;IACxD,IAAI,CAACH,iBAAiB,GAAGC,yBAAyB;EACpD;EAEOoD,OAAO,GAAGA,CAAA,KAAM;IACrB,IAAI,CAAC1E,SAAS,GAAG,IAAI;IACrB,IAAI,CAACW,oBAAoB,CAAC,CAAC;IAC3BxB,YAAY,CAAC,MAAM,EAAE,+BAA+B,CAAC;IACrD,IAAI,CAACwF,iBAAiB,EAAED,OAAO,CAAC,CAAC;IACjC,IAAI,CAACE,aAAa,EAAEF,OAAO,CAAC,CAAC;IAC7B,IAAI,CAAC3D,OAAO,GAAGyC,SAAS;IACxB,IAAI,CAACvC,qBAAqB,GAAGuC,SAAS;IACtC,IAAI,CAACrC,QAAQ,GAAGqC,SAAS;IACzB,IAAI,CAACnC,iBAAiB,GAAGmC,SAAS;EACpC,CAAC;;EAED;EACOqB,UAAU,GAAG,MAAAA,CAAA,KAAY;IAC9B,IAAI,CAAC9E,SAAS,GAAG,KAAK;IACtB,IAAI,CAAC2E,OAAO,CAAC,CAAC;IAEd,IAAI;MACF,MAAM,IAAI,CAAC7D,MAAM,CAACiE,gBAAgB,CAAC,CAAC;IACtC,CAAC,CAAC,OAAOxC,KAAK,EAAE;MACd,MAAMC,UAAU,GAAGjD,gBAAgB,CAACgD,KAAK,CAAC;MAE1CnD,YAAY,CAAC,MAAM,EAAE,6CAA6C,EAAE;QAClEqD,SAAS,EAAED,UAAU,CAACE;MACxB,CAAC,CAAC;IACJ;EACF,CAAC;EAEOsC,eAAe,GAAG,MAAAA,CAAA,KAAY;IACpC,IAAI,CAAC9E,4BAA4B,GAAG,KAAK;IACzC,IAAI,CAACG,wBAAwB,CAAC4E,KAAK,CAAC,CAAC;IACrC,IAAI,CAAC1E,mBAAmB,CAAC0E,KAAK,CAAC,CAAC;IAChC,IAAI,CAACzE,kBAAkB,GAAG,CAAC;;IAE3B;IACA,IAAI,CAACoB,UAAU,CAACM,gBAAgB,GAAG,IAAI,CAACzB,+BAA+B,CAAC,CAAC;IAEzE,MAAMyE,SAA2B,GAC/B,IAAI,CAACC,sBAAsB,GAAG,CAAC,IAAIrF,mBAAmB,CAAC,IAAI,CAACY,YAAY,CAAC;IAE3E,IAAI,CAACP,qBAAqB,GAAG+E,SAAS,CAACE,iBAAiB,GAAG,CAAC,KAAK,IAAI;IAErE,IAAI,CAACR,iBAAiB,GAAG,IAAIhF,mBAAmB,CAC9C,IAAI,CAACkB,MAAM,EACX,IAAI,CAACJ,YAAY,EACjB;MACE2E,eAAe,EAAGjD,MAAM,IAAK;QAC3B,IAAI,CAACpC,SAAS,GAAGoC,MAAM,KAAK3C,YAAY,CAAC6F,SAAS;QAClD,IAAI,CAACpE,qBAAqB,EAAEqE,IAAI,CAAC,IAAI,CAAC,CAACnD,MAAM,CAAC;QAC9C,IACEA,MAAM,KAAK3C,YAAY,CAAC6F,SAAS,IACjC,IAAI,CAAC3E,kBAAkB,IACvB,CAAC,IAAI,CAACP,mBAAmB,EACzB;UACA,IAAI,CAACA,mBAAmB,GAAG,IAAI;UAC/B,IAAI,CAACkB,iBAAiB,GAAG;YACvBM,UAAU,EAAE,IAAI,CAACA,UAAU;YAC3BsC,IAAI,EAAE;UACR,CAAC,CAAC;QACJ;QACA,IAAI9B,MAAM,KAAK3C,YAAY,CAAC6F,SAAS,EAAE;UACrC,IAAI,CAAChE,iBAAiB,GAAG;YACvBM,UAAU,EAAE,IAAI,CAACA,UAAU;YAC3BsC,IAAI,EAAE;UACR,CAAC,CAAC;QACJ;QACA,IAAI9B,MAAM,KAAK3C,YAAY,CAAC+F,YAAY,EAAE;UACxC,IAAI,CAAChE,oBAAoB,GAAG,CAAC;UAC7B,IAAI,CAACmD,OAAO,CAAC,CAAC;QAChB;MACF,CAAC;MACD3D,OAAO,EAAGuB,KAAK,IAAK,IAAI,CAACvB,OAAO,EAAEuE,IAAI,CAAC,IAAI,CAAC,CAAChD,KAAK,CAAC;MACnDjB,iBAAiB,EAAGmE,KAAK,IACvB,IAAI,CAACnE,iBAAiB,GAAG;QAAEM,UAAU,EAAE,IAAI,CAACA,UAAU;QAAE,GAAG6D;MAAM,CAAC,CAAC;MACrEC,cAAc,EAAEA,CAACC,IAAI,EAAEC,QAAQ,KAAK;QAClC,IAAI,CAACf,aAAa,EAAEgB,WAAW,CAACF,IAAI,EAAEC,QAAQ,CAAC;MACjD,CAAC;MACDE,YAAY,EAAGC,IAAI,IAAK;QACtB,IAAIA,IAAI,CAACjE,IAAI,EAAE;UACb,IAAI,CAACF,UAAU,CAACG,SAAS,GAAGgE,IAAI,CAACjE,IAAI;QACvC;QACA,IAAIiE,IAAI,CAACC,gBAAgB,EAAE;UACzB,IAAI,CAACpE,UAAU,CAACoE,gBAAgB,GAAGD,IAAI,CAACC,gBAAgB;QAC1D;QACA,IAAID,IAAI,CAACzD,KAAK,EAAE;UACd,IAAI,CAACV,UAAU,CAACU,KAAK,GAAGyD,IAAI,CAACzD,KAAK;QACpC;QACA,IAAIyD,IAAI,CAACE,YAAY,EAAE;UACrB,IAAI,CAACrE,UAAU,CAACK,EAAE,GAAG8D,IAAI,CAACE,YAAY;QACxC;MACF,CAAC;MACDC,eAAe,EAAEA,CAAA,KAAMhB,SAAS,CAACgB,eAAe,CAAC,CAAC;MAClDC,aAAa,EAAEA,CAAA,KAAM;QACnB,IAAI,CAACtB,aAAa,EAAEuB,eAAe,CAAC,CAAC;QACrC,IAAI,CAACvB,aAAa,EAAEwB,iBAAiB,CAAC,CAAC;MACzC,CAAC;MACDC,kBAAkB,EAAEA,CAAA,KAAMpB,SAAS,CAACoB,kBAAkB,GAAG,CAAC,IAAI;IAChE,CAAC,EACD,IAAI,CAACC,YACP,CAAC;IAED,IAAI,CAAC1B,aAAa,GAAG,IAAIhF,eAAe,CACtC,IAAI,CAACiB,MAAM,EACX,IAAI,CAACJ,YAAY,EACjB,IAAI,CAAC8F,gBAAgB,EACrB;MACEnB,eAAe,EAAE,IAAI,CAACnE,qBAAqB,EAAEqE,IAAI,CAAC,IAAI,CAAC;MACvDkB,aAAa,EAAE,IAAI,CAACA,aAAa,EAAElB,IAAI,CAAC,IAAI,CAAC;MAC7CmB,gBAAgB,EAAE,IAAI,CAAC9F,oBAAoB,CAAC2E,IAAI,CAAC,IAAI,CAAC;MACtDoB,eAAe,EAAE,IAAI,CAACA,eAAe,EAAEpB,IAAI,CAAC,IAAI,CAAC,KAAK,MAAM,KAAK,CAAC;MAClEnE,QAAQ,EAAEA,CAACwF,UAAU,EAAEC,eAAe,KAAK;QACzC,IAAI;UACF,OAAO,IAAI,CAACC,mBAAmB,CAACvB,IAAI,CAAC,IAAI,CAAC,CACxCqB,UAAU,EACVC,eACF,CAAC;QACH,CAAC,CAAC,OAAOtE,KAAK,EAAE;UACd,IAAI,CAACvB,OAAO,EAAEuE,IAAI,CAAC,IAAI,CAAC,CAAChD,KAAyB,CAAC;QACrD;MACF,CAAC;MACDwE,WAAW,EAAGC,KAAK,IAAK9B,SAAS,CAAC6B,WAAW,CAACC,KAAK,CAAC;MACpDC,YAAY,EAAGC,QAAQ,IACrB,KAAK,IAAI,CAACtC,iBAAiB,EAAEqC,YAAY,CAACC,QAAQ,CAAC;MACrDC,gBAAgB,EAAEA,CAAA,KAAMjC,SAAS,CAACiC,gBAAgB,GAAG,CAAC;MACtDC,gBAAgB,EAAEA,CAAA,KAAMlC,SAAS,CAACkC,gBAAgB,GAAG,CAAC,IAAI,CAAC,CAAC;MAC5DC,eAAe,EAAGL,KAAK,IACrB9B,SAAS,CAACmC,eAAe,GAAGL,KAAK,CAAC,IAAI,UAAU;MAClDhG,OAAO,EAAE,IAAI,CAACA,OAAO,EAAEuE,IAAI,CAAC,IAAI,CAAC;MACjC+B,qBAAqB,EAAE,IAAI,CAACA,qBAAqB,EAAE/B,IAAI,CAAC,IAAI;IAC9D,CAAC,EACD,IAAI,CAACgC,WACP,CAAC;IAED,MAAM,IAAI,CAAC3C,iBAAiB,CAAC4C,OAAO,CAAC,CAAC;EACxC,CAAC;EAEMA,OAAO,GAAGA,CAAA,KAAqB;IACpC,IAAI,IAAI,CAACvH,SAAS,EAAE;MAClB,OAAOwH,OAAO,CAACC,MAAM,CAAC,IAAI7E,KAAK,CAAC,6CAA6C,CAAC,CAAC;IACjF;IAEA,IAAI,IAAI,CAAC8E,iBAAiB,EAAE;MAC1B,OAAO,IAAI,CAACA,iBAAiB;IAC/B;IAEA,IAAI,IAAI,CAAC3H,SAAS,EAAE;MAClB,OAAOyH,OAAO,CAACG,OAAO,CAAC,CAAC;IAC1B;IAEA,IAAI,CAACD,iBAAiB,GAAG,IAAI,CAAC3C,eAAe,CAAC,CAAC,CAAC6C,OAAO,CAAC,MAAM;MAC5D,IAAI,CAACF,iBAAiB,GAAGlE,SAAS;IACpC,CAAC,CAAC;IAEF,OAAO,IAAI,CAACkE,iBAAiB;EAC/B,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["sentryLogger","addOvokSpanEvent","recordOvokMetric","findDeviceVariant","toBluetoothError","clockSyncCapabilityForDevice","DeviceStatus","createStableResultId","supportedMeasurementTypeKeys","BTConnectionHandler","BTDataProcessor","pollingSequencerFor","BTManagedDevice","connected","destroyed","resultReportedThisConnection","historyTransferActive","bondedEventReported","reportedMeasurementKinds","Set","reportedDailyTotals","historyResultCount","getSupportedMeasurementTypeKeys","mainServices","reportsBondedEvent","handleMeasurementEnd","constructor","device","deviceName","onError","onErrorCallback","onDeviceStatusChanged","onDeviceStatusChangedCallback","onResult","onResultCallback","onConnectionEvent","onConnectionEventCallback","onDeviceDisconnected","onDeviceDisconnectedCallback","oneReadingPerConnection","resultPolicy","deviceData","id","name","localName","manufacturerData","sn","measurementTypes","clockSync","variant","String","manufacturer","model","status","measurementTypeKey","error","normalized","errorCode","code","originalError","translationKey","Error","caseType","_","data","policy","byMeasurement","default","has","add","temporal","end","Date","undefined","now","getTime","day","start","recordedAt","key","toISOString","slice","kind","progress","current","result","Object","defineProperty","value","enumerable","writable","destroy","connectionHandler","dataProcessor","disconnect","cancelConnection","connectInternal","clear","sequencer","createCommandSequencer","isHistoryTransfer","onStatusChanged","CONNECTED","bind","DISCONNECTED","event","onDataReceived","uuid","hexValue","processData","onDeviceInfo","info","manufacturerName","serialNumber","onServicesDiscovered","uuids","initialCommands","onCommandSent","armStuckTimeout","armCommandTimeout","isNormalDisconnect","preferredMtu","stuckDataTimeout","onStreamStart","onMeasurementEnd","validatePackage","parsedData","collectedValues","handleSuccessResult","nextCommand","frame","sendCommands","commands","commandTimeoutMs","onCommandTimeout","commandProgress","handleDependentResult","frameReader","connect","Promise","reject","connectionPromise","resolve","finally"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-managed-device.ts"],"mappings":";;AAAA;;AAKA,SAASA,YAAY,QAAQ,yCAAsC;AACnE,SAASC,gBAAgB,EAAEC,gBAAgB,QAAQ,qCAAkC;AACrF,SAASC,iBAAiB,QAAQ,oCAAiC;AACnE,SAASC,gBAAgB,QAAQ,gCAA6B;AAC9D,SAASC,4BAA4B,QAAQ,2BAAwB;AAQrE,SAASC,YAAY,QAAQ,8BAA2B;AAQxD,SAASC,oBAAoB,QAAQ,gCAA6B;AAClE,SAASC,4BAA4B,QAAQ,gDAA6C;AAE1F,SAASC,mBAAmB,QAAQ,4BAAyB;AAC7D,SAASC,eAAe,QAAQ,wBAAqB;AACrD,SAASC,mBAAmB,QAAQ,gCAA6B;AAEjE,OAAO,MAAeC,eAAe,CAErC;EAKUC,SAAS,GAAG,KAAK;EACjBC,SAAS,GAAG,KAAK;EAMjBC,4BAA4B,GAAG,KAAK;EACpCC,qBAAqB,GAAG,KAAK;EAC7BC,mBAAmB,GAAG,KAAK;EAC3BC,wBAAwB,GAAG,IAAIC,GAAG,CAAqB,CAAC;EACxDC,mBAAmB,GAAG,IAAID,GAAG,CAAS,CAAC;EACvCE,kBAAkB,GAAG,CAAC;;EAG9B;AACF;AACA;;EAGE;EACUC,+BAA+BA,CAAA,EAAyB;IAChE,OAAOd,4BAA4B,CAAC,IAAI,CAACe,YAAY,CAAC;EACxD;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;;EAOE;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;EAGE;AACF;AACA;AACA;AACA;AACA;AACA;;EAGE;AACF;AACA;AACA;AACA;AACA;;EAGE;EACUC,kBAAkB,GAAG,KAAK;;EAEpC;AACF;AACA;AACA;AACA;AACA;;EAQE;EACUC,oBAAoBA,CAAA,EAAS,CAAC;EAYxCC,WAAWA,CACOC,MAAc,EAE9B;IACEC,UAAU;IACVC,OAAO,EAAEC,eAAe;IACxBC,qBAAqB,EAAEC,6BAA6B;IACpDC,QAAQ,EAAEC,gBAAgB;IAC1BC,iBAAiB,EAAEC,yBAAyB;IAC5CC,oBAAoB,EAAEC,4BAA4B;IAClDC,uBAAuB;IACvBC;EACqB,CAAC,EACxB;IAAA,KAZgBb,MAAc,GAAdA,MAAc;IAa9B,IAAI,CAACY,uBAAuB,GAAGA,uBAAuB,KAAK,IAAI;IAC/D,IAAI,CAACC,YAAY,GAAGA,YAAY;IAChCxC,YAAY,CAAC,MAAM,EAAE,sCAAsC,CAAC;IAC5D,IAAI,CAACyC,UAAU,GAAG;MAChBC,EAAE,EAAEf,MAAM,CAACe,EAAE;MACbC,IAAI,EAAEf,UAAU;MAChBgB,SAAS,EAAEjB,MAAM,CAACiB,SAAS,IAAI,EAAE;MACjCC,gBAAgB,EAAElB,MAAM,CAACkB,gBAAgB,IAAI,EAAE;MAC/CC,EAAE,EAAE,EAAE;MAEN;MACAC,gBAAgB,EAAE,EAAE;MACpBC,SAAS,EAAE3C,4BAA4B,CAACuB,UAAU;IACpD,CAAC;;IAED;IACA,MAAMqB,OAAO,GACX9C,iBAAiB,CAAC+C,MAAM,CAACtB,UAAU,CAAC,EAAED,MAAM,CAACgB,IAAI,IAAI,EAAE,CAAC,IACxDxC,iBAAiB,CAAC+C,MAAM,CAACtB,UAAU,CAAC,EAAED,MAAM,CAACiB,SAAS,IAAI,EAAE,CAAC;IAE/D,IAAIK,OAAO,EAAE;MACX,IAAI,CAACR,UAAU,CAACQ,OAAO,GAAG;QACxBE,YAAY,EAAEF,OAAO,CAACE,YAAY;QAClCC,KAAK,EAAEH,OAAO,CAACG;MACjB,CAAC;IACH;IAEA,IAAI,CAACV,EAAE,GAAGf,MAAM,CAACe,EAAE;IAEnB,IAAI,CAACX,qBAAqB,GAAG,CAC3BsB,MAAoB,EACpBC,kBAAuC,KACpC;MACHtD,YAAY,CACV,MAAM,EACN,oDAAoD,EACpD;QACEqD,MAAM;QACNC;MACF,CACF,CAAC;MACDrD,gBAAgB,CAAC,uBAAuB,EAAE;QACxCmD,KAAK,EAAE,IAAI,CAACX,UAAU,CAACE,IAAI;QAC3BU,MAAM;QACNC,kBAAkB,EAAEA,kBAAkB,IAAI;MAC5C,CAAC,CAAC;MACFtB,6BAA6B,GAAG;QAC9BS,UAAU,EAAE,IAAI,CAACA,UAAU;QAC3BY,MAAM,EAAEA,MAAM;QACdC;MACF,CAAC,CAAC;IACJ,CAAC;IACD,IAAI,CAACzB,OAAO,GAAI0B,KAAgC,IAAK;MACnD,MAAMC,UAAU,GAAGpD,gBAAgB,CAACmD,KAAK,CAAC;MAE1CvD,YAAY,CAAC,OAAO,EAAE,sCAAsC,EAAE;QAC5DyD,SAAS,EAAED,UAAU,CAACE;MACxB,CAAC,CAAC;MACF,MAAMC,aAAa,GAAGH,UAAU,CAACG,aAAa;MAE9C7B,eAAe,GAAG;QAChBW,UAAU,EAAE,IAAI,CAACA,UAAU;QAE3B;QACA;QACAc,KAAK,EACHC,UAAU,CAACI,cAAc,KACxBD,aAAa,YAAYE,KAAK,IAAI,OAAOF,aAAa,KAAK,QAAQ,GAChEA,aAAa,GACbH,UAAU,CAAC;QACjBE,IAAI,EAAEF,UAAU,CAACE;MACnB,CAAC,CAAC;IACJ,CAAC;IACD,IAAI,CAACzB,QAAQ,GAAG,CAAC;MACf6B,QAAQ,EAAEC,CAAC;MACX,GAAGC;IAC2B,CAAC,KAAK;MACpC,MAAMV,kBAAkB,GAAGU,IAAI,CAACV,kBAAkB;MAElD,MAAMW,MAAM,GACV,IAAI,CAACzB,YAAY,EAAE0B,aAAa,GAAGZ,kBAAkB,CAAC,IACtD,IAAI,CAACd,YAAY,EAAE2B,OAAO,IAC1B,KAAK;MAEP,IACE,IAAI,CAAC5B,uBAAuB,IAC5B,CAAC,IAAI,CAACC,YAAY,IAClB,IAAI,CAACzB,4BAA4B,EACjC;QACA;MACF;MAEA,IAAIkD,MAAM,KAAK,uCAAuC,EAAE;QACtD,IAAI,IAAI,CAAC/C,wBAAwB,CAACkD,GAAG,CAACd,kBAAkB,CAAC,EAAE;UACzD;QACF;QACA,IAAI,CAACpC,wBAAwB,CAACmD,GAAG,CAACf,kBAAkB,CAAC;MACvD;MAEA,IAAIW,MAAM,KAAK,mBAAmB,EAAE;QAClC,MAAMK,QAAQ,GAAGN,IAIhB;QAED,MAAMO,GAAG,GAAGD,QAAQ,CAACC,GAAG,YAAYC,IAAI,GAAGF,QAAQ,CAACC,GAAG,GAAGE,SAAS;QAEnE,MAAMC,GAAG,GAAG,IAAIF,IAAI,CAAC,CAAC;;QAEtB;QACA;QACA,IAAID,GAAG,IAAIA,GAAG,CAACI,OAAO,CAAC,CAAC,GAAGD,GAAG,CAACC,OAAO,CAAC,CAAC,EAAE;UACxC;QACF;QAEA,MAAMC,GAAG,GAAGN,QAAQ,CAACC,GAAG,IAAID,QAAQ,CAACO,KAAK,IAAIP,QAAQ,CAACQ,UAAU;QAEjE,IAAIF,GAAG,YAAYJ,IAAI,EAAE;UACvB,MAAMO,GAAG,GAAG,GAAGzB,kBAAkB,IAAIsB,GAAG,CAACI,WAAW,CAAC,CAAC,CAACC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE;UAErE,IAAI,IAAI,CAAC7D,mBAAmB,CAACgD,GAAG,CAACW,GAAG,CAAC,EAAE;YACrC;UACF;UAEA,IAAI,CAAC3D,mBAAmB,CAACiD,GAAG,CAACU,GAAG,CAAC;QACnC;MACF;MAEA,IAAI,CAAChE,4BAA4B,GAAG,IAAI;MACxC,IAAI,CAACM,kBAAkB,IAAI,CAAC;MAC5BnB,gBAAgB,CAAC,wBAAwB,EAAE,CAAC,EAAE;QAC5CkD,KAAK,EAAE,IAAI,CAACX,UAAU,CAACE,IAAI;QAC3BW;MACF,CAAC,CAAC;MACFrD,gBAAgB,CAAC,kBAAkB,EAAE;QACnCmD,KAAK,EAAE,IAAI,CAACX,UAAU,CAACE,IAAI;QAC3BW;MACF,CAAC,CAAC;MACFtD,YAAY,CAAC,MAAM,EAAE,uCAAuC,EAAE;QAC5DsD;MACF,CAAC,CAAC;MACF,IAAI,IAAI,CAACtC,qBAAqB,EAAE;QAC9BoB,yBAAyB,GAAG;UAC1BK,UAAU,EAAE,IAAI,CAACA,UAAU;UAC3ByC,IAAI,EAAE,kBAAkB;UACxBC,QAAQ,EAAE;YAAEC,OAAO,EAAE,IAAI,CAAC/D;UAAmB;QAC/C,CAAC,CAAC;MACJ;MACA,MAAMgE,MAAM,GAAG;QAAE5C,UAAU,EAAE,IAAI,CAACA,UAAU;QAAEuB;MAAK,CAIlD;MAGDsB,MAAM,CAACC,cAAc,CAACF,MAAM,EAAE,IAAI,EAAE;QAClCG,KAAK,EAAEjF,oBAAoB,CAAC,IAAI,CAACkC,UAAU,EAAEuB,IAAmB,CAAC;QACjEyB,UAAU,EAAE,IAAI;QAChBC,QAAQ,EAAE;MACZ,CAAC,CAAC;MACFxD,gBAAgB,GAAGmD,MAAM,CAAC;IAC5B,CAAC;IACD,IAAI,CAAChD,oBAAoB,GAAGC,4BAA4B;IACxD,IAAI,CAACH,iBAAiB,GAAGC,yBAAyB;EACpD;EAEOuD,OAAO,GAAGA,CAAA,KAAM;IACrB,IAAI,CAAC7E,SAAS,GAAG,IAAI;IACrB,IAAI,CAACW,oBAAoB,CAAC,CAAC;IAC3BzB,YAAY,CAAC,MAAM,EAAE,+BAA+B,CAAC;IACrD,IAAI,CAAC4F,iBAAiB,EAAED,OAAO,CAAC,CAAC;IACjC,IAAI,CAACE,aAAa,EAAEF,OAAO,CAAC,CAAC;IAC7B,IAAI,CAAC9D,OAAO,GAAG4C,SAAS;IACxB,IAAI,CAAC1C,qBAAqB,GAAG0C,SAAS;IACtC,IAAI,CAACxC,QAAQ,GAAGwC,SAAS;IACzB,IAAI,CAACtC,iBAAiB,GAAGsC,SAAS;EACpC,CAAC;;EAED;EACOqB,UAAU,GAAG,MAAAA,CAAA,KAAY;IAC9B,IAAI,CAACjF,SAAS,GAAG,KAAK;IACtB,IAAI,CAAC8E,OAAO,CAAC,CAAC;IAEd,IAAI;MACF,MAAM,IAAI,CAAChE,MAAM,CAACoE,gBAAgB,CAAC,CAAC;IACtC,CAAC,CAAC,OAAOxC,KAAK,EAAE;MACd,MAAMC,UAAU,GAAGpD,gBAAgB,CAACmD,KAAK,CAAC;MAE1CvD,YAAY,CAAC,MAAM,EAAE,6CAA6C,EAAE;QAClEyD,SAAS,EAAED,UAAU,CAACE;MACxB,CAAC,CAAC;IACJ;EACF,CAAC;EAEOsC,eAAe,GAAG,MAAAA,CAAA,KAAY;IACpC,IAAI,CAACjF,4BAA4B,GAAG,KAAK;IACzC,IAAI,CAACG,wBAAwB,CAAC+E,KAAK,CAAC,CAAC;IACrC,IAAI,CAAC7E,mBAAmB,CAAC6E,KAAK,CAAC,CAAC;IAChC,IAAI,CAAC5E,kBAAkB,GAAG,CAAC;;IAE3B;IACA,IAAI,CAACoB,UAAU,CAACM,gBAAgB,GAAG,IAAI,CAACzB,+BAA+B,CAAC,CAAC;IAEzE,MAAM4E,SAA2B,GAC/B,IAAI,CAACC,sBAAsB,GAAG,CAAC,IAAIxF,mBAAmB,CAAC,IAAI,CAACY,YAAY,CAAC;IAE3E,IAAI,CAACP,qBAAqB,GAAGkF,SAAS,CAACE,iBAAiB,GAAG,CAAC,KAAK,IAAI;IAErE,IAAI,CAACR,iBAAiB,GAAG,IAAInF,mBAAmB,CAC9C,IAAI,CAACkB,MAAM,EACX,IAAI,CAACJ,YAAY,EACjB;MACE8E,eAAe,EAAGhD,MAAM,IAAK;QAC3B,IAAI,CAACxC,SAAS,GAAGwC,MAAM,KAAK/C,YAAY,CAACgG,SAAS;QAClD,IAAI,CAACvE,qBAAqB,EAAEwE,IAAI,CAAC,IAAI,CAAC,CAAClD,MAAM,CAAC;QAC9C,IACEA,MAAM,KAAK/C,YAAY,CAACgG,SAAS,IACjC,IAAI,CAAC9E,kBAAkB,IACvB,CAAC,IAAI,CAACP,mBAAmB,EACzB;UACA,IAAI,CAACA,mBAAmB,GAAG,IAAI;UAC/B,IAAI,CAACkB,iBAAiB,GAAG;YACvBM,UAAU,EAAE,IAAI,CAACA,UAAU;YAC3ByC,IAAI,EAAE;UACR,CAAC,CAAC;QACJ;QACA,IAAI7B,MAAM,KAAK/C,YAAY,CAACgG,SAAS,EAAE;UACrC,IAAI,CAACnE,iBAAiB,GAAG;YACvBM,UAAU,EAAE,IAAI,CAACA,UAAU;YAC3ByC,IAAI,EAAE;UACR,CAAC,CAAC;QACJ;QACA,IAAI7B,MAAM,KAAK/C,YAAY,CAACkG,YAAY,EAAE;UACxC,IAAI,CAACnE,oBAAoB,GAAG,CAAC;UAC7B,IAAI,CAACsD,OAAO,CAAC,CAAC;QAChB;MACF,CAAC;MACD9D,OAAO,EAAG0B,KAAK,IAAK,IAAI,CAAC1B,OAAO,EAAE0E,IAAI,CAAC,IAAI,CAAC,CAAChD,KAAK,CAAC;MACnDpB,iBAAiB,EAAGsE,KAAK,IACvB,IAAI,CAACtE,iBAAiB,GAAG;QAAEM,UAAU,EAAE,IAAI,CAACA,UAAU;QAAE,GAAGgE;MAAM,CAAC,CAAC;MACrEC,cAAc,EAAEA,CAACC,IAAI,EAAEC,QAAQ,KAAK;QAClC,IAAI,CAACf,aAAa,EAAEgB,WAAW,CAACF,IAAI,EAAEC,QAAQ,CAAC;MACjD,CAAC;MACDE,YAAY,EAAGC,IAAI,IAAK;QACtB,IAAIA,IAAI,CAACpE,IAAI,EAAE;UACb,IAAI,CAACF,UAAU,CAACG,SAAS,GAAGmE,IAAI,CAACpE,IAAI;QACvC;QACA,IAAIoE,IAAI,CAACC,gBAAgB,EAAE;UACzB,IAAI,CAACvE,UAAU,CAACuE,gBAAgB,GAAGD,IAAI,CAACC,gBAAgB;QAC1D;QACA,IAAID,IAAI,CAAC3D,KAAK,EAAE;UACd,IAAI,CAACX,UAAU,CAACW,KAAK,GAAG2D,IAAI,CAAC3D,KAAK;QACpC;QACA,IAAI2D,IAAI,CAACE,YAAY,EAAE;UACrB,IAAI,CAACxE,UAAU,CAACK,EAAE,GAAGiE,IAAI,CAACE,YAAY;QACxC;MACF,CAAC;MACDC,oBAAoB,EAAGC,KAAK,IAAKjB,SAAS,CAACgB,oBAAoB,GAAGC,KAAK,CAAC;MACxEC,eAAe,EAAEA,CAAA,KAAMlB,SAAS,CAACkB,eAAe,CAAC,CAAC;MAClDC,aAAa,EAAEA,CAAA,KAAM;QACnB,IAAI,CAACxB,aAAa,EAAEyB,eAAe,CAAC,CAAC;QACrC,IAAI,CAACzB,aAAa,EAAE0B,iBAAiB,CAAC,CAAC;MACzC,CAAC;MACDC,kBAAkB,EAAEA,CAAA,KAAMtB,SAAS,CAACsB,kBAAkB,GAAG,CAAC,IAAI;IAChE,CAAC,EACD,IAAI,CAACC,YACP,CAAC;IAED,IAAI,CAAC5B,aAAa,GAAG,IAAInF,eAAe,CACtC,IAAI,CAACiB,MAAM,EACX,IAAI,CAACJ,YAAY,EACjB,IAAI,CAACmG,gBAAgB,EACrB;MACErB,eAAe,EAAE,IAAI,CAACtE,qBAAqB,EAAEwE,IAAI,CAAC,IAAI,CAAC;MACvDoB,aAAa,EAAE,IAAI,CAACA,aAAa,EAAEpB,IAAI,CAAC,IAAI,CAAC;MAC7CqB,gBAAgB,EAAE,IAAI,CAACnG,oBAAoB,CAAC8E,IAAI,CAAC,IAAI,CAAC;MACtDsB,eAAe,EAAE,IAAI,CAACA,eAAe,EAAEtB,IAAI,CAAC,IAAI,CAAC,KAAK,MAAM,KAAK,CAAC;MAClEtE,QAAQ,EAAEA,CAAC6F,UAAU,EAAEC,eAAe,KAAK;QACzC,IAAI;UACF,OAAO,IAAI,CAACC,mBAAmB,CAACzB,IAAI,CAAC,IAAI,CAAC,CACxCuB,UAAU,EACVC,eACF,CAAC;QACH,CAAC,CAAC,OAAOxE,KAAK,EAAE;UACd,IAAI,CAAC1B,OAAO,EAAE0E,IAAI,CAAC,IAAI,CAAC,CAAChD,KAAyB,CAAC;QACrD;MACF,CAAC;MACD0E,WAAW,EAAEA,CAACC,KAAK,EAAEvB,IAAI,KAAKT,SAAS,CAAC+B,WAAW,CAACC,KAAK,EAAEvB,IAAI,CAAC;MAChEwB,YAAY,EAAGC,QAAQ,IACrB,KAAK,IAAI,CAACxC,iBAAiB,EAAEuC,YAAY,CAACC,QAAQ,CAAC;MACrDC,gBAAgB,EAAEA,CAAA,KAAMnC,SAAS,CAACmC,gBAAgB,GAAG,CAAC;MACtDC,gBAAgB,EAAEA,CAAA,KAAMpC,SAAS,CAACoC,gBAAgB,GAAG,CAAC,IAAI,CAAC,CAAC;MAC5DC,eAAe,EAAGL,KAAK,IACrBhC,SAAS,CAACqC,eAAe,GAAGL,KAAK,CAAC,IAAI,UAAU;MAClDrG,OAAO,EAAE,IAAI,CAACA,OAAO,EAAE0E,IAAI,CAAC,IAAI,CAAC;MACjCiC,qBAAqB,EAAE,IAAI,CAACA,qBAAqB,EAAEjC,IAAI,CAAC,IAAI;IAC9D,CAAC,EACD,IAAI,CAACkC,WACP,CAAC;IAED,MAAM,IAAI,CAAC7C,iBAAiB,CAAC8C,OAAO,CAAC,CAAC;EACxC,CAAC;EAEMA,OAAO,GAAGA,CAAA,KAAqB;IACpC,IAAI,IAAI,CAAC5H,SAAS,EAAE;MAClB,OAAO6H,OAAO,CAACC,MAAM,CAAC,IAAI/E,KAAK,CAAC,6CAA6C,CAAC,CAAC;IACjF;IAEA,IAAI,IAAI,CAACgF,iBAAiB,EAAE;MAC1B,OAAO,IAAI,CAACA,iBAAiB;IAC/B;IAEA,IAAI,IAAI,CAAChI,SAAS,EAAE;MAClB,OAAO8H,OAAO,CAACG,OAAO,CAAC,CAAC;IAC1B;IAEA,IAAI,CAACD,iBAAiB,GAAG,IAAI,CAAC7C,eAAe,CAAC,CAAC,CAAC+C,OAAO,CAAC,MAAM;MAC5D,IAAI,CAACF,iBAAiB,GAAGpE,SAAS;IACpC,CAAC,CAAC;IAEF,OAAO,IAAI,CAACoE,iBAAiB;EAC/B,CAAC;AACH","ignoreList":[]}

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

@@ -270,7 +270,7 @@ export class CustomDevice extends BTManagedDevice {
         caseType: CaseType.RESULT,
         recordedAt
       };
-      this.onResult?.(this.decorateReading(summary));
+      this.emit(this.decorateReading(summary));
     });
   }
   sessionAverage(measurementTypeKey, name, value) {
@@ -310,8 +310,16 @@ export class CustomDevice extends BTManagedDevice {
     });
   }
 
-  /** Adds protocol-specific metadata to a validated reading before it is emitted. */
-  decorateReading = (reading, frame, recordOffset) => this.definition.decorateReading?.(reading, frame, recordOffset) ?? reading;
+  /** Adds protocol-specific metadata to a validated reading; `null` withholds it. */
+  decorateReading = (reading, frame, recordOffset) => {
+    const decorate = this.definition.decorateReading;
+    return decorate ? decorate(reading, frame, recordOffset) : reading;
+  };
+  emit(reading) {
+    if (reading) {
+      this.onResult?.(reading);
+    }
+  }
 
   /**
    * Reports what the frame carried, which may be more than one reading.
@@ -362,7 +370,7 @@ export class CustomDevice extends BTManagedDevice {
       this.discard(rejection, reading);
       return;
     }
-    this.onResult?.(this.decorateReading(reading, frame, recordOffset));
+    this.emit(this.decorateReading(reading, frame, recordOffset));
   }
   createMeasurement(parsedData, measurement) {
     const reading = {

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

@@ -1 +1 @@
-{"version":3,"names":["MeasurementTypeKey","CaseType","createFrameValidator","parseMeasurement","discardedReadingError","rejectCustomReading","decodeBP2File","BTManagedDevice","LepuCommandBuilder","LepuEcgTransferSequencer","LepuFrameReader","TmbCommandSequencer","TmbFrameReader","decodeViatomBp3File","decodeViatomEcgRecording","recordedAtFromViatomFileName","createLepuSequencer","recordLepuIdentity","selectLepu","CustomDevice","reportedHistoryIds","Set","validators","Map","sessionAggregates","constructor","device","params","definition","oneReadingPerConnection","frameHandler","createFrameHandler","sessionPolicy","deviceData","clockSync","deliveredFileNames","deliveredEcgFileNames","selectedLepu","lepu","manufacturerData","undefined","mainServices","manufacturerDataProtocol","filter","service","uuid","write","serviceUuid","frameReader","stuckDataTimeout","reportsBondedEvent","preferredMtu","declareLepuProtocol","declareTmbProtocol","frames","forEach","frame","set","tmb","createCommandSequencer","protocol","startBytes","fileTransfer","clear","characteristicUuid","builder","rejectEncryptionAtBytes","expectedDeviceTypes","onIdentified","onRefused","onIdentityRefused","onFile","reportViatomEcgFile","reportViatomBp2File","reportViatomBp3File","skipFiles","acceptFile","name","ecgFileDecoder","test","pollCommand","pollIntervalMs","afterTransfer","build","onError","reason","Error","onProgress","progress","onConnectionEvent","kind","current","receivedBytes","total","totalBytes","file","decoded","content","samples","length","onResult","measurementTypeKey","ecg","caseType","RESULT","diagramPoints","duration","recordedAt","recordingId","has","add","info","id","validatePackage","pkg","validate","get","String","toLowerCase","handleDependentResult","data","parsingCase","requiresStream","isMeasuring","OTHER","handleFrame","parsedData","handlerOnly","captureSessionSample","STREAM","shouldReportDependentResult","reportFrame","error","_data","handleSuccessResult","successResult","collectedValues","emit","reading","handleMeasurementEnd","policy","aggregates","values","sessionStartedAt","aggregate","count","minSamples","summary","sample","Object","fromEntries","sums","entries","map","sessionAverage","decorateReading","value","decimals","fields","Math","trunc","Number","toFixed","measurements","frameRecordedAt","Date","measurement","createMeasurement","rejection","measurementRejection","key","existing","readingFields","fieldNames","recordOffset","repeated","repeatedRecords","report","records","floor","from","recordBytes","record","discard","reportMeasurement","parsedFields","find","message"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/custom/custom.device.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["MeasurementTypeKey","CaseType","createFrameValidator","parseMeasurement","discardedReadingError","rejectCustomReading","decodeBP2File","BTManagedDevice","LepuCommandBuilder","LepuEcgTransferSequencer","LepuFrameReader","TmbCommandSequencer","TmbFrameReader","decodeViatomBp3File","decodeViatomEcgRecording","recordedAtFromViatomFileName","createLepuSequencer","recordLepuIdentity","selectLepu","CustomDevice","reportedHistoryIds","Set","validators","Map","sessionAggregates","constructor","device","params","definition","oneReadingPerConnection","frameHandler","createFrameHandler","sessionPolicy","deviceData","clockSync","deliveredFileNames","deliveredEcgFileNames","selectedLepu","lepu","manufacturerData","undefined","mainServices","manufacturerDataProtocol","filter","service","uuid","write","serviceUuid","frameReader","stuckDataTimeout","reportsBondedEvent","preferredMtu","declareLepuProtocol","declareTmbProtocol","frames","forEach","frame","set","tmb","createCommandSequencer","protocol","startBytes","fileTransfer","clear","characteristicUuid","builder","rejectEncryptionAtBytes","expectedDeviceTypes","onIdentified","onRefused","onIdentityRefused","onFile","reportViatomEcgFile","reportViatomBp2File","reportViatomBp3File","skipFiles","acceptFile","name","ecgFileDecoder","test","pollCommand","pollIntervalMs","afterTransfer","build","onError","reason","Error","onProgress","progress","onConnectionEvent","kind","current","receivedBytes","total","totalBytes","file","decoded","content","samples","length","onResult","measurementTypeKey","ecg","caseType","RESULT","diagramPoints","duration","recordedAt","recordingId","has","add","info","id","validatePackage","pkg","validate","get","String","toLowerCase","handleDependentResult","data","parsingCase","requiresStream","isMeasuring","OTHER","handleFrame","parsedData","handlerOnly","captureSessionSample","STREAM","shouldReportDependentResult","reportFrame","error","_data","handleSuccessResult","successResult","collectedValues","emit","reading","handleMeasurementEnd","policy","aggregates","values","sessionStartedAt","aggregate","count","minSamples","summary","sample","Object","fromEntries","sums","entries","map","sessionAverage","decorateReading","value","decimals","fields","Math","trunc","Number","toFixed","measurements","frameRecordedAt","Date","measurement","createMeasurement","rejection","measurementRejection","key","existing","readingFields","fieldNames","recordOffset","decorate","repeated","repeatedRecords","report","records","floor","from","recordBytes","record","discard","reportMeasurement","parsedFields","find","message"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/custom/custom.device.ts"],"mappings":";;AAAA;AACA,SAASA,kBAAkB,QAAQ,YAAY;AAG/C,SAASC,QAAQ,QAAQ,6BAA0B;AAcnD,SAASC,oBAAoB,QAAQ,0CAAuC;AAC5E,SAASC,gBAAgB,QAAQ,qCAAkC;AACnE,SACEC,qBAAqB,EACrBC,mBAAmB,QACd,yCAAsC;AAC7C,SAASC,aAAa,QAAQ,qBAAkB;AAChD,SAASC,eAAe,QAAQ,yBAAsB;AACtD,SAASC,kBAAkB,QAAQ,iCAA8B;AAEjE,SAASC,wBAAwB,QAAQ,8BAA2B;AAEpE,SAASC,eAAe,QAAQ,8BAA2B;AAC3D,SAASC,mBAAmB,QAAQ,iCAA8B;AAClE,SAASC,cAAc,QAAQ,4BAAyB;AACxD,SAASC,mBAAmB,QAAQ,+BAA4B;AAChE,SACEC,wBAAwB,EACxBC,4BAA4B,QACvB,+BAA4B;AAEnC,SACEC,mBAAmB,EACnBC,kBAAkB,EAClBC,UAAU,QACL,4BAAyB;AAWhC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,YAAY,SAASZ,eAAe,CAAiB;EAQxDa,kBAAkB,GAAG,IAAIC,GAAG,CAAS,CAAC;EAC7BC,UAAU,GAAG,IAAIC,GAAG,CAAsC,CAAC;EAE3DC,iBAAiB,GAAG,IAAID,GAAG,CAA2B,CAAC;EAGxEE,WAAWA,CACTC,MAAc,EACdC,MAA0C,EAC1CC,UAAkC,EAClC;IACA,KAAK,CAACF,MAAM,EAAE;MACZ,GAAGC,MAAM;MACTE,uBAAuB,EACrBF,MAAM,CAACE,uBAAuB,IAAID,UAAU,CAACC;IACjD,CAAC,CAAC;IAEF,IAAI,CAACD,UAAU,GAAGA,UAAU;IAC5B,IAAI,CAACE,YAAY,GAAGF,UAAU,CAACG,kBAAkB,GAAG,CAAC;IACrD,IAAI,CAACC,aAAa,GAAGJ,UAAU,CAACI,aAAa;IAC7C,IAAI,CAACC,UAAU,CAACC,SAAS,GAAGN,UAAU,CAACM,SAAS;IAChD,IAAI,CAACC,kBAAkB,GAAG,IAAId,GAAG,CAAC,CAChC,IAAIM,MAAM,CAACS,qBAAqB,IAAI,EAAE,CAAC,EACvC,IAAIT,MAAM,CAACQ,kBAAkB,IAAI,EAAE,CAAC,CACrC,CAAC;IACF,MAAME,YAAY,GAAGT,UAAU,CAACU,IAAI,GAChCpB,UAAU,CAACU,UAAU,CAACU,IAAI,EAAEZ,MAAM,CAACa,gBAAgB,IAAIC,SAAS,CAAC,GACjEA,SAAS;IAEb,IAAI,CAACC,YAAY,GACfJ,YAAY,EAAEK,wBAAwB,KAAK,eAAe,GACtDd,UAAU,CAACa,YAAY,CAACE,MAAM,CAC3BC,OAAO,IAAKA,OAAO,CAACC,IAAI,KAAKR,YAAY,CAACS,KAAK,CAACC,WACnD,CAAC,GACDnB,UAAU,CAACa,YAAY;IAC7B,IAAI,CAACO,WAAW,GAAGpB,UAAU,CAACoB,WAAW;IACzC,IAAI,CAACC,gBAAgB,GAAGrB,UAAU,CAACqB,gBAAgB;IACnD,IAAI,CAACC,kBAAkB,GAAGtB,UAAU,CAACsB,kBAAkB,KAAK,IAAI;IAEhE,IAAItB,UAAU,CAACuB,YAAY,KAAKX,SAAS,EAAE;MACzC,IAAI,CAACW,YAAY,GAAGvB,UAAU,CAACuB,YAAY;IAC7C;IAEA,IAAI,CAACC,mBAAmB,CAACxB,UAAU,EAAED,MAAM,CAACO,SAAS,CAAC;IACtD,IAAI,CAACmB,kBAAkB,CAACzB,UAAU,EAAED,MAAM,CAACO,SAAS,CAAC;IAErDN,UAAU,CAAC0B,MAAM,CAACC,OAAO,CAAC,CAACC,KAAK,EAAEX,IAAI,KAAK;MACzC,IAAI,CAACvB,UAAU,CAACmC,GAAG,CAACZ,IAAI,EAAE3C,oBAAoB,CAACsD,KAAK,CAAC,CAAC;IACxD,CAAC,CAAC;EACJ;;EAEA;EACQH,kBAAkBA,CACxBzB,UAAkC,EAClCM,SAA0D,EACpD;IACN,MAAMwB,GAAG,GAAG9B,UAAU,CAAC8B,GAAG;IAE1B,IAAI,CAACA,GAAG,EAAE;MACR;IACF;IAEA,IAAI,CAACV,WAAW,GAAG,IAAIpC,cAAc,CAAC,CAAC;IACvC,IAAI,CAAC+C,sBAAsB,GAAG,MAC5B,IAAIhD,mBAAmB,CAAC;MACtBiD,QAAQ,EAAEF,GAAG;MACbxB;IACF,CAAC,CAAC;EACN;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACUkB,mBAAmBA,CACzBxB,UAAkC,EAClCM,SAA0D,EACpD;IACN,MAAMI,IAAI,GAAGV,UAAU,CAACU,IAAI;IAE5B,IAAI,CAACA,IAAI,EAAE;MACT;IACF;IAEA,IAAI,CAACU,WAAW,GAAG,IAAItC,eAAe,CAAC4B,IAAI,CAACuB,UAAU,CAAC;IAEvD,IAAI,CAACF,sBAAsB,GAAG,MAAM;MAClC,IAAIrB,IAAI,CAACwB,YAAY,KAAKtB,SAAS,EAAE;QACnC,IAAI,CAACpB,kBAAkB,CAAC2C,KAAK,CAAC,CAAC;QAE/B,OAAO,IAAItD,wBAAwB,CAAC;UAClCqC,KAAK,EAAE;YACLC,WAAW,EAAET,IAAI,CAACQ,KAAK,CAACC,WAAW;YACnCiB,kBAAkB,EAAE1B,IAAI,CAACQ,KAAK,CAACkB;UACjC,CAAC;UACDC,OAAO,EAAE,IAAIzD,kBAAkB,CAAC8B,IAAI,CAACuB,UAAU,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;UAC3D3B,SAAS;UACTK,gBAAgB,EAAE,IAAI,CAACb,MAAM,CAACa,gBAAgB,IAAIC,SAAS;UAC3D0B,uBAAuB,EAAE5B,IAAI,CAAC4B,uBAAuB;UACrDC,mBAAmB,EAAE7B,IAAI,CAAC6B,mBAAmB;UAC7CC,YAAY,EAAE,IAAI,CAACA,YAAY;UAC/BC,SAAS,EAAE,IAAI,CAACC,iBAAiB;UACjCC,MAAM,EACJjC,IAAI,CAACwB,YAAY,KAAK,KAAK,GACvB,IAAI,CAACU,mBAAmB,GACxBlC,IAAI,CAACwB,YAAY,KAAK,KAAK,GACzB,IAAI,CAACW,mBAAmB,GACxB,IAAI,CAACC,mBAAmB;UAChCC,SAAS,EACPrC,IAAI,CAACwB,YAAY,KAAK,KAAK,GAAGtB,SAAS,GAAG,IAAI,CAACL,kBAAkB;UACnEyC,UAAU,EACRtC,IAAI,CAACwB,YAAY,KAAK,KAAK,GACtBe,IAAI,IACHvC,IAAI,CAACwC,cAAc,KAAK,WAAW,IAAI,KAAK,CAACC,IAAI,CAACF,IAAI,CAAC,GACzDvC,IAAI,CAACwB,YAAY,KAAK,KAAK,GACxBe,IAAI,IAAK,aAAa,CAACE,IAAI,CAACF,IAAI,CAAC,GAClCrC,SAAS;UACjBwC,WAAW,EACT1C,IAAI,CAACwB,YAAY,KAAK,KAAK,GAAGtB,SAAS,GAAGF,IAAI,CAAC0C,WAAW;UAC5DC,cAAc,EACZ3C,IAAI,CAACwB,YAAY,KAAK,KAAK,GAAGtB,SAAS,GAAGF,IAAI,CAAC2C,cAAc;UAC/DC,aAAa,EACX5C,IAAI,CAACwB,YAAY,KAAK,KAAK,IAAIxB,IAAI,CAAC0C,WAAW,GAC3C,MAAM,CACJ;YACEjC,WAAW,EAAET,IAAI,CAACQ,KAAK,CAACC,WAAW;YACnCiB,kBAAkB,EAAE1B,IAAI,CAACQ,KAAK,CAACkB,kBAAkB;YACjDR,KAAK,EAAE,IAAIhD,kBAAkB,CAC3B8B,IAAI,CAACuB,UAAU,CAAC,CAAC,CAAC,IAAI,IACxB,CAAC,CAACsB,KAAK,CAAC7C,IAAI,CAAC0C,WAAY;UAC3B,CAAC,CACF,GACDxC,SAAS;UACf4C,OAAO,EAAGC,MAAM,IACd,IAAI,CAACD,OAAO,GAAG,IAAIE,KAAK,CAAC,eAAeD,MAAM,EAAE,CAAC,CAAC;UACpDE,UAAU,EAAGC,QAAQ,IACnB,IAAI,CAACC,iBAAiB,GAAG;YACvBxD,UAAU,EAAE,IAAI,CAACA,UAAU;YAC3ByD,IAAI,EAAE,kBAAkB;YACxBF,QAAQ,EAAE;cACRG,OAAO,EAAEH,QAAQ,CAACI,aAAa;cAC/BC,KAAK,EAAEL,QAAQ,CAACM;YAClB;UACF,CAAC;QACL,CAAC,CAAC;MACJ;MAEA,OAAO9E,mBAAmB,CACxBsB,IAAI,EACJ;QACE8B,YAAY,EAAE,IAAI,CAACA,YAAY;QAC/BC,SAAS,EAAE,IAAI,CAACC;MAClB,CAAC,EACDpC,SAAS,EACT,IAAI,CAACR,MAAM,CAACa,gBAAgB,IAAIC,SAClC,CAAC;IACH,CAAC;EACH;EAEQgC,mBAAmB,GAAIuB,IAAc,IAAW;IACtD,MAAMC,OAAO,GAAGlF,wBAAwB,CAACiF,IAAI,CAACE,OAAO,CAAC;IAEtD,IAAID,OAAO,CAACE,OAAO,CAACC,MAAM,KAAK,CAAC,EAAE;MAChC,IAAI,CAACf,OAAO,GACV,IAAIE,KAAK,CAAC,qBAAqBS,IAAI,CAAClB,IAAI,mBAAmB,CAC7D,CAAC;MAED;IACF;IAEA,IAAI,CAACuB,QAAQ,GAAG;MACdC,kBAAkB,EAAErG,kBAAkB,CAACsG,GAAG;MAC1CC,QAAQ,EAAEtG,QAAQ,CAACuG,MAAM;MACzBC,aAAa,EAAET,OAAO,CAACE,OAAO;MAC9BQ,QAAQ,EAAEV,OAAO,CAACU,QAAQ;MAC1BC,UAAU,EAAE5F,4BAA4B,CAACgF,IAAI,CAAClB,IAAI,CAAC;MACnD+B,WAAW,EAAEb,IAAI,CAAClB;IACpB,CAA4B,CAAC;EAC/B,CAAC;EAEOJ,mBAAmB,GAAIsB,IAAc,IAAW;IACtD,MAAMC,OAAO,GAAG1F,aAAa,CAACyF,IAAI,CAAClB,IAAI,EAAEkB,IAAI,CAACE,OAAO,CAAC;IAEtD,IAAI,CAACD,OAAO,IAAI,IAAI,CAAC5E,kBAAkB,CAACyF,GAAG,CAACb,OAAO,CAACY,WAAW,CAAC,EAAE;MAChE;IACF;IAEA,IAAI,CAACxF,kBAAkB,CAAC0F,GAAG,CAACd,OAAO,CAACY,WAAW,CAAC;IAChD,IAAI,CAACR,QAAQ,GAAG;MACd,GAAGJ,OAAO;MACVO,QAAQ,EAAEtG,QAAQ,CAACuG;IACrB,CAA4B,CAAC;EAC/B,CAAC;EAEO9B,mBAAmB,GAAIqB,IAAc,IAAW;IACtDlF,mBAAmB,CAACkF,IAAI,CAAClB,IAAI,EAAEkB,IAAI,CAACE,OAAO,CAAC,EAAE1C,OAAO,CAAEyC,OAAO,IAAK;MACjE,IACE,IAAI,CAAC7D,kBAAkB,CAAC0E,GAAG,CAACb,OAAO,CAACY,WAAW,CAAC,IAChD,IAAI,CAACxF,kBAAkB,CAACyF,GAAG,CAACb,OAAO,CAACY,WAAW,CAAC,EAChD;QACA;MACF;MAEA,IAAI,CAACxF,kBAAkB,CAAC0F,GAAG,CAACd,OAAO,CAACY,WAAW,CAAC;MAChD,IAAI,CAACR,QAAQ,GAAG;QACd,GAAGJ,OAAO;QACVO,QAAQ,EAAEtG,QAAQ,CAACuG;MACrB,CAA4B,CAAC;IAC/B,CAAC,CAAC;EACJ,CAAC;EAEOpC,YAAY,GAAI2C,IAAoB,IAC1C9F,kBAAkB,CAAC,IAAI,CAACgB,UAAU,EAAE8E,IAAI,CAAC;EAEnCzC,iBAAiB,GAAIe,MAAc,IAAW;IACpD,IAAI,CAACD,OAAO,GACV,IAAIE,KAAK,CACP,kBAAkB,IAAI,CAAC1D,UAAU,CAACoF,EAAE,wBAAwB3B,MAAM,GACpE,CACF,CAAC;EACH,CAAC;EAES4B,eAAe,GAAGA,CAACC,GAAa,EAAErE,IAAY,KAAc;IACpE,MAAMsE,QAAQ,GAAG,IAAI,CAAC7F,UAAU,CAAC8F,GAAG,CAACC,MAAM,CAACxE,IAAI,IAAI,EAAE,CAAC,CAACyE,WAAW,CAAC,CAAC,CAAC;IAEtE,IAAI,CAACH,QAAQ,EAAE;MACb,OAAO,KAAK;IACd;IAEA,OAAOA,QAAQ,CAACD,GAAG,CAAC;EACtB,CAAC;;EAED;AACF;AACA;AACA;AACA;EACYK,qBAAqB,GAC7BC,IAAuD,IACD;IACtD,IAAI;MACF,IAAIA,IAAI,CAACC,WAAW,CAACC,cAAc,IAAI,CAACF,IAAI,CAACG,WAAW,EAAE;QACxD,OAAO;UACL,GAAGH,IAAI;UACPC,WAAW,EAAE;YAAE,GAAGD,IAAI,CAACC,WAAW;YAAElB,QAAQ,EAAEtG,QAAQ,CAAC2H;UAAM;QAC/D,CAAC;MACH;MAEA,IAAI,CAACC,WAAW,CACdL,IAAI,CAACM,UAAU,EACfN,IAAI,CAACC,WAAW,EAChBD,IAAI,CAAChE,KAAK,IAAI,EAAE,EAChBgE,IAAI,CAACG,WAAW,KAAK,IACvB,CAAC;MAED,IAAIH,IAAI,CAACC,WAAW,CAACM,WAAW,EAAE;QAChC,OAAO;UACL,GAAGP,IAAI;UACPC,WAAW,EAAE;YAAE,GAAGD,IAAI,CAACC,WAAW;YAAElB,QAAQ,EAAEtG,QAAQ,CAAC2H;UAAM;QAC/D,CAAC;MACH;MAEA,IAAI,IAAI,CAAC5F,aAAa,EAAE;QACtB,IAAI,CAACgG,oBAAoB,CAACR,IAAI,CAAC;QAE/B,OAAO;UACL,GAAGA,IAAI;UACPC,WAAW,EAAE;YAAE,GAAGD,IAAI,CAACC,WAAW;YAAElB,QAAQ,EAAEtG,QAAQ,CAACgI;UAAO;QAChE,CAAC;MACH;MAEA,IAAI,IAAI,CAACC,2BAA2B,CAACV,IAAI,CAAC,EAAE;QAC1C,IAAI,CAACW,WAAW,CAACX,IAAI,CAAC;MACxB;IACF,CAAC,CAAC,OAAOY,KAAK,EAAE;MACd,IAAI,CAAChD,OAAO,GAAGgD,KAAc,CAAC;IAChC;IAEA,OAAO;MACL,GAAGZ,IAAI;MACPC,WAAW,EAAE;QAAE,GAAGD,IAAI,CAACC,WAAW;QAAElB,QAAQ,EAAEtG,QAAQ,CAAC2H;MAAM;IAC/D,CAAC;EACH,CAAC;;EAED;EACUM,2BAA2B,GACnCG,KAAwD,IAC5C,IAAI;;EAElB;AACF;AACA;AACA;EACYC,mBAAmBA,CAC3BC,aAA2B,EAC3BC,eAAyB,EACT;IAChB,IAAI,CAACX,WAAW,CAACU,aAAa,EAAE/F,SAAS,EAAEgG,eAAe,EAAE,IAAI,CAAC;IAEjE;EACF;EAEQX,WAAWA,CACjBC,UAAwB,EACxBL,WAAoC,EACpCjE,KAAwB,EACxBmE,WAAoB,EACd;IACN,IAAI,CAAC7F,YAAY,GAAG;MAClBgG,UAAU;MACVL,WAAW;MACXjE,KAAK;MACLmE,WAAW;MACXc,IAAI,EAAGC,OAAO,IACZ,IAAI,CAACtC,QAAQ,GAAG;QACd,GAAGsC,OAAO;QACVnC,QAAQ,EAAEtG,QAAQ,CAACuG;MACrB,CAAiB;IACrB,CAAC,CAAC;EACJ;;EAEA;EACUmC,oBAAoBA,CAAA,EAAS;IACrC,MAAMC,MAAM,GAAG,IAAI,CAAC5G,aAAa;IAEjC,IAAI,CAAC4G,MAAM,EAAE;MACX;IACF;IAEA,MAAMC,UAAU,GAAG,CAAC,GAAG,IAAI,CAACrH,iBAAiB,CAACsH,MAAM,CAAC,CAAC,CAAC;IAEvD,IAAI,CAACtH,iBAAiB,CAACuC,KAAK,CAAC,CAAC;IAC9B,MAAM4C,UAAU,GAAG,IAAI,CAACoC,gBAAgB;IAExC,IAAI,CAACA,gBAAgB,GAAGvG,SAAS;IAEjC,IAAI,CAACmE,UAAU,IAAIiC,MAAM,CAACH,IAAI,KAAK,MAAM,EAAE;MACzC;IACF;IAEAI,UAAU,CAACtF,OAAO,CAAEyF,SAAS,IAAK;MAChC,IAAIA,SAAS,CAACC,KAAK,GAAGL,MAAM,CAACM,UAAU,EAAE;QACvC;MACF;MAEA,MAAMC,OAAO,GAAG;QACd,GAAGH,SAAS,CAACI,MAAM;QACnB,GAAGC,MAAM,CAACC,WAAW,CACnB,CAAC,GAAGN,SAAS,CAACO,IAAI,CAACC,OAAO,CAAC,CAAC,CAAC,CAACC,GAAG,CAAC,CAAC,CAAC5E,IAAI,EAAEgB,KAAK,CAAC,KAAK,CACnDhB,IAAI,EACJ,IAAI,CAAC6E,cAAc,CACjBV,SAAS,CAACI,MAAM,CAAC/C,kBAAkB,EACnCxB,IAAI,EACJgB,KAAK,GAAGmD,SAAS,CAACC,KACpB,CAAC,CACF,CACH,CAAC;QACD1C,QAAQ,EAAEtG,QAAQ,CAACuG,MAAM;QACzBG;MACF,CAA4B;MAE5B,IAAI,CAAC8B,IAAI,CAAC,IAAI,CAACkB,eAAe,CAACR,OAAO,CAAC,CAAC;IAC1C,CAAC,CAAC;EACJ;EAEQO,cAAcA,CACpBrD,kBAAsC,EACtCxB,IAAY,EACZ+E,KAAa,EACL;IACR,MAAMC,QAAQ,GAAG,IAAI,CAACjI,UAAU,CAACkI,MAAM,CAAC1C,GAAG,CACzC,GAAGf,kBAAkB,IAAIxB,IAAI,EAC/B,CAAC,EAAEgF,QAAQ;IAEX,OAAOA,QAAQ,KAAKrH,SAAS,GACzBuH,IAAI,CAACC,KAAK,CAACJ,KAAK,CAAC,GACjBK,MAAM,CAACL,KAAK,CAACM,OAAO,CAACL,QAAQ,CAAC,CAAC;EACrC;;EAEA;EACQ7B,oBAAoBA,CAC1BR,IAAuD,EACjD;IACN,MAAM2C,YAAY,GAAG3C,IAAI,CAACC,WAAW,CAAC0C,YAAY,IAAI,EAAE;IACxD,MAAMC,eAAe,GAAG,IAAI,CAACrB,gBAAgB,IAAI,IAAIsB,IAAI,CAAC,CAAC;IAE3DF,YAAY,CAAC5G,OAAO,CAAE+G,WAAW,IAAK;MACpC,MAAM5B,OAAO,GAAG,IAAI,CAAC6B,iBAAiB,CAAC/C,IAAI,CAACM,UAAU,EAAEwC,WAAW,CAAC;MACpE,MAAME,SAAS,GAAG,IAAI,CAACC,oBAAoB,CAAC/B,OAAO,EAAE4B,WAAW,CAAC;;MAEjE;MACA;MACA,IAAIE,SAAS,EAAE;QACb;MACF;MAEA,MAAME,GAAG,GAAGrD,MAAM,CAACiD,WAAW,CAACjE,kBAAkB,CAAC;MAClD,MAAMsE,QAAQ,GAAG,IAAI,CAACnJ,iBAAiB,CAAC4F,GAAG,CAACsD,GAAG,CAAC;MAChD,MAAMnB,IAAI,GAAGoB,QAAQ,EAAEpB,IAAI,IAAI,IAAIhI,GAAG,CAAiB,CAAC;MACxD,MAAMqJ,aAAa,GAAGlC,OAAiD;MAEvE4B,WAAW,CAACO,UAAU,CAACtH,OAAO,CAAEsB,IAAI,IAAK;QACvC,MAAM+E,KAAK,GAAGgB,aAAa,CAAC/F,IAAI,CAAC;QAEjC,IAAI,OAAO+E,KAAK,KAAK,QAAQ,EAAE;UAC7BL,IAAI,CAAC9F,GAAG,CAACoB,IAAI,EAAE,CAAC0E,IAAI,CAACnC,GAAG,CAACvC,IAAI,CAAC,IAAI,CAAC,IAAI+E,KAAK,CAAC;QAC/C;MACF,CAAC,CAAC;MAEF,IAAI,CAACpI,iBAAiB,CAACiC,GAAG,CAACiH,GAAG,EAAE;QAC9BzB,KAAK,EAAE,CAAC0B,QAAQ,EAAE1B,KAAK,IAAI,CAAC,IAAI,CAAC;QACjCG,MAAM,EAAEuB,QAAQ,EAAEvB,MAAM,IAAIV,OAAO;QACnCa;MACF,CAAC,CAAC;MACF,IAAI,CAACR,gBAAgB,KAAKqB,eAAe;IAC3C,CAAC,CAAC;EACJ;;EAEA;EACUT,eAAe,GAAGA,CAC1BjB,OAAqB,EACrBlF,KAAyB,EACzBsH,YAAqB,KACG;IACxB,MAAMC,QAAQ,GAAG,IAAI,CAACnJ,UAAU,CAAC+H,eAAe;IAEhD,OAAOoB,QAAQ,GACVA,QAAQ,CAACrC,OAAO,EAAElF,KAAK,EAAEsH,YAAY,CAAC,GACvCpC,OAAO;EACb,CAAC;EAEOD,IAAIA,CAACC,OAA4B,EAAQ;IAC/C,IAAIA,OAAO,EAAE;MACX,IAAI,CAACtC,QAAQ,GAAGsC,OAAO,CAAC;IAC1B;EACF;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACUP,WAAWA,CAACX,IAAuD,EAAE;IAC3E,MAAMwD,QAAQ,GAAGxD,IAAI,CAACC,WAAW,CAACwD,eAAe;IAEjD,IAAI,CAACD,QAAQ,IAAI,CAACxD,IAAI,CAAChE,KAAK,EAAE;MAC5B,IAAI,CAAC0H,MAAM,CAAC1D,IAAI,CAACM,UAAU,EAAEN,IAAI,CAACC,WAAW,EAAED,IAAI,CAAChE,KAAK,CAAC;MAE1D;IACF;IAEA,MAAM2H,OAAO,GAAGpB,IAAI,CAACqB,KAAK,CACxB,CAAC5D,IAAI,CAAChE,KAAK,CAAC2C,MAAM,GAAG6E,QAAQ,CAACK,IAAI,IAAIL,QAAQ,CAACM,WACjD,CAAC;IAED,KAAK,IAAIC,MAAM,GAAG,CAAC,EAAEA,MAAM,GAAGJ,OAAO,EAAEI,MAAM,EAAE,EAAE;MAC/C,IAAI,CAACL,MAAM,CACT/K,gBAAgB,CACdqH,IAAI,CAAChE,KAAK,EACVgE,IAAI,CAACC,WAAW,EAChBuD,QAAQ,CAACK,IAAI,GAAGE,MAAM,GAAGP,QAAQ,CAACM,WACpC,CAAC,EACD9D,IAAI,CAACC,WAAW,EAChBD,IAAI,CAAChE,KAAK,EACVwH,QAAQ,CAACK,IAAI,GAAGE,MAAM,GAAGP,QAAQ,CAACM,WACpC,CAAC;IACH;EACF;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACUJ,MAAMA,CACZpD,UAAwB,EACxBL,WAAwB,EACxBjE,KAAyB,EACzBsH,YAAqB,EACf;IACN,MAAMX,YAAY,GAAG1C,WAAW,CAAC0C,YAAY,IAAI,EAAE;IAEnD,IAAIA,YAAY,CAAChE,MAAM,KAAK,CAAC,EAAE;MAC7B,IAAI,CAACqF,OAAO,CAAC,4CAA4C,EAAE1D,UAAU,CAAC;MAEtE;IACF;IAEAqC,YAAY,CAAC5G,OAAO,CAAE+G,WAAW,IAC/B,IAAI,CAACmB,iBAAiB,CAAC3D,UAAU,EAAEwC,WAAW,EAAE9G,KAAK,EAAEsH,YAAY,CACrE,CAAC;EACH;EAEQU,OAAOA,CAACnG,MAAc,EAAEyC,UAAwB,EAAQ;IAC9D,IAAI,CAAC1C,OAAO,GACVhF,qBAAqB,CAAC,IAAI,CAACwB,UAAU,CAACoF,EAAE,EAAE3B,MAAM,EAAEyC,UAAU,CAC9D,CAAC;EACH;EAEQ2D,iBAAiBA,CACvB3D,UAAwB,EACxBwC,WAA6B,EAC7B9G,KAAyB,EACzBsH,YAAqB,EACf;IACN,MAAMpC,OAAO,GAAG,IAAI,CAAC6B,iBAAiB,CAACzC,UAAU,EAAEwC,WAAW,CAAC;IAC/D,MAAME,SAAS,GAAG,IAAI,CAACC,oBAAoB,CAAC/B,OAAO,EAAE4B,WAAW,CAAC;IAEjE,IAAIE,SAAS,EAAE;MACb,IAAI,CAACgB,OAAO,CAAChB,SAAS,EAAE9B,OAAO,CAAC;MAEhC;IACF;IAEA,IAAI,CAACD,IAAI,CAAC,IAAI,CAACkB,eAAe,CAACjB,OAAO,EAAElF,KAAK,EAAEsH,YAAY,CAAC,CAAC;EAC/D;EAEQP,iBAAiBA,CACvBzC,UAAwB,EACxBwC,WAA6B,EACf;IACd,MAAM5B,OAAO,GAAG;MACdnC,QAAQ,EAAEuB,UAAU,CAACvB,QAAQ;MAC7BF,kBAAkB,EAAEiE,WAAW,CAACjE;IAClC,CAAiB;IAEjB,MAAMuE,aAAa,GAAGlC,OAAiD;IACvE,MAAMgD,YAAY,GAAG5D,UAAoD;IAEzEwC,WAAW,CAACO,UAAU,CAACtH,OAAO,CAAEsB,IAAI,IAAK;MACvC+F,aAAa,CAAC/F,IAAI,CAAC,GAAG6G,YAAY,CAAC7G,IAAI,CAAC;IAC1C,CAAC,CAAC;IAEF,OAAO6D,OAAO;EAChB;EAEQ+B,oBAAoBA,CAC1B/B,OAAqB,EACrB4B,WAA6B,EACT;IACpB,OAAOA,WAAW,CAACO,UAAU,CAC1BpB,GAAG,CAAE5E,IAAI,IACRxE,mBAAmB,CACjB,IAAI,CAACuB,UAAU,CAACkI,MAAM,EACtBQ,WAAW,CAACjE,kBAAkB,EAC9BxB,IAAI,EACH6D,OAAO,CAA4C7D,IAAI,CAC1D,CACF,CAAC,CACA8G,IAAI,CAAEC,OAAO,IAAKA,OAAO,KAAKpJ,SAAS,CAAC;EAC7C;AACF","ignoreList":[]}