incyclist-devices 2.3.0-beta.8 → 2.3.0-beta.9

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

@@ -32,6 +32,7 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     protected onDiscovered: (peripheral: BlePeripheralInfo) => void;
     protected instanceId: number;
     protected connectedPeripherals: IBlePeripheral[];
+    protected connectAttemptCnt: number;
     static getInstance(props?: InterfaceProps): BleInterface;
     protected constructor(props: InterfaceProps);
     getLogger(): EventLogger;
@@ -63,6 +64,8 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     pauseDiscovery(): Promise<void>;
     resumeDiscovery(): Promise<void>;
     protected onPeripheralFound(peripheral: BleRawPeripheral): void;
+    protected checkForWahooEnhancement(announcement: BlePeripheralAnnouncement): boolean;
+    protected processWahooAnnouncement(announcement: BlePeripheralAnnouncement): void;
     protected buildAnnouncement(peripheral: BleRawPeripheral): BlePeripheralAnnouncement;
     protected updateWithServices(announcement: BlePeripheralAnnouncement): Promise<BlePeripheralAnnouncement>;
     protected discoverServices(announcement: BlePeripheralAnnouncement): Promise<string[]>;
@@ -85,6 +88,8 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     protected waitForBleConnected(): Promise<boolean>;
     protected onBleStateChange(state: BleInterfaceState): void;
     protected getAdapterFactory(): BleAdapterFactory<TBleSensor>;
+    protected getConnectTimeout(): number;
+    protected getExpectedServices(): string[];
     logEvent(event: any): void;
     logError(err: Error, fn: string, args?: any): void;
 }

package/lib/ble/base/interface.js

@@ -49,6 +49,7 @@ class BleInterface extends events_1.default {
         this.expectedServices = ['180d', '1818', '1826', '6e40fec1'];
         this.matching = [];
         this.connectedPeripherals = [];
+        this.connectAttemptCnt = 0;
         this.instanceId = ++instanceCount;
         this.props = props;
         this.logEnabled = props.log || true;
@@ -90,28 +91,28 @@ class BleInterface extends events_1.default {
                 return false;
             }
             if (this.isConnecting()) {
-                this.logEvent({ message: 'connect - already connecting' });
+                this.logEvent({ message: 'BLE connect - already connecting' });
                 return this.connectTask.getPromise();
             }
             if (this.isConnected())
                 return true;
-            this.logEvent({ message: 'Ble connect request' });
+            this.logEvent({ message: 'BLE connect request' });
             this.connectTask = new task_1.InteruptableTask(this.connectBle(), {
-                timeout: BLE_DEFAULT_CONNECT_TIMEOUT,
-                name: 'connect',
+                timeout: this.getConnectTimeout(),
+                name: 'BLE connect',
                 errorOnTimeout: false,
                 log: this.logEvent.bind(this),
             });
-            const success = yield this.connectTask.run();
+            const success = yield this.connectTask.run().catch(() => false);
             if (success) {
                 this.startPeripheralScan();
             }
-            this.expectedServices = factories_1.BleAdapterFactory.getInstance('ble').getAllSupportedServices();
             return success;
         });
     }
     disconnect() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (!this.getBinding()) {
                 return false;
             }
@@ -122,14 +123,16 @@ class BleInterface extends events_1.default {
             const promises = this.connectedPeripherals.map(p => p.disconnect());
             yield Promise.allSettled(promises);
             this.connectedPeripherals = [];
-            yield this.connectTask.stop();
+            if (this.isConnecting())
+                yield ((_a = this.connectTask) === null || _a === void 0 ? void 0 : _a.stop());
             this.getBinding().removeAllListeners();
+            this.connectAttemptCnt = 0;
             return true;
         });
     }
     isConnected() {
         var _a;
-        return ((_a = this.getBinding()) === null || _a === void 0 ? void 0 : _a.state) === 'poweredOn';
+        return this.connectAttemptCnt > 0 && ((_a = this.getBinding()) === null || _a === void 0 ? void 0 : _a.state) === 'poweredOn';
     }
     registerConnected(peripheral) {
         this.connectedPeripherals.push(peripheral);
@@ -228,6 +231,7 @@ 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()) {
@@ -254,9 +258,10 @@ class BleInterface extends events_1.default {
             return;
         this.logEvent({ message: 'stopping peripheral discovery ...' });
         this.discoverTask.stop();
-        this.getBinding().off('discover', this.onDiscovered);
+        const ble = this.getBinding();
+        ble.off('discover', this.onDiscovered);
         return new Promise(done => {
-            this.getBinding().stopScanning(() => {
+            ble.stopScanning(() => {
                 done();
             });
         });
@@ -313,24 +318,32 @@ class BleInterface extends events_1.default {
         }
         if (announcement.serviceUUIDs.length === 0) {
             return;
-            if (this.isCompleting(announcement)) {
-                return;
-            }
-            this.addCompleting(announcement);
-            setTimeout(() => {
-                if (this.find(announcement)) {
-                    this.removeCompleting(announcement);
-                    return;
-                }
-                this.updateWithServices(announcement)
-                    .then(() => {
-                    if (this.isSupportedPeripheral(announcement))
-                        this.addService(announcement);
-                });
-            }, 1000);
+        }
+        const isWahoo = this.checkForWahooEnhancement(announcement);
+        if (isWahoo) {
+            this.processWahooAnnouncement(announcement);
+            return;
         }
         this.addService(announcement);
     }
+    checkForWahooEnhancement(announcement) {
+        if (announcement.name.includes('KICKR')) {
+            const supported = announcement.serviceUUIDs.map(s => (0, utils_1.beautifyUUID)(s));
+            if (supported.length === 1 && supported[0] === '1818')
+                return true;
+        }
+        return false;
+    }
+    processWahooAnnouncement(announcement) {
+        if (this.isCompleting(announcement)) {
+            return;
+        }
+        this.updateWithServices(announcement)
+            .then(() => {
+            if (this.isSupportedPeripheral(announcement))
+                this.addService(announcement);
+        });
+    }
     buildAnnouncement(peripheral) {
         var _a;
         return {
@@ -379,11 +392,11 @@ class BleInterface extends events_1.default {
                     const res = yield peripheral.discoverSomeServicesAndCharacteristicsAsync([], []);
                     announcement.serviceUUIDs = res.services.map(s => s.uuid);
                 }
-                peripheral.removeAllListeners();
             }
             catch (err) {
                 this.logEvent({ message: 'discover services failed', reason: err.message, device });
             }
+            peripheral === null || peripheral === void 0 ? void 0 : peripheral.removeAllListeners();
             if (paused) {
                 yield this.resumeDiscovery();
             }
@@ -498,8 +511,10 @@ 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' });
                 return true;
             }
             const res = yield this.waitForBleConnected();
@@ -514,7 +529,7 @@ class BleInterface extends events_1.default {
             });
             this.getBinding().on('stateChange', (state) => {
                 if (state === 'poweredOn') {
-                    this.logEvent({ message: 'Ble connect result: success' });
+                    this.logEvent({ message: 'BLE connected' });
                     this.getBinding().removeAllListeners('stateChange');
                     this.getBinding().on('stateChange', this.onBleStateChange.bind(this));
                     this.getBinding().on('error', console.log);
@@ -531,6 +546,12 @@ class BleInterface extends events_1.default {
     getAdapterFactory() {
         return factories_1.BleAdapterFactory.getInstance('ble');
     }
+    getConnectTimeout() {
+        return BLE_DEFAULT_CONNECT_TIMEOUT;
+    }
+    getExpectedServices() {
+        return this.getAdapterFactory().getAllSupportedServices();
+    }
     logEvent(event) {
         if (this.logDisabled && event.message !== 'Error')
             return;

package/lib/direct-connect/base/peripheral.js

@@ -471,7 +471,7 @@ class DirectConnectPeripheral {
         }
         if (incoming.length > header.length + 6) {
             this.remainingBuffer = Buffer.from(incoming.subarray(header.length + 6));
-            incoming = incoming.subarray(0, header.length + 6);
+            incoming = Buffer.from(incoming.subarray(0, header.length + 6));
         }
         return incoming;
     }
@@ -499,7 +499,6 @@ class DirectConnectPeripheral {
                     this.eventEmitter.emit(uuid, notification.body.characteristicData);
                 }
                 else {
-                    this.logEvent({ message: 'incoming message', path: this.getPath(), raw: incoming.toString('hex'), header });
                     this.eventEmitter.emit(`response-${header.seqNum}`, incoming);
                 }
             }

package/lib/utils/task.js

@@ -66,6 +66,7 @@ class InteruptableTask {
                 this.sendStopNotification();
                 if (this.getState().result === 'completed' || this.getState().result === 'error')
                     return;
+                this.getState().result = 'stopped';
                 if (this.props.onDone)
                     resolve(this.props.onDone(this.getState()));
                 else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.3.0-beta.8",
+  "version": "2.3.0-beta.9",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",