incyclist-devices 3.0.7 → 3.0.9

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

@@ -144,6 +144,9 @@ class AntInterface extends node_events_1.EventEmitter {
         this.connected = false;
         return closed;
     }
+    async terminate() {
+        await this.disconnect();
+    }
     onError(profile, error) {
         this.logEvent({ message: 'ANT+ERROR:', profile, error });
     }

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) {
@@ -107,7 +115,6 @@ class BleInterface extends node_events_1.EventEmitter {
             return false;
         }
         if (this.isConnecting()) {
-            this.logEvent({ message: 'BLE connect - already connecting' });
             return this.connectTask.getPromise();
         }
         this.logEvent({ message: 'BLE connect request' });
@@ -161,6 +168,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()) {
@@ -175,6 +183,9 @@ class BleInterface extends node_events_1.EventEmitter {
         const success = await this.disconnectTask.run().catch(() => false);
         return success;
     }
+    async terminate() {
+        await this.disconnect();
+    }
     isConnected() {
         return this.confirmedBleState === 'poweredOn';
     }
@@ -301,7 +312,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 +591,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 +611,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);
                     }
                 }
@@ -616,6 +631,9 @@ class BleInterface extends node_events_1.EventEmitter {
         });
     }
     onError(err) {
+        if (typeof err === 'string') {
+            this.logError(new Error(err), 'BLE connect');
+        }
         this.logError(err, 'BLE connect');
     }
     async onConnected() {
@@ -656,7 +674,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

@@ -144,10 +144,16 @@ class DirectConnectInterface extends node_events_1.EventEmitter {
             return true;
         this.logEvent({ message: 'Disconnecting from Direct Connect' });
         await this.stopScan();
+        return true;
+    }
+    async terminate() {
+        await this.disconnect();
         this.getBinding()?.mdns?.disconnect();
         this.internalEvents.removeAllListeners();
         this.connected = false;
-        return !this.isConnected();
+        const disconnected = !this.isConnected();
+        if (disconnected)
+            this.emit('disconnect');
     }
     isConnected() {
         return this.connected && this.getBinding()?.mdns !== undefined && this.binding.mdns !== null;
@@ -156,7 +162,7 @@ class DirectConnectInterface extends node_events_1.EventEmitter {
         this.logDisabled = false;
         if (this.isScanning()) {
             this.logEvent({ message: 'starting scan - already scanning' });
-            await this.scanTask.getPromise();
+            await this.scanTask?.getPromise();
         }
         this.logEvent({ message: 'starting scan ..' });
         await this.reconnect();
@@ -174,7 +180,7 @@ class DirectConnectInterface extends node_events_1.EventEmitter {
         if (!this.isScanning())
             return true;
         this.logEvent({ message: 'stopping scan ...', interface: 'wifi' });
-        const res = await this.scanTask.stop();
+        const res = await this.scanTask?.stop();
         delete this.scanTask;
         return (res === true);
     }

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/cjs/serial/base/serial-interface.js

@@ -118,6 +118,9 @@ class SerialInterface extends node_events_1.EventEmitter {
         this.connected = false;
         return true;
     }
+    async terminate() {
+        await this.disconnect();
+    }
     async openPort(path) {
         this.logEvent({ message: 'opening port', port: path });
         const existing = this.ports.findIndex(p => p.path === path);

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

@@ -139,6 +139,9 @@ export default class AntInterface extends EventEmitter {
         this.connected = false;
         return closed;
     }
+    async terminate() {
+        await this.disconnect();
+    }
     onError(profile, error) {
         this.logEvent({ message: 'ANT+ERROR:', profile, error });
     }

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) {
@@ -104,7 +112,6 @@ export class BleInterface extends EventEmitter {
             return false;
         }
         if (this.isConnecting()) {
-            this.logEvent({ message: 'BLE connect - already connecting' });
             return this.connectTask.getPromise();
         }
         this.logEvent({ message: 'BLE connect request' });
@@ -158,6 +165,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()) {
@@ -172,6 +180,9 @@ export class BleInterface extends EventEmitter {
         const success = await this.disconnectTask.run().catch(() => false);
         return success;
     }
+    async terminate() {
+        await this.disconnect();
+    }
     isConnected() {
         return this.confirmedBleState === 'poweredOn';
     }
@@ -298,7 +309,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 +588,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 +608,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);
                     }
                 }
@@ -613,6 +628,9 @@ export class BleInterface extends EventEmitter {
         });
     }
     onError(err) {
+        if (typeof err === 'string') {
+            this.logError(new Error(err), 'BLE connect');
+        }
         this.logError(err, 'BLE connect');
     }
     async onConnected() {
@@ -653,7 +671,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

@@ -141,10 +141,16 @@ export default class DirectConnectInterface extends EventEmitter {
             return true;
         this.logEvent({ message: 'Disconnecting from Direct Connect' });
         await this.stopScan();
+        return true;
+    }
+    async terminate() {
+        await this.disconnect();
         this.getBinding()?.mdns?.disconnect();
         this.internalEvents.removeAllListeners();
         this.connected = false;
-        return !this.isConnected();
+        const disconnected = !this.isConnected();
+        if (disconnected)
+            this.emit('disconnect');
     }
     isConnected() {
         return this.connected && this.getBinding()?.mdns !== undefined && this.binding.mdns !== null;
@@ -153,7 +159,7 @@ export default class DirectConnectInterface extends EventEmitter {
         this.logDisabled = false;
         if (this.isScanning()) {
             this.logEvent({ message: 'starting scan - already scanning' });
-            await this.scanTask.getPromise();
+            await this.scanTask?.getPromise();
         }
         this.logEvent({ message: 'starting scan ..' });
         await this.reconnect();
@@ -171,7 +177,7 @@ export default class DirectConnectInterface extends EventEmitter {
         if (!this.isScanning())
             return true;
         this.logEvent({ message: 'stopping scan ...', interface: 'wifi' });
-        const res = await this.scanTask.stop();
+        const res = await this.scanTask?.stop();
         delete this.scanTask;
         return (res === true);
     }

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/esm/serial/base/serial-interface.js

@@ -113,6 +113,9 @@ export default class SerialInterface extends EventEmitter {
         this.connected = false;
         return true;
     }
+    async terminate() {
+        await this.disconnect();
+    }
     async openPort(path) {
         this.logEvent({ message: 'opening port', port: path });
         const existing = this.ports.findIndex(p => p.path === path);

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

@@ -39,6 +39,7 @@ export default class AntInterface extends EventEmitter implements IncyclistInter
     isConnected(): boolean;
     connect(): Promise<boolean>;
     disconnect(): Promise<boolean>;
+    terminate(): Promise<void>;
     onError(profile: any, error: any): void;
     onData(profile: any, id: any, data: any, tag: any): void;
     getReconnectPause(): number;

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,7 +52,9 @@ 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>;
+    terminate(): Promise<void>;
     isConnected(): boolean;
     registerConnected(peripheral: IBlePeripheral, id: string): void;
     unregisterConnected(id: string): void;
@@ -99,7 +102,7 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     addKnownDevice(_settings: BleDeviceSettings): void;
     protected connectBle(): Promise<boolean>;
     protected waitForBleConnected(): Promise<boolean>;
-    protected onError(err: Error): void;
+    protected onError(err: Error | string): void;
     protected onConnected(): Promise<void>;
     protected onDisconnected(): Promise<void>;
     protected onBleStateChange(state: BleInterfaceState): Promise<void>;

package/lib/types/direct-connect/base/interface.d.ts

@@ -24,7 +24,7 @@ export default class DirectConnectInterface extends EventEmitter implements IBle
     protected logDisabled: boolean;
     protected internalEvents: EventEmitter;
     protected services: Announcement[];
-    protected scanTask: InteruptableTask<TaskState, DeviceSettings[]>;
+    protected scanTask: InteruptableTask<TaskState, DeviceSettings[]> | undefined;
     protected matching?: Array<string>;
     protected instance: number;
     protected connected: boolean;
@@ -43,6 +43,7 @@ export default class DirectConnectInterface extends EventEmitter implements IBle
     autoConnect(): void;
     connect(reconnect?: boolean): Promise<boolean>;
     disconnect(): Promise<boolean>;
+    terminate(): Promise<void>;
     isConnected(): boolean;
     scan(props: DirectConnectScanProps): Promise<DeviceSettings[]>;
     stopScan(): Promise<boolean>;

package/lib/types/serial/base/serial-interface.d.ts

@@ -26,6 +26,7 @@ export default class SerialInterface extends EventEmitter implements IncyclistIn
     releaseInUse(path: string): void;
     connect(): Promise<boolean>;
     disconnect(): Promise<boolean>;
+    terminate(): Promise<void>;
     openPort(path: string): Promise<SerialPortStream | null>;
     closePort(path: string): Promise<boolean>;
     scan(props: SerialScannerProps): Promise<SerialDeviceSettings[]>;

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

@@ -12,6 +12,7 @@ export interface IncyclistInterface extends EventEmitter {
     setBinding(binding: any): void;
     connect(): Promise<boolean>;
     disconnect(): Promise<boolean>;
+    terminate(): Promise<void>;
     isConnected(): boolean;
     scan(props: IncyclistScanProps): Promise<DeviceSettings[]>;
     stopScan(): Promise<boolean>;

package/package.json

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