incyclist-services 1.7.118 → 1.7.120

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

@@ -47,6 +47,7 @@ const Injection_1 = require("../../../base/decorators/Injection");
 const i18n_1 = require("../../../i18n");
 exports.DB_VERSION = '5';
 exports.DB_NAME = 'db';
+const SHORT_RIDE_FILTER_CUTOFF = new Date('2026-08-28').getTime();
 let ActivitiesRepository = (() => {
     let _classDecorators = [types_1.Singleton];
     let _classDescriptor;
@@ -109,7 +110,7 @@ let ActivitiesRepository = (() => {
                 this.write();
             }
             if (writeDetails) {
-                this.writeDetails(activity);
+                await this.writeDetails(activity);
             }
         }
         migrate(activity, writeSummary = true) {
@@ -224,6 +225,16 @@ let ActivitiesRepository = (() => {
         }
         search(criteria) {
             let result = this.activities;
+            if (!this.isMobile()) {
+                result = result?.filter(ai => {
+                    const { rideTime, startTime } = ai.summary;
+                    if (rideTime < 1)
+                        return false;
+                    if (rideTime <= 30 && startTime < SHORT_RIDE_FILTER_CUTOFF)
+                        return false;
+                    return true;
+                });
+            }
             result = this.checkIdFilter(result, criteria);
             result = this.checkHashFilter(result, criteria);
             result = this.checkStartPosFilter(result, criteria);
@@ -475,7 +486,7 @@ let ActivitiesRepository = (() => {
         }
         async writeDetails(activity) {
             const name = activity.summary.name;
-            this.getRepo().write(name, activity.details);
+            await this.getRepo().write(name, activity.details);
         }
         async scanForNewActivities() {
             try {
@@ -509,6 +520,13 @@ let ActivitiesRepository = (() => {
         getRouteList() {
             return (0, routes_1.useRouteList)();
         }
+        isMobile() {
+            const { appInfo } = this.getBindings();
+            if (!appInfo) {
+                return false;
+            }
+            return appInfo?.getChannel() === 'mobile';
+        }
         getBindings() {
             return (0, api_1.getBindings)();
         }

package/lib/cjs/activities/base/utils/activity.js

@@ -254,7 +254,7 @@ let Activity = (() => {
         isRouteAvailable() {
             if (!this.details?.route)
                 return false;
-            if (this.details.routeType === 'Free-Ride')
+            if (this.details.routeType === 'Free-Ride' || this.details.routeType === 'None')
                 return false;
             return this.getRouteList().getRouteDescription(this.details.route.id) !== undefined;
         }
@@ -277,7 +277,7 @@ let Activity = (() => {
         canStart() {
             if (!this.details?.route)
                 return false;
-            if (this.details.routeType === 'Free-Ride')
+            if (this.details.routeType === 'Free-Ride' || this.details.routeType === 'None')
                 return false;
             if (this.details.routeType === 'Video') {
                 const isOnline = this.getOnlineMonitoring().onlineStatus;

package/lib/cjs/activities/ride/service.js

@@ -198,7 +198,7 @@ let ActivityRideService = (() => {
             this.disableDeviceHealthCheck();
             this.state = 'completed';
             this.updateActivityTime();
-            this._save();
+            await this._save();
             this.emit('completed');
             this.tsPauseStart = undefined;
             delete this.tsStart;
@@ -536,7 +536,7 @@ let ActivityRideService = (() => {
             if (this.state !== 'completed') {
                 await this.stop();
             }
-            this.getRepo().delete(this.activity.id);
+            await this.getRepo().delete(this.activity.id);
             this.state = 'idle';
         }
         save() {
@@ -552,7 +552,7 @@ let ActivityRideService = (() => {
                 let success = false;
                 try {
                     emit('start', success);
-                    await this._save();
+                    this._save();
                     success = await this._convertAndUpload();
                     (0, sleep_1.sleep)(0).then(() => {
                         delete this.saveObserver;
@@ -965,7 +965,7 @@ let ActivityRideService = (() => {
                     await fs.writeFile(fileName, Buffer.from(data));
                     this.activity.tcxFileName = fileName;
                 }
-                await this._save();
+                this._save();
                 emit('save.done', format, true);
                 return true;
             }

package/lib/cjs/devices/ride/cyclingMode.js

@@ -22,8 +22,11 @@ function isVirtualShiftingEnabled(mode) {
 function getLoadButtonMode(mode) {
     if (!mode)
         return 'power';
-    if (mode.isSIM() || mode.isResistance()) {
-        return isVirtualShiftingEnabled(mode) ? 'gear' : 'hidden';
-    }
-    return 'power';
+    if (mode.isERG())
+        return 'power';
+    if (mode.isSIM() && isVirtualShiftingEnabled(mode))
+        return 'gear';
+    if (mode.isResistance())
+        return 'gear';
+    return 'hidden';
 }

package/lib/cjs/ride/page/service.js

@@ -39,6 +39,7 @@ const gd_eventlog_1 = require("gd-eventlog");
 const decorators_1 = require("../../base/decorators");
 const pages_1 = require("../../base/pages");
 const display_1 = require("../display");
+const devices_1 = require("../../devices");
 const sleep_1 = require("../../utils/sleep");
 const monitoring_1 = require("../../monitoring");
 const activities_1 = require("../../activities");
@@ -64,6 +65,7 @@ let RidePageService = (() => {
     let _getActivityRide_decorators;
     let _getUserSettings_decorators;
     let _getOnlineStatusMonitoring_decorators;
+    let _getDeviceConfiguration_decorators;
     var RidePageService = class extends _classSuper {
         static { _classThis = this; }
         static {
@@ -73,11 +75,13 @@ let RidePageService = (() => {
             _getActivityRide_decorators = [decorators_1.Injectable];
             _getUserSettings_decorators = [decorators_1.Injectable];
             _getOnlineStatusMonitoring_decorators = [decorators_1.Injectable];
+            _getDeviceConfiguration_decorators = [decorators_1.Injectable];
             __esDecorate(this, null, _getRideDisplay_decorators, { kind: "method", name: "getRideDisplay", static: false, private: false, access: { has: obj => "getRideDisplay" in obj, get: obj => obj.getRideDisplay }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getWorkoutRide_decorators, { kind: "method", name: "getWorkoutRide", static: false, private: false, access: { has: obj => "getWorkoutRide" in obj, get: obj => obj.getWorkoutRide }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getActivityRide_decorators, { kind: "method", name: "getActivityRide", static: false, private: false, access: { has: obj => "getActivityRide" in obj, get: obj => obj.getActivityRide }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getOnlineStatusMonitoring_decorators, { kind: "method", name: "getOnlineStatusMonitoring", static: false, private: false, access: { has: obj => "getOnlineStatusMonitoring" in obj, get: obj => obj.getOnlineStatusMonitoring }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getDeviceConfiguration_decorators, { kind: "method", name: "getDeviceConfiguration", static: false, private: false, access: { has: obj => "getDeviceConfiguration" in obj, get: obj => obj.getDeviceConfiguration }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             RidePageService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -92,6 +96,7 @@ let RidePageService = (() => {
         menuProps = null;
         isInitialized = false;
         startGateProps = null;
+        onDeviceModeChangedBound = this.onDeviceModeChanged.bind(this);
         prevRidesVisibleRows = DEFAULT_PREV_RIDES_VISIBLE_ROWS;
         prevRidesMode = 'list';
         gestureHintDismissed = false;
@@ -103,7 +108,8 @@ let RidePageService = (() => {
             this.eventHandler['route-update'] = this.onRouteUpdate.bind(this);
             this.eventHandler['view-changed'] = this.onViewChanged.bind(this);
             this.eventHandler['prev-rides-update'] = this.onPrevRidesTick.bind(this);
-            this.workoutEventHandler['step-changed'] = this.onWorkoutUpdate.bind(this);
+            this.workoutEventHandler['step-changed'] = this.onWorkoutStepChanged.bind(this);
+            this.workoutEventHandler['step-countdown'] = this.onWorkoutStepCountdown.bind(this);
             this.workoutEventHandler['update'] = this.onWorkoutUpdate.bind(this);
             this.workoutEventHandler['forward'] = this.onWorkoutUpdate.bind(this);
             this.workoutEventHandler['backward'] = this.onWorkoutUpdate.bind(this);
@@ -142,6 +148,7 @@ let RidePageService = (() => {
                     const registerAndStart = () => {
                         this.registerHandlers(this.rideObserver, this.eventHandler);
                         this.subscribeToWorkoutObserver();
+                        this.getDeviceConfiguration().on('mode-changed', this.onDeviceModeChangedBound);
                         const state = service.getState();
                         if (state === 'Started' || state === 'Active' || state === 'Paused') {
                             this.logError(new Error(`start() requested while ride is ${state}`), 'openPage');
@@ -186,6 +193,7 @@ let RidePageService = (() => {
                 this.getRideDisplay().stop();
                 this.unregisterHandlers(this.rideObserver, this.eventHandler);
                 this.unsubscribeFromWorkoutObserver();
+                this.getDeviceConfiguration().off('mode-changed', this.onDeviceModeChangedBound);
                 this.menuProps = null;
                 this.isInitialized = false;
                 super.closePage();
@@ -277,9 +285,11 @@ let RidePageService = (() => {
         onMenuOpen() {
             try {
                 const state = this.getRideDisplay().getState();
+                const loadControl = this.getLoadControlProps();
+                const showRideSettings = !this.isRideType('Workout');
                 this.menuProps = this.isWorkoutAttached()
-                    ? { showResume: state === 'Paused', ...this.getStepFlags() }
-                    : { showResume: state === 'Paused' };
+                    ? { showResume: state === 'Paused', ...this.getStepFlags(), loadControl, showRideSettings }
+                    : { showResume: state === 'Paused', loadControl, showRideSettings };
                 this.updatePageDisplay();
             }
             catch (err) {
@@ -396,7 +406,7 @@ let RidePageService = (() => {
                 const available = this.getCornerWidgetStates();
                 if (available.length <= 1)
                     return undefined;
-                const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
+                const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'workout');
                 return available.includes(current) ? current : available[0];
             }
             catch (err) {
@@ -413,7 +423,7 @@ let RidePageService = (() => {
         onToggleCornerWidget() {
             try {
                 const available = this.getCornerWidgetStates();
-                const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
+                const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'workout');
                 const next = available[(available.indexOf(current) + 1) % available.length];
                 this.getUserSettings().set(CORNER_WIDGET_SETTING_KEY, next);
                 this.updatePageDisplay();
@@ -582,8 +592,7 @@ let RidePageService = (() => {
                 const plainErgAdjustment = !this.getWorkoutRide().inUse() && this.getLoadButtonMode() === 'power';
                 if (plainErgAdjustment) {
                     const sign = deltaPct >= 0 ? 1 : -1;
-                    const nominal = Math.abs(deltaPct) === 1 ? 5 : 50;
-                    return this.getRideDisplay().adjustDevicePower(sign * nominal);
+                    return this.getRideDisplay().adjustDevicePower(sign * this.getNominalErgWatts(deltaPct));
                 }
                 return deltaPct >= 0
                     ? this.getWorkoutRide().powerUp(deltaPct)
@@ -631,6 +640,13 @@ let RidePageService = (() => {
         onWorkoutUpdate() {
             this.updatePageDisplay();
         }
+        onWorkoutStepChanged(update) {
+            this.onWorkoutUpdate();
+            this.getPageObserver()?.emit('step-changed', update);
+        }
+        onWorkoutStepCountdown(tick) {
+            this.getPageObserver()?.emit('step-countdown', tick);
+        }
         onWorkoutFinished() {
             try {
                 if (this.isRideType('Workout'))
@@ -756,6 +772,40 @@ let RidePageService = (() => {
             const wo = this.getWorkoutRide().getDashboardDisplayProperties();
             return { canStepBack: !!wo.canShowBackward, canStepForward: !!wo.canShowForward };
         }
+        getLoadControlProps() {
+            const mode = this.getLoadButtonMode();
+            if (mode === 'hidden')
+                return { visible: false };
+            if (mode === 'gear')
+                return { visible: true, label: 'Gear', buttons: { inc1: '+1', dec1: '-1', inc5: '+5', dec5: '-5' } };
+            if (this.isWorkoutAttached()) {
+                const buttons = this.getWorkoutRide().getDashboardDisplayProperties().loadButtons;
+                return { visible: true, label: 'Load', buttons };
+            }
+            const small = this.getNominalErgWatts(1);
+            const big = this.getNominalErgWatts(5);
+            return {
+                visible: true,
+                label: 'Load',
+                buttons: { inc1: `+${small}W`, dec1: `-${small}W`, inc5: `+${big}W`, dec5: `-${big}W` }
+            };
+        }
+        getNominalErgWatts(magnitude) {
+            return Math.abs(magnitude) === 1 ? 5 : 50;
+        }
+        onDeviceModeChanged() {
+            setTimeout(() => {
+                try {
+                    if (!this.menuProps)
+                        return;
+                    this.menuProps = { ...this.menuProps, loadControl: this.getLoadControlProps() };
+                    this.updatePageDisplay();
+                }
+                catch (err) {
+                    this.logError(err, 'onDeviceModeChanged');
+                }
+            }, 0);
+        }
         getLastLogTime() {
             const logs = this.getActivityRide().getActivity()?.logs;
             if (!logs || logs.length === 0)
@@ -812,14 +862,18 @@ let RidePageService = (() => {
             }
         }
         buildPausedMenuProps() {
+            const loadControl = this.getLoadControlProps();
+            const showRideSettings = !this.isRideType('Workout');
             return this.isWorkoutAttached()
-                ? { showResume: true, ...this.getStepFlags() }
-                : { showResume: true };
+                ? { showResume: true, ...this.getStepFlags(), loadControl, showRideSettings }
+                : { showResume: true, loadControl, showRideSettings };
         }
         buildFinishedMenuProps() {
+            const loadControl = this.getLoadControlProps();
+            const showRideSettings = !this.isRideType('Workout');
             return this.isWorkoutAttached()
-                ? { showResume: false, finished: true, canStepBack: false, canStepForward: false }
-                : { showResume: false, finished: true };
+                ? { showResume: false, finished: true, canStepBack: false, canStepForward: false, loadControl, showRideSettings }
+                : { showResume: false, finished: true, loadControl, showRideSettings };
         }
         buildBaseDisplayProps() {
             const state = this.getRideDisplay().getState();
@@ -953,6 +1007,9 @@ let RidePageService = (() => {
         getOnlineStatusMonitoring() {
             return (0, monitoring_1.useOnlineStatusMonitoring)();
         }
+        getDeviceConfiguration() {
+            return (0, devices_1.useDeviceConfiguration)();
+        }
     };
     return RidePageService = _classThis;
 })();

package/lib/cjs/routes/list/service.js

@@ -609,6 +609,8 @@ let RouteListService = (() => {
         }
         getRouteDescription(id) {
             try {
+                if (!id)
+                    return undefined;
                 return this.getVisibleRoutes().find(r => r.description.id === id)?.description;
             }
             catch (err) {
@@ -617,6 +619,8 @@ let RouteListService = (() => {
         }
         getRoute(id) {
             try {
+                if (!id)
+                    return undefined;
                 return this.getVisibleRoutes().find(r => r.description.id === id);
             }
             catch (err) {

package/lib/cjs/workouts/ride/service.js

@@ -48,6 +48,10 @@ const list_1 = require("../list");
 const decorators_1 = require("../../base/decorators");
 const DEFAULT_FTP = 200;
 const WORKOUT_ZOOM = 1200;
+const STEP_COUNTDOWN_THRESHOLDS = [4, 3, 2, 1, 0];
+const hasValidDuration = (duration) => {
+    return typeof duration === 'number' && Number.isFinite(duration) && duration > 0;
+};
 let WorkoutRide = (() => {
     let _classDecorators = [types_1.Singleton];
     let _classDescriptor;
@@ -86,6 +90,8 @@ let WorkoutRide = (() => {
         tsCurrent;
         trainingTime;
         currentLimits;
+        countdownTimers = [];
+        firedCountdownThresholds = new Set();
         updateInterval;
         currentStep;
         isFreeRide;
@@ -136,6 +142,8 @@ let WorkoutRide = (() => {
                 this.logEvent({ message: 'workout started', settings: this.settings });
                 if (!this.updateInterval) {
                     this.update();
+                    this.resetCountdownProgress();
+                    this.rescheduleStepCountdown();
                     this.updateInterval = setInterval(() => { this.update(); }, 500);
                 }
                 if (paused)
@@ -155,6 +163,7 @@ let WorkoutRide = (() => {
                 this.tsPauseStart = ts;
                 this.tsCurrent = ts;
                 this.state = 'paused';
+                this.clearCountdownTimers();
                 this.emit('paused');
                 this.logger.logEvent({ message: 'workout paused' });
             }
@@ -178,6 +187,7 @@ let WorkoutRide = (() => {
                 this.tsPauseStart = undefined;
                 this.tsCurrent = ts;
                 this.state = 'active';
+                this.rescheduleStepCountdown();
                 this.logger.logEvent({ message: 'workout resumed', offset: this.offset });
                 this.emit('resumed');
             }
@@ -219,6 +229,8 @@ let WorkoutRide = (() => {
                 }
                 this.manualTimeOffset += limits.remaining;
                 this.update();
+                this.resetCountdownProgress();
+                this.rescheduleStepCountdown();
                 this.observer.emit('forward', ts, limits.remaining);
             }
             catch (err) {
@@ -258,6 +270,8 @@ let WorkoutRide = (() => {
                     }
                 }
                 this.update();
+                this.resetCountdownProgress();
+                this.rescheduleStepCountdown();
                 this.observer.emit('backward', ts, diff, jumpType, limits?.step, target);
             }
             catch (err) {
@@ -508,7 +522,46 @@ let WorkoutRide = (() => {
             else if (this.currentStep.power && !prevStep.power) {
                 this.stopFreeRide();
             }
+            if (!this.firedCountdownThresholds.has(0)) {
+                this.emit('step-countdown', { secondsRemaining: 0 });
+            }
             this.emit('step-changed', this.getDashboardDisplayProperties());
+            this.resetCountdownProgress();
+            this.rescheduleStepCountdown();
+        }
+        clearCountdownTimers() {
+            this.countdownTimers.forEach(t => clearTimeout(t));
+            this.countdownTimers = [];
+        }
+        resetCountdownProgress() {
+            this.firedCountdownThresholds = new Set();
+        }
+        rescheduleStepCountdown() {
+            this.clearCountdownTimers();
+            if (this.state !== 'active')
+                return;
+            const duration = this.currentLimits?.duration;
+            const remaining = this.currentLimits?.remaining;
+            const trainingTime = this.trainingTime;
+            if (!hasValidDuration(duration) || remaining === undefined || trainingTime === undefined)
+                return;
+            const stepEnd = trainingTime + remaining;
+            STEP_COUNTDOWN_THRESHOLDS.forEach(secondsRemaining => {
+                if (this.firedCountdownThresholds.has(secondsRemaining))
+                    return;
+                const targetTrainingTime = stepEnd - secondsRemaining;
+                if (targetTrainingTime < trainingTime)
+                    return;
+                const wallClockDeadline = this.tsStart + (this.offset ?? 0) + (targetTrainingTime - (this.manualTimeOffset ?? 0)) * 1000;
+                const delayMs = wallClockDeadline - Date.now();
+                if (delayMs < 0)
+                    return;
+                const timer = setTimeout(() => {
+                    this.firedCountdownThresholds.add(secondsRemaining);
+                    this.emit('step-countdown', { secondsRemaining });
+                }, delayMs);
+                this.countdownTimers.push(timer);
+            });
         }
         checkIfDone() {
             const time = (Date.now() - this.tsStart - (this.offset ?? 0)) / 1000 + (this.manualTimeOffset ?? 0);
@@ -691,6 +744,7 @@ let WorkoutRide = (() => {
                 clearInterval(this.updateInterval);
                 this.updateInterval = undefined;
             }
+            this.clearCountdownTimers();
         }
         getCyclingModeText() {
             const deviceRide = (0, devices_1.useDeviceRide)();

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

@@ -44,6 +44,7 @@ import { Injectable } from "../../../base/decorators/Injection";
 import { useUnitConverter } from "../../../i18n";
 export const DB_VERSION = '5';
 export const DB_NAME = 'db';
+const SHORT_RIDE_FILTER_CUTOFF = new Date('2026-08-28').getTime();
 let ActivitiesRepository = (() => {
     let _classDecorators = [Singleton];
     let _classDescriptor;
@@ -106,7 +107,7 @@ let ActivitiesRepository = (() => {
                 this.write();
             }
             if (writeDetails) {
-                this.writeDetails(activity);
+                await this.writeDetails(activity);
             }
         }
         migrate(activity, writeSummary = true) {
@@ -221,6 +222,16 @@ let ActivitiesRepository = (() => {
         }
         search(criteria) {
             let result = this.activities;
+            if (!this.isMobile()) {
+                result = result?.filter(ai => {
+                    const { rideTime, startTime } = ai.summary;
+                    if (rideTime < 1)
+                        return false;
+                    if (rideTime <= 30 && startTime < SHORT_RIDE_FILTER_CUTOFF)
+                        return false;
+                    return true;
+                });
+            }
             result = this.checkIdFilter(result, criteria);
             result = this.checkHashFilter(result, criteria);
             result = this.checkStartPosFilter(result, criteria);
@@ -472,7 +483,7 @@ let ActivitiesRepository = (() => {
         }
         async writeDetails(activity) {
             const name = activity.summary.name;
-            this.getRepo().write(name, activity.details);
+            await this.getRepo().write(name, activity.details);
         }
         async scanForNewActivities() {
             try {
@@ -506,6 +517,13 @@ let ActivitiesRepository = (() => {
         getRouteList() {
             return useRouteList();
         }
+        isMobile() {
+            const { appInfo } = this.getBindings();
+            if (!appInfo) {
+                return false;
+            }
+            return appInfo?.getChannel() === 'mobile';
+        }
         getBindings() {
             return getBindings();
         }

package/lib/esm/activities/base/utils/activity.js

@@ -251,7 +251,7 @@ let Activity = (() => {
         isRouteAvailable() {
             if (!this.details?.route)
                 return false;
-            if (this.details.routeType === 'Free-Ride')
+            if (this.details.routeType === 'Free-Ride' || this.details.routeType === 'None')
                 return false;
             return this.getRouteList().getRouteDescription(this.details.route.id) !== undefined;
         }
@@ -274,7 +274,7 @@ let Activity = (() => {
         canStart() {
             if (!this.details?.route)
                 return false;
-            if (this.details.routeType === 'Free-Ride')
+            if (this.details.routeType === 'Free-Ride' || this.details.routeType === 'None')
                 return false;
             if (this.details.routeType === 'Video') {
                 const isOnline = this.getOnlineMonitoring().onlineStatus;

package/lib/esm/activities/ride/service.js

@@ -192,7 +192,7 @@ let ActivityRideService = (() => {
             this.disableDeviceHealthCheck();
             this.state = 'completed';
             this.updateActivityTime();
-            this._save();
+            await this._save();
             this.emit('completed');
             this.tsPauseStart = undefined;
             delete this.tsStart;
@@ -530,7 +530,7 @@ let ActivityRideService = (() => {
             if (this.state !== 'completed') {
                 await this.stop();
             }
-            this.getRepo().delete(this.activity.id);
+            await this.getRepo().delete(this.activity.id);
             this.state = 'idle';
         }
         save() {
@@ -546,7 +546,7 @@ let ActivityRideService = (() => {
                 let success = false;
                 try {
                     emit('start', success);
-                    await this._save();
+                    this._save();
                     success = await this._convertAndUpload();
                     sleep(0).then(() => {
                         delete this.saveObserver;
@@ -959,7 +959,7 @@ let ActivityRideService = (() => {
                     await fs.writeFile(fileName, Buffer.from(data));
                     this.activity.tcxFileName = fileName;
                 }
-                await this._save();
+                this._save();
                 emit('save.done', format, true);
                 return true;
             }

package/lib/esm/devices/ride/cyclingMode.js

@@ -18,8 +18,11 @@ export function isVirtualShiftingEnabled(mode) {
 export function getLoadButtonMode(mode) {
     if (!mode)
         return 'power';
-    if (mode.isSIM() || mode.isResistance()) {
-        return isVirtualShiftingEnabled(mode) ? 'gear' : 'hidden';
-    }
-    return 'power';
+    if (mode.isERG())
+        return 'power';
+    if (mode.isSIM() && isVirtualShiftingEnabled(mode))
+        return 'gear';
+    if (mode.isResistance())
+        return 'gear';
+    return 'hidden';
 }

package/lib/esm/ride/page/service.js

@@ -36,6 +36,7 @@ import { EventLogger } from "gd-eventlog";
 import { Injectable, Singleton } from "../../base/decorators";
 import { IncyclistPageService } from "../../base/pages";
 import { useRideDisplay } from "../display";
+import { useDeviceConfiguration } from "../../devices";
 import { sleep } from "../../utils/sleep";
 import { useOnlineStatusMonitoring } from "../../monitoring";
 import { useActivityRide } from "../../activities";
@@ -61,6 +62,7 @@ let RidePageService = (() => {
     let _getActivityRide_decorators;
     let _getUserSettings_decorators;
     let _getOnlineStatusMonitoring_decorators;
+    let _getDeviceConfiguration_decorators;
     var RidePageService = class extends _classSuper {
         static { _classThis = this; }
         static {
@@ -70,11 +72,13 @@ let RidePageService = (() => {
             _getActivityRide_decorators = [Injectable];
             _getUserSettings_decorators = [Injectable];
             _getOnlineStatusMonitoring_decorators = [Injectable];
+            _getDeviceConfiguration_decorators = [Injectable];
             __esDecorate(this, null, _getRideDisplay_decorators, { kind: "method", name: "getRideDisplay", static: false, private: false, access: { has: obj => "getRideDisplay" in obj, get: obj => obj.getRideDisplay }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getWorkoutRide_decorators, { kind: "method", name: "getWorkoutRide", static: false, private: false, access: { has: obj => "getWorkoutRide" in obj, get: obj => obj.getWorkoutRide }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getActivityRide_decorators, { kind: "method", name: "getActivityRide", static: false, private: false, access: { has: obj => "getActivityRide" in obj, get: obj => obj.getActivityRide }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getOnlineStatusMonitoring_decorators, { kind: "method", name: "getOnlineStatusMonitoring", static: false, private: false, access: { has: obj => "getOnlineStatusMonitoring" in obj, get: obj => obj.getOnlineStatusMonitoring }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getDeviceConfiguration_decorators, { kind: "method", name: "getDeviceConfiguration", static: false, private: false, access: { has: obj => "getDeviceConfiguration" in obj, get: obj => obj.getDeviceConfiguration }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             RidePageService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -89,6 +93,7 @@ let RidePageService = (() => {
         menuProps = null;
         isInitialized = false;
         startGateProps = null;
+        onDeviceModeChangedBound = this.onDeviceModeChanged.bind(this);
         prevRidesVisibleRows = DEFAULT_PREV_RIDES_VISIBLE_ROWS;
         prevRidesMode = 'list';
         gestureHintDismissed = false;
@@ -100,7 +105,8 @@ let RidePageService = (() => {
             this.eventHandler['route-update'] = this.onRouteUpdate.bind(this);
             this.eventHandler['view-changed'] = this.onViewChanged.bind(this);
             this.eventHandler['prev-rides-update'] = this.onPrevRidesTick.bind(this);
-            this.workoutEventHandler['step-changed'] = this.onWorkoutUpdate.bind(this);
+            this.workoutEventHandler['step-changed'] = this.onWorkoutStepChanged.bind(this);
+            this.workoutEventHandler['step-countdown'] = this.onWorkoutStepCountdown.bind(this);
             this.workoutEventHandler['update'] = this.onWorkoutUpdate.bind(this);
             this.workoutEventHandler['forward'] = this.onWorkoutUpdate.bind(this);
             this.workoutEventHandler['backward'] = this.onWorkoutUpdate.bind(this);
@@ -139,6 +145,7 @@ let RidePageService = (() => {
                     const registerAndStart = () => {
                         this.registerHandlers(this.rideObserver, this.eventHandler);
                         this.subscribeToWorkoutObserver();
+                        this.getDeviceConfiguration().on('mode-changed', this.onDeviceModeChangedBound);
                         const state = service.getState();
                         if (state === 'Started' || state === 'Active' || state === 'Paused') {
                             this.logError(new Error(`start() requested while ride is ${state}`), 'openPage');
@@ -183,6 +190,7 @@ let RidePageService = (() => {
                 this.getRideDisplay().stop();
                 this.unregisterHandlers(this.rideObserver, this.eventHandler);
                 this.unsubscribeFromWorkoutObserver();
+                this.getDeviceConfiguration().off('mode-changed', this.onDeviceModeChangedBound);
                 this.menuProps = null;
                 this.isInitialized = false;
                 super.closePage();
@@ -274,9 +282,11 @@ let RidePageService = (() => {
         onMenuOpen() {
             try {
                 const state = this.getRideDisplay().getState();
+                const loadControl = this.getLoadControlProps();
+                const showRideSettings = !this.isRideType('Workout');
                 this.menuProps = this.isWorkoutAttached()
-                    ? { showResume: state === 'Paused', ...this.getStepFlags() }
-                    : { showResume: state === 'Paused' };
+                    ? { showResume: state === 'Paused', ...this.getStepFlags(), loadControl, showRideSettings }
+                    : { showResume: state === 'Paused', loadControl, showRideSettings };
                 this.updatePageDisplay();
             }
             catch (err) {
@@ -393,7 +403,7 @@ let RidePageService = (() => {
                 const available = this.getCornerWidgetStates();
                 if (available.length <= 1)
                     return undefined;
-                const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
+                const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'workout');
                 return available.includes(current) ? current : available[0];
             }
             catch (err) {
@@ -410,7 +420,7 @@ let RidePageService = (() => {
         onToggleCornerWidget() {
             try {
                 const available = this.getCornerWidgetStates();
-                const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
+                const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'workout');
                 const next = available[(available.indexOf(current) + 1) % available.length];
                 this.getUserSettings().set(CORNER_WIDGET_SETTING_KEY, next);
                 this.updatePageDisplay();
@@ -579,8 +589,7 @@ let RidePageService = (() => {
                 const plainErgAdjustment = !this.getWorkoutRide().inUse() && this.getLoadButtonMode() === 'power';
                 if (plainErgAdjustment) {
                     const sign = deltaPct >= 0 ? 1 : -1;
-                    const nominal = Math.abs(deltaPct) === 1 ? 5 : 50;
-                    return this.getRideDisplay().adjustDevicePower(sign * nominal);
+                    return this.getRideDisplay().adjustDevicePower(sign * this.getNominalErgWatts(deltaPct));
                 }
                 return deltaPct >= 0
                     ? this.getWorkoutRide().powerUp(deltaPct)
@@ -628,6 +637,13 @@ let RidePageService = (() => {
         onWorkoutUpdate() {
             this.updatePageDisplay();
         }
+        onWorkoutStepChanged(update) {
+            this.onWorkoutUpdate();
+            this.getPageObserver()?.emit('step-changed', update);
+        }
+        onWorkoutStepCountdown(tick) {
+            this.getPageObserver()?.emit('step-countdown', tick);
+        }
         onWorkoutFinished() {
             try {
                 if (this.isRideType('Workout'))
@@ -753,6 +769,40 @@ let RidePageService = (() => {
             const wo = this.getWorkoutRide().getDashboardDisplayProperties();
             return { canStepBack: !!wo.canShowBackward, canStepForward: !!wo.canShowForward };
         }
+        getLoadControlProps() {
+            const mode = this.getLoadButtonMode();
+            if (mode === 'hidden')
+                return { visible: false };
+            if (mode === 'gear')
+                return { visible: true, label: 'Gear', buttons: { inc1: '+1', dec1: '-1', inc5: '+5', dec5: '-5' } };
+            if (this.isWorkoutAttached()) {
+                const buttons = this.getWorkoutRide().getDashboardDisplayProperties().loadButtons;
+                return { visible: true, label: 'Load', buttons };
+            }
+            const small = this.getNominalErgWatts(1);
+            const big = this.getNominalErgWatts(5);
+            return {
+                visible: true,
+                label: 'Load',
+                buttons: { inc1: `+${small}W`, dec1: `-${small}W`, inc5: `+${big}W`, dec5: `-${big}W` }
+            };
+        }
+        getNominalErgWatts(magnitude) {
+            return Math.abs(magnitude) === 1 ? 5 : 50;
+        }
+        onDeviceModeChanged() {
+            setTimeout(() => {
+                try {
+                    if (!this.menuProps)
+                        return;
+                    this.menuProps = { ...this.menuProps, loadControl: this.getLoadControlProps() };
+                    this.updatePageDisplay();
+                }
+                catch (err) {
+                    this.logError(err, 'onDeviceModeChanged');
+                }
+            }, 0);
+        }
         getLastLogTime() {
             const logs = this.getActivityRide().getActivity()?.logs;
             if (!logs || logs.length === 0)
@@ -809,14 +859,18 @@ let RidePageService = (() => {
             }
         }
         buildPausedMenuProps() {
+            const loadControl = this.getLoadControlProps();
+            const showRideSettings = !this.isRideType('Workout');
             return this.isWorkoutAttached()
-                ? { showResume: true, ...this.getStepFlags() }
-                : { showResume: true };
+                ? { showResume: true, ...this.getStepFlags(), loadControl, showRideSettings }
+                : { showResume: true, loadControl, showRideSettings };
         }
         buildFinishedMenuProps() {
+            const loadControl = this.getLoadControlProps();
+            const showRideSettings = !this.isRideType('Workout');
             return this.isWorkoutAttached()
-                ? { showResume: false, finished: true, canStepBack: false, canStepForward: false }
-                : { showResume: false, finished: true };
+                ? { showResume: false, finished: true, canStepBack: false, canStepForward: false, loadControl, showRideSettings }
+                : { showResume: false, finished: true, loadControl, showRideSettings };
         }
         buildBaseDisplayProps() {
             const state = this.getRideDisplay().getState();
@@ -950,6 +1004,9 @@ let RidePageService = (() => {
         getOnlineStatusMonitoring() {
             return useOnlineStatusMonitoring();
         }
+        getDeviceConfiguration() {
+            return useDeviceConfiguration();
+        }
     };
     return RidePageService = _classThis;
 })();

package/lib/esm/routes/list/service.js

@@ -603,6 +603,8 @@ let RouteListService = (() => {
         }
         getRouteDescription(id) {
             try {
+                if (!id)
+                    return undefined;
                 return this.getVisibleRoutes().find(r => r.description.id === id)?.description;
             }
             catch (err) {
@@ -611,6 +613,8 @@ let RouteListService = (() => {
         }
         getRoute(id) {
             try {
+                if (!id)
+                    return undefined;
                 return this.getVisibleRoutes().find(r => r.description.id === id);
             }
             catch (err) {

package/lib/esm/workouts/ride/service.js

@@ -45,6 +45,10 @@ import { useWorkoutList } from "../list";
 import { Injectable } from "../../base/decorators";
 const DEFAULT_FTP = 200;
 const WORKOUT_ZOOM = 1200;
+const STEP_COUNTDOWN_THRESHOLDS = [4, 3, 2, 1, 0];
+const hasValidDuration = (duration) => {
+    return typeof duration === 'number' && Number.isFinite(duration) && duration > 0;
+};
 let WorkoutRide = (() => {
     let _classDecorators = [Singleton];
     let _classDescriptor;
@@ -83,6 +87,8 @@ let WorkoutRide = (() => {
         tsCurrent;
         trainingTime;
         currentLimits;
+        countdownTimers = [];
+        firedCountdownThresholds = new Set();
         updateInterval;
         currentStep;
         isFreeRide;
@@ -133,6 +139,8 @@ let WorkoutRide = (() => {
                 this.logEvent({ message: 'workout started', settings: this.settings });
                 if (!this.updateInterval) {
                     this.update();
+                    this.resetCountdownProgress();
+                    this.rescheduleStepCountdown();
                     this.updateInterval = setInterval(() => { this.update(); }, 500);
                 }
                 if (paused)
@@ -152,6 +160,7 @@ let WorkoutRide = (() => {
                 this.tsPauseStart = ts;
                 this.tsCurrent = ts;
                 this.state = 'paused';
+                this.clearCountdownTimers();
                 this.emit('paused');
                 this.logger.logEvent({ message: 'workout paused' });
             }
@@ -175,6 +184,7 @@ let WorkoutRide = (() => {
                 this.tsPauseStart = undefined;
                 this.tsCurrent = ts;
                 this.state = 'active';
+                this.rescheduleStepCountdown();
                 this.logger.logEvent({ message: 'workout resumed', offset: this.offset });
                 this.emit('resumed');
             }
@@ -216,6 +226,8 @@ let WorkoutRide = (() => {
                 }
                 this.manualTimeOffset += limits.remaining;
                 this.update();
+                this.resetCountdownProgress();
+                this.rescheduleStepCountdown();
                 this.observer.emit('forward', ts, limits.remaining);
             }
             catch (err) {
@@ -255,6 +267,8 @@ let WorkoutRide = (() => {
                     }
                 }
                 this.update();
+                this.resetCountdownProgress();
+                this.rescheduleStepCountdown();
                 this.observer.emit('backward', ts, diff, jumpType, limits?.step, target);
             }
             catch (err) {
@@ -505,7 +519,46 @@ let WorkoutRide = (() => {
             else if (this.currentStep.power && !prevStep.power) {
                 this.stopFreeRide();
             }
+            if (!this.firedCountdownThresholds.has(0)) {
+                this.emit('step-countdown', { secondsRemaining: 0 });
+            }
             this.emit('step-changed', this.getDashboardDisplayProperties());
+            this.resetCountdownProgress();
+            this.rescheduleStepCountdown();
+        }
+        clearCountdownTimers() {
+            this.countdownTimers.forEach(t => clearTimeout(t));
+            this.countdownTimers = [];
+        }
+        resetCountdownProgress() {
+            this.firedCountdownThresholds = new Set();
+        }
+        rescheduleStepCountdown() {
+            this.clearCountdownTimers();
+            if (this.state !== 'active')
+                return;
+            const duration = this.currentLimits?.duration;
+            const remaining = this.currentLimits?.remaining;
+            const trainingTime = this.trainingTime;
+            if (!hasValidDuration(duration) || remaining === undefined || trainingTime === undefined)
+                return;
+            const stepEnd = trainingTime + remaining;
+            STEP_COUNTDOWN_THRESHOLDS.forEach(secondsRemaining => {
+                if (this.firedCountdownThresholds.has(secondsRemaining))
+                    return;
+                const targetTrainingTime = stepEnd - secondsRemaining;
+                if (targetTrainingTime < trainingTime)
+                    return;
+                const wallClockDeadline = this.tsStart + (this.offset ?? 0) + (targetTrainingTime - (this.manualTimeOffset ?? 0)) * 1000;
+                const delayMs = wallClockDeadline - Date.now();
+                if (delayMs < 0)
+                    return;
+                const timer = setTimeout(() => {
+                    this.firedCountdownThresholds.add(secondsRemaining);
+                    this.emit('step-countdown', { secondsRemaining });
+                }, delayMs);
+                this.countdownTimers.push(timer);
+            });
         }
         checkIfDone() {
             const time = (Date.now() - this.tsStart - (this.offset ?? 0)) / 1000 + (this.manualTimeOffset ?? 0);
@@ -688,6 +741,7 @@ let WorkoutRide = (() => {
                 clearInterval(this.updateInterval);
                 this.updateInterval = undefined;
             }
+            this.clearCountdownTimers();
         }
         getCyclingModeText() {
             const deviceRide = useDeviceRide();

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

@@ -55,6 +55,7 @@ export declare class ActivitiesRepository {
     protected logError(err: Error, fn: string, logProps?: any): void;
     protected getRepo(): JsonRepository;
     protected getRouteList(): import("../../../routes").RouteListService;
+    protected isMobile(): boolean;
     protected getBindings(): import("../../../api").IncyclistBindings;
     protected getUnitConverter(): import("../../../i18n").UnitConverterService;
 }

package/lib/types/ride/page/service.d.ts

@@ -1,9 +1,9 @@
 import { IncyclistPageService } from "../../base/pages";
 import { CurrentRideDisplayProps, CurrentRideState, IObserver, RideType } from "../../types";
-import { AnyRidePageDisplayProps, GPXRidePageDisplayProps, IRidePageService, PrevRidesRowProps, RideMenuProps, RidePageDisplayProps, StartGateProps, VideoRidePageDisplayProps, WorkoutDashboardLine, WorkoutGestureHint, WorkoutGraphActuals, WorkoutGraphPlan, WorkoutRideMenuProps, WorkoutRidePageDisplayProps, WorkoutUpcomingSteps } from "./types";
+import { AnyRidePageDisplayProps, GPXRidePageDisplayProps, IRidePageService, PrevRidesRowProps, LoadControlButtonLabels, RideMenuProps, RidePageDisplayProps, StartGateProps, VideoRidePageDisplayProps, WorkoutDashboardLine, WorkoutGestureHint, WorkoutGraphActuals, WorkoutGraphPlan, WorkoutRideMenuProps, WorkoutRidePageDisplayProps, WorkoutUpcomingSteps } from "./types";
 import { ISecretBinding } from "../../api/secret";
 import { PrevRidesListDisplayProps } from "../../activities";
-import type { LoadButtonMode, PowerAdjustmentResult, WorkoutDisplayProperties } from "../../workouts/ride/types";
+import type { LoadButtonMode, PowerAdjustmentResult, StepCountdownTick, WorkoutDisplayProperties } from "../../workouts/ride/types";
 import type { Workout } from "../../workouts/base/model";
 import type { StepDefinition } from "../../workouts/base/model/types";
 export declare class RidePageService extends IncyclistPageService implements IRidePageService {
@@ -16,6 +16,7 @@ export declare class RidePageService extends IncyclistPageService implements IRi
     protected menuProps: RideMenuProps | null;
     protected isInitialized: boolean;
     protected startGateProps: StartGateProps | null;
+    protected onDeviceModeChangedBound: any;
     protected prevRidesVisibleRows: number;
     protected prevRidesMode: 'condensed' | 'list';
     protected gestureHintDismissed: boolean;
@@ -74,6 +75,8 @@ export declare class RidePageService extends IncyclistPageService implements IRi
     getLoadButtonMode(): LoadButtonMode;
     protected getWorkoutRideDisplayProps(): WorkoutRidePageDisplayProps;
     protected onWorkoutUpdate(): void;
+    protected onWorkoutStepChanged(update?: WorkoutDisplayProperties): void;
+    protected onWorkoutStepCountdown(tick?: StepCountdownTick): void;
     protected onWorkoutFinished(): void;
     protected finishRide(): void;
     protected subscribeToWorkoutObserver(): void;
@@ -89,6 +92,13 @@ export declare class RidePageService extends IncyclistPageService implements IRi
         canStepBack: boolean;
         canStepForward: boolean;
     };
+    protected getLoadControlProps(): {
+        visible: boolean;
+        label?: 'Load' | 'Gear';
+        buttons?: LoadControlButtonLabels;
+    };
+    protected getNominalErgWatts(magnitude: number): number;
+    protected onDeviceModeChanged(): void;
     protected getLastLogTime(): number;
     protected getElapsedActivityTime(): number;
     protected getEmptyWorkoutDisplayProps(): WorkoutRidePageDisplayProps;
@@ -129,5 +139,6 @@ export declare class RidePageService extends IncyclistPageService implements IRi
     protected getActivityRide(): import("../../activities").ActivityRideService;
     protected getUserSettings(): import("../../settings").UserSettingsService;
     protected getOnlineStatusMonitoring(): import("../../monitoring").OnlineStateMonitoringService;
+    protected getDeviceConfiguration(): import("../../devices").DeviceConfigurationService;
 }
 export declare const getRidePageService: () => IRidePageService;

package/lib/types/ride/page/types.d.ts

@@ -9,11 +9,23 @@ export interface StartGateProps {
     title: string;
     body: string;
 }
+export interface LoadControlButtonLabels {
+    inc1: string;
+    dec1: string;
+    inc5: string;
+    dec5: string;
+}
 export interface RideMenuProps {
     showResume?: boolean;
     finished?: boolean;
     canStepBack?: boolean;
     canStepForward?: boolean;
+    loadControl?: {
+        visible: boolean;
+        label?: 'Load' | 'Gear';
+        buttons?: LoadControlButtonLabels;
+    };
+    showRideSettings?: boolean;
 }
 export interface RidePageDisplayProps {
     rideState: CurrentRideState;
@@ -139,6 +151,12 @@ export interface WorkoutDashboardLine {
 export type WorkoutRideMenuProps = RideMenuProps & {
     canStepBack: boolean;
     canStepForward: boolean;
+    loadControl: {
+        visible: boolean;
+        label?: 'Load' | 'Gear';
+        buttons?: LoadControlButtonLabels;
+    };
+    showRideSettings: boolean;
 };
 export interface WorkoutGestureHint {
     visible: boolean;

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

@@ -20,6 +20,8 @@ export declare class WorkoutRide extends IncyclistService {
     protected tsCurrent: number;
     protected trainingTime: number;
     protected currentLimits: ActiveWorkoutLimit;
+    private countdownTimers;
+    private firedCountdownThresholds;
     protected updateInterval: NodeJS.Timeout;
     protected currentStep: StepDefinition;
     protected isFreeRide: boolean;
@@ -56,6 +58,9 @@ export declare class WorkoutRide extends IncyclistService {
     getObserver(): Observer;
     protected update(startIfInitialized?: boolean): void;
     private onStepChange;
+    private clearCountdownTimers;
+    private resetCountdownProgress;
+    private rescheduleStepCountdown;
     private checkIfDone;
     protected startFreeRide(): Promise<void>;
     protected stopFreeRide(): Promise<void>;

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

@@ -39,3 +39,6 @@ export interface WorkoutDisplayProperties {
         dec5: string;
     };
 }
+export interface StepCountdownTick {
+    secondsRemaining: 4 | 3 | 2 | 1 | 0;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.118",
+  "version": "1.7.120",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },