incyclist-services 1.7.118 → 1.7.119

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

@@ -103,7 +103,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);
@@ -631,6 +632,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'))

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/ride/page/service.js

@@ -100,7 +100,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);
@@ -628,6 +629,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'))

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/ride/page/service.d.ts

@@ -3,7 +3,7 @@ import { CurrentRideDisplayProps, CurrentRideState, IObserver, RideType } from "
 import { AnyRidePageDisplayProps, GPXRidePageDisplayProps, IRidePageService, PrevRidesRowProps, 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 {
@@ -74,6 +74,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;

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.119",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },