incyclist-devices 3.0.29 → 3.0.30

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

@@ -169,12 +169,12 @@ class BlePeripheral {
         return res;
     }
     checkAnnouncedServices(discovered) {
-        const announced = this.getAnnouncedServices().map(x => (0, utils_js_2.beautifyUUID)(x));
+        const announced = this.getAnnouncedServices();
         const toBeChecked = discovered.map(x => (0, utils_js_2.beautifyUUID)(x));
         const cntAnnounced = announced.length;
         let cntVerified = 0;
         for (const s of announced) {
-            if (toBeChecked.includes(s))
+            if (toBeChecked.some(d => (0, utils_js_2.isSameServiceFamily)(s, d)))
                 cntVerified++;
         }
         return cntAnnounced === cntVerified;

package/lib/cjs/ble/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bit = exports.propertyFromVal = exports.propertyVal = exports.fullUUID = exports.beautifyUUID = exports.parseUUID = void 0;
+exports.bit = exports.propertyFromVal = exports.propertyVal = exports.fullUUID = exports.isSameServiceFamily = exports.beautifyUUID = exports.parseUUID = void 0;
 exports.mapLegacyProfile = mapLegacyProfile;
 exports.uuid = uuid;
 exports.matches = matches;
@@ -106,6 +106,17 @@ const beautifyUUID = (str, withX = false) => {
     return parts.join('-');
 };
 exports.beautifyUUID = beautifyUUID;
+const isSameServiceFamily = (uuid1, uuid2) => {
+    const a = (0, exports.beautifyUUID)(uuid1);
+    const b = (0, exports.beautifyUUID)(uuid2);
+    if (a === b)
+        return true;
+    const isCustom128 = (u) => u.length === 36;
+    if (isCustom128(a) && isCustom128(b))
+        return a.substring(9) === b.substring(9);
+    return false;
+};
+exports.isSameServiceFamily = isSameServiceFamily;
 const fullUUID = (str) => {
     if (!str)
         return str;

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

@@ -1,5 +1,5 @@
 import { sleep } from "../../utils/utils.js";
-import { beautifyUUID, fullUUID, matches } from "../utils.js";
+import { beautifyUUID, fullUUID, isSameServiceFamily, matches } from "../utils.js";
 import { BleInterface } from "./interface.js";
 export class BlePeripheral {
     announcement;
@@ -166,12 +166,12 @@ export class BlePeripheral {
         return res;
     }
     checkAnnouncedServices(discovered) {
-        const announced = this.getAnnouncedServices().map(x => beautifyUUID(x));
+        const announced = this.getAnnouncedServices();
         const toBeChecked = discovered.map(x => beautifyUUID(x));
         const cntAnnounced = announced.length;
         let cntVerified = 0;
         for (const s of announced) {
-            if (toBeChecked.includes(s))
+            if (toBeChecked.some(d => isSameServiceFamily(s, d)))
                 cntVerified++;
         }
         return cntAnnounced === cntVerified;

package/lib/esm/ble/utils.js

@@ -96,6 +96,16 @@ export const beautifyUUID = (str, withX = false) => {
     }
     return parts.join('-');
 };
+export const isSameServiceFamily = (uuid1, uuid2) => {
+    const a = beautifyUUID(uuid1);
+    const b = beautifyUUID(uuid2);
+    if (a === b)
+        return true;
+    const isCustom128 = (u) => u.length === 36;
+    if (isCustom128(a) && isCustom128(b))
+        return a.substring(9) === b.substring(9);
+    return false;
+};
 export const fullUUID = (str) => {
     if (!str)
         return str;

package/lib/types/ble/utils.d.ts

@@ -16,6 +16,7 @@ export declare function getPeripheralInfo(p: BleRawPeripheral): {
 export declare function getCharachteristicsInfo(c: BleCharacteristic): string;
 export declare const parseUUID: (str: string) => string;
 export declare const beautifyUUID: (str: string, withX?: boolean) => string;
+export declare const isSameServiceFamily: (uuid1: string, uuid2: string) => boolean;
 export declare const fullUUID: (str: string) => string;
 export declare const propertyVal: (properties: BleProperty[]) => number;
 export declare const propertyFromVal: (val: number) => BleProperty[];

package/package.json

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