incyclist-devices 1.4.30 → 1.4.33

package/lib/ble/ble-device.js

@@ -89,7 +89,7 @@ class BleDevice extends ble_1.BleDeviceClass {
                     characteristics.forEach(c => {
                         if (c.properties.find(p => p === 'notify')) {
                             c.on('data', (data, _isNotification) => {
-                                this.onData(c.uuid, data);
+                                this.onData(ble_1.uuid(c.uuid), data);
                             });
                             c.subscribe((err) => {
                                 if (err)

package/lib/ble/ble-interface.js

@@ -94,7 +94,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
                             self.connectState.isOpened = false;
                             self.connectState.isConnected = false;
                             self.connectState.isConnecting = false;
-                            this.logEvent({ message: 'connect result: error', error: err.message });
+                            self.logEvent({ message: 'connect result: error', error: err.message });
                             return reject(new Error(err.message));
                         }
                     };
@@ -173,10 +173,10 @@ class BleInterface extends ble_1.BleInterfaceClass {
             });
         };
         if (typeof services === 'string') {
-            return get(deviceTypes, (s) => s === services);
+            return get(deviceTypes, (s) => s === ble_1.uuid(services));
         }
         if (Array.isArray(services)) {
-            return get(deviceTypes, s => services.includes(s));
+            return get(deviceTypes, s => services.map(ble_1.uuid).includes(s));
         }
         return [];
     }
@@ -236,6 +236,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
                 yield this.connect();
             }
             const detectedPeripherals = {};
+            this.devices = [];
             if (scanForDevice)
                 this.logEvent({ message: 'search device request', device, deviceTypes });
             else
@@ -275,13 +276,16 @@ class BleInterface extends ble_1.BleInterfaceClass {
                                 const d = new C({ peripheral });
                                 d.setInterface(this);
                                 if (scanForDevice) {
-                                    if ((device.id && d.id === device.id) || (device.address && d.address === device.address) || (device.name && d.name === device.name))
+                                    if ((device.id && device.id !== '' && d.id === device.id) ||
+                                        (device.address && device.address !== '' && d.address === device.address) ||
+                                        (device.name && device.name !== '' && d.name === device.name))
                                         cntFound++;
                                 }
                                 else
                                     cntFound++;
-                                if (cntFound > 0) {
-                                    this.logEvent({ message: 'scan: device found', device: d.name, services: d.services.join(',') });
+                                const existing = this.devices.find(i => i.device.id === d.id);
+                                if (cntFound > 0 && !existing) {
+                                    this.logEvent({ message: 'scan: device found', device: d.name, address: d.address, services: d.services.join(',') });
                                     this.devices.push({ device: d, isConnected: false });
                                     this.emit('device', d);
                                 }
@@ -301,7 +305,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
                 });
                 this.scanState.timeout = setTimeout(() => {
                     this.scanState.timeout = null;
-                    this.logEvent({ message: 'scan result: devices found', devices: this.devices.map(i => i.device.name) });
+                    this.logEvent({ message: 'scan result: devices found', devices: this.devices.map(i => i.device.name + (!i.device.name || i.device.name === '') ? `addr=${i.device.address}` : '') });
                     resolve(this.devices.map(i => i.device));
                     bleBinding.stopScanning(() => {
                         this.scanState.isScanning = false;

package/lib/ble/ble.d.ts

@@ -79,3 +79,4 @@ export declare enum BleState {
     POWERED_OFF = "poweredOff",
     POWERED_ON = "poweredOn"
 }
+export declare const uuid: (s: any) => any;

package/lib/ble/ble.js

@@ -49,3 +49,13 @@ var BleState;
     BleState["POWERED_OFF"] = "poweredOff";
     BleState["POWERED_ON"] = "poweredOn";
 })(BleState = exports.BleState || (exports.BleState = {}));
+exports.uuid = (s) => {
+    if (s) {
+        if (s.includes('-')) {
+            const parts = s.split('-');
+            const uuidNo = parseInt('0x' + parts[0]);
+            return uuidNo.toString(16);
+        }
+        return s;
+    }
+};

package/package.json

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