incyclist-devices 1.4.96 → 1.4.97

package/lib/ble/ble-interface.js

@@ -553,14 +553,14 @@ class BleInterface extends ble_1.BleInterfaceClass {
                     });
                 };
                 const onPeripheralFound = (peripheral, fromCache = false) => __awaiter(this, void 0, void 0, function* () {
-                    if (!peripheral || !peripheral.advertisement || !peripheral.advertisement.localName || !peripheral.advertisement.serviceUuids || peripheral.advertisement.serviceUuids.length === 0)
+                    if (!peripheral || !peripheral.advertisement || !peripheral.advertisement.localName || !peripheral.advertisement.serviceUuids)
                         return;
                     if (fromCache) {
                         this.logEvent({ message: 'adding from Cache', peripheral: peripheral.address });
                     }
                     else {
                         const { id, name, address, advertisement = {} } = peripheral;
-                        this.logEvent({ message: 'BLE scan: found device', peripheral: { id, name, address, services: advertisement.serviceUuids } });
+                        this.logEvent({ message: 'BLE scan: found device', peripheral: { id, name: advertisement.localName, address, services: advertisement.serviceUuids } });
                     }
                     if (peripheral.address === undefined || peripheral.address === '')
                         peripheral.address = peripheral.id;
@@ -568,8 +568,10 @@ class BleInterface extends ble_1.BleInterfaceClass {
                     if (isPeripheralProcessed)
                         return;
                     peripheralsProcessed.push(peripheral.address);
-                    const characteristics = yield this.getCharacteristics(peripheral);
+                    if (scanForDevice && requested.name && requested.name !== peripheral.advertisement.localName)
+                        return;
                     const connector = this.getConnector(peripheral);
+                    const characteristics = yield this.getCharacteristics(peripheral);
                     const connectedServices = connector.getServices();
                     const services = connectedServices ? connectedServices.map(cs => cs.uuid) : undefined;
                     const connectedPeripheral = connector.getPeripheral();
@@ -631,7 +633,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
                 });
                 this.logEvent({ message: `${opStr}: start scanning`, requested: scanForDevice ? { name, address, profile } : undefined, timeout });
                 let services = [];
-                if (scanForDevice) {
+                if (scanForDevice && name && !name.toLowerCase().startsWith('tacx')) {
                     if (props.requested instanceof ble_1.BleDeviceClass) {
                         const device = props.requested;
                         services = (device.getServices()) || [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "1.4.96",
+  "version": "1.4.97",
   "dependencies": {
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",