incyclist-devices 3.0.27 → 3.0.28

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

@@ -345,7 +345,10 @@ class BleAdapter extends adpater_js_1.default {
         }
         const sensor = this.getSensor();
         let connected = await sensor.startSensor();
-        await sensor.subscribe();
+        const subscribed = await sensor.subscribe();
+        if (connected && !subscribed) {
+            connected = false;
+        }
         if (connected) {
             sensor.on('data', this.onDeviceDataHandler);
             sensor.on('disconnected', this.onDeviceDisconnectHandler);

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

@@ -15,6 +15,7 @@ class BlePeripheral {
     disconnecting = false;
     disconnectedSignalled = false;
     discoveredServiceUUIds;
+    serviceDiscoveryIncomplete = false;
     discoverServicesPromise;
     discoverCharacteristicsPromise = {};
     onErrorHandler = this.onPeripheralError.bind(this);
@@ -159,8 +160,11 @@ class BlePeripheral {
         const res = await promise;
         (0, utils_js_1.sleep)(0).then(() => { delete this.discoverServicesPromise; });
         const isComplete = this.checkAnnouncedServices(res);
+        this.serviceDiscoveryIncomplete = !isComplete;
         if (!isComplete) {
-            this.logEvent({ message: 'service data incomplete - disconnecting' });
+            const { name, address } = this.getInfo();
+            this.logEvent({ message: 'service data incomplete - disconnecting', name, address,
+                announced: this.getAnnouncedServices(), discovered: this.getDiscoveredServices() });
         }
         return res;
     }
@@ -324,6 +328,14 @@ class BlePeripheral {
             }
             catch { }
         }
+        if (this.serviceDiscoveryIncomplete) {
+            this.logEvent({ message: 'peripheral subscribe selected failed', uuids, reason: 'service discovery incomplete',
+                announced: this.getAnnouncedServices(), discovered: this.getDiscoveredServices() });
+            this.discoveredServiceUUIds = undefined;
+            this.serviceDiscoveryIncomplete = false;
+            await this.disconnect().catch(() => { });
+            return false;
+        }
         try {
             if (Object.keys(this.characteristics).length === 0) {
                 await this.discoverAllCharacteristics();
@@ -364,6 +376,11 @@ class BlePeripheral {
             const res = await this.getPeripheral().discoverSomeServicesAndCharacteristicsAsync([], []);
             const found = [];
             const uuids = [];
+            const freshUuids = new Set(res.characteristics.map(c => (0, utils_js_2.beautifyUUID)(c.uuid)));
+            Object.keys(this.characteristics).forEach(existing => {
+                if (!freshUuids.has(existing))
+                    delete this.characteristics[existing];
+            });
             res.characteristics.forEach(c => {
                 this.characteristics[(0, utils_js_2.beautifyUUID)(c.uuid)] = c;
                 found.push(c.uuid);
@@ -382,6 +399,12 @@ class BlePeripheral {
             const target = characteristics.map(c => (0, utils_js_2.fullUUID)(c));
             const res = await this.getPeripheral().discoverSomeServicesAndCharacteristicsAsync([], target);
             const found = [];
+            const freshUuids = new Set(res.characteristics.map(c => (0, utils_js_2.beautifyUUID)(c.uuid)));
+            characteristics.forEach(requested => {
+                const requestedUuid = (0, utils_js_2.beautifyUUID)(requested);
+                if (!freshUuids.has(requestedUuid))
+                    delete this.characteristics[requestedUuid];
+            });
             res.characteristics.forEach(c => {
                 this.characteristics[(0, utils_js_2.beautifyUUID)(c.uuid)] = c;
                 found.push(c.uuid);

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

@@ -79,6 +79,7 @@ class TBleSensor extends node_events_1.EventEmitter {
         }
         this.connectPromise = this.connectPromise ?? this.peripheral.connect();
         const connected = await this.connectPromise;
+        delete this.connectPromise;
         if (!connected)
             return false;
         if (!reconnect)

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

@@ -340,7 +340,10 @@ export default class BleAdapter extends IncyclistDevice {
         }
         const sensor = this.getSensor();
         let connected = await sensor.startSensor();
-        await sensor.subscribe();
+        const subscribed = await sensor.subscribe();
+        if (connected && !subscribed) {
+            connected = false;
+        }
         if (connected) {
             sensor.on('data', this.onDeviceDataHandler);
             sensor.on('disconnected', this.onDeviceDisconnectHandler);

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

@@ -12,6 +12,7 @@ export class BlePeripheral {
     disconnecting = false;
     disconnectedSignalled = false;
     discoveredServiceUUIds;
+    serviceDiscoveryIncomplete = false;
     discoverServicesPromise;
     discoverCharacteristicsPromise = {};
     onErrorHandler = this.onPeripheralError.bind(this);
@@ -156,8 +157,11 @@ export class BlePeripheral {
         const res = await promise;
         sleep(0).then(() => { delete this.discoverServicesPromise; });
         const isComplete = this.checkAnnouncedServices(res);
+        this.serviceDiscoveryIncomplete = !isComplete;
         if (!isComplete) {
-            this.logEvent({ message: 'service data incomplete - disconnecting' });
+            const { name, address } = this.getInfo();
+            this.logEvent({ message: 'service data incomplete - disconnecting', name, address,
+                announced: this.getAnnouncedServices(), discovered: this.getDiscoveredServices() });
         }
         return res;
     }
@@ -321,6 +325,14 @@ export class BlePeripheral {
             }
             catch { }
         }
+        if (this.serviceDiscoveryIncomplete) {
+            this.logEvent({ message: 'peripheral subscribe selected failed', uuids, reason: 'service discovery incomplete',
+                announced: this.getAnnouncedServices(), discovered: this.getDiscoveredServices() });
+            this.discoveredServiceUUIds = undefined;
+            this.serviceDiscoveryIncomplete = false;
+            await this.disconnect().catch(() => { });
+            return false;
+        }
         try {
             if (Object.keys(this.characteristics).length === 0) {
                 await this.discoverAllCharacteristics();
@@ -361,6 +373,11 @@ export class BlePeripheral {
             const res = await this.getPeripheral().discoverSomeServicesAndCharacteristicsAsync([], []);
             const found = [];
             const uuids = [];
+            const freshUuids = new Set(res.characteristics.map(c => beautifyUUID(c.uuid)));
+            Object.keys(this.characteristics).forEach(existing => {
+                if (!freshUuids.has(existing))
+                    delete this.characteristics[existing];
+            });
             res.characteristics.forEach(c => {
                 this.characteristics[beautifyUUID(c.uuid)] = c;
                 found.push(c.uuid);
@@ -379,6 +396,12 @@ export class BlePeripheral {
             const target = characteristics.map(c => fullUUID(c));
             const res = await this.getPeripheral().discoverSomeServicesAndCharacteristicsAsync([], target);
             const found = [];
+            const freshUuids = new Set(res.characteristics.map(c => beautifyUUID(c.uuid)));
+            characteristics.forEach(requested => {
+                const requestedUuid = beautifyUUID(requested);
+                if (!freshUuids.has(requestedUuid))
+                    delete this.characteristics[requestedUuid];
+            });
             res.characteristics.forEach(c => {
                 this.characteristics[beautifyUUID(c.uuid)] = c;
                 found.push(c.uuid);

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

@@ -76,6 +76,7 @@ export class TBleSensor extends EventEmitter {
         }
         this.connectPromise = this.connectPromise ?? this.peripheral.connect();
         const connected = await this.connectPromise;
+        delete this.connectPromise;
         if (!connected)
             return false;
         if (!reconnect)

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

@@ -14,6 +14,7 @@ export declare class BlePeripheral implements IBlePeripheral {
     protected disconnecting: boolean;
     protected disconnectedSignalled: boolean;
     protected discoveredServiceUUIds: Array<string> | undefined;
+    protected serviceDiscoveryIncomplete: boolean;
     protected discoverServicesPromise: Promise<string[]> | undefined;
     protected discoverCharacteristicsPromise: Record<string, Promise<BleCharacteristic[]> | undefined>;
     protected onErrorHandler: any;

package/package.json

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