incyclist-devices 2.4.6-beta.2 → 2.4.6

package/lib/antv2/base/adapter.js

@@ -208,9 +208,9 @@ class AntAdapter extends adpater_1.default {
         });
     }
     getID() {
-        var _a;
-        const id = this.deviceData.DeviceID || ((_a = this.sensor) === null || _a === void 0 ? void 0 : _a.getDeviceID());
-        return id.toString();
+        var _a, _b, _c;
+        const id = (_b = (_a = this.deviceData) === null || _a === void 0 ? void 0 : _a.DeviceID) !== null && _b !== void 0 ? _b : (_c = this.sensor) === null || _c === void 0 ? void 0 : _c.getDeviceID();
+        return id === null || id === void 0 ? void 0 : id.toString();
     }
     getName() {
         if (this.settings.name)

package/lib/antv2/fe/adapter.js

@@ -39,7 +39,7 @@ class AntFEAdapter extends adapter_1.default {
     }
     getDefaultCyclingMode() {
         if (this.props.capabilities && this.props.capabilities.indexOf(types_1.IncyclistCapability.Control) === -1)
-            return new power_meter_1.default(this);
+            return this.createMode(power_meter_1.default);
         return super.getDefaultCyclingMode();
     }
     sendUpdate(request) {

package/lib/base/adpater.d.ts

@@ -14,6 +14,7 @@ export default class IncyclistDevice<P extends DeviceProperties> extends EventEm
     scanning: boolean;
     protected props: P;
     protected cyclingMode: ICyclingMode;
+    protected modes: Record<string, ICyclingMode>;
     protected logger: EventLogger;
     protected static controllers: ControllerConfig;
     protected user: User;
@@ -49,6 +50,7 @@ export default class IncyclistDevice<P extends DeviceProperties> extends EventEm
     setMaxUpdateFrequency(value: number): void;
     update(): void;
     setCyclingMode(mode: string | ICyclingMode, settings?: any, sendInitCommands?: boolean): void;
+    createMode(ModeClass: typeof CyclingMode): ICyclingMode;
     protected createOrGetMode(mode: string | ICyclingMode): ICyclingMode;
     getSupportedCyclingModes(): Array<typeof CyclingMode>;
     getCyclingMode(): ICyclingMode;

package/lib/base/adpater.js

@@ -19,6 +19,7 @@ const utils_1 = require("../utils/utils");
 class IncyclistDevice extends events_1.default {
     constructor(settings, props) {
         super();
+        this.modes = {};
         this.onDataFn = undefined;
         this.settings = settings;
         this.props = props || {};
@@ -146,22 +147,32 @@ class IncyclistDevice extends events_1.default {
         this.cyclingMode = selectedMode;
         this.cyclingMode.setSettings(settings);
     }
+    createMode(ModeClass) {
+        try {
+            const mode = new ModeClass(null);
+            return this.createOrGetMode(mode.getName());
+        }
+        catch (err) {
+            this.logEvent({ message: 'error', error: err.message, stack: err.stack, mode: ModeClass === null || ModeClass === void 0 ? void 0 : ModeClass.name });
+        }
+    }
     createOrGetMode(mode) {
-        var _a, _b;
+        var _a, _b, _c;
         if (typeof mode === 'string') {
             if (mode === ((_a = this.getCyclingMode()) === null || _a === void 0 ? void 0 : _a.getName())) {
                 return this.cyclingMode;
             }
             const supported = this.getSupportedCyclingModes();
-            const CyclingModeClass = supported.find(M => { const m = new M(this); return m.getName() === mode; });
+            const CyclingModeClass = supported.find(M => { const m = new M(null); return m.getName() === mode; });
             if (CyclingModeClass) {
-                return new CyclingModeClass(this);
+                this.modes[mode] = (_b = this.modes[mode]) !== null && _b !== void 0 ? _b : new CyclingModeClass(this);
+                return this.modes[mode];
             }
             else {
                 return this.getDefaultCyclingMode();
             }
         }
-        if (mode.getName() === ((_b = this.cyclingMode) === null || _b === void 0 ? void 0 : _b.getName())) {
+        if (mode.getName() === ((_c = this.cyclingMode) === null || _c === void 0 ? void 0 : _c.getName())) {
             return this.cyclingMode;
         }
         return mode;
@@ -182,7 +193,7 @@ class IncyclistDevice extends events_1.default {
         const config = this.getControllerInfo();
         const C = config.default;
         try {
-            return new C(this);
+            return this.createMode(C);
         }
         catch (err) {
             this.logEvent({ message: 'error', error: err.message, fn: 'getDefaultCyclingMode', stack: err.stack });

package/lib/ble/fm/adapter.d.ts

@@ -29,6 +29,7 @@ export default class BleFmAdapter extends BleAdapter<IndoorBikeData, BleFitnessM
     protected setConstants(): void;
     protected establishControl(): Promise<boolean>;
     protected sendInitialRequest(): Promise<void>;
+    protected updateCyclingModeConfig(): void;
     protected checkCapabilities(): Promise<void>;
     protected updateCapabilitiesFromFeatures(features: IndoorBikeFeatures): void;
     sendUpdate(request: any, enforced?: boolean): Promise<UpdateRequest | void>;

package/lib/ble/fm/adapter.js

@@ -21,11 +21,9 @@ const adapter_1 = __importDefault(require("../base/adapter"));
 const consts_1 = require("./consts");
 const types_1 = require("../../types");
 const utils_1 = require("../../utils/utils");
-const utils_2 = require("../utils");
 const play_1 = require("../zwift/play");
 const features_1 = require("../../features");
 const fm_resistance_1 = __importDefault(require("../../modes/fm-resistance"));
-const ZWIFT_PLAY_UUID = '0000000119ca465186e5fa29dcdd09d1';
 class BleFmAdapter extends adapter_1.default {
     constructor(settings, props) {
         super(settings, props);
@@ -53,7 +51,7 @@ class BleFmAdapter extends adapter_1.default {
         var _a, _b;
         if (!this.getFeatureToggle().has('VirtualShifting'))
             return false;
-        return (_b = (_a = this.device) === null || _a === void 0 ? void 0 : _a.getSupportedServiceUUids()) === null || _b === void 0 ? void 0 : _b.some(s => (0, utils_2.matches)(s, ZWIFT_PLAY_UUID));
+        return (_b = (_a = this.device) === null || _a === void 0 ? void 0 : _a.supportsVirtualShifting()) !== null && _b !== void 0 ? _b : false;
     }
     getSupportedCyclingModes() {
         var _a, _b;
@@ -75,18 +73,20 @@ class BleFmAdapter extends adapter_1.default {
     getDefaultCyclingMode() {
         var _a, _b;
         if (((_a = this.props) === null || _a === void 0 ? void 0 : _a.capabilities) && this.props.capabilities.indexOf(types_1.IncyclistCapability.Control) === -1)
-            return new power_meter_1.default(this);
+            return this.createMode(power_meter_1.default);
         const features = (_b = this.getSensor()) === null || _b === void 0 ? void 0 : _b.features;
-        if (!features)
-            return new antble_smarttrainer_1.default(this);
-        if (features.setSlope === undefined || features.setSlope)
-            return new antble_smarttrainer_1.default(this);
+        if (!features) {
+            return this.createMode(antble_smarttrainer_1.default);
+        }
+        if (features.setSlope === undefined || features.setSlope) {
+            return this.createMode(antble_smarttrainer_1.default);
+        }
         if (features.setPower === undefined || features.setPower)
-            return new antble_erg_1.default(this);
+            return this.createMode(antble_erg_1.default);
         if (features.setResistance) {
-            return new fm_resistance_1.default(this);
+            return this.createMode(fm_resistance_1.default);
         }
-        return new power_meter_1.default(this);
+        return this.createMode(power_meter_1.default);
     }
     mapData(deviceData) {
         var _a, _b, _c, _d, _e;
@@ -223,6 +223,14 @@ class BleFmAdapter extends adapter_1.default {
             yield this.sendUpdate(startRequest, true);
         });
     }
+    updateCyclingModeConfig() {
+        const modes = this.getSupportedCyclingModes();
+        modes.forEach(ModeClass => {
+            const mode = this.createMode(ModeClass);
+            mode.resetConfig();
+            mode.getConfig();
+        });
+    }
     checkCapabilities() {
         return __awaiter(this, void 0, void 0, function* () {
             const before = this.capabilities.join(',');
@@ -242,6 +250,7 @@ class BleFmAdapter extends adapter_1.default {
             if (before !== after) {
                 this.logEvent({ message: 'device capabilities updated', name: this.getSettings().name, interface: this.getSettings().interface, capabilities: this.capabilities });
                 this.emit('device-info', this.getSettings(), { capabilities: this.capabilities });
+                this.updateCyclingModeConfig();
             }
         });
     }

package/lib/ble/fm/consts.d.ts

@@ -97,3 +97,4 @@ export declare const TargetSettingFeatureFlag: {
     SpinDownControlSupported: number;
     TargetedCadenceConfigurationSupported: number;
 };
+export declare const ZWIFT_PLAY_UUID = "0000000119ca465186e5fa29dcdd09d1";

package/lib/ble/fm/consts.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TargetSettingFeatureFlag = exports.FitnessMachineFeatureFlag = exports.IndoorBikeDataFlag = exports.cRR = exports.cwABike = void 0;
+exports.ZWIFT_PLAY_UUID = exports.TargetSettingFeatureFlag = exports.FitnessMachineFeatureFlag = exports.IndoorBikeDataFlag = exports.cRR = exports.cwABike = void 0;
 exports.cwABike = {
     race: 0.35,
     triathlon: 0.29,
@@ -61,3 +61,4 @@ exports.TargetSettingFeatureFlag = {
     SpinDownControlSupported: bit(15),
     TargetedCadenceConfigurationSupported: bit(16)
 };
+exports.ZWIFT_PLAY_UUID = '0000000119ca465186e5fa29dcdd09d1';

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

@@ -36,6 +36,7 @@ export default class BleFitnessMachineDevice extends TBleSensor {
     protected parseIndoorBikeData(_data: Uint8Array): IndoorBikeData;
     protected parseFitnessMachineStatus(_data: Uint8Array): IndoorBikeData;
     getFitnessMachineFeatures(): Promise<IndoorBikeFeatures | undefined>;
+    supportsVirtualShifting(): boolean;
     protected buildFitnessMachineInfo(fitnessMachine: number): string[];
     protected buildTargetSettingsInfo(targetSettings: number): string[];
     protected writeFtmsMessage(requestedOpCode: any, data: any, props?: BleWriteProps): Promise<number>;

package/lib/ble/fm/sensor.js

@@ -332,6 +332,10 @@ class BleFitnessMachineDevice extends sensor_1.TBleSensor {
             }
         });
     }
+    supportsVirtualShifting() {
+        var _a;
+        return (_a = this.getSupportedServiceUUids()) === null || _a === void 0 ? void 0 : _a.some(s => (0, utils_1.matches)(s, consts_2.ZWIFT_PLAY_UUID));
+    }
     buildFitnessMachineInfo(fitnessMachine) {
         const info = [];
         const check = (flag, name) => {
@@ -387,6 +391,9 @@ class BleFitnessMachineDevice extends sensor_1.TBleSensor {
             check(consts_2.TargetSettingFeatureFlag.WheelCircumferenceConfigurationSupported, 'wheelCircumference');
             check(consts_2.TargetSettingFeatureFlag.SpinDownControlSupported, 'spindown');
             check(consts_2.TargetSettingFeatureFlag.TargetedCadenceConfigurationSupported, 'cadence');
+            if (this.supportsVirtualShifting) {
+                info.push('virtualShifting');
+            }
         }
         catch (err) {
             this.logEvent({ message: 'could not read TargetSettingsInfo', error: err.message, stack: err.stack, device: this.getName() });

package/lib/modes/antble-smarttrainer.d.ts

@@ -40,6 +40,7 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase i
     constructor(adapter: IAdapter, props?: any);
     getBikeInitRequest(): UpdateRequest;
     checkForResetOrEmpty(request: UpdateRequest): UpdateRequest | undefined;
+    resetConfig(): void;
     getConfig(): CyclingModeConfig;
     protected checkSlopeNoShiftig(request: UpdateRequest, newRequest?: UpdateRequest): void;
     protected checkSlopeWithAdapterShifting(request: UpdateRequest, newRequest?: UpdateRequest): void;

package/lib/modes/antble-smarttrainer.js

@@ -70,12 +70,24 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             return this.prevRequest;
         }
     }
+    resetConfig() {
+        const config = this.getConfig();
+        const virtshiftIdx = config.properties.findIndex(p => p.key === 'virtshift');
+        if (virtshiftIdx !== -1) {
+            config.properties.splice(virtshiftIdx, 1);
+        }
+        let startGearIdx = config.properties.findIndex(p => p.key === 'startGear');
+        if (startGearIdx !== -1) {
+            config.properties.splice(startGearIdx, 1);
+        }
+    }
     getConfig() {
+        var _a, _b;
         const config = super.getConfig();
         const virtShiftEnabled = this.getFeatureToogle().has('VirtualShifting');
         let virtshift = config.properties.find(p => p.key === 'virtshift');
         let startGear = config.properties.find(p => p.key === 'startGear');
-        if (!virtshift && !this.adapter.supportsVirtualShifting()) {
+        if (!virtshift && !((_a = this.adapter) === null || _a === void 0 ? void 0 : _a.supportsVirtualShifting())) {
             const options = virtShiftEnabled ? [
                 'Disabled',
                 { key: 'Incyclist', display: 'App only (beta)' },
@@ -88,7 +100,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             virtshift = { key: 'virtshift', name: 'Virtual Shifting', description: 'Enable virtual shifting', type: types_1.CyclingModeProperyType.SingleSelect, options, default: 'Disabled' };
             config.properties.push(virtshift);
         }
-        if (!virtshift && virtShiftEnabled && this.adapter.supportsVirtualShifting()) {
+        if (!virtshift && virtShiftEnabled && ((_b = this.adapter) === null || _b === void 0 ? void 0 : _b.supportsVirtualShifting())) {
             const options = [
                 'Disabled',
                 { key: 'Incyclist', display: 'App only (beta)' },
@@ -193,7 +205,6 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             return;
         }
         if (request.targetPower !== undefined || request.targetPowerDelta !== undefined || request.gearDelta !== undefined || request.gearRatio !== undefined) {
-            console.log('# cadence change ignored due to other power/gear request', request);
             return;
         }
         if (this.data.pedalRpm !== this.prevData.pedalRpm) {
@@ -216,20 +227,23 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             const prev = ((_e = (_d = this.prevSimPower) !== null && _d !== void 0 ? _d : prevPower) !== null && _e !== void 0 ? _e : 0);
             const delta = newPower - prev;
             if (!this.prevEkin && this.data.isPedalling) {
+                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 });
             }
             else if (changed === 'gear') {
-                this.simPower = prev + delta / 2;
+                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 });
             }
             else if (changed === 'slope' || changed === 'cadence') {
-                this.simPower = prev + delta / 4;
+                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 });
             }
             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 });
             }
         }
         else {
@@ -266,12 +280,11 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                         this.gear = this.gearRatios.length;
                     }
                     delete request.gearDelta;
-                    console.log('# gear changed');
                     this.logger.logEvent({ message: 'gear changed', gear: this.gear, oldGear });
+                    this.data.gearStr = this.getGearString();
                     this.calculateSimulatedPower('gear');
                     if (this.simPower !== undefined) {
-                        this.adapter.sendUpdate({ targetPower: this.simPower }).then(() => { });
-                        this.prevSimPower = this.simPower;
+                        newRequest.targetPower = this.simPower;
                     }
                 }
                 break;
@@ -342,6 +355,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         }
     }
     getVirtualShiftMode() {
+        var _a;
         try {
             if (!this.getFeatureToogle().has('VirtualShifting')) {
                 return 'Disabled';
@@ -360,7 +374,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                 return 'SlopeDelta';
             }
             else if (virtshiftMode === 'Enabled') {
-                return this.adapter.supportsVirtualShifting() ? 'Adapter' : 'Simulated';
+                return ((_a = this.adapter) === null || _a === void 0 ? void 0 : _a.supportsVirtualShifting()) ? 'Adapter' : 'Simulated';
             }
         }
         catch (err) {
@@ -370,7 +384,6 @@ class SmartTrainerCyclingMode extends power_base_1.default {
     }
     updateData(bikeData, log) {
         var _a;
-        console.log('# update data', bikeData);
         const prev = this.prevData = Object.assign({}, this.data);
         const data = super.updateData(bikeData, log);
         const mode = this.getVirtualShiftMode();
@@ -386,7 +399,6 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             this.gear = (_a = Number(this.getSetting('startGear'))) !== null && _a !== void 0 ? _a : 0;
             data.gearStr = this.getGearString();
         }
-        console.log('# data updated', data);
         return data;
     }
     getData() {
@@ -402,7 +414,6 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         return super.updateRequired(request);
     }
     sendBikeUpdate(incoming) {
-        console.log('# bike update request', incoming);
         this.logger.logEvent({ message: "processing update request", request: incoming, prev: this.prevRequest, data: this.getData() });
         let newRequest = {};
         const request = Object.assign({}, incoming);
@@ -422,7 +433,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         catch (err) {
             this.logger.logEvent({ message: "error", fn: 'sendBikeUpdate()', error: err.message, stack: err.stack });
         }
-        if (newRequest.targetPower) {
+        if (newRequest.targetPower && this.simPower) {
             this.prevSimPower = newRequest.targetPower;
         }
         return newRequest;

package/lib/modes/types.d.ts

@@ -53,6 +53,8 @@ export default interface ICyclingMode {
     setModeProperty(name: string, value: any): void;
     getModeProperty(name: string): any;
     getData(): Partial<IncyclistBikeData>;
+    resetConfig(): void;
+    getConfig(): CyclingModeConfig;
 }
 export type CyclingModeConfig = {
     isERG?: boolean;
@@ -82,6 +84,7 @@ export declare class CyclingMode implements ICyclingMode {
     isERG(): boolean;
     isSIM(): boolean;
     isResistance(): boolean;
+    resetConfig(): void;
     getData(): Partial<IncyclistBikeData>;
     confirmed(request: UpdateRequest): void;
 }

package/lib/modes/types.js

@@ -64,6 +64,7 @@ class CyclingMode {
     isResistance() {
         return this.getConfig().isResistance;
     }
+    resetConfig() { }
     getData() {
         return {};
     }

package/lib/serial/daum/DaumAdapter.js

@@ -52,7 +52,7 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
     }
     getDefaultCyclingMode() {
         if (this.props.capabilities && this.props.capabilities.indexOf(types_1.IncyclistCapability.Control) === -1)
-            return new daum_power_1.default(this);
+            return this.createMode(daum_power_1.default);
         return super.getDefaultCyclingMode();
     }
     sendInitCommands() {

package/lib/serial/daum/classic/adapter.js

@@ -19,7 +19,6 @@ const daum_classic_standard_1 = __importDefault(require("../../../modes/daum-cla
 const comms_1 = __importDefault(require("./comms"));
 const serial_interface_1 = __importDefault(require("../../base/serial-interface"));
 const daum_erg_1 = __importDefault(require("../../../modes/daum-erg"));
-const daum_smarttrainer_1 = __importDefault(require("../../../modes/daum-smarttrainer"));
 const daum_power_1 = __importDefault(require("../../../modes/daum-power"));
 const consts_1 = require("./consts");
 class DaumClassicAdapter extends DaumAdapter_1.default {
@@ -191,7 +190,7 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
 }
 DaumClassicAdapter.NAME = consts_1.PROTOCOL_NAME;
 DaumClassicAdapter.controllers = {
-    modes: [daum_erg_1.default, daum_smarttrainer_1.default, daum_power_1.default, daum_classic_standard_1.default],
+    modes: [daum_erg_1.default, daum_power_1.default, daum_classic_standard_1.default],
     default: daum_classic_standard_1.default
 };
 exports.default = DaumClassicAdapter;

package/lib/serial/daum/premium/adapter.js

@@ -21,7 +21,6 @@ const types_1 = require("../../types");
 const types_2 = require("../../../types");
 const daum_premium_standard_1 = __importDefault(require("../../../modes/daum-premium-standard"));
 const daum_erg_1 = __importDefault(require("../../../modes/daum-erg"));
-const daum_smarttrainer_1 = __importDefault(require("../../../modes/daum-smarttrainer"));
 const daum_power_1 = __importDefault(require("../../../modes/daum-power"));
 const PROTOCOL_NAME = "Daum Premium";
 const DAUM_PREMIUM_DEFAULT_PORT = 51955;
@@ -233,7 +232,7 @@ class DaumPremiumAdapter extends DaumAdapter_1.default {
 }
 DaumPremiumAdapter.NAME = PROTOCOL_NAME;
 DaumPremiumAdapter.controllers = {
-    modes: [daum_erg_1.default, daum_smarttrainer_1.default, daum_power_1.default, daum_premium_standard_1.default],
+    modes: [daum_erg_1.default, daum_power_1.default, daum_premium_standard_1.default],
     default: daum_erg_1.default
 };
 exports.default = DaumPremiumAdapter;

package/lib/types/adapter.d.ts

@@ -50,5 +50,6 @@ export interface IAdapter extends EventEmitter, IBike, ISensor {
     resetData(): void;
     onScanStart(): void;
     onScanStop(): void;
+    createMode(ModeClass: typeof CyclingMode): ICyclingMode;
     onData(callback: OnDeviceDataCallback): any;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.4.6-beta.2",
+  "version": "2.4.6",
   "dependencies": {
     "@protobuf-ts/runtime": "^2.11.1",
     "@serialport/bindings-interface": "^1.2.2",