incyclist-devices 3.0.7 → 3.0.8

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

@@ -15,6 +15,7 @@ class BleAdapter extends adpater_js_1.default {
     device;
     onDeviceDataHandler = this.onDeviceData.bind(this);
     onDeviceDisconnectHandler = this.emit.bind(this);
+    onDisconnectDoneHandler = this.onDisconnectDone.bind(this);
     startTask;
     constructor(settings, props) {
         super(settings, props);
@@ -198,7 +199,7 @@ class BleAdapter extends adpater_js_1.default {
             await this.stop();
         }
         const ble = this.getBle();
-        ble.once('disconnect-done', this.onDisconnectDone.bind(this));
+        ble.once('disconnect-done', this.onDisconnectDoneHandler);
         this.startTask = new task_js_1.InteruptableTask(this.startAdapter(startProps), {
             timeout: startProps?.timeout,
             name: 'start',
@@ -206,6 +207,9 @@ class BleAdapter extends adpater_js_1.default {
             log: this.logEvent.bind(this)
         });
         const res = await this.startTask.run();
+        if (!res) {
+            ble.removeListener('disconnect-done', this.onDisconnectDoneHandler);
+        }
         return res;
     }
     isStarting() {
@@ -303,6 +307,8 @@ class BleAdapter extends adpater_js_1.default {
             this.logEvent({ message: 'start result: error', error: err.message, device: this.getName(), interface: this.getInterface(), protocol: this.getProtocolName() });
             this.started = false;
             this.stopped = true;
+            const ble = this.getBle();
+            ble.removeListener('disconnect-done', this.onDisconnectDoneHandler);
             return false;
         }
     }
@@ -380,6 +386,8 @@ class BleAdapter extends adpater_js_1.default {
         sensor.off('data', this.onDeviceDataHandler);
         sensor.off('disconnected', this.onDeviceDisconnectHandler);
         sensor.off('error', console.log);
+        const ble = this.getBle();
+        ble.removeListener('disconnect-done', this.onDisconnectDoneHandler);
         sensor.reset();
         this.resetData();
         this.stopped = true;

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

@@ -36,6 +36,7 @@ class BleInterface extends node_events_1.EventEmitter {
     emitted = [];
     confirmedBleState;
     currentBleState;
+    isAutoStart = false;
     stateChangeEventHandler = null;
     static getInstance(props = {}) {
         if (BleInterface._instance === undefined)
@@ -93,9 +94,16 @@ class BleInterface extends node_events_1.EventEmitter {
         return this.binding;
     }
     async autoConnect() {
-        await this.connect();
+        this.isAutoStart = true;
+        await this.connectInternal();
     }
     async connect(reconnect) {
+        if (this.isAutoStart)
+            return this.isConnected();
+        else
+            return this.connectInternal(reconnect);
+    }
+    async connectInternal(reconnect) {
         if (this.isConnected())
             return true;
         if (!this.stateChangeEventHandler) {
@@ -161,6 +169,7 @@ class BleInterface extends node_events_1.EventEmitter {
             this.getBinding()?.on('error', this.onError.bind(this));
             this.logEvent({ message: 'interface disconnected', interface: 'BLE' });
             this.confirmedBleState = 'poweredOff';
+            this.emit('disconnect');
             return true;
         };
         if (this.isDisconnecting()) {
@@ -301,7 +310,7 @@ class BleInterface extends node_events_1.EventEmitter {
         }
         this.logEvent({ message: 'reconnecting interface', stack: error.stack });
         await this.disconnect();
-        await this.connect(true);
+        await this.connectInternal(true);
     }
     async startPeripheralScan(retry = false) {
         if (!this.isConnected() || this.isDiscovering()) {
@@ -580,8 +589,9 @@ class BleInterface extends node_events_1.EventEmitter {
     addKnownDevice(_settings) {
     }
     async connectBle() {
-        this.currentBleState = this.getBinding()?.state;
-        if (this.currentBleState === 'poweredOn') {
+        const prev = this.currentBleState;
+        this.currentBleState = this.currentBleState ?? this.getBinding()?.state;
+        if (this.currentBleState === 'poweredOn' && prev !== 'poweredOn') {
             this.onConnected();
             return true;
         }
@@ -599,13 +609,16 @@ class BleInterface extends node_events_1.EventEmitter {
             });
             this.on('ble-state-change', (state) => {
                 try {
+                    this.currentBleState = state;
                     if (state === 'poweredOn') {
                         this.onConnected();
                         this.removeAllListeners('ble-state-change');
+                        this.currentBleState = state;
                         return done(true);
                     }
                     if (state === 'unauthorized') {
                         this.removeAllListeners('ble-state-change');
+                        this.currentBleState = state;
                         return done(false);
                     }
                 }
@@ -656,7 +669,7 @@ class BleInterface extends node_events_1.EventEmitter {
             if (this.isDisconnecting()) {
                 await this.disconnectTask.getPromise();
             }
-            this.connect();
+            this.connectInternal();
         }
     }
     getAdapterFactory() {

package/lib/cjs/direct-connect/base/interface.js

@@ -147,7 +147,10 @@ class DirectConnectInterface extends node_events_1.EventEmitter {
         this.getBinding()?.mdns?.disconnect();
         this.internalEvents.removeAllListeners();
         this.connected = false;
-        return !this.isConnected();
+        const disconnected = !this.isConnected();
+        if (disconnected)
+            this.emit('disconnect');
+        return disconnected;
     }
     isConnected() {
         return this.connected && this.getBinding()?.mdns !== undefined && this.binding.mdns !== null;

package/lib/cjs/modes/antble-smarttrainer.js

@@ -414,7 +414,7 @@ class SmartTrainerCyclingMode extends power_base_js_1.default {
             this.tsStart = Date.now();
         }
         if (this.gear === undefined && this.tsStart && data.power > 0 && (Date.now() - this.tsStart > 3000)) {
-            this.gear = Number(this.getSetting('startGear')) ?? 0;
+            this.gear = Number(this.getSetting('startGear') ?? 0);
             data.gearStr = this.getGearString();
         }
         return data;

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

@@ -10,6 +10,7 @@ export default class BleAdapter extends IncyclistDevice {
     device;
     onDeviceDataHandler = this.onDeviceData.bind(this);
     onDeviceDisconnectHandler = this.emit.bind(this);
+    onDisconnectDoneHandler = this.onDisconnectDone.bind(this);
     startTask;
     constructor(settings, props) {
         super(settings, props);
@@ -193,7 +194,7 @@ export default class BleAdapter extends IncyclistDevice {
             await this.stop();
         }
         const ble = this.getBle();
-        ble.once('disconnect-done', this.onDisconnectDone.bind(this));
+        ble.once('disconnect-done', this.onDisconnectDoneHandler);
         this.startTask = new InteruptableTask(this.startAdapter(startProps), {
             timeout: startProps?.timeout,
             name: 'start',
@@ -201,6 +202,9 @@ export default class BleAdapter extends IncyclistDevice {
             log: this.logEvent.bind(this)
         });
         const res = await this.startTask.run();
+        if (!res) {
+            ble.removeListener('disconnect-done', this.onDisconnectDoneHandler);
+        }
         return res;
     }
     isStarting() {
@@ -298,6 +302,8 @@ export default class BleAdapter extends IncyclistDevice {
             this.logEvent({ message: 'start result: error', error: err.message, device: this.getName(), interface: this.getInterface(), protocol: this.getProtocolName() });
             this.started = false;
             this.stopped = true;
+            const ble = this.getBle();
+            ble.removeListener('disconnect-done', this.onDisconnectDoneHandler);
             return false;
         }
     }
@@ -375,6 +381,8 @@ export default class BleAdapter extends IncyclistDevice {
         sensor.off('data', this.onDeviceDataHandler);
         sensor.off('disconnected', this.onDeviceDisconnectHandler);
         sensor.off('error', console.log);
+        const ble = this.getBle();
+        ble.removeListener('disconnect-done', this.onDisconnectDoneHandler);
         sensor.reset();
         this.resetData();
         this.stopped = true;

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

@@ -33,6 +33,7 @@ export class BleInterface extends EventEmitter {
     emitted = [];
     confirmedBleState;
     currentBleState;
+    isAutoStart = false;
     stateChangeEventHandler = null;
     static getInstance(props = {}) {
         if (BleInterface._instance === undefined)
@@ -90,9 +91,16 @@ export class BleInterface extends EventEmitter {
         return this.binding;
     }
     async autoConnect() {
-        await this.connect();
+        this.isAutoStart = true;
+        await this.connectInternal();
     }
     async connect(reconnect) {
+        if (this.isAutoStart)
+            return this.isConnected();
+        else
+            return this.connectInternal(reconnect);
+    }
+    async connectInternal(reconnect) {
         if (this.isConnected())
             return true;
         if (!this.stateChangeEventHandler) {
@@ -158,6 +166,7 @@ export class BleInterface extends EventEmitter {
             this.getBinding()?.on('error', this.onError.bind(this));
             this.logEvent({ message: 'interface disconnected', interface: 'BLE' });
             this.confirmedBleState = 'poweredOff';
+            this.emit('disconnect');
             return true;
         };
         if (this.isDisconnecting()) {
@@ -298,7 +307,7 @@ export class BleInterface extends EventEmitter {
         }
         this.logEvent({ message: 'reconnecting interface', stack: error.stack });
         await this.disconnect();
-        await this.connect(true);
+        await this.connectInternal(true);
     }
     async startPeripheralScan(retry = false) {
         if (!this.isConnected() || this.isDiscovering()) {
@@ -577,8 +586,9 @@ export class BleInterface extends EventEmitter {
     addKnownDevice(_settings) {
     }
     async connectBle() {
-        this.currentBleState = this.getBinding()?.state;
-        if (this.currentBleState === 'poweredOn') {
+        const prev = this.currentBleState;
+        this.currentBleState = this.currentBleState ?? this.getBinding()?.state;
+        if (this.currentBleState === 'poweredOn' && prev !== 'poweredOn') {
             this.onConnected();
             return true;
         }
@@ -596,13 +606,16 @@ export class BleInterface extends EventEmitter {
             });
             this.on('ble-state-change', (state) => {
                 try {
+                    this.currentBleState = state;
                     if (state === 'poweredOn') {
                         this.onConnected();
                         this.removeAllListeners('ble-state-change');
+                        this.currentBleState = state;
                         return done(true);
                     }
                     if (state === 'unauthorized') {
                         this.removeAllListeners('ble-state-change');
+                        this.currentBleState = state;
                         return done(false);
                     }
                 }
@@ -653,7 +666,7 @@ export class BleInterface extends EventEmitter {
             if (this.isDisconnecting()) {
                 await this.disconnectTask.getPromise();
             }
-            this.connect();
+            this.connectInternal();
         }
     }
     getAdapterFactory() {

package/lib/esm/direct-connect/base/interface.js

@@ -144,7 +144,10 @@ export default class DirectConnectInterface extends EventEmitter {
         this.getBinding()?.mdns?.disconnect();
         this.internalEvents.removeAllListeners();
         this.connected = false;
-        return !this.isConnected();
+        const disconnected = !this.isConnected();
+        if (disconnected)
+            this.emit('disconnect');
+        return disconnected;
     }
     isConnected() {
         return this.connected && this.getBinding()?.mdns !== undefined && this.binding.mdns !== null;

package/lib/esm/modes/antble-smarttrainer.js

@@ -376,7 +376,7 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase {
             this.tsStart = Date.now();
         }
         if (this.gear === undefined && this.tsStart && data.power > 0 && (Date.now() - this.tsStart > 3000)) {
-            this.gear = Number(this.getSetting('startGear')) ?? 0;
+            this.gear = Number(this.getSetting('startGear') ?? 0);
             data.gearStr = this.getGearString();
         }
         return data;

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

@@ -13,6 +13,7 @@ export default class BleAdapter<TDeviceData extends BleDeviceData, TDevice exten
     protected device: TDevice;
     protected onDeviceDataHandler: any;
     protected onDeviceDisconnectHandler: any;
+    protected onDisconnectDoneHandler: any;
     protected startTask: InteruptableTask<TaskState, boolean>;
     constructor(settings: BleDeviceSettings, props?: DeviceProperties);
     getUniqueName(): string;

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

@@ -40,6 +40,7 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     protected emitted: BlePeripheralAnnouncement[];
     protected confirmedBleState: BleInterfaceState;
     protected currentBleState: BleInterfaceState;
+    protected isAutoStart: boolean;
     protected stateChangeEventHandler: TStateChangeHandler | null;
     static getInstance(props?: InterfaceProps): BleInterface;
     protected constructor(props: InterfaceProps);
@@ -51,6 +52,7 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     getBinding(): BleBinding;
     protected autoConnect(): Promise<void>;
     connect(reconnect?: boolean): Promise<boolean>;
+    connectInternal(reconnect?: boolean): Promise<boolean>;
     disconnect(connectionLost?: boolean): Promise<boolean>;
     isConnected(): boolean;
     registerConnected(peripheral: IBlePeripheral, id: string): void;

package/package.json

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