@ovok/native 0.4.7 → 0.4.9

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

@@ -9,93 +9,57 @@ var _caseType = require("../../../types/case-type.js");
 /**
  * Contec BC401 (a.k.a. BC01) urine analyzer — GATT profile.
  *
- * The BC401 uses Contec's proprietary FF12 service, shared across their consumer
- * medical devices. A single result notification carries a 7-parameter URS-7
- * strip readout expanded into eleven analyte values on the wire.
+ * The BC401 uses Contec's proprietary FF12 service, shared across their
+ * consumer medical devices. Every stored URS-7 measurement is pushed as a
+ * 16-byte record on 0xFF02 after the host has walked the handshake documented
+ * in `bc01-command-sequencer.ts`.
  *
  *   Service          0xFF12
- *   Notify (result)  0xFF01  — CCCD 0x2902 must be written 01 00 to enable
- *   Write (command)  0xFF02  — RESET / SET_UNIT / REQUEST_HISTORY
+ *   Notify (result)  0xFF02  — CCCD 0x2902 must be written 01 00 to enable
+ *   Write (command)  0xFF01  — RESET / SET_TIME / GET_COUNT / GET_RECORDS
  *
- * Wire layout of a result frame (Contec URS-7 firmware ≥ 1.2.x):
- *   [0..1]   header      "aa 55"      — Contec sentinel
- *   [2]      length      byte after header
- *   [3]      command     "a1" == RESULT_URS7
- *   [4]      strip type  "07" == 7-panel
- *   [5..15]  values      one byte per analyte, encoding the discrete
- *                        level index into diagnosticResults[key]
- *   [16]     checksum    xor over [2..15]
- *
- * Byte positions calibrated against PHMS 3.0.03 Android app; older firmware
- * (< 1.2.x) uses a different command byte and is not supported by this driver
- * (the validator will reject those frames).
+ * On the wire a stored URS record opens with 0xE1 (single) or 0xE2 (paginated).
+ * The remaining fifteen bytes carry the flags nibble, timestamp, seven bytes of
+ * packed 3-bit analyte indices, and a checksum. `bc01-frame-parser.ts` decodes
+ * them; this file just declares the GATT surface and hands every E1/E2 frame
+ * to the driver's dependent-result path so the parser can run.
  */
 const bc01MainServices = exports.bc01MainServices = [{
   uuid: "0000ff12-0000-1000-8000-00805f9b34fb",
-  monitorUuids: [{
+  /**
+   * PHMS 3.0.03 writes `[0x80, 0x00]` to 0xFF01 the moment its GATT
+   * subscription is up — decompiled at L1/f.java:694 ("发送复位命令" — "send
+   * reset command"). The device answers nothing until this reset lands. The
+   * `Bc01CommandSequencer` returns the same reset from `initialCommands()`
+   * so the SDK sends it whether or not the polling default is in play.
+   */
+  writeUuid: {
     uuid: "0000ff01-0000-1000-8000-00805f9b34fb",
+    mainCommandUuid: "8000"
+  },
+  monitorUuids: [{
+    uuid: "0000ff02-0000-1000-8000-00805f9b34fb",
+    /**
+     * We key on the first byte only. A `DEPENDENT` case fires
+     * `handleDependentResult` in the driver, which runs the real decoder
+     * (`parseBc01Record`) against the raw frame bytes and calls
+     * `onResult` directly. The parsing case itself carries no field
+     * definitions — the packed 3-bits-per-pad layout is not expressible
+     * with the ordinary declaration parser and would need the vendor's
+     * own decoding table pinned in a declaration to be so.
+     */
     parsingModel: {
-      caseValuePosition: [0, 1, 3, 4],
+      caseValuePosition: [0],
       cases: [{
         measurementTypeKey: _core.MeasurementTypeKey.uricAcid,
-        caseType: _caseType.CaseType.RESULT,
-        caseValue: "aa55a107",
-        parseDefinitions: [{
-          name: "uro",
-          parseType: "number",
-          byteIndexes: [5],
-          parseReference: 16
-        }, {
-          name: "bld",
-          parseType: "number",
-          byteIndexes: [6],
-          parseReference: 16
-        }, {
-          name: "bil",
-          parseType: "number",
-          byteIndexes: [7],
-          parseReference: 16
-        }, {
-          name: "ket",
-          parseType: "number",
-          byteIndexes: [8],
-          parseReference: 16
-        }, {
-          name: "glu",
-          parseType: "number",
-          byteIndexes: [9],
-          parseReference: 16
-        }, {
-          name: "pro",
-          parseType: "number",
-          byteIndexes: [10],
-          parseReference: 16
-        }, {
-          name: "ph",
-          parseType: "number",
-          byteIndexes: [11],
-          parseReference: 16
-        }, {
-          name: "nit",
-          parseType: "number",
-          byteIndexes: [12],
-          parseReference: 16
-        }, {
-          name: "leu",
-          parseType: "number",
-          byteIndexes: [13],
-          parseReference: 16
-        }, {
-          name: "sg",
-          parseType: "number",
-          byteIndexes: [14],
-          parseReference: 16
-        }, {
-          name: "vc",
-          parseType: "number",
-          byteIndexes: [15],
-          parseReference: 16
-        }]
+        caseType: _caseType.CaseType.DEPENDENT,
+        caseValue: "e1",
+        parseDefinitions: []
+      }, {
+        measurementTypeKey: _core.MeasurementTypeKey.uricAcid,
+        caseType: _caseType.CaseType.DEPENDENT,
+        caseValue: "e2",
+        parseDefinitions: []
       }]
     }
   }]

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

@@ -1 +1 @@
-{"version":3,"names":["_core","require","_caseType","bc01MainServices","exports","uuid","monitorUuids","parsingModel","caseValuePosition","cases","measurementTypeKey","MeasurementTypeKey","uricAcid","caseType","CaseType","RESULT","caseValue","parseDefinitions","name","parseType","byteIndexes","parseReference"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bc01/bc01.main-services.ts"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAEA,IAAAC,SAAA,GAAAD,OAAA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAME,gBAA4B,GAAAC,OAAA,CAAAD,gBAAA,GAAG,CAC1C;EACEE,IAAI,EAAE,sCAAsC;EAC5CC,YAAY,EAAE,CACZ;IACED,IAAI,EAAE,sCAAsC;IAC5CE,YAAY,EAAE;MACZC,iBAAiB,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;MAC/BC,KAAK,EAAE,CACL;QACEC,kBAAkB,EAAEC,wBAAkB,CAACC,QAAQ;QAC/CC,QAAQ,EAAEC,kBAAQ,CAACC,MAAM;QACzBC,SAAS,EAAE,UAAU;QACrBC,gBAAgB,EAAE,CAChB;UACEC,IAAI,EAAE,KAAK;UACXC,SAAS,EAAE,QAAQ;UACnBC,WAAW,EAAE,CAAC,CAAC,CAAC;UAChBC,cAAc,EAAE;QAClB,CAAC,EACD;UACEH,IAAI,EAAE,KAAK;UACXC,SAAS,EAAE,QAAQ;UACnBC,WAAW,EAAE,CAAC,CAAC,CAAC;UAChBC,cAAc,EAAE;QAClB,CAAC,EACD;UACEH,IAAI,EAAE,KAAK;UACXC,SAAS,EAAE,QAAQ;UACnBC,WAAW,EAAE,CAAC,CAAC,CAAC;UAChBC,cAAc,EAAE;QAClB,CAAC,EACD;UACEH,IAAI,EAAE,KAAK;UACXC,SAAS,EAAE,QAAQ;UACnBC,WAAW,EAAE,CAAC,CAAC,CAAC;UAChBC,cAAc,EAAE;QAClB,CAAC,EACD;UACEH,IAAI,EAAE,KAAK;UACXC,SAAS,EAAE,QAAQ;UACnBC,WAAW,EAAE,CAAC,CAAC,CAAC;UAChBC,cAAc,EAAE;QAClB,CAAC,EACD;UACEH,IAAI,EAAE,KAAK;UACXC,SAAS,EAAE,QAAQ;UACnBC,WAAW,EAAE,CAAC,EAAE,CAAC;UACjBC,cAAc,EAAE;QAClB,CAAC,EACD;UACEH,IAAI,EAAE,IAAI;UACVC,SAAS,EAAE,QAAQ;UACnBC,WAAW,EAAE,CAAC,EAAE,CAAC;UACjBC,cAAc,EAAE;QAClB,CAAC,EACD;UACEH,IAAI,EAAE,KAAK;UACXC,SAAS,EAAE,QAAQ;UACnBC,WAAW,EAAE,CAAC,EAAE,CAAC;UACjBC,cAAc,EAAE;QAClB,CAAC,EACD;UACEH,IAAI,EAAE,KAAK;UACXC,SAAS,EAAE,QAAQ;UACnBC,WAAW,EAAE,CAAC,EAAE,CAAC;UACjBC,cAAc,EAAE;QAClB,CAAC,EACD;UACEH,IAAI,EAAE,IAAI;UACVC,SAAS,EAAE,QAAQ;UACnBC,WAAW,EAAE,CAAC,EAAE,CAAC;UACjBC,cAAc,EAAE;QAClB,CAAC,EACD;UACEH,IAAI,EAAE,IAAI;UACVC,SAAS,EAAE,QAAQ;UACnBC,WAAW,EAAE,CAAC,EAAE,CAAC;UACjBC,cAAc,EAAE;QAClB,CAAC;MAEL,CAAC;IAEL;EACF,CAAC;AAEL,CAAC,CACF","ignoreList":[]}
+{"version":3,"names":["_core","require","_caseType","bc01MainServices","exports","uuid","writeUuid","mainCommandUuid","monitorUuids","parsingModel","caseValuePosition","cases","measurementTypeKey","MeasurementTypeKey","uricAcid","caseType","CaseType","DEPENDENT","caseValue","parseDefinitions"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bc01/bc01.main-services.ts"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAEA,IAAAC,SAAA,GAAAD,OAAA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAME,gBAA4B,GAAAC,OAAA,CAAAD,gBAAA,GAAG,CAC1C;EACEE,IAAI,EAAE,sCAAsC;EAE5C;AACJ;AACA;AACA;AACA;AACA;AACA;EACIC,SAAS,EAAE;IACTD,IAAI,EAAE,sCAAsC;IAC5CE,eAAe,EAAE;EACnB,CAAC;EACDC,YAAY,EAAE,CACZ;IACEH,IAAI,EAAE,sCAAsC;IAE5C;AACR;AACA;AACA;AACA;AACA;AACA;AACA;AACA;IACQI,YAAY,EAAE;MACZC,iBAAiB,EAAE,CAAC,CAAC,CAAC;MACtBC,KAAK,EAAE,CACL;QACEC,kBAAkB,EAAEC,wBAAkB,CAACC,QAAQ;QAC/CC,QAAQ,EAAEC,kBAAQ,CAACC,SAAS;QAC5BC,SAAS,EAAE,IAAI;QACfC,gBAAgB,EAAE;MACpB,CAAC,EACD;QACEP,kBAAkB,EAAEC,wBAAkB,CAACC,QAAQ;QAC/CC,QAAQ,EAAEC,kBAAQ,CAACC,SAAS;QAC5BC,SAAS,EAAE,IAAI;QACfC,gBAAgB,EAAE;MACpB,CAAC;IAEL;EACF,CAAC;AAEL,CAAC,CACF","ignoreList":[]}

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

@@ -91,6 +91,20 @@ class BTCommandWriter {
     }
   };
 
+  /**
+   * 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.
    *
@@ -120,7 +134,7 @@ class BTCommandWriter {
         if (!isConnected) {
           return false;
         }
-        await this.device.writeCharacteristicWithResponseForService(command.serviceUuid, command.characteristicUuid, (0, _hexToBase.hexToBase64)(chunk.join("")));
+        await this.writeTo(command, (0, _hexToBase.hexToBase64)(chunk.join("")));
         return true;
       } catch (error) {
         (0, _sentryLogger.sentryLogger)("error", "DEVICE: Error sending command", {

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

@@ -1 +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","size","Math","max","chunks","start","length","push","slice","attempt","isConnected","writeCharacteristicWithResponseForService","serviceUuid","characteristicUuid","hexToBase64","join","sentryLogger","Error","message","deviceName","name","slog","exports"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-command-writer.ts"],"mappings":";;;;;;AAEA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AAEA,IAAAE,UAAA,GAAAF,OAAA;AAEA,MAAMG,kBAAkB,GAAG,CAAC;;AAE5B;AACA,MAAMC,eAAe,GAAG,EAAE;;AAE1B;AACA,MAAMC,sBAAsB,GAAG,CAAC;;AAEhC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,eAAe,CAAC;EACnBC,aAAa,GAAkBC,OAAO,CAACC,OAAO,CAAC,CAAC;EAChDC,GAAG,GAAGN,eAAe;EAEtBO,WAAWA,CACCC,MAAc,EACdC,OAA2C,EAC5D;IAAA,KAFiBD,MAAc,GAAdA,MAAc;IAAA,KACdC,OAA2C,GAA3CA,OAA2C;EAC3D;;EAEH;AACF;AACA;AACA;AACA;AACA;AACA;EACSC,gBAAgB,GAAIJ,GAAY,IAAW;IAChD,IAAI,OAAOA,GAAG,KAAK,QAAQ,IAAIK,MAAM,CAACC,SAAS,CAACN,GAAG,CAAC,IAAIA,GAAG,GAAG,IAAI,CAACA,GAAG,EAAE;MACtE,IAAI,CAACA,GAAG,GAAGA,GAAG;IAChB;EACF,CAAC;;EAED;EACOO,KAAK,GAAGA,CAAA,KAAY;IACzB,IAAI,CAACV,aAAa,GAAGC,OAAO,CAACC,OAAO,CAAC,CAAC;EACxC,CAAC;;EAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACSS,IAAI,GAAIC,QAAkC,IAAoB;IACnE,IAAI,CAACZ,aAAa,GAAG,IAAI,CAACA,aAAa,CACpCa,IAAI,CAAC,MAAM,IAAI,CAACC,YAAY,CAACF,QAAQ,CAAC,CAAC,CACvCG,KAAK,CAAEC,KAAK,IAAK;MAChB,IAAI,CAACV,OAAO,GAAGU,KAAyB,CAAC;IAC3C,CAAC,CAAC;IAEJ,OAAO,IAAI,CAAChB,aAAa;EAC3B,CAAC;EAEOc,YAAY,GAAG,MACrBF,QAAkC,IAChB;IAClB,KAAK,MAAMK,OAAO,IAAIL,QAAQ,EAAE;MAC9B,MAAM,IAAI,CAACM,YAAY,CAACD,OAAO,CAAC;IAClC;EACF,CAAC;;EAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACUC,YAAY,GAAG,MAAOD,OAAsB,IAAoB;IACtE,KAAK,MAAME,KAAK,IAAI,IAAI,CAACC,QAAQ,CAACH,OAAO,CAACI,KAAK,CAAC,EAAE;MAChD,MAAMC,OAAO,GAAG,MAAM,IAAI,CAACC,UAAU,CAACN,OAAO,EAAEE,KAAK,CAAC;MAErD,IAAI,CAACG,OAAO,EAAE;QACZ;MACF;IACF;EACF,CAAC;;EAED;AACF;AACA;AACA;AACA;AACA;EACUF,QAAQ,GAAIC,KAAwB,IAAiB;IAC3D,MAAMG,IAAI,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC,EAAE,IAAI,CAACvB,GAAG,GAAGL,sBAAsB,CAAC;IAC3D,MAAM6B,MAAkB,GAAG,EAAE;IAE7B,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGP,KAAK,CAACQ,MAAM,EAAED,KAAK,IAAIJ,IAAI,EAAE;MACvDG,MAAM,CAACG,IAAI,CAACT,KAAK,CAACU,KAAK,CAACH,KAAK,EAAEA,KAAK,GAAGJ,IAAI,CAAC,CAAC;IAC/C;IAEA,OAAOG,MAAM;EACf,CAAC;;EAED;AACF;AACA;AACA;AACA;AACA;AACA;EACUJ,UAAU,GAAG,MAAAA,CACnBN,OAAsB,EACtBE,KAAwB,KACH;IACrB,KAAK,IAAIa,OAAO,GAAG,CAAC,EAAEA,OAAO,IAAIpC,kBAAkB,EAAEoC,OAAO,EAAE,EAAE;MAC9D,IAAI;QACF,MAAMC,WAAW,GAAG,MAAM,IAAI,CAAC5B,MAAM,CAAC4B,WAAW,CAAC,CAAC;QAEnD,IAAI,CAACA,WAAW,EAAE;UAChB,OAAO,KAAK;QACd;QAEA,MAAM,IAAI,CAAC5B,MAAM,CAAC6B,yCAAyC,CACzDjB,OAAO,CAACkB,WAAW,EACnBlB,OAAO,CAACmB,kBAAkB,EAC1B,IAAAC,sBAAW,EAAClB,KAAK,CAACmB,IAAI,CAAC,EAAE,CAAC,CAC5B,CAAC;QAED,OAAO,IAAI;MACb,CAAC,CAAC,OAAOtB,KAAK,EAAE;QACd,IAAAuB,0BAAY,EAAC,OAAO,EAAE,+BAA+B,EAAE;UACrDvB,KAAK,EAAEA,KAAK,YAAYwB,KAAK,GAAGxB,KAAK,CAACyB,OAAO,GAAGzB,KAAK;UACrD0B,UAAU,EAAE,IAAI,CAACrC,MAAM,CAACsC;QAC1B,CAAC,CAAC;QAEF,IAAIX,OAAO,KAAKpC,kBAAkB,EAAE;UAClC,IAAAgD,UAAI,EAAC5B,KAAK,EAAE,8CAA8C,EAAE;YAC1D0B,UAAU,EAAE,IAAI,CAACrC,MAAM,CAACsC;UAC1B,CAAC,CAAC;QACJ;MACF;IACF;IAEA,OAAO,KAAK;EACd,CAAC;AACH;AAACE,OAAA,CAAA9C,eAAA,GAAAA,eAAA","ignoreList":[]}
+{"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/custom/custom-lepu-sequencer.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createLepuSequencer = void 0;
+exports.recordLepuIdentity = exports.createLepuSequencer = void 0;
+var _sentryLogger = require("../../../../helpers/utils/sentry-logger.js");
 var _lepuCommandBuilder = require("../lepu/lepu.command-builder.js");
 var _lepuIdentityGate = require("../lepu/lepu.identity-gate.js");
 /** Registration guarantees at least one start byte; this keeps the indexed read total. */
@@ -19,6 +20,24 @@ const DEFAULT_START_BYTE = "a5";
  * 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;
+  (0, _sentryLogger.sentryLogger)("info", "BT_MANAGER: Device identified itself", {
+    deviceId: deviceData.id,
+    deviceName: deviceData.name,
+    deviceType: info.deviceType,
+    branchCode: info.branchCode,
+    protocolMaxLength: info.protocolMaxLength
+  });
+};
+exports.recordLepuIdentity = recordLepuIdentity;
 const createLepuSequencer = (lepu, report) => new _lepuIdentityGate.LepuIdentityGate({
   write: {
     serviceUuid: lepu.write.serviceUuid,

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

@@ -1 +1 @@
-{"version":3,"names":["_lepuCommandBuilder","require","_lepuIdentityGate","DEFAULT_START_BYTE","createLepuSequencer","lepu","report","LepuIdentityGate","write","serviceUuid","characteristicUuid","builder","LepuCommandBuilder","startBytes","expectedDeviceTypes","pollCommand","undefined","onIdentified","onRefused","exports"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/custom/custom-lepu-sequencer.ts"],"mappings":";;;;;;AAEA,IAAAA,mBAAA,GAAAC,OAAA;AAEA,IAAAC,iBAAA,GAAAD,OAAA;AAEA;AACA,MAAME,kBAAkB,GAAG,IAAI;AAO/B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,mBAAmB,GAAGA,CACjCC,IAAoB,EACpBC,MAAsB,KAEtB,IAAIC,kCAAgB,CAAC;EACnBC,KAAK,EAAE;IACLC,WAAW,EAAEJ,IAAI,CAACG,KAAK,CAACC,WAAW;IACnCC,kBAAkB,EAAEL,IAAI,CAACG,KAAK,CAACE;EACjC,CAAC;EACDC,OAAO,EAAE,IAAIC,sCAAkB,CAACP,IAAI,CAACQ,UAAU,CAAC,CAAC,CAAC,IAAIV,kBAAkB,CAAC;EACzEW,mBAAmB,EAAET,IAAI,CAACS,mBAAmB;EAC7C,IAAIT,IAAI,CAACU,WAAW,KAAKC,SAAS,GAAG,CAAC,CAAC,GAAG;IAAED,WAAW,EAAEV,IAAI,CAACU;EAAY,CAAC,CAAC;EAC5EE,YAAY,EAAEX,MAAM,CAACW,YAAY;EACjCC,SAAS,EAAEZ,MAAM,CAACY;AACpB,CAAC,CAAC;AAACC,OAAA,CAAAf,mBAAA,GAAAA,mBAAA","ignoreList":[]}
+{"version":3,"names":["_sentryLogger","require","_lepuCommandBuilder","_lepuIdentityGate","DEFAULT_START_BYTE","recordLepuIdentity","deviceData","info","sn","serialNumber","sentryLogger","deviceId","id","deviceName","name","deviceType","branchCode","protocolMaxLength","exports","createLepuSequencer","lepu","report","LepuIdentityGate","write","serviceUuid","characteristicUuid","builder","LepuCommandBuilder","startBytes","expectedDeviceTypes","pollCommand","undefined","onIdentified","onRefused"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/custom/custom-lepu-sequencer.ts"],"mappings":";;;;;;AAAA,IAAAA,aAAA,GAAAC,OAAA;AAIA,IAAAC,mBAAA,GAAAD,OAAA;AAEA,IAAAE,iBAAA,GAAAF,OAAA;AAEA;AACA,MAAMG,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;EAEjC,IAAAC,0BAAY,EAAC,MAAM,EAAE,sCAAsC,EAAE;IAC3DC,QAAQ,EAAEL,UAAU,CAACM,EAAE;IACvBC,UAAU,EAAEP,UAAU,CAACQ,IAAI;IAC3BC,UAAU,EAAER,IAAI,CAACQ,UAAU;IAC3BC,UAAU,EAAET,IAAI,CAACS,UAAU;IAC3BC,iBAAiB,EAAEV,IAAI,CAACU;EAC1B,CAAC,CAAC;AACJ,CAAC;AAACC,OAAA,CAAAb,kBAAA,GAAAA,kBAAA;AAEF,MAAMc,mBAAmB,GAAGA,CAC1BC,IAAoB,EACpBC,MAAsB,KAEtB,IAAIC,kCAAgB,CAAC;EACnBC,KAAK,EAAE;IACLC,WAAW,EAAEJ,IAAI,CAACG,KAAK,CAACC,WAAW;IACnCC,kBAAkB,EAAEL,IAAI,CAACG,KAAK,CAACE;EACjC,CAAC;EACDC,OAAO,EAAE,IAAIC,sCAAkB,CAACP,IAAI,CAACQ,UAAU,CAAC,CAAC,CAAC,IAAIxB,kBAAkB,CAAC;EACzEyB,mBAAmB,EAAET,IAAI,CAACS,mBAAmB;EAC7C,IAAIT,IAAI,CAACU,WAAW,KAAKC,SAAS,GAAG,CAAC,CAAC,GAAG;IAAED,WAAW,EAAEV,IAAI,CAACU;EAAY,CAAC,CAAC;EAC5EE,YAAY,EAAEX,MAAM,CAACW,YAAY;EACjCC,SAAS,EAAEZ,MAAM,CAACY;AACpB,CAAC,CAAC;AAACf,OAAA,CAAAC,mBAAA,GAAAA,mBAAA","ignoreList":[]}

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

@@ -4,9 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CustomDevice = void 0;
-var _sentryLogger = require("../../../../helpers/utils/sentry-logger.js");
 var _caseType = require("../../../types/case-type.js");
 var _createFrameValidator = require("../../../utils/create-frame-validator.js");
+var _parseMeasurement = require("../../../utils/parse-measurement.js");
+var _rejectCustomReading = require("../../../utils/reject-custom-reading.js");
 var _btManagedDevice = require("../bt-managed-device.js");
 var _lepuFrameReader = require("../lepu/lepu.frame-reader.js");
 var _customLepuSequencer = require("./custom-lepu-sequencer.js");
@@ -53,29 +54,7 @@ class CustomDevice extends _btManagedDevice.BTManagedDevice {
       onRefused: this.onIdentityRefused
     });
   }
-
-  /**
-   * 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.
-   */
-  onIdentified = info => {
-    this.deviceData.sn = info.serialNumber;
-    (0, _sentryLogger.sentryLogger)("info", "BT_MANAGER: Device identified itself", {
-      deviceId: this.deviceData.id,
-      deviceName: this.deviceData.name,
-      deviceType: info.deviceType,
-      branchCode: info.branchCode,
-      protocolMaxLength: info.protocolMaxLength
-    });
-  };
-
-  /**
-   * Nothing is sent to a device that could not be identified, because the same opcode means
-   * different things on different models in this family.
-   */
+  onIdentified = info => (0, _customLepuSequencer.recordLepuIdentity)(this.deviceData, info);
   onIdentityRefused = reason => {
     this.onError?.(new Error(`Custom device "${this.definition.id}" was not addressed: ${reason}.`));
   };
@@ -94,7 +73,7 @@ class CustomDevice extends _btManagedDevice.BTManagedDevice {
    */
   handleDependentResult = data => {
     try {
-      this.report(data.parsedData, data.parsingCase);
+      this.reportFrame(data);
     } catch (error) {
       this.onError?.(error);
     }
@@ -115,6 +94,26 @@ class CustomDevice extends _btManagedDevice.BTManagedDevice {
     return;
   }
 
+  /**
+   * 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 records = Math.floor((data.frame.length - repeated.from) / repeated.recordBytes);
+    for (let record = 0; record < records; record++) {
+      this.report((0, _parseMeasurement.parseMeasurement)(data.frame, data.parsingCase, repeated.from + record * repeated.recordBytes), data.parsingCase);
+    }
+  }
+
   /**
    * Reports every reading the frame carried.
    *
@@ -129,11 +128,14 @@ class CustomDevice extends _btManagedDevice.BTManagedDevice {
   report(parsedData, parsingCase) {
     const measurements = parsingCase.measurements ?? [];
     if (measurements.length === 0) {
-      this.fail("a result frame carries no measurement type", parsedData);
+      this.discard("a result frame carries no measurement type", parsedData);
       return;
     }
     measurements.forEach(measurement => this.reportMeasurement(parsedData, measurement));
   }
+  discard(reason, parsedData) {
+    this.onError?.((0, _rejectCustomReading.discardedReadingError)(this.definition.id, reason, parsedData));
+  }
   reportMeasurement(parsedData, measurement) {
     const reading = {
       caseType: parsedData.caseType,
@@ -142,29 +144,13 @@ class CustomDevice extends _btManagedDevice.BTManagedDevice {
     measurement.fieldNames.forEach(name => {
       reading[name] = parsedData[name];
     });
-    const rejection = measurement.fieldNames.map(name => this.reject(measurement.measurementTypeKey, name, reading[name])).find(message => message !== undefined);
+    const rejection = measurement.fieldNames.map(name => (0, _rejectCustomReading.rejectCustomReading)(this.definition.fields, measurement.measurementTypeKey, name, reading[name])).find(message => message !== undefined);
     if (rejection) {
-      this.fail(rejection, reading);
+      this.discard(rejection, reading);
       return;
     }
     this.onResult?.(reading);
   }
-  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;
-  }
-  fail(reason, parsedData) {
-    this.onError?.(new Error(`Custom device "${this.definition.id}": ${reason}. The reading was discarded (decoded ${JSON.stringify(parsedData)}).`));
-  }
 }
 exports.CustomDevice = CustomDevice;
 //# sourceMappingURL=custom.device.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_sentryLogger","require","_caseType","_createFrameValidator","_btManagedDevice","_lepuFrameReader","_customLepuSequencer","CustomDevice","BTManagedDevice","validators","Map","constructor","device","params","definition","mainServices","stuckDataTimeout","preferredMtu","undefined","declareLepuProtocol","frames","forEach","frame","uuid","set","createFrameValidator","lepu","frameReader","LepuFrameReader","startBytes","createCommandSequencer","createLepuSequencer","onIdentified","onRefused","onIdentityRefused","info","deviceData","sn","serialNumber","sentryLogger","deviceId","id","deviceName","name","deviceType","branchCode","protocolMaxLength","reason","onError","Error","validatePackage","pkg","validate","get","String","toLowerCase","handleDependentResult","data","report","parsedData","parsingCase","error","caseType","CaseType","OTHER","handleSuccessResult","measurements","length","fail","measurement","reportMeasurement","reading","measurementTypeKey","fieldNames","rejection","map","reject","find","message","onResult","value","field","fields","Number","isFinite","min","max","unit","JSON","stringify","exports"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/custom/custom.device.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_caseType","require","_createFrameValidator","_parseMeasurement","_rejectCustomReading","_btManagedDevice","_lepuFrameReader","_customLepuSequencer","CustomDevice","BTManagedDevice","validators","Map","constructor","device","params","definition","mainServices","stuckDataTimeout","preferredMtu","undefined","declareLepuProtocol","frames","forEach","frame","uuid","set","createFrameValidator","lepu","frameReader","LepuFrameReader","startBytes","createCommandSequencer","createLepuSequencer","onIdentified","onRefused","onIdentityRefused","info","recordLepuIdentity","deviceData","reason","onError","Error","id","validatePackage","pkg","validate","get","String","toLowerCase","handleDependentResult","data","reportFrame","error","parsingCase","caseType","CaseType","OTHER","handleSuccessResult","repeated","repeatedRecords","report","parsedData","records","Math","floor","length","from","recordBytes","record","parseMeasurement","measurements","discard","measurement","reportMeasurement","discardedReadingError","reading","measurementTypeKey","fieldNames","name","rejection","map","rejectCustomReading","fields","find","message","onResult","exports"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/custom/custom.device.ts"],"mappings":"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","ignoreList":[]}

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

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

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

@@ -1 +1 @@
-{"version":3,"names":["_parseMeasurement","require","FrameParser","constructor","mainServices","parse","uuid","frame","parsingModel","findParsingModel","caseValue","readCaseValue","parsingCase","cases","find","declared","parsedData","parseMeasurement","measurementTypeKey","mainService","characteristic","monitorUuids","monitored","toLowerCase","undefined","caseValuePosition","map","index","join","exports"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/frame-parser.ts"],"mappings":";;;;;;AAMA,IAAAA,iBAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,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,GAAG,IAAAC,kCAAgB,EAACV,KAAK,EAAEK,WAAW,CAAC;IAEvD,IAAI,CAACI,UAAU,EAAE;MACf;IACF;IAEA,OAAO;MACLJ,WAAW;MACXM,kBAAkB,EAAEN,WAAW,CAACM,kBAAkB;MAClDF,UAAU,EAAEA;IACd,CAAC;EACH;EAEQP,gBAAgBA,CAACH,IAAY,EAA4B;IAC/D,KAAK,MAAMa,WAAW,IAAI,IAAI,CAACf,YAAY,EAAE;MAC3C,MAAMgB,cAAc,GAAGD,WAAW,CAACE,YAAY,CAACP,IAAI,CACjDQ,SAAS,IAAKA,SAAS,CAAChB,IAAI,CAACiB,WAAW,CAAC,CAAC,KAAKjB,IAAI,CAACiB,WAAW,CAAC,CACnE,CAAC;MAED,IAAIH,cAAc,EAAE;QAClB,OAAOA,cAAc,CAACZ,YAAY;MACpC;IACF;IAEA,OAAOgB,SAAS;EAClB;EAEQb,aAAaA,CAACH,YAA0B,EAAED,KAAe,EAAU;IACzE,OACEC,YAAY,CAACiB,iBAAiB,EAAEC,GAAG,CAAEC,KAAK,IAAKpB,KAAK,CAACoB,KAAK,CAAC,CAAC,CAACC,IAAI,CAAC,EAAE,CAAC,IACrE,EAAE;EAEN;AACF;AAACC,OAAA,CAAA3B,WAAA,GAAAA,WAAA","ignoreList":[]}
+{"version":3,"names":["_parseMeasurement","require","FrameParser","constructor","mainServices","parse","uuid","frame","parsingModel","findParsingModel","caseValue","readCaseValue","parsingCase","cases","find","declared","parsedData","parseMeasurement","measurementTypeKey","mainService","characteristic","monitorUuids","monitored","toLowerCase","undefined","caseValuePosition","map","index","join","exports"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/frame-parser.ts"],"mappings":";;;;;;AAMA,IAAAA,iBAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,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,GAAG,IAAAC,kCAAgB,EAACV,KAAK,EAAEK,WAAW,CAAC;IAEvD,IAAI,CAACI,UAAU,EAAE;MACf;IACF;IAEA,OAAO;MACLJ,WAAW;MACXM,kBAAkB,EAAEN,WAAW,CAACM,kBAAkB;MAClDF,UAAU,EAAEA,UAAwC;MACpDT;IACF,CAAC;EACH;EAEQE,gBAAgBA,CAACH,IAAY,EAA4B;IAC/D,KAAK,MAAMa,WAAW,IAAI,IAAI,CAACf,YAAY,EAAE;MAC3C,MAAMgB,cAAc,GAAGD,WAAW,CAACE,YAAY,CAACP,IAAI,CACjDQ,SAAS,IAAKA,SAAS,CAAChB,IAAI,CAACiB,WAAW,CAAC,CAAC,KAAKjB,IAAI,CAACiB,WAAW,CAAC,CACnE,CAAC;MAED,IAAIH,cAAc,EAAE;QAClB,OAAOA,cAAc,CAACZ,YAAY;MACpC;IACF;IAEA,OAAOgB,SAAS;EAClB;EAEQb,aAAaA,CAACH,YAA0B,EAAED,KAAe,EAAU;IACzE,OACEC,YAAY,CAACiB,iBAAiB,EAAEC,GAAG,CAAEC,KAAK,IAAKpB,KAAK,CAACoB,KAAK,CAAC,CAAC,CAACC,IAAI,CAAC,EAAE,CAAC,IACrE,EAAE;EAEN;AACF;AAACC,OAAA,CAAA3B,WAAA,GAAAA,WAAA","ignoreList":[]}

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

@@ -0,0 +1,84 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SentinelFrameReader = void 0;
+var _frameReadStatus = require("../../types/frame-read-status.js");
+const lower = byte => (byte ?? "").toLowerCase();
+
+/**
+ * Reads a reply that ends on a sentinel byte rather than declaring its length.
+ *
+ * The Veroval duo control answers this way, as serial protocols generally do: a request is
+ * answered across as many notifications as it takes and the end is marked, not counted. The
+ * reader therefore cannot know how much is coming and holds the buffer until the terminator
+ * lands - which is why the cap exists.
+ *
+ * There is no integrity check to make. A sentinel protocol carries no checksum, so a frame
+ * that reaches a parser here has been delimited, not verified, and whatever decodes it is
+ * the only thing standing between a corrupted reply and a reported reading. Declare a range
+ * for every field.
+ */
+class SentinelFrameReader {
+  constructor(spec) {
+    this.spec = spec;
+  }
+  readFrame(buffer) {
+    const first = lower(buffer[0]);
+    if (buffer.length > 0 && (this.spec.standaloneBytes ?? []).includes(first)) {
+      return {
+        status: _frameReadStatus.FrameReadStatus.COMPLETE,
+        consumedBytes: 1,
+        frame: [first]
+      };
+    }
+    const start = this.frameStart(buffer);
+
+    /**
+     * A declared start byte is one byte, so there is no partial match to preserve: a buffer
+     * without it holds no frame start and is junk in its entirety.
+     */
+    if (start === undefined) {
+      return {
+        status: _frameReadStatus.FrameReadStatus.INCOMPLETE,
+        consumedBytes: buffer.length
+      };
+    }
+    const end = buffer.findIndex((byte, index) => index >= start && lower(byte) === this.spec.terminator);
+    if (end === -1) {
+      return this.incompleteOrOverlong(buffer, start);
+    }
+    return {
+      status: _frameReadStatus.FrameReadStatus.COMPLETE,
+      consumedBytes: end + 1,
+      frame: buffer.slice(start, end)
+    };
+  }
+
+  /**
+   * Where the payload begins: after the start byte when one is declared, and at zero when
+   * none is. A declared start byte that has not arrived means the reply has not begun.
+   */
+  frameStart(buffer) {
+    if (this.spec.start === undefined) {
+      return 0;
+    }
+    const index = buffer.findIndex(byte => lower(byte) === this.spec.start);
+    return index === -1 ? undefined : index + 1;
+  }
+  incompleteOrOverlong(buffer, start) {
+    if (buffer.length - start <= this.spec.maxFrameBytes) {
+      return {
+        status: _frameReadStatus.FrameReadStatus.INCOMPLETE,
+        consumedBytes: 0
+      };
+    }
+    return {
+      status: _frameReadStatus.FrameReadStatus.CORRUPT,
+      consumedBytes: buffer.length
+    };
+  }
+}
+exports.SentinelFrameReader = SentinelFrameReader;
+//# sourceMappingURL=sentinel-frame-reader.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["_frameReadStatus","require","lower","byte","toLowerCase","SentinelFrameReader","constructor","spec","readFrame","buffer","first","length","standaloneBytes","includes","status","FrameReadStatus","COMPLETE","consumedBytes","frame","start","frameStart","undefined","INCOMPLETE","end","findIndex","index","terminator","incompleteOrOverlong","slice","maxFrameBytes","CORRUPT","exports"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/sentinel-frame-reader.ts"],"mappings":";;;;;;AACA,IAAAA,gBAAA,GAAAC,OAAA;AAgCA,MAAMC,KAAK,GAAIC,IAAwB,IAAa,CAACA,IAAI,IAAI,EAAE,EAAEC,WAAW,CAAC,CAAC;;AAE9E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,mBAAmB,CAAwB;EAC/CC,WAAWA,CAAkBC,IAAuB,EAAE;IAAA,KAAzBA,IAAuB,GAAvBA,IAAuB;EAAG;EAEvDC,SAASA,CAACC,MAAyB,EAAmB;IAC3D,MAAMC,KAAK,GAAGR,KAAK,CAACO,MAAM,CAAC,CAAC,CAAC,CAAC;IAE9B,IAAIA,MAAM,CAACE,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAACJ,IAAI,CAACK,eAAe,IAAI,EAAE,EAAEC,QAAQ,CAACH,KAAK,CAAC,EAAE;MAC1E,OAAO;QACLI,MAAM,EAAEC,gCAAe,CAACC,QAAQ;QAChCC,aAAa,EAAE,CAAC;QAChBC,KAAK,EAAE,CAACR,KAAK;MACf,CAAC;IACH;IAEA,MAAMS,KAAK,GAAG,IAAI,CAACC,UAAU,CAACX,MAAM,CAAC;;IAErC;AACJ;AACA;AACA;IACI,IAAIU,KAAK,KAAKE,SAAS,EAAE;MACvB,OAAO;QAAEP,MAAM,EAAEC,gCAAe,CAACO,UAAU;QAAEL,aAAa,EAAER,MAAM,CAACE;MAAO,CAAC;IAC7E;IAEA,MAAMY,GAAG,GAAGd,MAAM,CAACe,SAAS,CAC1B,CAACrB,IAAI,EAAEsB,KAAK,KAAKA,KAAK,IAAIN,KAAK,IAAIjB,KAAK,CAACC,IAAI,CAAC,KAAK,IAAI,CAACI,IAAI,CAACmB,UAC/D,CAAC;IAED,IAAIH,GAAG,KAAK,CAAC,CAAC,EAAE;MACd,OAAO,IAAI,CAACI,oBAAoB,CAAClB,MAAM,EAAEU,KAAK,CAAC;IACjD;IAEA,OAAO;MACLL,MAAM,EAAEC,gCAAe,CAACC,QAAQ;MAChCC,aAAa,EAAEM,GAAG,GAAG,CAAC;MACtBL,KAAK,EAAET,MAAM,CAACmB,KAAK,CAACT,KAAK,EAAEI,GAAG;IAChC,CAAC;EACH;;EAEA;AACF;AACA;AACA;EACUH,UAAUA,CAACX,MAAyB,EAAsB;IAChE,IAAI,IAAI,CAACF,IAAI,CAACY,KAAK,KAAKE,SAAS,EAAE;MACjC,OAAO,CAAC;IACV;IAEA,MAAMI,KAAK,GAAGhB,MAAM,CAACe,SAAS,CAAErB,IAAI,IAAKD,KAAK,CAACC,IAAI,CAAC,KAAK,IAAI,CAACI,IAAI,CAACY,KAAK,CAAC;IAEzE,OAAOM,KAAK,KAAK,CAAC,CAAC,GAAGJ,SAAS,GAAGI,KAAK,GAAG,CAAC;EAC7C;EAEQE,oBAAoBA,CAC1BlB,MAAyB,EACzBU,KAAa,EACI;IACjB,IAAIV,MAAM,CAACE,MAAM,GAAGQ,KAAK,IAAI,IAAI,CAACZ,IAAI,CAACsB,aAAa,EAAE;MACpD,OAAO;QAAEf,MAAM,EAAEC,gCAAe,CAACO,UAAU;QAAEL,aAAa,EAAE;MAAE,CAAC;IACjE;IAEA,OAAO;MAAEH,MAAM,EAAEC,gCAAe,CAACe,OAAO;MAAEb,aAAa,EAAER,MAAM,CAACE;IAAO,CAAC;EAC1E;AACF;AAACoB,OAAA,CAAA1B,mBAAA,GAAAA,mBAAA","ignoreList":[]}