incyclist-devices 3.0.8 → 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/interface.js

@@ -115,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' });
@@ -184,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';
     }
@@ -629,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() {

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

@@ -144,13 +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;
         const disconnected = !this.isConnected();
         if (disconnected)
             this.emit('disconnect');
-        return disconnected;
     }
     isConnected() {
         return this.connected && this.getBinding()?.mdns !== undefined && this.binding.mdns !== null;
@@ -159,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();
@@ -177,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/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/interface.js

@@ -112,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' });
@@ -181,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';
     }
@@ -626,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() {

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

@@ -141,13 +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;
         const disconnected = !this.isConnected();
         if (disconnected)
             this.emit('disconnect');
-        return disconnected;
     }
     isConnected() {
         return this.connected && this.getBinding()?.mdns !== undefined && this.binding.mdns !== null;
@@ -156,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();
@@ -174,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/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/interface.d.ts

@@ -54,6 +54,7 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     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;
@@ -101,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.8",
+    "version": "3.0.9",
     "scripts": {
         "lint": "eslint . --ext .ts",
         "build": "npm run build:esm && npm run build:cjs",