incyclist-devices 3.0.28 → 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/cjs/ble/wahoo/sensor.js

@@ -8,6 +8,8 @@ const consts_js_2 = require("../consts.js");
 const consts_js_3 = require("./consts.js");
 const sensor_js_1 = __importDefault(require("../fm/sensor.js"));
 const utils_js_1 = require("../utils.js");
+const task_js_1 = require("../../utils/task.js");
+const WAHOO_CP_WRITE_TIMEOUT = 800;
 class BleWahooDevice extends sensor_js_1.default {
     static profile = 'Smart Trainer';
     static protocol = 'wahoo';
@@ -234,7 +236,22 @@ class BleWahooDevice extends sensor_js_1.default {
             opcode.writeUInt8(requestedOpCode, 0);
             const message = Buffer.concat([opcode, data]);
             this.logEvent({ message: 'wahoo cp:write', data: message.toString('hex') });
-            const res = await this.write(this.wahooCP, message, props);
+            let res;
+            if (props?.timeout) {
+                const internalAbort = new AbortController();
+                const combined = new AbortController();
+                props.signal?.addEventListener('abort', () => combined.abort(), { once: true });
+                internalAbort.signal.addEventListener('abort', () => combined.abort(), { once: true });
+                const signal = combined.signal;
+                res = await new task_js_1.InteruptableTask(this.write(this.wahooCP, message, { ...props, signal }), {
+                    timeout: props.timeout,
+                    errorOnTimeout: true,
+                    onCancel: () => internalAbort.abort()
+                }).run();
+            }
+            else {
+                res = await this.write(this.wahooCP, message, props);
+            }
             const responseData = Buffer.from(res);
             const result = responseData.readUInt8(0);
             return result === 1;
@@ -263,7 +280,7 @@ class BleWahooDevice extends sensor_js_1.default {
                 return false;
             const data = Buffer.alloc(2);
             data.writeInt16LE(Math.round(power), 0);
-            const res = await this.writeWahooFtmsMessage(66, data);
+            const res = await this.writeWahooFtmsMessage(66, data, { timeout: WAHOO_CP_WRITE_TIMEOUT });
             if (res === true) {
                 this.setPowerAdjusting();
                 this.data.targetPower = power;
@@ -298,7 +315,7 @@ class BleWahooDevice extends sensor_js_1.default {
             data.writeInt16LE(Math.round(weight * 100), 0);
             data.writeInt16LE(Math.round(crr * 10000), 2);
             data.writeInt16LE(Math.round(cw * 1000), 4);
-            const res = await this.writeWahooFtmsMessage(67, data);
+            const res = await this.writeWahooFtmsMessage(67, data, { timeout: WAHOO_CP_WRITE_TIMEOUT });
             this.isSimMode = true;
             this.simModeSettings = { weight, crr, cw };
             return res;
@@ -313,7 +330,7 @@ class BleWahooDevice extends sensor_js_1.default {
         try {
             const data = Buffer.alloc(2);
             data.writeInt16LE(Math.round(crr * 10000), 0);
-            const res = await this.writeWahooFtmsMessage(68, data);
+            const res = await this.writeWahooFtmsMessage(68, data, { timeout: WAHOO_CP_WRITE_TIMEOUT });
             return res;
         }
         catch (err) {
@@ -326,7 +343,7 @@ class BleWahooDevice extends sensor_js_1.default {
         try {
             const data = Buffer.alloc(2);
             data.writeInt16LE(Math.round(cw * 1000), 0);
-            const res = await this.writeWahooFtmsMessage(69, data);
+            const res = await this.writeWahooFtmsMessage(69, data, { timeout: WAHOO_CP_WRITE_TIMEOUT });
             return res;
         }
         catch (err) {
@@ -345,7 +362,7 @@ class BleWahooDevice extends sensor_js_1.default {
             const slopeVal = Math.min(Math.round((1 + s / 100) * 65535 / 2.0), 65535);
             const data = Buffer.alloc(2);
             data.writeUInt16LE(slopeVal, 0);
-            const res = await this.writeWahooFtmsMessage(70, data);
+            const res = await this.writeWahooFtmsMessage(70, data, { timeout: WAHOO_CP_WRITE_TIMEOUT });
             return res;
         }
         catch (err) {
@@ -359,7 +376,7 @@ class BleWahooDevice extends sensor_js_1.default {
             const value = (Math.max(-32.767, Math.min(32.767, v)) + 32.767) * 1000;
             const data = Buffer.alloc(2);
             data.writeInt16LE(Math.round(value), 0);
-            const res = await this.writeWahooFtmsMessage(71, data);
+            const res = await this.writeWahooFtmsMessage(71, data, { timeout: WAHOO_CP_WRITE_TIMEOUT });
             return res;
         }
         catch (err) {
@@ -373,5 +390,20 @@ class BleWahooDevice extends sensor_js_1.default {
     getWheelCircumference() {
         return this.wheelCircumference;
     }
+    async startRequest() {
+        return true;
+    }
+    async stopRequest() {
+        return true;
+    }
+    async PauseRequest() {
+        return true;
+    }
+    async setTargetInclination(_inclination) {
+        return true;
+    }
+    async setTargetResistanceLevel(_resistanceLevel) {
+        return true;
+    }
 }
 exports.default = BleWahooDevice;

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/esm/ble/wahoo/sensor.js

@@ -3,6 +3,8 @@ import { CSP, CSP_MEASUREMENT, FTMS_CP, FTMS_FEATURE, FTMS_STATUS, HR_MEASUREMEN
 import { WAHOO_ADVANCED_FTMS, WAHOO_ADVANCED_TRAINER_CP, ErgWriteDelay } from './consts.js';
 import BleFitnessMachineDevice from "../fm/sensor.js";
 import { beautifyUUID } from "../utils.js";
+import { InteruptableTask } from "../../utils/task.js";
+const WAHOO_CP_WRITE_TIMEOUT = 800;
 export default class BleWahooDevice extends BleFitnessMachineDevice {
     static profile = 'Smart Trainer';
     static protocol = 'wahoo';
@@ -229,7 +231,22 @@ export default class BleWahooDevice extends BleFitnessMachineDevice {
             opcode.writeUInt8(requestedOpCode, 0);
             const message = Buffer.concat([opcode, data]);
             this.logEvent({ message: 'wahoo cp:write', data: message.toString('hex') });
-            const res = await this.write(this.wahooCP, message, props);
+            let res;
+            if (props?.timeout) {
+                const internalAbort = new AbortController();
+                const combined = new AbortController();
+                props.signal?.addEventListener('abort', () => combined.abort(), { once: true });
+                internalAbort.signal.addEventListener('abort', () => combined.abort(), { once: true });
+                const signal = combined.signal;
+                res = await new InteruptableTask(this.write(this.wahooCP, message, { ...props, signal }), {
+                    timeout: props.timeout,
+                    errorOnTimeout: true,
+                    onCancel: () => internalAbort.abort()
+                }).run();
+            }
+            else {
+                res = await this.write(this.wahooCP, message, props);
+            }
             const responseData = Buffer.from(res);
             const result = responseData.readUInt8(0);
             return result === 1;
@@ -258,7 +275,7 @@ export default class BleWahooDevice extends BleFitnessMachineDevice {
                 return false;
             const data = Buffer.alloc(2);
             data.writeInt16LE(Math.round(power), 0);
-            const res = await this.writeWahooFtmsMessage(66, data);
+            const res = await this.writeWahooFtmsMessage(66, data, { timeout: WAHOO_CP_WRITE_TIMEOUT });
             if (res === true) {
                 this.setPowerAdjusting();
                 this.data.targetPower = power;
@@ -293,7 +310,7 @@ export default class BleWahooDevice extends BleFitnessMachineDevice {
             data.writeInt16LE(Math.round(weight * 100), 0);
             data.writeInt16LE(Math.round(crr * 10000), 2);
             data.writeInt16LE(Math.round(cw * 1000), 4);
-            const res = await this.writeWahooFtmsMessage(67, data);
+            const res = await this.writeWahooFtmsMessage(67, data, { timeout: WAHOO_CP_WRITE_TIMEOUT });
             this.isSimMode = true;
             this.simModeSettings = { weight, crr, cw };
             return res;
@@ -308,7 +325,7 @@ export default class BleWahooDevice extends BleFitnessMachineDevice {
         try {
             const data = Buffer.alloc(2);
             data.writeInt16LE(Math.round(crr * 10000), 0);
-            const res = await this.writeWahooFtmsMessage(68, data);
+            const res = await this.writeWahooFtmsMessage(68, data, { timeout: WAHOO_CP_WRITE_TIMEOUT });
             return res;
         }
         catch (err) {
@@ -321,7 +338,7 @@ export default class BleWahooDevice extends BleFitnessMachineDevice {
         try {
             const data = Buffer.alloc(2);
             data.writeInt16LE(Math.round(cw * 1000), 0);
-            const res = await this.writeWahooFtmsMessage(69, data);
+            const res = await this.writeWahooFtmsMessage(69, data, { timeout: WAHOO_CP_WRITE_TIMEOUT });
             return res;
         }
         catch (err) {
@@ -340,7 +357,7 @@ export default class BleWahooDevice extends BleFitnessMachineDevice {
             const slopeVal = Math.min(Math.round((1 + s / 100) * 65535 / 2.0), 65535);
             const data = Buffer.alloc(2);
             data.writeUInt16LE(slopeVal, 0);
-            const res = await this.writeWahooFtmsMessage(70, data);
+            const res = await this.writeWahooFtmsMessage(70, data, { timeout: WAHOO_CP_WRITE_TIMEOUT });
             return res;
         }
         catch (err) {
@@ -354,7 +371,7 @@ export default class BleWahooDevice extends BleFitnessMachineDevice {
             const value = (Math.max(-32.767, Math.min(32.767, v)) + 32.767) * 1000;
             const data = Buffer.alloc(2);
             data.writeInt16LE(Math.round(value), 0);
-            const res = await this.writeWahooFtmsMessage(71, data);
+            const res = await this.writeWahooFtmsMessage(71, data, { timeout: WAHOO_CP_WRITE_TIMEOUT });
             return res;
         }
         catch (err) {
@@ -368,4 +385,19 @@ export default class BleWahooDevice extends BleFitnessMachineDevice {
     getWheelCircumference() {
         return this.wheelCircumference;
     }
+    async startRequest() {
+        return true;
+    }
+    async stopRequest() {
+        return true;
+    }
+    async PauseRequest() {
+        return true;
+    }
+    async setTargetInclination(_inclination) {
+        return true;
+    }
+    async setTargetResistanceLevel(_resistanceLevel) {
+        return true;
+    }
 }

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/lib/types/ble/wahoo/sensor.d.ts

@@ -51,4 +51,9 @@ export default class BleWahooDevice extends BleFitnessMachineDevice {
     setSimWindSpeed(v: number): Promise<boolean>;
     setWheelCircumference(wheelCircumference: number): Promise<void>;
     getWheelCircumference(): number;
+    startRequest(): Promise<boolean>;
+    stopRequest(): Promise<boolean>;
+    PauseRequest(): Promise<boolean>;
+    setTargetInclination(_inclination: number): Promise<boolean>;
+    setTargetResistanceLevel(_resistanceLevel: number): Promise<boolean>;
 }

package/package.json

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