@ovok/native 1.10.9 → 1.10.11

package/lib/module/modules/bt-management/services/devices/and-medical/and-medical.protocol.js

@@ -0,0 +1,106 @@
+"use strict";
+
+/* eslint-disable import/group-exports */
+
+import { decodeMedicalFloat } from "../../../utils/decode-medical-float.js";
+import { hexToByte } from "../../../utils/hex-to-byte.js";
+import { bloodPressureStatusFromFrame, recordedAtFromBloodPressureFrame } from "../standard-gatt/standard-gatt.profile.js";
+
+/**
+ * A&D Medical (UA-651/656/1200BLE monitors, UC-352BLE scale), from MedM Health Diary 3.12.11's
+ * `CAND_*` classes.
+ *
+ * The monitors are the SIG Blood Pressure profile plus a clock write a second after connecting:
+ * a 7-byte SIG Date Time to 0x1810/0x2A08, or the same bytes to Current Time 0x1805/0x2A2B on
+ * the UA-1200BLE/UB-1100BLE. The scale takes A&D command frames (`length type command payload`,
+ * no checksum) on 233bf001 and indicates 10-byte weight records on 23434101.
+ */
+const sig16 = assigned => `0000${assigned}-0000-1000-8000-00805f9b34fb`;
+export const AND_MEDICAL = {
+  bloodPressureService: sig16("1810"),
+  bloodPressureMeasurement: sig16("2a35"),
+  dateTime: sig16("2a08"),
+  currentTimeService: sig16("1805"),
+  currentTime: sig16("2a2b"),
+  commandService: "233bf000-5a34-1b6d-975c-000d5690abe4",
+  command: "233bf001-5a34-1b6d-975c-000d5690abe4",
+  scaleService: "23434100-1fe4-1eff-80cb-00ff78297d8b",
+  scaleRecord: "23434101-1fe4-1eff-80cb-00ff78297d8b"
+};
+const POUND_IN_KG = 0.45359237;
+const KPA_IN_MMHG = 7.500617;
+const toHex = bytes => bytes.map(value => (value & 0xff).toString(16).padStart(2, "0"));
+
+/** SIG Date Time, phone-local: year (u16 LE), month, day, hour, minute, second. */
+export const dateTimeCommand = now => toHex([now.getFullYear() & 0xff, now.getFullYear() >> 8, now.getMonth() + 1, now.getDate(), now.getHours(), now.getMinutes(), now.getSeconds()]);
+
+/** A&D set-time frame for the scale: `08 01 01 YY MM DD hh mm ss`, binary, phone-local. */
+export const scaleSetTimeCommand = now => toHex([0x08, 0x01, 0x01, now.getFullYear() % 100, now.getMonth() + 1, now.getDate(), now.getHours(), now.getMinutes(), now.getSeconds()]);
+const sfloat = (bytes, at) => at + 1 < bytes.length ? decodeMedicalFloat((bytes[at] ?? 0) | (bytes[at + 1] ?? 0) << 8, 4, 12) : undefined;
+
+/**
+ * SIG Blood Pressure Measurement 0x2A35. kPa is converted to mmHg; the device timestamp is kept
+ * when the clock is valid; the user id (0-based, 0xFF unknown) becomes a 1-based memory slot;
+ * status bit 2 is the irregular pulse. A record without both pressures is dropped.
+ */
+export const readBloodPressure = frame => {
+  const bytes = frame.map(byte => hexToByte(byte));
+  const flags = bytes[0] ?? 0;
+  const unit = (flags & 0x01) !== 0 ? KPA_IN_MMHG : 1;
+  const systolic = sfloat(bytes, 1);
+  const diastolic = sfloat(bytes, 3);
+  if (systolic === undefined || diastolic === undefined) {
+    return undefined;
+  }
+  const recordedAt = recordedAtFromBloodPressureFrame(frame);
+  let cursor = 7 + ((flags & 0x02) !== 0 ? 7 : 0);
+  const heartRate = (flags & 0x04) !== 0 ? sfloat(bytes, cursor) : undefined;
+  cursor += (flags & 0x04) !== 0 ? 2 : 0;
+  const user = (flags & 0x08) !== 0 ? bytes[cursor] : undefined;
+  const status = bloodPressureStatusFromFrame(frame);
+  return {
+    systolic: Math.round(systolic * unit),
+    diastolic: Math.round(diastolic * unit),
+    ...(heartRate === undefined ? {} : {
+      heartRate
+    }),
+    ...(status === undefined ? {} : {
+      irregularHeartbeat: (status & 0x04) !== 0
+    }),
+    ...(recordedAt ? {
+      recordedAt
+    } : {}),
+    ...(user === undefined || user === 0xff ? {} : {
+      memorySlot: user + 1
+    })
+  };
+};
+
+/** `yearLE16 month day hour minute second` at `at`, local; undefined when the clock is unset. */
+const readDateTime = (bytes, at) => {
+  const [low = 0, high = 0, month = 0, day = 0, hour = 0, minute = 0, second = 0] = bytes.slice(at, at + 7);
+  const year = low | high << 8;
+  const date = new Date(year, month - 1, day, hour, minute, second);
+  return year >= 2000 && date.getMonth() === month - 1 && date.getDate() === day ? date : undefined;
+};
+
+/**
+ * UC-352 record: flags (bit 0 = pounds), weight u16 LE in tenths, then the device time. Pounds
+ * are converted to kilograms. A record too short to carry a time uses the phone's, as MedM does.
+ */
+export const readWeight = (frame, now) => {
+  const bytes = frame.map(byte => hexToByte(byte));
+  const raw = (bytes[1] ?? 0) | (bytes[2] ?? 0) << 8;
+  if (bytes.length < 3 || raw === 0 || raw === 0xffff) {
+    return undefined;
+  }
+  const value = ((bytes[0] ?? 0) & 0x01) !== 0 ? raw / 10 * POUND_IN_KG : raw / 10;
+  const recordedAt = bytes.length >= 10 ? readDateTime(bytes, 3) : now;
+  return {
+    bodyWeight: Math.round(value * 100) / 100,
+    ...(recordedAt ? {
+      recordedAt
+    } : {})
+  };
+};
+//# sourceMappingURL=and-medical.protocol.js.map

package/lib/module/modules/bt-management/services/devices/and-medical/and-medical.protocol.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["decodeMedicalFloat","hexToByte","bloodPressureStatusFromFrame","recordedAtFromBloodPressureFrame","sig16","assigned","AND_MEDICAL","bloodPressureService","bloodPressureMeasurement","dateTime","currentTimeService","currentTime","commandService","command","scaleService","scaleRecord","POUND_IN_KG","KPA_IN_MMHG","toHex","bytes","map","value","toString","padStart","dateTimeCommand","now","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","scaleSetTimeCommand","sfloat","at","length","undefined","readBloodPressure","frame","byte","flags","unit","systolic","diastolic","recordedAt","cursor","heartRate","user","status","Math","round","irregularHeartbeat","memorySlot","readDateTime","low","high","month","day","hour","minute","second","slice","year","date","Date","readWeight","raw","bodyWeight"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/and-medical/and-medical.protocol.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/and-medical/and-medical.sequencer.js

@@ -0,0 +1,74 @@
+"use strict";
+
+import { MeasurementTypeKey } from "@ovok/core";
+import { CaseType } from "../../../types/case-type.js";
+import { AND_MEDICAL, dateTimeCommand, readBloodPressure, readWeight, scaleSetTimeCommand } from "./and-medical.protocol.js";
+
+/** `bpm`: time to 0x1810/0x2A08; `bpmCts`: to 0x1805/0x2A2B (UA-1200BLE/UB-1100BLE); `scale`: UC-352. */
+
+/** MedM waits this long after connecting before a monitor's clock write. */
+const MONITOR_TIME_DELAY_MS = 1_000;
+
+/**
+ * Sets the clock, then reports whatever the device indicates. A monitor resends stored readings,
+ * so an exact repeat (same time and values) within one connection is reported once.
+ */
+class AndMedicalSequencer {
+  recorded = false;
+  seen = new Set();
+  constructor(params) {
+    this.params = params;
+  }
+  initialCommands = () => {
+    const now = this.now();
+    if (this.params.kind === "scale") {
+      return [{
+        serviceUuid: AND_MEDICAL.commandService,
+        characteristicUuid: AND_MEDICAL.command,
+        frame: scaleSetTimeCommand(now)
+      }];
+    }
+    const cts = this.params.kind === "bpmCts";
+    return [{
+      serviceUuid: cts ? AND_MEDICAL.currentTimeService : AND_MEDICAL.bloodPressureService,
+      characteristicUuid: cts ? AND_MEDICAL.currentTime : AND_MEDICAL.dateTime,
+      frame: dateTimeCommand(now),
+      delayBeforeWriteMs: MONITOR_TIME_DELAY_MS
+    }];
+  };
+  isNormalDisconnect = () => this.recorded;
+  nextCommand = frame => {
+    if (this.params.kind === "scale") {
+      const weight = readWeight(frame, this.now());
+      if (weight) {
+        this.report({
+          measurementTypeKey: MeasurementTypeKey.bodyWeight,
+          ...weight
+        });
+      }
+      return undefined;
+    }
+    const reading = readBloodPressure(frame);
+    const key = reading?.recordedAt instanceof Date ? JSON.stringify(reading) : undefined;
+    if (reading && !(key && this.seen.has(key))) {
+      if (key) {
+        this.seen.add(key);
+      }
+      this.report({
+        measurementTypeKey: MeasurementTypeKey.bloodPressure,
+        ...reading
+      });
+    }
+    return undefined;
+  };
+  report = reading => {
+    this.recorded = true;
+    this.params.onResult({
+      caseType: CaseType.RESULT,
+      ...reading
+    });
+  };
+  now = () => this.params.now?.() ?? new Date();
+}
+export { AndMedicalSequencer };
+//# sourceMappingURL=and-medical.sequencer.js.map

package/lib/module/modules/bt-management/services/devices/and-medical/and-medical.sequencer.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["MeasurementTypeKey","CaseType","AND_MEDICAL","dateTimeCommand","readBloodPressure","readWeight","scaleSetTimeCommand","MONITOR_TIME_DELAY_MS","AndMedicalSequencer","recorded","seen","Set","constructor","params","initialCommands","now","kind","serviceUuid","commandService","characteristicUuid","command","frame","cts","currentTimeService","bloodPressureService","currentTime","dateTime","delayBeforeWriteMs","isNormalDisconnect","nextCommand","weight","report","measurementTypeKey","bodyWeight","undefined","reading","key","recordedAt","Date","JSON","stringify","has","add","bloodPressure","onResult","caseType","RESULT"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/and-medical/and-medical.sequencer.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/aoj/aoj-70b.device.js

@@ -0,0 +1,37 @@
+"use strict";
+
+import { BTManagedDevice } from "../bt-managed-device.js";
+import { AOJ_VALUES, LiveOximeterSequencer, readOximeterData } from "../live-oximeter.sequencer.js";
+import { AOJ_BP } from "./aoj-bp.protocol.js";
+const aoj70bMainServices = [{
+  uuid: AOJ_BP.service,
+  monitorUuids: [{
+    uuid: AOJ_BP.notify,
+    parsingModel: {
+      caseValuePosition: [],
+      cases: []
+    }
+  }]
+}];
+
+/** The AOJ-70A/70B pulse oximeter: live values only, reported as one spot reading. */
+class Aoj70bDevice extends BTManagedDevice {
+  mainServices = aoj70bMainServices;
+  stuckDataTimeout = 120_000;
+  onStreamStart = undefined;
+  constructor(device, params) {
+    super(device, params);
+    this.createCommandSequencer = () => new LiveOximeterSequencer({
+      readValues: frame => readOximeterData(frame, AOJ_VALUES),
+      onResult: result => this.onResult?.(result)
+    });
+  }
+
+  /** One notification is one packet. */
+  validatePackage = () => true;
+  handleSuccessResult() {
+    return;
+  }
+}
+export { Aoj70bDevice };
+//# sourceMappingURL=aoj-70b.device.js.map

package/lib/module/modules/bt-management/services/devices/aoj/aoj-70b.device.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["BTManagedDevice","AOJ_VALUES","LiveOximeterSequencer","readOximeterData","AOJ_BP","aoj70bMainServices","uuid","service","monitorUuids","notify","parsingModel","caseValuePosition","cases","Aoj70bDevice","mainServices","stuckDataTimeout","onStreamStart","undefined","constructor","device","params","createCommandSequencer","readValues","frame","onResult","result","validatePackage","handleSuccessResult"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj-70b.device.ts"],"mappings":";;AAOA,SAASA,eAAe,QAAQ,yBAAsB;AACtD,SAASC,UAAU,EAAEC,qBAAqB,EAAEC,gBAAgB,QAAQ,+BAA4B;AAEhG,SAASC,MAAM,QAAQ,sBAAmB;AAE1C,MAAMC,kBAA8B,GAAG,CACrC;EACEC,IAAI,EAAEF,MAAM,CAACG,OAAO;EACpBC,YAAY,EAAE,CAAC;IAAEF,IAAI,EAAEF,MAAM,CAACK,MAAM;IAAEC,YAAY,EAAE;MAAEC,iBAAiB,EAAE,EAAE;MAAEC,KAAK,EAAE;IAAG;EAAE,CAAC;AAC5F,CAAC,CACF;;AAED;AACA,MAAMC,YAAY,SAASb,eAAe,CAA4B;EAC1Dc,YAAY,GAAGT,kBAAkB;EACjCU,gBAAgB,GAAG,OAAO;EAC1BC,aAAa,GAAGC,SAAS;EAE5BC,WAAWA,CAACC,MAAc,EAAEC,MAAqD,EAAE;IACxF,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IACrB,IAAI,CAACC,sBAAsB,GAAG,MAC5B,IAAInB,qBAAqB,CAAC;MACxBoB,UAAU,EAAGC,KAAK,IAAKpB,gBAAgB,CAACoB,KAAK,EAAEtB,UAAU,CAAC;MAC1DuB,QAAQ,EAAGC,MAAM,IACf,IAAI,CAACD,QAAQ,GACXC,MAGF;IACJ,CAAC,CAAC;EACN;;EAEA;EACUC,eAAe,GAAGA,CAAA,KAAe,IAAI;EAErCC,mBAAmBA,CAAA,EAAS;IACpC;EACF;AACF;AAEA,SAASd,YAAY","ignoreList":[]}

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

@@ -0,0 +1,41 @@
+"use strict";
+
+import { IntegratedDevices } from "../../../types/integrated-devices.js";
+import { BTManagedDevice } from "../bt-managed-device.js";
+import { AOJ_BP, AOJ_BP_FFF0, AojBpFrameReader } from "./aoj-bp.protocol.js";
+import { AojBpSequencer } from "./aoj-bp.sequencer.js";
+const passThrough = {
+  caseValuePosition: [],
+  cases: []
+};
+const servicesFor = gatt => [{
+  uuid: gatt.service,
+  monitorUuids: [{
+    uuid: gatt.notify,
+    parsingModel: passThrough
+  }]
+}];
+
+/** AOJ Medical blood-pressure monitors; the FFF0 variant is the Cazon BSX530B. */
+class AojBpDeviceClass extends BTManagedDevice {
+  stuckDataTimeout = 90_000;
+  onStreamStart = undefined;
+  constructor(device, params) {
+    super(device, params);
+    const fff0 = params.deviceName === IntegratedDevices.AOJ_BPM_FFF0;
+    const gatt = fff0 ? AOJ_BP_FFF0 : AOJ_BP;
+    this.mainServices = servicesFor(gatt);
+    this.frameReader = new AojBpFrameReader();
+    this.createCommandSequencer = () => new AojBpSequencer({
+      service: gatt.service,
+      write: gatt.write,
+      listenOnly: fff0,
+      onResult: result => this.onResult?.(result)
+    });
+  }
+  handleSuccessResult() {
+    return;
+  }
+}
+export { AojBpDeviceClass as AojBpDevice };
+//# sourceMappingURL=aoj-bp.device.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["IntegratedDevices","BTManagedDevice","AOJ_BP","AOJ_BP_FFF0","AojBpFrameReader","AojBpSequencer","passThrough","caseValuePosition","cases","servicesFor","gatt","uuid","service","monitorUuids","notify","parsingModel","AojBpDeviceClass","stuckDataTimeout","onStreamStart","undefined","constructor","device","params","fff0","deviceName","AOJ_BPM_FFF0","mainServices","frameReader","createCommandSequencer","write","listenOnly","onResult","result","handleSuccessResult","AojBpDevice"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj-bp.device.ts"],"mappings":";;AAIA,SAASA,iBAAiB,QAAQ,sCAAmC;AAGrE,SAASC,eAAe,QAAQ,yBAAsB;AAEtD,SAASC,MAAM,EAAEC,WAAW,EAAEC,gBAAgB,QAAQ,sBAAmB;AACzE,SAASC,cAAc,QAAQ,uBAAoB;AAInD,MAAMC,WAAW,GAAG;EAAEC,iBAAiB,EAAE,EAAE;EAAEC,KAAK,EAAE;AAAG,CAAC;AAExD,MAAMC,WAAW,GAAIC,IAAyC,IAAiB,CAC7E;EAAEC,IAAI,EAAED,IAAI,CAACE,OAAO;EAAEC,YAAY,EAAE,CAAC;IAAEF,IAAI,EAAED,IAAI,CAACI,MAAM;IAAEC,YAAY,EAAET;EAAY,CAAC;AAAE,CAAC,CACzF;;AAED;AACA,MAAMU,gBAAgB,SAASf,eAAe,CAAc;EAEhDgB,gBAAgB,GAAG,MAAM;EACzBC,aAAa,GAAGC,SAAS;EAE5BC,WAAWA,CAACC,MAAc,EAAEC,MAAuC,EAAE;IAC1E,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;IAErB,MAAMC,IAAI,GAAGD,MAAM,CAACE,UAAU,KAAKxB,iBAAiB,CAACyB,YAAY;IACjE,MAAMf,IAAI,GAAGa,IAAI,GAAGpB,WAAW,GAAGD,MAAM;IAExC,IAAI,CAACwB,YAAY,GAAGjB,WAAW,CAACC,IAAI,CAAC;IACrC,IAAI,CAACiB,WAAW,GAAG,IAAIvB,gBAAgB,CAAC,CAAC;IACzC,IAAI,CAACwB,sBAAsB,GAAG,MAC5B,IAAIvB,cAAc,CAAC;MACjBO,OAAO,EAAEF,IAAI,CAACE,OAAO;MACrBiB,KAAK,EAAEnB,IAAI,CAACmB,KAAK;MACjBC,UAAU,EAAEP,IAAI;MAChBQ,QAAQ,EAAGC,MAAM,IACf,IAAI,CAACD,QAAQ,GACXC,MACF;IACJ,CAAC,CAAC;EACN;EAEUC,mBAAmBA,CAAA,EAAS;IACpC;EACF;AACF;AAEA,SAASjB,gBAAgB,IAAIkB,WAAW","ignoreList":[]}

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

@@ -0,0 +1,123 @@
+"use strict";
+
+/* eslint-disable import/group-exports */
+
+import { FrameReadStatus } from "../../../types/frame-read-status.js";
+import { calculateCrc8Maxim } from "../../../utils/calculate-crc-8-maxim.js";
+import { hexToByte } from "../../../utils/hex-to-byte.js";
+
+/**
+ * AOJ Medical's blood-pressure protocol (AOJ-30x/33x, ARM-111, WRS-35E and rebrands), from
+ * MedM Health Diary 3.12.11's `CAOJMedical_BPM`. It is not the AOJ-20A thermometer's framing.
+ *
+ * Frames are `BE B0` (app to device) or `D0 C2` (device to app), a length counting the command
+ * and payload, the command, the payload, and CRC-8/MAXIM over every byte before it.
+ */
+const sig16 = assigned => `0000${assigned}-0000-1000-8000-00805f9b34fb`;
+export const AOJ_BP = {
+  service: sig16("ffe0"),
+  notify: sig16("ffe1"),
+  write: sig16("ffe2")
+};
+
+/** The Cazon BSX530B variant: one characteristic for both directions, and a listen-only session. */
+export const AOJ_BP_FFF0 = {
+  service: sig16("fff0"),
+  notify: sig16("fff6"),
+  write: sig16("fff6")
+};
+export const AOJ_COMMAND = {
+  ack: 0x00,
+  serial: 0xd6,
+  systemInfo: 0xd8,
+  voice: 0xd9,
+  record: 0xcc
+};
+const DEVICE_HEADER = [0xd0, 0xc2];
+const toHex = bytes => bytes.map(value => (value & 0xff).toString(16).padStart(2, "0"));
+export const frame = (command, payload = []) => {
+  const bytes = toHex([0xbe, 0xb0, payload.length + 1, command, ...payload]);
+  return [...bytes, ...toHex([calculateCrc8Maxim(bytes, bytes.length)])];
+};
+export const commandOf = received => hexToByte(received[3] ?? "00");
+export const payloadOf = received => received.slice(4, -1).map(byte => hexToByte(byte));
+export const updateStatusCommand = () => frame(0xb2);
+export const setTimeCommand = now => frame(0xb1, [now.getFullYear() >> 8, now.getFullYear() & 0xff, now.getMonth() + 1, now.getDate(), now.getHours(), now.getMinutes(), now.getSeconds()]);
+export const getSerialCommand = () => frame(0xd6, [0x00]);
+export const getSystemInfoCommand = () => frame(0xd8);
+
+/** Voice off: the SDK has no setting for spoken readings. */
+export const setVoiceCommand = () => frame(0xd9, [0x03, 0x00]);
+
+/** `D7 FF 01`: send stored records for every user. */
+export const getDataCommand = () => frame(0xd7, [0xff, 0x01]);
+export const ackCommand = () => frame(0x00, [0x00]);
+export const turnOffCommand = () => frame(0xd0);
+
+/** Isolates `D0 C2` frames whatever the notification boundaries. */
+export class AojBpFrameReader {
+  readFrame(buffer) {
+    const start = buffer.findIndex((byte, index) => hexToByte(byte) === DEVICE_HEADER[0] && (index + 1 >= buffer.length || hexToByte(buffer[index + 1] ?? "00") === DEVICE_HEADER[1]));
+    if (start === -1) {
+      return {
+        status: FrameReadStatus.INCOMPLETE,
+        consumedBytes: buffer.length
+      };
+    }
+    if (start + 3 > buffer.length) {
+      return {
+        status: FrameReadStatus.INCOMPLETE,
+        consumedBytes: start
+      };
+    }
+    const length = hexToByte(buffer[start + 2] ?? "00") + 4;
+    if (start + length > buffer.length) {
+      return {
+        status: FrameReadStatus.INCOMPLETE,
+        consumedBytes: start
+      };
+    }
+    const received = buffer.slice(start, start + length);
+    if (calculateCrc8Maxim(received, length - 1) !== hexToByte(received[length - 1] ?? "00")) {
+      return {
+        status: FrameReadStatus.CORRUPT,
+        consumedBytes: start + 1
+      };
+    }
+    return {
+      status: FrameReadStatus.COMPLETE,
+      consumedBytes: start + length,
+      frame: received
+    };
+  }
+}
+
+/** `D8`: the unsent-record counts for users 1 and 2, used to know when the upload is done. */
+export const readUnsentCount = payload => (payload[4] ?? 0) + (payload[5] ?? 0);
+/**
+ * `CC`: systolic, diastolic and pulse (mmHg, bpm), flags (bit 0 irregular heartbeat, top nibble
+ * the user), then `YYYY MM DD hh mm ss` local time. Diastolic, pulse and flags all zero is an
+ * error record whose first byte is the error code; a zero year means the clock was never set.
+ */
+export const readBloodPressure = payload => {
+  if (payload.length < 11) {
+    return undefined;
+  }
+  const [systolic = 0, diastolic = 0, heartRate = 0, flags = 0] = payload;
+  const year = (payload[4] ?? 0) << 8 | (payload[5] ?? 0);
+  if (diastolic === 0 && heartRate === 0 && flags === 0 || year === 0) {
+    return undefined;
+  }
+  const user = flags >> 4;
+  return {
+    systolic,
+    diastolic,
+    heartRate,
+    irregularHeartbeat: (flags & 0x01) !== 0,
+    recordedAt: new Date(year, (payload[6] ?? 1) - 1, payload[7] ?? 1, payload[8] ?? 0, payload[9] ?? 0, payload[10] ?? 0),
+    ...(user > 0 ? {
+      memorySlot: user
+    } : {})
+  };
+};
+//# sourceMappingURL=aoj-bp.protocol.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["FrameReadStatus","calculateCrc8Maxim","hexToByte","sig16","assigned","AOJ_BP","service","notify","write","AOJ_BP_FFF0","AOJ_COMMAND","ack","serial","systemInfo","voice","record","DEVICE_HEADER","toHex","bytes","map","value","toString","padStart","frame","command","payload","length","commandOf","received","payloadOf","slice","byte","updateStatusCommand","setTimeCommand","now","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","getSerialCommand","getSystemInfoCommand","setVoiceCommand","getDataCommand","ackCommand","turnOffCommand","AojBpFrameReader","readFrame","buffer","start","findIndex","index","status","INCOMPLETE","consumedBytes","CORRUPT","COMPLETE","readUnsentCount","readBloodPressure","undefined","systolic","diastolic","heartRate","flags","year","user","irregularHeartbeat","recordedAt","Date","memorySlot"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj-bp.protocol.ts"],"mappings":"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","ignoreList":[]}

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

@@ -0,0 +1,134 @@
+"use strict";
+
+import { MeasurementTypeKey } from "@ovok/core";
+import { CaseType } from "../../../types/case-type.js";
+import { ackCommand, AOJ_COMMAND, commandOf, getDataCommand, getSerialCommand, getSystemInfoCommand, payloadOf, readBloodPressure, readUnsentCount, setTimeCommand, setVoiceCommand, turnOffCommand, updateStatusCommand } from "./aoj-bp.protocol.js";
+/** MedM re-sends the time every 5 s, five times, then turns the monitor off. */
+const TIME_RETRY_MS = 5_000;
+const TIME_ATTEMPTS = 5;
+const SYSTEM_INFO_RETRY_MS = 2_000;
+
+/** Quiet time after the last record before the monitor is turned off. */
+const END_AFTER_MS = 30_000;
+
+/**
+ * The AOJ blood-pressure session: status, time, serial, system info, voice, then "send stored
+ * data", acknowledging every record. Records stay on the monitor - the SDK never sends MedM's
+ * optional delete - and the monitor is turned off after the upload goes quiet.
+ */
+class AojBpSequencer {
+  phase = "time";
+  timeAttempts = 0;
+  recorded = false;
+  turnedOff = false;
+  unsent = 0;
+  constructor(params) {
+    this.params = params;
+  }
+  initialCommands = () => {
+    if (this.params.listenOnly) {
+      this.phase = "data";
+      return [];
+    }
+    this.timeAttempts = 1;
+    return [this.command(updateStatusCommand()), this.command(setTimeCommand(this.now()), 1_000)];
+  };
+  isNormalDisconnect = () => this.turnedOff || this.recorded;
+  commandTimeoutMs = () => {
+    switch (this.phase) {
+      case "time":
+        return this.params.listenOnly ? undefined : TIME_RETRY_MS;
+      case "system-info":
+        return SYSTEM_INFO_RETRY_MS;
+      case "data":
+        return this.recorded && !this.params.listenOnly ? END_AFTER_MS : undefined;
+      default:
+        return undefined;
+    }
+  };
+  onCommandTimeout = () => {
+    if (this.phase === "time") {
+      if (this.timeAttempts >= TIME_ATTEMPTS) {
+        return this.turnOff();
+      }
+      this.timeAttempts += 1;
+      return {
+        commands: [this.command(setTimeCommand(this.now()))]
+      };
+    }
+    if (this.phase === "system-info") {
+      return {
+        commands: [this.command(getSystemInfoCommand())]
+      };
+    }
+    return this.phase === "data" ? this.turnOff() : {};
+  };
+  commandProgress = frame => commandOf(frame) === AOJ_COMMAND.record ? "partial" : "complete";
+  nextCommand = frame => {
+    const command = commandOf(frame);
+    if (command === AOJ_COMMAND.record) {
+      return this.record(payloadOf(frame));
+    }
+    if (this.phase === "time" && command === AOJ_COMMAND.ack) {
+      this.phase = "serial";
+      return [this.command(getSerialCommand())];
+    }
+    if (this.phase === "serial" && command === AOJ_COMMAND.serial) {
+      this.phase = "system-info";
+      return [this.command(getSystemInfoCommand())];
+    }
+    if (this.phase === "system-info" && command === AOJ_COMMAND.systemInfo) {
+      this.unsent = readUnsentCount(payloadOf(frame));
+      this.phase = "voice";
+      return [this.command(setVoiceCommand())];
+    }
+    if (this.phase === "voice" && command === AOJ_COMMAND.voice) {
+      this.phase = "data";
+      return [this.command(getDataCommand())];
+    }
+    return undefined;
+  };
+  record = payload => {
+    this.unsent -= 1;
+    const reading = readBloodPressure(payload);
+
+    // MedM acknowledges only a readable record; an error record is left unanswered.
+    if (!reading) {
+      return undefined;
+    }
+    this.recorded = true;
+    this.params.onResult({
+      caseType: CaseType.RESULT,
+      measurementTypeKey: MeasurementTypeKey.bloodPressure,
+      systolic: reading.systolic,
+      diastolic: reading.diastolic,
+      heartRate: reading.heartRate,
+      recordedAt: reading.recordedAt,
+      ...(reading.memorySlot ? {
+        memorySlot: reading.memorySlot
+      } : {}),
+      ...(reading.irregularHeartbeat ? {
+        irregularHeartbeat: true
+      } : {})
+    });
+    return [this.command(ackCommand())];
+  };
+  turnOff = () => {
+    this.phase = "done";
+    this.turnedOff = true;
+    return {
+      commands: [this.command(turnOffCommand())]
+    };
+  };
+  now = () => this.params.now?.() ?? new Date();
+  command = (frame, delayBeforeWriteMs) => ({
+    serviceUuid: this.params.service,
+    characteristicUuid: this.params.write,
+    frame,
+    ...(delayBeforeWriteMs ? {
+      delayBeforeWriteMs
+    } : {})
+  });
+}
+export { AojBpSequencer };
+//# sourceMappingURL=aoj-bp.sequencer.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["MeasurementTypeKey","CaseType","ackCommand","AOJ_COMMAND","commandOf","getDataCommand","getSerialCommand","getSystemInfoCommand","payloadOf","readBloodPressure","readUnsentCount","setTimeCommand","setVoiceCommand","turnOffCommand","updateStatusCommand","TIME_RETRY_MS","TIME_ATTEMPTS","SYSTEM_INFO_RETRY_MS","END_AFTER_MS","AojBpSequencer","phase","timeAttempts","recorded","turnedOff","unsent","constructor","params","initialCommands","listenOnly","command","now","isNormalDisconnect","commandTimeoutMs","undefined","onCommandTimeout","turnOff","commands","commandProgress","frame","record","nextCommand","ack","serial","systemInfo","voice","payload","reading","onResult","caseType","RESULT","measurementTypeKey","bloodPressure","systolic","diastolic","heartRate","recordedAt","memorySlot","irregularHeartbeat","Date","delayBeforeWriteMs","serviceUuid","service","characteristicUuid","write"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj-bp.sequencer.ts"],"mappings":"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","ignoreList":[]}

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

@@ -5,17 +5,17 @@ import { CaseType } from "../../../types/case-type.js";
 import { IntegratedDevices } from "../../../types/integrated-devices.js";
 import { hexToByte } from "../../../utils/hex-to-byte.js";
 import { BTManagedDevice } from "../bt-managed-device.js";
-const LEGACY_SERVICE = "00001523-1212-efde-1523-785feabcd123";
-const LEGACY_CHARACTERISTIC = "00001524-1212-efde-1523-785feabcd123";
+import { TAIDOC, TAIDOC_CHARACTERISTIC, TAIDOC_SERVICE, taidocCommand } from "../taidoc/taidoc.protocol.js";
+import { isPatientGlucoseRecord } from "../taidoc/taidoc.records.js";
 const BGM_SERVICE = "0003cdd0-0000-1000-8000-00805f9b0131";
 const BGM_CHARACTERISTIC = "0003cdd1-0000-1000-8000-00805f9b0131";
-const GLUCOSE_REQUEST = "512600000000a31a";
+const GLUCOSE_REQUEST = taidocCommand(TAIDOC.readingResult).join("");
 const servicesFor = device => {
   const isBgm = device === IntegratedDevices.BGM;
   return [{
-    uuid: isBgm ? BGM_SERVICE : LEGACY_SERVICE,
+    uuid: isBgm ? BGM_SERVICE : TAIDOC_SERVICE,
     monitorUuids: [{
-      uuid: isBgm ? BGM_CHARACTERISTIC : LEGACY_CHARACTERISTIC,
+      uuid: isBgm ? BGM_CHARACTERISTIC : TAIDOC_CHARACTERISTIC,
       parsingModel: {
         caseValuePosition: [isBgm ? 9 : 1],
         cases: [...(isBgm ? ["00", "0b", "10", "11", "18", "22", "33", "55"] : ["46", ...(device === IntegratedDevices.GLUCOCHECK ? ["50"] : [])]).map(caseValue => ({
@@ -44,7 +44,7 @@ const servicesFor = device => {
     }],
     ...(isBgm ? {} : {
       writeUuid: {
-        uuid: LEGACY_CHARACTERISTIC,
+        uuid: TAIDOC_CHARACTERISTIC,
         mainCommandUuid: GLUCOSE_REQUEST
       }
     })
@@ -59,10 +59,15 @@ export class BloodGlucoseDevice extends BTManagedDevice {
     this.mainServices = servicesFor(params.deviceName);
   }
   validatePackage = pkg => pkg.length >= (this.deviceData.name === IntegratedDevices.BGM ? 12 : 8);
-  handleSuccessResult(result) {
+  handleSuccessResult(result, frame) {
     if (result.caseType !== CaseType.RESULT || result.bloodGlucose === 0) {
       return;
     }
+
+    // A ketone, cholesterol or control-solution record decodes to a number too; it is not glucose.
+    if (this.deviceData.name !== IntegratedDevices.BGM && !isPatientGlucoseRecord(frame)) {
+      return;
+    }
     this.onResult?.(result);
   }
 }