@ovok/native 1.10.9 → 1.10.10

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

@@ -0,0 +1 @@
+{"version":3,"names":["_btManagedDevice","require","_liveOximeterSequencer","_aojBpProtocol","aoj70bMainServices","uuid","AOJ_BP","service","monitorUuids","notify","parsingModel","caseValuePosition","cases","Aoj70bDevice","BTManagedDevice","mainServices","stuckDataTimeout","onStreamStart","undefined","constructor","device","params","createCommandSequencer","LiveOximeterSequencer","isValuesFrame","AOJ_VALUES","onResult","result","validatePackage","handleSuccessResult","exports"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj-70b.device.ts"],"mappings":";;;;;;AAOA,IAAAA,gBAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AAEA,IAAAE,cAAA,GAAAF,OAAA;AAEA,MAAMG,kBAA8B,GAAG,CACrC;EACEC,IAAI,EAAEC,qBAAM,CAACC,OAAO;EACpBC,YAAY,EAAE,CAAC;IAAEH,IAAI,EAAEC,qBAAM,CAACG,MAAM;IAAEC,YAAY,EAAE;MAAEC,iBAAiB,EAAE,EAAE;MAAEC,KAAK,EAAE;IAAG;EAAE,CAAC;AAC5F,CAAC,CACF;;AAED;AACA,MAAMC,YAAY,SAASC,gCAAe,CAA4B;EAC1DC,YAAY,GAAGX,kBAAkB;EACjCY,gBAAgB,GAAG,OAAO;EAC1BC,aAAa,GAAGC,SAAS;EAE5BC,WAAWA,CAACC,MAAc,EAAEC,MAAqD,EAAE;IACxF,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IACrB,IAAI,CAACC,sBAAsB,GAAG,MAC5B,IAAIC,4CAAqB,CAAC;MACxBC,aAAa,EAAEC,iCAAU;MACzBC,QAAQ,EAAGC,MAAM,IACf,IAAI,CAACD,QAAQ,GACXC,MAGF;IACJ,CAAC,CAAC;EACN;;EAEA;EACUC,eAAe,GAAGA,CAAA,KAAe,IAAI;EAErCC,mBAAmBA,CAAA,EAAS;IACpC;EACF;AACF;AAACC,OAAA,CAAAjB,YAAA,GAAAA,YAAA","ignoreList":[]}

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

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AojBpDevice = void 0;
+var _integratedDevices = require("../../../types/integrated-devices.js");
+var _btManagedDevice = require("../bt-managed-device.js");
+var _aojBpProtocol = require("./aoj-bp.protocol.js");
+var _aojBpSequencer = require("./aoj-bp.sequencer.js");
+const passThrough = {
+  caseValuePosition: [],
+  cases: []
+};
+const servicesFor = gatt => [{
+  uuid: gatt.service,
+  monitorUuids: [{
+    uuid: gatt.notify,
+    parsingModel: passThrough
+  }]
+}];
+
+/** AOJ Medical blood-pressure monitors; the FFF0 variant is the Cazon BSX530B. */
+class AojBpDeviceClass extends _btManagedDevice.BTManagedDevice {
+  stuckDataTimeout = 90_000;
+  onStreamStart = undefined;
+  constructor(device, params) {
+    super(device, params);
+    const fff0 = params.deviceName === _integratedDevices.IntegratedDevices.AOJ_BPM_FFF0;
+    const gatt = fff0 ? _aojBpProtocol.AOJ_BP_FFF0 : _aojBpProtocol.AOJ_BP;
+    this.mainServices = servicesFor(gatt);
+    this.frameReader = new _aojBpProtocol.AojBpFrameReader();
+    this.createCommandSequencer = () => new _aojBpSequencer.AojBpSequencer({
+      service: gatt.service,
+      write: gatt.write,
+      listenOnly: fff0,
+      onResult: result => this.onResult?.(result)
+    });
+  }
+  handleSuccessResult() {
+    return;
+  }
+}
+exports.AojBpDevice = AojBpDeviceClass;
+//# sourceMappingURL=aoj-bp.device.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["_integratedDevices","require","_btManagedDevice","_aojBpProtocol","_aojBpSequencer","passThrough","caseValuePosition","cases","servicesFor","gatt","uuid","service","monitorUuids","notify","parsingModel","AojBpDeviceClass","BTManagedDevice","stuckDataTimeout","onStreamStart","undefined","constructor","device","params","fff0","deviceName","IntegratedDevices","AOJ_BPM_FFF0","AOJ_BP_FFF0","AOJ_BP","mainServices","frameReader","AojBpFrameReader","createCommandSequencer","AojBpSequencer","write","listenOnly","onResult","result","handleSuccessResult","exports","AojBpDevice"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj-bp.device.ts"],"mappings":";;;;;;AAIA,IAAAA,kBAAA,GAAAC,OAAA;AAGA,IAAAC,gBAAA,GAAAD,OAAA;AAEA,IAAAE,cAAA,GAAAF,OAAA;AACA,IAAAG,eAAA,GAAAH,OAAA;AAIA,MAAMI,WAAW,GAAG;EAAEC,iBAAiB,EAAE,EAAE;EAAEC,KAAK,EAAE;AAAG,CAAC;AAExD,MAAMC,WAAW,GAAIC,IAAyC,IAAiB,CAC7E;EAAEC,IAAI,EAAED,IAAI,CAACE,OAAO;EAAEC,YAAY,EAAE,CAAC;IAAEF,IAAI,EAAED,IAAI,CAACI,MAAM;IAAEC,YAAY,EAAET;EAAY,CAAC;AAAE,CAAC,CACzF;;AAED;AACA,MAAMU,gBAAgB,SAASC,gCAAe,CAAc;EAEhDC,gBAAgB,GAAG,MAAM;EACzBC,aAAa,GAAGC,SAAS;EAE5BC,WAAWA,CAACC,MAAc,EAAEC,MAAuC,EAAE;IAC1E,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IAErB,MAAMC,IAAI,GAAGD,MAAM,CAACE,UAAU,KAAKC,oCAAiB,CAACC,YAAY;IACjE,MAAMjB,IAAI,GAAGc,IAAI,GAAGI,0BAAW,GAAGC,qBAAM;IAExC,IAAI,CAACC,YAAY,GAAGrB,WAAW,CAACC,IAAI,CAAC;IACrC,IAAI,CAACqB,WAAW,GAAG,IAAIC,+BAAgB,CAAC,CAAC;IACzC,IAAI,CAACC,sBAAsB,GAAG,MAC5B,IAAIC,8BAAc,CAAC;MACjBtB,OAAO,EAAEF,IAAI,CAACE,OAAO;MACrBuB,KAAK,EAAEzB,IAAI,CAACyB,KAAK;MACjBC,UAAU,EAAEZ,IAAI;MAChBa,QAAQ,EAAGC,MAAM,IACf,IAAI,CAACD,QAAQ,GACXC,MACF;IACJ,CAAC,CAAC;EACN;EAEUC,mBAAmBA,CAAA,EAAS;IACpC;EACF;AACF;AAACC,OAAA,CAAAC,WAAA,GAAAzB,gBAAA","ignoreList":[]}

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

@@ -0,0 +1,140 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.updateStatusCommand = exports.turnOffCommand = exports.setVoiceCommand = exports.setTimeCommand = exports.readUnsentCount = exports.readBloodPressure = exports.payloadOf = exports.getSystemInfoCommand = exports.getSerialCommand = exports.getDataCommand = exports.frame = exports.commandOf = exports.ackCommand = exports.AojBpFrameReader = exports.AOJ_COMMAND = exports.AOJ_BP_FFF0 = exports.AOJ_BP = void 0;
+var _frameReadStatus = require("../../../types/frame-read-status.js");
+var _calculateCrc8Maxim = require("../../../utils/calculate-crc-8-maxim.js");
+var _hexToByte = require("../../../utils/hex-to-byte.js");
+/* eslint-disable import/group-exports */
+
+/**
+ * AOJ Medical's blood-pressure protocol (AOJ-30x/33x, ARM-111, WRS-35E and rebrands), from
+ * MedM Health Diary 3.12.11's `CAOJMedical_BPM`. It is not the AOJ-20A thermometer's framing.
+ *
+ * Frames are `BE B0` (app to device) or `D0 C2` (device to app), a length counting the command
+ * and payload, the command, the payload, and CRC-8/MAXIM over every byte before it.
+ */
+const sig16 = assigned => `0000${assigned}-0000-1000-8000-00805f9b34fb`;
+const AOJ_BP = exports.AOJ_BP = {
+  service: sig16("ffe0"),
+  notify: sig16("ffe1"),
+  write: sig16("ffe2")
+};
+
+/** The Cazon BSX530B variant: one characteristic for both directions, and a listen-only session. */
+const AOJ_BP_FFF0 = exports.AOJ_BP_FFF0 = {
+  service: sig16("fff0"),
+  notify: sig16("fff6"),
+  write: sig16("fff6")
+};
+const AOJ_COMMAND = exports.AOJ_COMMAND = {
+  ack: 0x00,
+  serial: 0xd6,
+  systemInfo: 0xd8,
+  voice: 0xd9,
+  record: 0xcc
+};
+const DEVICE_HEADER = [0xd0, 0xc2];
+const toHex = bytes => bytes.map(value => (value & 0xff).toString(16).padStart(2, "0"));
+const frame = (command, payload = []) => {
+  const bytes = toHex([0xbe, 0xb0, payload.length + 1, command, ...payload]);
+  return [...bytes, ...toHex([(0, _calculateCrc8Maxim.calculateCrc8Maxim)(bytes, bytes.length)])];
+};
+exports.frame = frame;
+const commandOf = received => (0, _hexToByte.hexToByte)(received[3] ?? "00");
+exports.commandOf = commandOf;
+const payloadOf = received => received.slice(4, -1).map(byte => (0, _hexToByte.hexToByte)(byte));
+exports.payloadOf = payloadOf;
+const updateStatusCommand = () => frame(0xb2);
+exports.updateStatusCommand = updateStatusCommand;
+const setTimeCommand = now => frame(0xb1, [now.getFullYear() >> 8, now.getFullYear() & 0xff, now.getMonth() + 1, now.getDate(), now.getHours(), now.getMinutes(), now.getSeconds()]);
+exports.setTimeCommand = setTimeCommand;
+const getSerialCommand = () => frame(0xd6, [0x00]);
+exports.getSerialCommand = getSerialCommand;
+const getSystemInfoCommand = () => frame(0xd8);
+
+/** Voice off: the SDK has no setting for spoken readings. */
+exports.getSystemInfoCommand = getSystemInfoCommand;
+const setVoiceCommand = () => frame(0xd9, [0x03, 0x00]);
+
+/** `D7 FF 01`: send stored records for every user. */
+exports.setVoiceCommand = setVoiceCommand;
+const getDataCommand = () => frame(0xd7, [0xff, 0x01]);
+exports.getDataCommand = getDataCommand;
+const ackCommand = () => frame(0x00, [0x00]);
+exports.ackCommand = ackCommand;
+const turnOffCommand = () => frame(0xd0);
+
+/** Isolates `D0 C2` frames whatever the notification boundaries. */
+exports.turnOffCommand = turnOffCommand;
+class AojBpFrameReader {
+  readFrame(buffer) {
+    const start = buffer.findIndex((byte, index) => (0, _hexToByte.hexToByte)(byte) === DEVICE_HEADER[0] && (index + 1 >= buffer.length || (0, _hexToByte.hexToByte)(buffer[index + 1] ?? "00") === DEVICE_HEADER[1]));
+    if (start === -1) {
+      return {
+        status: _frameReadStatus.FrameReadStatus.INCOMPLETE,
+        consumedBytes: buffer.length
+      };
+    }
+    if (start + 3 > buffer.length) {
+      return {
+        status: _frameReadStatus.FrameReadStatus.INCOMPLETE,
+        consumedBytes: start
+      };
+    }
+    const length = (0, _hexToByte.hexToByte)(buffer[start + 2] ?? "00") + 4;
+    if (start + length > buffer.length) {
+      return {
+        status: _frameReadStatus.FrameReadStatus.INCOMPLETE,
+        consumedBytes: start
+      };
+    }
+    const received = buffer.slice(start, start + length);
+    if ((0, _calculateCrc8Maxim.calculateCrc8Maxim)(received, length - 1) !== (0, _hexToByte.hexToByte)(received[length - 1] ?? "00")) {
+      return {
+        status: _frameReadStatus.FrameReadStatus.CORRUPT,
+        consumedBytes: start + 1
+      };
+    }
+    return {
+      status: _frameReadStatus.FrameReadStatus.COMPLETE,
+      consumedBytes: start + length,
+      frame: received
+    };
+  }
+}
+
+/** `D8`: the unsent-record counts for users 1 and 2, used to know when the upload is done. */
+exports.AojBpFrameReader = AojBpFrameReader;
+const readUnsentCount = payload => (payload[4] ?? 0) + (payload[5] ?? 0);
+exports.readUnsentCount = readUnsentCount;
+/**
+ * `CC`: systolic, diastolic and pulse (mmHg, bpm), flags (bit 0 irregular heartbeat, top nibble
+ * the user), then `YYYY MM DD hh mm ss` local time. Diastolic, pulse and flags all zero is an
+ * error record whose first byte is the error code; a zero year means the clock was never set.
+ */
+const readBloodPressure = payload => {
+  if (payload.length < 11) {
+    return undefined;
+  }
+  const [systolic = 0, diastolic = 0, heartRate = 0, flags = 0] = payload;
+  const year = (payload[4] ?? 0) << 8 | (payload[5] ?? 0);
+  if (diastolic === 0 && heartRate === 0 && flags === 0 || year === 0) {
+    return undefined;
+  }
+  const user = flags >> 4;
+  return {
+    systolic,
+    diastolic,
+    heartRate,
+    irregularHeartbeat: (flags & 0x01) !== 0,
+    recordedAt: new Date(year, (payload[6] ?? 1) - 1, payload[7] ?? 1, payload[8] ?? 0, payload[9] ?? 0, payload[10] ?? 0),
+    ...(user > 0 ? {
+      memorySlot: user
+    } : {})
+  };
+};
+exports.readBloodPressure = readBloodPressure;
+//# sourceMappingURL=aoj-bp.protocol.js.map

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

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

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

@@ -0,0 +1,138 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AojBpSequencer = void 0;
+var _core = require("@ovok/core");
+var _caseType = require("../../../types/case-type.js");
+var _aojBpProtocol = require("./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((0, _aojBpProtocol.updateStatusCommand)()), this.command((0, _aojBpProtocol.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((0, _aojBpProtocol.setTimeCommand)(this.now()))]
+      };
+    }
+    if (this.phase === "system-info") {
+      return {
+        commands: [this.command((0, _aojBpProtocol.getSystemInfoCommand)())]
+      };
+    }
+    return this.phase === "data" ? this.turnOff() : {};
+  };
+  commandProgress = frame => (0, _aojBpProtocol.commandOf)(frame) === _aojBpProtocol.AOJ_COMMAND.record ? "partial" : "complete";
+  nextCommand = frame => {
+    const command = (0, _aojBpProtocol.commandOf)(frame);
+    if (command === _aojBpProtocol.AOJ_COMMAND.record) {
+      return this.record((0, _aojBpProtocol.payloadOf)(frame));
+    }
+    if (this.phase === "time" && command === _aojBpProtocol.AOJ_COMMAND.ack) {
+      this.phase = "serial";
+      return [this.command((0, _aojBpProtocol.getSerialCommand)())];
+    }
+    if (this.phase === "serial" && command === _aojBpProtocol.AOJ_COMMAND.serial) {
+      this.phase = "system-info";
+      return [this.command((0, _aojBpProtocol.getSystemInfoCommand)())];
+    }
+    if (this.phase === "system-info" && command === _aojBpProtocol.AOJ_COMMAND.systemInfo) {
+      this.unsent = (0, _aojBpProtocol.readUnsentCount)((0, _aojBpProtocol.payloadOf)(frame));
+      this.phase = "voice";
+      return [this.command((0, _aojBpProtocol.setVoiceCommand)())];
+    }
+    if (this.phase === "voice" && command === _aojBpProtocol.AOJ_COMMAND.voice) {
+      this.phase = "data";
+      return [this.command((0, _aojBpProtocol.getDataCommand)())];
+    }
+    return undefined;
+  };
+  record = payload => {
+    this.unsent -= 1;
+    const reading = (0, _aojBpProtocol.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.CaseType.RESULT,
+      measurementTypeKey: _core.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((0, _aojBpProtocol.ackCommand)())];
+  };
+  turnOff = () => {
+    this.phase = "done";
+    this.turnedOff = true;
+    return {
+      commands: [this.command((0, _aojBpProtocol.turnOffCommand)())]
+    };
+  };
+  now = () => this.params.now?.() ?? new Date();
+  command = (frame, delayBeforeWriteMs) => ({
+    serviceUuid: this.params.service,
+    characteristicUuid: this.params.write,
+    frame,
+    ...(delayBeforeWriteMs ? {
+      delayBeforeWriteMs
+    } : {})
+  });
+}
+exports.AojBpSequencer = AojBpSequencer;
+//# sourceMappingURL=aoj-bp.sequencer.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["_core","require","_caseType","_aojBpProtocol","TIME_RETRY_MS","TIME_ATTEMPTS","SYSTEM_INFO_RETRY_MS","END_AFTER_MS","AojBpSequencer","phase","timeAttempts","recorded","turnedOff","unsent","constructor","params","initialCommands","listenOnly","command","updateStatusCommand","setTimeCommand","now","isNormalDisconnect","commandTimeoutMs","undefined","onCommandTimeout","turnOff","commands","getSystemInfoCommand","commandProgress","frame","commandOf","AOJ_COMMAND","record","nextCommand","payloadOf","ack","getSerialCommand","serial","systemInfo","readUnsentCount","setVoiceCommand","voice","getDataCommand","payload","reading","readBloodPressure","onResult","caseType","CaseType","RESULT","measurementTypeKey","MeasurementTypeKey","bloodPressure","systolic","diastolic","heartRate","recordedAt","memorySlot","irregularHeartbeat","ackCommand","turnOffCommand","Date","delayBeforeWriteMs","serviceUuid","service","characteristicUuid","write","exports"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj-bp.sequencer.ts"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAEA,IAAAC,SAAA,GAAAD,OAAA;AAIA,IAAAE,cAAA,GAAAF,OAAA;AA4BA;AACA,MAAMG,aAAa,GAAG,KAAK;AAC3B,MAAMC,aAAa,GAAG,CAAC;AACvB,MAAMC,oBAAoB,GAAG,KAAK;;AAElC;AACA,MAAMC,YAAY,GAAG,MAAM;;AAE3B;AACA;AACA;AACA;AACA;AACA,MAAMC,cAAc,CAA6B;EACvCC,KAAK,GAAU,MAAM;EACrBC,YAAY,GAAG,CAAC;EAChBC,QAAQ,GAAG,KAAK;EAChBC,SAAS,GAAG,KAAK;EACjBC,MAAM,GAAG,CAAC;EAEXC,WAAWA,CAAkBC,MAA4B,EAAE;IAAA,KAA9BA,MAA4B,GAA5BA,MAA4B;EAAG;EAE5DC,eAAe,GAAGA,CAAA,KAAgC;IACvD,IAAI,IAAI,CAACD,MAAM,CAACE,UAAU,EAAE;MAC1B,IAAI,CAACR,KAAK,GAAG,MAAM;MAEnB,OAAO,EAAE;IACX;IAEA,IAAI,CAACC,YAAY,GAAG,CAAC;IAErB,OAAO,CACL,IAAI,CAACQ,OAAO,CAAC,IAAAC,kCAAmB,EAAC,CAAC,CAAC,EACnC,IAAI,CAACD,OAAO,CAAC,IAAAE,6BAAc,EAAC,IAAI,CAACC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAChD;EACH,CAAC;EAEMC,kBAAkB,GAAGA,CAAA,KAAe,IAAI,CAACV,SAAS,IAAI,IAAI,CAACD,QAAQ;EAEnEY,gBAAgB,GAAGA,CAAA,KAA0B;IAClD,QAAQ,IAAI,CAACd,KAAK;MAChB,KAAK,MAAM;QACT,OAAO,IAAI,CAACM,MAAM,CAACE,UAAU,GAAGO,SAAS,GAAGpB,aAAa;MAC3D,KAAK,aAAa;QAChB,OAAOE,oBAAoB;MAC7B,KAAK,MAAM;QACT,OAAO,IAAI,CAACK,QAAQ,IAAI,CAAC,IAAI,CAACI,MAAM,CAACE,UAAU,GAAGV,YAAY,GAAGiB,SAAS;MAC5E;QACE,OAAOA,SAAS;IACpB;EACF,CAAC;EAEMC,gBAAgB,GAAGA,CAAA,KAA4B;IACpD,IAAI,IAAI,CAAChB,KAAK,KAAK,MAAM,EAAE;MACzB,IAAI,IAAI,CAACC,YAAY,IAAIL,aAAa,EAAE;QACtC,OAAO,IAAI,CAACqB,OAAO,CAAC,CAAC;MACvB;MAEA,IAAI,CAAChB,YAAY,IAAI,CAAC;MAEtB,OAAO;QAAEiB,QAAQ,EAAE,CAAC,IAAI,CAACT,OAAO,CAAC,IAAAE,6BAAc,EAAC,IAAI,CAACC,GAAG,CAAC,CAAC,CAAC,CAAC;MAAE,CAAC;IACjE;IAEA,IAAI,IAAI,CAACZ,KAAK,KAAK,aAAa,EAAE;MAChC,OAAO;QAAEkB,QAAQ,EAAE,CAAC,IAAI,CAACT,OAAO,CAAC,IAAAU,mCAAoB,EAAC,CAAC,CAAC;MAAE,CAAC;IAC7D;IAEA,OAAO,IAAI,CAACnB,KAAK,KAAK,MAAM,GAAG,IAAI,CAACiB,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;EACpD,CAAC;EAEMG,eAAe,GAAIC,KAAwB,IAChD,IAAAC,wBAAS,EAACD,KAAK,CAAC,KAAKE,0BAAW,CAACC,MAAM,GAAG,SAAS,GAAG,UAAU;EAE3DC,WAAW,GAAIJ,KAAwB,IAA2C;IACvF,MAAMZ,OAAO,GAAG,IAAAa,wBAAS,EAACD,KAAK,CAAC;IAEhC,IAAIZ,OAAO,KAAKc,0BAAW,CAACC,MAAM,EAAE;MAClC,OAAO,IAAI,CAACA,MAAM,CAAC,IAAAE,wBAAS,EAACL,KAAK,CAAC,CAAC;IACtC;IAEA,IAAI,IAAI,CAACrB,KAAK,KAAK,MAAM,IAAIS,OAAO,KAAKc,0BAAW,CAACI,GAAG,EAAE;MACxD,IAAI,CAAC3B,KAAK,GAAG,QAAQ;MAErB,OAAO,CAAC,IAAI,CAACS,OAAO,CAAC,IAAAmB,+BAAgB,EAAC,CAAC,CAAC,CAAC;IAC3C;IAEA,IAAI,IAAI,CAAC5B,KAAK,KAAK,QAAQ,IAAIS,OAAO,KAAKc,0BAAW,CAACM,MAAM,EAAE;MAC7D,IAAI,CAAC7B,KAAK,GAAG,aAAa;MAE1B,OAAO,CAAC,IAAI,CAACS,OAAO,CAAC,IAAAU,mCAAoB,EAAC,CAAC,CAAC,CAAC;IAC/C;IAEA,IAAI,IAAI,CAACnB,KAAK,KAAK,aAAa,IAAIS,OAAO,KAAKc,0BAAW,CAACO,UAAU,EAAE;MACtE,IAAI,CAAC1B,MAAM,GAAG,IAAA2B,8BAAe,EAAC,IAAAL,wBAAS,EAACL,KAAK,CAAC,CAAC;MAC/C,IAAI,CAACrB,KAAK,GAAG,OAAO;MAEpB,OAAO,CAAC,IAAI,CAACS,OAAO,CAAC,IAAAuB,8BAAe,EAAC,CAAC,CAAC,CAAC;IAC1C;IAEA,IAAI,IAAI,CAAChC,KAAK,KAAK,OAAO,IAAIS,OAAO,KAAKc,0BAAW,CAACU,KAAK,EAAE;MAC3D,IAAI,CAACjC,KAAK,GAAG,MAAM;MAEnB,OAAO,CAAC,IAAI,CAACS,OAAO,CAAC,IAAAyB,6BAAc,EAAC,CAAC,CAAC,CAAC;IACzC;IAEA,OAAOnB,SAAS;EAClB,CAAC;EAEOS,MAAM,GAAIW,OAA0B,IAA2C;IACrF,IAAI,CAAC/B,MAAM,IAAI,CAAC;IAEhB,MAAMgC,OAAO,GAAG,IAAAC,gCAAiB,EAACF,OAAO,CAAC;;IAE1C;IACA,IAAI,CAACC,OAAO,EAAE;MACZ,OAAOrB,SAAS;IAClB;IAEA,IAAI,CAACb,QAAQ,GAAG,IAAI;IACpB,IAAI,CAACI,MAAM,CAACgC,QAAQ,CAAC;MACnBC,QAAQ,EAAEC,kBAAQ,CAACC,MAAM;MACzBC,kBAAkB,EAAEC,wBAAkB,CAACC,aAAa;MACpDC,QAAQ,EAAET,OAAO,CAACS,QAAQ;MAC1BC,SAAS,EAAEV,OAAO,CAACU,SAAS;MAC5BC,SAAS,EAAEX,OAAO,CAACW,SAAS;MAC5BC,UAAU,EAAEZ,OAAO,CAACY,UAAU;MAC9B,IAAIZ,OAAO,CAACa,UAAU,GAAG;QAAEA,UAAU,EAAEb,OAAO,CAACa;MAAW,CAAC,GAAG,CAAC,CAAC,CAAC;MACjE,IAAIb,OAAO,CAACc,kBAAkB,GAAG;QAAEA,kBAAkB,EAAE;MAAK,CAAC,GAAG,CAAC,CAAC;IACpE,CAAC,CAAC;IAEF,OAAO,CAAC,IAAI,CAACzC,OAAO,CAAC,IAAA0C,yBAAU,EAAC,CAAC,CAAC,CAAC;EACrC,CAAC;EAEOlC,OAAO,GAAGA,CAAA,KAA4B;IAC5C,IAAI,CAACjB,KAAK,GAAG,MAAM;IACnB,IAAI,CAACG,SAAS,GAAG,IAAI;IAErB,OAAO;MAAEe,QAAQ,EAAE,CAAC,IAAI,CAACT,OAAO,CAAC,IAAA2C,6BAAc,EAAC,CAAC,CAAC;IAAE,CAAC;EACvD,CAAC;EAEOxC,GAAG,GAAGA,CAAA,KAAY,IAAI,CAACN,MAAM,CAACM,GAAG,GAAG,CAAC,IAAI,IAAIyC,IAAI,CAAC,CAAC;EAEnD5C,OAAO,GAAGA,CAACY,KAAwB,EAAEiC,kBAA2B,MAAqB;IAC3FC,WAAW,EAAE,IAAI,CAACjD,MAAM,CAACkD,OAAO;IAChCC,kBAAkB,EAAE,IAAI,CAACnD,MAAM,CAACoD,KAAK;IACrCrC,KAAK;IACL,IAAIiC,kBAAkB,GAAG;MAAEA;IAAmB,CAAC,GAAG,CAAC,CAAC;EACtD,CAAC,CAAC;AACJ;AAACK,OAAA,CAAA5D,cAAA,GAAAA,cAAA","ignoreList":[]}

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

@@ -14,6 +14,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 = (0, _hexToByte.hexToByte)(frame[RECORD_FLAGS_BYTE] ?? "00");
+  return flags >> 6 !== CONTROL_SOLUTION_FLAG && (flags >> 2 & 0x0f) === GLUCOSE_PARAMETER;
+};
 const servicesFor = device => {
   const isBgm = device === _integratedDevices.IntegratedDevices.BGM;
   return [{
@@ -63,10 +81,15 @@ class BloodGlucoseDevice extends _btManagedDevice.BTManagedDevice {
     this.mainServices = servicesFor(params.deviceName);
   }
   validatePackage = pkg => pkg.length >= (this.deviceData.name === _integratedDevices.IntegratedDevices.BGM ? 12 : 8);
-  handleSuccessResult(result) {
+  handleSuccessResult(result, frame) {
     if (result.caseType !== _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.IntegratedDevices.BGM && !isPatientGlucoseRecord(frame)) {
+      return;
+    }
     this.onResult?.(result);
   }
 }

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

@@ -1 +1 @@
-{"version":3,"names":["_core","require","_caseType","_integratedDevices","_hexToByte","_btManagedDevice","LEGACY_SERVICE","LEGACY_CHARACTERISTIC","BGM_SERVICE","BGM_CHARACTERISTIC","GLUCOSE_REQUEST","servicesFor","device","isBgm","IntegratedDevices","BGM","uuid","monitorUuids","parsingModel","caseValuePosition","cases","GLUCOCHECK","map","caseValue","caseType","CaseType","OTHER","parseDefinitions","measurementTypeKey","MeasurementTypeKey","bloodGlucose","RESULT","name","parseType","byteIndexes","parseReference","customParserDefinition","value","hexToByte","slice","raw","parseInt","TAIDOC_GLUCOSE","Number","toFixed","writeUuid","mainCommandUuid","BloodGlucoseDevice","BTManagedDevice","stuckDataTimeout","constructor","params","mainServices","deviceName","validatePackage","pkg","length","deviceData","handleSuccessResult","result","onResult","exports"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/blood-glucose/blood-glucose.device.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_core","require","_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","hexToByte","servicesFor","device","isBgm","IntegratedDevices","BGM","uuid","monitorUuids","parsingModel","caseValuePosition","cases","GLUCOCHECK","map","caseValue","caseType","CaseType","OTHER","parseDefinitions","measurementTypeKey","MeasurementTypeKey","bloodGlucose","RESULT","name","parseType","byteIndexes","parseReference","customParserDefinition","value","slice","raw","parseInt","TAIDOC_GLUCOSE","Number","toFixed","writeUuid","mainCommandUuid","BloodGlucoseDevice","BTManagedDevice","stuckDataTimeout","constructor","params","mainServices","deviceName","validatePackage","pkg","length","deviceData","handleSuccessResult","result","onResult","exports"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/blood-glucose/blood-glucose.device.ts"],"mappings":"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","ignoreList":[]}

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

@@ -182,9 +182,35 @@ class BTConnectionHandler {
     this.callbacks.onStatusChanged?.(_deviceStatus.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/commonjs/modules/bt-management/services/devices/bt-connection-handler.js.map

@@ -1 +1 @@
-{"version":3,"names":["_sentryLogger","require","_telemetry","_bluetoothError","_deviceStatus","_base64ToHex","_btCommandWriter","_btDeviceInformation","BTConnectionHandler","characteristicSubscriptions","disconnectObserved","constructor","device","mainServices","callbacks","preferredMtu","writer","BTCommandWriter","onError","isNormalDisconnect","connect","startedAt","Date","now","span","startOvokSpan","connectWithRetries","requestPreferredMtu","discoverAllServicesAndCharacteristics","readDeviceInformation","onDeviceInfo","readBatteryLevel","isConnected","Error","onStatusChanged","DeviceStatus","CONNECTED","subscribeToAllCharacteristics","setStatus","code","error","errorCode","toBluetoothError","sentryLogger","BluetoothErrorCode","PAIRING_REQUIRED","recordOvokMetric","addOvokSpanEvent","onConnectionEvent","kind","pairingCodeRequired","DISCONNECTED","message","recordOvokDuration","end","destroy","forEach","sub","remove","reset","onDisconnectSubscription","undefined","sendCommands","commands","send","negotiated","requestMTU","useNegotiatedMtu","mtu","requestedMtu","characteristic","readCharacteristicForService","value","Number","parseInt","base64ToHex","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","exports"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-connection-handler.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_sentryLogger","require","_telemetry","_bluetoothError","_deviceStatus","_base64ToHex","_btCommandWriter","_btDeviceInformation","BTConnectionHandler","characteristicSubscriptions","disconnectObserved","constructor","device","mainServices","callbacks","preferredMtu","writer","BTCommandWriter","onError","isNormalDisconnect","connect","startedAt","Date","now","span","startOvokSpan","connectWithRetries","requestPreferredMtu","discoverAllServicesAndCharacteristics","readDeviceInformation","onDeviceInfo","readBatteryLevel","isConnected","Error","onStatusChanged","DeviceStatus","CONNECTED","subscribeToAllCharacteristics","setStatus","code","error","errorCode","toBluetoothError","sentryLogger","BluetoothErrorCode","PAIRING_REQUIRED","recordOvokMetric","addOvokSpanEvent","onConnectionEvent","kind","pairingCodeRequired","DISCONNECTED","message","recordOvokDuration","end","destroy","forEach","sub","remove","reset","onDisconnectSubscription","undefined","sendCommands","commands","send","negotiated","requestMTU","useNegotiatedMtu","mtu","requestedMtu","characteristic","readCharacteristicForService","value","Number","parseInt","base64ToHex","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","exports"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-connection-handler.ts"],"mappings":"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","ignoreList":[]}

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

@@ -82,7 +82,7 @@ class BTDataProcessor {
       buffer.splice(0, result.consumedBytes);
       if (result.status === _frameReadStatus.FrameReadStatus.COMPLETE) {
         this.handleFrame(uuid, result.frame);
-        this.answerFrame(result.frame);
+        this.answerFrame(result.frame, uuid);
         continue;
       }
       if (result.status === _frameReadStatus.FrameReadStatus.CORRUPT) {
@@ -103,7 +103,7 @@ class BTDataProcessor {
     }
     this.handleFrame(uuid, buffer);
     this.buffers.set(this.currentUuid, []);
-    this.answerFrame(buffer);
+    this.answerFrame(buffer, uuid);
   };
 
   /**
@@ -114,9 +114,9 @@ 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/commonjs/modules/bt-management/services/devices/bt-data-processor.js.map

@@ -1 +1 @@
-{"version":3,"names":["_sentryLogger","require","_caseType","_frameReadStatus","_frameParser","_measurementStateMachine","BTDataProcessor","buffers","Map","constructor","device","mainServices","stuckDataTimeoutDuration","callbacks","frameReader","frameParser","FrameParser","measurementState","MeasurementStateMachine","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","FrameReadStatus","COMPLETE","handleFrame","frame","answerFrame","CORRUPT","reportCorruptFrame","INCOMPLETE","validatePackage","progress","commandProgress","commands","nextCommand","sendCommands","data","parse","sentryLogger","frameLength","dependentData","parsingCase","caseType","CaseType","DEPENDENT","handleDependentResult","isMeasuring","measuring","advance","onError","Error","cause","message","setTimeout","cancelConnection","duration","commandTimeoutMs","onCommandTimeout","terminal","exports"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-data-processor.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_sentryLogger","require","_caseType","_frameReadStatus","_frameParser","_measurementStateMachine","BTDataProcessor","buffers","Map","constructor","device","mainServices","stuckDataTimeoutDuration","callbacks","frameReader","frameParser","FrameParser","measurementState","MeasurementStateMachine","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","FrameReadStatus","COMPLETE","handleFrame","frame","answerFrame","CORRUPT","reportCorruptFrame","INCOMPLETE","validatePackage","progress","commandProgress","commands","nextCommand","sendCommands","data","parse","sentryLogger","frameLength","dependentData","parsingCase","caseType","CaseType","DEPENDENT","handleDependentResult","isMeasuring","measuring","advance","onError","Error","cause","message","setTimeout","cancelConnection","duration","commandTimeoutMs","onCommandTimeout","terminal","exports"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-data-processor.ts"],"mappings":"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","ignoreList":[]}

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.BTManagedDevice = void 0;
 var _sentryLogger = require("../../../helpers/utils/sentry-logger.js");
 var _telemetry = require("../../../helpers/utils/telemetry.js");
+var _deviceVariants = require("../../constants/device-variants.js");
 var _bluetoothError = require("../../types/bluetooth-error.js");
 var _clockSync = require("../../types/clock-sync.js");
 var _deviceStatus = require("../../types/device-status.js");
@@ -106,6 +107,15 @@ class BTManagedDevice {
       measurementTypes: [],
       clockSync: (0, _clockSync.clockSyncCapabilityForDevice)(deviceName)
     };
+
+    // The scan matched the parser on `name` first and `localName` second; Android can report two different strings.
+    const variant = (0, _deviceVariants.findDeviceVariant)(String(deviceName), device.name ?? "") ?? (0, _deviceVariants.findDeviceVariant)(String(deviceName), device.localName ?? "");
+    if (variant) {
+      this.deviceData.variant = {
+        manufacturer: variant.manufacturer,
+        model: variant.model
+      };
+    }
     this.id = device.id;
     this.onDeviceStatusChanged = (status, measurementTypeKey) => {
       (0, _sentryLogger.sentryLogger)("info", "BT_MANAGER: Calling onDeviceStatusChanged callback", {
@@ -286,6 +296,7 @@ class BTManagedDevice {
           this.deviceData.sn = info.serialNumber;
         }
       },
+      onServicesDiscovered: uuids => sequencer.onServicesDiscovered?.(uuids),
       initialCommands: () => sequencer.initialCommands(),
       onCommandSent: () => {
         this.dataProcessor?.armStuckTimeout();
@@ -305,7 +316,7 @@ 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?.() ?? {},