incyclist-devices 3.0.13 → 3.0.14

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

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BlePeripheral = void 0;
-const utils_js_1 = require("../utils.js");
+const utils_js_1 = require("../../utils/utils.js");
+const utils_js_2 = require("../utils.js");
 const interface_js_1 = require("./interface.js");
 class BlePeripheral {
     announcement;
@@ -14,6 +15,8 @@ class BlePeripheral {
     disconnecting = false;
     disconnectedSignalled = false;
     discoveredServiceUUIds;
+    discoverServicesPromise;
+    discoverCharacteristicsPromise = {};
     onErrorHandler = this.onPeripheralError.bind(this);
     constructor(announcement) {
         this.announcement = announcement;
@@ -29,7 +32,7 @@ class BlePeripheral {
         return this.ble;
     }
     getAnnouncedServices() {
-        return this.announcement.serviceUUIDs.map(s => (0, utils_js_1.beautifyUUID)(s));
+        return this.announcement.serviceUUIDs.map(s => (0, utils_js_2.beautifyUUID)(s));
     }
     getDiscoveredServices() {
         return this.discoveredServiceUUIds ?? [];
@@ -123,7 +126,7 @@ class BlePeripheral {
         const serviceData = this.announcement?.serviceData;
         if (!serviceData)
             return;
-        const data = serviceData.find(sd => (0, utils_js_1.matches)(sd.uuid, uuid))?.data;
+        const data = serviceData.find(sd => (0, utils_js_2.matches)(sd.uuid, uuid))?.data;
         if (data)
             return Buffer.from(data);
         return data;
@@ -147,6 +150,13 @@ class BlePeripheral {
         this.logEvent({ message: 'peripheral error', address: this.getPeripheral()?.address, error: err.message });
     }
     async discoverServices() {
+        this.discoverServicesPromise = this.discoverServicesPromise ?? this._discoverServices();
+        const promise = this.discoverServicesPromise;
+        const res = await promise;
+        (0, utils_js_1.sleep)(0).then(() => { delete this.discoverServicesPromise; });
+        return res;
+    }
+    async _discoverServices() {
         if (!this.getPeripheral())
             return [];
         if (this.getPeripheral().discoverServicesAsync) {
@@ -157,25 +167,32 @@ class BlePeripheral {
                 services = await peripheral.discoverServicesAsync([])
                     .catch(() => []);
             }
-            this.discoveredServiceUUIds = services.map(s => (0, utils_js_1.beautifyUUID)(s.uuid));
+            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 });
             return services.map(s => s.uuid);
         }
         else {
             this.logEvent({ message: 'discover services and characteristics', address: this.getPeripheral().address });
             const res = await this.getPeripheral().discoverSomeServicesAndCharacteristicsAsync([], []);
-            this.discoveredServiceUUIds = res.services.map(s => (0, utils_js_1.beautifyUUID)(s.uuid));
+            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 });
             return res.services.map(s => s.uuid);
         }
     }
     async discoverCharacteristics(serviceUUID) {
+        this.discoverCharacteristicsPromise[serviceUUID] = this.discoverCharacteristicsPromise[serviceUUID] ?? this._discoverCharacteristics(serviceUUID);
+        const promise = this.discoverCharacteristicsPromise[serviceUUID];
+        const res = await promise;
+        (0, utils_js_1.sleep)(0).then(() => { delete this.discoverCharacteristicsPromise[serviceUUID]; });
+        return res;
+    }
+    async _discoverCharacteristics(serviceUUID) {
         if (!this.getPeripheral())
             return [];
         this.logEvent({ message: 'discover services and characteristics', service: serviceUUID, address: this.getPeripheral().address });
         const res = await this.getPeripheral().discoverSomeServicesAndCharacteristicsAsync([serviceUUID], [])
             .catch(() => ({ services: [], characteristics: [] }));
-        res.characteristics.forEach(c => this.characteristics[(0, utils_js_1.beautifyUUID)(c.uuid)] = c);
+        res.characteristics.forEach(c => this.characteristics[(0, utils_js_2.beautifyUUID)(c.uuid)] = c);
         return res.characteristics.map(c => {
             const { uuid, properties, name, _serviceUuid } = c;
             return { uuid, properties, name, _serviceUuid };
@@ -185,7 +202,7 @@ class BlePeripheral {
         try {
             if (this.disconnecting || !this.connected)
                 return false;
-            const uuid = (0, utils_js_1.beautifyUUID)(characteristicUUID);
+            const uuid = (0, utils_js_2.beautifyUUID)(characteristicUUID);
             const onData = (data, isNotify) => {
                 try {
                     callback(characteristicUUID, data, isNotify);
@@ -238,7 +255,7 @@ class BlePeripheral {
     }
     unsubscribe(characteristicUUID) {
         try {
-            const uuid = (0, utils_js_1.beautifyUUID)(characteristicUUID);
+            const uuid = (0, utils_js_2.beautifyUUID)(characteristicUUID);
             const subscription = this.subscribed.find(s => s.uuid === uuid);
             if (!subscription) {
                 return Promise.resolve(true);
@@ -305,7 +322,7 @@ class BlePeripheral {
             const res = await this.getPeripheral().discoverSomeServicesAndCharacteristicsAsync([], []);
             const found = [];
             res.characteristics.forEach(c => {
-                this.characteristics[(0, utils_js_1.beautifyUUID)(c.uuid)] = c;
+                this.characteristics[(0, utils_js_2.beautifyUUID)(c.uuid)] = c;
                 found.push(c.uuid);
             });
             return found;
@@ -317,11 +334,11 @@ class BlePeripheral {
     }
     async discoverSomeCharacteristics(characteristics) {
         try {
-            const target = characteristics.map(c => (0, utils_js_1.fullUUID)(c));
+            const target = characteristics.map(c => (0, utils_js_2.fullUUID)(c));
             const res = await this.getPeripheral().discoverSomeServicesAndCharacteristicsAsync([], target);
             const found = [];
             res.characteristics.forEach(c => {
-                this.characteristics[(0, utils_js_1.beautifyUUID)(c.uuid)] = c;
+                this.characteristics[(0, utils_js_2.beautifyUUID)(c.uuid)] = c;
                 found.push(c.uuid);
             });
             return found;
@@ -356,10 +373,10 @@ class BlePeripheral {
     async read(characteristicUUID) {
         if (this.disconnecting || !this.connected)
             return Buffer.from([]);
-        let c = this.characteristics[(0, utils_js_1.beautifyUUID)(characteristicUUID)];
+        let c = this.characteristics[(0, utils_js_2.beautifyUUID)(characteristicUUID)];
         if (!c) {
             await this.discoverAllCharacteristics();
-            c = this.characteristics[(0, utils_js_1.beautifyUUID)(characteristicUUID)];
+            c = this.characteristics[(0, utils_js_2.beautifyUUID)(characteristicUUID)];
             if (!c) {
                 return Promise.reject(new Error('characteristic not found: ' + characteristicUUID));
             }
@@ -378,11 +395,11 @@ class BlePeripheral {
     async write(characteristicUUID, data, options) {
         if (this.disconnecting || !this.connected)
             return Buffer.from([]);
-        const uuid = (0, utils_js_1.beautifyUUID)(characteristicUUID);
+        const uuid = (0, utils_js_2.beautifyUUID)(characteristicUUID);
         let c = this.characteristics[uuid];
         if (!c) {
             await this.discoverAllCharacteristics();
-            c = this.characteristics[(0, utils_js_1.beautifyUUID)(characteristicUUID)];
+            c = this.characteristics[(0, utils_js_2.beautifyUUID)(characteristicUUID)];
             if (!c) {
                 return Promise.reject(new Error('characteristic not found: ' + characteristicUUID));
             }
@@ -415,22 +432,22 @@ class BlePeripheral {
         });
     }
     async queryRawCharacteristic(uuid) {
-        const characteristicUUID = (0, utils_js_1.beautifyUUID)(uuid);
-        let c = this.characteristics[(0, utils_js_1.beautifyUUID)(uuid)];
+        const characteristicUUID = (0, utils_js_2.beautifyUUID)(uuid);
+        let c = this.characteristics[(0, utils_js_2.beautifyUUID)(uuid)];
         if (c)
             return c;
         const res = await this.getPeripheral().discoverSomeServicesAndCharacteristicsAsync([], [characteristicUUID]);
         if (res.characteristics.length === 0) {
             return;
         }
-        c = res.characteristics.find(dc => (0, utils_js_1.beautifyUUID)(dc.uuid) === (0, utils_js_1.beautifyUUID)(characteristicUUID));
+        c = res.characteristics.find(dc => (0, utils_js_2.beautifyUUID)(dc.uuid) === (0, utils_js_2.beautifyUUID)(characteristicUUID));
         if (c) {
             this.characteristics[characteristicUUID] = c;
         }
         return c;
     }
     getRawCharacteristic(uuid, query = false) {
-        return this.characteristics[(0, utils_js_1.beautifyUUID)(uuid)];
+        return this.characteristics[(0, utils_js_2.beautifyUUID)(uuid)];
     }
     logEvent(event) {
         event.peripheral = this.announcement?.name;

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

@@ -1,3 +1,4 @@
+import { sleep } from "../../utils/utils.js";
 import { beautifyUUID, fullUUID, matches } from "../utils.js";
 import { BleInterface } from "./interface.js";
 export class BlePeripheral {
@@ -11,6 +12,8 @@ export class BlePeripheral {
     disconnecting = false;
     disconnectedSignalled = false;
     discoveredServiceUUIds;
+    discoverServicesPromise;
+    discoverCharacteristicsPromise = {};
     onErrorHandler = this.onPeripheralError.bind(this);
     constructor(announcement) {
         this.announcement = announcement;
@@ -144,6 +147,13 @@ export class BlePeripheral {
         this.logEvent({ message: 'peripheral error', address: this.getPeripheral()?.address, error: err.message });
     }
     async discoverServices() {
+        this.discoverServicesPromise = this.discoverServicesPromise ?? this._discoverServices();
+        const promise = this.discoverServicesPromise;
+        const res = await promise;
+        sleep(0).then(() => { delete this.discoverServicesPromise; });
+        return res;
+    }
+    async _discoverServices() {
         if (!this.getPeripheral())
             return [];
         if (this.getPeripheral().discoverServicesAsync) {
@@ -167,6 +177,13 @@ export class BlePeripheral {
         }
     }
     async discoverCharacteristics(serviceUUID) {
+        this.discoverCharacteristicsPromise[serviceUUID] = this.discoverCharacteristicsPromise[serviceUUID] ?? this._discoverCharacteristics(serviceUUID);
+        const promise = this.discoverCharacteristicsPromise[serviceUUID];
+        const res = await promise;
+        sleep(0).then(() => { delete this.discoverCharacteristicsPromise[serviceUUID]; });
+        return res;
+    }
+    async _discoverCharacteristics(serviceUUID) {
         if (!this.getPeripheral())
             return [];
         this.logEvent({ message: 'discover services and characteristics', service: serviceUUID, address: this.getPeripheral().address });

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

@@ -14,6 +14,8 @@ export declare class BlePeripheral implements IBlePeripheral {
     protected disconnecting: boolean;
     protected disconnectedSignalled: boolean;
     protected discoveredServiceUUIds: Array<string> | undefined;
+    protected discoverServicesPromise: Promise<string[]> | undefined;
+    protected discoverCharacteristicsPromise: Record<string, Promise<BleCharacteristic[]> | undefined>;
     protected onErrorHandler: any;
     constructor(announcement: BlePeripheralAnnouncement);
     get services(): BleService[];
@@ -32,7 +34,9 @@ export declare class BlePeripheral implements IBlePeripheral {
     protected onPeripheralDisconnect(): Promise<void>;
     protected onPeripheralError(err: Error): void;
     discoverServices(): Promise<string[]>;
+    protected _discoverServices(): Promise<string[]>;
     discoverCharacteristics(serviceUUID: string): Promise<BleCharacteristic[]>;
+    protected _discoverCharacteristics(serviceUUID: string): Promise<BleCharacteristic[]>;
     subscribe(characteristicUUID: string, callback: (characteristicUuid: string, data: Buffer, isNotify?: any) => void): Promise<boolean>;
     unsubscribe(characteristicUUID: string): Promise<boolean>;
     subscribeSelected(characteristics: string[], callback: (characteristicUuid: string, data: Buffer, isNotify?: boolean) => void): Promise<boolean>;

package/package.json

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