incyclist-devices 1.4.79 → 1.4.80

package/lib/ble/ble-device.d.ts

@@ -13,6 +13,11 @@ declare type CommandQueueItem = {
     resolve: any;
     reject: any;
 };
+export interface MessageLog {
+    uuid: string;
+    timestamp: any;
+    data: string;
+}
 export declare abstract class BleDevice extends BleDeviceClass {
     id: string;
     address: string;
@@ -28,6 +33,7 @@ export declare abstract class BleDevice extends BleDeviceClass {
     subscribedCharacteristics: string[];
     writeQueue: CommandQueueItem[];
     workerIv: NodeJS.Timeout;
+    prevMessages: MessageLog[];
     constructor(props?: BleDeviceConstructProps);
     logEvent(event: any): void;
     setLogger(logger: EventLogger): void;
@@ -44,6 +50,7 @@ export declare abstract class BleDevice extends BleDeviceClass {
     connect(props?: ConnectProps): Promise<boolean>;
     disconnect(): Promise<boolean>;
     abstract getProfile(): string;
+    checkForDuplicate(characteristic: string, data: Buffer): boolean;
     onData(characteristic: string, data: Buffer): void;
     timeoutCheck(): void;
     startWorker(): void;

package/lib/ble/ble-device.js

@@ -28,6 +28,7 @@ class BleDevice extends ble_1.BleDeviceClass {
         this.isInitialized = false;
         this.writeQueue = [];
         this.workerIv = null;
+        this.prevMessages = [];
         if (props.peripheral) {
             const { id, address, advertisement, state } = props.peripheral;
             this.peripheral = props.peripheral;
@@ -251,6 +252,23 @@ class BleDevice extends ble_1.BleDeviceClass {
             }
         });
     }
+    checkForDuplicate(characteristic, data) {
+        const prev = this.prevMessages.find(i => i.uuid === characteristic);
+        if (prev) {
+            if (prev.data === data.toString('hex') && prev.timestamp > Date.now() - 500) {
+                prev.timestamp = Date.now();
+                return true;
+            }
+            else {
+                prev.data = data.toString('hex');
+                prev.timestamp = Date.now();
+            }
+        }
+        else {
+            this.prevMessages.push({ uuid: characteristic, timestamp: Date.now(), data: data.toString('hex') });
+        }
+        return false;
+    }
     onData(characteristic, data) {
         if (this.writeQueue.length > 0) {
             const writeIdx = this.writeQueue.findIndex(i => i.uuid === characteristic.toLocaleLowerCase());

package/lib/ble/ble-interface.d.ts

@@ -79,7 +79,7 @@ export default class BleInterface extends BleInterfaceClass {
         profile?: string;
         services?: string[];
     }): (typeof BleDeviceClass)[];
-    createDevice(DeviceClass: (typeof BleDeviceClass), peripheral: BlePeripheral, characteristics?: BleCharacteristic[]): any;
+    createDevice(DeviceClass: (typeof BleDeviceClass), peripheral: BlePeripheral, characteristics?: BleCharacteristic[]): BleDeviceClass;
     connectDevice(requested: BleDeviceClass | BleDeviceDescription, timeout?: number): Promise<BleDeviceClass>;
     waitForScanFinished(timeout: any): Promise<unknown>;
     scan(props: ScanProps): Promise<BleDeviceClass[]>;

package/lib/ble/ble-interface.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const gd_eventlog_1 = require("gd-eventlog");
 const utils_1 = require("../utils");
 const ble_1 = require("./ble");
+const ble_2 = require("./ble");
 const ble_peripheral_1 = __importDefault(require("./ble-peripheral"));
 const CONNECT_TIMEOUT = 5000;
 const DEFAULT_SCAN_TIMEOUT = 20000;
@@ -206,13 +207,13 @@ class BleInterface extends ble_1.BleInterfaceClass {
             return types;
         };
         if (typeof services === 'string') {
-            return get(deviceTypes, (s) => (0, ble_1.uuid)(s) === (0, ble_1.uuid)(services));
+            return get(deviceTypes, (s) => (0, ble_2.matches)(s, services));
         }
         if (Array.isArray(services)) {
             const sids = services.map(ble_1.uuid);
             return get(deviceTypes, s => {
-                const res = sids.includes((0, ble_1.uuid)(s));
-                return res;
+                const res = sids.find((s) => (0, ble_2.matches)(s, services));
+                return res !== undefined;
             });
         }
         return [];
@@ -370,6 +371,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
             device.setInterface(this);
             if (characteristics && device.isMatching(cids)) {
                 device.characteristics = characteristics;
+                device.setCharacteristicUUIDs(characteristics.map(c => c.uuid));
                 return device;
             }
             else {

package/lib/ble/ble.d.ts

@@ -42,6 +42,7 @@ export declare abstract class BleDeviceClass extends EventEmitter {
     abstract connect(props?: ConnectProps): Promise<boolean>;
     abstract disconnect(): Promise<boolean>;
     abstract getDeviceInfo(): Promise<BleDeviceInfo>;
+    setCharacteristicUUIDs(uuids: string[]): void;
 }
 export interface BleBinding extends EventEmitter {
     startScanning(serviceUUIDs?: string[], allowDuplicates?: boolean, callback?: (error?: Error) => void): void;
@@ -118,3 +119,4 @@ export declare enum BleState {
     POWERED_ON = "poweredOn"
 }
 export declare const uuid: (s: any) => any;
+export declare const matches: (uuid1: any, uuid2: any) => boolean;

package/lib/ble/ble.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uuid = exports.BleState = exports.BleInterfaceClass = exports.BleBindingWrapper = exports.BleDeviceClass = void 0;
+exports.matches = exports.uuid = exports.BleState = exports.BleInterfaceClass = exports.BleBindingWrapper = exports.BleDeviceClass = void 0;
 const events_1 = __importDefault(require("events"));
 class BleDeviceClass extends events_1.default {
     constructor() {
@@ -16,6 +16,7 @@ class BleDeviceClass extends events_1.default {
     isConnected() {
         return this.connectState.isConnected;
     }
+    setCharacteristicUUIDs(uuids) { }
 }
 exports.BleDeviceClass = BleDeviceClass;
 BleDeviceClass.services = [];
@@ -71,3 +72,15 @@ const uuid = (s) => {
     }
 };
 exports.uuid = uuid;
+const matches = (uuid1, uuid2) => {
+    if ((0, exports.uuid)(uuid1) === (0, exports.uuid)(uuid2))
+        return true;
+    const ul1 = uuid1.toLowerCase();
+    const ul2 = uuid2.toLowerCase();
+    if (ul1.length < ul2.length && ul2.startsWith(ul1))
+        return true;
+    if (ul1.length > ul2.length && ul1.startsWith(ul2))
+        return true;
+    return false;
+};
+exports.matches = matches;

package/lib/ble/fm.js

@@ -306,6 +306,9 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
     }
     onData(characteristic, data) {
         super.onData(characteristic, data);
+        const isDuplicate = this.checkForDuplicate(characteristic, data);
+        if (isDuplicate)
+            return;
         const uuid = characteristic.toLocaleLowerCase();
         let res = undefined;
         switch (uuid) {
@@ -321,7 +324,6 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
             case '2a63':
             case '2a5b':
             case '347b0011-7635-408b-8918-8ff3949ce592':
-                this.logger.logEvent({ message: 'onBleData', raw: `uuid:${data.toString('hex')}` });
                 break;
             default:
                 break;

package/lib/ble/hrm.js

@@ -52,6 +52,9 @@ class BleHrmDevice extends ble_device_1.BleDevice {
     }
     onData(characteristic, data) {
         super.onData(characteristic, data);
+        const isDuplicate = this.checkForDuplicate(characteristic, data);
+        if (isDuplicate)
+            return;
         if (characteristic.toLocaleLowerCase() === '2a37') {
             const res = this.parseHrm(data);
             this.emit('data', res);

package/lib/ble/pwr.js

@@ -140,6 +140,9 @@ class BleCyclingPowerDevice extends ble_device_1.BleDevice {
     }
     onData(characteristic, data) {
         super.onData(characteristic, data);
+        const isDuplicate = this.checkForDuplicate(characteristic, data);
+        if (isDuplicate)
+            return;
         if (characteristic.toLocaleLowerCase() === CP_MEASUREMENT) {
             const res = this.parsePower(data);
             this.emit('data', res);

package/lib/ble/tacx.d.ts

@@ -24,14 +24,6 @@ declare type CrankData = {
     time?: number;
     cntUpdateMissing?: number;
 };
-declare type MessageInfo = {
-    message: string;
-    ts: number;
-    uuid: string;
-};
-declare type MessageLog = {
-    [uuid: string]: MessageInfo;
-};
 export default class TacxAdvancedFitnessMachineDevice extends BleFitnessMachineDevice {
     static services: string[];
     static characteristics: string[];
@@ -42,10 +34,12 @@ export default class TacxAdvancedFitnessMachineDevice extends BleFitnessMachineD
     tsPrevWrite: any;
     data: BleFeBikeData;
     hasFECData: boolean;
-    prevMessages: MessageLog;
     messageCnt: number;
+    tacxRx: string;
+    tacxTx: string;
     constructor(props?: any);
     isMatching(characteristics: string[]): boolean;
+    setCharacteristicUUIDs(uuids: string[]): void;
     init(): Promise<boolean>;
     getProfile(): string;
     getServiceUUids(): string[];

package/lib/ble/tacx.js

@@ -33,6 +33,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TacxBleFEAdapter = void 0;
 const ble_interface_1 = __importDefault(require("./ble-interface"));
+const ble_1 = require("./ble");
 const Device_1 = require("../Device");
 const gd_eventlog_1 = require("gd-eventlog");
 const fm_1 = __importStar(require("./fm"));
@@ -75,15 +76,25 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
         this.data = {};
         this.hasFECData = false;
         this.messageCnt = 0;
-        this.prevMessages = {};
+        this.tacxRx = consts_1.TACX_FE_C_RX;
+        this.tacxTx = consts_1.TACX_FE_C_TX;
     }
     isMatching(characteristics) {
         if (!characteristics)
             return false;
-        const hasTacxCP = characteristics.find(c => c === consts_1.TACX_FE_C_RX) !== undefined && characteristics.find(c => c === consts_1.TACX_FE_C_TX) !== undefined;
-        const hasFTMS = characteristics.find(c => c === consts_1.FTMS_CP) !== undefined;
+        const hasTacxCP = characteristics.find(c => (0, ble_1.matches)(c, consts_1.TACX_FE_C_RX)) !== undefined &&
+            characteristics.find(c => (0, ble_1.matches)(c, consts_1.TACX_FE_C_TX)) !== undefined;
+        const hasFTMS = characteristics.find(c => (0, ble_1.matches)(c, consts_1.FTMS_CP)) !== undefined;
         return hasTacxCP;
     }
+    setCharacteristicUUIDs(uuids) {
+        uuids.forEach(c => {
+            if ((0, ble_1.matches)(c, consts_1.TACX_FE_C_RX))
+                this.tacxRx = c;
+            if ((0, ble_1.matches)(c, consts_1.TACX_FE_C_TX))
+                this.tacxTx = c;
+        });
+    }
     init() {
         const _super = Object.create(null, {
             initDevice: { get: () => super.initDevice }
@@ -423,20 +434,13 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
         return res;
     }
     onData(characteristic, data) {
+        const isDuplicate = this.checkForDuplicate(characteristic, data);
+        if (isDuplicate)
+            return;
         try {
             const uuid = characteristic.toLocaleLowerCase();
-            const message = data.toString('hex');
-            const ts = Date.now();
-            if (this.prevMessages[uuid]) {
-                const prev = this.prevMessages[uuid];
-                if (prev.message === message && prev.ts > ts - 500) {
-                    return;
-                }
-            }
-            this.prevMessages[uuid] = { uuid, ts, message };
-            this.messageCnt++;
             let res = undefined;
-            if (uuid && uuid.startsWith(consts_1.TACX_FE_C_RX)) {
+            if (uuid && (0, ble_1.matches)(uuid, this.tacxRx)) {
                 res = this.parseFECMessage(data);
             }
             else {
@@ -492,7 +496,7 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
     }
     sendMessage(message) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.write(consts_1.TACX_FE_C_TX, message, true);
+            yield this.write(this.tacxTx, message, true);
             return true;
         });
     }

package/lib/ble/wahoo-kickr.d.ts

@@ -35,9 +35,11 @@ export default class WahooAdvancedFitnessMachineDevice extends BleFitnessMachine
     timeOffset: number;
     tsPrevWrite: any;
     prevSlope: any;
+    wahooCP: string;
     constructor(props?: any);
     isMatching(characteristics: string[]): boolean;
     init(): Promise<boolean>;
+    setCharacteristicUUIDs(uuids: string[]): void;
     getProfile(): string;
     getServiceUUids(): string[];
     isBike(): boolean;

package/lib/ble/wahoo-kickr.js

@@ -33,6 +33,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WahooAdvancedFmAdapter = void 0;
 const ble_interface_1 = __importDefault(require("./ble-interface"));
+const ble_1 = require("./ble");
 const Device_1 = require("../Device");
 const gd_eventlog_1 = require("gd-eventlog");
 const fm_1 = __importStar(require("./fm"));
@@ -55,12 +56,13 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
         this.tsPrevWrite = undefined;
         this.prevSlope = undefined;
         this.data = {};
+        this.wahooCP = WAHOO_ADVANCED_TRAINER_CP;
     }
     isMatching(characteristics) {
         if (!characteristics)
             return false;
-        const hasWahooCP = characteristics.find(c => c === WAHOO_ADVANCED_TRAINER_CP) !== undefined;
-        const hasFTMS = characteristics.find(c => c === consts_1.FTMS_CP) !== undefined;
+        const hasWahooCP = characteristics.find(c => (0, ble_1.matches)(c, WAHOO_ADVANCED_TRAINER_CP)) !== undefined;
+        const hasFTMS = characteristics.find(c => (0, ble_1.matches)(c, consts_1.FTMS_CP)) !== undefined;
         return hasWahooCP && !hasFTMS;
     }
     init() {
@@ -69,7 +71,7 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
         });
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                yield this.subscribeWriteResponse(WAHOO_ADVANCED_TRAINER_CP);
+                yield this.subscribeWriteResponse(this.wahooCP);
                 yield _super.initDevice.call(this);
                 return true;
             }
@@ -79,6 +81,12 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
             }
         });
     }
+    setCharacteristicUUIDs(uuids) {
+        uuids.forEach(c => {
+            if ((0, ble_1.matches)(c, WAHOO_ADVANCED_TRAINER_CP))
+                this.wahooCP = c;
+        });
+    }
     getProfile() {
         return 'Wahoo Smart Trainer';
     }
@@ -155,6 +163,9 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
     }
     onData(characteristic, data) {
         super.onData(characteristic, data);
+        const isDuplicate = this.checkForDuplicate(characteristic, data);
+        if (isDuplicate)
+            return;
         const uuid = characteristic.toLocaleLowerCase();
         let res = undefined;
         switch (uuid) {
@@ -182,7 +193,7 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
                 const opcode = Buffer.alloc(1);
                 opcode.writeUInt8(requestedOpCode, 0);
                 const message = Buffer.concat([opcode, data]);
-                const res = yield this.write(WAHOO_ADVANCED_TRAINER_CP, message);
+                const res = yield this.write(this.wahooCP, message);
                 const responseData = Buffer.from(res);
                 const result = responseData.readUInt8(0);
                 this.logEvent({ message: 'response', opCode: requestedOpCode, response: responseData.toString('hex') });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "1.4.79",
+  "version": "1.4.80",
   "dependencies": {
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",