incyclist-services 1.3.35 → 1.3.36

package/lib/activities/base/repo/db.d.ts

@@ -49,6 +49,6 @@ export declare class ActivitiesRepository {
     protected scanForNewActivities(): Promise<Array<string> | null>;
     protected _load(): Promise<void>;
     protected getActivity(id: string): ActivityInfo;
-    protected logError(error: Error, fn: string, logProps?: any): void;
+    protected logError(err: Error, fn: string, logProps?: any): void;
     protected getRepo(): JsonRepository;
 }

package/lib/activities/base/repo/db.js

@@ -416,9 +416,9 @@ let ActivitiesRepository = (() => {
         getActivity(id) {
             return this.activities.find(ai => ai.summary.id === id);
         }
-        logError(error, fn, logProps) {
+        logError(err, fn, logProps) {
             const props = logProps !== null && logProps !== void 0 ? logProps : {};
-            this.logger.logEvent(Object.assign({ message: 'error', error, fn }, props));
+            this.logger.logEvent(Object.assign(Object.assign({ message: 'error', fn, error: err.message }, props), { stack: err.stack }));
         }
         getRepo() {
             if (!this.repo)

package/lib/devices/configuration/model/service/index.d.ts

@@ -8,6 +8,8 @@ export interface AdapterInfo {
 export interface DeviceModeInfo {
     udid: string;
     mode: string;
+    isERG?: boolean;
+    isSIM?: boolean;
     settings: any;
     options?: string[];
 }

package/lib/devices/configuration/service.js

@@ -544,7 +544,7 @@ class DeviceConfigurationService extends events_1.default {
             const device = devices.find(d => d.udid === udid);
             if (!device)
                 return;
-            let mode, modes, settings;
+            let mode, modes, settings, isERG, isSIM;
             let modeObj;
             const adapter = incyclist_devices_1.AdapterFactory.create(device.settings);
             if (!adapter) {
@@ -563,7 +563,12 @@ class DeviceConfigurationService extends events_1.default {
             if (!settings && modeObj) {
                 settings = modeObj.getSettings();
             }
-            return { udid, mode, settings, options: modes.map(M => new M(adapter)) };
+            const options = modes.map(M => new M(adapter));
+            if (options === null || options === void 0 ? void 0 : options.length) {
+                isERG = options[0].isERG();
+                isSIM = options[0].isSIM();
+            }
+            return { udid, mode, settings, isERG, isSIM, options };
         }
         catch (err) {
             this.logError(err, 'getModeSettings()');

package/lib/devices/ride/service.d.ts

@@ -18,6 +18,7 @@ export declare class DeviceRideService extends EventEmitter {
     protected logger: EventLogger;
     protected debug: any;
     protected promiseSendUpdate: Promise<UpdateRequest | void>[];
+    protected originalMode: CyclingMode;
     protected deviceDataHandler: any;
     static getInstance(): DeviceRideService;
     constructor();
@@ -66,7 +67,10 @@ export declare class DeviceRideService extends EventEmitter {
     waitForUpdateFinish(): Promise<void>;
     sendUpdate(request: UpdateRequest): Promise<void>;
     getCyclingMode(udid?: string): CyclingMode;
+    isToggleEnabled(): boolean;
+    toggleCyclingMode(): Promise<void>;
     resetCyclingMode(sendInit?: boolean): Promise<void>;
+    private getControlAdapter;
     enforceERG(): Promise<void>;
     onCyclingModeChanged(udid: string, mode: string, settings: any): Promise<void>;
     onDeviceDeleted(settings: IncyclistDeviceSettings): void;

package/lib/devices/ride/service.js

@@ -691,12 +691,15 @@ class DeviceRideService extends events_1.default {
     }
     start(props) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             yield this.lazyInit();
             const adapters = this.getAdapterList();
             this.emit('start-request', adapters === null || adapters === void 0 ? void 0 : adapters.map(this.getAdapterStateInfo));
             const goodToGo = yield this.waitForPreviousStartToFinish();
             if (!goodToGo)
                 return;
+            const { adapter } = (_a = this.getControlAdapter()) !== null && _a !== void 0 ? _a : {};
+            this.originalMode = adapter.getCyclingMode();
             return this.startAdapters(adapters, 'start', props);
         });
     }
@@ -916,11 +919,44 @@ class DeviceRideService extends events_1.default {
         if (adapter)
             return adapter.getCyclingMode();
     }
+    isToggleEnabled() {
+        var _a;
+        const { adapter, udid } = (_a = this.getControlAdapter()) !== null && _a !== void 0 ? _a : {};
+        if (!adapter)
+            return false;
+        const settings = (0, configuration_1.useDeviceConfiguration)().getModeSettings(udid);
+        return settings === null || settings === void 0 ? void 0 : settings.isSIM;
+    }
+    toggleCyclingMode() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            if (!this.isToggleEnabled())
+                return;
+            const { adapter } = (_a = this.getControlAdapter()) !== null && _a !== void 0 ? _a : {};
+            if (!adapter)
+                return;
+            const ergRide = ((_b = this.originalMode) === null || _b === void 0 ? void 0 : _b.isERG());
+            const targetMode = ergRide ? adapter.getDefaultCyclingMode() : this.originalMode;
+            const currentMode = adapter.getCyclingMode();
+            if (!currentMode)
+                return;
+            if (!currentMode.isERG()) {
+                const power = adapter.getData().power;
+                this.enforceERG();
+                adapter.sendUpdate({ targetPower: power });
+            }
+            else {
+                const slope = adapter.getData().slope;
+                adapter.setCyclingMode(targetMode);
+                this.resetCyclingMode(false);
+                adapter.sendUpdate({ slope });
+            }
+        });
+    }
     resetCyclingMode() {
         return __awaiter(this, arguments, void 0, function* (sendInit = false) {
             try {
-                const adapters = this.getAdapterList();
-                const adapterInfo = adapters === null || adapters === void 0 ? void 0 : adapters.find(ai => ai.adapter.hasCapability(incyclist_devices_1.IncyclistCapability.Control));
+                const adapterInfo = this.getControlAdapter();
                 if (!(adapterInfo === null || adapterInfo === void 0 ? void 0 : adapterInfo.adapter))
                     return;
                 const { udid, adapter } = adapterInfo;
@@ -939,6 +975,11 @@ class DeviceRideService extends events_1.default {
             }
         });
     }
+    getControlAdapter() {
+        const adapters = this.getAdapterList();
+        const adapterInfo = adapters === null || adapters === void 0 ? void 0 : adapters.find(ai => ai.adapter.hasCapability(incyclist_devices_1.IncyclistCapability.Control));
+        return adapterInfo;
+    }
     enforceERG() {
         return __awaiter(this, void 0, void 0, function* () {
             try {

package/lib/workouts/ride/service.d.ts

@@ -31,6 +31,7 @@ export declare class WorkoutRide extends IncyclistService {
     backward(): void;
     powerUp(delta: number): void;
     powerDown(delta: number): void;
+    toggleCyclingMode(): void;
     getDashboardDisplayProperties(): WorkoutDisplayProperties;
     getCurrentLimits(): ActiveWorkoutLimit;
     inUse(): boolean;
@@ -56,6 +57,7 @@ export declare class WorkoutRide extends IncyclistService {
     protected resetWorkout(): void;
     emit(eventName: string, ...args: any[]): boolean;
     protected stopWorker(): void;
+    protected getCyclingModeText(): string;
 }
 export declare const useWorkoutRide: () => WorkoutRide;
 export declare const getWorkoutRide: () => WorkoutRide;

package/lib/workouts/ride/service.js

@@ -250,6 +250,11 @@ let WorkoutRide = (() => {
                 this.logError(err, 'powerDown');
             }
         }
+        toggleCyclingMode() {
+            const deviceRide = (0, devices_1.useDeviceRide)();
+            deviceRide.toggleCyclingMode();
+            this.emit('update', this.getDashboardDisplayProperties());
+        }
         getDashboardDisplayProperties() {
             var _a;
             try {
@@ -264,6 +269,7 @@ let WorkoutRide = (() => {
                     ftp: this.settings.ftp,
                     current: this.currentLimits,
                     start, stop,
+                    mode: this.getCyclingModeText(),
                     canShowBackward,
                     canShowForward: true
                 };
@@ -495,6 +501,17 @@ let WorkoutRide = (() => {
                 this.updateInterval = undefined;
             }
         }
+        getCyclingModeText() {
+            const deviceRide = (0, devices_1.useDeviceRide)();
+            const mode = deviceRide.getCyclingMode();
+            const enabled = deviceRide.isToggleEnabled();
+            if (!mode || !enabled)
+                return;
+            if (mode.isERG())
+                return 'SIM';
+            if (mode.isSIM())
+                return 'ERG';
+        }
     };
     __setFunctionName(_classThis, "WorkoutRide");
     (() => {

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "incyclist-services",
-  "version": "1.3.35",
+  "version": "1.3.36",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",
     "@types/node": "^22.9.0",
-    "@typescript-eslint/eslint-plugin": "^8.12.2",
-    "@typescript-eslint/parser": "^8.11.0",
+    "@typescript-eslint/eslint-plugin": "^8.13.0",
+    "@typescript-eslint/parser": "^8.13.0",
     "dotenv": "^16.4.5",
-    "eslint": "^9.13.0",
+    "eslint": "^9.14.0",
     "formdata-node": "^6.0.3",
     "jest": "^29.7.0",
     "jsdoc": "^4.0.4",
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "axios": "^1.7.7",
-    "incyclist-devices": "^2.2.6",
+    "incyclist-devices": "^2.2.7",
     "promise.any": "^2.0.6",
     "semver": "^7.6.3",
     "tcx-builder": "^1.1.1",