incyclist-devices 3.0.32 → 3.0.33

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

@@ -498,7 +498,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 +511,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 +552,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 +588,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)

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

@@ -496,7 +496,7 @@ export default class BleFitnessMachineDevice extends 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) {
@@ -509,37 +509,40 @@ export default class BleFitnessMachineDevice extends 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 => matches(s.uuid, '1818'));
             let heartrate = services.some(s => 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 & FitnessMachineFeatureFlag.PowerMeasurementSupported) !== 0;
-                heartrate = heartrate || (fitnessMachine & FitnessMachineFeatureFlag.HeartRateMeasurementSupported) !== 0;
-                const cadence = (fitnessMachine & FitnessMachineFeatureFlag.CadenceSupported) !== 0;
-                const setSlope = (targetSettings & TargetSettingFeatureFlag.IndoorBikeSimulationParametersSupported) !== 0
-                    || (targetSettings & TargetSettingFeatureFlag.InclinationTargetSettingSupported) !== 0;
-                const setPower = (targetSettings & TargetSettingFeatureFlag.PowerTargetSettingSupported) !== 0;
-                const setResistance = (targetSettings & 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 & FitnessMachineFeatureFlag.PowerMeasurementSupported) !== 0;
+            heartrate = heartrate || (fitnessMachine & FitnessMachineFeatureFlag.HeartRateMeasurementSupported) !== 0;
+            const cadence = (fitnessMachine & FitnessMachineFeatureFlag.CadenceSupported) !== 0;
+            const setSlope = (targetSettings & TargetSettingFeatureFlag.IndoorBikeSimulationParametersSupported) !== 0
+                || (targetSettings & TargetSettingFeatureFlag.InclinationTargetSettingSupported) !== 0;
+            const setPower = (targetSettings & TargetSettingFeatureFlag.PowerTargetSettingSupported) !== 0;
+            const setResistance = (targetSettings & 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;
         }
     }
@@ -547,6 +550,8 @@ export default class BleFitnessMachineDevice extends TBleSensor {
         return this.getSupportedServiceUUids()?.some(s => matches(s, ZWIFT_PLAY_UUID));
     }
     buildFitnessMachineInfo(fitnessMachine) {
+        if (fitnessMachine == null)
+            return;
         if (this.getName().startsWith('MRK-')) {
             return ['avgSpeed', 'cadence', 'power', 'pace'];
         }
@@ -581,6 +586,8 @@ export default class BleFitnessMachineDevice extends TBleSensor {
         return info;
     }
     buildTargetSettingsInfo(targetSettings) {
+        if (targetSettings == null)
+            return;
         const info = [];
         const check = (flag, name) => {
             if (targetSettings & flag)

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

@@ -47,8 +47,8 @@ export default class BleFitnessMachineDevice extends TBleSensor {
     protected parseServiceData(): FtmsServiceData | undefined;
     getFitnessMachineFeatures(): Promise<IndoorBikeFeatures | undefined>;
     supportsVirtualShifting(): boolean;
-    protected buildFitnessMachineInfo(fitnessMachine: number): string[] | undefined;
-    protected buildTargetSettingsInfo(targetSettings: number): string[] | undefined;
+    protected buildFitnessMachineInfo(fitnessMachine?: number): string[] | undefined;
+    protected buildTargetSettingsInfo(targetSettings?: number): string[] | undefined;
     protected writeFtmsMessage(requestedOpCode: number, data: Buffer, props?: BleWriteProps): Promise<number>;
     setTargetInclination(inclination: number): Promise<boolean>;
     setIndoorBikeSimulation(windSpeed: number, gradient: number, crr: number, cw: number): Promise<boolean>;

package/package.json

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