incyclist-devices 3.0.17 → 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/peripheral.js

@@ -50,6 +50,7 @@ class BlePeripheral {
         if (this.connectPromise !== undefined) {
             return this.connectPromise.then(() => this.connected);
         }
+        let address;
         this.connectPromise = new Promise((done) => {
             const peripheral = this.getPeripheral();
             this.connected = false;
@@ -60,7 +61,8 @@ class BlePeripheral {
             if (!this.ble.isConnected()) {
                 return done();
             }
-            this.logEvent({ message: 'connect peripheral', address: peripheral.address });
+            address = peripheral.address;
+            this.logEvent({ message: 'connect peripheral', address });
             peripheral.connectAsync().then(() => {
                 this.ble.registerConnected(this, peripheralId);
                 peripheral.once('disconnect', () => { this.onPeripheralDisconnect(); });
@@ -75,11 +77,12 @@ class BlePeripheral {
         });
         await this.connectPromise;
         delete this.connectPromise;
+        this.logEvent({ message: 'connect peripheral result', address, connected: this.connected });
         return this.connected;
     }
     async disconnect(connectionLost = false) {
         this.disconnecting = true;
-        if (this.isConnected()) {
+        if (this.isConnected() || connectionLost) {
             await this.unsubscribeAll(connectionLost);
         }
         Object.keys(this.characteristics).forEach(uuid => {
@@ -101,13 +104,14 @@ class BlePeripheral {
                     .catch(() => { });
             }
             peripheral.removeAllListeners();
+            this.ble.unregisterConnected(peripheral.id);
         }
         else {
             delete this.onDisconnectHandler;
         }
-        this.ble.unregisterConnected(peripheral.id);
         this.connected = false;
         this.disconnecting = false;
+        this.logEvent({ message: 'peripheral disconnect completed', address: peripheral.address });
         return !this.connected;
     }
     isConnected() {
@@ -200,8 +204,12 @@ class BlePeripheral {
     }
     async subscribe(characteristicUUID, callback) {
         try {
-            if (this.disconnecting || !this.connected)
+            if (this.disconnecting || !this.connected) {
+                this.logEvent({ message: 'peripheral subscribe failed', uuid: characteristicUUID, reason: 'not connected',
+                    disconnecting: this.disconnecting, connected: this.connected
+                });
                 return false;
+            }
             const uuid = (0, utils_js_2.beautifyUUID)(characteristicUUID);
             const onData = (data, isNotify) => {
                 try {
@@ -211,6 +219,7 @@ class BlePeripheral {
             };
             const subscription = this.subscribed.find(s => s.uuid === uuid);
             if (subscription) {
+                this.logEvent({ message: 'peripheral subscribe skipped', uuid: characteristicUUID, reason: 'already subscribed' });
                 const c = this.getRawCharacteristic(characteristicUUID);
                 if (c) {
                     c.off('data', onData);
@@ -220,11 +229,13 @@ class BlePeripheral {
             }
             let c = await this.queryRawCharacteristic(characteristicUUID).catch(() => null);
             if (!c) {
+                this.logEvent({ message: 'peripheral subscribe failed', uuid: characteristicUUID, reason: 'not found' });
                 return false;
             }
             return new Promise((resolve, reject) => {
                 const info = this.subscribed.find(s => s.uuid === characteristicUUID);
                 if (info) {
+                    this.logEvent({ message: 'peripheral subscribe skipped', uuid: characteristicUUID, reason: 'already subscribed' });
                     return Promise.resolve(true);
                 }
                 this.logEvent({ message: 'subscribe request', address: this.getPeripheral().address, characteristic: uuid, success: true });
@@ -287,6 +298,8 @@ class BlePeripheral {
         }
     }
     async subscribeSelected(characteristics, callback) {
+        const uuids = characteristics != null ? characteristics.map(c => (0, utils_js_2.beautifyUUID)(c)).join('|') : 'none';
+        this.logEvent({ message: 'peripheral subscribe selected', uuids });
         if (!this.discoveredServiceUUIds) {
             try {
                 await this.discoverServices();
@@ -349,6 +362,7 @@ class BlePeripheral {
         }
     }
     async subscribeAll(callback) {
+        this.logEvent({ message: 'peripheral subscribe all' });
         if (!this.discoveredServiceUUIds) {
             try {
                 await this.discoverServices();
@@ -360,6 +374,7 @@ class BlePeripheral {
         return success;
     }
     async unsubscribeAll(connectionLost = false) {
+        this.logEvent({ message: 'peripheral unsubscribe all', connectionLost });
         if (connectionLost) {
             this.subscribed = [];
             return;

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/peripheral.js

@@ -47,6 +47,7 @@ export class BlePeripheral {
         if (this.connectPromise !== undefined) {
             return this.connectPromise.then(() => this.connected);
         }
+        let address;
         this.connectPromise = new Promise((done) => {
             const peripheral = this.getPeripheral();
             this.connected = false;
@@ -57,7 +58,8 @@ export class BlePeripheral {
             if (!this.ble.isConnected()) {
                 return done();
             }
-            this.logEvent({ message: 'connect peripheral', address: peripheral.address });
+            address = peripheral.address;
+            this.logEvent({ message: 'connect peripheral', address });
             peripheral.connectAsync().then(() => {
                 this.ble.registerConnected(this, peripheralId);
                 peripheral.once('disconnect', () => { this.onPeripheralDisconnect(); });
@@ -72,11 +74,12 @@ export class BlePeripheral {
         });
         await this.connectPromise;
         delete this.connectPromise;
+        this.logEvent({ message: 'connect peripheral result', address, connected: this.connected });
         return this.connected;
     }
     async disconnect(connectionLost = false) {
         this.disconnecting = true;
-        if (this.isConnected()) {
+        if (this.isConnected() || connectionLost) {
             await this.unsubscribeAll(connectionLost);
         }
         Object.keys(this.characteristics).forEach(uuid => {
@@ -98,13 +101,14 @@ export class BlePeripheral {
                     .catch(() => { });
             }
             peripheral.removeAllListeners();
+            this.ble.unregisterConnected(peripheral.id);
         }
         else {
             delete this.onDisconnectHandler;
         }
-        this.ble.unregisterConnected(peripheral.id);
         this.connected = false;
         this.disconnecting = false;
+        this.logEvent({ message: 'peripheral disconnect completed', address: peripheral.address });
         return !this.connected;
     }
     isConnected() {
@@ -197,8 +201,12 @@ export class BlePeripheral {
     }
     async subscribe(characteristicUUID, callback) {
         try {
-            if (this.disconnecting || !this.connected)
+            if (this.disconnecting || !this.connected) {
+                this.logEvent({ message: 'peripheral subscribe failed', uuid: characteristicUUID, reason: 'not connected',
+                    disconnecting: this.disconnecting, connected: this.connected
+                });
                 return false;
+            }
             const uuid = beautifyUUID(characteristicUUID);
             const onData = (data, isNotify) => {
                 try {
@@ -208,6 +216,7 @@ export class BlePeripheral {
             };
             const subscription = this.subscribed.find(s => s.uuid === uuid);
             if (subscription) {
+                this.logEvent({ message: 'peripheral subscribe skipped', uuid: characteristicUUID, reason: 'already subscribed' });
                 const c = this.getRawCharacteristic(characteristicUUID);
                 if (c) {
                     c.off('data', onData);
@@ -217,11 +226,13 @@ export class BlePeripheral {
             }
             let c = await this.queryRawCharacteristic(characteristicUUID).catch(() => null);
             if (!c) {
+                this.logEvent({ message: 'peripheral subscribe failed', uuid: characteristicUUID, reason: 'not found' });
                 return false;
             }
             return new Promise((resolve, reject) => {
                 const info = this.subscribed.find(s => s.uuid === characteristicUUID);
                 if (info) {
+                    this.logEvent({ message: 'peripheral subscribe skipped', uuid: characteristicUUID, reason: 'already subscribed' });
                     return Promise.resolve(true);
                 }
                 this.logEvent({ message: 'subscribe request', address: this.getPeripheral().address, characteristic: uuid, success: true });
@@ -284,6 +295,8 @@ export class BlePeripheral {
         }
     }
     async subscribeSelected(characteristics, callback) {
+        const uuids = characteristics != null ? characteristics.map(c => beautifyUUID(c)).join('|') : 'none';
+        this.logEvent({ message: 'peripheral subscribe selected', uuids });
         if (!this.discoveredServiceUUIds) {
             try {
                 await this.discoverServices();
@@ -346,6 +359,7 @@ export class BlePeripheral {
         }
     }
     async subscribeAll(callback) {
+        this.logEvent({ message: 'peripheral subscribe all' });
         if (!this.discoveredServiceUUIds) {
             try {
                 await this.discoverServices();
@@ -357,6 +371,7 @@ export class BlePeripheral {
         return success;
     }
     async unsubscribeAll(connectionLost = false) {
+        this.logEvent({ message: 'peripheral unsubscribe all', connectionLost });
         if (connectionLost) {
             this.subscribed = [];
             return;

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.17",
+    "version": "3.0.19",
     "scripts": {
         "lint": "eslint . --ext .ts",
         "build": "npm run build:esm && npm run build:cjs",