incyclist-devices 3.0.9 → 3.0.11

package/lib/cjs/antv2/base/interface.js

@@ -28,6 +28,7 @@ class AntInterface extends node_events_1.EventEmitter {
     activeScan;
     props;
     logEnabled;
+    logPaused = false;
     channelsInUse;
     constructor(props) {
         super();
@@ -35,6 +36,7 @@ class AntInterface extends node_events_1.EventEmitter {
         this.device = undefined;
         this.connected = false;
         this.connectPromise = null;
+        this.scanPromise = null;
         this.channelsInUse = [];
         this.logEnabled = props.log || true;
         const { binding } = props;
@@ -52,6 +54,12 @@ class AntInterface extends node_events_1.EventEmitter {
     setBinding(binding) {
         this.Binding = binding;
     }
+    pauseLogging() {
+        this.logPaused = true;
+    }
+    resumeLogging() {
+        this.logPaused = false;
+    }
     getLogger() {
         return this.logger;
     }
@@ -65,7 +73,7 @@ class AntInterface extends node_events_1.EventEmitter {
         this.logEnabled = false;
     }
     logEvent(event) {
-        if (!this.logEnabled || !this.logger)
+        if (!this.logEnabled || !this.logger || this.logPaused)
             return;
         this.logger.logEvent(event);
         const w = global.window;
@@ -77,6 +85,8 @@ class AntInterface extends node_events_1.EventEmitter {
         return this.connected && this.device !== undefined;
     }
     async connect() {
+        if (!this.Binding)
+            return false;
         if (this.isConnected())
             return true;
         if (this.connectPromise) {

package/lib/cjs/antv2/fe/adapter.js

@@ -31,6 +31,9 @@ class AntFEAdapter extends adapter_js_1.default {
             index_js_1.IncyclistCapability.Control
         ];
     }
+    getSupportedSports() {
+        return ['cycling'];
+    }
     getDisplayName() {
         const { InstantaneousPower } = this.deviceData;
         const pwrStr = InstantaneousPower ? ` (${InstantaneousPower})` : '';

package/lib/cjs/base/adpater.js

@@ -22,6 +22,7 @@ class IncyclistDevice extends node_events_1.EventEmitter {
     user;
     data;
     debugLogEnabled;
+    logPaused;
     constructor(settings, props) {
         super();
         this.onDataFn = undefined;
@@ -48,8 +49,17 @@ class IncyclistDevice extends node_events_1.EventEmitter {
         }
         return false;
     }
+    pauseLogging() {
+        this.logPaused = true;
+    }
+    resumeLogging() {
+        this.logPaused = false;
+    }
+    isLogPaused() {
+        return this.logPaused;
+    }
     logEvent(event) {
-        if (!this.logger || this.paused)
+        if (!this.logger || this.paused || this.logPaused)
             return;
         if (this.isDebugEnabled() && !this.debugLogEnabled)
             this.initDebugLog();

package/lib/cjs/bindings/crypto/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/bindings/index.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BindingsFactory = void 0;
+class BindingsFactory {
+    static instance;
+    binding;
+    static getInstance() {
+        this.instance = this.instance ?? new BindingsFactory();
+        return this.instance;
+    }
+    getBinding() {
+        return this.binding;
+    }
+    setBinding(binding) {
+        this.binding = binding;
+    }
+}
+exports.BindingsFactory = BindingsFactory;

package/lib/cjs/bindings/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/ble/base/adapter.js

@@ -304,7 +304,7 @@ class BleAdapter extends adpater_js_1.default {
             return true;
         }
         catch (err) {
-            this.logEvent({ message: 'start result: error', error: err.message, device: this.getName(), interface: this.getInterface(), protocol: this.getProtocolName() });
+            this.logEvent({ message: 'start result: error', error: err.message, stack: err.stack, device: this.getName(), interface: this.getInterface(), protocol: this.getProtocolName() });
             this.started = false;
             this.stopped = true;
             const ble = this.getBle();

package/lib/cjs/ble/base/interface.js

@@ -406,7 +406,7 @@ class BleInterface extends node_events_1.EventEmitter {
         this.addService(announcement);
     }
     checkForWahooEnhancement(announcement) {
-        if (announcement.name.includes('KICKR')) {
+        if (announcement.name.includes('KICKR') || announcement.name.includes('Zwift')) {
             const supported = announcement.serviceUUIDs.map(s => (0, utils_js_1.beautifyUUID)(s));
             if (supported.length === 1 && (supported[0] === '1818' || supported[0] === 'FC82')) {
                 return true;
@@ -430,6 +430,7 @@ class BleInterface extends node_events_1.EventEmitter {
             name: peripheral.advertisement.localName,
             manufacturerData: peripheral.advertisement?.manufacturerData ? Buffer.from(peripheral.advertisement.manufacturerData) : undefined,
             serviceUUIDs: peripheral.advertisement.serviceUuids ?? [],
+            serviceData: peripheral.advertisement.serviceData,
             peripheral,
             transport: this.getName()
         };

package/lib/cjs/ble/base/peripheral.js

@@ -25,6 +25,9 @@ class BlePeripheral {
     getPeripheral() {
         return this.announcement.peripheral;
     }
+    getInterface() {
+        return this.ble;
+    }
     getAnnouncedServices() {
         return this.announcement.serviceUUIDs.map(s => (0, utils_js_1.beautifyUUID)(s));
     }
@@ -116,6 +119,15 @@ class BlePeripheral {
     getManufacturerData() {
         return this.announcement?.manufacturerData;
     }
+    getServiceData(uuid) {
+        const serviceData = this.announcement?.serviceData;
+        if (!serviceData)
+            return;
+        const data = serviceData.find(sd => (0, utils_js_1.matches)(sd.uuid, uuid))?.data;
+        if (data)
+            return Buffer.from(data);
+        return data;
+    }
     async onPeripheralDisconnect() {
         if (this.disconnectedSignalled || this.disconnecting)
             return;

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

@@ -14,6 +14,11 @@ class TBleSensor extends node_events_1.EventEmitter {
     reconnectPromise;
     onDataHandler;
     logEvent(event, ...args) {
+        try {
+            if (this.getPeripheral()?.getInterface()?.isLoggingPaused())
+                return;
+        }
+        catch { }
         this.logger.logEvent(event, ...args);
     }
     constructor(peripheral, props) {

package/lib/cjs/ble/consts.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ELITE_TRAINER_SVC = exports.CSC_FEATURE = exports.CSC_MEASUREMENT = exports.CSC = exports.HR_MEASUREMENT = exports.CSP_FEATURE = exports.CSP_MEASUREMENT = exports.CSP = exports.POWER_RANGE = exports.RES_LEVEL_RANGE = exports.FTMS_FEATURE = exports.INDOOR_BIKE_DATA = exports.FTMS_STATUS = exports.FTMS_CP = exports.FTMS = void 0;
+exports.ELITE_TRAINER_SVC = exports.CSC_FEATURE = exports.CSC_MEASUREMENT = exports.CSC = exports.HR_MEASUREMENT = exports.CSP_FEATURE = exports.CSP_MEASUREMENT = exports.CSP = exports.POWER_RANGE = exports.RES_LEVEL_RANGE = exports.FTMS_FEATURE = exports.TREADMILL_DATA = exports.INDOOR_BIKE_DATA = exports.ROWER_DATA = exports.FTMS_STATUS = exports.FTMS_CP = exports.FTMS = void 0;
 exports.FTMS = '1826';
 exports.FTMS_CP = '2ad9';
 exports.FTMS_STATUS = '2ada';
+exports.ROWER_DATA = '2ad1';
 exports.INDOOR_BIKE_DATA = '2ad2';
+exports.TREADMILL_DATA = '2acd';
 exports.FTMS_FEATURE = '2acc';
 exports.RES_LEVEL_RANGE = '2ad6';
 exports.POWER_RANGE = '2ad8';

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

@@ -15,6 +15,7 @@ const utils_js_1 = require("../../utils/utils.js");
 const index_js_2 = require("../zwift/play/index.js");
 const index_js_3 = require("../../features/index.js");
 const fm_resistance_js_1 = __importDefault(require("../../modes/fm-resistance.js"));
+const rower_js_1 = __importDefault(require("../../modes/rower.js"));
 class BleFmAdapter extends adapter_js_1.default {
     static INCYCLIST_PROFILE_NAME = 'Smart Trainer';
     distanceInternal = 0;
@@ -32,6 +33,9 @@ class BleFmAdapter extends adapter_js_1.default {
             index_js_1.IncyclistCapability.Control
         ];
     }
+    getSupportedSports() {
+        return this.device?.getSupportedSports() ?? ['cycling'];
+    }
     updateSensor(peripheral) {
         this.device = new sensor_js_1.default(peripheral, { logger: this.logger });
     }
@@ -52,6 +56,10 @@ class BleFmAdapter extends adapter_js_1.default {
         const modes = [power_meter_js_1.default];
         if (this.props?.capabilities && this.props.capabilities.indexOf(index_js_1.IncyclistCapability.Control) === -1)
             return modes;
+        const sports = this.getSupportedSports();
+        if (sports.length === 1 && sports[0] === 'rowing') {
+            return [rower_js_1.default];
+        }
         const features = this.getSensor()?.features;
         if (!features)
             return [power_meter_js_1.default, antble_smarttrainer_js_1.default, antble_erg_js_1.default];
@@ -67,6 +75,10 @@ class BleFmAdapter extends adapter_js_1.default {
     getDefaultCyclingMode() {
         if (this.props?.capabilities && this.props.capabilities.indexOf(index_js_1.IncyclistCapability.Control) === -1)
             return this.createMode(power_meter_js_1.default);
+        const sports = this.getSupportedSports();
+        if (sports.length === 1 && sports[0] === 'rowing') {
+            return this.createMode(rower_js_1.default);
+        }
         const features = this.getSensor()?.features;
         if (!features) {
             return this.createMode(antble_smarttrainer_js_1.default);

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

@@ -21,6 +21,7 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
     cw = 0.6;
     windSpeed = 0;
     wheelSize = 2100;
+    ftmsServiceData;
     constructor(peripheral, props) {
         super(peripheral, props);
         this.reset();
@@ -32,6 +33,9 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
         this.data = {};
     }
     getRequiredCharacteristics() {
+        this.parseServiceData();
+        if (this.ftmsServiceData?.rower)
+            return [consts_js_1.ROWER_DATA, '2a37', consts_js_1.FTMS_STATUS];
         return [consts_js_1.INDOOR_BIKE_DATA, '2a37', consts_js_1.FTMS_STATUS];
     }
     onData(characteristic, characteristicData) {
@@ -46,6 +50,11 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
                 case consts_js_1.INDOOR_BIKE_DATA:
                     res = this.parseIndoorBikeData(data);
                     break;
+                case consts_js_1.ROWER_DATA:
+                    res = this.parseRowerData(data);
+                    break;
+                case consts_js_1.TREADMILL_DATA:
+                    res = this.parseTreadmillData(data);
                 case '2a37':
                     res = this.parseHrm(data);
                     break;
@@ -76,6 +85,19 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
     getCw() { return this.cw; }
     setWindSpeed(windSpeed) { this.windSpeed = windSpeed; }
     getWindSpeed() { return this.windSpeed; }
+    getSupportedSports() {
+        this.parseServiceData();
+        if (!this.ftmsServiceData)
+            return ['cycling'];
+        const sports = [];
+        if (this.ftmsServiceData?.indoorBike)
+            sports.push('cycling');
+        if (this.ftmsServiceData?.rower)
+            sports.push('rowing');
+        if (this.ftmsServiceData?.treadmill)
+            sports.push('running');
+        return sports;
+    }
     onDisconnect() {
         this.hasControl = false;
     }
@@ -167,6 +189,152 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
         }
         return { ...this.data, raw: `2a37:${data.toString('hex')}` };
     }
+    parseTreadmillData(_data) {
+        const data = Buffer.from(_data);
+        let offset = 2;
+        if (data.length > 2) {
+            try {
+                const flags = data.readUInt16LE(0);
+                if ((flags & 0x0001) === 0) {
+                    this.data.speed = data.readUInt16LE(offset) / 100;
+                    offset += 2;
+                }
+                if (flags & 0x0002) {
+                    this.data.averageSpeed = data.readUInt16LE(offset) / 100;
+                    offset += 2;
+                }
+                if (flags & 0x0004) {
+                    const dvLow = data.readUInt8(offset);
+                    offset += 1;
+                    const dvHigh = data.readUInt16LE(offset);
+                    offset += 2;
+                    this.data.totalDistance = (dvHigh << 8) + dvLow;
+                }
+                if (flags & 0x0008) {
+                    this.data.targetInclination = data.readInt16LE(offset) / 10;
+                    offset += 2;
+                    offset += 2;
+                }
+                if (flags & 0x0010) {
+                    offset += 2;
+                    offset += 2;
+                }
+                if (flags & 0x0020) {
+                    const pace = data.readUInt8(offset);
+                    offset += 1;
+                    this.data.speed = pace > 0 ? Math.round(60 / pace * 100) / 100 : 0;
+                }
+                if (flags & 0x0040) {
+                    const avgPace = data.readUInt8(offset);
+                    offset += 1;
+                    this.data.averageSpeed = avgPace > 0 ? Math.round(60 / avgPace * 100) / 100 : 0;
+                }
+                if (flags & 0x0080) {
+                    this.data.totalEnergy = data.readUInt16LE(offset);
+                    offset += 2;
+                    this.data.energyPerHour = data.readUInt16LE(offset);
+                    offset += 2;
+                    this.data.energyPerMinute = data.readUInt8(offset);
+                    offset += 1;
+                }
+                if (flags & 0x0100) {
+                    this.data.heartrate = data.readUInt8(offset);
+                    offset += 1;
+                }
+                if (flags & 0x0200) {
+                    this.data.metabolicEquivalent = data.readUInt8(offset) / 10;
+                    offset += 1;
+                }
+                if (flags & 0x0400) {
+                    this.data.time = data.readUInt16LE(offset);
+                    offset += 2;
+                }
+                if (flags & 0x0800) {
+                    this.data.remainingTime = data.readUInt16LE(offset);
+                }
+            }
+            catch (err) {
+                this.logEvent({ message: 'error', fn: 'parseTreadmillData()', device: this.getName(), data: data.toString('hex'), offset, error: err.message, stack: err.stack });
+            }
+        }
+        return { ...this.data, raw: `2acd:${data.toString('hex')}` };
+    }
+    parseRowerData(_data) {
+        const data = Buffer.from(_data);
+        let offset = 2;
+        if (data.length > 2) {
+            try {
+                const flags = data.readUInt16LE(0);
+                if ((flags & 0x0001) === 0) {
+                    this.data.cadence = data.readUInt8(offset) / 2;
+                    offset += 1;
+                    offset += 2;
+                }
+                if (flags & 0x0002) {
+                    this.data.averageCadence = data.readUInt8(offset) / 2;
+                    offset += 1;
+                }
+                if (flags & 0x0004) {
+                    const dvLow = data.readUInt8(offset);
+                    offset += 1;
+                    const dvHigh = data.readUInt16LE(offset);
+                    offset += 2;
+                    this.data.totalDistance = (dvHigh << 8) + dvLow;
+                }
+                if (flags & 0x0008) {
+                    const pace = data.readUInt16LE(offset);
+                    offset += 2;
+                    this.data.speed = pace > 0 ? Math.round(1800 / pace * 100) / 100 : 0;
+                }
+                if (flags & 0x0010) {
+                    const avgPace = data.readUInt16LE(offset);
+                    offset += 2;
+                    this.data.averageSpeed = avgPace > 0 ? Math.round(1800 / avgPace * 100) / 100 : 0;
+                }
+                if (flags & 0x0020) {
+                    this.data.instantaneousPower = data.readInt16LE(offset);
+                    offset += 2;
+                }
+                if (flags & 0x0040) {
+                    this.data.averagePower = data.readInt16LE(offset);
+                    offset += 2;
+                    this.data.instantaneousPower = data.readInt16LE(offset);
+                    offset += 2;
+                }
+                if (flags & 0x0080) {
+                    this.data.resistanceLevel = data.readInt16LE(offset);
+                    offset += 2;
+                }
+                if (flags & 0x0100) {
+                    this.data.totalEnergy = data.readUInt16LE(offset);
+                    offset += 2;
+                    this.data.energyPerHour = data.readUInt16LE(offset);
+                    offset += 2;
+                    this.data.energyPerMinute = data.readUInt8(offset);
+                    offset += 1;
+                }
+                if (flags & 0x0200) {
+                    this.data.heartrate = data.readUInt8(offset);
+                    offset += 1;
+                }
+                if (flags & 0x0400) {
+                    this.data.metabolicEquivalent = data.readUInt8(offset) / 10;
+                    offset += 1;
+                }
+                if (flags & 0x0800) {
+                    this.data.time = data.readUInt16LE(offset);
+                    offset += 2;
+                }
+                if (flags & 0x1000) {
+                    this.data.remainingTime = data.readUInt16LE(offset);
+                }
+            }
+            catch (err) {
+                this.logEvent({ message: 'error', fn: 'parseRowerData()', device: this.getName(), data: data.toString('hex'), offset, error: err.message, stack: err.stack });
+            }
+        }
+        return { ...this.data, raw: `2ad1:${data.toString('hex')}` };
+    }
     parseIndoorBikeData(_data) {
         const data = Buffer.from(_data);
         let offset = 2;
@@ -292,16 +460,54 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
         }
         return { ...this.data, raw: `2ada:${data.toString('hex')}` };
     }
+    parseServiceData() {
+        if (this.ftmsServiceData)
+            return this.ftmsServiceData;
+        try {
+            const peripheral = this.peripheral;
+            if (!peripheral.getServiceData)
+                return;
+            const bitSet = (value, bitNo) => (value & (0, utils_js_1.bit)(bitNo)) > 0;
+            const data = peripheral.getServiceData(consts_js_1.FTMS);
+            const dataLength = data?.length ?? 0;
+            if (dataLength >= 2) {
+                const flags = data.readUInt8(0);
+                const fmType = dataLength === 3 ? data.readUInt16LE(1) : data.readUInt8(1);
+                const available = bitSet(flags, 0);
+                const treadmill = bitSet(fmType, 0);
+                const crossTrainer = bitSet(fmType, 1);
+                const stepClimber = bitSet(fmType, 2);
+                const stairClimber = bitSet(fmType, 3);
+                const rower = bitSet(fmType, 4);
+                const indoorBike = bitSet(fmType, 5);
+                const raw = data?.toString('hex');
+                const serviceData = { available, treadmill, crossTrainer, stepClimber, stairClimber, rower, indoorBike, raw };
+                this.logEvent({ message: 'service data', device: this.getName(), ...serviceData });
+                this.ftmsServiceData = serviceData;
+                return serviceData;
+            }
+            else {
+                this.logEvent({ message: 'could not parse service data', reason: 'not enough data', raw: data?.toString('hex') });
+            }
+        }
+        catch (err) {
+            this.logEvent({ message: 'could not parse service data', reason: err.message, stack: err.stack });
+        }
+    }
     async getFitnessMachineFeatures() {
         if (this._features)
             return this._features;
+        if (this.getName().startsWith('MRK-')) {
+            return { fitnessMachine: 0, targetSettings: 0, setPower: true, power: true, heartrate: true };
+        }
         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'));
-            if (buffer?.length >= 8) {
+            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;
@@ -320,7 +526,7 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
                 return this._features;
             }
             else {
-                return { fitnessMachine: undefined, targetSettings: undefined, power, heartrate };
+                return { fitnessMachine: 0, targetSettings: 0, power, heartrate };
             }
         }
         catch (err) {
@@ -332,6 +538,9 @@ 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 (this.getName().startsWith('MRK-')) {
+            return ['avgSpeed', 'cadence', 'power', 'pace'];
+        }
         const info = [];
         const check = (flag, name) => {
             if (fitnessMachine & flag)

package/lib/cjs/ble/zwift/play/sensor.js

@@ -4,8 +4,8 @@ exports.BleZwiftPlaySensor = void 0;
 const zwift_hub_js_1 = require("../../../proto/zwift_hub.js");
 const sensor_js_1 = require("../../base/sensor.js");
 const utils_js_1 = require("../../utils.js");
-const node_crypto_1 = require("node:crypto");
 const node_events_1 = require("node:events");
+const index_js_1 = require("../../../bindings/index.js");
 class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
     static profile = 'Controller';
     static protocol = 'zwift-play';
@@ -479,11 +479,19 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
     }
     reset() {
     }
+    getCrypto() {
+        let crypto = index_js_1.BindingsFactory.getInstance()?.getBinding()?.crypto;
+        if (!crypto)
+            crypto = require('node:crypto');
+        return crypto;
+    }
     encryptedSupported() {
-        return node_crypto_1.generateKeyPairSync !== undefined && typeof (node_crypto_1.generateKeyPairSync) === 'function';
+        const crypto = this.getCrypto();
+        return crypto?.generateKeyPairSync !== undefined && typeof (crypto?.generateKeyPairSync) === 'function';
     }
     createKeyPair() {
-        return (0, node_crypto_1.generateKeyPairSync)('ec', {
+        const crypto = this.getCrypto();
+        return crypto.generateKeyPairSync('ec', {
             namedCurve: 'prime256v1',
             publicKeyEncoding: { type: 'spki', format: 'der' },
             privateKeyEncoding: { type: 'pkcs8', format: 'der' }

package/lib/cjs/index.js

@@ -49,3 +49,4 @@ __exportStar(require("./antv2/index.js"), exports);
 __exportStar(require("./direct-connect/index.js"), exports);
 __exportStar(require("./features/index.js"), exports);
 __exportStar(require("./proto/zwift_hub.js"), exports);
+__exportStar(require("./bindings/index.js"), exports);

package/lib/cjs/modes/ant-fe-adv-st-mode.js

@@ -44,7 +44,7 @@ class AntAdvSimCyclingMode extends antble_smarttrainer_js_1.default {
         }
     }
     sendBikeUpdate(incoming) {
-        this.logger.logEvent({ message: "processing update request", request: incoming, prev: this.prevRequest, data: this.getData() });
+        this.logEvent({ message: "processing update request", request: incoming, prev: this.prevRequest, data: this.getData() });
         let newRequest = {};
         const request = Object.assign({}, incoming);
         try {
@@ -75,7 +75,7 @@ class AntAdvSimCyclingMode extends antble_smarttrainer_js_1.default {
             this.prevRequest = JSON.parse(JSON.stringify(newRequest));
         }
         catch (err) {
-            this.logger.logEvent({ message: "error", fn: 'sendBikeUpdate()', error: err.message, stack: err.stack });
+            this.logEvent({ message: "error", fn: 'sendBikeUpdate()', error: err.message, stack: err.stack });
         }
         return newRequest;
     }

package/lib/cjs/modes/antble-smarttrainer.js

@@ -224,7 +224,7 @@ class SmartTrainerCyclingMode extends power_base_js_1.default {
             return;
         }
         if (this.data?.pedalRpm !== this.prevData?.pedalRpm) {
-            this.logger.logEvent({ message: 'cadence changed', cadence: this.data?.pedalRpm, prevCadence: this.prevData?.pedalRpm });
+            this.logEvent({ message: 'cadence changed', cadence: this.data?.pedalRpm, prevCadence: this.prevData?.pedalRpm });
             request.slope = request.slope ?? this.data.slope;
         }
     }
@@ -245,20 +245,20 @@ class SmartTrainerCyclingMode extends power_base_js_1.default {
                 this.simPower = prev + delta / 2;
                 this.simPower = Math.max(newPower, prevPower);
                 this.prevEkin = m * v * v / 2;
-                this.logger.logEvent({ message: 'set simulated power (starting)', target: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevTarget: this.prevSimPower, actualPower: prevPower, newPower });
+                this.logEvent({ message: 'set simulated power (starting)', target: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevTarget: this.prevSimPower, actualPower: prevPower, newPower });
             }
             else if (changed === 'gear') {
                 this.simPower = prev + delta;
                 this.prevEkin = m * v * v / 2;
-                this.logger.logEvent({ message: 'set simulated power (gear change)', target: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevTarget: this.prevSimPower, actualPower: prevPower, newPower });
+                this.logEvent({ message: 'set simulated power (gear change)', target: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevTarget: this.prevSimPower, actualPower: prevPower, newPower });
             }
             else if (changed === 'slope' || changed === 'cadence') {
                 const adjustTime = this.simSlope < 0 ? 5 : 3;
                 this.simPower = prev + delta / adjustTime;
-                this.logger.logEvent({ message: `set simulated power (${changed} change)`, target: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevTarget: this.prevSimPower, actualPower: prevPower, newPower });
+                this.logEvent({ message: `set simulated power (${changed} change)`, target: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevTarget: this.prevSimPower, actualPower: prevPower, newPower });
             }
             else {
-                this.logger.logEvent({ message: `set simulated power (mothing changed)`, target: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevTarget: this.prevSimPower, actualPower: prevPower, newPower });
+                this.logEvent({ message: `set simulated power (mothing changed)`, target: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevTarget: this.prevSimPower, actualPower: prevPower, newPower });
             }
         }
         else {
@@ -295,7 +295,7 @@ class SmartTrainerCyclingMode extends power_base_js_1.default {
                         this.gear = this.gearRatios.length;
                     }
                     delete request.gearDelta;
-                    this.logger.logEvent({ message: 'gear changed', gear: this.gear, oldGear });
+                    this.logEvent({ message: 'gear changed', gear: this.gear, oldGear });
                     this.data.gearStr = this.getGearString();
                     this.calculateSimulatedPower('gear');
                     if (this.simPower !== undefined) {
@@ -319,7 +319,7 @@ class SmartTrainerCyclingMode extends power_base_js_1.default {
                             }
                         }
                         this.gear = closestIndex + 1;
-                        this.logger.logEvent({ message: 'gear changed', gear: this.gear, gearRatio: newRequest.gearRatio, oldGear });
+                        this.logEvent({ message: 'gear changed', gear: this.gear, gearRatio: newRequest.gearRatio, oldGear });
                     }
                 }
                 else if (request.gearDelta !== undefined) {
@@ -339,7 +339,7 @@ class SmartTrainerCyclingMode extends power_base_js_1.default {
                     }
                     delete request.gearDelta;
                     newRequest.gearRatio = this.gearRatios[this.gear];
-                    this.logger.logEvent({ message: 'gear changed', gear: this.gear, gearRatio: newRequest.gearRatio, oldGear });
+                    this.logEvent({ message: 'gear changed', gear: this.gear, gearRatio: newRequest.gearRatio, oldGear });
                 }
                 else {
                     if (this.gear === undefined) {
@@ -347,7 +347,7 @@ class SmartTrainerCyclingMode extends power_base_js_1.default {
                         this.gear = initialGear + request.gearDelta;
                     }
                     newRequest.gearRatio = this.gearRatios[this.gear];
-                    this.logger.logEvent({ message: 'gear initialized', gear: this.gear, gearRatio: newRequest.gearRatio });
+                    this.logEvent({ message: 'gear initialized', gear: this.gear, gearRatio: newRequest.gearRatio });
                 }
                 break;
             case 'Disabled':
@@ -397,7 +397,7 @@ class SmartTrainerCyclingMode extends power_base_js_1.default {
             }
         }
         catch (err) {
-            this.logger.logEvent({ message: 'error', fn: 'getVirtualShiftMode', error: err.message, stack: err.stack });
+            this.logEvent({ message: 'error', fn: 'getVirtualShiftMode', error: err.message, stack: err.stack });
         }
         return 'Disabled';
     }
@@ -432,7 +432,7 @@ class SmartTrainerCyclingMode extends power_base_js_1.default {
         return super.updateRequired(request);
     }
     sendBikeUpdate(incoming) {
-        this.logger.logEvent({ message: "processing update request", request: incoming, prev: this.prevRequest, data: this.getData() });
+        this.logEvent({ message: "processing update request", request: incoming, prev: this.prevRequest, data: this.getData() });
         let newRequest = {};
         const request = { ...incoming };
         delete this.simPower;
@@ -449,7 +449,7 @@ class SmartTrainerCyclingMode extends power_base_js_1.default {
             this.prevRequest.slope = this.data.slope;
         }
         catch (err) {
-            this.logger.logEvent({ message: "error", fn: 'sendBikeUpdate()', error: err.message, stack: err.stack });
+            this.logEvent({ message: "error", fn: 'sendBikeUpdate()', error: err.message, stack: err.stack });
         }
         if (newRequest.targetPower && this.simPower) {
             this.prevSimPower = newRequest.targetPower;