incyclist-devices 3.0.19 → 3.0.20

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

@@ -405,7 +405,12 @@ class BleInterface extends node_events_1.EventEmitter {
         }
         const isWahoo = this.checkForWahooEnhancement(announcement);
         if (isWahoo) {
-            this.processWahooAnnouncement(announcement);
+            this.processEnrichedAnnouncement(announcement);
+            return;
+        }
+        const isTacx = this.checkForTacxEnhancement(announcement);
+        if (isTacx) {
+            this.processEnrichedAnnouncement(announcement);
             return;
         }
         this.addService(announcement);
@@ -419,7 +424,7 @@ class BleInterface extends node_events_1.EventEmitter {
         }
         return false;
     }
-    processWahooAnnouncement(announcement) {
+    processEnrichedAnnouncement(announcement) {
         if (this.isCompleting(announcement)) {
             return;
         }
@@ -429,6 +434,19 @@ class BleInterface extends node_events_1.EventEmitter {
                 this.addService(announcement);
         });
     }
+    checkForTacxEnhancement(announcement) {
+        const name = announcement?.name?.toUpperCase();
+        if (name.startsWith('TACX')) {
+            const supported = announcement.serviceUUIDs.map(s => (0, utils_js_1.beautifyUUID)(s));
+            const tacxService = (0, utils_js_1.beautifyUUID)('6E40FEC1-B5A3-F393-E0A9-E50E24DCCA9E');
+            const cp = (0, utils_js_1.beautifyUUID)('1818');
+            const fe = (0, utils_js_1.beautifyUUID)('1826');
+            if (supported.includes(cp) && !supported.includes(fe) && !supported.includes(tacxService)) {
+                return true;
+            }
+        }
+        return false;
+    }
     buildAnnouncement(peripheral) {
         return {
             advertisement: peripheral.advertisement,

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

@@ -163,8 +163,9 @@ class BlePeripheral {
     async _discoverServices() {
         if (!this.getPeripheral())
             return [];
+        const { name, address } = this.getInfo();
         if (this.getPeripheral().discoverServicesAsync) {
-            this.logEvent({ message: 'discover services', address: this.getPeripheral().address });
+            this.logEvent({ message: 'discover services', name, address });
             const peripheral = this.getPeripheral();
             let services = [];
             if (peripheral?.discoverServicesAsync) {
@@ -172,14 +173,14 @@ class BlePeripheral {
                     .catch(() => []);
             }
             this.discoveredServiceUUIds = services.map(s => (0, utils_js_2.beautifyUUID)(s.uuid));
-            this.logEvent({ message: 'discover services result', address: this.getPeripheral().address, services: this.discoveredServiceUUIds });
+            this.logEvent({ message: 'discover services result', name, address, services: this.discoveredServiceUUIds });
             return services.map(s => s.uuid);
         }
         else {
-            this.logEvent({ message: 'discover services and characteristics', address: this.getPeripheral().address });
+            this.logEvent({ message: 'discover services and characteristics', name, address });
             const res = await this.getPeripheral().discoverSomeServicesAndCharacteristicsAsync([], []);
             this.discoveredServiceUUIds = res.services.map(s => (0, utils_js_2.beautifyUUID)(s.uuid));
-            this.logEvent({ message: 'discover services result', address: this.getPeripheral().address, services: this.discoveredServiceUUIds });
+            this.logEvent({ message: 'discover services result', name, address, services: this.discoveredServiceUUIds });
             return res.services.map(s => s.uuid);
         }
     }
@@ -193,10 +194,12 @@ class BlePeripheral {
     async _discoverCharacteristics(serviceUUID) {
         if (!this.getPeripheral())
             return [];
-        this.logEvent({ message: 'discover services and characteristics', service: serviceUUID, address: this.getPeripheral().address });
+        const { name, address } = this.getInfo();
+        this.logEvent({ message: 'discover services and characteristics', name, address, service: serviceUUID });
         const res = await this.getPeripheral().discoverSomeServicesAndCharacteristicsAsync([serviceUUID], [])
             .catch(() => ({ services: [], characteristics: [] }));
         res.characteristics.forEach(c => this.characteristics[(0, utils_js_2.beautifyUUID)(c.uuid)] = c);
+        this.logEvent({ message: 'discover services and characteristics result', name, address, service: serviceUUID });
         return res.characteristics.map(c => {
             const { uuid, properties, name, _serviceUuid } = c;
             return { uuid, properties, name, _serviceUuid };
@@ -318,6 +321,15 @@ class BlePeripheral {
                     if (!success)
                         retry.push(c);
                 }
+                else {
+                    const uuid = (0, utils_js_2.beautifyUUID)(element);
+                    if (c?.properties) {
+                        this.logEvent({ message: 'cannot subscribe', uuid, reason: 'invalid type', properties: c.properties.join('|') });
+                    }
+                    else {
+                        this.logEvent({ message: 'cannot subscribe', uuid, reason: 'not found' });
+                    }
+                }
             }
             for (const element of retry) {
                 const c = element;
@@ -332,12 +344,17 @@ class BlePeripheral {
     }
     async discoverAllCharacteristics() {
         try {
+            const { name, address } = this.getInfo();
+            this.logEvent({ message: 'discover all characteristics', name, address });
             const res = await this.getPeripheral().discoverSomeServicesAndCharacteristicsAsync([], []);
             const found = [];
+            const uuids = [];
             res.characteristics.forEach(c => {
                 this.characteristics[(0, utils_js_2.beautifyUUID)(c.uuid)] = c;
                 found.push(c.uuid);
+                uuids.push((0, utils_js_2.beautifyUUID)(c.uuid));
             });
+            this.logEvent({ message: 'discover all characteristics result', name, address, uuids: uuids.join('|') });
             return found;
         }
         catch (err) {

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

@@ -402,7 +402,12 @@ export class BleInterface extends EventEmitter {
         }
         const isWahoo = this.checkForWahooEnhancement(announcement);
         if (isWahoo) {
-            this.processWahooAnnouncement(announcement);
+            this.processEnrichedAnnouncement(announcement);
+            return;
+        }
+        const isTacx = this.checkForTacxEnhancement(announcement);
+        if (isTacx) {
+            this.processEnrichedAnnouncement(announcement);
             return;
         }
         this.addService(announcement);
@@ -416,7 +421,7 @@ export class BleInterface extends EventEmitter {
         }
         return false;
     }
-    processWahooAnnouncement(announcement) {
+    processEnrichedAnnouncement(announcement) {
         if (this.isCompleting(announcement)) {
             return;
         }
@@ -426,6 +431,19 @@ export class BleInterface extends EventEmitter {
                 this.addService(announcement);
         });
     }
+    checkForTacxEnhancement(announcement) {
+        const name = announcement?.name?.toUpperCase();
+        if (name.startsWith('TACX')) {
+            const supported = announcement.serviceUUIDs.map(s => beautifyUUID(s));
+            const tacxService = beautifyUUID('6E40FEC1-B5A3-F393-E0A9-E50E24DCCA9E');
+            const cp = beautifyUUID('1818');
+            const fe = beautifyUUID('1826');
+            if (supported.includes(cp) && !supported.includes(fe) && !supported.includes(tacxService)) {
+                return true;
+            }
+        }
+        return false;
+    }
     buildAnnouncement(peripheral) {
         return {
             advertisement: peripheral.advertisement,

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

@@ -160,8 +160,9 @@ export class BlePeripheral {
     async _discoverServices() {
         if (!this.getPeripheral())
             return [];
+        const { name, address } = this.getInfo();
         if (this.getPeripheral().discoverServicesAsync) {
-            this.logEvent({ message: 'discover services', address: this.getPeripheral().address });
+            this.logEvent({ message: 'discover services', name, address });
             const peripheral = this.getPeripheral();
             let services = [];
             if (peripheral?.discoverServicesAsync) {
@@ -169,14 +170,14 @@ export class BlePeripheral {
                     .catch(() => []);
             }
             this.discoveredServiceUUIds = services.map(s => beautifyUUID(s.uuid));
-            this.logEvent({ message: 'discover services result', address: this.getPeripheral().address, services: this.discoveredServiceUUIds });
+            this.logEvent({ message: 'discover services result', name, address, services: this.discoveredServiceUUIds });
             return services.map(s => s.uuid);
         }
         else {
-            this.logEvent({ message: 'discover services and characteristics', address: this.getPeripheral().address });
+            this.logEvent({ message: 'discover services and characteristics', name, address });
             const res = await this.getPeripheral().discoverSomeServicesAndCharacteristicsAsync([], []);
             this.discoveredServiceUUIds = res.services.map(s => beautifyUUID(s.uuid));
-            this.logEvent({ message: 'discover services result', address: this.getPeripheral().address, services: this.discoveredServiceUUIds });
+            this.logEvent({ message: 'discover services result', name, address, services: this.discoveredServiceUUIds });
             return res.services.map(s => s.uuid);
         }
     }
@@ -190,10 +191,12 @@ export class BlePeripheral {
     async _discoverCharacteristics(serviceUUID) {
         if (!this.getPeripheral())
             return [];
-        this.logEvent({ message: 'discover services and characteristics', service: serviceUUID, address: this.getPeripheral().address });
+        const { name, address } = this.getInfo();
+        this.logEvent({ message: 'discover services and characteristics', name, address, service: serviceUUID });
         const res = await this.getPeripheral().discoverSomeServicesAndCharacteristicsAsync([serviceUUID], [])
             .catch(() => ({ services: [], characteristics: [] }));
         res.characteristics.forEach(c => this.characteristics[beautifyUUID(c.uuid)] = c);
+        this.logEvent({ message: 'discover services and characteristics result', name, address, service: serviceUUID });
         return res.characteristics.map(c => {
             const { uuid, properties, name, _serviceUuid } = c;
             return { uuid, properties, name, _serviceUuid };
@@ -315,6 +318,15 @@ export class BlePeripheral {
                     if (!success)
                         retry.push(c);
                 }
+                else {
+                    const uuid = beautifyUUID(element);
+                    if (c?.properties) {
+                        this.logEvent({ message: 'cannot subscribe', uuid, reason: 'invalid type', properties: c.properties.join('|') });
+                    }
+                    else {
+                        this.logEvent({ message: 'cannot subscribe', uuid, reason: 'not found' });
+                    }
+                }
             }
             for (const element of retry) {
                 const c = element;
@@ -329,12 +341,17 @@ export class BlePeripheral {
     }
     async discoverAllCharacteristics() {
         try {
+            const { name, address } = this.getInfo();
+            this.logEvent({ message: 'discover all characteristics', name, address });
             const res = await this.getPeripheral().discoverSomeServicesAndCharacteristicsAsync([], []);
             const found = [];
+            const uuids = [];
             res.characteristics.forEach(c => {
                 this.characteristics[beautifyUUID(c.uuid)] = c;
                 found.push(c.uuid);
+                uuids.push(beautifyUUID(c.uuid));
             });
+            this.logEvent({ message: 'discover all characteristics result', name, address, uuids: uuids.join('|') });
             return found;
         }
         catch (err) {

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

@@ -79,7 +79,8 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     protected discoverPeripherals(): Promise<void>;
     protected onPeripheralFound(peripheral: BleRawPeripheral): void;
     protected checkForWahooEnhancement(announcement: BlePeripheralAnnouncement): boolean;
-    protected processWahooAnnouncement(announcement: BlePeripheralAnnouncement): void;
+    protected processEnrichedAnnouncement(announcement: BlePeripheralAnnouncement): void;
+    protected checkForTacxEnhancement(announcement: BlePeripheralAnnouncement): boolean;
     protected buildAnnouncement(peripheral: BleRawPeripheral): BlePeripheralAnnouncement;
     protected updateWithServices(announcement: BlePeripheralAnnouncement): Promise<BlePeripheralAnnouncement>;
     protected discoverServices(announcement: BlePeripheralAnnouncement): Promise<string[]>;

package/package.json

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