@ovok/native 0.4.6 → 0.4.8

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

@@ -1,19 +1,17 @@
 "use strict";
 
-import { slog } from "../../../helpers/index.js";
 import { sentryLogger } from "../../../helpers/utils/sentry-logger.js";
 import { DeviceStatus } from "../../types/device-status.js";
 import { base64ToHex } from "../../utils/base-64-to-hex.js";
-import { hexToBase64 } from "../../utils/hex-to-base-64.js";
+import { BTCommandWriter } from "./bt-command-writer.js";
 export 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(device, callbacks.onError);
   }
   connect = async () => {
     try {
@@ -35,23 +33,12 @@ export 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.
@@ -64,7 +51,8 @@ export 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) {
       sentryLogger("info", "DEVICE: MTU request was not granted", {
         deviceId: this.device.id,
@@ -148,7 +136,7 @@ export class BTConnectionHandler {
           this.characteristicSubscriptions.push(subscription);
         }
       }
-      await this.sendCommandToDevice();
+      await this.sendCommands(this.callbacks.initialCommands?.() ?? []);
     } catch (error) {
       sentryLogger("error", "DEVICE: Error subscribing to all characteristics", {
         error: error instanceof Error ? error.message : error,
@@ -157,33 +145,5 @@ export 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 = hexToBase64(mainService.writeUuid.mainCommandUuid);
-        await this.device.writeCharacteristicWithResponseForService(mainService.uuid, mainService.writeUuid.uuid, command);
-        this.retryCount = 0;
-        break;
-      } catch (error) {
-        this.retryCount++;
-        sentryLogger("error", "DEVICE: Error sending command", {
-          error: error instanceof Error ? error.message : error,
-          deviceName: this.device.name
-        });
-        if (this.retryCount === 3) {
-          slog(error, "BT_CONNECTION_HANDLER: Error sending command", {
-            deviceName: this.device.name
-          });
-        }
-      }
-    }
-  };
 }
 //# sourceMappingURL=bt-connection-handler.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["slog","sentryLogger","DeviceStatus","base64ToHex","hexToBase64","BTConnectionHandler","characteristicSubscriptions","isSendingCommand","retryCount","constructor","device","mainServices","callbacks","preferredMtu","connect","connectWithRetries","requestPreferredMtu","onStatusChanged","CONNECTED","discoverAllServicesAndCharacteristics","onDisconnectSubscription","onDisconnected","onDeviceDisconnected","subscribeToAllCharacteristics","error","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","onDataReceived","push","command","mainCommandUuid","writeCharacteristicWithResponseForService"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-connection-handler.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["sentryLogger","DeviceStatus","base64ToHex","BTCommandWriter","BTConnectionHandler","characteristicSubscriptions","constructor","device","mainServices","callbacks","preferredMtu","writer","onError","connect","connectWithRetries","requestPreferredMtu","onStatusChanged","CONNECTED","discoverAllServicesAndCharacteristics","onDisconnectSubscription","onDisconnected","onDeviceDisconnected","subscribeToAllCharacteristics","error","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","onDataReceived","push","initialCommands"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-connection-handler.ts"],"mappings":"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","ignoreList":[]}

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

@@ -57,14 +57,13 @@ export 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.COMPLETE) {
-        hasReadFrame = true;
         this.handleFrame(uuid, result.frame);
+        this.answerFrame(result.frame);
         continue;
       }
       if (result.status === FrameReadStatus.CORRUPT) {
@@ -74,9 +73,6 @@ export class BTDataProcessor {
         break;
       }
     }
-    if (hasReadFrame) {
-      this.callbacks.onSendCommandToDevice?.();
-    }
   };
 
   /**
@@ -88,7 +84,22 @@ export 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/module/modules/bt-management/services/devices/bt-data-processor.js.map

@@ -1 +1 @@
-{"version":3,"names":["sentryLogger","CaseType","FrameReadStatus","FrameParser","MeasurementStateMachine","BTDataProcessor","buffers","Map","constructor","device","mainServices","stuckDataTimeoutDuration","callbacks","frameReader","frameParser","measurementState","onStatusChanged","onStreamStart","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","COMPLETE","handleFrame","frame","CORRUPT","reportCorruptFrame","INCOMPLETE","onSendCommandToDevice","validatePackage","data","parse","join","dependentData","parsingCase","caseType","DEPENDENT","handleDependentResult","advance","onError","Error","cause","message","setTimeout","cancelConnection"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-data-processor.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["sentryLogger","CaseType","FrameReadStatus","FrameParser","MeasurementStateMachine","BTDataProcessor","buffers","Map","constructor","device","mainServices","stuckDataTimeoutDuration","callbacks","frameReader","frameParser","measurementState","onStatusChanged","onStreamStart","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","COMPLETE","handleFrame","frame","answerFrame","CORRUPT","reportCorruptFrame","INCOMPLETE","validatePackage","commands","nextCommand","sendCommands","data","parse","join","dependentData","parsingCase","caseType","DEPENDENT","handleDependentResult","advance","onError","Error","cause","message","setTimeout","cancelConnection"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-data-processor.ts"],"mappings":"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","ignoreList":[]}

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

@@ -2,8 +2,11 @@
 
 import { sentryLogger } from "../../../helpers/utils/sentry-logger.js";
 import { DeviceStatus } from "../../types/device-status.js";
+import { summariseMeasurementForLog } from "../../utils/summarise-measurement-for-log.js";
+import { supportedMeasurementTypeKeys } from "../../utils/supported-measurement-type-keys.js";
 import { BTConnectionHandler } from "./bt-connection-handler.js";
 import { BTDataProcessor } from "./bt-data-processor.js";
+import { pollingSequencerFor } from "./polling-command-sequencer.js";
 export class BTManagedDevice {
   /**
    * The timeout in milliseconds for the stuck data.
@@ -18,6 +21,17 @@ export 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.
    *
@@ -91,10 +105,7 @@ export class BTManagedDevice {
       ...data
     }) => {
       sentryLogger("info", "BT_MANAGER: Calling onResult callback", {
-        data: {
-          ...data,
-          diagramPoints: "diagramPoints" in data ? data.diagramPoints.length : undefined
-        },
+        data: summariseMeasurementForLog(data),
         deviceData: this.deviceData,
         deviceName: this.deviceData.name
       });
@@ -118,7 +129,8 @@ export 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 = supportedMeasurementTypeKeys(this.mainServices);
+    const sequencer = this.createCommandSequencer?.() ?? pollingSequencerFor(this.mainServices);
     this.connectionHandler = new BTConnectionHandler(this.device, this.mainServices, {
       onStatusChanged: status => {
         this.onDeviceStatusChanged?.bind(this)(status);
@@ -130,7 +142,8 @@ export 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(this.device, this.mainServices, this.stuckDataTimeout, {
       onStatusChanged: this.onDeviceStatusChanged?.bind(this),
@@ -143,18 +156,12 @@ export 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;
-  };
 }
 //# sourceMappingURL=bt-managed-device.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["sentryLogger","DeviceStatus","BTConnectionHandler","BTDataProcessor","BTManagedDevice","constructor","device","deviceName","onError","onErrorCallback","onDeviceStatusChanged","onDeviceStatusChangedCallback","onResult","onResultCallback","onDeviceDisconnected","onDeviceDisconnectedCallback","deviceId","id","deviceData","name","localName","manufacturerData","sn","measurementTypes","status","measurementTypeKey","error","Error","message","caseType","_","data","diagramPoints","length","undefined","destroy","connectionHandler","dataProcessor","connect","getSupportedMeasurementTypeKeys","mainServices","onStatusChanged","bind","DISCONNECTED","onDataReceived","uuid","hexValue","processData","preferredMtu","stuckDataTimeout","onStreamStart","validatePackage","parsedData","collectedValues","handleSuccessResult","onSendCommandToDevice","sendCommandToDevice","handleDependentResult","frameReader","flatMap","service","monitorUuids","parsingModel","cases","map","c","filter","type","uniqueMeasurementTypes","Set","flat"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-managed-device.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["sentryLogger","DeviceStatus","summariseMeasurementForLog","supportedMeasurementTypeKeys","BTConnectionHandler","BTDataProcessor","pollingSequencerFor","BTManagedDevice","constructor","device","deviceName","onError","onErrorCallback","onDeviceStatusChanged","onDeviceStatusChangedCallback","onResult","onResultCallback","onDeviceDisconnected","onDeviceDisconnectedCallback","deviceId","id","deviceData","name","localName","manufacturerData","sn","measurementTypes","status","measurementTypeKey","error","Error","message","caseType","_","data","destroy","connectionHandler","dataProcessor","undefined","connect","mainServices","sequencer","createCommandSequencer","onStatusChanged","bind","DISCONNECTED","onDataReceived","uuid","hexValue","processData","initialCommands","preferredMtu","stuckDataTimeout","onStreamStart","validatePackage","parsedData","collectedValues","handleSuccessResult","nextCommand","frame","sendCommands","commands","handleDependentResult","frameReader"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-managed-device.ts"],"mappings":";;AAGA,SAASA,YAAY,QAAQ,yCAAsC;AAOnE,SAASC,YAAY,QAAQ,8BAA2B;AAMxD,SAASC,0BAA0B,QAAQ,8CAA2C;AACtF,SAASC,4BAA4B,QAAQ,gDAA6C;AAE1F,SAASC,mBAAmB,QAAQ,4BAAyB;AAC7D,SAASC,eAAe,QAAQ,wBAAqB;AACrD,SAASC,mBAAmB,QAAQ,gCAA6B;AAEjE,OAAO,MAAeC,eAAe,CAErC;EASE;AACF;AACA;;EAGE;AACF;AACA;AACA;AACA;AACA;AACA;AACA;;EAOE;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;EAGE;AACF;AACA;AACA;AACA;AACA;AACA;;EAGE;AACF;AACA;AACA;AACA;AACA;;EAGE;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;IAU9BT,YAAY,CAAC,MAAM,EAAE,sCAAsC,EAAE;MAC3DmB,QAAQ,EAAEV,MAAM,CAACW,EAAE;MACnBV,UAAU,EAAEA;IACd,CAAC,CAAC;IACF,IAAI,CAACW,UAAU,GAAG;MAChBD,EAAE,EAAEX,MAAM,CAACW,EAAE;MACbE,IAAI,EAAEZ,UAAU;MAChBa,SAAS,EAAEd,MAAM,CAACc,SAAS,IAAI,EAAE;MACjCC,gBAAgB,EAAEf,MAAM,CAACe,gBAAgB,IAAI,EAAE;MAC/CC,EAAE,EAAE,EAAE;MAEN;MACAC,gBAAgB,EAAE;IACpB,CAAC;IAED,IAAI,CAACN,EAAE,GAAGX,MAAM,CAACW,EAAE;IAEnB,IAAI,CAACP,qBAAqB,GAAG,CAC3Bc,MAAoB,EACpBC,kBAAuC,KACpC;MACH5B,YAAY,CACV,MAAM,EACN,oDAAoD,EACpD;QACE2B,MAAM;QACNC,kBAAkB;QAClBP,UAAU,EAAE,IAAI,CAACA,UAAU;QAC3BX,UAAU,EAAE,IAAI,CAACW,UAAU,CAACC;MAC9B,CACF,CAAC;MACDR,6BAA6B,GAAG;QAC9BO,UAAU,EAAE,IAAI,CAACA,UAAU;QAC3BM,MAAM,EAAEA,MAAM;QACdC;MACF,CAAC,CAAC;IACJ,CAAC;IACD,IAAI,CAACjB,OAAO,GAAIkB,KAAgC,IAAK;MACnD7B,YAAY,CAAC,OAAO,EAAE,sCAAsC,EAAE;QAC5D6B,KAAK,EAAEA,KAAK,YAAYC,KAAK,GAAGD,KAAK,CAACE,OAAO,GAAGF,KAAK;QACrDR,UAAU,EAAE,IAAI,CAACA,UAAU;QAC3BX,UAAU,EAAE,IAAI,CAACW,UAAU,CAACC;MAC9B,CAAC,CAAC;MACFV,eAAe,GAAG;QAChBS,UAAU,EAAE,IAAI,CAACA,UAAU;QAC3BQ,KAAK,EAAEA;MACT,CAAC,CAAC;IACJ,CAAC;IACD,IAAI,CAACd,QAAQ,GAAG,CAAC;MACfiB,QAAQ,EAAEC,CAAC;MACX,GAAGC;IAC2B,CAAC,KAAK;MACpClC,YAAY,CAAC,MAAM,EAAE,uCAAuC,EAAE;QAC5DkC,IAAI,EAAEhC,0BAA0B,CAACgC,IAAI,CAAC;QACtCb,UAAU,EAAE,IAAI,CAACA,UAAU;QAC3BX,UAAU,EAAE,IAAI,CAACW,UAAU,CAACC;MAC9B,CAAC,CAAC;MACFN,gBAAgB,GAAG;QAAEK,UAAU,EAAE,IAAI,CAACA,UAAU;QAAEa;MAAK,CAAC,CAAC;IAC3D,CAAC;IACD,IAAI,CAACjB,oBAAoB,GAAGC,4BAA4B;EAC1D;EAEOiB,OAAO,GAAGA,CAAA,KAAM;IACrBnC,YAAY,CAAC,MAAM,EAAE,+BAA+B,EAAE;MACpDqB,UAAU,EAAE,IAAI,CAACA,UAAU;MAC3BX,UAAU,EAAE,IAAI,CAACW,UAAU,CAACC;IAC9B,CAAC,CAAC;IACF,IAAI,CAACc,iBAAiB,EAAED,OAAO,CAAC,CAAC;IACjC,IAAI,CAACE,aAAa,EAAEF,OAAO,CAAC,CAAC;IAC7B,IAAI,CAACxB,OAAO,GAAG2B,SAAS;IACxB,IAAI,CAACzB,qBAAqB,GAAGyB,SAAS;IACtC,IAAI,CAACvB,QAAQ,GAAGuB,SAAS;EAC3B,CAAC;EAEMC,OAAO,GAAG,MAAAA,CAAA,KAAY;IAC3B;IACA,IAAI,CAAClB,UAAU,CAACK,gBAAgB,GAAGvB,4BAA4B,CAC7D,IAAI,CAACqC,YACP,CAAC;IAED,MAAMC,SAAS,GACb,IAAI,CAACC,sBAAsB,GAAG,CAAC,IAAIpC,mBAAmB,CAAC,IAAI,CAACkC,YAAY,CAAC;IAE3E,IAAI,CAACJ,iBAAiB,GAAG,IAAIhC,mBAAmB,CAC9C,IAAI,CAACK,MAAM,EACX,IAAI,CAAC+B,YAAY,EACjB;MACEG,eAAe,EAAGhB,MAAM,IAAK;QAC3B,IAAI,CAACd,qBAAqB,EAAE+B,IAAI,CAAC,IAAI,CAAC,CAACjB,MAAM,CAAC;QAC9C,IAAIA,MAAM,KAAK1B,YAAY,CAAC4C,YAAY,EAAE;UACxC,IAAI,CAAC5B,oBAAoB,GAAG,CAAC;UAC7B,IAAI,CAACkB,OAAO,CAAC,CAAC;QAChB;MACF,CAAC;MACDxB,OAAO,EAAGkB,KAAK,IAAK,IAAI,CAAClB,OAAO,EAAEiC,IAAI,CAAC,IAAI,CAAC,CAACf,KAAK,CAAC;MACnDiB,cAAc,EAAEA,CAACC,IAAI,EAAEC,QAAQ,KAAK;QAClC,IAAI,CAACX,aAAa,EAAEY,WAAW,CAACF,IAAI,EAAEC,QAAQ,CAAC;MACjD,CAAC;MACDE,eAAe,EAAEA,CAAA,KAAMT,SAAS,CAACS,eAAe,CAAC;IACnD,CAAC,EACD,IAAI,CAACC,YACP,CAAC;IAED,IAAI,CAACd,aAAa,GAAG,IAAIhC,eAAe,CACtC,IAAI,CAACI,MAAM,EACX,IAAI,CAAC+B,YAAY,EACjB,IAAI,CAACY,gBAAgB,EACrB;MACET,eAAe,EAAE,IAAI,CAAC9B,qBAAqB,EAAE+B,IAAI,CAAC,IAAI,CAAC;MACvDS,aAAa,EAAE,IAAI,CAACA,aAAa,EAAET,IAAI,CAAC,IAAI,CAAC;MAC7CU,eAAe,EAAE,IAAI,CAACA,eAAe,EAAEV,IAAI,CAAC,IAAI,CAAC,KAAK,MAAM,KAAK,CAAC;MAClE7B,QAAQ,EAAEA,CAACwC,UAAU,EAAEC,eAAe,KAAK;QACzC,IAAI;UACF,OAAO,IAAI,CAACC,mBAAmB,CAACb,IAAI,CAAC,IAAI,CAAC,CACxCW,UAAU,EACVC,eACF,CAAC;QACH,CAAC,CAAC,OAAO3B,KAAK,EAAE;UACd,IAAI,CAAClB,OAAO,EAAEiC,IAAI,CAAC,IAAI,CAAC,CAACf,KAAyB,CAAC;QACrD;MACF,CAAC;MACD6B,WAAW,EAAGC,KAAK,IAAKlB,SAAS,CAACiB,WAAW,CAACC,KAAK,CAAC;MACpDC,YAAY,EAAGC,QAAQ,IACrB,KAAK,IAAI,CAACzB,iBAAiB,EAAEwB,YAAY,CAACC,QAAQ,CAAC;MACrDlD,OAAO,EAAE,IAAI,CAACA,OAAO,EAAEiC,IAAI,CAAC,IAAI,CAAC;MACjCkB,qBAAqB,EAAE,IAAI,CAACA,qBAAqB,EAAElB,IAAI,CAAC,IAAI;IAC9D,CAAC,EACD,IAAI,CAACmB,WACP,CAAC;IAED,MAAM,IAAI,CAAC3B,iBAAiB,CAACG,OAAO,CAAC,CAAC;EACxC,CAAC;AAEH","ignoreList":[]}

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

@@ -0,0 +1,51 @@
+"use strict";
+
+import { sentryLogger } from "../../../../helpers/utils/sentry-logger.js";
+import { LepuCommandBuilder } from "../lepu/lepu.command-builder.js";
+import { LepuIdentityGate } from "../lepu/lepu.identity-gate.js";
+
+/** Registration guarantees at least one start byte; this keeps the indexed read total. */
+const DEFAULT_START_BYTE = "a5";
+/**
+ * Builds the gate a Lepu declaration asks for.
+ *
+ * A fresh builder each time, because its sequence number is per connection: one shared
+ * across devices would interleave their counters, which is a defect the vendor's own global
+ * counter has.
+ *
+ * Frames are built with the first declared start byte. A device that accepts either still
+ * answers on the one it is addressed with, so the list matters for reading and its head for
+ * writing.
+ */
+/**
+ * Records what the device said it was.
+ *
+ * The model number is logged because it is the only place one exists: the vendor's SDK
+ * never reads the field back, so a declaration written without it is completed by
+ * connecting once and reading this line.
+ */
+const recordLepuIdentity = (deviceData, info) => {
+  deviceData.sn = info.serialNumber;
+  sentryLogger("info", "BT_MANAGER: Device identified itself", {
+    deviceId: deviceData.id,
+    deviceName: deviceData.name,
+    deviceType: info.deviceType,
+    branchCode: info.branchCode,
+    protocolMaxLength: info.protocolMaxLength
+  });
+};
+const createLepuSequencer = (lepu, report) => new LepuIdentityGate({
+  write: {
+    serviceUuid: lepu.write.serviceUuid,
+    characteristicUuid: lepu.write.characteristicUuid
+  },
+  builder: new LepuCommandBuilder(lepu.startBytes[0] ?? DEFAULT_START_BYTE),
+  expectedDeviceTypes: lepu.expectedDeviceTypes,
+  ...(lepu.pollCommand === undefined ? {} : {
+    pollCommand: lepu.pollCommand
+  }),
+  onIdentified: report.onIdentified,
+  onRefused: report.onRefused
+});
+export { createLepuSequencer, recordLepuIdentity };
+//# sourceMappingURL=custom-lepu-sequencer.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["sentryLogger","LepuCommandBuilder","LepuIdentityGate","DEFAULT_START_BYTE","recordLepuIdentity","deviceData","info","sn","serialNumber","deviceId","id","deviceName","name","deviceType","branchCode","protocolMaxLength","createLepuSequencer","lepu","report","write","serviceUuid","characteristicUuid","builder","startBytes","expectedDeviceTypes","pollCommand","undefined","onIdentified","onRefused"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/custom/custom-lepu-sequencer.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,4CAAyC;AAItE,SAASC,kBAAkB,QAAQ,iCAA8B;AAEjE,SAASC,gBAAgB,QAAQ,+BAA4B;;AAE7D;AACA,MAAMC,kBAAkB,GAAG,IAAI;AAO/B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,kBAAkB,GAAGA,CACzBC,UAAsB,EACtBC,IAAoB,KACX;EACTD,UAAU,CAACE,EAAE,GAAGD,IAAI,CAACE,YAAY;EAEjCR,YAAY,CAAC,MAAM,EAAE,sCAAsC,EAAE;IAC3DS,QAAQ,EAAEJ,UAAU,CAACK,EAAE;IACvBC,UAAU,EAAEN,UAAU,CAACO,IAAI;IAC3BC,UAAU,EAAEP,IAAI,CAACO,UAAU;IAC3BC,UAAU,EAAER,IAAI,CAACQ,UAAU;IAC3BC,iBAAiB,EAAET,IAAI,CAACS;EAC1B,CAAC,CAAC;AACJ,CAAC;AAED,MAAMC,mBAAmB,GAAGA,CAC1BC,IAAoB,EACpBC,MAAsB,KAEtB,IAAIhB,gBAAgB,CAAC;EACnBiB,KAAK,EAAE;IACLC,WAAW,EAAEH,IAAI,CAACE,KAAK,CAACC,WAAW;IACnCC,kBAAkB,EAAEJ,IAAI,CAACE,KAAK,CAACE;EACjC,CAAC;EACDC,OAAO,EAAE,IAAIrB,kBAAkB,CAACgB,IAAI,CAACM,UAAU,CAAC,CAAC,CAAC,IAAIpB,kBAAkB,CAAC;EACzEqB,mBAAmB,EAAEP,IAAI,CAACO,mBAAmB;EAC7C,IAAIP,IAAI,CAACQ,WAAW,KAAKC,SAAS,GAAG,CAAC,CAAC,GAAG;IAAED,WAAW,EAAER,IAAI,CAACQ;EAAY,CAAC,CAAC;EAC5EE,YAAY,EAAET,MAAM,CAACS,YAAY;EACjCC,SAAS,EAAEV,MAAM,CAACU;AACpB,CAAC,CAAC;AAEJ,SAASZ,mBAAmB,EAAEZ,kBAAkB","ignoreList":[]}

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

@@ -2,9 +2,11 @@
 
 import { CaseType } from "../../../types/case-type.js";
 import { createFrameValidator } from "../../../utils/create-frame-validator.js";
+import { parseMeasurement } from "../../../utils/parse-measurement.js";
+import { discardedReadingError, rejectCustomReading } from "../../../utils/reject-custom-reading.js";
 import { BTManagedDevice } from "../bt-managed-device.js";
-const RESERVED_KEYS = ["measurementTypeKey", "caseType"];
-
+import { LepuFrameReader } from "../lepu/lepu.frame-reader.js";
+import { createLepuSequencer, recordLepuIdentity } from "./custom-lepu-sequencer.js";
 /**
  * Runs a device registered with defineCustomDevice.
  *
@@ -21,10 +23,37 @@ export class CustomDevice extends BTManagedDevice {
     this.definition = definition;
     this.mainServices = definition.mainServices;
     this.stuckDataTimeout = definition.stuckDataTimeout;
+    if (definition.preferredMtu !== undefined) {
+      this.preferredMtu = definition.preferredMtu;
+    }
+    this.declareLepuProtocol(definition);
     definition.frames.forEach((frame, uuid) => {
       this.validators.set(uuid, createFrameValidator(frame));
     });
   }
+
+  /**
+   * Gives a Lepu declaration its frame reader and its command sequence.
+   *
+   * Both or neither: the reader finds frame edges the family's own way, and the gate is
+   * what decides anything may be sent at all. A declaration that had the reader without the
+   * gate would poll hardware it had not identified, which is the case the gate exists for.
+   */
+  declareLepuProtocol(definition) {
+    const lepu = definition.lepu;
+    if (!lepu) {
+      return;
+    }
+    this.frameReader = new LepuFrameReader(lepu.startBytes);
+    this.createCommandSequencer = () => createLepuSequencer(lepu, {
+      onIdentified: this.onIdentified,
+      onRefused: this.onIdentityRefused
+    });
+  }
+  onIdentified = info => recordLepuIdentity(this.deviceData, info);
+  onIdentityRefused = reason => {
+    this.onError?.(new Error(`Custom device "${this.definition.id}" was not addressed: ${reason}.`));
+  };
   validatePackage = (pkg, uuid) => {
     const validate = this.validators.get(String(uuid ?? "").toLowerCase());
     if (!validate) {
@@ -40,7 +69,7 @@ export class CustomDevice extends BTManagedDevice {
    */
   handleDependentResult = data => {
     try {
-      this.report(data.parsedData);
+      this.reportFrame(data);
     } catch (error) {
       this.onError?.(error);
     }
@@ -60,39 +89,63 @@ export class CustomDevice extends BTManagedDevice {
   handleSuccessResult() {
     return;
   }
-  report(parsedData) {
-    const measurementTypeKey = parsedData.measurementTypeKey;
-    if (!measurementTypeKey) {
-      this.fail("a result frame carries no measurement type", parsedData);
+
+  /**
+   * Reports what the frame carried, which may be more than one reading.
+   *
+   * A device handing over its stored history answers one request with every record it
+   * holds, back to back. Those were taken at different times and are separate readings, so
+   * each record is decoded and reported on its own. A trailing part-record is ignored: half
+   * a record is not a reading.
+   */
+  reportFrame(data) {
+    const repeated = data.parsingCase.repeatedRecords;
+    if (!repeated || !data.frame) {
+      this.report(data.parsedData, data.parsingCase);
       return;
     }
-    const names = Object.keys(parsedData).filter(key => !RESERVED_KEYS.includes(key));
-    if (names.length === 0) {
-      this.fail("a result frame decoded no properties", parsedData);
-      return;
+    const records = Math.floor((data.frame.length - repeated.from) / repeated.recordBytes);
+    for (let record = 0; record < records; record++) {
+      this.report(parseMeasurement(data.frame, data.parsingCase, repeated.from + record * repeated.recordBytes), data.parsingCase);
     }
-    const rejection = names.map(name => this.reject(measurementTypeKey, name, parsedData[name])).find(message => message !== undefined);
-    if (rejection) {
-      this.fail(rejection, parsedData);
+  }
+
+  /**
+   * Reports every reading the frame carried.
+   *
+   * One frame is often one reading, but a multi-parameter monitor sends a heart rate, an
+   * oxygen saturation and a temperature together. Those are separate measurements, so they
+   * are reported separately rather than merged into one object whose properties came from
+   * different instruments.
+   *
+   * A reading that fails its checks is discarded on its own. A temperature the device could
+   * not take is no reason to withhold the heart rate in the same frame.
+   */
+  report(parsedData, parsingCase) {
+    const measurements = parsingCase.measurements ?? [];
+    if (measurements.length === 0) {
+      this.discard("a result frame carries no measurement type", parsedData);
       return;
     }
-    this.onResult?.(parsedData);
+    measurements.forEach(measurement => this.reportMeasurement(parsedData, measurement));
   }
-  reject(measurementTypeKey, name, value) {
-    const field = this.definition.fields.get(`${measurementTypeKey}:${name}`);
-    if (!field) {
-      return `decoded "${name}", which is not declared for ${measurementTypeKey}`;
-    }
-    if (typeof value !== "number" || !Number.isFinite(value)) {
-      return `could not decode ${name}; the frame was shorter than the declaration expects`;
-    }
-    if (value < field.min || value > field.max) {
-      return `decoded ${name} = ${value} ${field.unit}, outside the accepted range ${field.min}-${field.max} ${field.unit}`;
-    }
-    return undefined;
+  discard(reason, parsedData) {
+    this.onError?.(discardedReadingError(this.definition.id, reason, parsedData));
   }
-  fail(reason, parsedData) {
-    this.onError?.(new Error(`Custom device "${this.definition.id}": ${reason}. The reading was discarded (decoded ${JSON.stringify(parsedData)}).`));
+  reportMeasurement(parsedData, measurement) {
+    const reading = {
+      caseType: parsedData.caseType,
+      measurementTypeKey: measurement.measurementTypeKey
+    };
+    measurement.fieldNames.forEach(name => {
+      reading[name] = parsedData[name];
+    });
+    const rejection = measurement.fieldNames.map(name => rejectCustomReading(this.definition.fields, measurement.measurementTypeKey, name, reading[name])).find(message => message !== undefined);
+    if (rejection) {
+      this.discard(rejection, reading);
+      return;
+    }
+    this.onResult?.(reading);
   }
 }
 //# sourceMappingURL=custom.device.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["CaseType","createFrameValidator","BTManagedDevice","RESERVED_KEYS","CustomDevice","validators","Map","constructor","device","params","definition","mainServices","stuckDataTimeout","frames","forEach","frame","uuid","set","validatePackage","pkg","validate","get","String","toLowerCase","handleDependentResult","data","report","parsedData","error","onError","parsingCase","caseType","OTHER","handleSuccessResult","measurementTypeKey","fail","names","Object","keys","filter","key","includes","length","rejection","map","name","reject","find","message","undefined","onResult","value","field","fields","Number","isFinite","min","max","unit","reason","Error","id","JSON","stringify"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/custom/custom.device.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["CaseType","createFrameValidator","parseMeasurement","discardedReadingError","rejectCustomReading","BTManagedDevice","LepuFrameReader","createLepuSequencer","recordLepuIdentity","CustomDevice","validators","Map","constructor","device","params","definition","mainServices","stuckDataTimeout","preferredMtu","undefined","declareLepuProtocol","frames","forEach","frame","uuid","set","lepu","frameReader","startBytes","createCommandSequencer","onIdentified","onRefused","onIdentityRefused","info","deviceData","reason","onError","Error","id","validatePackage","pkg","validate","get","String","toLowerCase","handleDependentResult","data","reportFrame","error","parsingCase","caseType","OTHER","handleSuccessResult","repeated","repeatedRecords","report","parsedData","records","Math","floor","length","from","recordBytes","record","measurements","discard","measurement","reportMeasurement","reading","measurementTypeKey","fieldNames","name","rejection","map","fields","find","message","onResult"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/custom/custom.device.ts"],"mappings":";;AAEA,SAASA,QAAQ,QAAQ,6BAA0B;AAUnD,SAASC,oBAAoB,QAAQ,0CAAuC;AAC5E,SAASC,gBAAgB,QAAQ,qCAAkC;AACnE,SACEC,qBAAqB,EACrBC,mBAAmB,QACd,yCAAsC;AAC7C,SAASC,eAAe,QAAQ,yBAAsB;AAEtD,SAASC,eAAe,QAAQ,8BAA2B;AAE3D,SACEC,mBAAmB,EACnBC,kBAAkB,QACb,4BAAyB;AAKhC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,YAAY,SAASJ,eAAe,CAAiB;EAM/CK,UAAU,GAAG,IAAIC,GAAG,CAAqC,CAAC;EAE3EC,WAAWA,CACTC,MAAc,EACdC,MAA0C,EAC1CC,UAAkC,EAClC;IACA,KAAK,CAACF,MAAM,EAAEC,MAAM,CAAC;IAErB,IAAI,CAACC,UAAU,GAAGA,UAAU;IAC5B,IAAI,CAACC,YAAY,GAAGD,UAAU,CAACC,YAAY;IAC3C,IAAI,CAACC,gBAAgB,GAAGF,UAAU,CAACE,gBAAgB;IAEnD,IAAIF,UAAU,CAACG,YAAY,KAAKC,SAAS,EAAE;MACzC,IAAI,CAACD,YAAY,GAAGH,UAAU,CAACG,YAAY;IAC7C;IAEA,IAAI,CAACE,mBAAmB,CAACL,UAAU,CAAC;IAEpCA,UAAU,CAACM,MAAM,CAACC,OAAO,CAAC,CAACC,KAAK,EAAEC,IAAI,KAAK;MACzC,IAAI,CAACd,UAAU,CAACe,GAAG,CAACD,IAAI,EAAEvB,oBAAoB,CAACsB,KAAK,CAAC,CAAC;IACxD,CAAC,CAAC;EACJ;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACUH,mBAAmBA,CAACL,UAAkC,EAAQ;IACpE,MAAMW,IAAI,GAAGX,UAAU,CAACW,IAAI;IAE5B,IAAI,CAACA,IAAI,EAAE;MACT;IACF;IAEA,IAAI,CAACC,WAAW,GAAG,IAAIrB,eAAe,CAACoB,IAAI,CAACE,UAAU,CAAC;IAEvD,IAAI,CAACC,sBAAsB,GAAG,MAC5BtB,mBAAmB,CAACmB,IAAI,EAAE;MACxBI,YAAY,EAAE,IAAI,CAACA,YAAY;MAC/BC,SAAS,EAAE,IAAI,CAACC;IAClB,CAAC,CAAC;EACN;EAEQF,YAAY,GAAIG,IAAoB,IAC1CzB,kBAAkB,CAAC,IAAI,CAAC0B,UAAU,EAAED,IAAI,CAAC;EAEnCD,iBAAiB,GAAIG,MAAc,IAAW;IACpD,IAAI,CAACC,OAAO,GACV,IAAIC,KAAK,CACP,kBAAkB,IAAI,CAACtB,UAAU,CAACuB,EAAE,wBAAwBH,MAAM,GACpE,CACF,CAAC;EACH,CAAC;EAESI,eAAe,GAAGA,CAACC,GAAa,EAAEhB,IAAY,KAAc;IACpE,MAAMiB,QAAQ,GAAG,IAAI,CAAC/B,UAAU,CAACgC,GAAG,CAACC,MAAM,CAACnB,IAAI,IAAI,EAAE,CAAC,CAACoB,WAAW,CAAC,CAAC,CAAC;IAEtE,IAAI,CAACH,QAAQ,EAAE;MACb,OAAO,KAAK;IACd;IAEA,OAAOA,QAAQ,CAACD,GAAG,CAAC;EACtB,CAAC;;EAED;AACF;AACA;AACA;AACA;EACYK,qBAAqB,GAC7BC,IAAuD,IACD;IACtD,IAAI;MACF,IAAI,CAACC,WAAW,CAACD,IAAI,CAAC;IACxB,CAAC,CAAC,OAAOE,KAAK,EAAE;MACd,IAAI,CAACZ,OAAO,GAAGY,KAAc,CAAC;IAChC;IAEA,OAAO;MACL,GAAGF,IAAI;MACPG,WAAW,EAAE;QAAE,GAAGH,IAAI,CAACG,WAAW;QAAEC,QAAQ,EAAElD,QAAQ,CAACmD;MAAM;IAC/D,CAAC;EACH,CAAC;;EAED;AACF;AACA;AACA;EACYC,mBAAmBA,CAAA,EAAmB;IAC9C;EACF;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACUL,WAAWA,CAACD,IAAuD,EAAE;IAC3E,MAAMO,QAAQ,GAAGP,IAAI,CAACG,WAAW,CAACK,eAAe;IAEjD,IAAI,CAACD,QAAQ,IAAI,CAACP,IAAI,CAACvB,KAAK,EAAE;MAC5B,IAAI,CAACgC,MAAM,CAACT,IAAI,CAACU,UAAU,EAAEV,IAAI,CAACG,WAAW,CAAC;MAE9C;IACF;IAEA,MAAMQ,OAAO,GAAGC,IAAI,CAACC,KAAK,CACxB,CAACb,IAAI,CAACvB,KAAK,CAACqC,MAAM,GAAGP,QAAQ,CAACQ,IAAI,IAAIR,QAAQ,CAACS,WACjD,CAAC;IAED,KAAK,IAAIC,MAAM,GAAG,CAAC,EAAEA,MAAM,GAAGN,OAAO,EAAEM,MAAM,EAAE,EAAE;MAC/C,IAAI,CAACR,MAAM,CACTrD,gBAAgB,CACd4C,IAAI,CAACvB,KAAK,EACVuB,IAAI,CAACG,WAAW,EAChBI,QAAQ,CAACQ,IAAI,GAAGE,MAAM,GAAGV,QAAQ,CAACS,WACpC,CAAC,EACDhB,IAAI,CAACG,WACP,CAAC;IACH;EACF;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACUM,MAAMA,CAACC,UAAwB,EAAEP,WAAwB,EAAQ;IACvE,MAAMe,YAAY,GAAGf,WAAW,CAACe,YAAY,IAAI,EAAE;IAEnD,IAAIA,YAAY,CAACJ,MAAM,KAAK,CAAC,EAAE;MAC7B,IAAI,CAACK,OAAO,CAAC,4CAA4C,EAAET,UAAU,CAAC;MAEtE;IACF;IAEAQ,YAAY,CAAC1C,OAAO,CAAE4C,WAAW,IAC/B,IAAI,CAACC,iBAAiB,CAACX,UAAU,EAAEU,WAAW,CAChD,CAAC;EACH;EAEQD,OAAOA,CAAC9B,MAAc,EAAEqB,UAAwB,EAAQ;IAC9D,IAAI,CAACpB,OAAO,GAAGjC,qBAAqB,CAAC,IAAI,CAACY,UAAU,CAACuB,EAAE,EAAEH,MAAM,EAAEqB,UAAU,CAAC,CAAC;EAC/E;EAEQW,iBAAiBA,CACvBX,UAAwB,EACxBU,WAA6B,EACvB;IACN,MAAME,OAAO,GAAG;MACdlB,QAAQ,EAAEM,UAAU,CAACN,QAAQ;MAC7BmB,kBAAkB,EAAEH,WAAW,CAACG;IAClC,CAAiB;IAEjBH,WAAW,CAACI,UAAU,CAAChD,OAAO,CAAEiD,IAAI,IAAK;MACvCH,OAAO,CAACG,IAAI,CAAC,GAAGf,UAAU,CAACe,IAAI,CAAC;IAClC,CAAC,CAAC;IAEF,MAAMC,SAAS,GAAGN,WAAW,CAACI,UAAU,CACrCG,GAAG,CAAEF,IAAI,IACRnE,mBAAmB,CACjB,IAAI,CAACW,UAAU,CAAC2D,MAAM,EACtBR,WAAW,CAACG,kBAAkB,EAC9BE,IAAI,EACJH,OAAO,CAACG,IAAI,CACd,CACF,CAAC,CACAI,IAAI,CAAEC,OAAO,IAAKA,OAAO,KAAKzD,SAAS,CAAC;IAE3C,IAAIqD,SAAS,EAAE;MACb,IAAI,CAACP,OAAO,CAACO,SAAS,EAAEJ,OAAO,CAAC;MAEhC;IACF;IAEA,IAAI,CAACS,QAAQ,GAAGT,OAAO,CAAC;EAC1B;AAEF","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/frame-parser.js

@@ -31,7 +31,8 @@ export class FrameParser {
     return {
       parsingCase,
       measurementTypeKey: parsingCase.measurementTypeKey,
-      parsedData: parsedData
+      parsedData: parsedData,
+      frame
     };
   }
   findParsingModel(uuid) {

package/lib/module/modules/bt-management/services/devices/frame-parser.js.map

@@ -1 +1 @@
-{"version":3,"names":["parseMeasurement","FrameParser","constructor","mainServices","parse","uuid","frame","parsingModel","findParsingModel","caseValue","readCaseValue","parsingCase","cases","find","declared","parsedData","measurementTypeKey","mainService","characteristic","monitorUuids","monitored","toLowerCase","undefined","caseValuePosition","map","index","join"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/frame-parser.ts"],"mappings":";;AAMA,SAASA,gBAAgB,QAAQ,kCAA+B;;AAEhE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,WAAW,CAAwB;EAC9CC,WAAWA,CAAkBC,YAA2C,EAAE;IAAA,KAA7CA,YAA2C,GAA3CA,YAA2C;EAAG;EAEpEC,KAAKA,CACVC,IAAY,EACZC,KAAe,EAC8B;IAC7C,MAAMC,YAAY,GAAG,IAAI,CAACC,gBAAgB,CAACH,IAAI,CAAC;IAEhD,IAAI,CAACE,YAAY,EAAE;MACjB;IACF;IAEA,MAAME,SAAS,GAAG,IAAI,CAACC,aAAa,CAACH,YAAY,EAAED,KAAK,CAAC;IAEzD,MAAMK,WAAW,GAAGJ,YAAY,CAACK,KAAK,EAAEC,IAAI,CACzCC,QAAQ,IAAKA,QAAQ,CAACL,SAAS,KAAKA,SACvC,CAAC;IAED,IAAI,CAACE,WAAW,EAAE;MAChB;IACF;IAEA,MAAMI,UAAU,GAAGf,gBAAgB,CAACM,KAAK,EAAEK,WAAW,CAAC;IAEvD,IAAI,CAACI,UAAU,EAAE;MACf;IACF;IAEA,OAAO;MACLJ,WAAW;MACXK,kBAAkB,EAAEL,WAAW,CAACK,kBAAkB;MAClDD,UAAU,EAAEA;IACd,CAAC;EACH;EAEQP,gBAAgBA,CAACH,IAAY,EAA4B;IAC/D,KAAK,MAAMY,WAAW,IAAI,IAAI,CAACd,YAAY,EAAE;MAC3C,MAAMe,cAAc,GAAGD,WAAW,CAACE,YAAY,CAACN,IAAI,CACjDO,SAAS,IAAKA,SAAS,CAACf,IAAI,CAACgB,WAAW,CAAC,CAAC,KAAKhB,IAAI,CAACgB,WAAW,CAAC,CACnE,CAAC;MAED,IAAIH,cAAc,EAAE;QAClB,OAAOA,cAAc,CAACX,YAAY;MACpC;IACF;IAEA,OAAOe,SAAS;EAClB;EAEQZ,aAAaA,CAACH,YAA0B,EAAED,KAAe,EAAU;IACzE,OACEC,YAAY,CAACgB,iBAAiB,EAAEC,GAAG,CAAEC,KAAK,IAAKnB,KAAK,CAACmB,KAAK,CAAC,CAAC,CAACC,IAAI,CAAC,EAAE,CAAC,IACrE,EAAE;EAEN;AACF","ignoreList":[]}
+{"version":3,"names":["parseMeasurement","FrameParser","constructor","mainServices","parse","uuid","frame","parsingModel","findParsingModel","caseValue","readCaseValue","parsingCase","cases","find","declared","parsedData","measurementTypeKey","mainService","characteristic","monitorUuids","monitored","toLowerCase","undefined","caseValuePosition","map","index","join"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/frame-parser.ts"],"mappings":";;AAMA,SAASA,gBAAgB,QAAQ,kCAA+B;;AAEhE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,WAAW,CAAwB;EAC9CC,WAAWA,CAAkBC,YAA2C,EAAE;IAAA,KAA7CA,YAA2C,GAA3CA,YAA2C;EAAG;EAEpEC,KAAKA,CACVC,IAAY,EACZC,KAAe,EAC8B;IAC7C,MAAMC,YAAY,GAAG,IAAI,CAACC,gBAAgB,CAACH,IAAI,CAAC;IAEhD,IAAI,CAACE,YAAY,EAAE;MACjB;IACF;IAEA,MAAME,SAAS,GAAG,IAAI,CAACC,aAAa,CAACH,YAAY,EAAED,KAAK,CAAC;IAEzD,MAAMK,WAAW,GAAGJ,YAAY,CAACK,KAAK,EAAEC,IAAI,CACzCC,QAAQ,IAAKA,QAAQ,CAACL,SAAS,KAAKA,SACvC,CAAC;IAED,IAAI,CAACE,WAAW,EAAE;MAChB;IACF;IAEA,MAAMI,UAAU,GAAGf,gBAAgB,CAACM,KAAK,EAAEK,WAAW,CAAC;IAEvD,IAAI,CAACI,UAAU,EAAE;MACf;IACF;IAEA,OAAO;MACLJ,WAAW;MACXK,kBAAkB,EAAEL,WAAW,CAACK,kBAAkB;MAClDD,UAAU,EAAEA,UAAwC;MACpDT;IACF,CAAC;EACH;EAEQE,gBAAgBA,CAACH,IAAY,EAA4B;IAC/D,KAAK,MAAMY,WAAW,IAAI,IAAI,CAACd,YAAY,EAAE;MAC3C,MAAMe,cAAc,GAAGD,WAAW,CAACE,YAAY,CAACN,IAAI,CACjDO,SAAS,IAAKA,SAAS,CAACf,IAAI,CAACgB,WAAW,CAAC,CAAC,KAAKhB,IAAI,CAACgB,WAAW,CAAC,CACnE,CAAC;MAED,IAAIH,cAAc,EAAE;QAClB,OAAOA,cAAc,CAACX,YAAY;MACpC;IACF;IAEA,OAAOe,SAAS;EAClB;EAEQZ,aAAaA,CAACH,YAA0B,EAAED,KAAe,EAAU;IACzE,OACEC,YAAY,CAACgB,iBAAiB,EAAEC,GAAG,CAAEC,KAAK,IAAKnB,KAAK,CAACmB,KAAK,CAAC,CAAC,CAACC,IAAI,CAAC,EAAE,CAAC,IACrE,EAAE;EAEN;AACF","ignoreList":[]}