incyclist-services 1.7.81 → 1.7.82

package/lib/cjs/routes/list/cards/RouteCard.js

@@ -389,6 +389,13 @@ let RouteCard = (() => {
                         showNextOverwrite = false;
                     }
                 }
+                if (showNextOverwrite) {
+                    const nextVideoEnabled = this.isMobile() ? this.getAppState().hasFeature('MOBILE_NEXT_VIDEO') : true;
+                    if (!nextVideoEnabled) {
+                        showNextOverwrite = false;
+                        uiSettings.nextOverwrite = true;
+                    }
+                }
             }
             catch (err) {
                 this.logError(err, 'openSettings');
@@ -540,6 +547,7 @@ let RouteCard = (() => {
         start() {
             try {
                 const service = (0, service_1.getRouteList)();
+                this.enforceNextVideoOverrideOnMobile();
                 service.select(this.route);
                 service.setStartSettings({ type: this.getCardType(), ...this.startSettings });
                 this.route.description.tsLastStart = Date.now();
@@ -556,6 +564,7 @@ let RouteCard = (() => {
         addWorkout() {
             try {
                 const service = (0, service_1.getRouteList)();
+                this.enforceNextVideoOverrideOnMobile();
                 service.select(this.route);
                 service.setStartSettings({ type: this.getCardType(), ...this.startSettings });
                 this.route.description.tsLastStart = Date.now();
@@ -565,6 +574,21 @@ let RouteCard = (() => {
                 this.logError(err, 'addWorkout');
             }
         }
+        enforceNextVideoOverrideOnMobile() {
+            try {
+                if (!this.isMobile())
+                    return;
+                if (!this.startSettings || !(0, route_1.hasNextVideo)(this.route))
+                    return;
+                const nextVideoEnabled = this.getAppState().hasFeature('MOBILE_NEXT_VIDEO');
+                if (!nextVideoEnabled) {
+                    this.startSettings.nextOverwrite = true;
+                }
+            }
+            catch (err) {
+                this.logError(err, 'enforceNextVideoOverrideOnMobile');
+            }
+        }
         getCurrentDownload() {
             return this.downloadObserver;
         }

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

@@ -145,6 +145,10 @@ let WorkoutListService = (() => {
         }
         close() {
             this.getWorkoutCalendar().setActive(false);
+            this.logEvent({ message: 'close workout list' });
+            this.emit('closed', this.observer);
+            this.observer?.emit('stopped');
+            this.observer?.reset();
         }
         openSettings() {
             let workouts;

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

@@ -43,6 +43,7 @@ const observer_1 = require("../../base/types/observer");
 const settings_1 = require("../../settings");
 const calendar_1 = require("../calendar");
 const service_1 = require("../list/service");
+const devices_1 = require("../../devices");
 const DEFAULT_IMPORT_GROUP = 'My Workouts';
 const UPCOMING_COLLAPSED_COUNT = 3;
 let WorkoutListPageService = (() => {
@@ -52,6 +53,7 @@ let WorkoutListPageService = (() => {
     let _classThis;
     let _classSuper = pages_1.IncyclistPageService;
     let _instanceExtraInitializers = [];
+    let _getDevicePairing_decorators;
     let _getWorkoutList_decorators;
     let _getWorkoutCalendar_decorators;
     let _getUserSettings_decorators;
@@ -60,10 +62,12 @@ let WorkoutListPageService = (() => {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getDevicePairing_decorators = [decorators_1.Injectable];
             _getWorkoutList_decorators = [decorators_1.Injectable];
             _getWorkoutCalendar_decorators = [decorators_1.Injectable];
             _getUserSettings_decorators = [decorators_1.Injectable];
             _getAppState_decorators = [decorators_1.Injectable];
+            __esDecorate(this, null, _getDevicePairing_decorators, { kind: "method", name: "getDevicePairing", static: false, private: false, access: { has: obj => "getDevicePairing" in obj, get: obj => obj.getDevicePairing }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getWorkoutList_decorators, { kind: "method", name: "getWorkoutList", static: false, private: false, access: { has: obj => "getWorkoutList" in obj, get: obj => obj.getWorkoutList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getWorkoutCalendar_decorators, { kind: "method", name: "getWorkoutCalendar", static: false, private: false, access: { has: obj => "getWorkoutCalendar" in obj, get: obj => obj.getWorkoutCalendar }, 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);
@@ -264,9 +268,15 @@ let WorkoutListPageService = (() => {
                 const card = this.findWorkoutCard(id);
                 if (!card)
                     return;
-                const settings = this.getWorkoutList().getStartSettings();
+                const service = this.getWorkoutList();
+                const pairing = this.getDevicePairing();
+                const settings = service.getStartSettings() ?? {};
                 card.select({ ...settings, noRoute: opts?.noRoute });
-                this.getPageObserver()?.emit('start-ride', { id, noRoute: opts?.noRoute });
+                this.logEvent({ message: 'Attempting to start a ride', id, ...settings, noRoute: opts?.noRoute, readyToStart: pairing.isReadyToStart(), });
+                this.detailWorkoutId = null;
+                service.close();
+                const next = pairing.isReadyToStart() ? '/rideDeviceOK' : '/pairingStart';
+                this.moveTo(next);
             }
             catch (err) {
                 this.logError(err, 'onStart');
@@ -455,6 +465,9 @@ let WorkoutListPageService = (() => {
                 this.logError(err, 'emitImportUpdate');
             }
         }
+        getDevicePairing() {
+            return (0, devices_1.useDevicePairing)();
+        }
         getWorkoutList() {
             return (0, service_1.useWorkoutList)();
         }

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

@@ -77,7 +77,6 @@ let WorkoutRidePageService = (() => {
         backgroundTimer;
         backgroundPausedByService = false;
         menuProps = null;
-        isInitialized = false;
         constructor() {
             super('WorkoutRidePage');
             this.rideEventHandler['state-update'] = this.onRideStateUpdate.bind(this);
@@ -95,10 +94,6 @@ let WorkoutRidePageService = (() => {
                 super.openPage();
                 try {
                     const service = this.getRideDisplay();
-                    if (!this.isInitialized) {
-                        service.init();
-                        this.isInitialized = true;
-                    }
                     this.registerRideEventHandlers();
                     this.subscribeToWorkoutObserver();
                     service.start(simulate);
@@ -120,7 +115,6 @@ let WorkoutRidePageService = (() => {
                 this.unregisterRideEventHandlers();
                 this.unsubscribeFromWorkoutObserver();
                 this.menuProps = null;
-                this.isInitialized = false;
                 super.closePage();
             }
             catch (err) {
@@ -314,19 +308,15 @@ let WorkoutRidePageService = (() => {
             switch (state) {
                 case 'Paused':
                     this.menuProps = { showResume: true, ...this.getStepFlags() };
-                    this.updatePageDisplay();
                     break;
                 case 'Active':
                     this.menuProps = null;
-                    this.updatePageDisplay();
                     break;
                 case 'Finished':
                     this.emitNavigateBack();
-                    break;
-                case 'Error':
-                    this.updatePageDisplay();
-                    break;
+                    return;
             }
+            this.updatePageDisplay();
         }
         onWorkoutUpdate() {
             this.updatePageDisplay();
@@ -373,7 +363,8 @@ let WorkoutRidePageService = (() => {
             }
             const bars = (0, graph_1.getWorkoutGraphSeries)(current, { ftp, absValues: true });
             const lastBarX = bars.length ? bars.at(-1).x : 0;
-            const maxX = Math.max(this.getLastLogTime(), lastBarX, current.duration ?? 0);
+            const maxXCandidates = [this.getLastLogTime(), lastBarX, current.duration ?? 0].filter(Number.isFinite);
+            const maxX = maxXCandidates.length ? Math.max(...maxXCandidates) : 0;
             const maxBarPower = bars.length ? Math.max(...bars.map(b => b.y)) : 0;
             return {
                 bars,

package/lib/esm/routes/list/cards/RouteCard.js

@@ -43,7 +43,7 @@ import { valid } from "../../../utils/valid";
 import { waitNextTick } from "../../../utils";
 import { useRouteDownload } from "../../download/service";
 import { EventLogger } from "gd-eventlog";
-import { checkIsLoop, getNextVideoId, getPosition, updateSlopes } from "../../base/utils/route";
+import { checkIsLoop, getNextVideoId, hasNextVideo, getPosition, updateSlopes } from "../../base/utils/route";
 import { getWorkoutList } from "../../../workouts";
 import { checkIsNew } from "../utils";
 import { useOnlineStatusMonitoring } from "../../../monitoring";
@@ -386,6 +386,13 @@ let RouteCard = (() => {
                         showNextOverwrite = false;
                     }
                 }
+                if (showNextOverwrite) {
+                    const nextVideoEnabled = this.isMobile() ? this.getAppState().hasFeature('MOBILE_NEXT_VIDEO') : true;
+                    if (!nextVideoEnabled) {
+                        showNextOverwrite = false;
+                        uiSettings.nextOverwrite = true;
+                    }
+                }
             }
             catch (err) {
                 this.logError(err, 'openSettings');
@@ -537,6 +544,7 @@ let RouteCard = (() => {
         start() {
             try {
                 const service = getRouteList();
+                this.enforceNextVideoOverrideOnMobile();
                 service.select(this.route);
                 service.setStartSettings({ type: this.getCardType(), ...this.startSettings });
                 this.route.description.tsLastStart = Date.now();
@@ -553,6 +561,7 @@ let RouteCard = (() => {
         addWorkout() {
             try {
                 const service = getRouteList();
+                this.enforceNextVideoOverrideOnMobile();
                 service.select(this.route);
                 service.setStartSettings({ type: this.getCardType(), ...this.startSettings });
                 this.route.description.tsLastStart = Date.now();
@@ -562,6 +571,21 @@ let RouteCard = (() => {
                 this.logError(err, 'addWorkout');
             }
         }
+        enforceNextVideoOverrideOnMobile() {
+            try {
+                if (!this.isMobile())
+                    return;
+                if (!this.startSettings || !hasNextVideo(this.route))
+                    return;
+                const nextVideoEnabled = this.getAppState().hasFeature('MOBILE_NEXT_VIDEO');
+                if (!nextVideoEnabled) {
+                    this.startSettings.nextOverwrite = true;
+                }
+            }
+            catch (err) {
+                this.logError(err, 'enforceNextVideoOverrideOnMobile');
+            }
+        }
         getCurrentDownload() {
             return this.downloadObserver;
         }

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

@@ -142,6 +142,10 @@ let WorkoutListService = (() => {
         }
         close() {
             this.getWorkoutCalendar().setActive(false);
+            this.logEvent({ message: 'close workout list' });
+            this.emit('closed', this.observer);
+            this.observer?.emit('stopped');
+            this.observer?.reset();
         }
         openSettings() {
             let workouts;

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

@@ -40,6 +40,7 @@ import { Observer } from "../../base/types/observer";
 import { useUserSettings } from "../../settings";
 import { useWorkoutCalendar } from "../calendar";
 import { useWorkoutList } from "../list/service";
+import { useDevicePairing } from "../../devices";
 const DEFAULT_IMPORT_GROUP = 'My Workouts';
 const UPCOMING_COLLAPSED_COUNT = 3;
 let WorkoutListPageService = (() => {
@@ -49,6 +50,7 @@ let WorkoutListPageService = (() => {
     let _classThis;
     let _classSuper = IncyclistPageService;
     let _instanceExtraInitializers = [];
+    let _getDevicePairing_decorators;
     let _getWorkoutList_decorators;
     let _getWorkoutCalendar_decorators;
     let _getUserSettings_decorators;
@@ -57,10 +59,12 @@ let WorkoutListPageService = (() => {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getDevicePairing_decorators = [Injectable];
             _getWorkoutList_decorators = [Injectable];
             _getWorkoutCalendar_decorators = [Injectable];
             _getUserSettings_decorators = [Injectable];
             _getAppState_decorators = [Injectable];
+            __esDecorate(this, null, _getDevicePairing_decorators, { kind: "method", name: "getDevicePairing", static: false, private: false, access: { has: obj => "getDevicePairing" in obj, get: obj => obj.getDevicePairing }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getWorkoutList_decorators, { kind: "method", name: "getWorkoutList", static: false, private: false, access: { has: obj => "getWorkoutList" in obj, get: obj => obj.getWorkoutList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getWorkoutCalendar_decorators, { kind: "method", name: "getWorkoutCalendar", static: false, private: false, access: { has: obj => "getWorkoutCalendar" in obj, get: obj => obj.getWorkoutCalendar }, 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);
@@ -261,9 +265,15 @@ let WorkoutListPageService = (() => {
                 const card = this.findWorkoutCard(id);
                 if (!card)
                     return;
-                const settings = this.getWorkoutList().getStartSettings();
+                const service = this.getWorkoutList();
+                const pairing = this.getDevicePairing();
+                const settings = service.getStartSettings() ?? {};
                 card.select({ ...settings, noRoute: opts?.noRoute });
-                this.getPageObserver()?.emit('start-ride', { id, noRoute: opts?.noRoute });
+                this.logEvent({ message: 'Attempting to start a ride', id, ...settings, noRoute: opts?.noRoute, readyToStart: pairing.isReadyToStart(), });
+                this.detailWorkoutId = null;
+                service.close();
+                const next = pairing.isReadyToStart() ? '/rideDeviceOK' : '/pairingStart';
+                this.moveTo(next);
             }
             catch (err) {
                 this.logError(err, 'onStart');
@@ -452,6 +462,9 @@ let WorkoutListPageService = (() => {
                 this.logError(err, 'emitImportUpdate');
             }
         }
+        getDevicePairing() {
+            return useDevicePairing();
+        }
         getWorkoutList() {
             return useWorkoutList();
         }

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

@@ -74,7 +74,6 @@ let WorkoutRidePageService = (() => {
         backgroundTimer;
         backgroundPausedByService = false;
         menuProps = null;
-        isInitialized = false;
         constructor() {
             super('WorkoutRidePage');
             this.rideEventHandler['state-update'] = this.onRideStateUpdate.bind(this);
@@ -92,10 +91,6 @@ let WorkoutRidePageService = (() => {
                 super.openPage();
                 try {
                     const service = this.getRideDisplay();
-                    if (!this.isInitialized) {
-                        service.init();
-                        this.isInitialized = true;
-                    }
                     this.registerRideEventHandlers();
                     this.subscribeToWorkoutObserver();
                     service.start(simulate);
@@ -117,7 +112,6 @@ let WorkoutRidePageService = (() => {
                 this.unregisterRideEventHandlers();
                 this.unsubscribeFromWorkoutObserver();
                 this.menuProps = null;
-                this.isInitialized = false;
                 super.closePage();
             }
             catch (err) {
@@ -311,19 +305,15 @@ let WorkoutRidePageService = (() => {
             switch (state) {
                 case 'Paused':
                     this.menuProps = { showResume: true, ...this.getStepFlags() };
-                    this.updatePageDisplay();
                     break;
                 case 'Active':
                     this.menuProps = null;
-                    this.updatePageDisplay();
                     break;
                 case 'Finished':
                     this.emitNavigateBack();
-                    break;
-                case 'Error':
-                    this.updatePageDisplay();
-                    break;
+                    return;
             }
+            this.updatePageDisplay();
         }
         onWorkoutUpdate() {
             this.updatePageDisplay();
@@ -370,7 +360,8 @@ let WorkoutRidePageService = (() => {
             }
             const bars = getWorkoutGraphSeries(current, { ftp, absValues: true });
             const lastBarX = bars.length ? bars.at(-1).x : 0;
-            const maxX = Math.max(this.getLastLogTime(), lastBarX, current.duration ?? 0);
+            const maxXCandidates = [this.getLastLogTime(), lastBarX, current.duration ?? 0].filter(Number.isFinite);
+            const maxX = maxXCandidates.length ? Math.max(...maxXCandidates) : 0;
             const maxBarPower = bars.length ? Math.max(...bars.map(b => b.y)) : 0;
             return {
                 bars,

package/lib/types/appstate/types.d.ts

@@ -1,4 +1,4 @@
-export type FeatureToggle = 'NEW_SEARCH_UI' | 'CONTROLLERS' | 'MOBILE_WORKOUTS' | 'WEBBLE_WINDOWS';
+export type FeatureToggle = 'NEW_SEARCH_UI' | 'CONTROLLERS' | 'MOBILE_WORKOUTS' | 'WEBBLE_WINDOWS' | 'MOBILE_NEXT_VIDEO';
 export type Interfaces = 'ant' | 'ble' | 'serial' | 'wifi' | 'tcpip';
 export type BLEFeatures = {
     services: Array<string>;

package/lib/types/routes/list/cards/RouteCard.d.ts

@@ -78,6 +78,7 @@ export declare class RouteCard extends BaseCard implements Card<Route> {
     start(): void;
     cancel(): void;
     addWorkout(): void;
+    protected enforceNextVideoOverrideOnMobile(): void;
     getCurrentDownload(): Observer;
     getVideoDir(): string;
     setVideoDir(dir: string): void;

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

@@ -50,6 +50,7 @@ export declare class WorkoutListPageService extends IncyclistPageService impleme
     protected formatDuration(duration: number): string;
     protected emitPageUpdate(): void;
     protected emitImportUpdate(): void;
+    protected getDevicePairing(): import("../../devices").DevicePairingService;
     protected getWorkoutList(): WorkoutListService;
     protected getWorkoutCalendar(): import("../calendar").WorkoutCalendarService;
     protected getUserSettings(): import("../../settings").UserSettingsService;

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

@@ -12,7 +12,6 @@ export declare class WorkoutRidePageService extends IncyclistPageService impleme
     protected backgroundTimer: NodeJS.Timeout | undefined;
     protected backgroundPausedByService: boolean;
     protected menuProps: WorkoutRideMenuProps | null;
-    protected isInitialized: boolean;
     constructor();
     openPage(simulate?: boolean): IObserver;
     closePage(): void;

package/package.json

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