@ovok/native 1.16.1-rc.2 → 1.16.1-rc.4

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

@@ -11,6 +11,8 @@ const SERVICE = `0000ffe0${BASE_UUID_SUFFIX}`;
 const NOTIFY = `0000ffe1${BASE_UUID_SUFFIX}`;
 const WRITE = `0000ffe2${BASE_UUID_SUFFIX}`;
 const STUCK_TIMEOUT_MS = 120_000;
+
+/** Reads the recording time from a history frame, or `undefined` if it is not a valid date. */
 const parseRecordedAt = frame => {
   const year = 2000 + hexToByte(frame[5] ?? "00");
   const month = hexToByte(frame[6] ?? "00");
@@ -23,6 +25,8 @@ const parseRecordedAt = frame => {
   }
   return recordedAt;
 };
+
+/** Describes a temperature error code in words, or `undefined` for an unknown code. */
 const decodeAojError = code => {
   const messages = {
     225: "ambient temperature out of range",
@@ -71,6 +75,8 @@ const acceptEverything = {
     parseDefinitions: []
   }))]
 };
+
+/** The GATT service AOJ devices are monitored and written through. */
 const aojMainServices = [{
   uuid: SERVICE,
   monitorUuids: [{

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

@@ -1 +1 @@
-{"version":3,"names":["MeasurementTypeKey","CaseType","hexToByte","BTManagedDevice","AojCommandSequencer","AojFrameReader","aojCommandByte","BASE_UUID_SUFFIX","SERVICE","NOTIFY","WRITE","STUCK_TIMEOUT_MS","parseRecordedAt","frame","year","month","day","hours","minutes","recordedAt","Date","every","Number","isFinite","getFullYear","getMonth","getDate","getHours","getMinutes","undefined","decodeAojError","code","messages","acceptEverything","caseValuePosition","cases","caseValue","caseType","RESULT","measurementTypeKey","temperature","parseDefinitions","name","parseType","byteIndexes","customParserDefinition","value","parseInt","minLengthBytes","map","OTHER","aojMainServices","uuid","monitorUuids","parsingModel","writeUuid","mainCommandUuid","Aoj20aDevice","mainServices","stuckDataTimeout","frameReader","constructor","device","params","clearHistory","clearDeviceHistory","clockSync","createCommandSequencer","write","serviceUuid","characteristicUuid","handleSuccessResult","successResult","collectedValues","command","errorCode","message","onError","Error","onResult","recordingId","getTime"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj.device.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["MeasurementTypeKey","CaseType","hexToByte","BTManagedDevice","AojCommandSequencer","AojFrameReader","aojCommandByte","BASE_UUID_SUFFIX","SERVICE","NOTIFY","WRITE","STUCK_TIMEOUT_MS","parseRecordedAt","frame","year","month","day","hours","minutes","recordedAt","Date","every","Number","isFinite","getFullYear","getMonth","getDate","getHours","getMinutes","undefined","decodeAojError","code","messages","acceptEverything","caseValuePosition","cases","caseValue","caseType","RESULT","measurementTypeKey","temperature","parseDefinitions","name","parseType","byteIndexes","customParserDefinition","value","parseInt","minLengthBytes","map","OTHER","aojMainServices","uuid","monitorUuids","parsingModel","writeUuid","mainCommandUuid","Aoj20aDevice","mainServices","stuckDataTimeout","frameReader","constructor","device","params","clearHistory","clearDeviceHistory","clockSync","createCommandSequencer","write","serviceUuid","characteristicUuid","handleSuccessResult","successResult","collectedValues","command","errorCode","message","onError","Error","onResult","recordingId","getTime"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj.device.ts"],"mappings":"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","ignoreList":[]}

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

@@ -11,6 +11,7 @@ const CHECKSUM_BYTES = 1;
 
 /** Reads AOJ's `aa 01 command length payload xor` notifications. */
 class AojFrameReader {
+  /** Extracts the next complete frame from the notification buffer. */
   readFrame(buffer) {
     const start = this.findStart(buffer);
     if (start < 0) {
@@ -44,6 +45,8 @@ class AojFrameReader {
     return checksum === hexToByte(frame[checksumIndex] ?? "00");
   }
 }
+
+/** Reads the command byte of a frame. */
 const aojCommandByte = frame => hexToByte(frame[COMMAND_INDEX] ?? "00");
 export { AojFrameReader, aojCommandByte };
 //# sourceMappingURL=aoj.frame-reader.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["complete","corrupt","incomplete","noFrameStart","hexToByte","START","DEVICE_TYPE","COMMAND_INDEX","LENGTH_INDEX","HEADER_BYTES","CHECKSUM_BYTES","AojFrameReader","readFrame","buffer","start","findStart","payloadLength","frameLength","length","frame","slice","hasValidChecksum","index","toLowerCase","checksumIndex","checksum","aojCommandByte"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj.frame-reader.ts"],"mappings":";;AAEA,SAASA,QAAQ,EAAEC,OAAO,EAAEC,UAAU,EAAEC,YAAY,QAAQ,sCAAmC;AAC/F,SAASC,SAAS,QAAQ,+BAA4B;AAEtD,MAAMC,KAAK,GAAG,IAAI;AAClB,MAAMC,WAAW,GAAG,IAAI;AACxB,MAAMC,aAAa,GAAG,CAAC;AACvB,MAAMC,YAAY,GAAG,CAAC;AACtB,MAAMC,YAAY,GAAG,CAAC;AACtB,MAAMC,cAAc,GAAG,CAAC;;AAExB;AACA,MAAMC,cAAc,CAAwB;EACnCC,SAASA,CAACC,MAAyB,EAAmB;IAC3D,MAAMC,KAAK,GAAG,IAAI,CAACC,SAAS,CAACF,MAAM,CAAC;IAEpC,IAAIC,KAAK,GAAG,CAAC,EAAE;MACb,OAAOX,YAAY,CAACU,MAAM,CAAC;IAC7B;IAEA,MAAMG,aAAa,GAAGZ,SAAS,CAACS,MAAM,CAACC,KAAK,GAAGN,YAAY,CAAC,IAAI,IAAI,CAAC;IACrE,MAAMS,WAAW,GAAGR,YAAY,GAAGO,aAAa,GAAGN,cAAc;IAEjE,IAAII,KAAK,GAAGG,WAAW,GAAGJ,MAAM,CAACK,MAAM,EAAE;MACvC,OAAOhB,UAAU,CAACY,KAAK,CAAC;IAC1B;IAEA,MAAMK,KAAK,GAAGN,MAAM,CAACO,KAAK,CAACN,KAAK,EAAEA,KAAK,GAAGG,WAAW,CAAC;IAEtD,IAAI,CAAC,IAAI,CAACI,gBAAgB,CAACF,KAAK,CAAC,EAAE;MACjC,OAAOlB,OAAO,CAACa,KAAK,GAAG,CAAC,CAAC;IAC3B;IAEA,OAAOd,QAAQ,CAACmB,KAAK,EAAEL,KAAK,GAAGG,WAAW,CAAC;EAC7C;EAEQF,SAASA,CAACF,MAAyB,EAAU;IACnD,KAAK,IAAIS,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAG,CAAC,GAAGT,MAAM,CAACK,MAAM,EAAEI,KAAK,EAAE,EAAE;MACtD,IACET,MAAM,CAACS,KAAK,CAAC,EAAEC,WAAW,CAAC,CAAC,KAAKlB,KAAK,IACtCQ,MAAM,CAACS,KAAK,GAAG,CAAC,CAAC,EAAEC,WAAW,CAAC,CAAC,KAAKjB,WAAW,EAChD;QACA,OAAOgB,KAAK;MACd;IACF;IAEA,OAAO,CAAC,CAAC;EACX;EAEQD,gBAAgBA,CAACF,KAAwB,EAAW;IAC1D,MAAMK,aAAa,GAAGL,KAAK,CAACD,MAAM,GAAGR,cAAc;IACnD,IAAIe,QAAQ,GAAG,CAAC;IAEhB,KAAK,IAAIH,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGE,aAAa,EAAEF,KAAK,EAAE,EAAE;MAClDG,QAAQ,IAAIrB,SAAS,CAACe,KAAK,CAACG,KAAK,CAAC,IAAI,IAAI,CAAC;IAC7C;IAEA,OAAOG,QAAQ,KAAKrB,SAAS,CAACe,KAAK,CAACK,aAAa,CAAC,IAAI,IAAI,CAAC;EAC7D;AACF;AAEA,MAAME,cAAc,GAAIP,KAAwB,IAC9Cf,SAAS,CAACe,KAAK,CAACZ,aAAa,CAAC,IAAI,IAAI,CAAC;AAEzC,SAASI,cAAc,EAAEe,cAAc","ignoreList":[]}
+{"version":3,"names":["complete","corrupt","incomplete","noFrameStart","hexToByte","START","DEVICE_TYPE","COMMAND_INDEX","LENGTH_INDEX","HEADER_BYTES","CHECKSUM_BYTES","AojFrameReader","readFrame","buffer","start","findStart","payloadLength","frameLength","length","frame","slice","hasValidChecksum","index","toLowerCase","checksumIndex","checksum","aojCommandByte"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/aoj/aoj.frame-reader.ts"],"mappings":";;AAEA,SAASA,QAAQ,EAAEC,OAAO,EAAEC,UAAU,EAAEC,YAAY,QAAQ,sCAAmC;AAC/F,SAASC,SAAS,QAAQ,+BAA4B;AAEtD,MAAMC,KAAK,GAAG,IAAI;AAClB,MAAMC,WAAW,GAAG,IAAI;AACxB,MAAMC,aAAa,GAAG,CAAC;AACvB,MAAMC,YAAY,GAAG,CAAC;AACtB,MAAMC,YAAY,GAAG,CAAC;AACtB,MAAMC,cAAc,GAAG,CAAC;;AAExB;AACA,MAAMC,cAAc,CAAwB;EAC1C;EACOC,SAASA,CAACC,MAAyB,EAAmB;IAC3D,MAAMC,KAAK,GAAG,IAAI,CAACC,SAAS,CAACF,MAAM,CAAC;IAEpC,IAAIC,KAAK,GAAG,CAAC,EAAE;MACb,OAAOX,YAAY,CAACU,MAAM,CAAC;IAC7B;IAEA,MAAMG,aAAa,GAAGZ,SAAS,CAACS,MAAM,CAACC,KAAK,GAAGN,YAAY,CAAC,IAAI,IAAI,CAAC;IACrE,MAAMS,WAAW,GAAGR,YAAY,GAAGO,aAAa,GAAGN,cAAc;IAEjE,IAAII,KAAK,GAAGG,WAAW,GAAGJ,MAAM,CAACK,MAAM,EAAE;MACvC,OAAOhB,UAAU,CAACY,KAAK,CAAC;IAC1B;IAEA,MAAMK,KAAK,GAAGN,MAAM,CAACO,KAAK,CAACN,KAAK,EAAEA,KAAK,GAAGG,WAAW,CAAC;IAEtD,IAAI,CAAC,IAAI,CAACI,gBAAgB,CAACF,KAAK,CAAC,EAAE;MACjC,OAAOlB,OAAO,CAACa,KAAK,GAAG,CAAC,CAAC;IAC3B;IAEA,OAAOd,QAAQ,CAACmB,KAAK,EAAEL,KAAK,GAAGG,WAAW,CAAC;EAC7C;EAEQF,SAASA,CAACF,MAAyB,EAAU;IACnD,KAAK,IAAIS,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAG,CAAC,GAAGT,MAAM,CAACK,MAAM,EAAEI,KAAK,EAAE,EAAE;MACtD,IACET,MAAM,CAACS,KAAK,CAAC,EAAEC,WAAW,CAAC,CAAC,KAAKlB,KAAK,IACtCQ,MAAM,CAACS,KAAK,GAAG,CAAC,CAAC,EAAEC,WAAW,CAAC,CAAC,KAAKjB,WAAW,EAChD;QACA,OAAOgB,KAAK;MACd;IACF;IAEA,OAAO,CAAC,CAAC;EACX;EAEQD,gBAAgBA,CAACF,KAAwB,EAAW;IAC1D,MAAMK,aAAa,GAAGL,KAAK,CAACD,MAAM,GAAGR,cAAc;IACnD,IAAIe,QAAQ,GAAG,CAAC;IAEhB,KAAK,IAAIH,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGE,aAAa,EAAEF,KAAK,EAAE,EAAE;MAClDG,QAAQ,IAAIrB,SAAS,CAACe,KAAK,CAACG,KAAK,CAAC,IAAI,IAAI,CAAC;IAC7C;IAEA,OAAOG,QAAQ,KAAKrB,SAAS,CAACe,KAAK,CAACK,aAAa,CAAC,IAAI,IAAI,CAAC;EAC7D;AACF;;AAEA;AACA,MAAME,cAAc,GAAIP,KAAwB,IAC9Cf,SAAS,CAACe,KAAK,CAACZ,aAAa,CAAC,IAAI,IAAI,CAAC;AAEzC,SAASI,cAAc,EAAEe,cAAc","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/boso/boso.medicus.js

@@ -8,6 +8,9 @@ import { standardBloodPressureDevice } from "../standard-gatt/standard-gatt.devi
  * six-character hexadecimal suffix, for example `boso medicus 312B5D`.
  */
 const BOSO_MEDICUS_NAME_MATCH = /^boso medicus [0-9a-f]{6}$/i;
+
+/** Params for declaring a Boso Medicus. */
+
 /**
  * Declares a boso medicus system monitor.
  *

package/lib/module/modules/bt-management/services/devices/boso/boso.medicus.js.map

@@ -1 +1 @@
-{"version":3,"names":["standardBloodPressureDevice","BOSO_MEDICUS_NAME_MATCH","bosoMedicusMonitor","params","id","nameMatch","stuckDataTimeoutMs","undefined","reportsBondedEvent"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/boso/boso.medicus.ts"],"mappings":";;AACA,SAASA,2BAA2B,QAAQ,2CAAwC;;AAEpF;AACA;AACA;AACA;AACA;AACA,MAAMC,uBAAuB,GAAG,6BAA6B;AAc7D;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,kBAAkB,GACtBC,MAAyB,KACG;EAC5B,GAAGH,2BAA2B,CAAC;IAC7BI,EAAE,EAAED,MAAM,CAACC,EAAE,IAAI,qBAAqB;IACtCC,SAAS,EAAEF,MAAM,CAACE,SAAS,IAAIJ,uBAAuB;IACtD,IAAIE,MAAM,CAACG,kBAAkB,KAAKC,SAAS,GACvC,CAAC,CAAC,GACF;MAAED,kBAAkB,EAAEH,MAAM,CAACG;IAAmB,CAAC;EACvD,CAAC,CAAC;EACFE,kBAAkB,EAAE;AACtB,CAAC,CAAC;AAEF,SAASP,uBAAuB,EAAEC,kBAAkB","ignoreList":[]}
+{"version":3,"names":["standardBloodPressureDevice","BOSO_MEDICUS_NAME_MATCH","bosoMedicusMonitor","params","id","nameMatch","stuckDataTimeoutMs","undefined","reportsBondedEvent"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/boso/boso.medicus.ts"],"mappings":";;AACA,SAASA,2BAA2B,QAAQ,2CAAwC;;AAEpF;AACA;AACA;AACA;AACA;AACA,MAAMC,uBAAuB,GAAG,6BAA6B;;AAE7D;;AAaA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,kBAAkB,GACtBC,MAAyB,KACG;EAC5B,GAAGH,2BAA2B,CAAC;IAC7BI,EAAE,EAAED,MAAM,CAACC,EAAE,IAAI,qBAAqB;IACtCC,SAAS,EAAEF,MAAM,CAACE,SAAS,IAAIJ,uBAAuB;IACtD,IAAIE,MAAM,CAACG,kBAAkB,KAAKC,SAAS,GACvC,CAAC,CAAC,GACF;MAAED,kBAAkB,EAAEH,MAAM,CAACG;IAAmB,CAAC;EACvD,CAAC,CAAC;EACFE,kBAAkB,EAAE;AACtB,CAAC,CAAC;AAEF,SAASP,uBAAuB,EAAEC,kBAAkB","ignoreList":[]}

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

@@ -3,6 +3,7 @@
 import { sentryLogger } from "../../../helpers/utils/sentry-logger.js";
 import { toBluetoothError } from "../../types/bluetooth-error.js";
 import { hexToBase64 } from "../../utils/hex-to-base-64.js";
+import { runOnce } from "./bt-pairing-retry.js";
 const MAX_WRITE_ATTEMPTS = 3;
 
 /** The MTU every BLE link starts at, before either side asks for more. */
@@ -23,10 +24,11 @@ const ATT_WRITE_HEADER_BYTES = 3;
 export class BTCommandWriter {
   pendingWrites = Promise.resolve();
   mtu = DEFAULT_ATT_MTU;
-  constructor(device, onError, isNormalDisconnect) {
+  constructor(device, onError, isNormalDisconnect, retryAfterPairing = runOnce) {
     this.device = device;
     this.onError = onError;
     this.isNormalDisconnect = isNormalDisconnect;
+    this.retryAfterPairing = retryAfterPairing;
   }
 
   /**
@@ -135,7 +137,7 @@ export class BTCommandWriter {
           sentryLogger("info", "DEVICE: Skipping write after disconnect");
           return false;
         }
-        await this.writeTo(command, hexToBase64(chunk.join("")));
+        await this.retryAfterPairing(() => this.writeTo(command, hexToBase64(chunk.join(""))));
         return true;
       } catch (error) {
         const message = toBluetoothError(error).message;

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

@@ -1 +1 @@
-{"version":3,"names":["sentryLogger","toBluetoothError","hexToBase64","MAX_WRITE_ATTEMPTS","DEFAULT_ATT_MTU","ATT_WRITE_HEADER_BYTES","BTCommandWriter","pendingWrites","Promise","resolve","mtu","constructor","device","onError","isNormalDisconnect","useNegotiatedMtu","Number","isInteger","reset","send","commands","then","writeInOrder","catch","error","command","writeCommand","delayBeforeWriteMs","setTimeout","chunk","chunksOf","frame","written","writeChunk","writeTo","value","withoutResponse","writeCharacteristicWithoutResponseForService","serviceUuid","characteristicUuid","writeCharacteristicWithResponseForService","size","Math","max","chunks","start","length","push","slice","attempt","isConnected","join","message","expectedEnd","test","errorCode","code"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-command-writer.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["sentryLogger","toBluetoothError","hexToBase64","runOnce","MAX_WRITE_ATTEMPTS","DEFAULT_ATT_MTU","ATT_WRITE_HEADER_BYTES","BTCommandWriter","pendingWrites","Promise","resolve","mtu","constructor","device","onError","isNormalDisconnect","retryAfterPairing","useNegotiatedMtu","Number","isInteger","reset","send","commands","then","writeInOrder","catch","error","command","writeCommand","delayBeforeWriteMs","setTimeout","chunk","chunksOf","frame","written","writeChunk","writeTo","value","withoutResponse","writeCharacteristicWithoutResponseForService","serviceUuid","characteristicUuid","writeCharacteristicWithResponseForService","size","Math","max","chunks","start","length","push","slice","attempt","isConnected","join","message","expectedEnd","test","errorCode","code"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-command-writer.ts"],"mappings":"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","ignoreList":[]}

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

@@ -8,27 +8,34 @@ import { BluetoothErrorCode, toBluetoothError } from "../../types/bluetooth-erro
 import { DeviceStatus } from "../../types/device-status.js";
 import { base64ToHex } from "../../utils/base-64-to-hex.js";
 import { BTCommandWriter } from "./bt-command-writer.js";
+import { writeCurrentTime } from "./bt-current-time.js";
 import { readDeviceInformation } from "./bt-device-information.js";
+import { awaitNotificationsEnabled } from "./bt-notification-readiness.js";
+import { BTPairingRetry, isPairingRequired } from "./bt-pairing-retry.js";
 export class BTConnectionHandler {
   characteristicSubscriptions = [];
   disconnectObserved = false;
+  pairingReported = false;
   constructor(device, mainServices, callbacks, preferredMtu) {
     this.device = device;
     this.mainServices = mainServices;
     this.callbacks = callbacks;
     this.preferredMtu = preferredMtu;
-    this.writer = new BTCommandWriter(device, callbacks.onError, callbacks.isNormalDisconnect);
+    this.pairing = new BTPairingRetry(device, this.reportPairingRequired);
+    this.writer = new BTCommandWriter(device, callbacks.onError, callbacks.isNormalDisconnect, this.pairing.run);
   }
   connect = async () => {
     const startedAt = Date.now();
     this.disconnectObserved = false;
+    this.pairingReported = false;
     const span = startOvokSpan("bluetooth.connect");
     try {
       await this.connectWithRetries();
       await this.requestPreferredMtu();
       await this.device.discoverAllServicesAndCharacteristics();
-      await readDeviceInformation(this.device, this.callbacks.onDeviceInfo);
+      await readDeviceInformation(this.device, this.callbacks.onDeviceInfo, this.pairing.run);
       await this.readBatteryLevel();
+      await this.syncCurrentTime();
       if (this.disconnectObserved || !(await this.device.isConnected())) {
         throw new Error("Device disconnected during connection setup");
       }
@@ -50,10 +57,7 @@ export class BTConnectionHandler {
         addOvokSpanEvent("pairing.failed", {
           errorCode
         }, span);
-        this.callbacks.onConnectionEvent?.({
-          kind: "pairing",
-          pairingCodeRequired: true
-        });
+        this.reportPairingRequired();
       }
       if (!this.disconnectObserved) {
         this.callbacks.onStatusChanged?.(DeviceStatus.DISCONNECTED);
@@ -69,8 +73,7 @@ export class BTConnectionHandler {
     }
   };
   destroy = () => {
-    this.characteristicSubscriptions.forEach(sub => sub?.remove());
-    this.characteristicSubscriptions = [];
+    this.removeSubscriptions();
     this.writer.reset();
     this.onDisconnectSubscription?.remove();
     this.onDisconnectSubscription = undefined;
@@ -206,26 +209,8 @@ export class BTConnectionHandler {
       this.callbacks.onServicesDiscovered?.(services.map(({
         uuid
       }) => uuid));
-      for (const mainService of services) {
-        for (const monitorUuid of mainService.monitorUuids) {
-          const subscription = this.device.monitorCharacteristicForService(mainService.uuid, monitorUuid.uuid, (error, result) => {
-            if (error) {
-              this.callbacks.onError?.(error);
-              return;
-            }
-            if (!result || !result.value) {
-              this.callbacks.onError?.(new Error("Received empty data from device"));
-              return;
-            }
-            if (monitorUuid.processData !== false) {
-              const hexValue = base64ToHex(result.value);
-              this.callbacks.onDataReceived?.(result.uuid, hexValue);
-            }
-          });
-          this.characteristicSubscriptions.push(subscription);
-        }
-      }
-      const initialCommands = this.callbacks.initialCommands?.() ?? [];
+      await this.pairing.run(() => this.startMonitors(services));
+      const initialCommands = (await this.callbacks.initialCommands?.()) ?? [];
       if (initialCommands.length > 0) {
         await this.sendCommands(initialCommands);
         this.callbacks.onCommandSent?.();
@@ -238,5 +223,89 @@ export class BTConnectionHandler {
       this.callbacks.onError?.(error);
     }
   };
+
+  /** A monitor failing for pairing while starting is thrown here, for the pairing retry, not reported. */
+  startMonitors = async services => {
+    this.removeSubscriptions();
+    let starting = true;
+    let pairingError;
+    const onMonitorError = error => {
+      if (starting && isPairingRequired(error)) {
+        pairingError ??= error;
+        return;
+      }
+      this.callbacks.onError?.(error);
+    };
+    try {
+      const monitored = [];
+      for (const service of services) {
+        for (const monitorUuid of service.monitorUuids) {
+          this.characteristicSubscriptions.push(this.monitor(service.uuid, monitorUuid, onMonitorError));
+          monitored.push({
+            serviceUuid: service.uuid,
+            characteristicUuid: monitorUuid.uuid
+          });
+        }
+      }
+      await awaitNotificationsEnabled(this.device, monitored);
+      if (pairingError) {
+        throw pairingError;
+      }
+    } finally {
+      starting = false;
+    }
+  };
+  monitor = (serviceUuid, monitorUuid, onMonitorError) => this.device.monitorCharacteristicForService(serviceUuid, monitorUuid.uuid, (error, result) => {
+    if (error) {
+      onMonitorError(error);
+      return;
+    }
+    if (!result || !result.value) {
+      this.callbacks.onError?.(new Error("Received empty data from device"));
+      return;
+    }
+    if (monitorUuid.processData !== false) {
+      const hexValue = base64ToHex(result.value);
+      this.callbacks.onDataReceived?.(result.uuid, hexValue);
+    }
+  });
+  removeSubscriptions = () => {
+    this.characteristicSubscriptions.forEach(sub => sub?.remove());
+    this.characteristicSubscriptions = [];
+  };
+
+  /** Tells the app once per connection that the platform is asking the user to pair. */
+  reportPairingRequired = () => {
+    if (this.pairingReported) {
+      return;
+    }
+    this.pairingReported = true;
+    this.callbacks.onConnectionEvent?.({
+      kind: "pairing",
+      pairingCodeRequired: true
+    });
+  };
+
+  /** Sets the device clock when the declaration asked for it; a device that refuses keeps its own time. */
+  syncCurrentTime = async () => {
+    const clock = this.callbacks.currentTimeSync;
+    if (!clock) {
+      return;
+    }
+    try {
+      const clockAt = await writeCurrentTime(this.device, clock);
+      if (clockAt) {
+        this.callbacks.onConnectionEvent?.({
+          kind: "clock-synchronized",
+          clockAt,
+          phoneUtcOffsetMinutes: -clockAt.getTimezoneOffset()
+        });
+      }
+    } catch (error) {
+      sentryLogger("info", "DEVICE: Current Time was not written", {
+        errorCode: toBluetoothError(error).code
+      });
+    }
+  };
 }
 //# sourceMappingURL=bt-connection-handler.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["sentryLogger","addOvokSpanEvent","recordOvokDuration","recordOvokMetric","startOvokSpan","BluetoothErrorCode","toBluetoothError","DeviceStatus","base64ToHex","BTCommandWriter","readDeviceInformation","BTConnectionHandler","characteristicSubscriptions","disconnectObserved","constructor","device","mainServices","callbacks","preferredMtu","writer","onError","isNormalDisconnect","connect","startedAt","Date","now","span","connectWithRetries","requestPreferredMtu","discoverAllServicesAndCharacteristics","onDeviceInfo","readBatteryLevel","isConnected","Error","onStatusChanged","CONNECTED","subscribeToAllCharacteristics","setStatus","code","error","errorCode","PAIRING_REQUIRED","onConnectionEvent","kind","pairingCodeRequired","DISCONNECTED","message","end","destroy","forEach","sub","remove","reset","onDisconnectSubscription","undefined","sendCommands","commands","send","negotiated","requestMTU","useNegotiatedMtu","mtu","requestedMtu","characteristic","readCharacteristicForService","value","Number","parseInt","isFinite","batteryLevel","maxRetries","retryDelay","maxDelay","connected","retryCount","listenForDisconnect","willRetry","Promise","resolve","setTimeout","Math","min","pow","onDisconnected","onDeviceDisconnected","servicesPresent","some","optional","services","discovered","Set","map","uuid","toLowerCase","filter","has","onServicesDiscovered","mainService","monitorUuid","monitorUuids","subscription","monitorCharacteristicForService","result","processData","hexValue","onDataReceived","push","initialCommands","length","onCommandSent"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-connection-handler.ts"],"mappings":";;AAAA;;AAIA,SAASA,YAAY,QAAQ,yCAAsC;AACnE,SACEC,gBAAgB,EAChBC,kBAAkB,EAClBC,gBAAgB,EAChBC,aAAa,QACR,qCAAkC;AACzC,SAASC,kBAAkB,EAAEC,gBAAgB,QAAQ,gCAA6B;AAGlF,SAASC,YAAY,QAAQ,8BAA2B;AAGxD,SAASC,WAAW,QAAQ,+BAA4B;AAExD,SAASC,eAAe,QAAQ,wBAAqB;AACrD,SAASC,qBAAqB,QAAQ,4BAAyB;AAsB/D,OAAO,MAAMC,mBAAmB,CAAC;EAEvBC,2BAA2B,GAAmB,EAAE;EAChDC,kBAAkB,GAAG,KAAK;EAGlCC,WAAWA,CACQC,MAAc,EACdC,YAA2C,EAC3CC,SAAqC,EACrCC,YAAqB,EACtC;IAAA,KAJiBH,MAAc,GAAdA,MAAc;IAAA,KACdC,YAA2C,GAA3CA,YAA2C;IAAA,KAC3CC,SAAqC,GAArCA,SAAqC;IAAA,KACrCC,YAAqB,GAArBA,YAAqB;IAEtC,IAAI,CAACC,MAAM,GAAG,IAAIV,eAAe,CAC/BM,MAAM,EACNE,SAAS,CAACG,OAAO,EACjBH,SAAS,CAACI,kBACZ,CAAC;EACH;EAEOC,OAAO,GAAG,MAAAA,CAAA,KAAY;IAC3B,MAAMC,SAAS,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC;IAE5B,IAAI,CAACZ,kBAAkB,GAAG,KAAK;IAE/B,MAAMa,IAAI,GAAGtB,aAAa,CAAC,mBAAmB,CAAC;IAE/C,IAAI;MACF,MAAM,IAAI,CAACuB,kBAAkB,CAAC,CAAC;MAE/B,MAAM,IAAI,CAACC,mBAAmB,CAAC,CAAC;MAEhC,MAAM,IAAI,CAACb,MAAM,CAACc,qCAAqC,CAAC,CAAC;MACzD,MAAMnB,qBAAqB,CAAC,IAAI,CAACK,MAAM,EAAE,IAAI,CAACE,SAAS,CAACa,YAAY,CAAC;MACrE,MAAM,IAAI,CAACC,gBAAgB,CAAC,CAAC;MAE7B,IAAI,IAAI,CAAClB,kBAAkB,IAAI,EAAE,MAAM,IAAI,CAACE,MAAM,CAACiB,WAAW,CAAC,CAAC,CAAC,EAAE;QACjE,MAAM,IAAIC,KAAK,CAAC,6CAA6C,CAAC;MAChE;MAEA,IAAI,CAAChB,SAAS,CAACiB,eAAe,GAAG3B,YAAY,CAAC4B,SAAS,CAAC;MAExD,MAAM,IAAI,CAACC,6BAA6B,CAAC,CAAC;MAC1CV,IAAI,EAAEW,SAAS,GAAG;QAAEC,IAAI,EAAE;MAAE,CAAC,CAAC;IAChC,CAAC,CAAC,OAAOC,KAAK,EAAE;MACd,MAAMC,SAAS,GAAGlC,gBAAgB,CAACiC,KAAK,CAAC,CAACD,IAAI;MAE9CtC,YAAY,CAAC,OAAO,EAAE,wCAAwC,EAAE;QAC9DwC;MACF,CAAC,CAAC;MACF,IAAI,CAACvB,SAAS,CAACG,OAAO,GAAGmB,KAAyB,CAAC;MACnD,IAAIjC,gBAAgB,CAACiC,KAAK,CAAC,CAACD,IAAI,KAAKjC,kBAAkB,CAACoC,gBAAgB,EAAE;QACxEtC,gBAAgB,CAAC,uBAAuB,EAAE,CAAC,EAAE;UAC3CqC;QACF,CAAC,CAAC;QACFvC,gBAAgB,CAAC,gBAAgB,EAAE;UAAEuC;QAAU,CAAC,EAAEd,IAAI,CAAC;QACvD,IAAI,CAACT,SAAS,CAACyB,iBAAiB,GAAG;UACjCC,IAAI,EAAE,SAAS;UACfC,mBAAmB,EAAE;QACvB,CAAC,CAAC;MACJ;MACA,IAAI,CAAC,IAAI,CAAC/B,kBAAkB,EAAE;QAC5B,IAAI,CAACI,SAAS,CAACiB,eAAe,GAAG3B,YAAY,CAACsC,YAAY,CAAC;MAC7D;MACAnB,IAAI,EAAEW,SAAS,GAAG;QAChBC,IAAI,EAAE,CAAC;QACPQ,OAAO,EAAEN;MACX,CAAC,CAAC;MACF,MAAMD,KAAK;IACb,CAAC,SAAS;MACRrC,kBAAkB,CAAC,iCAAiC,EAAEsB,IAAI,CAACC,GAAG,CAAC,CAAC,GAAGF,SAAS,CAAC;MAC7EG,IAAI,EAAEqB,GAAG,CAAC,CAAC;IACb;EACF,CAAC;EAEMC,OAAO,GAAGA,CAAA,KAAM;IACrB,IAAI,CAACpC,2BAA2B,CAACqC,OAAO,CAAEC,GAAG,IAAKA,GAAG,EAAEC,MAAM,CAAC,CAAC,CAAC;IAChE,IAAI,CAACvC,2BAA2B,GAAG,EAAE;IACrC,IAAI,CAACO,MAAM,CAACiC,KAAK,CAAC,CAAC;IAEnB,IAAI,CAACC,wBAAwB,EAAEF,MAAM,CAAC,CAAC;IACvC,IAAI,CAACE,wBAAwB,GAAGC,SAAS;EAC3C,CAAC;;EAED;EACOC,YAAY,GAAIC,QAAkC,IACvD,IAAI,CAACrC,MAAM,CAACsC,IAAI,CAACD,QAAQ,CAAC;;EAE5B;AACF;AACA;AACA;AACA;AACA;EACU5B,mBAAmB,GAAG,MAAAA,CAAA,KAA2B;IACvD,IAAI,CAAC,IAAI,CAACV,YAAY,EAAE;MACtB;IACF;IAEA,IAAI;MACF,MAAMwC,UAAU,GAAG,MAAM,IAAI,CAAC3C,MAAM,CAAC4C,UAAU,CAAC,IAAI,CAACzC,YAAY,CAAC;MAElE,IAAI,CAACC,MAAM,CAACyC,gBAAgB,CAACF,UAAU,EAAEG,GAAG,IAAI,IAAI,CAAC9C,MAAM,CAAC8C,GAAG,CAAC;IAClE,CAAC,CAAC,OAAOtB,KAAK,EAAE;MACd,MAAMC,SAAS,GAAGlC,gBAAgB,CAACiC,KAAK,CAAC,CAACD,IAAI;MAE9CtC,YAAY,CAAC,MAAM,EAAE,qCAAqC,EAAE;QAC1D8D,YAAY,EAAE,IAAI,CAAC5C,YAAY;QAC/BsB;MACF,CAAC,CAAC;IACJ;EACF,CAAC;;EAED;EACQT,gBAAgB,GAAG,MAAAA,CAAA,KAA2B;IACpD,IAAI;MACF,MAAMgC,cAAc,GAAG,MAAM,IAAI,CAAChD,MAAM,CAACiD,4BAA4B,CACnE,MAAM,EACN,MACF,CAAC;MAED,IAAI,CAACD,cAAc,CAACE,KAAK,EAAE;QACzB;MACF;MAEA,MAAMA,KAAK,GAAGC,MAAM,CAACC,QAAQ,CAAC3D,WAAW,CAACuD,cAAc,CAACE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC;MAE7E,IAAI,CAACC,MAAM,CAACE,QAAQ,CAACH,KAAK,CAAC,IAAIA,KAAK,GAAG,CAAC,IAAIA,KAAK,GAAG,GAAG,EAAE;QACvD;MACF;MAEA,IAAI,CAAChD,SAAS,CAACyB,iBAAiB,GAAG;QACjCC,IAAI,EAAE,SAAS;QACf0B,YAAY,EAAEJ;MAChB,CAAC,CAAC;IACJ,CAAC,CAAC,MAAM;MACN;IAAA;EAEJ,CAAC;EAEOtC,kBAAkB,GAAG,MAAAA,CAAA,KAAY;IACvC,MAAM2C,UAAU,GAAG,CAAC;IACpB,MAAMC,UAAU,GAAG,IAAI;IACvB,MAAMC,QAAQ,GAAG,KAAK;IACtB,IAAIC,SAAS,GAAG,KAAK;IACrB,IAAIC,UAAU,GAAG,CAAC;IAElB,OAAO,CAACD,SAAS,IAAIC,UAAU,GAAGJ,UAAU,EAAE;MAC5CG,SAAS,GAAG,MAAM,IAAI,CAAC1D,MAAM,CAACiB,WAAW,CAAC,CAAC;MAC3C,IAAIyC,SAAS,EAAE;QACb,IAAI,CAACE,mBAAmB,CAAC,CAAC;QAE1B;MACF;MACA,IAAI;QACF,MAAM,IAAI,CAAC5D,MAAM,CAACO,OAAO,CAAC,CAAC;QAC3B,IAAI,CAACqD,mBAAmB,CAAC,CAAC;QAC1BF,SAAS,GAAG,IAAI;MAClB,CAAC,CAAC,OAAOlC,KAAK,EAAE;QACdmC,UAAU,EAAE;QACZ,MAAMlC,SAAS,GAAGlC,gBAAgB,CAACiC,KAAK,CAAC,CAACD,IAAI;QAE9CtC,YAAY,CAAC,OAAO,EAAE,2BAA2B,EAAE;UACjDwC,SAAS;UACTkC;QACF,CAAC,CAAC;QACF,IAAIA,UAAU,IAAIJ,UAAU,EAAE;UAC5BtE,YAAY,CAAC,OAAO,EAAE,6CAA6C,EAAE;YACnEwC,SAAS;YACToC,SAAS,EAAEF,UAAU,GAAGJ;UAC1B,CAAC,CAAC;UACF,MAAM/B,KAAK;QACb;QAEA,MAAM,IAAIsC,OAAO,CAAEC,OAAO,IACxBC,UAAU,CACRD,OAAO,EACPE,IAAI,CAACC,GAAG,CAACV,UAAU,GAAGS,IAAI,CAACE,GAAG,CAAC,CAAC,EAAER,UAAU,GAAG,CAAC,CAAC,EAAEF,QAAQ,CAC7D,CACF,CAAC;MACH;IACF;EACF,CAAC;EAEOG,mBAAmB,GAAGA,CAAA,KAAM;IAClC,IAAI,CAACtB,wBAAwB,EAAEF,MAAM,CAAC,CAAC;IACvC,IAAI,CAACE,wBAAwB,GAAG,IAAI,CAACtC,MAAM,CAACoE,cAAc,CACxD,IAAI,CAACC,oBACP,CAAC;EACH,CAAC;EAEOA,oBAAoB,GAAI7C,KAAsB,IAAK;IACzD,IAAI,CAAC1B,kBAAkB,GAAG,IAAI;IAC9Bb,YAAY,CAAC,MAAM,EAAE,oCAAoC,EAAE;MACzD,IAAIuC,KAAK,GAAG;QAAEC,SAAS,EAAElC,gBAAgB,CAACiC,KAAK,CAAC,CAACD;MAAK,CAAC,GAAG,CAAC,CAAC;IAC9D,CAAC,CAAC;IACF,IAAIC,KAAK,IAAI,CAAC,IAAI,CAACtB,SAAS,CAACI,kBAAkB,GAAG,CAAC,EAAE;MACnD,IAAI,CAACJ,SAAS,CAACG,OAAO,GAAGmB,KAAK,CAAC;IACjC;;IAEA;AACJ;AACA;AACA;AACA;AACA;IACI,IAAI,CAACtB,SAAS,CAACiB,eAAe,GAAG3B,YAAY,CAACsC,YAAY,CAAC;IAC3D,IAAI,CAACG,OAAO,CAAC,CAAC;EAChB,CAAC;;EAED;EACQqC,eAAe,GAAG,MAAAA,CAAA,KAA0C;IAClE,IACE,CAAC,IAAI,CAACrE,YAAY,CAACsE,IAAI,CAAC,CAAC;MAAEC;IAAS,CAAC,KAAKA,QAAQ,CAAC,IACnD,OAAO,IAAI,CAACxE,MAAM,CAACyE,QAAQ,KAAK,UAAU,EAC1C;MACA,OAAO,IAAI,CAACxE,YAAY;IAC1B;IAEA,IAAIyE,UAAuB;IAE3B,IAAI;MACFA,UAAU,GAAG,IAAIC,GAAG,CAClB,CAAC,MAAM,IAAI,CAAC3E,MAAM,CAACyE,QAAQ,CAAC,CAAC,EAAEG,GAAG,CAAC,CAAC;QAAEC;MAAK,CAAC,KAAKA,IAAI,CAACC,WAAW,CAAC,CAAC,CACrE,CAAC;IACH,CAAC,CAAC,MAAM;MACN;MACA,OAAO,IAAI,CAAC7E,YAAY;IAC1B;IAEA,OAAO,IAAI,CAACA,YAAY,CAAC8E,MAAM,CAC7B,CAAC;MAAEF,IAAI;MAAEL;IAAS,CAAC,KAAK,CAACA,QAAQ,IAAIE,UAAU,CAACM,GAAG,CAACH,IAAI,CAACC,WAAW,CAAC,CAAC,CACxE,CAAC;EACH,CAAC;EAEOzD,6BAA6B,GAAG,MAAAA,CAAA,KAAY;IAClD,IAAI;MACF,MAAMoD,QAAQ,GAAG,MAAM,IAAI,CAACH,eAAe,CAAC,CAAC;MAE7C,IAAI,CAACpE,SAAS,CAAC+E,oBAAoB,GAAGR,QAAQ,CAACG,GAAG,CAAC,CAAC;QAAEC;MAAK,CAAC,KAAKA,IAAI,CAAC,CAAC;MAEvE,KAAK,MAAMK,WAAW,IAAIT,QAAQ,EAAE;QAClC,KAAK,MAAMU,WAAW,IAAID,WAAW,CAACE,YAAY,EAAE;UAClD,MAAMC,YAAY,GAAG,IAAI,CAACrF,MAAM,CAACsF,+BAA+B,CAC9DJ,WAAW,CAACL,IAAI,EAChBM,WAAW,CAACN,IAAI,EAChB,CAACrD,KAAK,EAAE+D,MAAM,KAAK;YACjB,IAAI/D,KAAK,EAAE;cACT,IAAI,CAACtB,SAAS,CAACG,OAAO,GAAGmB,KAAK,CAAC;cAE/B;YACF;YAEA,IAAI,CAAC+D,MAAM,IAAI,CAACA,MAAM,CAACrC,KAAK,EAAE;cAC5B,IAAI,CAAChD,SAAS,CAACG,OAAO,GACpB,IAAIa,KAAK,CAAC,iCAAiC,CAC7C,CAAC;cAED;YACF;YAEA,IAAIiE,WAAW,CAACK,WAAW,KAAK,KAAK,EAAE;cACrC,MAAMC,QAAQ,GAAGhG,WAAW,CAAC8F,MAAM,CAACrC,KAAK,CAAC;cAE1C,IAAI,CAAChD,SAAS,CAACwF,cAAc,GAAGH,MAAM,CAACV,IAAI,EAAEY,QAAQ,CAAC;YACxD;UACF,CACF,CAAC;UAED,IAAI,CAAC5F,2BAA2B,CAAC8F,IAAI,CAACN,YAAY,CAAC;QACrD;MACF;MAEA,MAAMO,eAAe,GAAG,IAAI,CAAC1F,SAAS,CAAC0F,eAAe,GAAG,CAAC,IAAI,EAAE;MAEhE,IAAIA,eAAe,CAACC,MAAM,GAAG,CAAC,EAAE;QAC9B,MAAM,IAAI,CAACrD,YAAY,CAACoD,eAAe,CAAC;QACxC,IAAI,CAAC1F,SAAS,CAAC4F,aAAa,GAAG,CAAC;MAClC;IACF,CAAC,CAAC,OAAOtE,KAAK,EAAE;MACd,MAAMC,SAAS,GAAGlC,gBAAgB,CAACiC,KAAK,CAAC,CAACD,IAAI;MAE9CtC,YAAY,CACV,OAAO,EACP,kDAAkD,EAClD;QACEwC;MACF,CACF,CAAC;MACD,IAAI,CAACvB,SAAS,CAACG,OAAO,GAAGmB,KAAyB,CAAC;IACrD;EACF,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["sentryLogger","addOvokSpanEvent","recordOvokDuration","recordOvokMetric","startOvokSpan","BluetoothErrorCode","toBluetoothError","DeviceStatus","base64ToHex","BTCommandWriter","writeCurrentTime","readDeviceInformation","awaitNotificationsEnabled","BTPairingRetry","isPairingRequired","BTConnectionHandler","characteristicSubscriptions","disconnectObserved","pairingReported","constructor","device","mainServices","callbacks","preferredMtu","pairing","reportPairingRequired","writer","onError","isNormalDisconnect","run","connect","startedAt","Date","now","span","connectWithRetries","requestPreferredMtu","discoverAllServicesAndCharacteristics","onDeviceInfo","readBatteryLevel","syncCurrentTime","isConnected","Error","onStatusChanged","CONNECTED","subscribeToAllCharacteristics","setStatus","code","error","errorCode","PAIRING_REQUIRED","DISCONNECTED","message","end","destroy","removeSubscriptions","reset","onDisconnectSubscription","remove","undefined","sendCommands","commands","send","negotiated","requestMTU","useNegotiatedMtu","mtu","requestedMtu","characteristic","readCharacteristicForService","value","Number","parseInt","isFinite","onConnectionEvent","kind","batteryLevel","maxRetries","retryDelay","maxDelay","connected","retryCount","listenForDisconnect","willRetry","Promise","resolve","setTimeout","Math","min","pow","onDisconnected","onDeviceDisconnected","servicesPresent","some","optional","services","discovered","Set","map","uuid","toLowerCase","filter","has","onServicesDiscovered","startMonitors","initialCommands","length","onCommandSent","starting","pairingError","onMonitorError","monitored","service","monitorUuid","monitorUuids","push","monitor","serviceUuid","characteristicUuid","monitorCharacteristicForService","result","processData","hexValue","onDataReceived","forEach","sub","pairingCodeRequired","clock","currentTimeSync","clockAt","phoneUtcOffsetMinutes","getTimezoneOffset"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-connection-handler.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/bt-management/services/devices/bt-current-time.js

@@ -0,0 +1,55 @@
+"use strict";
+
+import { Buffer } from "buffer";
+import { getClockParts } from "../../types/clock-sync.js";
+import { sigUuid } from "../../utils/sig-uuid.js";
+const CURRENT_TIME_SERVICE = sigUuid("1805");
+const CURRENT_TIME = sigUuid("2a2b");
+const SUNDAY = 7;
+const BYTE_MASK = 0xff;
+const BITS_PER_BYTE = 8;
+const NO_FRACTION = 0;
+
+/** Adjust Reason bit 0: the time was set by hand, which is what a phone writing it is. */
+const MANUAL_TIME_UPDATE = 0x01;
+/** 1 for Monday to 7 for Sunday, as Day of Week is encoded. */
+const dayOfWeek = ({
+  year,
+  month,
+  day
+}) => new Date(Date.UTC(year, month - 1, day)).getUTCDay() || SUNDAY;
+
+/** Current Time 0x2A2B: Date Time, Day of Week, Fractions256 and Adjust Reason. */
+const currentTimeBytes = parts => [parts.year & BYTE_MASK, parts.year >> BITS_PER_BYTE, parts.month, parts.day, parts.hours, parts.minutes, parts.seconds, dayOfWeek(parts), NO_FRACTION, MANUAL_TIME_UPDATE];
+const isWritableCurrentTime = ({
+  uuid,
+  isWritableWithResponse,
+  isWritableWithoutResponse
+}) => uuid.toLowerCase() === CURRENT_TIME && (isWritableWithResponse || isWritableWithoutResponse);
+
+/**
+ * Sets the device clock through the Current Time Service.
+ *
+ * Resolves to the time written, or `undefined` when the device has no writable Current Time
+ * characteristic. A device that refuses the write rejects.
+ */
+const writeCurrentTime = async (device, {
+  now,
+  timezone
+}) => {
+  const characteristics = await device.characteristicsForService(CURRENT_TIME_SERVICE).catch(() => []);
+  const characteristic = characteristics.find(isWritableCurrentTime);
+  if (!characteristic) {
+    return undefined;
+  }
+  const time = now?.() ?? new Date();
+  const value = Buffer.from(currentTimeBytes(getClockParts(time, timezone))).toString("base64");
+  if (characteristic.isWritableWithResponse) {
+    await device.writeCharacteristicWithResponseForService(CURRENT_TIME_SERVICE, CURRENT_TIME, value);
+  } else {
+    await device.writeCharacteristicWithoutResponseForService(CURRENT_TIME_SERVICE, CURRENT_TIME, value);
+  }
+  return time;
+};
+export { writeCurrentTime };
+//# sourceMappingURL=bt-current-time.js.map

package/lib/module/modules/bt-management/services/devices/bt-current-time.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["Buffer","getClockParts","sigUuid","CURRENT_TIME_SERVICE","CURRENT_TIME","SUNDAY","BYTE_MASK","BITS_PER_BYTE","NO_FRACTION","MANUAL_TIME_UPDATE","dayOfWeek","year","month","day","Date","UTC","getUTCDay","currentTimeBytes","parts","hours","minutes","seconds","isWritableCurrentTime","uuid","isWritableWithResponse","isWritableWithoutResponse","toLowerCase","writeCurrentTime","device","now","timezone","characteristics","characteristicsForService","catch","characteristic","find","undefined","time","value","from","toString","writeCharacteristicWithResponseForService","writeCharacteristicWithoutResponseForService"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-current-time.ts"],"mappings":";;AAAA,SAASA,MAAM,QAAQ,QAAQ;AAI/B,SAA2BC,aAAa,QAAQ,2BAAwB;AACxE,SAASC,OAAO,QAAQ,yBAAsB;AAE9C,MAAMC,oBAAoB,GAAGD,OAAO,CAAC,MAAM,CAAC;AAC5C,MAAME,YAAY,GAAGF,OAAO,CAAC,MAAM,CAAC;AAEpC,MAAMG,MAAM,GAAG,CAAC;AAChB,MAAMC,SAAS,GAAG,IAAI;AACtB,MAAMC,aAAa,GAAG,CAAC;AACvB,MAAMC,WAAW,GAAG,CAAC;;AAErB;AACA,MAAMC,kBAAkB,GAAG,IAAI;AAI/B;AACA,MAAMC,SAAS,GAAGA,CAAC;EAAEC,IAAI;EAAEC,KAAK;EAAEC;AAAmB,CAAC,KACpD,IAAIC,IAAI,CAACA,IAAI,CAACC,GAAG,CAACJ,IAAI,EAAEC,KAAK,GAAG,CAAC,EAAEC,GAAG,CAAC,CAAC,CAACG,SAAS,CAAC,CAAC,IAAIX,MAAM;;AAEhE;AACA,MAAMY,gBAAgB,GAAIC,KAAoB,IAAe,CAC3DA,KAAK,CAACP,IAAI,GAAGL,SAAS,EACtBY,KAAK,CAACP,IAAI,IAAIJ,aAAa,EAC3BW,KAAK,CAACN,KAAK,EACXM,KAAK,CAACL,GAAG,EACTK,KAAK,CAACC,KAAK,EACXD,KAAK,CAACE,OAAO,EACbF,KAAK,CAACG,OAAO,EACbX,SAAS,CAACQ,KAAK,CAAC,EAChBV,WAAW,EACXC,kBAAkB,CACnB;AAED,MAAMa,qBAAqB,GAAGA,CAAC;EAC7BC,IAAI;EACJC,sBAAsB;EACtBC;AACc,CAAC,KACfF,IAAI,CAACG,WAAW,CAAC,CAAC,KAAKtB,YAAY,KAAKoB,sBAAsB,IAAIC,yBAAyB,CAAC;;AAE9F;AACA;AACA;AACA;AACA;AACA;AACA,MAAME,gBAAgB,GAAG,MAAAA,CACvBC,MAAc,EACd;EAAEC,GAAG;EAAEC;AAA2B,CAAC,KACL;EAC9B,MAAMC,eAAe,GAAG,MAAMH,MAAM,CAACI,yBAAyB,CAAC7B,oBAAoB,CAAC,CAAC8B,KAAK,CAAC,MAAM,EAAE,CAAC;EACpG,MAAMC,cAAc,GAAGH,eAAe,CAACI,IAAI,CAACb,qBAAqB,CAAC;EAElE,IAAI,CAACY,cAAc,EAAE;IACnB,OAAOE,SAAS;EAClB;EAEA,MAAMC,IAAI,GAAGR,GAAG,GAAG,CAAC,IAAI,IAAIf,IAAI,CAAC,CAAC;EAClC,MAAMwB,KAAK,GAAGtC,MAAM,CAACuC,IAAI,CAACtB,gBAAgB,CAAChB,aAAa,CAACoC,IAAI,EAAEP,QAAQ,CAAC,CAAC,CAAC,CAACU,QAAQ,CAAC,QAAQ,CAAC;EAE7F,IAAIN,cAAc,CAACV,sBAAsB,EAAE;IACzC,MAAMI,MAAM,CAACa,yCAAyC,CAACtC,oBAAoB,EAAEC,YAAY,EAAEkC,KAAK,CAAC;EACnG,CAAC,MAAM;IACL,MAAMV,MAAM,CAACc,4CAA4C,CAACvC,oBAAoB,EAAEC,YAAY,EAAEkC,KAAK,CAAC;EACtG;EAEA,OAAOD,IAAI;AACb,CAAC;AAED,SAASV,gBAAgB","ignoreList":[]}

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

@@ -3,50 +3,31 @@
 import { Buffer } from "buffer";
 import { sentryLogger } from "../../../helpers/utils/sentry-logger.js";
 import { toBluetoothError } from "../../types/bluetooth-error.js";
-const MAX_PAIRING_RETRIES = 2;
-const PAIRING_RETRY_DELAY_MS = 1_000;
-const isPairingAuthenticationError = error => {
-  const text = error instanceof Error ? error.message : String(error);
-  return /(?:GATT_)?(?:INSUFFICIENT_AUTHENTICATION|AUTH_FAIL)|authentication|pairing|bond/i.test(text);
-};
-const wait = milliseconds => new Promise(resolve => setTimeout(resolve, milliseconds));
-const readDeviceInformation = async (device, onDeviceInfo) => {
+import { runOnce } from "./bt-pairing-retry.js";
+const GENERIC_ACCESS_SERVICE = "00001800-0000-1000-8000-00805f9b34fb";
+const DEVICE_INFORMATION_SERVICE = "0000180a-0000-1000-8000-00805f9b34fb";
+const INFORMATION_CHARACTERISTICS = [["name", GENERIC_ACCESS_SERVICE, "00002a00-0000-1000-8000-00805f9b34fb"], ["manufacturerName", DEVICE_INFORMATION_SERVICE, "00002a29-0000-1000-8000-00805f9b34fb"], ["model", DEVICE_INFORMATION_SERVICE, "00002a24-0000-1000-8000-00805f9b34fb"], ["serialNumber", DEVICE_INFORMATION_SERVICE, "00002a25-0000-1000-8000-00805f9b34fb"]];
+const textOf = base64 => Buffer.from(base64, "base64").toString("utf8").replace(/\0+$/, "").trim();
+const readDeviceInformation = async (device, onDeviceInfo, retryAfterPairing = runOnce) => {
   const read = device.readCharacteristicForService;
   if (typeof read !== "function") {
     return;
   }
   const info = {};
-  const values = [["name", "00001800-0000-1000-8000-00805f9b34fb", "00002a00-0000-1000-8000-00805f9b34fb"], ["manufacturerName", "0000180a-0000-1000-8000-00805f9b34fb", "00002a29-0000-1000-8000-00805f9b34fb"], ["model", "0000180a-0000-1000-8000-00805f9b34fb", "00002a24-0000-1000-8000-00805f9b34fb"], ["serialNumber", "0000180a-0000-1000-8000-00805f9b34fb", "00002a25-0000-1000-8000-00805f9b34fb"]];
-  let pending = values;
-  for (let attempt = 0; attempt <= MAX_PAIRING_RETRIES; attempt += 1) {
-    const retry = [];
-    for (const [key, serviceUuid, characteristicUuid] of pending) {
-      try {
-        const characteristic = await read.call(device, serviceUuid, characteristicUuid);
-        const value = characteristic?.value;
-        if (!value) {
-          continue;
-        }
-        const text = Buffer.from(value, "base64").toString("utf8").replace(/\0+$/, "").trim();
-        if (text) {
-          info[key] = text;
-        }
-      } catch (error) {
-        // Optional GAP/Device Information characteristics are not present on every device.
-        sentryLogger("info", "DEVICE: Optional device information unavailable", {
-          characteristicUuid,
-          errorCode: toBluetoothError(error).code
-        });
-        if (attempt < MAX_PAIRING_RETRIES && isPairingAuthenticationError(error)) {
-          retry.push([key, serviceUuid, characteristicUuid]);
-        }
+  for (const [key, serviceUuid, characteristicUuid] of INFORMATION_CHARACTERISTICS) {
+    try {
+      const characteristic = await retryAfterPairing(() => read.call(device, serviceUuid, characteristicUuid));
+      const text = characteristic?.value ? textOf(characteristic.value) : "";
+      if (text) {
+        info[key] = text;
       }
+    } catch (error) {
+      // Optional GAP/Device Information characteristics are not present on every device.
+      sentryLogger("info", "DEVICE: Optional device information unavailable", {
+        characteristicUuid,
+        errorCode: toBluetoothError(error).code
+      });
     }
-    if (!retry.length) {
-      break;
-    }
-    await wait(PAIRING_RETRY_DELAY_MS * (attempt + 1));
-    pending = retry;
   }
   if (Object.keys(info).length > 0) {
     onDeviceInfo?.(info);

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

@@ -1 +1 @@
-{"version":3,"names":["Buffer","sentryLogger","toBluetoothError","MAX_PAIRING_RETRIES","PAIRING_RETRY_DELAY_MS","isPairingAuthenticationError","error","text","Error","message","String","test","wait","milliseconds","Promise","resolve","setTimeout","readDeviceInformation","device","onDeviceInfo","read","readCharacteristicForService","info","values","pending","attempt","retry","key","serviceUuid","characteristicUuid","characteristic","call","value","from","toString","replace","trim","errorCode","code","push","length","Object","keys"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-device-information.ts"],"mappings":";;AAAA,SAASA,MAAM,QAAQ,QAAQ;AAI/B,SAASC,YAAY,QAAQ,yCAAsC;AACnE,SAASC,gBAAgB,QAAQ,gCAA6B;AAS9D,MAAMC,mBAAmB,GAAG,CAAC;AAC7B,MAAMC,sBAAsB,GAAG,KAAK;AAEpC,MAAMC,4BAA4B,GAAIC,KAAc,IAAc;EAChE,MAAMC,IAAI,GAAGD,KAAK,YAAYE,KAAK,GAAGF,KAAK,CAACG,OAAO,GAAGC,MAAM,CAACJ,KAAK,CAAC;EAEnE,OAAO,kFAAkF,CAACK,IAAI,CAC5FJ,IACF,CAAC;AACH,CAAC;AAED,MAAMK,IAAI,GAAIC,YAAoB,IAChC,IAAIC,OAAO,CAAEC,OAAO,IAAKC,UAAU,CAACD,OAAO,EAAEF,YAAY,CAAC,CAAC;AAE7D,MAAMI,qBAAqB,GAAG,MAAAA,CAC5BC,MAAc,EACdC,YAAkD,KAChC;EAClB,MAAMC,IAAI,GAAGF,MAAM,CAACG,4BAA4B;EAEhD,IAAI,OAAOD,IAAI,KAAK,UAAU,EAAE;IAC9B;EACF;EAEA,MAAME,IAAyB,GAAG,CAAC,CAAC;EAEpC,MAAMC,MAA8D,GAAG,CACrE,CAAC,MAAM,EAAE,sCAAsC,EAAE,sCAAsC,CAAC,EACxF,CAAC,kBAAkB,EAAE,sCAAsC,EAAE,sCAAsC,CAAC,EACpG,CAAC,OAAO,EAAE,sCAAsC,EAAE,sCAAsC,CAAC,EACzF,CAAC,cAAc,EAAE,sCAAsC,EAAE,sCAAsC,CAAC,CACjG;EAED,IAAIC,OAAO,GAAGD,MAAM;EAEpB,KAAK,IAAIE,OAAO,GAAG,CAAC,EAAEA,OAAO,IAAItB,mBAAmB,EAAEsB,OAAO,IAAI,CAAC,EAAE;IAClE,MAAMC,KAAK,GAAG,EAA6B;IAE3C,KAAK,MAAM,CAACC,GAAG,EAAEC,WAAW,EAAEC,kBAAkB,CAAC,IAAIL,OAAO,EAAE;MAC5D,IAAI;QACF,MAAMM,cAAc,GAAG,MAAMV,IAAI,CAACW,IAAI,CACpCb,MAAM,EACNU,WAAW,EACXC,kBACF,CAAC;QAED,MAAMG,KAAK,GAAGF,cAAc,EAAEE,KAAK;QAEnC,IAAI,CAACA,KAAK,EAAE;UACV;QACF;QAEA,MAAMzB,IAAI,GAAGP,MAAM,CAACiC,IAAI,CAACD,KAAK,EAAE,QAAQ,CAAC,CACtCE,QAAQ,CAAC,MAAM,CAAC,CAChBC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CACnBC,IAAI,CAAC,CAAC;QAET,IAAI7B,IAAI,EAAE;UACRe,IAAI,CAACK,GAAG,CAAC,GAAGpB,IAAI;QAClB;MACF,CAAC,CAAC,OAAOD,KAAK,EAAE;QACd;QACAL,YAAY,CAAC,MAAM,EAAE,iDAAiD,EAAE;UACtE4B,kBAAkB;UAClBQ,SAAS,EAAEnC,gBAAgB,CAACI,KAAK,CAAC,CAACgC;QACrC,CAAC,CAAC;QAEF,IAAIb,OAAO,GAAGtB,mBAAmB,IAAIE,4BAA4B,CAACC,KAAK,CAAC,EAAE;UACxEoB,KAAK,CAACa,IAAI,CAAC,CAACZ,GAAG,EAAEC,WAAW,EAAEC,kBAAkB,CAAC,CAAC;QACpD;MACF;IACF;IAEA,IAAI,CAACH,KAAK,CAACc,MAAM,EAAE;MACjB;IACF;IAEA,MAAM5B,IAAI,CAACR,sBAAsB,IAAIqB,OAAO,GAAG,CAAC,CAAC,CAAC;IAClDD,OAAO,GAAGE,KAAK;EACjB;EAEA,IAAIe,MAAM,CAACC,IAAI,CAACpB,IAAI,CAAC,CAACkB,MAAM,GAAG,CAAC,EAAE;IAChCrB,YAAY,GAAGG,IAAI,CAAC;EACtB;AACF,CAAC;AAED,SAASL,qBAAqB","ignoreList":[]}
+{"version":3,"names":["Buffer","sentryLogger","toBluetoothError","runOnce","GENERIC_ACCESS_SERVICE","DEVICE_INFORMATION_SERVICE","INFORMATION_CHARACTERISTICS","textOf","base64","from","toString","replace","trim","readDeviceInformation","device","onDeviceInfo","retryAfterPairing","read","readCharacteristicForService","info","key","serviceUuid","characteristicUuid","characteristic","call","text","value","error","errorCode","code","Object","keys","length"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-device-information.ts"],"mappings":";;AAAA,SAASA,MAAM,QAAQ,QAAQ;AAI/B,SAASC,YAAY,QAAQ,yCAAsC;AACnE,SAASC,gBAAgB,QAAQ,gCAA6B;AAE9D,SAAuBC,OAAO,QAAQ,uBAAoB;AAS1D,MAAMC,sBAAsB,GAAG,sCAAsC;AACrE,MAAMC,0BAA0B,GAAG,sCAAsC;AAEzE,MAAMC,2BAAmF,GAAG,CAC1F,CAAC,MAAM,EAAEF,sBAAsB,EAAE,sCAAsC,CAAC,EACxE,CAAC,kBAAkB,EAAEC,0BAA0B,EAAE,sCAAsC,CAAC,EACxF,CAAC,OAAO,EAAEA,0BAA0B,EAAE,sCAAsC,CAAC,EAC7E,CAAC,cAAc,EAAEA,0BAA0B,EAAE,sCAAsC,CAAC,CACrF;AAED,MAAME,MAAM,GAAIC,MAAc,IAC5BR,MAAM,CAACS,IAAI,CAACD,MAAM,EAAE,QAAQ,CAAC,CAACE,QAAQ,CAAC,MAAM,CAAC,CAACC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAACC,IAAI,CAAC,CAAC;AAE3E,MAAMC,qBAAqB,GAAG,MAAAA,CAC5BC,MAAc,EACdC,YAAkD,EAClDC,iBAA+B,GAAGb,OAAO,KACvB;EAClB,MAAMc,IAAI,GAAGH,MAAM,CAACI,4BAA4B;EAEhD,IAAI,OAAOD,IAAI,KAAK,UAAU,EAAE;IAC9B;EACF;EAEA,MAAME,IAAyB,GAAG,CAAC,CAAC;EAEpC,KAAK,MAAM,CAACC,GAAG,EAAEC,WAAW,EAAEC,kBAAkB,CAAC,IAAIhB,2BAA2B,EAAE;IAChF,IAAI;MACF,MAAMiB,cAAc,GAAG,MAAMP,iBAAiB,CAAC,MAC7CC,IAAI,CAACO,IAAI,CAACV,MAAM,EAAEO,WAAW,EAAEC,kBAAkB,CACnD,CAAC;MAED,MAAMG,IAAI,GAAGF,cAAc,EAAEG,KAAK,GAAGnB,MAAM,CAACgB,cAAc,CAACG,KAAK,CAAC,GAAG,EAAE;MAEtE,IAAID,IAAI,EAAE;QACRN,IAAI,CAACC,GAAG,CAAC,GAAGK,IAAI;MAClB;IACF,CAAC,CAAC,OAAOE,KAAK,EAAE;MACd;MACA1B,YAAY,CAAC,MAAM,EAAE,iDAAiD,EAAE;QACtEqB,kBAAkB;QAClBM,SAAS,EAAE1B,gBAAgB,CAACyB,KAAK,CAAC,CAACE;MACrC,CAAC,CAAC;IACJ;EACF;EAEA,IAAIC,MAAM,CAACC,IAAI,CAACZ,IAAI,CAAC,CAACa,MAAM,GAAG,CAAC,EAAE;IAChCjB,YAAY,GAAGI,IAAI,CAAC;EACtB;AACF,CAAC;AAED,SAASN,qBAAqB","ignoreList":[]}