@ovok/native 0.4.4 → 0.4.6

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.BP2Device = void 0;
 var _core = require("@ovok/core");
 var _BloodPressureStates = require("@ovok/core/dist/client/observation/types/measurement/BloodPressureStates");
-var _sentryLogger = require("../../../../helpers/utils/sentry-logger.js");
 var _bloodPressureTranslatedExceptionMap = require("../../../constants/blood-pressure-translated-exception-map.js");
 var _caseType = require("../../../types/case-type.js");
 var _hexToByte = require("../../../utils/hex-to-byte.js");
@@ -14,7 +13,13 @@ var _i16FromHex = require("../../../utils/i-16-from-hex.js");
 var _le16FromHex = require("../../../utils/le-16-from-hex.js");
 var _le32FromHex = require("../../../utils/le-32-from-hex.js");
 var _btManagedDevice = require("../bt-managed-device.js");
+var _bp2FrameReader = require("./bp2.frame-reader.js");
 var _bp2MainServices = require("./bp2.main-services.js");
+/**
+ * Leaves a 244 byte payload, enough for an ECG waveform frame to arrive in far fewer
+ * notifications than the 23 byte default allows.
+ */
+const BP2_PREFERRED_MTU = 247;
 class BP2Device extends _btManagedDevice.BTManagedDevice {
   collectedValues = [];
   diagramPoints = [];
@@ -26,28 +31,8 @@ class BP2Device extends _btManagedDevice.BTManagedDevice {
     this.diagramPoints = [];
     this.duration = 0;
   };
-  validatePackage = pkg => {
-    if (pkg[0] !== "a5") {
-      (0, _sentryLogger.sentryLogger)("info", "BP2_DEVICE: Package does not start with a5");
-      const headIndex = pkg.indexOf("a5");
-      if (headIndex > 0) {
-        pkg = pkg.slice(headIndex);
-      }
-    }
-    if (pkg.length < 7) {
-      (0, _sentryLogger.sentryLogger)("info", "BP2_DEVICE: Package is shorter than 7 bytes");
-      return false;
-    }
-    const toNum = hex => parseInt(hex, 16);
-    const lenL = toNum(pkg[5] || "0");
-    const lenH = toNum(pkg[6] || "0");
-    const dataLen = lenL | lenH << 8;
-    const totalLen = 7 + dataLen + 1;
-    if (pkg.length < totalLen) {
-      return false;
-    }
-    return true;
-  };
+  frameReader = new _bp2FrameReader.BP2FrameReader();
+  preferredMtu = BP2_PREFERRED_MTU;
   handleSuccessResult(successResult, collectedValues) {
     this.collectedValues = collectedValues;
     if (!successResult.measurementTypeKey || !successResult.caseType) {

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

@@ -1 +1 @@
-{"version":3,"names":["_core","require","_BloodPressureStates","_sentryLogger","_bloodPressureTranslatedExceptionMap","_caseType","_hexToByte","_i16FromHex","_le16FromHex","_le32FromHex","_btManagedDevice","_bp2MainServices","BP2Device","BTManagedDevice","collectedValues","diagramPoints","duration","mainServices","bp2MainServices","stuckDataTimeout","onStreamStart","validatePackage","pkg","sentryLogger","headIndex","indexOf","slice","length","toNum","hex","parseInt","lenL","lenH","dataLen","totalLen","handleSuccessResult","successResult","measurementTypeKey","caseType","onError","Error","MeasurementTypeKey","ecg","handleEcgResult","bloodPressure","handleBloodPressureResult","CaseType","RESULT","error","checkIfHasErrorForEcg","onResult","handleEcgStream","hexToByte","dataStart","dataEnd","data","le32FromHex","samplingNum","le16FromHex","samplesStart","i","byteIndexInData","sampleVal","i16FromHex","push","checkIfHasErrorForBloodPressure","bpMeasurement","status","undefined","diastolic","systolic","heartRate","BloodPressureStates","REGULAR","errorString","bloodPressureTranslatedExceptionMap","get","DEVICE_ERROR","ecgMeasurement","diagnosticResult","EcgDiagnosticFlag","POOR_WAVEFORM","LEAD_OFF","exports"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bp2/bp2.device.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_core","require","_BloodPressureStates","_bloodPressureTranslatedExceptionMap","_caseType","_hexToByte","_i16FromHex","_le16FromHex","_le32FromHex","_btManagedDevice","_bp2FrameReader","_bp2MainServices","BP2_PREFERRED_MTU","BP2Device","BTManagedDevice","collectedValues","diagramPoints","duration","mainServices","bp2MainServices","stuckDataTimeout","onStreamStart","frameReader","BP2FrameReader","preferredMtu","handleSuccessResult","successResult","measurementTypeKey","caseType","onError","Error","MeasurementTypeKey","ecg","handleEcgResult","bloodPressure","handleBloodPressureResult","CaseType","RESULT","error","checkIfHasErrorForEcg","onResult","handleEcgStream","lenL","hexToByte","lenH","dataLen","dataStart","dataEnd","data","slice","le32FromHex","samplingNum","le16FromHex","samplesStart","i","byteIndexInData","sampleVal","i16FromHex","push","checkIfHasErrorForBloodPressure","bpMeasurement","status","undefined","diastolic","systolic","heartRate","BloodPressureStates","REGULAR","errorString","bloodPressureTranslatedExceptionMap","get","DEVICE_ERROR","ecgMeasurement","diagnosticResult","EcgDiagnosticFlag","POOR_WAVEFORM","LEAD_OFF","length","exports"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bp2/bp2.device.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/modules/bt-management/services/devices/bp2/bp2.frame-reader.js

@@ -0,0 +1,89 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BP2FrameReader = void 0;
+var _frameReadStatus = require("../../../types/frame-read-status.js");
+var _calculateCrc = require("../../../utils/calculate-crc-8.js");
+var _hexToByte = require("../../../utils/hex-to-byte.js");
+var _le16FromHex = require("../../../utils/le-16-from-hex.js");
+const FRAME_START_BYTE = "a5";
+const COMMAND_INDEX = 1;
+const COMMAND_COMPLEMENT_INDEX = 2;
+const PAYLOAD_LENGTH_INDEX = 5;
+const HEADER_BYTES = 7;
+const CHECKSUM_BYTES = 1;
+const BYTE_MASK = 0xff;
+
+/** Start byte, command and its complement: the shortest run that can identify a start. */
+const START_PATTERN_BYTES = 3;
+const isFrameStart = (buffer, index) => {
+  if ((buffer[index] || "").toLowerCase() !== FRAME_START_BYTE) {
+    return false;
+  }
+  const command = (0, _hexToByte.hexToByte)(buffer[index + COMMAND_INDEX] || "0");
+  const complement = (0, _hexToByte.hexToByte)(buffer[index + COMMAND_COMPLEMENT_INDEX] || "0");
+  return command === (~complement & BYTE_MASK);
+};
+const findFrameStart = buffer => {
+  const lastCandidate = buffer.length - START_PATTERN_BYTES;
+  for (let index = 0; index <= lastCandidate; index++) {
+    if (isFrameStart(buffer, index)) {
+      return index;
+    }
+  }
+  return -1;
+};
+
+/**
+ * Bytes that cannot begin a frame start, and are therefore safe to drop when no start
+ * was found. The trailing bytes are kept because a start pattern may still be arriving.
+ */
+const droppableLeadingBytes = buffer => Math.max(0, buffer.length - (START_PATTERN_BYTES - 1));
+
+/**
+ * Reads Lepu protocol frames as used by the BP2.
+ *
+ * Layout: `a5 | cmd | ~cmd | type | seq | lenLow lenHigh | payload | crc8`, where the
+ * checksum covers every byte before it. The complement of the command byte only narrows
+ * the search for a start; the checksum is what actually decides a frame is trustworthy.
+ */
+class BP2FrameReader {
+  readFrame(buffer) {
+    const start = findFrameStart(buffer);
+    if (start === -1) {
+      return {
+        status: _frameReadStatus.FrameReadStatus.INCOMPLETE,
+        consumedBytes: droppableLeadingBytes(buffer)
+      };
+    }
+    const payloadLength = (0, _le16FromHex.le16FromHex)(buffer, start + PAYLOAD_LENGTH_INDEX);
+    const frameLength = HEADER_BYTES + payloadLength + CHECKSUM_BYTES;
+    if (start + frameLength > buffer.length) {
+      return {
+        status: _frameReadStatus.FrameReadStatus.INCOMPLETE,
+        consumedBytes: start
+      };
+    }
+    const frame = buffer.slice(start, start + frameLength);
+    if (!this.hasValidChecksum(frame)) {
+      return {
+        status: _frameReadStatus.FrameReadStatus.CORRUPT,
+        consumedBytes: start + START_PATTERN_BYTES
+      };
+    }
+    return {
+      status: _frameReadStatus.FrameReadStatus.COMPLETE,
+      consumedBytes: start + frameLength,
+      frame
+    };
+  }
+  hasValidChecksum(frame) {
+    const checksummedBytes = frame.length - CHECKSUM_BYTES;
+    const declared = (0, _hexToByte.hexToByte)(frame[checksummedBytes] || "0");
+    return declared === (0, _calculateCrc.calculateCrc8)(frame, checksummedBytes);
+  }
+}
+exports.BP2FrameReader = BP2FrameReader;
+//# sourceMappingURL=bp2.frame-reader.js.map

package/lib/commonjs/modules/bt-management/services/devices/bp2/bp2.frame-reader.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_frameReadStatus","require","_calculateCrc","_hexToByte","_le16FromHex","FRAME_START_BYTE","COMMAND_INDEX","COMMAND_COMPLEMENT_INDEX","PAYLOAD_LENGTH_INDEX","HEADER_BYTES","CHECKSUM_BYTES","BYTE_MASK","START_PATTERN_BYTES","isFrameStart","buffer","index","toLowerCase","command","hexToByte","complement","findFrameStart","lastCandidate","length","droppableLeadingBytes","Math","max","BP2FrameReader","readFrame","start","status","FrameReadStatus","INCOMPLETE","consumedBytes","payloadLength","le16FromHex","frameLength","frame","slice","hasValidChecksum","CORRUPT","COMPLETE","checksummedBytes","declared","calculateCrc8","exports"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bp2/bp2.frame-reader.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/modules/bt-management/services/devices/bp2/bp2.main-services.js

@@ -8,6 +8,27 @@ var _core = require("@ovok/core");
 var _caseType = require("../../../types/case-type.js");
 var _convertBpStateFlag = require("../../../utils/convert-bp-state-flag.js");
 var _convertEcgDiagnosticFlag = require("../../../utils/convert-ecg-diagnostic-flag.js");
+const bloodPressureResultFields = [{
+  name: "systolic",
+  parseType: "number",
+  byteIndexes: [21, 20],
+  parseReference: 16
+}, {
+  name: "diastolic",
+  parseType: "number",
+  byteIndexes: [23, 22],
+  parseReference: 16
+}, {
+  name: "heartRate",
+  parseType: "number",
+  byteIndexes: [27, 26],
+  parseReference: 16
+}, {
+  name: "status",
+  parseType: "custom",
+  byteIndexes: [28],
+  customParserDefinition: a => (0, _convertBpStateFlag.convertBpStateFlag)(a)
+}];
 const bp2MainServices = exports.bp2MainServices = [{
   uuid: "14839ac4-7d7e-415c-9a42-167340cf2339",
   monitorUuids: [{
@@ -52,27 +73,35 @@ const bp2MainServices = exports.bp2MainServices = [{
         measurementTypeKey: _core.MeasurementTypeKey.bloodPressure,
         caseType: _caseType.CaseType.RESULT,
         caseValue: "a50805",
-        parseDefinitions: [{
-          name: "systolic",
-          parseType: "number",
-          byteIndexes: [21, 20],
-          parseReference: 16
-        }, {
-          name: "diastolic",
-          parseType: "number",
-          byteIndexes: [23, 22],
-          parseReference: 16
-        }, {
-          name: "heartRate",
-          parseType: "number",
-          byteIndexes: [27, 26],
-          parseReference: 16
-        }, {
-          name: "status",
-          parseType: "custom",
-          byteIndexes: [28],
-          customParserDefinition: a => (0, _convertBpStateFlag.convertBpStateFlag)(a)
-        }]
+        parseDefinitions: [...bloodPressureResultFields]
+      }, {
+        measurementTypeKey: _core.MeasurementTypeKey.bloodPressure,
+        caseType: _caseType.CaseType.STREAM,
+        caseValue: "a5080f",
+        parseDefinitions: [],
+        description: "Averaging run: a measurement is in progress"
+      }, {
+        measurementTypeKey: _core.MeasurementTypeKey.bloodPressure,
+        caseType: _caseType.CaseType.STREAM,
+        caseValue: "a50810",
+        parseDefinitions: [],
+        description: "Averaging run: waiting between measurements, run not finished"
+      }, {
+        measurementTypeKey: _core.MeasurementTypeKey.bloodPressure,
+        caseType: _caseType.CaseType.RESULT,
+        caseValue: "a50811",
+        parseDefinitions: bloodPressureResultFields,
+        description: "Averaging run finished. Carries the same payload as a single measurement"
+      }, {
+        caseType: _caseType.CaseType.OTHER,
+        caseValue: "a50814",
+        parseDefinitions: [],
+        description: "Venous congestion detected, measurement abandoned"
+      }, {
+        caseType: _caseType.CaseType.OTHER,
+        caseValue: "a508ff",
+        parseDefinitions: [],
+        description: "Device reports an invalid state"
       }, {
         measurementTypeKey: _core.MeasurementTypeKey.ecg,
         caseType: _caseType.CaseType.STREAM,

package/lib/commonjs/modules/bt-management/services/devices/bp2/bp2.main-services.js.map

@@ -1 +1 @@
-{"version":3,"names":["_core","require","_caseType","_convertBpStateFlag","_convertEcgDiagnosticFlag","bp2MainServices","exports","uuid","monitorUuids","parsingModel","caseValuePosition","cases","caseType","CaseType","OTHER","caseValue","parseDefinitions","description","measurementTypeKey","MeasurementTypeKey","bloodPressure","STREAM","RESULT","name","parseType","byteIndexes","parseReference","customParserDefinition","a","convertBpStateFlag","ecg","convertEcgDiagnosticFlag","writeUuid","mainCommandUuid"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bp2/bp2.main-services.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_core","require","_caseType","_convertBpStateFlag","_convertEcgDiagnosticFlag","bloodPressureResultFields","name","parseType","byteIndexes","parseReference","customParserDefinition","a","convertBpStateFlag","bp2MainServices","exports","uuid","monitorUuids","parsingModel","caseValuePosition","cases","caseType","CaseType","OTHER","caseValue","parseDefinitions","description","measurementTypeKey","MeasurementTypeKey","bloodPressure","STREAM","RESULT","ecg","convertEcgDiagnosticFlag","writeUuid","mainCommandUuid"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bp2/bp2.main-services.ts"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAEA,IAAAC,SAAA,GAAAD,OAAA;AAGA,IAAAE,mBAAA,GAAAF,OAAA;AACA,IAAAG,yBAAA,GAAAH,OAAA;AAEA,MAAMI,yBAA6C,GAAG,CACpD;EACEC,IAAI,EAAE,UAAU;EAChBC,SAAS,EAAE,QAAQ;EACnBC,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;EACrBC,cAAc,EAAE;AAClB,CAAC,EACD;EACEH,IAAI,EAAE,WAAW;EACjBC,SAAS,EAAE,QAAQ;EACnBC,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;EACrBC,cAAc,EAAE;AAClB,CAAC,EACD;EACEH,IAAI,EAAE,WAAW;EACjBC,SAAS,EAAE,QAAQ;EACnBC,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;EACrBC,cAAc,EAAE;AAClB,CAAC,EACD;EACEH,IAAI,EAAE,QAAQ;EACdC,SAAS,EAAE,QAAQ;EACnBC,WAAW,EAAE,CAAC,EAAE,CAAC;EACjBE,sBAAsB,EAAGC,CAAS,IAAa,IAAAC,sCAAkB,EAACD,CAAC;AACrE,CAAC,CACF;AAEM,MAAME,eAA2B,GAAAC,OAAA,CAAAD,eAAA,GAAG,CACzC;EACEE,IAAI,EAAE,sCAAsC;EAC5CC,YAAY,EAAE,CACZ;IACED,IAAI,EAAE,sCAAsC;IAC5CE,YAAY,EAAE;MACZC,iBAAiB,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;MAC5BC,KAAK,EAAE,CACL;QACEC,QAAQ,EAAEC,kBAAQ,CAACC,KAAK;QACxBC,SAAS,EAAE,QAAQ;QACnBC,gBAAgB,EAAE,EAAE;QACpBC,WAAW,EACT;MACJ,CAAC,EACD;QACEL,QAAQ,EAAEC,kBAAQ,CAACC,KAAK;QACxBC,SAAS,EAAE,QAAQ;QACnBC,gBAAgB,EAAE,EAAE;QACpBC,WAAW,EAAE;MACf,CAAC,EACD;QACEL,QAAQ,EAAEC,kBAAQ,CAACC,KAAK;QACxBC,SAAS,EAAE,QAAQ;QACnBC,gBAAgB,EAAE,EAAE;QACpBC,WAAW,EAAE;MACf,CAAC,EACD;QACEL,QAAQ,EAAEC,kBAAQ,CAACC,KAAK;QACxBC,SAAS,EAAE,QAAQ;QACnBC,gBAAgB,EAAE,EAAE;QACpBC,WAAW,EAAE;MACf,CAAC,EACD;QACEL,QAAQ,EAAEC,kBAAQ,CAACC,KAAK;QACxBC,SAAS,EAAE,QAAQ;QACnBC,gBAAgB,EAAE,EAAE;QACpBC,WAAW,EAAE;MACf,CAAC,EACD;QACEC,kBAAkB,EAAEC,wBAAkB,CAACC,aAAa;QACpDR,QAAQ,EAAEC,kBAAQ,CAACQ,MAAM;QACzBN,SAAS,EAAE,QAAQ;QACnBC,gBAAgB,EAAE;MACpB,CAAC,EACD;QACEJ,QAAQ,EAAEC,kBAAQ,CAACC,KAAK;QACxBC,SAAS,EAAE,QAAQ;QACnBC,gBAAgB,EAAE;MACpB,CAAC,EACD;QACEE,kBAAkB,EAAEC,wBAAkB,CAACC,aAAa;QACpDR,QAAQ,EAAEC,kBAAQ,CAACS,MAAM;QACzBP,SAAS,EAAE,QAAQ;QACnBC,gBAAgB,EAAE,CAChB,GAAGnB,yBAAyB;MAEhC,CAAC,EACD;QACEqB,kBAAkB,EAAEC,wBAAkB,CAACC,aAAa;QACpDR,QAAQ,EAAEC,kBAAQ,CAACQ,MAAM;QACzBN,SAAS,EAAE,QAAQ;QACnBC,gBAAgB,EAAE,EAAE;QACpBC,WAAW,EAAE;MACf,CAAC,EACD;QACEC,kBAAkB,EAAEC,wBAAkB,CAACC,aAAa;QACpDR,QAAQ,EAAEC,kBAAQ,CAACQ,MAAM;QACzBN,SAAS,EAAE,QAAQ;QACnBC,gBAAgB,EAAE,EAAE;QACpBC,WAAW,EACT;MACJ,CAAC,EACD;QACEC,kBAAkB,EAAEC,wBAAkB,CAACC,aAAa;QACpDR,QAAQ,EAAEC,kBAAQ,CAACS,MAAM;QACzBP,SAAS,EAAE,QAAQ;QACnBC,gBAAgB,EAAEnB,yBAAyB;QAC3CoB,WAAW,EACT;MACJ,CAAC,EACD;QACEL,QAAQ,EAAEC,kBAAQ,CAACC,KAAK;QACxBC,SAAS,EAAE,QAAQ;QACnBC,gBAAgB,EAAE,EAAE;QACpBC,WAAW,EAAE;MACf,CAAC,EACD;QACEL,QAAQ,EAAEC,kBAAQ,CAACC,KAAK;QACxBC,SAAS,EAAE,QAAQ;QACnBC,gBAAgB,EAAE,EAAE;QACpBC,WAAW,EAAE;MACf,CAAC,EACD;QACEC,kBAAkB,EAAEC,wBAAkB,CAACI,GAAG;QAC1CX,QAAQ,EAAEC,kBAAQ,CAACQ,MAAM;QACzBN,SAAS,EAAE,QAAQ;QACnBC,gBAAgB,EAAE,EAAE;QACpBC,WAAW,EACT;MACJ,CAAC,EACD;QACEC,kBAAkB,EAAEC,wBAAkB,CAACI,GAAG;QAC1CX,QAAQ,EAAEC,kBAAQ,CAACS,MAAM;QACzBP,SAAS,EAAE,QAAQ;QACnBC,gBAAgB,EAAE,CAChB;UACElB,IAAI,EAAE,WAAW;UACjBC,SAAS,EAAE,QAAQ;UACnBC,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;UACrBC,cAAc,EAAE;QAClB,CAAC,EACD;UACEH,IAAI,EAAE,kBAAkB;UACxBC,SAAS,EAAE,QAAQ;UACnBC,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;UAC7BE,sBAAsB,EAAGC,CAAS,IAChC,IAAAqB,kDAAwB,EAACrB,CAAC;QAC9B,CAAC;MAEL,CAAC;IAEL;EACF,CAAC,CACF;EACDsB,SAAS,EAAE;IACTlB,IAAI,EAAE,sCAAsC;IAC5CmB,eAAe,EAAE;EACnB;AACF,CAAC,CACF","ignoreList":[]}

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

@@ -13,14 +13,16 @@ class BTConnectionHandler {
   characteristicSubscriptions = [];
   isSendingCommand = false;
   retryCount = 0;
-  constructor(device, mainServices, callbacks) {
+  constructor(device, mainServices, callbacks, preferredMtu) {
     this.device = device;
     this.mainServices = mainServices;
     this.callbacks = callbacks;
+    this.preferredMtu = preferredMtu;
   }
   connect = async () => {
     try {
       await this.connectWithRetries();
+      await this.requestPreferredMtu();
       this.callbacks.onStatusChanged?.(_deviceStatus.DeviceStatus.CONNECTED);
       await this.device.discoverAllServicesAndCharacteristics();
       this.onDisconnectSubscription = this.device.onDisconnected(this.onDeviceDisconnected);
@@ -54,6 +56,28 @@ class BTConnectionHandler {
     this.isSendingCommand = false;
     this.retryCount = 0;
   };
+
+  /**
+   * Asks for a larger MTU so a frame arrives in fewer notifications.
+   *
+   * A device or platform that will not grant it keeps working at the default, so a
+   * refusal is recorded and the connection continues.
+   */
+  requestPreferredMtu = async () => {
+    if (!this.preferredMtu) {
+      return;
+    }
+    try {
+      await this.device.requestMTU(this.preferredMtu);
+    } catch (error) {
+      (0, _sentryLogger.sentryLogger)("info", "DEVICE: MTU request was not granted", {
+        deviceId: this.device.id,
+        deviceName: this.device.name,
+        requestedMtu: this.preferredMtu,
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+  };
   connectWithRetries = async () => {
     const maxRetries = 5;
     const retryDelay = 1000;
@@ -98,8 +122,14 @@ class BTConnectionHandler {
     });
     if (error) {
       this.callbacks.onError?.(error);
-      return;
     }
+
+    /**
+     * The teardown runs whether or not the disconnect carried an error. A link that drops
+     * on its own reports one, and returning early there left the device reported as
+     * connected with its subscriptions still attached, so it was never rediscovered and
+     * only a device restart recovered it.
+     */
     this.callbacks.onStatusChanged?.(_deviceStatus.DeviceStatus.DISCONNECTED);
     this.destroy();
   };

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

@@ -1 +1 @@
-{"version":3,"names":["_index","require","_sentryLogger","_deviceStatus","_base64ToHex","_hexToBase","BTConnectionHandler","characteristicSubscriptions","isSendingCommand","retryCount","constructor","device","mainServices","callbacks","connect","connectWithRetries","onStatusChanged","DeviceStatus","CONNECTED","discoverAllServicesAndCharacteristics","onDisconnectSubscription","onDisconnected","onDeviceDisconnected","subscribeToAllCharacteristics","error","sentryLogger","Error","message","deviceName","name","onError","DISCONNECTED","destroy","forEach","sub","remove","sendCommandToDevice","mainService","writeUuid","sendCommand","maxRetries","retryDelay","maxDelay","connected","isConnected","deviceId","id","String","errorCode","willRetry","Promise","resolve","setTimeout","Math","min","pow","monitorUuid","monitorUuids","subscription","monitorCharacteristicForService","uuid","result","value","hexValue","base64ToHex","onDataReceived","push","command","hexToBase64","mainCommandUuid","writeCharacteristicWithResponseForService","slog","exports"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-connection-handler.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_index","require","_sentryLogger","_deviceStatus","_base64ToHex","_hexToBase","BTConnectionHandler","characteristicSubscriptions","isSendingCommand","retryCount","constructor","device","mainServices","callbacks","preferredMtu","connect","connectWithRetries","requestPreferredMtu","onStatusChanged","DeviceStatus","CONNECTED","discoverAllServicesAndCharacteristics","onDisconnectSubscription","onDisconnected","onDeviceDisconnected","subscribeToAllCharacteristics","error","sentryLogger","Error","message","deviceName","name","onError","DISCONNECTED","destroy","forEach","sub","remove","sendCommandToDevice","mainService","writeUuid","sendCommand","requestMTU","deviceId","id","requestedMtu","String","maxRetries","retryDelay","maxDelay","connected","isConnected","errorCode","willRetry","Promise","resolve","setTimeout","Math","min","pow","monitorUuid","monitorUuids","subscription","monitorCharacteristicForService","uuid","result","value","hexValue","base64ToHex","onDataReceived","push","command","hexToBase64","mainCommandUuid","writeCharacteristicWithResponseForService","slog","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

@@ -4,9 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BTDataProcessor = void 0;
+var _sentryLogger = require("../../../helpers/utils/sentry-logger.js");
 var _caseType = require("../../types/case-type.js");
-var _deviceStatus = require("../../types/device-status.js");
-var _parseMeasurement = require("../../utils/parse-measurement.js");
+var _frameReadStatus = require("../../types/frame-read-status.js");
+var _frameParser = require("./frame-parser.js");
+var _measurementStateMachine = require("./measurement-state-machine.js");
 class BTDataProcessor {
   /**
    * One buffer per characteristic.
@@ -18,21 +20,23 @@ class BTDataProcessor {
    * error. Keeping the buffers apart makes that impossible.
    */
   buffers = new Map();
-  isMeasuring = false;
-  constructor(device, mainServices, stuckDataTimeoutDuration, callbacks) {
+  constructor(device, mainServices, stuckDataTimeoutDuration, callbacks, frameReader) {
     this.device = device;
-    this.mainServices = mainServices;
     this.stuckDataTimeoutDuration = stuckDataTimeoutDuration;
     this.callbacks = callbacks;
-  }
-  get collectedValues() {
-    return this.buffers.get(this.currentUuid) ?? [];
+    this.frameReader = frameReader;
+    this.frameParser = new _frameParser.FrameParser(mainServices);
+    this.measurementState = new _measurementStateMachine.MeasurementStateMachine({
+      onStatusChanged: callbacks.onStatusChanged,
+      onStreamStart: callbacks.onStreamStart,
+      onResult: callbacks.onResult
+    });
   }
   currentUuid = "";
   destroy = () => {
     this.buffers.clear();
     this.currentUuid = "";
-    this.isMeasuring = false;
+    this.measurementState.reset();
     clearTimeout(this.stuckDataTimeout);
     this.stuckDataTimeout = undefined;
   };
@@ -42,13 +46,61 @@ class BTDataProcessor {
     buffer.push(...hexValue);
     this.buffers.set(this.currentUuid, buffer);
     this.startStuckTimeout();
-    const isValid = this.callbacks.validatePackage(buffer, uuid);
-    if (!isValid) {
+    if (this.frameReader) {
+      this.readFramesFromBuffer(this.frameReader, uuid, buffer);
+      return;
+    }
+    this.readWholeBuffer(uuid, buffer);
+  };
+
+  /**
+   * Drains every complete frame the buffer holds.
+   *
+   * One notification can complete several frames and can also carry bytes that belong to
+   * no frame at all, so the reader is asked repeatedly until it stops making progress.
+   * A frame that fails its integrity check is reported and skipped rather than parsed.
+   */
+  readFramesFromBuffer = (reader, uuid, buffer) => {
+    let hasReadFrame = false;
+    while (buffer.length > 0) {
+      const result = reader.readFrame(buffer);
+      const hasProgressed = result.consumedBytes > 0;
+      buffer.splice(0, result.consumedBytes);
+      if (result.status === _frameReadStatus.FrameReadStatus.COMPLETE) {
+        hasReadFrame = true;
+        this.handleFrame(uuid, result.frame);
+        continue;
+      }
+      if (result.status === _frameReadStatus.FrameReadStatus.CORRUPT) {
+        this.reportCorruptFrame();
+      }
+      if (result.status === _frameReadStatus.FrameReadStatus.INCOMPLETE || !hasProgressed) {
+        break;
+      }
+    }
+    if (hasReadFrame) {
+      this.callbacks.onSendCommandToDevice?.();
+    }
+  };
+
+  /**
+   * Treats the whole buffer as one frame, for devices that have not declared a reader.
+   */
+  readWholeBuffer = (uuid, buffer) => {
+    if (!this.callbacks.validatePackage(buffer, uuid)) {
       return;
     }
-    const data = this.extractData(uuid);
+    this.handleFrame(uuid, buffer);
+    this.buffers.set(this.currentUuid, []);
+    this.callbacks.onSendCommandToDevice?.();
+  };
+  handleFrame = (uuid, frame) => {
+    const data = this.frameParser.parse(uuid, frame);
     if (!data) {
-      this.resetDataAndSendCommandToDevice();
+      (0, _sentryLogger.sentryLogger)("info", "BT_MANAGER: Frame matched no declared case", {
+        uuid,
+        frame: frame.join("")
+      });
       return;
     }
 
@@ -60,81 +112,24 @@ class BTDataProcessor {
     if (data.parsingCase.caseType === _caseType.CaseType.DEPENDENT) {
       dependentData = this.callbacks.handleDependentResult?.(data);
     }
-    this.handleStatusChanges(dependentData || data);
-    this.resetDataAndSendCommandToDevice();
+    this.measurementState.advance(dependentData || data, frame);
   };
-  extractData(uuid) {
-    const parsingModel = this.findParsingModel(uuid);
-    if (!parsingModel) {
-      return;
-    }
-    const value = parsingModel.caseValuePosition?.map(index => this.collectedValues[index]).join("") || "";
-    const parsingCase = this.findParsingCase(value, parsingModel);
-    if (!parsingCase) {
-      return;
-    }
-    const parsedData = this.parseData(this.collectedValues, parsingCase);
-    if (!parsedData) {
-      return;
-    }
-    const measurementTypeKey = parsingCase.measurementTypeKey;
-    return {
-      parsingCase,
-      measurementTypeKey,
-      parsedData: parsedData
-    };
-  }
-  findParsingModel(uuid) {
-    let parsingModel;
-    for (const mainService of this.mainServices) {
-      const characteristic = mainService.monitorUuids.find(e => e.uuid.toLowerCase() === uuid.toLowerCase());
-      if (characteristic) {
-        parsingModel = characteristic.parsingModel;
-        break;
+  reportCorruptFrame = () => {
+    this.callbacks.onError?.(new Error("feedback-messages.measurement.corrupt-frame-error", {
+      cause: {
+        message: "Frame failed its integrity check"
       }
-    }
-    return parsingModel;
-  }
-  findParsingCase(caseValue, parsingModel) {
-    if (!parsingModel) {
-      return;
-    }
-    const parsingCase = parsingModel.cases?.find(e => e.caseValue === caseValue);
-    return parsingCase;
-  }
-  parseData(successResult, parsingCase) {
-    if (!parsingCase) {
-      return;
-    }
-    return (0, _parseMeasurement.parseMeasurement)(successResult, parsingCase);
-  }
-  handleStatusChanges({
-    parsingCase,
-    measurementTypeKey,
-    parsedData
-  }) {
-    if (parsingCase.caseType === _caseType.CaseType.STREAM && !this.isMeasuring) {
-      this.callbacks.onStreamStart?.();
-      this.callbacks.onStatusChanged?.(_deviceStatus.DeviceStatus.MEASURING, measurementTypeKey);
-      this.isMeasuring = true;
-    }
-    if (this.isMeasuring && parsingCase.caseType === _caseType.CaseType.OTHER) {
-      this.callbacks.onStatusChanged?.(_deviceStatus.DeviceStatus.CONNECTED, measurementTypeKey);
-      this.isMeasuring = false;
-    }
-    let skipConnectedChange = false;
-    if (this.isMeasuring) {
-      skipConnectedChange = this.callbacks.onResult?.(parsedData, this.collectedValues) ?? false;
-    }
-    if (parsingCase.caseType === _caseType.CaseType.RESULT && this.isMeasuring && !skipConnectedChange) {
-      this.isMeasuring = false;
-      this.callbacks.onStatusChanged?.(_deviceStatus.DeviceStatus.CONNECTED, measurementTypeKey);
-    }
-  }
-  resetDataAndSendCommandToDevice = () => {
-    this.buffers.set(this.currentUuid, []);
-    this.callbacks.onSendCommandToDevice?.();
+    }));
   };
+
+  /**
+   * Reports a parsed frame and moves the device between measuring and connected.
+   *
+   * A result is reported whether or not a stream preceded it, because a device already
+   * holding a finished measurement when the app connects has a real reading to hand over.
+   * Repeats are suppressed on the case transition rather than on the values, so a second
+   * measurement that happens to read the same is still reported.
+   */
   startStuckTimeout = () => {
     if (this.stuckDataTimeout) {
       clearTimeout(this.stuckDataTimeout);