@ovok/native 0.4.6 → 0.4.8

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

@@ -4,85 +4,19 @@ 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));
+var _lepuFrameReader = require("../lepu/lepu.frame-reader.js");
+/** The start byte the BP2 and most of its family use. */
+const BP2_START_BYTES = ["a5"];
 
 /**
  * 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.
+ * The frame itself is shared across the family, so it lives in `LepuFrameReader`; the only
+ * thing that makes it a BP2 is which start byte it accepts.
  */
-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);
+class BP2FrameReader extends _lepuFrameReader.LepuFrameReader {
+  constructor() {
+    super(BP2_START_BYTES);
   }
 }
 exports.BP2FrameReader = BP2FrameReader;

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

@@ -1 +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":[]}
+{"version":3,"names":["_lepuFrameReader","require","BP2_START_BYTES","BP2FrameReader","LepuFrameReader","constructor","exports"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bp2/bp2.frame-reader.ts"],"mappings":";;;;;;AAAA,IAAAA,gBAAA,GAAAC,OAAA;AAEA;AACA,MAAMC,eAAe,GAAG,CAAC,IAAI,CAAC;;AAE9B;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,cAAc,SAASC,gCAAe,CAAC;EAC3CC,WAAWA,CAAA,EAAG;IACnB,KAAK,CAACH,eAAe,CAAC;EACxB;AACF;AAACI,OAAA,CAAAH,cAAA,GAAAA,cAAA","ignoreList":[]}

package/lib/commonjs/modules/bt-management/services/devices/bt-command-writer.js

@@ -0,0 +1,155 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BTCommandWriter = void 0;
+var _sLog = require("../../../helpers/utils/s-log.js");
+var _sentryLogger = require("../../../helpers/utils/sentry-logger.js");
+var _hexToBase = require("../../utils/hex-to-base-64.js");
+const MAX_WRITE_ATTEMPTS = 3;
+
+/** The MTU every BLE link starts at, before either side asks for more. */
+const DEFAULT_ATT_MTU = 23;
+
+/** An ATT write spends three bytes on its own header. */
+const ATT_WRITE_HEADER_BYTES = 3;
+
+/**
+ * The write channel to a connected device.
+ *
+ * These protocols allow one command outstanding at a time, and the reply to it is what
+ * decides the next one, so writes are serialised rather than merely guarded against
+ * re-entry. Refusing a command while another is in flight stalls a self-clocking exchange
+ * permanently: the refused command is the one that would have provoked the next reply, and
+ * nothing retries it.
+ */
+class BTCommandWriter {
+  pendingWrites = Promise.resolve();
+  mtu = DEFAULT_ATT_MTU;
+  constructor(device, onError) {
+    this.device = device;
+    this.onError = onError;
+  }
+
+  /**
+   * Records what the link actually negotiated.
+   *
+   * The floor stands until something says otherwise, because a link that has not
+   * negotiated is at the minimum, and over-estimating truncates while under-estimating
+   * only costs a second packet.
+   */
+  useNegotiatedMtu = mtu => {
+    if (typeof mtu === "number" && Number.isInteger(mtu) && mtu > this.mtu) {
+      this.mtu = mtu;
+    }
+  };
+
+  /** Drops anything still queued, for a link that is going away. */
+  reset = () => {
+    this.pendingWrites = Promise.resolve();
+  };
+
+  /**
+   * Queues commands behind whatever is already being written.
+   *
+   * The returned promise settles when the last of them has been written and never rejects.
+   * A write that fails is retried and reported where it happens; the catch here is a
+   * backstop, so that anything that gets past that still cannot poison the queue and
+   * silence every command after it.
+   */
+  send = commands => {
+    this.pendingWrites = this.pendingWrites.then(() => this.writeInOrder(commands)).catch(error => {
+      this.onError?.(error);
+    });
+    return this.pendingWrites;
+  };
+  writeInOrder = async commands => {
+    for (const command of commands) {
+      await this.writeCommand(command);
+    }
+  };
+
+  /**
+   * Writes one command, split to fit the link.
+   *
+   * A write longer than the negotiated MTU is truncated by the stack rather than refused,
+   * so an oversized command arrives as a shorter one whose header still looks valid. The
+   * Er2 negotiates the 23-byte minimum where the rest of the family grants 247, which is
+   * enough to cut a 28-byte file-read request in half.
+   *
+   * A chunk that cannot be written abandons the rest of the command. The device reassembles
+   * by arrival, so continuing past a gap would hand it a frame that is not the one asked
+   * for - worse than sending nothing, because it would be answered.
+   */
+  writeCommand = async command => {
+    for (const chunk of this.chunksOf(command.frame)) {
+      const written = await this.writeChunk(command, chunk);
+      if (!written) {
+        return;
+      }
+    }
+  };
+
+  /**
+   * Writes one chunk the way the characteristic accepts writes.
+   *
+   * A with-response write to a characteristic that only supports write-without-response
+   * fails outright, so the command says which it is rather than the transport guessing.
+   */
+  writeTo = async (command, value) => {
+    if (command.withoutResponse) {
+      await this.device.writeCharacteristicWithoutResponseForService(command.serviceUuid, command.characteristicUuid, value);
+      return;
+    }
+    await this.device.writeCharacteristicWithResponseForService(command.serviceUuid, command.characteristicUuid, value);
+  };
+
+  /**
+   * Splits a frame into writes the link will carry whole.
+   *
+   * A frame that already fits yields one chunk, so the common command - a poll of a handful
+   * of bytes - is written exactly as it was before there was any splitting at all.
+   */
+  chunksOf = frame => {
+    const size = Math.max(1, this.mtu - ATT_WRITE_HEADER_BYTES);
+    const chunks = [];
+    for (let start = 0; start < frame.length; start += size) {
+      chunks.push(frame.slice(start, start + size));
+    }
+    return chunks;
+  };
+
+  /**
+   * Writes one chunk, retrying a failed write.
+   *
+   * The attempt count is local rather than an instance field, so a write that exhausted its
+   * retries cannot leave the next one with none left - which is what a shared counter did
+   * on any path that failed to reset it.
+   */
+  writeChunk = async (command, chunk) => {
+    for (let attempt = 1; attempt <= MAX_WRITE_ATTEMPTS; attempt++) {
+      try {
+        const isConnected = await this.device.isConnected();
+        if (!isConnected) {
+          return false;
+        }
+        await this.writeTo(command, (0, _hexToBase.hexToBase64)(chunk.join("")));
+        return true;
+      } catch (error) {
+        (0, _sentryLogger.sentryLogger)("error", "DEVICE: Error sending command", {
+          error: error instanceof Error ? error.message : error,
+          deviceName: this.device.name
+        });
+        if (attempt === MAX_WRITE_ATTEMPTS) {
+          (0, _sLog.slog)(error, "BT_CONNECTION_HANDLER: Error sending command", {
+            deviceName: this.device.name
+          });
+        }
+      }
+    }
+    return false;
+  };
+}
+exports.BTCommandWriter = BTCommandWriter;
+//# sourceMappingURL=bt-command-writer.js.map

package/lib/commonjs/modules/bt-management/services/devices/bt-command-writer.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_sLog","require","_sentryLogger","_hexToBase","MAX_WRITE_ATTEMPTS","DEFAULT_ATT_MTU","ATT_WRITE_HEADER_BYTES","BTCommandWriter","pendingWrites","Promise","resolve","mtu","constructor","device","onError","useNegotiatedMtu","Number","isInteger","reset","send","commands","then","writeInOrder","catch","error","command","writeCommand","chunk","chunksOf","frame","written","writeChunk","writeTo","value","withoutResponse","writeCharacteristicWithoutResponseForService","serviceUuid","characteristicUuid","writeCharacteristicWithResponseForService","size","Math","max","chunks","start","length","push","slice","attempt","isConnected","hexToBase64","join","sentryLogger","Error","message","deviceName","name","slog","exports"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-command-writer.ts"],"mappings":"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","ignoreList":[]}

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

@@ -4,20 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BTConnectionHandler = void 0;
-var _index = require("../../../helpers/index.js");
 var _sentryLogger = require("../../../helpers/utils/sentry-logger.js");
 var _deviceStatus = require("../../types/device-status.js");
 var _base64ToHex = require("../../utils/base-64-to-hex.js");
-var _hexToBase = require("../../utils/hex-to-base-64.js");
+var _btCommandWriter = require("./bt-command-writer.js");
 class BTConnectionHandler {
   characteristicSubscriptions = [];
-  isSendingCommand = false;
-  retryCount = 0;
   constructor(device, mainServices, callbacks, preferredMtu) {
     this.device = device;
     this.mainServices = mainServices;
     this.callbacks = callbacks;
     this.preferredMtu = preferredMtu;
+    this.writer = new _btCommandWriter.BTCommandWriter(device, callbacks.onError);
   }
   connect = async () => {
     try {
@@ -39,23 +37,12 @@ class BTConnectionHandler {
   destroy = () => {
     this.characteristicSubscriptions.forEach(sub => sub?.remove());
     this.characteristicSubscriptions = [];
-    this.isSendingCommand = false;
-    this.retryCount = 0;
+    this.writer.reset();
     this.onDisconnectSubscription?.remove();
   };
-  sendCommandToDevice = async () => {
-    if (this.isSendingCommand) {
-      return;
-    }
-    this.isSendingCommand = true;
-    for (const mainService of this.mainServices) {
-      if (mainService.writeUuid) {
-        await this.sendCommand(mainService);
-      }
-    }
-    this.isSendingCommand = false;
-    this.retryCount = 0;
-  };
+
+  /** Sends commands to the device, in order, one at a time. */
+  sendCommands = commands => this.writer.send(commands);
 
   /**
    * Asks for a larger MTU so a frame arrives in fewer notifications.
@@ -68,7 +55,8 @@ class BTConnectionHandler {
       return;
     }
     try {
-      await this.device.requestMTU(this.preferredMtu);
+      const negotiated = await this.device.requestMTU(this.preferredMtu);
+      this.writer.useNegotiatedMtu(negotiated?.mtu ?? this.device.mtu);
     } catch (error) {
       (0, _sentryLogger.sentryLogger)("info", "DEVICE: MTU request was not granted", {
         deviceId: this.device.id,
@@ -152,7 +140,7 @@ class BTConnectionHandler {
           this.characteristicSubscriptions.push(subscription);
         }
       }
-      await this.sendCommandToDevice();
+      await this.sendCommands(this.callbacks.initialCommands?.() ?? []);
     } catch (error) {
       (0, _sentryLogger.sentryLogger)("error", "DEVICE: Error subscribing to all characteristics", {
         error: error instanceof Error ? error.message : error,
@@ -161,34 +149,6 @@ class BTConnectionHandler {
       this.callbacks.onError?.(error);
     }
   };
-  sendCommand = async mainService => {
-    if (!mainService.writeUuid) {
-      return;
-    }
-    while (this.retryCount < 3) {
-      try {
-        const isConnected = await this.device.isConnected();
-        if (!isConnected) {
-          return;
-        }
-        const command = (0, _hexToBase.hexToBase64)(mainService.writeUuid.mainCommandUuid);
-        await this.device.writeCharacteristicWithResponseForService(mainService.uuid, mainService.writeUuid.uuid, command);
-        this.retryCount = 0;
-        break;
-      } catch (error) {
-        this.retryCount++;
-        (0, _sentryLogger.sentryLogger)("error", "DEVICE: Error sending command", {
-          error: error instanceof Error ? error.message : error,
-          deviceName: this.device.name
-        });
-        if (this.retryCount === 3) {
-          (0, _index.slog)(error, "BT_CONNECTION_HANDLER: Error sending command", {
-            deviceName: this.device.name
-          });
-        }
-      }
-    }
-  };
 }
 exports.BTConnectionHandler = BTConnectionHandler;
 //# sourceMappingURL=bt-connection-handler.js.map

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","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":[]}
+{"version":3,"names":["_sentryLogger","require","_deviceStatus","_base64ToHex","_btCommandWriter","BTConnectionHandler","characteristicSubscriptions","constructor","device","mainServices","callbacks","preferredMtu","writer","BTCommandWriter","onError","connect","connectWithRetries","requestPreferredMtu","onStatusChanged","DeviceStatus","CONNECTED","discoverAllServicesAndCharacteristics","onDisconnectSubscription","onDisconnected","onDeviceDisconnected","subscribeToAllCharacteristics","error","sentryLogger","Error","message","deviceName","name","DISCONNECTED","destroy","forEach","sub","remove","reset","sendCommands","commands","send","negotiated","requestMTU","useNegotiatedMtu","mtu","deviceId","id","requestedMtu","String","maxRetries","retryDelay","maxDelay","connected","retryCount","isConnected","errorCode","willRetry","Promise","resolve","setTimeout","Math","min","pow","mainService","monitorUuid","monitorUuids","subscription","monitorCharacteristicForService","uuid","result","value","hexValue","base64ToHex","onDataReceived","push","initialCommands","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

@@ -61,14 +61,13 @@ class BTDataProcessor {
    * 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);
+        this.answerFrame(result.frame);
         continue;
       }
       if (result.status === _frameReadStatus.FrameReadStatus.CORRUPT) {
@@ -78,9 +77,6 @@ class BTDataProcessor {
         break;
       }
     }
-    if (hasReadFrame) {
-      this.callbacks.onSendCommandToDevice?.();
-    }
   };
 
   /**
@@ -92,7 +88,22 @@ class BTDataProcessor {
     }
     this.handleFrame(uuid, buffer);
     this.buffers.set(this.currentUuid, []);
-    this.callbacks.onSendCommandToDevice?.();
+    this.answerFrame(buffer);
+  };
+
+  /**
+   * Answers one complete frame with whatever the device's sequencer decides.
+   *
+   * Every frame is offered, including one that matched no parsing case. An identity reply
+   * and a file-transfer chunk carry no measurement, and a sequencer that never saw them
+   * could not take the step that follows - the exchange would stop dead on the first frame
+   * that was protocol rather than data.
+   */
+  answerFrame = frame => {
+    const commands = this.callbacks.nextCommand?.(frame);
+    if (commands && commands.length > 0) {
+      this.callbacks.sendCommands?.(commands);
+    }
   };
   handleFrame = (uuid, frame) => {
     const data = this.frameParser.parse(uuid, frame);

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","onResult","currentUuid","destroy","clear","reset","clearTimeout","stuckDataTimeout","undefined","processData","uuid","hexValue","String","toLowerCase","buffer","get","push","set","startStuckTimeout","readFramesFromBuffer","readWholeBuffer","reader","hasReadFrame","length","result","readFrame","hasProgressed","consumedBytes","splice","status","FrameReadStatus","COMPLETE","handleFrame","frame","CORRUPT","reportCorruptFrame","INCOMPLETE","onSendCommandToDevice","validatePackage","data","parse","sentryLogger","join","dependentData","parsingCase","caseType","CaseType","DEPENDENT","handleDependentResult","advance","onError","Error","cause","message","setTimeout","cancelConnection","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","onResult","currentUuid","destroy","clear","reset","clearTimeout","stuckDataTimeout","undefined","processData","uuid","hexValue","String","toLowerCase","buffer","get","push","set","startStuckTimeout","readFramesFromBuffer","readWholeBuffer","reader","length","result","readFrame","hasProgressed","consumedBytes","splice","status","FrameReadStatus","COMPLETE","handleFrame","frame","answerFrame","CORRUPT","reportCorruptFrame","INCOMPLETE","validatePackage","commands","nextCommand","sendCommands","data","parse","sentryLogger","join","dependentData","parsingCase","caseType","CaseType","DEPENDENT","handleDependentResult","advance","onError","Error","cause","message","setTimeout","cancelConnection","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,8 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.BTManagedDevice = void 0;
 var _sentryLogger = require("../../../helpers/utils/sentry-logger.js");
 var _deviceStatus = require("../../types/device-status.js");
+var _summariseMeasurementForLog = require("../../utils/summarise-measurement-for-log.js");
+var _supportedMeasurementTypeKeys = require("../../utils/supported-measurement-type-keys.js");
 var _btConnectionHandler = require("./bt-connection-handler.js");
 var _btDataProcessor = require("./bt-data-processor.js");
+var _pollingCommandSequencer = require("./polling-command-sequencer.js");
 class BTManagedDevice {
   /**
    * The timeout in milliseconds for the stuck data.
@@ -22,6 +25,17 @@ class BTManagedDevice {
    * @returns The handled data.
    */
 
+  /**
+   * Builds the policy that decides what to send this device, and when.
+   *
+   * A factory rather than an instance, because a sequencer carries the state of the
+   * exchange - whether the device has identified itself, how far a file read has got. One
+   * shared across connections would resume a conversation the device has forgotten.
+   *
+   * A device that leaves this undefined polls with the command its services declare, which
+   * is what every device did before a policy could be expressed at all.
+   */
+
   /**
    * Locates frame boundaries inside the notification buffer.
    *
@@ -95,10 +109,7 @@ class BTManagedDevice {
       ...data
     }) => {
       (0, _sentryLogger.sentryLogger)("info", "BT_MANAGER: Calling onResult callback", {
-        data: {
-          ...data,
-          diagramPoints: "diagramPoints" in data ? data.diagramPoints.length : undefined
-        },
+        data: (0, _summariseMeasurementForLog.summariseMeasurementForLog)(data),
         deviceData: this.deviceData,
         deviceName: this.deviceData.name
       });
@@ -122,7 +133,8 @@ class BTManagedDevice {
   };
   connect = async () => {
     // To access the abstract property in the constructor, we need to set it here
-    this.deviceData.measurementTypes = this.getSupportedMeasurementTypeKeys();
+    this.deviceData.measurementTypes = (0, _supportedMeasurementTypeKeys.supportedMeasurementTypeKeys)(this.mainServices);
+    const sequencer = this.createCommandSequencer?.() ?? (0, _pollingCommandSequencer.pollingSequencerFor)(this.mainServices);
     this.connectionHandler = new _btConnectionHandler.BTConnectionHandler(this.device, this.mainServices, {
       onStatusChanged: status => {
         this.onDeviceStatusChanged?.bind(this)(status);
@@ -134,7 +146,8 @@ class BTManagedDevice {
       onError: error => this.onError?.bind(this)(error),
       onDataReceived: (uuid, hexValue) => {
         this.dataProcessor?.processData(uuid, hexValue);
-      }
+      },
+      initialCommands: () => sequencer.initialCommands()
     }, this.preferredMtu);
     this.dataProcessor = new _btDataProcessor.BTDataProcessor(this.device, this.mainServices, this.stuckDataTimeout, {
       onStatusChanged: this.onDeviceStatusChanged?.bind(this),
@@ -147,19 +160,13 @@ class BTManagedDevice {
           this.onError?.bind(this)(error);
         }
       },
-      onSendCommandToDevice: this.connectionHandler?.sendCommandToDevice?.bind(this),
+      nextCommand: frame => sequencer.nextCommand(frame),
+      sendCommands: commands => void this.connectionHandler?.sendCommands(commands),
       onError: this.onError?.bind(this),
       handleDependentResult: this.handleDependentResult?.bind(this)
     }, this.frameReader);
     await this.connectionHandler.connect();
   };
-  getSupportedMeasurementTypeKeys = () => {
-    const measurementTypes = this.mainServices.flatMap(service => {
-      return service.monitorUuids.flatMap(uuid => uuid.parsingModel.cases.map(c => c.measurementTypeKey) || []);
-    }).filter(type => type !== undefined);
-    const uniqueMeasurementTypes = [...new Set(measurementTypes.flat())];
-    return uniqueMeasurementTypes;
-  };
 }
 exports.BTManagedDevice = BTManagedDevice;
 //# sourceMappingURL=bt-managed-device.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_sentryLogger","require","_deviceStatus","_btConnectionHandler","_btDataProcessor","BTManagedDevice","constructor","device","deviceName","onError","onErrorCallback","onDeviceStatusChanged","onDeviceStatusChangedCallback","onResult","onResultCallback","onDeviceDisconnected","onDeviceDisconnectedCallback","sentryLogger","deviceId","id","deviceData","name","localName","manufacturerData","sn","measurementTypes","status","measurementTypeKey","error","Error","message","caseType","_","data","diagramPoints","length","undefined","destroy","connectionHandler","dataProcessor","connect","getSupportedMeasurementTypeKeys","BTConnectionHandler","mainServices","onStatusChanged","bind","DeviceStatus","DISCONNECTED","onDataReceived","uuid","hexValue","processData","preferredMtu","BTDataProcessor","stuckDataTimeout","onStreamStart","validatePackage","parsedData","collectedValues","handleSuccessResult","onSendCommandToDevice","sendCommandToDevice","handleDependentResult","frameReader","flatMap","service","monitorUuids","parsingModel","cases","map","c","filter","type","uniqueMeasurementTypes","Set","flat","exports"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-managed-device.ts"],"mappings":";;;;;;AAGA,IAAAA,aAAA,GAAAC,OAAA;AAMA,IAAAC,aAAA,GAAAD,OAAA;AAOA,IAAAE,oBAAA,GAAAF,OAAA;AACA,IAAAG,gBAAA,GAAAH,OAAA;AAEO,MAAeI,eAAe,CAErC;EASE;AACF;AACA;;EAGE;AACF;AACA;AACA;AACA;AACA;AACA;AACA;;EAOE;AACF;AACA;AACA;AACA;AACA;AACA;;EAGE;AACF;AACA;AACA;AACA;AACA;;EAGE;AACF;AACA;AACA;AACA;AACA;;EAiBEC,WAAWA,CACOC,MAAc,EAE9B;IACEC,UAAU;IACVC,OAAO,EAAEC,eAAe;IACxBC,qBAAqB,EAAEC,6BAA6B;IACpDC,QAAQ,EAAEC,gBAAgB;IAC1BC,oBAAoB,EAAEC;EACD,CAAC,EACxB;IAAA,KATgBT,MAAc,GAAdA,MAAc;IAU9B,IAAAU,0BAAY,EAAC,MAAM,EAAE,sCAAsC,EAAE;MAC3DC,QAAQ,EAAEX,MAAM,CAACY,EAAE;MACnBX,UAAU,EAAEA;IACd,CAAC,CAAC;IACF,IAAI,CAACY,UAAU,GAAG;MAChBD,EAAE,EAAEZ,MAAM,CAACY,EAAE;MACbE,IAAI,EAAEb,UAAU;MAChBc,SAAS,EAAEf,MAAM,CAACe,SAAS,IAAI,EAAE;MACjCC,gBAAgB,EAAEhB,MAAM,CAACgB,gBAAgB,IAAI,EAAE;MAC/CC,EAAE,EAAE,EAAE;MAEN;MACAC,gBAAgB,EAAE;IACpB,CAAC;IAED,IAAI,CAACN,EAAE,GAAGZ,MAAM,CAACY,EAAE;IAEnB,IAAI,CAACR,qBAAqB,GAAG,CAC3Be,MAAoB,EACpBC,kBAAuC,KACpC;MACH,IAAAV,0BAAY,EACV,MAAM,EACN,oDAAoD,EACpD;QACES,MAAM;QACNC,kBAAkB;QAClBP,UAAU,EAAE,IAAI,CAACA,UAAU;QAC3BZ,UAAU,EAAE,IAAI,CAACY,UAAU,CAACC;MAC9B,CACF,CAAC;MACDT,6BAA6B,GAAG;QAC9BQ,UAAU,EAAE,IAAI,CAACA,UAAU;QAC3BM,MAAM,EAAEA,MAAM;QACdC;MACF,CAAC,CAAC;IACJ,CAAC;IACD,IAAI,CAAClB,OAAO,GAAImB,KAAgC,IAAK;MACnD,IAAAX,0BAAY,EAAC,OAAO,EAAE,sCAAsC,EAAE;QAC5DW,KAAK,EAAEA,KAAK,YAAYC,KAAK,GAAGD,KAAK,CAACE,OAAO,GAAGF,KAAK;QACrDR,UAAU,EAAE,IAAI,CAACA,UAAU;QAC3BZ,UAAU,EAAE,IAAI,CAACY,UAAU,CAACC;MAC9B,CAAC,CAAC;MACFX,eAAe,GAAG;QAChBU,UAAU,EAAE,IAAI,CAACA,UAAU;QAC3BQ,KAAK,EAAEA;MACT,CAAC,CAAC;IACJ,CAAC;IACD,IAAI,CAACf,QAAQ,GAAG,CAAC;MACfkB,QAAQ,EAAEC,CAAC;MACX,GAAGC;IAC2B,CAAC,KAAK;MACpC,IAAAhB,0BAAY,EAAC,MAAM,EAAE,uCAAuC,EAAE;QAC5DgB,IAAI,EAAE;UACJ,GAAGA,IAAI;UACPC,aAAa,EACX,eAAe,IAAID,IAAI,GAClBA,IAAI,CAACC,aAAa,CAAcC,MAAM,GACvCC;QACR,CAAC;QACDhB,UAAU,EAAE,IAAI,CAACA,UAAU;QAC3BZ,UAAU,EAAE,IAAI,CAACY,UAAU,CAACC;MAC9B,CAAC,CAAC;MACFP,gBAAgB,GAAG;QAAEM,UAAU,EAAE,IAAI,CAACA,UAAU;QAAEa;MAAK,CAAC,CAAC;IAC3D,CAAC;IACD,IAAI,CAAClB,oBAAoB,GAAGC,4BAA4B;EAC1D;EAEOqB,OAAO,GAAGA,CAAA,KAAM;IACrB,IAAApB,0BAAY,EAAC,MAAM,EAAE,+BAA+B,EAAE;MACpDG,UAAU,EAAE,IAAI,CAACA,UAAU;MAC3BZ,UAAU,EAAE,IAAI,CAACY,UAAU,CAACC;IAC9B,CAAC,CAAC;IACF,IAAI,CAACiB,iBAAiB,EAAED,OAAO,CAAC,CAAC;IACjC,IAAI,CAACE,aAAa,EAAEF,OAAO,CAAC,CAAC;IAC7B,IAAI,CAAC5B,OAAO,GAAG2B,SAAS;IACxB,IAAI,CAACzB,qBAAqB,GAAGyB,SAAS;IACtC,IAAI,CAACvB,QAAQ,GAAGuB,SAAS;EAC3B,CAAC;EAEMI,OAAO,GAAG,MAAAA,CAAA,KAAY;IAC3B;IACA,IAAI,CAACpB,UAAU,CAACK,gBAAgB,GAAG,IAAI,CAACgB,+BAA+B,CAAC,CAAC;IAEzE,IAAI,CAACH,iBAAiB,GAAG,IAAII,wCAAmB,CAC9C,IAAI,CAACnC,MAAM,EACX,IAAI,CAACoC,YAAY,EACjB;MACEC,eAAe,EAAGlB,MAAM,IAAK;QAC3B,IAAI,CAACf,qBAAqB,EAAEkC,IAAI,CAAC,IAAI,CAAC,CAACnB,MAAM,CAAC;QAC9C,IAAIA,MAAM,KAAKoB,0BAAY,CAACC,YAAY,EAAE;UACxC,IAAI,CAAChC,oBAAoB,GAAG,CAAC;UAC7B,IAAI,CAACsB,OAAO,CAAC,CAAC;QAChB;MACF,CAAC;MACD5B,OAAO,EAAGmB,KAAK,IAAK,IAAI,CAACnB,OAAO,EAAEoC,IAAI,CAAC,IAAI,CAAC,CAACjB,KAAK,CAAC;MACnDoB,cAAc,EAAEA,CAACC,IAAI,EAAEC,QAAQ,KAAK;QAClC,IAAI,CAACX,aAAa,EAAEY,WAAW,CAACF,IAAI,EAAEC,QAAQ,CAAC;MACjD;IACF,CAAC,EACD,IAAI,CAACE,YACP,CAAC;IAED,IAAI,CAACb,aAAa,GAAG,IAAIc,gCAAe,CACtC,IAAI,CAAC9C,MAAM,EACX,IAAI,CAACoC,YAAY,EACjB,IAAI,CAACW,gBAAgB,EACrB;MACEV,eAAe,EAAE,IAAI,CAACjC,qBAAqB,EAAEkC,IAAI,CAAC,IAAI,CAAC;MACvDU,aAAa,EAAE,IAAI,CAACA,aAAa,EAAEV,IAAI,CAAC,IAAI,CAAC;MAC7CW,eAAe,EAAE,IAAI,CAACA,eAAe,EAAEX,IAAI,CAAC,IAAI,CAAC,KAAK,MAAM,KAAK,CAAC;MAClEhC,QAAQ,EAAEA,CAAC4C,UAAU,EAAEC,eAAe,KAAK;QACzC,IAAI;UACF,OAAO,IAAI,CAACC,mBAAmB,CAACd,IAAI,CAAC,IAAI,CAAC,CACxCY,UAAU,EACVC,eACF,CAAC;QACH,CAAC,CAAC,OAAO9B,KAAK,EAAE;UACd,IAAI,CAACnB,OAAO,EAAEoC,IAAI,CAAC,IAAI,CAAC,CAACjB,KAAyB,CAAC;QACrD;MACF,CAAC;MACDgC,qBAAqB,EACnB,IAAI,CAACtB,iBAAiB,EAAEuB,mBAAmB,EAAEhB,IAAI,CAAC,IAAI,CAAC;MACzDpC,OAAO,EAAE,IAAI,CAACA,OAAO,EAAEoC,IAAI,CAAC,IAAI,CAAC;MACjCiB,qBAAqB,EAAE,IAAI,CAACA,qBAAqB,EAAEjB,IAAI,CAAC,IAAI;IAC9D,CAAC,EACD,IAAI,CAACkB,WACP,CAAC;IAED,MAAM,IAAI,CAACzB,iBAAiB,CAACE,OAAO,CAAC,CAAC;EACxC,CAAC;EAEOC,+BAA+B,GAAGA,CAAA,KAA4B;IACpE,MAAMhB,gBAAgB,GAAG,IAAI,CAACkB,YAAY,CACvCqB,OAAO,CAAEC,OAAO,IAAK;MACpB,OAAOA,OAAO,CAACC,YAAY,CAACF,OAAO,CAChCf,IAAI,IACHA,IAAI,CAACkB,YAAY,CAACC,KAAK,CAACC,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAAC3C,kBAAkB,CAAC,IAAI,EAChE,CAAC;IACH,CAAC,CAAC,CACD4C,MAAM,CAAEC,IAAI,IAAKA,IAAI,KAAKpC,SAAS,CAAC;IAEvC,MAAMqC,sBAAsB,GAAG,CAAC,GAAG,IAAIC,GAAG,CAACjD,gBAAgB,CAACkD,IAAI,CAAC,CAAC,CAAC,CAAC;IAEpE,OAAOF,sBAAsB;EAC/B,CAAC;AACH;AAACG,OAAA,CAAAvE,eAAA,GAAAA,eAAA","ignoreList":[]}
+{"version":3,"names":["_sentryLogger","require","_deviceStatus","_summariseMeasurementForLog","_supportedMeasurementTypeKeys","_btConnectionHandler","_btDataProcessor","_pollingCommandSequencer","BTManagedDevice","constructor","device","deviceName","onError","onErrorCallback","onDeviceStatusChanged","onDeviceStatusChangedCallback","onResult","onResultCallback","onDeviceDisconnected","onDeviceDisconnectedCallback","sentryLogger","deviceId","id","deviceData","name","localName","manufacturerData","sn","measurementTypes","status","measurementTypeKey","error","Error","message","caseType","_","data","summariseMeasurementForLog","destroy","connectionHandler","dataProcessor","undefined","connect","supportedMeasurementTypeKeys","mainServices","sequencer","createCommandSequencer","pollingSequencerFor","BTConnectionHandler","onStatusChanged","bind","DeviceStatus","DISCONNECTED","onDataReceived","uuid","hexValue","processData","initialCommands","preferredMtu","BTDataProcessor","stuckDataTimeout","onStreamStart","validatePackage","parsedData","collectedValues","handleSuccessResult","nextCommand","frame","sendCommands","commands","handleDependentResult","frameReader","exports"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-managed-device.ts"],"mappings":"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","ignoreList":[]}