@ovok/native 0.4.6 → 0.4.8

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

@@ -0,0 +1,93 @@
+"use strict";
+
+import { customDeviceError } from "./custom-device-error.js";
+import { normalizeBleUuid } from "./normalize-ble-uuid.js";
+const HEX_BYTE = /^[0-9a-f]{2}$/;
+const MAX_OPCODE = 0xff;
+const MAX_DEVICE_TYPE = 0xffff;
+const assertStartBytes = (id, startBytes) => {
+  if (!Array.isArray(startBytes) || startBytes.length === 0) {
+    throw customDeviceError(id, "lepu.startBytes", "must list at least one frame start byte, such as [\"a5\"]");
+  }
+  return startBytes.map((byte, index) => {
+    const normalized = String(byte).toLowerCase();
+    if (!HEX_BYTE.test(normalized)) {
+      throw customDeviceError(id, `lepu.startBytes[${index}]`, `is "${String(byte)}"; it must be exactly two hex digits`);
+    }
+    return normalized;
+  });
+};
+const assertDeviceTypes = (id, deviceTypes) => {
+  if (!Array.isArray(deviceTypes)) {
+    throw customDeviceError(id, "lepu.expectedDeviceTypes", "must be an array of the model numbers this declaration was written for");
+  }
+  return deviceTypes.map((deviceType, index) => {
+    if (!Number.isInteger(deviceType) || deviceType < 0 || deviceType > MAX_DEVICE_TYPE) {
+      throw customDeviceError(id, `lepu.expectedDeviceTypes[${index}]`, `is ${String(deviceType)}; a model number is a whole number between 0 and ${MAX_DEVICE_TYPE}`);
+    }
+    return deviceType;
+  });
+};
+
+/**
+ * The opcode to poll with, once the device has been identified.
+ *
+ * Identification is the advertised name unless `expectedDeviceTypes` narrows it further.
+ * The name is what the vendor's own SDK binds every one of its products on - a 732-line
+ * cascade of name checks resolving to 176 models - so requiring more than that to poll at
+ * all would hold this SDK to a bar the hardware's own maker does not meet, and would leave
+ * every device undeclarable.
+ *
+ * Naming the models is still the stronger declaration, and is worth doing once the numbers
+ * are known: the family's low opcodes act, and a frame built for the wrong product is still
+ * well formed, so a name that matched the wrong hardware would not be caught by anything
+ * else in the protocol.
+ */
+const assertPollCommand = (id, lepu) => {
+  const {
+    pollCommand
+  } = lepu;
+  if (pollCommand === undefined) {
+    return undefined;
+  }
+  if (!Number.isInteger(pollCommand) || pollCommand < 0 || pollCommand > MAX_OPCODE) {
+    throw customDeviceError(id, "lepu.pollCommand", `is ${String(pollCommand)}; an opcode is a whole number between 0 and ${MAX_OPCODE}`);
+  }
+  return pollCommand;
+};
+
+/**
+ * Validates the Lepu declaration and normalises its UUIDs.
+ *
+ * The write service has to be one the declaration already monitors: a command written to a
+ * service the device never opened is accepted by nothing and answered by nothing, which
+ * looks exactly like hardware that is simply not responding.
+ */
+export const compileCustomLepu = (id, spec, serviceUuids) => {
+  const lepu = spec.lepu;
+  if (!lepu) {
+    return undefined;
+  }
+  if (spec.services.some(service => service.write)) {
+    throw customDeviceError(id, "services[].write", "cannot be declared alongside lepu, which builds its own commands and addresses them through lepu.write");
+  }
+  const startBytes = assertStartBytes(id, lepu.startBytes);
+  const expectedDeviceTypes = assertDeviceTypes(id, lepu.expectedDeviceTypes);
+  const pollCommand = assertPollCommand(id, lepu);
+  const serviceUuid = normalizeBleUuid(id, "lepu.write.serviceUuid", lepu.write?.serviceUuid);
+  if (!serviceUuids.includes(serviceUuid)) {
+    throw customDeviceError(id, "lepu.write.serviceUuid", `is "${serviceUuid}", which this device does not declare among its services`);
+  }
+  return {
+    startBytes,
+    expectedDeviceTypes,
+    ...(pollCommand === undefined ? {} : {
+      pollCommand
+    }),
+    write: {
+      serviceUuid,
+      characteristicUuid: normalizeBleUuid(id, "lepu.write.characteristicUuid", lepu.write?.characteristicUuid)
+    }
+  };
+};
+//# sourceMappingURL=compile-custom-lepu.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["customDeviceError","normalizeBleUuid","HEX_BYTE","MAX_OPCODE","MAX_DEVICE_TYPE","assertStartBytes","id","startBytes","Array","isArray","length","map","byte","index","normalized","String","toLowerCase","test","assertDeviceTypes","deviceTypes","deviceType","Number","isInteger","assertPollCommand","lepu","pollCommand","undefined","compileCustomLepu","spec","serviceUuids","services","some","service","write","expectedDeviceTypes","serviceUuid","includes","characteristicUuid"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/custom/compile-custom-lepu.ts"],"mappings":";;AAGA,SAASA,iBAAiB,QAAQ,0BAAuB;AACzD,SAASC,gBAAgB,QAAQ,yBAAsB;AAEvD,MAAMC,QAAQ,GAAG,eAAe;AAChC,MAAMC,UAAU,GAAG,IAAI;AACvB,MAAMC,eAAe,GAAG,MAAM;AAE9B,MAAMC,gBAAgB,GAAGA,CAACC,EAAU,EAAEC,UAAmB,KAAe;EACtE,IAAI,CAACC,KAAK,CAACC,OAAO,CAACF,UAAU,CAAC,IAAIA,UAAU,CAACG,MAAM,KAAK,CAAC,EAAE;IACzD,MAAMV,iBAAiB,CACrBM,EAAE,EACF,iBAAiB,EACjB,2DACF,CAAC;EACH;EAEA,OAAOC,UAAU,CAACI,GAAG,CAAC,CAACC,IAAI,EAAEC,KAAK,KAAK;IACrC,MAAMC,UAAU,GAAGC,MAAM,CAACH,IAAI,CAAC,CAACI,WAAW,CAAC,CAAC;IAE7C,IAAI,CAACd,QAAQ,CAACe,IAAI,CAACH,UAAU,CAAC,EAAE;MAC9B,MAAMd,iBAAiB,CACrBM,EAAE,EACF,mBAAmBO,KAAK,GAAG,EAC3B,OAAOE,MAAM,CAACH,IAAI,CAAC,sCACrB,CAAC;IACH;IAEA,OAAOE,UAAU;EACnB,CAAC,CAAC;AACJ,CAAC;AAED,MAAMI,iBAAiB,GAAGA,CAACZ,EAAU,EAAEa,WAAoB,KAAe;EACxE,IAAI,CAACX,KAAK,CAACC,OAAO,CAACU,WAAW,CAAC,EAAE;IAC/B,MAAMnB,iBAAiB,CACrBM,EAAE,EACF,0BAA0B,EAC1B,wEACF,CAAC;EACH;EAEA,OAAOa,WAAW,CAACR,GAAG,CAAC,CAACS,UAAU,EAAEP,KAAK,KAAK;IAC5C,IACE,CAACQ,MAAM,CAACC,SAAS,CAACF,UAAU,CAAC,IAC5BA,UAAU,GAAc,CAAC,IACzBA,UAAU,GAAchB,eAAe,EACxC;MACA,MAAMJ,iBAAiB,CACrBM,EAAE,EACF,4BAA4BO,KAAK,GAAG,EACpC,MAAME,MAAM,CAACK,UAAU,CAAC,oDAAoDhB,eAAe,EAC7F,CAAC;IACH;IAEA,OAAOgB,UAAU;EACnB,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMG,iBAAiB,GAAGA,CACxBjB,EAAU,EACVkB,IAAoB,KACG;EACvB,MAAM;IAAEC;EAAY,CAAC,GAAGD,IAAI;EAE5B,IAAIC,WAAW,KAAKC,SAAS,EAAE;IAC7B,OAAOA,SAAS;EAClB;EAEA,IACE,CAACL,MAAM,CAACC,SAAS,CAACG,WAAW,CAAC,IAC9BA,WAAW,GAAG,CAAC,IACfA,WAAW,GAAGtB,UAAU,EACxB;IACA,MAAMH,iBAAiB,CACrBM,EAAE,EACF,kBAAkB,EAClB,MAAMS,MAAM,CAACU,WAAW,CAAC,+CAA+CtB,UAAU,EACpF,CAAC;EACH;EAEA,OAAOsB,WAAW;AACpB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAME,iBAAiB,GAAGA,CAC/BrB,EAAU,EACVsB,IAAsB,EACtBC,YAA+B,KACA;EAC/B,MAAML,IAAI,GAAGI,IAAI,CAACJ,IAAI;EAEtB,IAAI,CAACA,IAAI,EAAE;IACT,OAAOE,SAAS;EAClB;EAEA,IAAIE,IAAI,CAACE,QAAQ,CAACC,IAAI,CAAEC,OAAO,IAAKA,OAAO,CAACC,KAAK,CAAC,EAAE;IAClD,MAAMjC,iBAAiB,CACrBM,EAAE,EACF,kBAAkB,EAClB,wGACF,CAAC;EACH;EAEA,MAAMC,UAAU,GAAGF,gBAAgB,CAACC,EAAE,EAAEkB,IAAI,CAACjB,UAAU,CAAC;EACxD,MAAM2B,mBAAmB,GAAGhB,iBAAiB,CAACZ,EAAE,EAAEkB,IAAI,CAACU,mBAAmB,CAAC;EAC3E,MAAMT,WAAW,GAAGF,iBAAiB,CAACjB,EAAE,EAAEkB,IAAI,CAAC;EAE/C,MAAMW,WAAW,GAAGlC,gBAAgB,CAClCK,EAAE,EACF,wBAAwB,EACxBkB,IAAI,CAACS,KAAK,EAAEE,WACd,CAAC;EAED,IAAI,CAACN,YAAY,CAACO,QAAQ,CAACD,WAAW,CAAC,EAAE;IACvC,MAAMnC,iBAAiB,CACrBM,EAAE,EACF,wBAAwB,EACxB,OAAO6B,WAAW,0DACpB,CAAC;EACH;EAEA,OAAO;IACL5B,UAAU;IACV2B,mBAAmB;IACnB,IAAIT,WAAW,KAAKC,SAAS,GAAG,CAAC,CAAC,GAAG;MAAED;IAAY,CAAC,CAAC;IACrDQ,KAAK,EAAE;MACLE,WAAW;MACXE,kBAAkB,EAAEpC,gBAAgB,CAClCK,EAAE,EACF,+BAA+B,EAC/BkB,IAAI,CAACS,KAAK,EAAEI,kBACd;IACF;EACF,CAAC;AACH,CAAC","ignoreList":[]}

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

@@ -2,11 +2,16 @@
 
 import { CUSTOM_DEVICE_BRAND } from "../../constants/custom-device-brand.js";
 import { IntegratedDevices } from "../../types/integrated-devices.js";
+import { compileCustomLepu } from "./compile-custom-lepu.js";
 import { compileCustomMonitor } from "./compile-custom-monitor.js";
 import { customDeviceError } from "./custom-device-error.js";
 import { normalizeBleUuid } from "./normalize-ble-uuid.js";
 const MIN_STUCK_TIMEOUT_MS = 1_000;
 
+/** The smallest MTU a BLE link has, and the largest an ATT packet may declare. */
+const MIN_MTU = 23;
+const MAX_MTU = 517;
+
 // The SDK's own F4 scale waits this long, because it sleeps while still connected.
 const MAX_STUCK_TIMEOUT_MS = 6_000_000;
 const HEX_BYTES = /^([0-9a-f]{2})+$/;
@@ -42,6 +47,16 @@ const assertStuckTimeout = (id, spec) => {
   }
   return timeout;
 };
+const assertPreferredMtu = (id, spec) => {
+  const mtu = spec.preferredMtu;
+  if (mtu === undefined) {
+    return undefined;
+  }
+  if (!Number.isInteger(mtu) || mtu < MIN_MTU || mtu > MAX_MTU) {
+    throw customDeviceError(id, "preferredMtu", `is ${String(mtu)}; it must be a whole number between ${MIN_MTU} and ${MAX_MTU}`);
+  }
+  return mtu;
+};
 const compileWrite = (id, path, write) => {
   if (!write) {
     return undefined;
@@ -68,6 +83,7 @@ export const defineCustomDevice = spec => {
   const id = assertIdentity(spec);
   const nameMatch = compileNameMatch(id, spec);
   const stuckDataTimeout = assertStuckTimeout(id, spec);
+  const preferredMtu = assertPreferredMtu(id, spec);
   if (!Array.isArray(spec.services) || spec.services.length === 0) {
     throw customDeviceError(id, "services", "must declare at least one service");
   }
@@ -101,6 +117,7 @@ export const defineCustomDevice = spec => {
       writeUuid: compileWrite(id, path, service.write)
     };
   });
+  const lepu = compileCustomLepu(id, spec, mainServices.map(service => service.uuid));
   return {
     [CUSTOM_DEVICE_BRAND]: true,
     id: id,
@@ -109,7 +126,13 @@ export const defineCustomDevice = spec => {
     mainServices,
     stuckDataTimeout,
     fields,
-    frames
+    frames,
+    ...(preferredMtu === undefined ? {} : {
+      preferredMtu
+    }),
+    ...(lepu === undefined ? {} : {
+      lepu
+    })
   };
 };
 //# sourceMappingURL=define-custom-device.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["CUSTOM_DEVICE_BRAND","IntegratedDevices","compileCustomMonitor","customDeviceError","normalizeBleUuid","MIN_STUCK_TIMEOUT_MS","MAX_STUCK_TIMEOUT_MS","HEX_BYTES","assertIdentity","spec","id","trim","String","builtIn","Object","values","find","name","toLowerCase","compileNameMatch","nameMatch","RegExp","global","sticky","exact","replace","assertStuckTimeout","timeout","stuckDataTimeoutMs","Number","isInteger","compileWrite","path","write","undefined","commandHex","test","uuid","mainCommandUuid","defineCustomDevice","stuckDataTimeout","Array","isArray","services","length","fields","Map","frames","seenCharacteristics","Set","mainServices","map","service","serviceIndex","monitor","monitorUuids","monitorIndex","monitorPath","characteristic","frame","has","add","set","writeUuid"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/custom/define-custom-device.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["CUSTOM_DEVICE_BRAND","IntegratedDevices","compileCustomLepu","compileCustomMonitor","customDeviceError","normalizeBleUuid","MIN_STUCK_TIMEOUT_MS","MIN_MTU","MAX_MTU","MAX_STUCK_TIMEOUT_MS","HEX_BYTES","assertIdentity","spec","id","trim","String","builtIn","Object","values","find","name","toLowerCase","compileNameMatch","nameMatch","RegExp","global","sticky","exact","replace","assertStuckTimeout","timeout","stuckDataTimeoutMs","Number","isInteger","assertPreferredMtu","mtu","preferredMtu","undefined","compileWrite","path","write","commandHex","test","uuid","mainCommandUuid","defineCustomDevice","stuckDataTimeout","Array","isArray","services","length","fields","Map","frames","seenCharacteristics","Set","mainServices","map","service","serviceIndex","monitor","monitorUuids","monitorIndex","monitorPath","characteristic","frame","has","add","set","writeUuid","lepu"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/custom/define-custom-device.ts"],"mappings":"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","ignoreList":[]}

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

@@ -8,6 +8,24 @@ import { BP2Device } from "./devices/bp2/bp2.device.js";
 import { CustomDevice } from "./devices/custom/custom.device.js";
 import { F4Device } from "./devices/f4/f4.device.js";
 import { SPO2Device } from "./devices/spo/spo2.device.js";
+import { VerovalDuoControlDevice } from "./devices/veroval/veroval.duo-control-device.js";
+import { VerovalEcgDevice } from "./devices/veroval/veroval.ecg-device.js";
+
+/**
+ * The built-in names the SDK can actually build.
+ *
+ * `integratedDevicesMap` matches more names than this, on purpose: matching is what names a
+ * device in a scan result and a device list, which is useful for hardware the SDK cannot
+ * yet decode. Connecting to one of those is what fails, and it fails saying so.
+ */
+const DEVICE_CLASSES = {
+  [IntegratedDevices.BP2]: BP2Device,
+  [IntegratedDevices.F4]: F4Device,
+  [IntegratedDevices.PC60WF]: SPO2Device,
+  [IntegratedDevices.BC01]: BC01Device,
+  [IntegratedDevices.VEROVAL_DUO_CONTROL]: VerovalDuoControlDevice,
+  [IntegratedDevices.VEROVAL_ECG]: VerovalEcgDevice
+};
 const collectCustomDevices = acceptedDevices => {
   const customDevices = new Map();
   const matchers = new Set();
@@ -67,15 +85,9 @@ export class DeviceCreator {
       // @ts-expect-error - the caller asked for this custom device by its own id
       return new CustomDevice(params.device, params, custom);
     }
-    const deviceMap = {
-      [IntegratedDevices.BP2]: BP2Device,
-      [IntegratedDevices.F4]: F4Device,
-      [IntegratedDevices.PC60WF]: SPO2Device,
-      [IntegratedDevices.BC01]: BC01Device
-    };
-    const deviceClass = deviceMap[params.deviceName];
+    const deviceClass = DEVICE_CLASSES[params.deviceName];
     if (!deviceClass) {
-      throw new Error(`Device ${params.device.name} not found`);
+      throw new Error(`"${params.deviceName}" is a name the SDK matches during a scan but has no decoder for, so "${params.device.name}" cannot be connected. The names it can decode are ${Object.keys(DEVICE_CLASSES).join(", ")}; anything else needs a declaration registered with defineCustomDevice and passed in acceptedDevices.`);
     }
 
     // @ts-expect-error - This is a workaround to allow the deviceClass to be instantiated with the correct type

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

@@ -1 +1 @@
-{"version":3,"names":["integratedDevicesMap","IntegratedDevices","isCustomDeviceDefinition","BC01Device","BP2Device","CustomDevice","F4Device","SPO2Device","collectCustomDevices","acceptedDevices","customDevices","Map","matchers","Set","forEach","entry","index","Error","has","id","nameMatch","source","set","add","DeviceCreator","deviceNameCache","CACHE_MAX_SIZE","constructor","acceptedDeviceNames","getDeviceName","foundName","undefined","get","matched","matchDeviceName","cacheDeviceName","createDevice","params","String","deviceName","trim","device","name","custom","deviceMap","BP2","F4","PC60WF","BC01","deviceClass","destroy","clear","regex","deviceType","test","some","values","size","firstKey","keys","next","value","delete"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/services/device-creator.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["integratedDevicesMap","IntegratedDevices","isCustomDeviceDefinition","BC01Device","BP2Device","CustomDevice","F4Device","SPO2Device","VerovalDuoControlDevice","VerovalEcgDevice","DEVICE_CLASSES","BP2","F4","PC60WF","BC01","VEROVAL_DUO_CONTROL","VEROVAL_ECG","collectCustomDevices","acceptedDevices","customDevices","Map","matchers","Set","forEach","entry","index","Error","has","id","nameMatch","source","set","add","DeviceCreator","deviceNameCache","CACHE_MAX_SIZE","constructor","acceptedDeviceNames","getDeviceName","foundName","undefined","get","matched","matchDeviceName","cacheDeviceName","createDevice","params","String","deviceName","trim","device","name","custom","deviceClass","Object","keys","join","destroy","clear","regex","deviceType","test","some","values","size","firstKey","next","value","delete"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/services/device-creator.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/aoj/aoj.thermometers.js

@@ -0,0 +1,81 @@
+"use strict";
+
+import { MeasurementTypeKey } from "@ovok/core";
+import { defineCustomDevice } from "../../custom/define-custom-device.js";
+
+/**
+ * Declarations for the AOJ Medical thermometers.
+ *
+ * Their frame is `aa | 01 | cmd | len | payload | xor`, where the checksum covers everything
+ * from the device-type byte up to itself. It is not the Lepu framing, despite both being
+ * reachable from the same vendor app: no complement byte, no sequence number, a one-byte
+ * length and an exclusive-or rather than a CRC.
+ */
+
+/** Every frame opens with these two: a fixed start byte and a fixed device type. */
+const FRAME_HEADER = ["aa", "01"];
+const COMMAND_BYTE = 2;
+
+/** Header, a three-byte payload and the checksum. */
+const FRAME_BYTES = 8;
+const CHECKSUM_INDEX = 7;
+
+/** The checksum starts after the start byte, which it does not cover. */
+const CHECKSUM_FROM = 1;
+const PAYLOAD = 4;
+
+/** The device answers a realtime-temperature request with this. */
+const TEMPERATURE_REPLY = "c1";
+
+/** Hundredths of a degree, big-endian - the one field in this family that is not little. */
+const TEMPERATURE_SCALE = 0.01;
+const TEMPERATURE_DECIMALS = 2;
+const SPOT_CHECK_TIMEOUT_MS = 60_000;
+/**
+ * The AOJ-20A infrared thermometer.
+ *
+ * Declared without a write characteristic, because the device sends its reading rather than
+ * waiting to be asked: the vendor app has a request for it, calls it from nowhere, and still
+ * displays temperatures - so the reply arrives when someone takes a measurement. Not writing
+ * also means not polling, which for a spot-check device would otherwise re-report the same
+ * reading for as long as the link stayed up.
+ *
+ * Only the realtime reply is declared. The stored-history reply shares the header and would
+ * need its own case; nothing reads history yet, and a case that decoded it into the same
+ * measurement would post old readings as though they had just been taken.
+ */
+export const aoj20aThermometer = params => defineCustomDevice({
+  id: params.id,
+  nameMatch: params.nameMatch,
+  stuckDataTimeoutMs: params.stuckDataTimeoutMs ?? SPOT_CHECK_TIMEOUT_MS,
+  services: [{
+    uuid: "ffe0",
+    monitor: [{
+      uuid: "ffe1",
+      frame: {
+        header: FRAME_HEADER,
+        minLengthBytes: FRAME_BYTES,
+        checksum: {
+          algorithm: "xor",
+          index: CHECKSUM_INDEX,
+          from: CHECKSUM_FROM
+        }
+      },
+      caseSelectorBytes: [COMMAND_BYTE],
+      cases: [{
+        selector: TEMPERATURE_REPLY,
+        kind: "result",
+        measurementTypeKey: MeasurementTypeKey.temperature,
+        fields: [{
+          name: "bodyTemp",
+          byteIndexes: [PAYLOAD, PAYLOAD + 1],
+          byteOrder: "big",
+          unit: "Cel",
+          scale: TEMPERATURE_SCALE,
+          decimals: TEMPERATURE_DECIMALS
+        }]
+      }]
+    }]
+  }]
+});
+//# sourceMappingURL=aoj.thermometers.js.map

package/lib/module/modules/bt-management/services/devices/aoj/aoj.thermometers.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["MeasurementTypeKey","defineCustomDevice","FRAME_HEADER","COMMAND_BYTE","FRAME_BYTES","CHECKSUM_INDEX","CHECKSUM_FROM","PAYLOAD","TEMPERATURE_REPLY","TEMPERATURE_SCALE","TEMPERATURE_DECIMALS","SPOT_CHECK_TIMEOUT_MS","aoj20aThermometer","params","id","nameMatch","stuckDataTimeoutMs","services","uuid","monitor","frame","header","minLengthBytes","checksum","algorithm","index","from","caseSelectorBytes","cases","selector","kind","measurementTypeKey","temperature","fields","name","byteIndexes","byteOrder","unit","scale","decimals"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj.thermometers.ts"],"mappings":";;AAAA,SAASA,kBAAkB,QAAQ,YAAY;AAG/C,SAASC,kBAAkB,QAAQ,sCAAmC;;AAEtE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,MAAMC,YAAY,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC;AAEjC,MAAMC,YAAY,GAAG,CAAC;;AAEtB;AACA,MAAMC,WAAW,GAAG,CAAC;AACrB,MAAMC,cAAc,GAAG,CAAC;;AAExB;AACA,MAAMC,aAAa,GAAG,CAAC;AAEvB,MAAMC,OAAO,GAAG,CAAC;;AAEjB;AACA,MAAMC,iBAAiB,GAAG,IAAI;;AAE9B;AACA,MAAMC,iBAAiB,GAAG,IAAI;AAC9B,MAAMC,oBAAoB,GAAG,CAAC;AAE9B,MAAMC,qBAAqB,GAAG,MAAM;AAapC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,iBAAiB,GAC5BC,MAAuB,IAEvBZ,kBAAkB,CAAC;EACjBa,EAAE,EAAED,MAAM,CAACC,EAAE;EACbC,SAAS,EAAEF,MAAM,CAACE,SAAS;EAC3BC,kBAAkB,EAAEH,MAAM,CAACG,kBAAkB,IAAIL,qBAAqB;EACtEM,QAAQ,EAAE,CACR;IACEC,IAAI,EAAE,MAAM;IACZC,OAAO,EAAE,CACP;MACED,IAAI,EAAE,MAAM;MACZE,KAAK,EAAE;QACLC,MAAM,EAAEnB,YAAY;QACpBoB,cAAc,EAAElB,WAAW;QAC3BmB,QAAQ,EAAE;UACRC,SAAS,EAAE,KAAK;UAChBC,KAAK,EAAEpB,cAAc;UACrBqB,IAAI,EAAEpB;QACR;MACF,CAAC;MACDqB,iBAAiB,EAAE,CAACxB,YAAY,CAAC;MACjCyB,KAAK,EAAE,CACL;QACEC,QAAQ,EAAErB,iBAAiB;QAC3BsB,IAAI,EAAE,QAAQ;QACdC,kBAAkB,EAAE/B,kBAAkB,CAACgC,WAAW;QAClDC,MAAM,EAAE,CACN;UACEC,IAAI,EAAE,UAAU;UAChBC,WAAW,EAAE,CAAC5B,OAAO,EAAEA,OAAO,GAAG,CAAC,CAAC;UACnC6B,SAAS,EAAE,KAAK;UAChBC,IAAI,EAAE,KAAK;UACXC,KAAK,EAAE7B,iBAAiB;UACxB8B,QAAQ,EAAE7B;QACZ,CAAC;MAEL,CAAC;IAEL,CAAC;EAEL,CAAC;AAEL,CAAC,CAAC","ignoreList":[]}

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

@@ -1,84 +1,19 @@
 "use strict";
 
-import { FrameReadStatus } from "../../../types/frame-read-status.js";
-import { calculateCrc8 } from "../../../utils/calculate-crc-8.js";
-import { hexToByte } from "../../../utils/hex-to-byte.js";
-import { le16FromHex } from "../../../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;
+import { LepuFrameReader } from "../lepu/lepu.frame-reader.js";
 
-/** 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 = hexToByte(buffer[index + COMMAND_INDEX] || "0");
-  const complement = 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));
+/** 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.
  */
-export class BP2FrameReader {
-  readFrame(buffer) {
-    const start = findFrameStart(buffer);
-    if (start === -1) {
-      return {
-        status: FrameReadStatus.INCOMPLETE,
-        consumedBytes: droppableLeadingBytes(buffer)
-      };
-    }
-    const payloadLength = le16FromHex(buffer, start + PAYLOAD_LENGTH_INDEX);
-    const frameLength = HEADER_BYTES + payloadLength + CHECKSUM_BYTES;
-    if (start + frameLength > buffer.length) {
-      return {
-        status: FrameReadStatus.INCOMPLETE,
-        consumedBytes: start
-      };
-    }
-    const frame = buffer.slice(start, start + frameLength);
-    if (!this.hasValidChecksum(frame)) {
-      return {
-        status: FrameReadStatus.CORRUPT,
-        consumedBytes: start + START_PATTERN_BYTES
-      };
-    }
-    return {
-      status: FrameReadStatus.COMPLETE,
-      consumedBytes: start + frameLength,
-      frame
-    };
-  }
-  hasValidChecksum(frame) {
-    const checksummedBytes = frame.length - CHECKSUM_BYTES;
-    const declared = hexToByte(frame[checksummedBytes] || "0");
-    return declared === calculateCrc8(frame, checksummedBytes);
+export class BP2FrameReader extends LepuFrameReader {
+  constructor() {
+    super(BP2_START_BYTES);
   }
 }
 //# sourceMappingURL=bp2.frame-reader.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["FrameReadStatus","calculateCrc8","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","complement","findFrameStart","lastCandidate","length","droppableLeadingBytes","Math","max","BP2FrameReader","readFrame","start","status","INCOMPLETE","consumedBytes","payloadLength","frameLength","frame","slice","hasValidChecksum","CORRUPT","COMPLETE","checksummedBytes","declared"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bp2/bp2.frame-reader.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["LepuFrameReader","BP2_START_BYTES","BP2FrameReader","constructor"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bp2/bp2.frame-reader.ts"],"mappings":";;AAAA,SAASA,eAAe,QAAQ,8BAA2B;;AAE3D;AACA,MAAMC,eAAe,GAAG,CAAC,IAAI,CAAC;;AAE9B;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,cAAc,SAASF,eAAe,CAAC;EAC3CG,WAAWA,CAAA,EAAG;IACnB,KAAK,CAACF,eAAe,CAAC;EACxB;AACF","ignoreList":[]}

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

@@ -0,0 +1,150 @@
+"use strict";
+
+import { slog } from "../../../helpers/utils/s-log.js";
+import { sentryLogger } from "../../../helpers/utils/sentry-logger.js";
+import { hexToBase64 } from "../../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.
+ */
+export 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, hexToBase64(chunk.join("")));
+        return true;
+      } catch (error) {
+        sentryLogger("error", "DEVICE: Error sending command", {
+          error: error instanceof Error ? error.message : error,
+          deviceName: this.device.name
+        });
+        if (attempt === MAX_WRITE_ATTEMPTS) {
+          slog(error, "BT_CONNECTION_HANDLER: Error sending command", {
+            deviceName: this.device.name
+          });
+        }
+      }
+    }
+    return false;
+  };
+}
+//# sourceMappingURL=bt-command-writer.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["slog","sentryLogger","hexToBase64","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","join","Error","message","deviceName","name"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-command-writer.ts"],"mappings":"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","ignoreList":[]}