incyclist-devices 3.0.18 → 3.0.19

package/lib/cjs/ble/base/adapter.js

@@ -359,7 +359,7 @@ class BleAdapter extends adpater_js_1.default {
         sensor.off('data', this.onDeviceDataHandler);
         let connected = false;
         if (sensor.isReconnectBusy()) {
-            connected = await sensor.reconnectSensor();
+            connected = await sensor.reconnectSensor(false);
         }
         if (connected) {
             sensor.on('data', this.onDeviceDataHandler);

package/lib/cjs/ble/base/sensor.js

@@ -112,18 +112,19 @@ class TBleSensor extends node_events_1.EventEmitter {
     isReconnectBusy() {
         return (this.reconnectPromise !== undefined);
     }
-    async reconnectSensor() {
+    async reconnectSensor(connectionLost = true) {
         if (this.reconnectPromise !== undefined) {
             return await this.reconnectPromise;
         }
-        this.reconnectPromise = this.doReconnectSensor();
+        this.reconnectPromise = this.doReconnectSensor(connectionLost);
         const res = await this.reconnectPromise;
         delete this.reconnectPromise;
         return res;
     }
-    async doReconnectSensor() {
+    async doReconnectSensor(connectionLost = true) {
         this.onDisconnect();
-        this.logEvent({ message: 'reconnect sensor' });
+        const { name, address } = this.peripheral?.getInfo() ?? {};
+        this.logEvent({ message: 'reconnect sensor', name, address, connectionLost });
         let connected = false;
         let subscribed = false;
         let success = false;
@@ -143,8 +144,8 @@ class TBleSensor extends node_events_1.EventEmitter {
             if (!success) {
                 await (0, utils_js_1.sleep)(1000);
             }
-            if (!this.stopRequested)
-                this.logEvent({ message: 'reconnect sensor retry' });
+            if (!this.stopRequested && !success)
+                this.logEvent({ message: 'reconnect sensor retry', name, address });
         } while (!success || this.stopRequested);
         this.logEvent({ message: 'reconnect sensor completed', success, stopRequested: this.stopRequested });
         return success;

package/lib/cjs/ble/fm/sensor.js

@@ -22,6 +22,7 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
     windSpeed = 0;
     wheelSize = 2100;
     ftmsServiceData;
+    ftmsServiceDataAttempts = 0;
     rowerDataTS;
     rowerMaxPower;
     constructor(peripheral, props) {
@@ -102,6 +103,7 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
     }
     onDisconnect() {
         this.hasControl = false;
+        this.ftmsServiceDataAttempts = 0;
     }
     async requestControl() {
         if (this.hasControl) {
@@ -472,11 +474,14 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
     parseServiceData() {
         if (this.ftmsServiceData)
             return this.ftmsServiceData;
+        if (this.ftmsServiceDataAttempts > 3)
+            return this.ftmsServiceData;
         try {
             const peripheral = this.peripheral;
             if (peripheral?.getServiceData === undefined)
                 return;
             const bitSet = (value, bitNo) => (value & (0, utils_js_1.bit)(bitNo)) > 0;
+            this.ftmsServiceDataAttempts++;
             const data = peripheral.getServiceData(consts_js_1.FTMS);
             const dataLength = data?.length ?? 0;
             if (dataLength >= 2) {

package/lib/esm/ble/base/adapter.js

@@ -354,7 +354,7 @@ export default class BleAdapter extends IncyclistDevice {
         sensor.off('data', this.onDeviceDataHandler);
         let connected = false;
         if (sensor.isReconnectBusy()) {
-            connected = await sensor.reconnectSensor();
+            connected = await sensor.reconnectSensor(false);
         }
         if (connected) {
             sensor.on('data', this.onDeviceDataHandler);

package/lib/esm/ble/base/sensor.js

@@ -109,18 +109,19 @@ export class TBleSensor extends EventEmitter {
     isReconnectBusy() {
         return (this.reconnectPromise !== undefined);
     }
-    async reconnectSensor() {
+    async reconnectSensor(connectionLost = true) {
         if (this.reconnectPromise !== undefined) {
             return await this.reconnectPromise;
         }
-        this.reconnectPromise = this.doReconnectSensor();
+        this.reconnectPromise = this.doReconnectSensor(connectionLost);
         const res = await this.reconnectPromise;
         delete this.reconnectPromise;
         return res;
     }
-    async doReconnectSensor() {
+    async doReconnectSensor(connectionLost = true) {
         this.onDisconnect();
-        this.logEvent({ message: 'reconnect sensor' });
+        const { name, address } = this.peripheral?.getInfo() ?? {};
+        this.logEvent({ message: 'reconnect sensor', name, address, connectionLost });
         let connected = false;
         let subscribed = false;
         let success = false;
@@ -140,8 +141,8 @@ export class TBleSensor extends EventEmitter {
             if (!success) {
                 await sleep(1000);
             }
-            if (!this.stopRequested)
-                this.logEvent({ message: 'reconnect sensor retry' });
+            if (!this.stopRequested && !success)
+                this.logEvent({ message: 'reconnect sensor retry', name, address });
         } while (!success || this.stopRequested);
         this.logEvent({ message: 'reconnect sensor completed', success, stopRequested: this.stopRequested });
         return success;

package/lib/esm/ble/fm/sensor.js

@@ -20,6 +20,7 @@ export default class BleFitnessMachineDevice extends TBleSensor {
     windSpeed = 0;
     wheelSize = 2100;
     ftmsServiceData;
+    ftmsServiceDataAttempts = 0;
     rowerDataTS;
     rowerMaxPower;
     constructor(peripheral, props) {
@@ -100,6 +101,7 @@ export default class BleFitnessMachineDevice extends TBleSensor {
     }
     onDisconnect() {
         this.hasControl = false;
+        this.ftmsServiceDataAttempts = 0;
     }
     async requestControl() {
         if (this.hasControl) {
@@ -470,11 +472,14 @@ export default class BleFitnessMachineDevice extends TBleSensor {
     parseServiceData() {
         if (this.ftmsServiceData)
             return this.ftmsServiceData;
+        if (this.ftmsServiceDataAttempts > 3)
+            return this.ftmsServiceData;
         try {
             const peripheral = this.peripheral;
             if (peripheral?.getServiceData === undefined)
                 return;
             const bitSet = (value, bitNo) => (value & bit(bitNo)) > 0;
+            this.ftmsServiceDataAttempts++;
             const data = peripheral.getServiceData(FTMS);
             const dataLength = data?.length ?? 0;
             if (dataLength >= 2) {

package/lib/types/ble/base/sensor.d.ts

@@ -28,8 +28,8 @@ export declare class TBleSensor extends EventEmitter implements IBleSensor {
     subscribe(): Promise<boolean>;
     stopSensor(): Promise<boolean>;
     isReconnectBusy(): boolean;
-    reconnectSensor(): Promise<boolean>;
-    doReconnectSensor(): Promise<boolean>;
+    reconnectSensor(connectionLost?: boolean): Promise<boolean>;
+    doReconnectSensor(connectionLost?: boolean): Promise<boolean>;
     reset(): void;
     isConnected(): boolean;
     isSubscribed(): boolean;

package/lib/types/ble/fm/sensor.d.ts

@@ -19,6 +19,7 @@ export default class BleFitnessMachineDevice extends TBleSensor {
     protected windSpeed: number;
     protected wheelSize: number;
     protected ftmsServiceData: FtmsServiceData;
+    protected ftmsServiceDataAttempts: number;
     protected rowerDataTS: number | undefined;
     protected rowerMaxPower: number | undefined;
     constructor(peripheral: IBlePeripheral, props?: any);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "incyclist-devices",
-    "version": "3.0.18",
+    "version": "3.0.19",
     "scripts": {
         "lint": "eslint . --ext .ts",
         "build": "npm run build:esm && npm run build:cjs",