@ovok/native 1.6.55 → 1.8.0

package/lib/module/modules/bt-management/services/devices/trasense/s9-advertisement.js

@@ -0,0 +1,26 @@
+"use strict";
+
+import { base64ToHex } from "../../../utils/base-64-to-hex.js";
+import { hexToByte } from "../../../utils/hex-to-byte.js";
+const NAME = "S9";
+const COMPANY_ID = [0x0a, 0x0a];
+const PAYLOAD_LENGTH = 18;
+
+/**
+ * The SH09 reuses company ID 0x0A0A and advertises only as "S9". Require both
+ * fields and the exact manufacturer payload length; the name alone is ambiguous.
+ * react-native-ble-plx exposes the manufacturer-specific bytes as base64, including
+ * the two company-ID bytes at the start of the AD structure.
+ */
+export const isTrasenseS9Advertisement = (advertisedName, manufacturerData) => {
+  if (advertisedName !== NAME || !manufacturerData) {
+    return false;
+  }
+  try {
+    const bytes = base64ToHex(manufacturerData).map(hexToByte);
+    return bytes.length === PAYLOAD_LENGTH + COMPANY_ID.length && bytes[0] === COMPANY_ID[0] && bytes[1] === COMPANY_ID[1];
+  } catch {
+    return false;
+  }
+};
+//# sourceMappingURL=s9-advertisement.js.map

package/lib/module/modules/bt-management/services/devices/trasense/s9-advertisement.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["base64ToHex","hexToByte","NAME","COMPANY_ID","PAYLOAD_LENGTH","isTrasenseS9Advertisement","advertisedName","manufacturerData","bytes","map","length"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/trasense/s9-advertisement.ts"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,kCAA+B;AAC3D,SAASC,SAAS,QAAQ,+BAA4B;AAEtD,MAAMC,IAAI,GAAG,IAAI;AACjB,MAAMC,UAAU,GAAG,CAAC,IAAI,EAAE,IAAI,CAAU;AACxC,MAAMC,cAAc,GAAG,EAAE;;AAEzB;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,yBAAyB,GAAGA,CACvCC,cAAsB,EACtBC,gBAAyB,KACb;EACZ,IAAID,cAAc,KAAKJ,IAAI,IAAI,CAACK,gBAAgB,EAAE;IAChD,OAAO,KAAK;EACd;EAEA,IAAI;IACF,MAAMC,KAAK,GAAGR,WAAW,CAACO,gBAAgB,CAAC,CAACE,GAAG,CAACR,SAAS,CAAC;IAE1D,OACEO,KAAK,CAACE,MAAM,KAAKN,cAAc,GAAGD,UAAU,CAACO,MAAM,IACnDF,KAAK,CAAC,CAAC,CAAC,KAAKL,UAAU,CAAC,CAAC,CAAC,IAC1BK,KAAK,CAAC,CAAC,CAAC,KAAKL,UAAU,CAAC,CAAC,CAAC;EAE9B,CAAC,CAAC,MAAM;IACN,OAAO,KAAK;EACd;AACF,CAAC","ignoreList":[]}

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

@@ -0,0 +1,22 @@
+"use strict";
+
+import { FrameReadStatus } from "../../../types/frame-read-status.js";
+const FRAME_LENGTH = 20;
+
+/** SH09 notifications are fixed-width, zero-padded 20-byte replies. */
+export class S9FrameReader {
+  readFrame(buffer) {
+    if (buffer.length < FRAME_LENGTH) {
+      return {
+        status: FrameReadStatus.INCOMPLETE,
+        consumedBytes: 0
+      };
+    }
+    return {
+      status: FrameReadStatus.COMPLETE,
+      consumedBytes: FRAME_LENGTH,
+      frame: buffer.slice(0, FRAME_LENGTH)
+    };
+  }
+}
+//# sourceMappingURL=s9-frame-reader.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["FrameReadStatus","FRAME_LENGTH","S9FrameReader","readFrame","buffer","length","status","INCOMPLETE","consumedBytes","COMPLETE","frame","slice"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/trasense/s9-frame-reader.ts"],"mappings":";;AACA,SAASA,eAAe,QAAQ,qCAAkC;AAGlE,MAAMC,YAAY,GAAG,EAAE;;AAEvB;AACA,OAAO,MAAMC,aAAa,CAAwB;EACzCC,SAASA,CAACC,MAAyB,EAAmB;IAC3D,IAAIA,MAAM,CAACC,MAAM,GAAGJ,YAAY,EAAE;MAChC,OAAO;QAAEK,MAAM,EAAEN,eAAe,CAACO,UAAU;QAAEC,aAAa,EAAE;MAAE,CAAC;IACjE;IAEA,OAAO;MACLF,MAAM,EAAEN,eAAe,CAACS,QAAQ;MAChCD,aAAa,EAAEP,YAAY;MAC3BS,KAAK,EAAEN,MAAM,CAACO,KAAK,CAAC,CAAC,EAAEV,YAAY;IACrC,CAAC;EACH;AACF","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/trasense/s9.command-sequencer.js

@@ -0,0 +1,336 @@
+"use strict";
+
+/* eslint-disable max-lines */
+
+import { MeasurementTypeKey } from "@ovok/core";
+import { CaseType } from "../../../types/case-type.js";
+import { getClockParts } from "../../../types/clock-sync.js";
+import { hexToByte } from "../../../utils/hex-to-byte.js";
+const TRASENSE_S9_SERVICE = "0000fff0-0000-1000-8000-00805f9b34fb";
+const TRASENSE_S9_WRITE = "0000fff1-0000-1000-8000-00805f9b34fb";
+const TRASENSE_S9_NOTIFY = "0000fff2-0000-1000-8000-00805f9b34fb";
+const RESPONSE = {
+  identity: 0xf0,
+  address: 0x88,
+  clock: 0x81,
+  historyIndex: 0x90,
+  steps: 0x93,
+  heartRate: 0xd6,
+  battery: 0xb0
+};
+const HISTORY_HOURS = [0x00, 0x06, 0x0c, 0x12];
+const HISTORY_SLOTS = 7;
+const RESPONSE_TIMEOUT_MS = 3_000;
+const MAX_RESPONSE_RETRIES = 1;
+const MAX_HEART_RATE_POLLS = 12;
+const HEART_RATE_POLL_INTERVAL_MS = 1_000;
+const byte = value => (value & 0xff).toString(16).padStart(2, "0");
+const values = frame => frame.map(hexToByte);
+const command = (write, request, delayBeforeWriteMs) => ({
+  ...write,
+  frame: [...request, ...new Array(20 - request.length).fill(0)].map(byte),
+  ...(delayBeforeWriteMs === undefined ? {} : {
+    delayBeforeWriteMs
+  })
+});
+const decodeFirmware = frame => values(frame).slice(1).filter(value => value !== 0).map(value => String.fromCharCode(value)).join("").trim();
+const buildDateFromFirmware = firmware => {
+  const match = /^(\d{4})(\d{2})(\d{2})\.SH09(?:\.|$)/.exec(firmware);
+  if (!match) {
+    return undefined;
+  }
+  const date = {
+    year: Number(match[1]),
+    month: Number(match[2]),
+    day: Number(match[3])
+  };
+  return isValidDate(date) ? date : undefined;
+};
+const isValidDate = ({
+  year,
+  month,
+  day
+}) => {
+  const date = new Date(0);
+  date.setFullYear(year, month - 1, day);
+  return Number.isInteger(year) && Number.isInteger(month) && Number.isInteger(day) && month >= 1 && month <= 12 && day >= 1 && date.getFullYear() === year && date.getMonth() === month - 1 && date.getDate() === day;
+};
+const dateFromReply = frame => {
+  if (frame.length < 5) {
+    return undefined;
+  }
+  const date = {
+    year: (frame[1] ?? 0) * 100 + (frame[2] ?? 0),
+    month: frame[3] ?? 0,
+    day: frame[4] ?? 0
+  };
+  return isValidDate(date) ? date : undefined;
+};
+const isBefore = (left, right) => left.year < right.year || left.year === right.year && left.month < right.month || left.year === right.year && left.month === right.month && left.day < right.day;
+const dateAtHour = (date, hour, timezone) => {
+  const result = new Date(0);
+  if (timezone === "utc") {
+    result.setUTCFullYear(date.year, date.month - 1, date.day);
+    result.setUTCHours(hour, 0, 0, 0);
+  } else {
+    result.setFullYear(date.year, date.month - 1, date.day);
+    result.setHours(hour, 0, 0, 0);
+  }
+  return result;
+};
+const isResponseFor = (phase, frame) => {
+  const response = hexToByte(frame[0] ?? "00");
+  if (phase === "heart-rate") {
+    return response === RESPONSE.heartRate && hexToByte(frame[1] ?? "00") === 0x02;
+  }
+  switch (phase) {
+    case "identity":
+      return response === RESPONSE.identity;
+    case "address":
+      return response === RESPONSE.address;
+    case "clock":
+      return response === RESPONSE.clock;
+    case "history-index":
+      return response === RESPONSE.historyIndex;
+    case "steps":
+      return response === RESPONSE.steps;
+    case "battery":
+      return response === RESPONSE.battery;
+    case "done":
+      return false;
+  }
+};
+
+/** Runs only the SH09 commands verified on firmware image 1. */
+class S9CommandSequencer {
+  phase = "identity";
+  retries = 0;
+  firmware = "";
+  historyCount = 0;
+  historySlot = 0;
+  historyHourIndex = 0;
+  heartRatePolls = 0;
+  constructor(params) {
+    this.params = params;
+  }
+  initialCommands = () => [this.queue([0x70])];
+  isHistoryTransfer = () => true;
+  commandTimeoutMs = () => RESPONSE_TIMEOUT_MS;
+  commandProgress = frame => isResponseFor(this.phase, frame) ? "complete" : "ignored";
+  onCommandTimeout = () => {
+    if (this.pendingCommand && this.retries < MAX_RESPONSE_RETRIES) {
+      this.retries += 1;
+      return {
+        commands: [this.pendingCommand]
+      };
+    }
+    return {
+      terminal: true
+    };
+  };
+  nextCommand = frame => {
+    if (!isResponseFor(this.phase, frame)) {
+      return undefined;
+    }
+    this.pendingCommand = undefined;
+    this.retries = 0;
+    const response = values(frame);
+    switch (this.phase) {
+      case "identity":
+        return this.handleIdentity(frame);
+      case "address":
+        return this.handleAddress(response);
+      case "clock":
+        this.reportClockWrite();
+        return this.queueHistoryIndex();
+      case "history-index":
+        return this.handleHistoryIndex(response);
+      case "steps":
+        if (!this.handleSteps(response)) {
+          return undefined;
+        }
+        return this.queueNextStepsOrHeartRate();
+      case "heart-rate":
+        return this.handleHeartRate(response);
+      case "battery":
+        this.handleBattery(response);
+        this.finish();
+        return undefined;
+      case "done":
+        return undefined;
+    }
+  };
+  handleIdentity = frame => {
+    const firmware = decodeFirmware(frame);
+    if (!/(?:^|\.)SH09(?:\.|$)/.test(firmware)) {
+      this.params.onError(new Error("Trasense S9 identity check failed."));
+      this.finish();
+      return undefined;
+    }
+    this.firmware = firmware;
+    this.firmwareBuildDate = buildDateFromFirmware(firmware);
+    this.phase = "address";
+    return [this.queue([0x08])];
+  };
+  handleAddress = response => {
+    if (response.length < 7) {
+      this.params.onError(new Error("Trasense S9 address reply was incomplete."));
+      this.finish();
+      return undefined;
+    }
+    const addressBytes = response.slice(1, 7).reverse();
+    if (addressBytes.every(value => value === 0 || value === 0xff)) {
+      this.params.onError(new Error("Trasense S9 address reply was invalid."));
+      this.finish();
+      return undefined;
+    }
+    const hardwareAddress = addressBytes.map(byte).join(":").toUpperCase();
+    this.params.onIdentity(this.firmware, hardwareAddress);
+    this.params.onConnectionEvent({
+      kind: "device-identified"
+    });
+    return [this.queueClockOrHistoryIndex()];
+  };
+  queueClockOrHistoryIndex = () => {
+    const options = this.params.clockSync;
+    if (options?.enabled === false) {
+      return this.queueHistoryIndex()[0];
+    }
+    this.phase = "clock";
+    const now = options?.now?.() ?? new Date();
+
+    // SH09 has no time-zone setting; its clock and history are local wall time.
+    const parts = getClockParts(now, "local");
+    return this.queue([0x01, Math.floor(parts.year / 100), parts.year % 100, parts.month, parts.day, parts.hours, parts.minutes, parts.seconds, 0x00, 0x18], undefined, now);
+  };
+  reportClockWrite = () => {
+    const clockAt = this.clockAt ?? new Date();
+    this.params.onConnectionEvent({
+      kind: "clock-synchronized",
+      clockAt,
+      phoneUtcOffsetMinutes: -clockAt.getTimezoneOffset()
+    });
+  };
+  queueHistoryIndex = () => {
+    this.phase = "history-index";
+    return [this.queue([0x10])];
+  };
+  handleHistoryIndex = response => {
+    if (response.length < 7) {
+      this.params.onError(new Error("Trasense S9 history index was incomplete."));
+      this.finish();
+      return undefined;
+    }
+    const todaySlot = response[1] ?? 0;
+    const count = response[2] ?? 0;
+    if (count > HISTORY_SLOTS || todaySlot >= Math.max(count, 1)) {
+      this.params.onError(new Error("Trasense S9 history index was invalid."));
+      this.finish();
+      return undefined;
+    }
+    this.historyCount = count;
+    this.historySlot = 0;
+    this.historyHourIndex = 0;
+    if (count === 0 || !this.firmwareBuildDate) {
+      return this.queueHeartRate();
+    }
+    return this.queueSteps();
+  };
+  queueSteps = () => {
+    this.phase = "steps";
+    return [this.queue([0x13, this.historySlot, HISTORY_HOURS[this.historyHourIndex] ?? 0])];
+  };
+  handleSteps = response => {
+    const date = dateFromReply(response);
+    const hour = response[5] ?? -1;
+    const expectedHour = HISTORY_HOURS[this.historyHourIndex];
+    if (response.length < 18 || !date || hour !== expectedHour) {
+      this.params.onError(new Error("Trasense S9 steps reply was invalid."));
+      this.finish();
+      return false;
+    }
+    if (this.firmwareBuildDate && !isBefore(date, this.firmwareBuildDate)) {
+      for (let index = 0; index < 6; index += 1) {
+        const high = response[6 + index * 2] ?? 0;
+        const low = response[7 + index * 2] ?? 0;
+        const stepCount = high * 256 + low;
+        if (stepCount === 0xffff) {
+          continue;
+        }
+        const start = dateAtHour(date, hour + index, "local");
+        this.params.onResult({
+          caseType: CaseType.RESULT,
+          measurementTypeKey: MeasurementTypeKey.stepCount,
+          stepCount,
+          start,
+          end: new Date(start.getTime() + 60 * 60 * 1000)
+        });
+      }
+    }
+    return true;
+  };
+  queueNextStepsOrHeartRate = () => {
+    this.historyHourIndex += 1;
+    if (this.historyHourIndex >= HISTORY_HOURS.length) {
+      this.historyHourIndex = 0;
+      this.historySlot += 1;
+    }
+    if (this.historySlot < this.historyCount) {
+      return this.queueSteps();
+    }
+    return this.queueHeartRate();
+  };
+  queueHeartRate = () => {
+    this.phase = "heart-rate";
+    this.heartRatePolls = 0;
+    return [this.queue([0x56, 0x02])];
+  };
+  handleHeartRate = response => {
+    const heartRate = response[2] ?? 0;
+    if (heartRate >= 40 && heartRate <= 200) {
+      const recordedAt = this.params.clockSync?.now?.() ?? new Date();
+      this.params.onResult({
+        caseType: CaseType.RESULT,
+        measurementTypeKey: MeasurementTypeKey.heartRate,
+        heartRate,
+        start: recordedAt,
+        end: recordedAt
+      });
+      return this.queueBattery();
+    }
+    this.heartRatePolls += 1;
+    if (this.heartRatePolls < MAX_HEART_RATE_POLLS) {
+      return [this.queue([0x56, 0x02], HEART_RATE_POLL_INTERVAL_MS)];
+    }
+    return this.queueBattery();
+  };
+  queueBattery = () => {
+    this.phase = "battery";
+    return [this.queue([0x30])];
+  };
+  handleBattery = response => {
+    const level = response[1] ?? -1;
+    if (level < 0 || level > 5) {
+      return;
+    }
+    this.params.onConnectionEvent({
+      kind: "battery",
+      batteryLevel: level === 0 ? 5 : level * 20
+    });
+  };
+  queue = (request, delayBeforeWriteMs, clockAt) => {
+    this.pendingCommand = command(this.params.write, request, delayBeforeWriteMs);
+    this.retries = 0;
+    if (clockAt) {
+      this.clockAt = clockAt;
+    }
+    return this.pendingCommand;
+  };
+  finish = () => {
+    this.phase = "done";
+    this.pendingCommand = undefined;
+    this.params.onComplete();
+  };
+}
+export { S9CommandSequencer, TRASENSE_S9_NOTIFY, TRASENSE_S9_SERVICE, TRASENSE_S9_WRITE };
+//# sourceMappingURL=s9.command-sequencer.js.map

package/lib/module/modules/bt-management/services/devices/trasense/s9.command-sequencer.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["MeasurementTypeKey","CaseType","getClockParts","hexToByte","TRASENSE_S9_SERVICE","TRASENSE_S9_WRITE","TRASENSE_S9_NOTIFY","RESPONSE","identity","address","clock","historyIndex","steps","heartRate","battery","HISTORY_HOURS","HISTORY_SLOTS","RESPONSE_TIMEOUT_MS","MAX_RESPONSE_RETRIES","MAX_HEART_RATE_POLLS","HEART_RATE_POLL_INTERVAL_MS","byte","value","toString","padStart","values","frame","map","command","write","request","delayBeforeWriteMs","Array","length","fill","undefined","decodeFirmware","slice","filter","String","fromCharCode","join","trim","buildDateFromFirmware","firmware","match","exec","date","year","Number","month","day","isValidDate","Date","setFullYear","isInteger","getFullYear","getMonth","getDate","dateFromReply","isBefore","left","right","dateAtHour","hour","timezone","result","setUTCFullYear","setUTCHours","setHours","isResponseFor","phase","response","S9CommandSequencer","retries","historyCount","historySlot","historyHourIndex","heartRatePolls","constructor","params","initialCommands","queue","isHistoryTransfer","commandTimeoutMs","commandProgress","onCommandTimeout","pendingCommand","commands","terminal","nextCommand","handleIdentity","handleAddress","reportClockWrite","queueHistoryIndex","handleHistoryIndex","handleSteps","queueNextStepsOrHeartRate","handleHeartRate","handleBattery","finish","test","onError","Error","firmwareBuildDate","addressBytes","reverse","every","hardwareAddress","toUpperCase","onIdentity","onConnectionEvent","kind","queueClockOrHistoryIndex","options","clockSync","enabled","now","parts","Math","floor","hours","minutes","seconds","clockAt","phoneUtcOffsetMinutes","getTimezoneOffset","todaySlot","count","max","queueHeartRate","queueSteps","expectedHour","index","high","low","stepCount","start","onResult","caseType","RESULT","measurementTypeKey","end","getTime","recordedAt","queueBattery","level","batteryLevel","onComplete"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/trasense/s9.command-sequencer.ts"],"mappings":"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","ignoreList":[]}

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

@@ -0,0 +1,69 @@
+"use strict";
+
+import { MeasurementTypeKey } from "@ovok/core";
+import { CaseType } from "../../../types/case-type.js";
+import { BTManagedDevice } from "../bt-managed-device.js";
+import { S9FrameReader } from "./s9-frame-reader.js";
+import { S9CommandSequencer, TRASENSE_S9_NOTIFY, TRASENSE_S9_SERVICE, TRASENSE_S9_WRITE } from "./s9.command-sequencer.js";
+const acceptProtocolFrames = {
+  caseValuePosition: [],
+  cases: [{
+    caseValue: "",
+    caseType: CaseType.OTHER,
+    parseDefinitions: [],
+    description: "SH09 protocol frame handled by its command sequencer"
+  }]
+};
+const s9Services = [{
+  uuid: TRASENSE_S9_SERVICE,
+  writeUuid: {
+    uuid: TRASENSE_S9_SERVICE,
+    mainCommandUuid: TRASENSE_S9_WRITE
+  },
+  monitorUuids: [{
+    uuid: TRASENSE_S9_NOTIFY,
+    parsingModel: acceptProtocolFrames
+  }]
+}];
+const S9_SUPPORTED_MEASUREMENTS = [MeasurementTypeKey.stepCount, MeasurementTypeKey.heartRate];
+
+/** Trasense SH09. Its address and advertisement data are sensitive and never logged. */
+export class TrasenseS9Device extends BTManagedDevice {
+  mainServices = s9Services;
+  stuckDataTimeout = 120_000;
+  onStreamStart = undefined;
+  frameReader = new S9FrameReader();
+  constructor(device, params) {
+    super(device, params);
+
+    // Manufacturer data contains device health information; do not expose it in callbacks.
+    this.deviceData.manufacturerData = "";
+    this.createCommandSequencer = () => new S9CommandSequencer({
+      clockSync: params.clockSync,
+      write: {
+        serviceUuid: TRASENSE_S9_SERVICE,
+        characteristicUuid: TRASENSE_S9_WRITE
+      },
+      onResult: result => this.onResult?.(result),
+      onConnectionEvent: event => this.onConnectionEvent?.({
+        deviceData: this.deviceData,
+        ...event
+      }),
+      onIdentity: (_firmware, hardwareAddress) => {
+        this.deviceData.model = "SH09";
+        this.deviceData.hardwareAddress = hardwareAddress;
+      },
+      onError: error => this.onError?.(error),
+      onComplete: () => {
+        setTimeout(() => void this.disconnect(), 0);
+      }
+    });
+  }
+  getSupportedMeasurementTypeKeys() {
+    return [...S9_SUPPORTED_MEASUREMENTS];
+  }
+  handleSuccessResult() {
+    return;
+  }
+}
+//# sourceMappingURL=s9.device.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["MeasurementTypeKey","CaseType","BTManagedDevice","S9FrameReader","S9CommandSequencer","TRASENSE_S9_NOTIFY","TRASENSE_S9_SERVICE","TRASENSE_S9_WRITE","acceptProtocolFrames","caseValuePosition","cases","caseValue","caseType","OTHER","parseDefinitions","description","s9Services","uuid","writeUuid","mainCommandUuid","monitorUuids","parsingModel","S9_SUPPORTED_MEASUREMENTS","stepCount","heartRate","TrasenseS9Device","mainServices","stuckDataTimeout","onStreamStart","undefined","frameReader","constructor","device","params","deviceData","manufacturerData","createCommandSequencer","clockSync","write","serviceUuid","characteristicUuid","onResult","result","onConnectionEvent","event","onIdentity","_firmware","hardwareAddress","model","onError","error","onComplete","setTimeout","disconnect","getSupportedMeasurementTypeKeys","handleSuccessResult"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/trasense/s9.device.ts"],"mappings":";;AAAA,SAASA,kBAAkB,QAAQ,YAAY;AAG/C,SAASC,QAAQ,QAAQ,6BAA0B;AAKnD,SAASC,eAAe,QAAQ,yBAAsB;AAEtD,SAASC,aAAa,QAAQ,sBAAmB;AACjD,SACEC,kBAAkB,EAClBC,kBAAkB,EAClBC,mBAAmB,EACnBC,iBAAiB,QACZ,2BAAwB;AAE/B,MAAMC,oBAAoB,GAAG;EAC3BC,iBAAiB,EAAE,EAAE;EACrBC,KAAK,EAAE,CACL;IACEC,SAAS,EAAE,EAAE;IACbC,QAAQ,EAAEX,QAAQ,CAACY,KAAK;IACxBC,gBAAgB,EAAE,EAAE;IACpBC,WAAW,EAAE;EACf,CAAC;AAEL,CAAC;AAED,MAAMC,UAAsB,GAAG,CAC7B;EACEC,IAAI,EAAEX,mBAAmB;EACzBY,SAAS,EAAE;IACTD,IAAI,EAAEX,mBAAmB;IACzBa,eAAe,EAAEZ;EACnB,CAAC;EACDa,YAAY,EAAE,CACZ;IAAEH,IAAI,EAAEZ,kBAAkB;IAAEgB,YAAY,EAAEb;EAAqB,CAAC;AAEpE,CAAC,CACF;AAED,MAAMc,yBAAyB,GAAG,CAChCtB,kBAAkB,CAACuB,SAAS,EAC5BvB,kBAAkB,CAACwB,SAAS,CAC7B;;AAED;AACA,OAAO,MAAMC,gBAAgB,SAASvB,eAAe,CAAgC;EACzEwB,YAAY,GAAGV,UAAU;EACzBW,gBAAgB,GAAG,OAAO;EAC1BC,aAAa,GAAGC,SAAS;EACzBC,WAAW,GAAG,IAAI3B,aAAa,CAAC,CAAC;EAEpC4B,WAAWA,CAChBC,MAAc,EACdC,MAAyD,EACzD;IACA,KAAK,CAACD,MAAM,EAAEC,MAAM,CAAC;;IAErB;IACA,IAAI,CAACC,UAAU,CAACC,gBAAgB,GAAG,EAAE;IAErC,IAAI,CAACC,sBAAsB,GAAG,MAC5B,IAAIhC,kBAAkB,CAAC;MACrBiC,SAAS,EAAEJ,MAAM,CAACI,SAAS;MAC3BC,KAAK,EAAE;QACLC,WAAW,EAAEjC,mBAAmB;QAChCkC,kBAAkB,EAAEjC;MACtB,CAAC;MACDkC,QAAQ,EAAGC,MAAM,IAAK,IAAI,CAACD,QAAQ,GAAGC,MAAM,CAAC;MAC7CC,iBAAiB,EAAGC,KAAK,IACvB,IAAI,CAACD,iBAAiB,GAAG;QAAET,UAAU,EAAE,IAAI,CAACA,UAAU;QAAE,GAAGU;MAAM,CAAC,CAAC;MACrEC,UAAU,EAAEA,CAACC,SAAS,EAAEC,eAAe,KAAK;QAC1C,IAAI,CAACb,UAAU,CAACc,KAAK,GAAG,MAAM;QAC9B,IAAI,CAACd,UAAU,CAACa,eAAe,GAAGA,eAAe;MACnD,CAAC;MACDE,OAAO,EAAGC,KAAK,IAAK,IAAI,CAACD,OAAO,GAAGC,KAAK,CAAC;MACzCC,UAAU,EAAEA,CAAA,KAAM;QAChBC,UAAU,CAAC,MAAM,KAAK,IAAI,CAACC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC;MAC7C;IACF,CAAC,CAAC;EACN;EAEmBC,+BAA+BA,CAAA,EAAyB;IACzE,OAAO,CAAC,GAAGhC,yBAAyB,CAAC;EACvC;EAEUiC,mBAAmBA,CAAA,EAAmB;IAC9C;EACF;AACF","ignoreList":[]}

package/lib/module/modules/bt-management/types/clock-sync.js

@@ -38,6 +38,7 @@ export const clockSyncCapabilityForDevice = deviceName => {
       return "unsupported";
     case IntegratedDevices.GENIAL_T31:
     case IntegratedDevices.ZH_SG_A606:
+    case IntegratedDevices.TRASENSE_S9:
       return "supported";
     default:
       return "unknown";

package/lib/module/modules/bt-management/types/clock-sync.js.map

@@ -1 +1 @@
-{"version":3,"names":["IntegratedDevices","isClockSyncEnabled","options","enabled","getClockParts","date","timezone","year","getUTCFullYear","month","getUTCMonth","day","getUTCDate","hours","getUTCHours","minutes","getUTCMinutes","seconds","getUTCSeconds","milliseconds","getUTCMilliseconds","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","getMilliseconds","clockSyncCapabilityForDevice","deviceName","BC01","MYSENSE","VEROVAL_ECG","AOJ20A","BP2","VIATOM_R20","VIATOM_R200","VIATOM_BBSM_BS1","VEROVAL_ACTIVITY","GENIAL_T31","ZH_SG_A606"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/types/clock-sync.ts"],"mappings":";;AAAA;;AAEA,SAASA,iBAAiB,QAAQ,yBAAsB;AAkBxD,OAAO,MAAMC,kBAAkB,GAAIC,OAA0B,IAC3DA,OAAO,EAAEC,OAAO,KAAK,KAAK;AAE5B,OAAO,MAAMC,aAAa,GAAGA,CAC3BC,IAAU,EACVC,QAA2B,GAAG,OAAO,KAErCA,QAAQ,KAAK,KAAK,GACd;EACEC,IAAI,EAAEF,IAAI,CAACG,cAAc,CAAC,CAAC;EAC3BC,KAAK,EAAEJ,IAAI,CAACK,WAAW,CAAC,CAAC,GAAG,CAAC;EAC7BC,GAAG,EAAEN,IAAI,CAACO,UAAU,CAAC,CAAC;EACtBC,KAAK,EAAER,IAAI,CAACS,WAAW,CAAC,CAAC;EACzBC,OAAO,EAAEV,IAAI,CAACW,aAAa,CAAC,CAAC;EAC7BC,OAAO,EAAEZ,IAAI,CAACa,aAAa,CAAC,CAAC;EAC7BC,YAAY,EAAEd,IAAI,CAACe,kBAAkB,CAAC;AACxC,CAAC,GACD;EACEb,IAAI,EAAEF,IAAI,CAACgB,WAAW,CAAC,CAAC;EACxBZ,KAAK,EAAEJ,IAAI,CAACiB,QAAQ,CAAC,CAAC,GAAG,CAAC;EAC1BX,GAAG,EAAEN,IAAI,CAACkB,OAAO,CAAC,CAAC;EACnBV,KAAK,EAAER,IAAI,CAACmB,QAAQ,CAAC,CAAC;EACtBT,OAAO,EAAEV,IAAI,CAACoB,UAAU,CAAC,CAAC;EAC1BR,OAAO,EAAEZ,IAAI,CAACqB,UAAU,CAAC,CAAC;EAC1BP,YAAY,EAAEd,IAAI,CAACsB,eAAe,CAAC;AACrC,CAAC;;AAEP;AACA,OAAO,MAAMC,4BAA4B,GACvCC,UAAkB,IACM;EACxB,QAAQA,UAAU;IAChB,KAAK7B,iBAAiB,CAAC8B,IAAI;IAC3B,KAAK9B,iBAAiB,CAAC+B,OAAO;IAC9B,KAAK/B,iBAAiB,CAACgC,WAAW;IAClC,KAAKhC,iBAAiB,CAACiC,MAAM;IAC7B,KAAKjC,iBAAiB,CAACkC,GAAG;IAC1B,KAAKlC,iBAAiB,CAACmC,UAAU;IACjC,KAAKnC,iBAAiB,CAACoC,WAAW;IAClC,KAAKpC,iBAAiB,CAACqC,eAAe;MACpC,OAAO,WAAW;IACpB,KAAKrC,iBAAiB,CAACsC,gBAAgB;MACrC,OAAO,aAAa;IACtB,KAAKtC,iBAAiB,CAACuC,UAAU;IACjC,KAAKvC,iBAAiB,CAACwC,UAAU;MAC/B,OAAO,WAAW;IACpB;MACE,OAAO,SAAS;EACpB;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["IntegratedDevices","isClockSyncEnabled","options","enabled","getClockParts","date","timezone","year","getUTCFullYear","month","getUTCMonth","day","getUTCDate","hours","getUTCHours","minutes","getUTCMinutes","seconds","getUTCSeconds","milliseconds","getUTCMilliseconds","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","getMilliseconds","clockSyncCapabilityForDevice","deviceName","BC01","MYSENSE","VEROVAL_ECG","AOJ20A","BP2","VIATOM_R20","VIATOM_R200","VIATOM_BBSM_BS1","VEROVAL_ACTIVITY","GENIAL_T31","ZH_SG_A606","TRASENSE_S9"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/types/clock-sync.ts"],"mappings":";;AAAA;;AAEA,SAASA,iBAAiB,QAAQ,yBAAsB;AAkBxD,OAAO,MAAMC,kBAAkB,GAAIC,OAA0B,IAC3DA,OAAO,EAAEC,OAAO,KAAK,KAAK;AAE5B,OAAO,MAAMC,aAAa,GAAGA,CAC3BC,IAAU,EACVC,QAA2B,GAAG,OAAO,KAErCA,QAAQ,KAAK,KAAK,GACd;EACEC,IAAI,EAAEF,IAAI,CAACG,cAAc,CAAC,CAAC;EAC3BC,KAAK,EAAEJ,IAAI,CAACK,WAAW,CAAC,CAAC,GAAG,CAAC;EAC7BC,GAAG,EAAEN,IAAI,CAACO,UAAU,CAAC,CAAC;EACtBC,KAAK,EAAER,IAAI,CAACS,WAAW,CAAC,CAAC;EACzBC,OAAO,EAAEV,IAAI,CAACW,aAAa,CAAC,CAAC;EAC7BC,OAAO,EAAEZ,IAAI,CAACa,aAAa,CAAC,CAAC;EAC7BC,YAAY,EAAEd,IAAI,CAACe,kBAAkB,CAAC;AACxC,CAAC,GACD;EACEb,IAAI,EAAEF,IAAI,CAACgB,WAAW,CAAC,CAAC;EACxBZ,KAAK,EAAEJ,IAAI,CAACiB,QAAQ,CAAC,CAAC,GAAG,CAAC;EAC1BX,GAAG,EAAEN,IAAI,CAACkB,OAAO,CAAC,CAAC;EACnBV,KAAK,EAAER,IAAI,CAACmB,QAAQ,CAAC,CAAC;EACtBT,OAAO,EAAEV,IAAI,CAACoB,UAAU,CAAC,CAAC;EAC1BR,OAAO,EAAEZ,IAAI,CAACqB,UAAU,CAAC,CAAC;EAC1BP,YAAY,EAAEd,IAAI,CAACsB,eAAe,CAAC;AACrC,CAAC;;AAEP;AACA,OAAO,MAAMC,4BAA4B,GACvCC,UAAkB,IACM;EACxB,QAAQA,UAAU;IAChB,KAAK7B,iBAAiB,CAAC8B,IAAI;IAC3B,KAAK9B,iBAAiB,CAAC+B,OAAO;IAC9B,KAAK/B,iBAAiB,CAACgC,WAAW;IAClC,KAAKhC,iBAAiB,CAACiC,MAAM;IAC7B,KAAKjC,iBAAiB,CAACkC,GAAG;IAC1B,KAAKlC,iBAAiB,CAACmC,UAAU;IACjC,KAAKnC,iBAAiB,CAACoC,WAAW;IAClC,KAAKpC,iBAAiB,CAACqC,eAAe;MACpC,OAAO,WAAW;IACpB,KAAKrC,iBAAiB,CAACsC,gBAAgB;MACrC,OAAO,aAAa;IACtB,KAAKtC,iBAAiB,CAACuC,UAAU;IACjC,KAAKvC,iBAAiB,CAACwC,UAAU;IACjC,KAAKxC,iBAAiB,CAACyC,WAAW;MAChC,OAAO,WAAW;IACpB;MACE,OAAO,SAAS;EACpB;AACF,CAAC","ignoreList":[]}

package/lib/module/modules/bt-management/types/device-measurement-map.js.map

@@ -1 +1 @@
-{"version":3,"names":["IntegratedDevices"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/types/device-measurement-map.ts"],"mappings":";;AAiBA,SAASA,iBAAiB,QAAQ,yBAAsB;;AA2GxD;AACA;AACA;AACA","ignoreList":[]}
+{"version":3,"names":["IntegratedDevices"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/types/device-measurement-map.ts"],"mappings":";;AAiBA,SAASA,iBAAiB,QAAQ,yBAAsB;;AAkHxD;AACA;AACA;AACA","ignoreList":[]}

package/lib/module/modules/bt-management/types/integrated-devices.js

@@ -57,6 +57,7 @@ export let IntegratedDevices = /*#__PURE__*/function (IntegratedDevices) {
   IntegratedDevices["PF10AW_ME"] = "PF10AW-ME";
   IntegratedDevices["SA10AW_PU"] = "SA10AW-PU";
   IntegratedDevices["PF10BW_VE"] = "PF10BW-VE";
+  IntegratedDevices["TRASENSE_S9"] = "Trasense S9";
   return IntegratedDevices;
 }({});
 //# sourceMappingURL=integrated-devices.js.map

package/lib/module/modules/bt-management/types/integrated-devices.js.map

@@ -1 +1 @@
-{"version":3,"names":["IntegratedDevices"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/types/integrated-devices.ts"],"mappings":";;AAAA,WAAYA,iBAAiB,0BAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAA,OAAjBA,iBAAiB;AAAA","ignoreList":[]}
+{"version":3,"names":["IntegratedDevices"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/types/integrated-devices.ts"],"mappings":";;AAAA,WAAYA,iBAAiB,0BAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAA,OAAjBA,iBAAiB;AAAA","ignoreList":[]}

package/lib/module/modules/data-sync/index.js

@@ -9,5 +9,6 @@ export * from "./types/health-authorization-status.js";
 export * from "./types/health-sync-keys.js";
 export * from "./types/health-sync-batch-error.js";
 export * from "./hooks/use-health-import.js";
+export { HEALTH_DATA_CATALOG, getHealthDataCoding } from "./utils/health-data-catalog.js";
 export { HealthAuthorizationContext, useHealthAuthorization } from "./contexts/health-authorization-context.js";
 //# sourceMappingURL=index.js.map

package/lib/module/modules/data-sync/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["HealthAuthorizationContext","useHealthAuthorization"],"sourceRoot":"../../../../src","sources":["modules/data-sync/index.ts"],"mappings":";;AAAA,cAAc,2BAAwB;AACtC,cAAc,oCAAiC;AAC/C,cAAc,uDAAoD;AAClE,cAAc,0BAAuB;AACrC,cAAc,sCAAmC;AACjD,cAAc,wCAAqC;AACnD,cAAc,6BAA0B;AACxC,cAAc,oCAAiC;AAC/C,cAAc,8BAA2B;AACzC,SACEA,0BAA0B,EAC1BC,sBAAsB,QACjB,4CAAyC","ignoreList":[]}
+{"version":3,"names":["HEALTH_DATA_CATALOG","getHealthDataCoding","HealthAuthorizationContext","useHealthAuthorization"],"sourceRoot":"../../../../src","sources":["modules/data-sync/index.ts"],"mappings":";;AAAA,cAAc,2BAAwB;AACtC,cAAc,oCAAiC;AAC/C,cAAc,uDAAoD;AAClE,cAAc,0BAAuB;AACrC,cAAc,sCAAmC;AACjD,cAAc,wCAAqC;AACnD,cAAc,6BAA0B;AACxC,cAAc,oCAAiC;AAC/C,cAAc,8BAA2B;AACzC,SAASA,mBAAmB,EAAEC,mBAAmB,QAAQ,gCAA6B;AACtF,SACEC,0BAA0B,EAC1BC,sBAAsB,QACjB,4CAAyC","ignoreList":[]}

package/lib/module/modules/data-sync/services/base-health-sync-service.js

@@ -71,7 +71,7 @@ export class BaseHealthSyncService {
       if (!data) {
         continue;
       }
-      const latestValidStartDate = this.dataProcessor.getLatestValidStartDate(this.stateManager.latestObservationDates, data, getHealthDataMode(measurementTypeKey, data.mode));
+      const latestValidStartDate = this.dataProcessor.getLatestValidStartDate(this.stateManager.latestObservationDates, data, measurementTypeKey, getHealthDataMode(measurementTypeKey, data.mode));
       const totalCount = await this.dataProcessor.getTotalRecordsCountForType(measurementTypeKey, data, latestValidStartDate);
       this.progressManager.setTotalObservations(measurementTypeKey, totalCount);
     }
@@ -92,12 +92,13 @@ export class BaseHealthSyncService {
     }
   }
   async syncDataByType(measurementTypeKey, data) {
-    const latestValidStartDate = this.dataProcessor.getLatestValidStartDate(this.stateManager.latestObservationDates, data, getHealthDataMode(measurementTypeKey, data.mode));
+    const latestValidStartDate = this.dataProcessor.getLatestValidStartDate(this.stateManager.latestObservationDates, data, measurementTypeKey, getHealthDataMode(measurementTypeKey, data.mode));
     let hasMore = true;
     while (hasMore && !this.stateManager.shouldStopSync) {
       const {
         observationBodies,
         observationSyncIds,
+        deletedObservationSyncIds,
         hasMore: currentHasMore,
         anchors
       } = await this.dataProcessor.getObservationBodiesForType(measurementTypeKey, data, latestValidStartDate);
@@ -106,25 +107,30 @@ export class BaseHealthSyncService {
         break;
       }
       const entries = this.dataProcessor.generateObservationEntries(observationBodies, observationSyncIds, getHealthDataMode(measurementTypeKey, data.mode));
-      if (entries.length !== 0 && !this.stateManager.shouldStopSync) {
+      if ((entries.length !== 0 || deletedObservationSyncIds.length !== 0) && !this.stateManager.shouldStopSync) {
         try {
-          const startedAt = Date.now();
-          const result = await withSyncRetries(() => this.storageManager.saveObservations(entries), () => this.stateManager.shouldStopSync);
-          if (this.stateManager.shouldStopSync) {
-            return;
+          if (entries.length !== 0) {
+            const startedAt = Date.now();
+            const result = await withSyncRetries(() => this.storageManager.saveObservations(entries), () => this.stateManager.shouldStopSync);
+            if (this.stateManager.shouldStopSync) {
+              return;
+            }
+            const responseEntries = result.entry ?? [];
+            const savedCount = responseEntries.length ? responseEntries.filter(entry => entry.response?.status.startsWith("2")).length : entries.length;
+            const createdCount = responseEntries.filter(entry => entry.response?.status.startsWith("201")).length;
+            recordOvokMetric("ovok.health.samples.imported", createdCount, {
+              provider: this.getProviderName(),
+              measurementTypeKey
+            });
+            recordOvokDuration("ovok.measurement.save.duration", Date.now() - startedAt, {
+              provider: this.getProviderName()
+            });
+            this.stateManager.addResult(result);
+            this.progressManager.incrementSyncedObservations(measurementTypeKey, savedCount, createdCount);
+          }
+          if (deletedObservationSyncIds.length !== 0) {
+            await this.storageManager.deleteObservations(deletedObservationSyncIds, this.patientId);
           }
-          const responseEntries = result.entry ?? [];
-          const savedCount = responseEntries.length ? responseEntries.filter(entry => entry.response?.status.startsWith("2")).length : entries.length;
-          const createdCount = responseEntries.filter(entry => entry.response?.status.startsWith("201")).length;
-          recordOvokMetric("ovok.health.samples.imported", createdCount, {
-            provider: this.getProviderName(),
-            measurementTypeKey
-          });
-          recordOvokDuration("ovok.measurement.save.duration", Date.now() - startedAt, {
-            provider: this.getProviderName()
-          });
-          this.stateManager.addResult(result);
-          this.progressManager.incrementSyncedObservations(measurementTypeKey, savedCount, createdCount);
           this.storageManager.saveAnchors(anchors);
         } catch (error) {
           if (isSyncRetryCancelled(error) || this.stateManager.shouldStopSync) {