incyclist-devices 3.0.5 → 3.0.6

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

@@ -349,9 +349,21 @@ class BleAdapter extends adpater_js_1.default {
     }
     async restart(pause) {
         const sensor = this.getSensor();
+        sensor.off('data', this.onDeviceDataHandler);
+        let connected = false;
+        if (sensor.isReconnectBusy()) {
+            connected = await sensor.reconnectSensor();
+        }
+        if (connected) {
+            sensor.on('data', this.onDeviceDataHandler);
+            return true;
+        }
         await sensor.getPeripheral().disconnect();
-        const res = await super.restart(pause);
-        return res;
+        const success = await super.restart(pause);
+        if (success) {
+            sensor.on('data', this.onDeviceDataHandler);
+        }
+        return success;
     }
     async stop() {
         this.logEvent({ message: 'stopping device', device: this.getName(), interface: this.getInterface() });

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

@@ -29,7 +29,7 @@ class BlePeripheral {
         return this.announcement.serviceUUIDs.map(s => (0, utils_js_1.beautifyUUID)(s));
     }
     getDiscoveredServices() {
-        return this.discoveredServiceUUIds;
+        return this.discoveredServiceUUIds ?? [];
     }
     getInfo() {
         return {
@@ -47,13 +47,16 @@ class BlePeripheral {
         this.connectPromise = new Promise((done) => {
             const peripheral = this.getPeripheral();
             this.connected = false;
+            if (!peripheral?.id)
+                return done();
+            const peripheralId = peripheral.id;
             this.ble.unregisterConnected(peripheral.id);
             if (!this.ble.isConnected()) {
                 return done();
             }
             this.logEvent({ message: 'connect peripheral', address: peripheral.address });
             peripheral.connectAsync().then(() => {
-                this.ble.registerConnected(this, peripheral.id);
+                this.ble.registerConnected(this, peripheralId);
                 peripheral.once('disconnect', () => { this.onPeripheralDisconnect(); });
                 peripheral.on('error', this.onErrorHandler);
                 this.connected = true;
@@ -131,14 +134,20 @@ class BlePeripheral {
             return [];
         if (this.getPeripheral().discoverServicesAsync) {
             this.logEvent({ message: 'discover services', address: this.getPeripheral().address });
-            const services = await this.getPeripheral().discoverServicesAsync([]);
+            const peripheral = this.getPeripheral();
+            let services = [];
+            if (peripheral?.discoverServicesAsync) {
+                services = await peripheral.discoverServicesAsync([]);
+            }
             this.discoveredServiceUUIds = services.map(s => (0, utils_js_1.beautifyUUID)(s.uuid));
+            this.logEvent({ message: 'discover services result', address: this.getPeripheral().address, services: this.discoveredServiceUUIds });
             return services.map(s => s.uuid);
         }
         else {
             this.logEvent({ message: 'discover services and characteristics', address: this.getPeripheral().address });
             const res = await this.getPeripheral().discoverSomeServicesAndCharacteristicsAsync([], []);
             this.discoveredServiceUUIds = res.services.map(s => (0, utils_js_1.beautifyUUID)(s.uuid));
+            this.logEvent({ message: 'discover services result', address: this.getPeripheral().address, services: this.discoveredServiceUUIds });
             return res.services.map(s => s.uuid);
         }
     }

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

@@ -9,7 +9,9 @@ class TBleSensor extends node_events_1.EventEmitter {
     peripheral;
     static protocol;
     logger;
-    stopRequested;
+    stopRequested = false;
+    subscribeSuccess = false;
+    reconnectPromise;
     onDataHandler;
     logEvent(event, ...args) {
         this.logger.logEvent(event, ...args);
@@ -82,23 +84,40 @@ class TBleSensor extends node_events_1.EventEmitter {
     async subscribe() {
         const selected = this.getRequiredCharacteristics();
         if (selected === null) {
-            const res = await this.peripheral.subscribeAll(this.onDataHandler);
+            const res = this.peripheral?.subscribeAll ? await this.peripheral.subscribeAll(this.onDataHandler) : false;
+            this.subscribeSuccess = res;
             return res;
         }
         if (selected.length === 0) {
+            this.subscribeSuccess = true;
             return true;
         }
         const res = await this.peripheral.subscribeSelected(selected, this.onDataHandler);
+        this.subscribeSuccess = res;
         return res;
     }
     async stopSensor() {
+        this.onDisconnect();
         this.removeAllListeners();
         if (!this.peripheral)
             return true;
         this.stopRequested = true;
         return await this.peripheral.disconnect();
     }
+    isReconnectBusy() {
+        return (this.reconnectPromise !== undefined);
+    }
     async reconnectSensor() {
+        if (this.reconnectPromise !== undefined) {
+            return await this.reconnectPromise;
+        }
+        this.reconnectPromise = this.doReconnectSensor();
+        const res = await this.reconnectPromise;
+        delete this.reconnectPromise;
+        return res;
+    }
+    async doReconnectSensor() {
+        this.onDisconnect();
         this.logEvent({ message: 'reconnect sensor' });
         let connected = false;
         let subscribed = false;
@@ -115,6 +134,8 @@ class TBleSensor extends node_events_1.EventEmitter {
                 await (0, utils_js_1.sleep)(1000);
             }
         } while (!success || this.stopRequested);
+        this.logEvent({ message: 'reconnect sensor completed', success, stopRequested: this.stopRequested });
+        return success;
     }
     reset() {
         throw new Error("Method not implemented.");
@@ -122,6 +143,12 @@ class TBleSensor extends node_events_1.EventEmitter {
     isConnected() {
         return this.peripheral?.isConnected();
     }
+    isSubscribed() {
+        return this.subscribeSuccess;
+    }
+    onDisconnect() {
+        this.subscribeSuccess = false;
+    }
     read(characteristicUUID) {
         if (!this.isConnected()) {
             return Promise.reject(new Error('not connected'));

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

@@ -76,10 +76,15 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
     getCw() { return this.cw; }
     setWindSpeed(windSpeed) { this.windSpeed = windSpeed; }
     getWindSpeed() { return this.windSpeed; }
+    onDisconnect() {
+        this.hasControl = false;
+    }
     async requestControl() {
         if (this.hasControl) {
             return true;
         }
+        if (!this.isSubscribed())
+            return false;
         if (this.features?.setPower === false && this.features?.setSlope === false && this.features?.setResistance === false) {
             return true;
         }
@@ -98,6 +103,8 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
         return this.hasControl;
     }
     async setTargetPower(power) {
+        if (!this.isSubscribed())
+            return false;
         this.logEvent({ message: 'setTargetPower', device: this.getName(), power, skip: (this.data.targetPower !== undefined && this.data.targetPower === power) });
         if (this.data.targetPower !== undefined && this.data.targetPower === power)
             return true;
@@ -116,6 +123,8 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
         return (res === 1);
     }
     async setTargetResistanceLevel(resistanceLevel) {
+        if (!this.isSubscribed())
+            return false;
         this.logEvent({ message: 'setTargetResistanceLevel', device: this.getName(), resistanceLevel, skip: (this.data.resistanceLevel !== undefined && this.data.resistanceLevel === resistanceLevel) });
         if (this.data.resistanceLevel !== undefined && this.data.resistanceLevel === resistanceLevel)
             return true;
@@ -136,6 +145,8 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
         return (res === 1);
     }
     async setSlope(slope) {
+        if (!this.isSubscribed())
+            return false;
         this.logEvent({ message: 'setSlope', device: this.getName(), slope });
         const { windSpeed, crr, cw } = this;
         return await this.setIndoorBikeSimulation(windSpeed, slope, crr, cw);

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

@@ -344,9 +344,21 @@ export default class BleAdapter extends IncyclistDevice {
     }
     async restart(pause) {
         const sensor = this.getSensor();
+        sensor.off('data', this.onDeviceDataHandler);
+        let connected = false;
+        if (sensor.isReconnectBusy()) {
+            connected = await sensor.reconnectSensor();
+        }
+        if (connected) {
+            sensor.on('data', this.onDeviceDataHandler);
+            return true;
+        }
         await sensor.getPeripheral().disconnect();
-        const res = await super.restart(pause);
-        return res;
+        const success = await super.restart(pause);
+        if (success) {
+            sensor.on('data', this.onDeviceDataHandler);
+        }
+        return success;
     }
     async stop() {
         this.logEvent({ message: 'stopping device', device: this.getName(), interface: this.getInterface() });

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

@@ -26,7 +26,7 @@ export class BlePeripheral {
         return this.announcement.serviceUUIDs.map(s => beautifyUUID(s));
     }
     getDiscoveredServices() {
-        return this.discoveredServiceUUIds;
+        return this.discoveredServiceUUIds ?? [];
     }
     getInfo() {
         return {
@@ -44,13 +44,16 @@ export class BlePeripheral {
         this.connectPromise = new Promise((done) => {
             const peripheral = this.getPeripheral();
             this.connected = false;
+            if (!peripheral?.id)
+                return done();
+            const peripheralId = peripheral.id;
             this.ble.unregisterConnected(peripheral.id);
             if (!this.ble.isConnected()) {
                 return done();
             }
             this.logEvent({ message: 'connect peripheral', address: peripheral.address });
             peripheral.connectAsync().then(() => {
-                this.ble.registerConnected(this, peripheral.id);
+                this.ble.registerConnected(this, peripheralId);
                 peripheral.once('disconnect', () => { this.onPeripheralDisconnect(); });
                 peripheral.on('error', this.onErrorHandler);
                 this.connected = true;
@@ -128,14 +131,20 @@ export class BlePeripheral {
             return [];
         if (this.getPeripheral().discoverServicesAsync) {
             this.logEvent({ message: 'discover services', address: this.getPeripheral().address });
-            const services = await this.getPeripheral().discoverServicesAsync([]);
+            const peripheral = this.getPeripheral();
+            let services = [];
+            if (peripheral?.discoverServicesAsync) {
+                services = await peripheral.discoverServicesAsync([]);
+            }
             this.discoveredServiceUUIds = services.map(s => beautifyUUID(s.uuid));
+            this.logEvent({ message: 'discover services result', address: this.getPeripheral().address, services: this.discoveredServiceUUIds });
             return services.map(s => s.uuid);
         }
         else {
             this.logEvent({ message: 'discover services and characteristics', address: this.getPeripheral().address });
             const res = await this.getPeripheral().discoverSomeServicesAndCharacteristicsAsync([], []);
             this.discoveredServiceUUIds = res.services.map(s => beautifyUUID(s.uuid));
+            this.logEvent({ message: 'discover services result', address: this.getPeripheral().address, services: this.discoveredServiceUUIds });
             return res.services.map(s => s.uuid);
         }
     }

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

@@ -6,7 +6,9 @@ export class TBleSensor extends EventEmitter {
     peripheral;
     static protocol;
     logger;
-    stopRequested;
+    stopRequested = false;
+    subscribeSuccess = false;
+    reconnectPromise;
     onDataHandler;
     logEvent(event, ...args) {
         this.logger.logEvent(event, ...args);
@@ -79,23 +81,40 @@ export class TBleSensor extends EventEmitter {
     async subscribe() {
         const selected = this.getRequiredCharacteristics();
         if (selected === null) {
-            const res = await this.peripheral.subscribeAll(this.onDataHandler);
+            const res = this.peripheral?.subscribeAll ? await this.peripheral.subscribeAll(this.onDataHandler) : false;
+            this.subscribeSuccess = res;
             return res;
         }
         if (selected.length === 0) {
+            this.subscribeSuccess = true;
             return true;
         }
         const res = await this.peripheral.subscribeSelected(selected, this.onDataHandler);
+        this.subscribeSuccess = res;
         return res;
     }
     async stopSensor() {
+        this.onDisconnect();
         this.removeAllListeners();
         if (!this.peripheral)
             return true;
         this.stopRequested = true;
         return await this.peripheral.disconnect();
     }
+    isReconnectBusy() {
+        return (this.reconnectPromise !== undefined);
+    }
     async reconnectSensor() {
+        if (this.reconnectPromise !== undefined) {
+            return await this.reconnectPromise;
+        }
+        this.reconnectPromise = this.doReconnectSensor();
+        const res = await this.reconnectPromise;
+        delete this.reconnectPromise;
+        return res;
+    }
+    async doReconnectSensor() {
+        this.onDisconnect();
         this.logEvent({ message: 'reconnect sensor' });
         let connected = false;
         let subscribed = false;
@@ -112,6 +131,8 @@ export class TBleSensor extends EventEmitter {
                 await sleep(1000);
             }
         } while (!success || this.stopRequested);
+        this.logEvent({ message: 'reconnect sensor completed', success, stopRequested: this.stopRequested });
+        return success;
     }
     reset() {
         throw new Error("Method not implemented.");
@@ -119,6 +140,12 @@ export class TBleSensor extends EventEmitter {
     isConnected() {
         return this.peripheral?.isConnected();
     }
+    isSubscribed() {
+        return this.subscribeSuccess;
+    }
+    onDisconnect() {
+        this.subscribeSuccess = false;
+    }
     read(characteristicUUID) {
         if (!this.isConnected()) {
             return Promise.reject(new Error('not connected'));

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

@@ -74,10 +74,15 @@ export default class BleFitnessMachineDevice extends TBleSensor {
     getCw() { return this.cw; }
     setWindSpeed(windSpeed) { this.windSpeed = windSpeed; }
     getWindSpeed() { return this.windSpeed; }
+    onDisconnect() {
+        this.hasControl = false;
+    }
     async requestControl() {
         if (this.hasControl) {
             return true;
         }
+        if (!this.isSubscribed())
+            return false;
         if (this.features?.setPower === false && this.features?.setSlope === false && this.features?.setResistance === false) {
             return true;
         }
@@ -96,6 +101,8 @@ export default class BleFitnessMachineDevice extends TBleSensor {
         return this.hasControl;
     }
     async setTargetPower(power) {
+        if (!this.isSubscribed())
+            return false;
         this.logEvent({ message: 'setTargetPower', device: this.getName(), power, skip: (this.data.targetPower !== undefined && this.data.targetPower === power) });
         if (this.data.targetPower !== undefined && this.data.targetPower === power)
             return true;
@@ -114,6 +121,8 @@ export default class BleFitnessMachineDevice extends TBleSensor {
         return (res === 1);
     }
     async setTargetResistanceLevel(resistanceLevel) {
+        if (!this.isSubscribed())
+            return false;
         this.logEvent({ message: 'setTargetResistanceLevel', device: this.getName(), resistanceLevel, skip: (this.data.resistanceLevel !== undefined && this.data.resistanceLevel === resistanceLevel) });
         if (this.data.resistanceLevel !== undefined && this.data.resistanceLevel === resistanceLevel)
             return true;
@@ -134,6 +143,8 @@ export default class BleFitnessMachineDevice extends TBleSensor {
         return (res === 1);
     }
     async setSlope(slope) {
+        if (!this.isSubscribed())
+            return false;
         this.logEvent({ message: 'setSlope', device: this.getName(), slope });
         const { windSpeed, crr, cw } = this;
         return await this.setIndoorBikeSimulation(windSpeed, slope, crr, cw);

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

@@ -3,7 +3,7 @@ import { BleInterface } from "./interface.js";
 export declare class BlePeripheral implements IBlePeripheral {
     protected announcement: BlePeripheralAnnouncement;
     protected connected: boolean;
-    protected connectPromise: Promise<void>;
+    protected connectPromise: Promise<void> | undefined;
     protected characteristics: Record<string, BleRawCharacteristic>;
     protected onDisconnectHandler?: () => void;
     protected ble: BleInterface;
@@ -13,7 +13,7 @@ export declare class BlePeripheral implements IBlePeripheral {
     }>;
     protected disconnecting: boolean;
     protected disconnectedSignalled: boolean;
-    protected discoveredServiceUUIds: Array<string>;
+    protected discoveredServiceUUIds: Array<string> | undefined;
     protected onErrorHandler: any;
     constructor(announcement: BlePeripheralAnnouncement);
     get services(): BleService[];

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

@@ -7,8 +7,10 @@ export declare class TBleSensor extends EventEmitter implements IBleSensor {
     static readonly protocol: BleProtocol;
     protected logger: EventLogger;
     protected stopRequested: boolean;
+    protected subscribeSuccess: boolean;
+    protected reconnectPromise: Promise<boolean> | undefined;
     protected onDataHandler: any;
-    logEvent(event: any, ...args: any[]): void;
+    logEvent(event: any, ...args: any): void;
     constructor(peripheral: IBlePeripheral, props?: {
         logger?: EventLogger;
     });
@@ -22,12 +24,16 @@ export declare class TBleSensor extends EventEmitter implements IBleSensor {
     hasPeripheral(): boolean;
     pair(): Promise<boolean>;
     startSensor(reconnect?: boolean): Promise<boolean>;
-    protected getRequiredCharacteristics(): Array<string>;
+    protected getRequiredCharacteristics(): Array<string> | null;
     subscribe(): Promise<boolean>;
     stopSensor(): Promise<boolean>;
-    reconnectSensor(): Promise<void>;
+    isReconnectBusy(): boolean;
+    reconnectSensor(): Promise<boolean>;
+    doReconnectSensor(): Promise<boolean>;
     reset(): void;
     isConnected(): boolean;
+    isSubscribed(): boolean;
+    protected onDisconnect(): void;
     read(characteristicUUID: string): Promise<Buffer>;
     write(characteristicUUID: string, data: Buffer, options?: BleWriteProps): Promise<Buffer>;
     onData(characteristic: string, data: Buffer): boolean;

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

@@ -28,10 +28,11 @@ export default class BleFitnessMachineDevice extends TBleSensor {
     getCw(): number;
     setWindSpeed(windSpeed: number): void;
     getWindSpeed(): number;
+    protected onDisconnect(): void;
     requestControl(): Promise<boolean>;
     setTargetPower(power: number): Promise<boolean>;
     setTargetResistanceLevel(resistanceLevel: number): Promise<boolean>;
-    setSlope(slope: any): Promise<boolean>;
+    setSlope(slope: number): Promise<boolean>;
     protected parseHrm(_data: Uint8Array): IndoorBikeData;
     protected parseIndoorBikeData(_data: Uint8Array): IndoorBikeData;
     protected parseFitnessMachineStatus(_data: Uint8Array): IndoorBikeData;

package/lib/types/ble/zwift/play/sensor.d.ts

@@ -40,7 +40,7 @@ export declare class BleZwiftPlaySensor extends TBleSensor {
     protected prevHubSettings: DeviceSettingsSubContent | undefined;
     protected prevcWax10000: number;
     constructor(peripheral: IBlePeripheral | TBleSensor, props?: BleZwiftPlaySensorProps);
-    reconnectSensor(): Promise<void>;
+    reconnectSensor(): Promise<boolean>;
     stopSensor(): Promise<boolean>;
     protected getRequiredCharacteristics(): Array<string>;
     onData(characteristic: string, data: Buffer, isNotify?: boolean): boolean;

package/package.json

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