incyclist-devices 3.0.30 → 3.0.32

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

@@ -718,6 +718,9 @@ class BleInterface extends node_events_1.EventEmitter {
     getExpectedServices() {
         return this.getAdapterFactory().getAllSupportedServices();
     }
+    getSupportedServices() {
+        return this.expectedServices;
+    }
     logEvent(event) {
         if (this.logDisabled && event.message !== 'Error')
             return;

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

@@ -4,6 +4,7 @@ exports.BlePeripheral = void 0;
 const utils_js_1 = require("../../utils/utils.js");
 const utils_js_2 = require("../utils.js");
 const interface_js_1 = require("./interface.js");
+const SERVICE_COMPLETENESS_WHITELIST = ['MRK-R15'];
 class BlePeripheral {
     announcement;
     connected = false;
@@ -159,7 +160,7 @@ class BlePeripheral {
         const promise = this.discoverServicesPromise;
         const res = await promise;
         (0, utils_js_1.sleep)(0).then(() => { delete this.discoverServicesPromise; });
-        const isComplete = this.checkAnnouncedServices(res);
+        const isComplete = !this.isServiceCompletenessCheckApplicable() || this.checkAnnouncedServices(res);
         this.serviceDiscoveryIncomplete = !isComplete;
         if (!isComplete) {
             const { name, address } = this.getInfo();
@@ -168,8 +169,13 @@ class BlePeripheral {
         }
         return res;
     }
+    isServiceCompletenessCheckApplicable() {
+        const { name } = this.getInfo();
+        return !!name && SERVICE_COMPLETENESS_WHITELIST.some(prefix => name.startsWith(prefix));
+    }
     checkAnnouncedServices(discovered) {
-        const announced = this.getAnnouncedServices();
+        const expected = this.ble.getSupportedServices();
+        const announced = this.getAnnouncedServices().filter(a => expected.some(e => (0, utils_js_2.isSameServiceFamily)(a, e)));
         const toBeChecked = discovered.map(x => (0, utils_js_2.beautifyUUID)(x));
         const cntAnnounced = announced.length;
         let cntVerified = 0;

package/lib/cjs/ble/characteristics/csc/measurement.js

@@ -41,6 +41,7 @@ class CscMeasurement {
             const { rpm } = this.parseCrankData(crankData);
             this.data.cadence = rpm;
         }
+        this.data.raw = data.toString('hex');
         return this.data;
     }
     parseCrankData(crankData) {

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

@@ -49,6 +49,10 @@ class BleCyclingSpeedCadenceDevice extends sensor_js_1.TBleSensor {
         }
         const parsed = parser.parse(data);
         this.data = { ...this.data, ...parsed };
+        if (this.data.speed < 0) {
+            this.logEvent({ message: 'error', fn: 'onData', error: 'speed<0', speed: this.data.speed, raw: this.data.raw });
+            return false;
+        }
         this.emit('data', this.data);
         return true;
     }

package/lib/cjs/direct-connect/base/interface.js

@@ -66,6 +66,9 @@ class DirectConnectInterface extends node_events_1.EventEmitter {
     createPeripheral(announcement) {
         return peripheral_js_1.DirectConnectPeripheral.create(announcement);
     }
+    getSupportedServices() {
+        return [];
+    }
     createDeviceSetting(service) {
         try {
             const name = service.name;

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

@@ -715,6 +715,9 @@ export class BleInterface extends EventEmitter {
     getExpectedServices() {
         return this.getAdapterFactory().getAllSupportedServices();
     }
+    getSupportedServices() {
+        return this.expectedServices;
+    }
     logEvent(event) {
         if (this.logDisabled && event.message !== 'Error')
             return;

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

@@ -1,6 +1,7 @@
 import { sleep } from "../../utils/utils.js";
 import { beautifyUUID, fullUUID, isSameServiceFamily, matches } from "../utils.js";
 import { BleInterface } from "./interface.js";
+const SERVICE_COMPLETENESS_WHITELIST = ['MRK-R15'];
 export class BlePeripheral {
     announcement;
     connected = false;
@@ -156,7 +157,7 @@ export class BlePeripheral {
         const promise = this.discoverServicesPromise;
         const res = await promise;
         sleep(0).then(() => { delete this.discoverServicesPromise; });
-        const isComplete = this.checkAnnouncedServices(res);
+        const isComplete = !this.isServiceCompletenessCheckApplicable() || this.checkAnnouncedServices(res);
         this.serviceDiscoveryIncomplete = !isComplete;
         if (!isComplete) {
             const { name, address } = this.getInfo();
@@ -165,8 +166,13 @@ export class BlePeripheral {
         }
         return res;
     }
+    isServiceCompletenessCheckApplicable() {
+        const { name } = this.getInfo();
+        return !!name && SERVICE_COMPLETENESS_WHITELIST.some(prefix => name.startsWith(prefix));
+    }
     checkAnnouncedServices(discovered) {
-        const announced = this.getAnnouncedServices();
+        const expected = this.ble.getSupportedServices();
+        const announced = this.getAnnouncedServices().filter(a => expected.some(e => isSameServiceFamily(a, e)));
         const toBeChecked = discovered.map(x => beautifyUUID(x));
         const cntAnnounced = announced.length;
         let cntVerified = 0;

package/lib/esm/ble/characteristics/csc/measurement.js

@@ -38,6 +38,7 @@ export class CscMeasurement {
             const { rpm } = this.parseCrankData(crankData);
             this.data.cadence = rpm;
         }
+        this.data.raw = data.toString('hex');
         return this.data;
     }
     parseCrankData(crankData) {

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

@@ -46,6 +46,10 @@ export class BleCyclingSpeedCadenceDevice extends TBleSensor {
         }
         const parsed = parser.parse(data);
         this.data = { ...this.data, ...parsed };
+        if (this.data.speed < 0) {
+            this.logEvent({ message: 'error', fn: 'onData', error: 'speed<0', speed: this.data.speed, raw: this.data.raw });
+            return false;
+        }
         this.emit('data', this.data);
         return true;
     }

package/lib/esm/direct-connect/base/interface.js

@@ -63,6 +63,9 @@ export default class DirectConnectInterface extends EventEmitter {
     createPeripheral(announcement) {
         return DirectConnectPeripheral.create(announcement);
     }
+    getSupportedServices() {
+        return [];
+    }
     createDeviceSetting(service) {
         try {
             const name = service.name;

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

@@ -110,6 +110,7 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     protected getAdapterFactory(): BleAdapterFactory<TBleSensor>;
     protected getConnectTimeout(): number;
     protected getExpectedServices(): string[];
+    getSupportedServices(): string[];
     logEvent(event: any): void;
     logError(err: Error, fn: string, args?: any): void;
     protected reset(): Promise<void>;

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

@@ -35,6 +35,7 @@ export declare class BlePeripheral implements IBlePeripheral {
     protected onPeripheralDisconnect(): Promise<void>;
     protected onPeripheralError(err: Error): void;
     discoverServices(): Promise<string[]>;
+    protected isServiceCompletenessCheckApplicable(): boolean;
     protected checkAnnouncedServices(discovered: string[]): boolean;
     protected _discoverServices(): Promise<string[]>;
     discoverCharacteristics(serviceUUID: string): Promise<BleCharacteristic[]>;

package/lib/types/ble/characteristics/csc/measurement.d.ts

@@ -3,6 +3,7 @@ import { CharacteristicParser, Feature } from "../types.js";
 export type CyclingCadenceAndSpeed = {
     cadence?: number;
     speed?: number;
+    raw?: string;
 };
 export declare class CscMeasurement implements CharacteristicParser<CyclingCadenceAndSpeed> {
     protected data: CyclingCadenceAndSpeed;

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

@@ -150,6 +150,7 @@ export interface IBleInterface<T extends PeripheralAnnouncement> extends Incycli
     waitForPeripheral(settings: DeviceSettings): Promise<IBlePeripheral>;
     pauseDiscovery?(): Promise<void>;
     resumeDiscovery?(): Promise<void>;
+    getSupportedServices(): string[];
 }
 export interface IBlePeripheral {
     services: BleService[];

package/lib/types/direct-connect/base/interface.d.ts

@@ -32,6 +32,7 @@ export default class DirectConnectInterface extends EventEmitter implements IBle
     constructor(props: InterfaceProps);
     setProps(props: InterfaceProps): void;
     createPeripheral(announcement: MulticastDnsAnnouncement): IBlePeripheral;
+    getSupportedServices(): string[];
     createDeviceSetting(service: MulticastDnsAnnouncement): BleDeviceSettings;
     createPeripheralFromSettings(settings: DeviceSettings): IBlePeripheral;
     addKnownDevice(settings: BleDeviceSettings): void;

package/package.json

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