incyclist-devices 2.3.9 → 2.3.10

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

@@ -27,6 +27,7 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     protected expectedServices: string[];
     protected matching: string[];
     protected connectTask: InteruptableTask<TaskState, boolean>;
+    protected disconnectTask: InteruptableTask<TaskState, boolean>;
     protected scanTask: InteruptableTask<TaskState, void>;
     protected discoverTask: InteruptableTask<TaskState, void>;
     protected onDiscovered: (peripheral: BleRawPeripheral) => void;
@@ -35,8 +36,9 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
         id: string;
         peripheral: IBlePeripheral;
     }[];
-    protected connectAttemptCnt: number;
     protected emitted: BlePeripheralAnnouncement[];
+    protected confirmedBleState: BleInterfaceState;
+    protected currentBleState: BleInterfaceState;
     static getInstance(props?: InterfaceProps): BleInterface;
     protected constructor(props: InterfaceProps);
     setProps(props: InterfaceProps): void;
@@ -52,6 +54,7 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     registerConnected(peripheral: IBlePeripheral, id: string): void;
     unregisterConnected(id: string): void;
     protected isConnecting(): boolean;
+    protected isDisconnecting(): boolean;
     scan(props: BleScanProps): Promise<DeviceSettings[]>;
     stopScan(): Promise<boolean>;
     onScanDone(): DeviceSettings[];
@@ -94,9 +97,9 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     protected connectBle(): Promise<boolean>;
     protected waitForBleConnected(): Promise<boolean>;
     protected onError(err: Error): void;
-    protected onConnected(): void;
+    protected onConnected(): Promise<void>;
     protected onDisconnected(): Promise<void>;
-    protected onBleStateChange(state: BleInterfaceState): void;
+    protected onBleStateChange(state: BleInterfaceState): Promise<void>;
     protected getAdapterFactory(): BleAdapterFactory<TBleSensor>;
     protected getConnectTimeout(): number;
     protected getExpectedServices(): string[];

package/lib/ble/base/interface.js

@@ -50,7 +50,6 @@ class BleInterface extends events_1.default {
         this.expectedServices = ['180d', '1818', '1826', '6e40fec1'];
         this.matching = [];
         this.connectedPeripherals = [];
-        this.connectAttemptCnt = 0;
         this.emitted = [];
         this.instanceId = ++instanceCount;
         this.props = props;
@@ -111,41 +110,59 @@ class BleInterface extends events_1.default {
                 log: this.logEvent.bind(this),
             });
             const success = yield this.connectTask.run().catch(() => false);
-            if (success) {
-                this.startPeripheralScan();
-            }
             return success;
         });
     }
     disconnect(connectionLost) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (!this.getBinding()) {
-                return false;
-            }
-            if (!this.isConnected() && !connectionLost)
+            if (!this.isConnected())
                 return true;
-            if (!connectionLost)
-                this.logEvent({ message: 'disconnect request' });
-            this.emit('disconnect-request');
-            yield this.stopPeripheralScan();
-            if (connectionLost) {
-                this.emitDisconnectAllPeripherals();
-            }
-            else {
-                yield this.disconnectAllPeripherals();
+            const performDisconnect = () => __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                if (!this.getBinding()) {
+                    this.confirmedBleState = 'poweredOff';
+                    return false;
+                }
+                this.getBinding().removeAllListeners('error');
+                if (!this.isConnected() && !connectionLost) {
+                    this.confirmedBleState = 'poweredOff';
+                    return true;
+                }
+                if (!connectionLost)
+                    this.logEvent({ message: 'disconnect request' });
+                this.emit('disconnect-request');
+                yield this.stopPeripheralScan();
+                if (connectionLost) {
+                    this.emitDisconnectAllPeripherals();
+                }
+                else {
+                    yield this.disconnectAllPeripherals();
+                }
+                if (this.isConnecting())
+                    yield ((_a = this.connectTask) === null || _a === void 0 ? void 0 : _a.stop());
+                this.emit('disconnect-done');
+                this.getBinding().removeAllListeners('stateChange');
+                this.getBinding().on('stateChange', this.onBleStateChange.bind(this));
+                this.getBinding().on('error', this.onError.bind(this));
+                this.logEvent({ message: 'interface disconnected', interface: 'BLE' });
+                this.confirmedBleState = 'poweredOff';
+                return true;
+            });
+            if (this.isDisconnecting()) {
+                return this.disconnectTask.getPromise();
             }
-            if (this.isConnecting())
-                yield ((_a = this.connectTask) === null || _a === void 0 ? void 0 : _a.stop());
-            this.getBinding().removeAllListeners();
-            this.connectAttemptCnt = 0;
-            this.emit('disconnect-done');
-            return true;
+            this.disconnectTask = new task_1.InteruptableTask(performDisconnect(), {
+                timeout: this.getConnectTimeout(),
+                name: 'BLE connect',
+                errorOnTimeout: false,
+                log: this.logEvent.bind(this),
+            });
+            const success = yield this.disconnectTask.run().catch(() => false);
+            return success;
         });
     }
     isConnected() {
-        var _a;
-        return this.connectAttemptCnt > 0 && ((_a = this.getBinding()) === null || _a === void 0 ? void 0 : _a.state) === 'poweredOn';
+        return this.confirmedBleState === 'poweredOn';
     }
     registerConnected(peripheral, id) {
         const p = this.connectedPeripherals.find(p => p.id === id);
@@ -165,6 +182,10 @@ class BleInterface extends events_1.default {
         var _a;
         return ((_a = this.connectTask) === null || _a === void 0 ? void 0 : _a.isRunning()) === true;
     }
+    isDisconnecting() {
+        var _a;
+        return ((_a = this.disconnectTask) === null || _a === void 0 ? void 0 : _a.isRunning()) === true;
+    }
     scan(props) {
         return __awaiter(this, void 0, void 0, function* () {
             this.resumeLogging();
@@ -272,12 +293,12 @@ class BleInterface extends events_1.default {
     }
     startPeripheralScan() {
         return __awaiter(this, arguments, void 0, function* (retry = false) {
-            this.expectedServices = this.getExpectedServices();
-            if (!retry)
-                this.logEvent({ message: 'starting peripheral discovery ...' });
             if (!this.isConnected() || this.isDiscovering()) {
                 return;
             }
+            this.expectedServices = this.getExpectedServices();
+            if (!retry)
+                this.logEvent({ message: 'starting peripheral discovery ...' });
             this.discoverTask = new task_1.InteruptableTask(this.discoverPeripherals(), {
                 errorOnTimeout: false,
                 name: 'discover',
@@ -556,10 +577,9 @@ class BleInterface extends events_1.default {
     }
     connectBle() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.connectAttemptCnt++;
-            const state = this.getBinding().state;
-            if (state === 'poweredOn') {
-                this.logEvent({ message: 'BLE connected' });
+            this.currentBleState = this.getBinding().state;
+            if (this.currentBleState === 'poweredOn') {
+                this.onConnected();
                 return true;
             }
             const res = yield this.waitForBleConnected();
@@ -573,13 +593,13 @@ class BleInterface extends events_1.default {
                 return done(false);
             });
             this.getBinding().on('stateChange', (state) => {
+                if (state === this.confirmedBleState)
+                    return;
+                this.logEvent({ message: 'BLE state change', state });
                 if (state === 'poweredOn') {
                     this.onConnected();
                     return done(true);
                 }
-                else {
-                    this.logEvent({ message: 'BLE state change', state });
-                }
             });
         });
     }
@@ -587,26 +607,41 @@ class BleInterface extends events_1.default {
         this.logError(err, 'BLE connect');
     }
     onConnected() {
-        this.logEvent({ message: 'BLE connected' });
-        this.getBinding().removeAllListeners('error');
-        this.getBinding().removeAllListeners('stateChange');
-        this.getBinding().on('stateChange', this.onBleStateChange.bind(this));
-        this.getBinding().on('error', this.onError.bind(this));
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.isConnected())
+                return;
+            this.confirmedBleState = 'poweredOn';
+            this.getBinding().removeAllListeners('error');
+            this.getBinding().removeAllListeners('stateChange');
+            this.getBinding().on('stateChange', this.onBleStateChange.bind(this));
+            this.getBinding().on('error', this.onError.bind(this));
+            this.logEvent({ message: 'BLE connected' });
+            this.startPeripheralScan();
+        });
     }
     onDisconnected() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.isDisconnecting() || !this.isConnected())
+                return;
             this.logEvent({ message: 'BLE Disconnected' });
             yield this.disconnect(true);
-            this.getBinding().on('stateChange', this.onBleStateChange.bind(this));
-            this.getBinding().on('error', this.onError.bind(this));
         });
     }
     onBleStateChange(state) {
-        if (state !== 'poweredOn') {
-            this.onDisconnected();
-        }
-        else
-            this.onConnected();
+        return __awaiter(this, void 0, void 0, function* () {
+            if (state === this.currentBleState)
+                return;
+            this.currentBleState = state;
+            if (state === 'poweredOff') {
+                this.onDisconnected();
+            }
+            else {
+                if (this.isDisconnecting()) {
+                    yield this.disconnectTask.getPromise();
+                }
+                this.onConnected();
+            }
+        });
     }
     getAdapterFactory() {
         return factories_1.BleAdapterFactory.getInstance('ble');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.3.9",
+  "version": "2.3.10",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",