incyclist-devices 1.4.31 → 1.4.32

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

@@ -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 [];
     }

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.31",
+  "version": "1.4.32",
   "dependencies": {
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",