incyclist-devices 3.0.32 → 3.0.34

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

@@ -111,6 +111,8 @@ class CscMeasurement {
         this.data = {};
         this.prevCrankData = undefined;
         this.currentCrankData = undefined;
+        this.prevWheelData = undefined;
+        this.currentWheelData = undefined;
         this.timeOffset = 0;
     }
 }

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

@@ -58,6 +58,11 @@ class BleCyclingSpeedCadenceDevice extends sensor_js_1.TBleSensor {
     }
     reset() {
         this.data = {};
+        this.measurement?.reset();
+    }
+    onDisconnect() {
+        super.onDisconnect();
+        this.measurement.reset();
     }
     async setWheelCircumference(wheelCircumference) {
         this.measurement.setWheelCircumference(wheelCircumference);

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

@@ -25,6 +25,7 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
     ftmsServiceDataAttempts = 0;
     rowerDataTS;
     rowerMaxPower;
+    indoorBikeDataTruncationLogged = false;
     constructor(peripheral, props) {
         super(peripheral, props);
         this.reset();
@@ -176,6 +177,8 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
     }
     parseHrm(_data) {
         const data = Buffer.from(_data);
+        if (data.length == 0)
+            return { ...this.data, raw: '<empty>' };
         try {
             const flags = data.readUInt8(0);
             if (flags % 1 === 0) {
@@ -186,7 +189,7 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
             }
         }
         catch (err) {
-            this.logEvent({ message: 'error', fn: 'parseHrm()', error: err.message | err, stack: err.stack });
+            this.logEvent({ message: 'error', fn: 'parseHrm()', error: err.message, stack: err.stack, raw: `2a37:${data.toString('hex')}` });
         }
         return { ...this.data, raw: `2a37:${data.toString('hex')}` };
     }
@@ -343,48 +346,61 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
         }
         return { ...this.data, raw: `2ad1:${data.toString('hex')}` };
     }
+    logIndoorBikeDataTruncated(data, flags, offset, needed) {
+        if (this.indoorBikeDataTruncationLogged)
+            return;
+        this.indoorBikeDataTruncationLogged = true;
+        this.logEvent({ message: 'error', fn: 'parseIndoorBikeData()', device: this.getName(), data: data.toString('hex'), flags, offset, needed, error: 'Indoor Bike Data flags declare more fields than the packet contains' });
+    }
     parseIndoorBikeData(_data) {
         const data = Buffer.from(_data);
         let offset = 2;
         if (data.length > 2) {
             try {
                 const flags = data.readUInt16LE(0);
-                if ((flags & consts_js_2.IndoorBikeDataFlag.MoreData) === 0) {
+                const need = (size) => {
+                    if (offset + size > data.length) {
+                        this.logIndoorBikeDataTruncated(data, flags, offset, size);
+                        return false;
+                    }
+                    return true;
+                };
+                if ((flags & consts_js_2.IndoorBikeDataFlag.MoreData) === 0 && need(2)) {
                     this.data.speed = data.readUInt16LE(offset) / 100;
                     offset += 2;
                 }
-                if (flags & consts_js_2.IndoorBikeDataFlag.AverageSpeedPresent) {
+                if ((flags & consts_js_2.IndoorBikeDataFlag.AverageSpeedPresent) && need(2)) {
                     this.data.averageSpeed = data.readUInt16LE(offset) / 100;
                     offset += 2;
                 }
-                if (flags & consts_js_2.IndoorBikeDataFlag.InstantaneousCadence) {
+                if ((flags & consts_js_2.IndoorBikeDataFlag.InstantaneousCadence) && need(2)) {
                     this.data.cadence = data.readUInt16LE(offset) / 2;
                     offset += 2;
                 }
-                if (flags & consts_js_2.IndoorBikeDataFlag.AverageCadencePresent) {
+                if ((flags & consts_js_2.IndoorBikeDataFlag.AverageCadencePresent) && need(2)) {
                     this.data.averageCadence = data.readUInt16LE(offset) / 2;
                     offset += 2;
                 }
-                if (flags & consts_js_2.IndoorBikeDataFlag.TotalDistancePresent) {
+                if ((flags & consts_js_2.IndoorBikeDataFlag.TotalDistancePresent) && need(3)) {
                     const dvLow = data.readUInt8(offset);
                     offset += 1;
                     const dvHigh = data.readUInt16LE(offset);
                     offset += 2;
                     this.data.totalDistance = (dvHigh << 8) + dvLow;
                 }
-                if (flags & consts_js_2.IndoorBikeDataFlag.ResistanceLevelPresent) {
+                if ((flags & consts_js_2.IndoorBikeDataFlag.ResistanceLevelPresent) && need(2)) {
                     this.data.resistanceLevel = data.readInt16LE(offset);
                     offset += 2;
                 }
-                if (flags & consts_js_2.IndoorBikeDataFlag.InstantaneousPowerPresent) {
+                if ((flags & consts_js_2.IndoorBikeDataFlag.InstantaneousPowerPresent) && need(2)) {
                     this.data.instantaneousPower = data.readInt16LE(offset);
                     offset += 2;
                 }
-                if (flags & consts_js_2.IndoorBikeDataFlag.AveragePowerPresent) {
+                if ((flags & consts_js_2.IndoorBikeDataFlag.AveragePowerPresent) && need(2)) {
                     this.data.averagePower = data.readInt16LE(offset);
                     offset += 2;
                 }
-                if (flags & consts_js_2.IndoorBikeDataFlag.ExpendedEnergyPresent) {
+                if ((flags & consts_js_2.IndoorBikeDataFlag.ExpendedEnergyPresent) && need(5)) {
                     this.data.totalEnergy = data.readUInt16LE(offset);
                     offset += 2;
                     this.data.energyPerHour = data.readUInt16LE(offset);
@@ -392,19 +408,19 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
                     this.data.energyPerMinute = data.readUInt8(offset);
                     offset += 1;
                 }
-                if (flags & consts_js_2.IndoorBikeDataFlag.HeartRatePresent) {
+                if ((flags & consts_js_2.IndoorBikeDataFlag.HeartRatePresent) && need(1)) {
                     this.data.heartrate = data.readUInt8(offset);
                     offset += 1;
                 }
-                if (flags & consts_js_2.IndoorBikeDataFlag.MetabolicEquivalentPresent) {
+                if ((flags & consts_js_2.IndoorBikeDataFlag.MetabolicEquivalentPresent) && need(1)) {
                     this.data.metabolicEquivalent = data.readUInt8(offset) / 10;
                     offset += 1;
                 }
-                if (flags & consts_js_2.IndoorBikeDataFlag.ElapsedTimePresent) {
+                if ((flags & consts_js_2.IndoorBikeDataFlag.ElapsedTimePresent) && need(2)) {
                     this.data.time = data.readUInt16LE(offset);
                     offset += 2;
                 }
-                if (flags & consts_js_2.IndoorBikeDataFlag.RemainingTimePresent) {
+                if ((flags & consts_js_2.IndoorBikeDataFlag.RemainingTimePresent) && need(2)) {
                     this.data.remainingTime = data.readUInt16LE(offset);
                 }
             }
@@ -498,7 +514,7 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
                 return serviceData;
             }
             else {
-                this.logEvent({ message: 'could not parse service data', reason: 'not enough data', raw: data?.toString('hex') });
+                this.logEvent({ message: 'could not parse service data', reason: data == null ? 'not available' : 'not enough data', raw: data?.toString('hex') });
             }
         }
         catch (err) {
@@ -511,37 +527,40 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
         if (this.getName().startsWith('MRK-')) {
             return { fitnessMachine: 0, targetSettings: 0, setPower: true, power: true, heartrate: true };
         }
+        let data;
+        try {
+            this.logEvent({ message: 'reading FitnessMachineFeatures', device: this.getName() });
+            data = await this.read('2acc');
+        }
+        catch (err) {
+            this.logEvent({ message: 'could not read FitnessMachineFeatures', error: err.message, stack: err.stack, device: this.getName() });
+            return undefined;
+        }
+        const buffer = data ? Buffer.from(data) : undefined;
         try {
-            const data = await this.read('2acc');
-            const buffer = data ? Buffer.from(data) : undefined;
             const services = this.peripheral?.services || [];
             let power = services.some(s => (0, utils_js_1.matches)(s.uuid, '1818'));
             let heartrate = services.some(s => (0, utils_js_1.matches)(s.uuid, '180d'));
             const dataLength = buffer?.length ?? 0;
-            if (dataLength >= 8) {
-                const fitnessMachine = buffer.readUInt32LE(0);
-                const targetSettings = buffer.readUInt32LE(4);
-                power = power || (fitnessMachine & consts_js_2.FitnessMachineFeatureFlag.PowerMeasurementSupported) !== 0;
-                heartrate = heartrate || (fitnessMachine & consts_js_2.FitnessMachineFeatureFlag.HeartRateMeasurementSupported) !== 0;
-                const cadence = (fitnessMachine & consts_js_2.FitnessMachineFeatureFlag.CadenceSupported) !== 0;
-                const setSlope = (targetSettings & consts_js_2.TargetSettingFeatureFlag.IndoorBikeSimulationParametersSupported) !== 0
-                    || (targetSettings & consts_js_2.TargetSettingFeatureFlag.InclinationTargetSettingSupported) !== 0;
-                const setPower = (targetSettings & consts_js_2.TargetSettingFeatureFlag.PowerTargetSettingSupported) !== 0;
-                const setResistance = (targetSettings & consts_js_2.TargetSettingFeatureFlag.ResistanceTargetSettingSupported) !== 0;
-                const fmInfo = this.buildFitnessMachineInfo(fitnessMachine) ?? [];
-                const tsInfo = this.buildTargetSettingsInfo(targetSettings) ?? [];
-                this._features = { fitnessMachine, targetSettings, power, heartrate, cadence, setPower, setSlope, setResistance };
-                this.logEvent({ message: 'supported features', device: this.getName(), fmFeatures: fmInfo.join('|'), tsFeatures: tsInfo.join('|'), features: this._features });
-                this._features.fmInfo = fmInfo;
-                this._features.tsInfo = tsInfo;
-                return this._features;
-            }
-            else {
-                return { fitnessMachine: 0, targetSettings: 0, power, heartrate };
-            }
+            const fitnessMachine = dataLength >= 4 ? buffer.readUInt32LE(0) : 0;
+            const targetSettings = dataLength >= 8 ? buffer.readUInt32LE(4) : 0;
+            const fmInfo = this.buildFitnessMachineInfo(fitnessMachine) ?? [];
+            const tsInfo = this.buildTargetSettingsInfo(targetSettings) ?? [];
+            power = power || (fitnessMachine & consts_js_2.FitnessMachineFeatureFlag.PowerMeasurementSupported) !== 0;
+            heartrate = heartrate || (fitnessMachine & consts_js_2.FitnessMachineFeatureFlag.HeartRateMeasurementSupported) !== 0;
+            const cadence = (fitnessMachine & consts_js_2.FitnessMachineFeatureFlag.CadenceSupported) !== 0;
+            const setSlope = (targetSettings & consts_js_2.TargetSettingFeatureFlag.IndoorBikeSimulationParametersSupported) !== 0
+                || (targetSettings & consts_js_2.TargetSettingFeatureFlag.InclinationTargetSettingSupported) !== 0;
+            const setPower = (targetSettings & consts_js_2.TargetSettingFeatureFlag.PowerTargetSettingSupported) !== 0;
+            const setResistance = (targetSettings & consts_js_2.TargetSettingFeatureFlag.ResistanceTargetSettingSupported) !== 0;
+            this._features = { fitnessMachine, targetSettings, power, heartrate, cadence, setPower, setSlope, setResistance };
+            this.logEvent({ message: 'supported features', device: this.getName(), fmFeatures: fmInfo.join('|'), tsFeatures: tsInfo.join('|'), features: this._features, raw: buffer?.toString('hex') });
+            this._features.fmInfo = fmInfo;
+            this._features.tsInfo = tsInfo;
+            return this._features;
         }
         catch (err) {
-            this.logEvent({ message: 'could not read FitnessMachineFeatures', error: err.message, stack: err.stack, device: this.getName() });
+            this.logEvent({ message: 'could not parse FitnessMachineFeatures', error: err.message, stack: err.stack, device: this.getName(), raw: buffer?.toString('hex') });
             return undefined;
         }
     }
@@ -549,6 +568,8 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
         return this.getSupportedServiceUUids()?.some(s => (0, utils_js_1.matches)(s, consts_js_2.ZWIFT_PLAY_UUID));
     }
     buildFitnessMachineInfo(fitnessMachine) {
+        if (fitnessMachine == null)
+            return;
         if (this.getName().startsWith('MRK-')) {
             return ['avgSpeed', 'cadence', 'power', 'pace'];
         }
@@ -583,6 +604,8 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
         return info;
     }
     buildTargetSettingsInfo(targetSettings) {
+        if (targetSettings == null)
+            return;
         const info = [];
         const check = (flag, name) => {
             if (targetSettings & flag)