incyclist-devices 3.0.27 → 3.0.29

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/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/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/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/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/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.27",
+    "version": "3.0.29",
     "scripts": {
         "lint": "eslint . --ext .ts",
         "build": "npm run build:esm && npm run build:cjs",