incyclist-services 1.7.89 → 1.7.91

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

@@ -48,6 +48,7 @@ const incyclist_devices_1 = require("incyclist-devices");
 const devices_1 = require("../../devices");
 const base_1 = require("../base");
 const uuid_1 = require("uuid");
+const workouts_1 = require("../../workouts");
 const route_1 = require("../../routes/base/utils/route");
 const route_2 = require("../../routes/base/model/route");
 const stats_1 = require("./stats");
@@ -425,14 +426,15 @@ let ActivityRideService = (() => {
                 const route = this.getRouteList().getSelected();
                 const startSettings = this.getRouteList().getStartSettings();
                 const isFreeRide = startSettings?.type === 'Free-Ride';
-                const isWorkout = this.activity?.routeType === 'None';
+                const showWorkoutSummary = this.activity?.routeType === 'None';
                 const showSave = this.activity !== undefined && !this.isSaveDone;
                 const showContinue = this.state !== 'completed';
                 const hasGPX = this.activity?.logs?.some((log) => !!log.lat && !!log.lng);
-                const showMap = hasGPX || isFreeRide || isWorkout || (route?.description?.hasGpx);
+                const showMap = hasGPX || isFreeRide || (route?.description?.hasGpx);
                 const preview = showMap ? undefined : route?.description?.previewUrl;
+                const workoutGraph = showWorkoutSummary ? this.buildWorkoutSummaryGraph(this.activity) : undefined;
                 if (!this.isSummaryShown) {
-                    this.logEvent({ message: 'activity summary shown', showSave, showContinue, showMap, fileLink: this.activity?.fitFileName });
+                    this.logEvent({ message: 'activity summary shown', showSave, showContinue, showMap, showWorkoutSummary, fileLink: this.activity?.fitFileName });
                 }
                 this.isSummaryShown = true;
                 const props = {
@@ -440,6 +442,8 @@ let ActivityRideService = (() => {
                     showSave,
                     showContinue,
                     showMap,
+                    showWorkoutSummary,
+                    workoutGraph,
                     showDonate: this.canShowDonate(),
                     preview,
                     units: this.getUnitConverter().getDefaultUnits()
@@ -451,6 +455,34 @@ let ActivityRideService = (() => {
                 return {};
             }
         }
+        buildWorkoutSummaryGraph(activity) {
+            const workout = activity?.workout;
+            if (!workout)
+                return undefined;
+            const ftp = activity.user?.ftp ?? 0;
+            const bars = (0, workouts_1.getWorkoutGraphSeries)(workout, { ftp, absValues: true });
+            const lastBarX = bars.length ? bars.at(-1).x : 0;
+            const lastLogTime = activity.logs?.length ? activity.logs.at(-1).time : 0;
+            const maxXCandidates = [lastLogTime, lastBarX, workout.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;
+            const plan = {
+                bars,
+                ftp,
+                ftpLine: ftp,
+                domain: { x: [0, maxX], y: [0, maxBarPower * 1.1] }
+            };
+            const actuals = {
+                power: (activity.logs ?? [])
+                    .filter(log => Number.isFinite(log.time) && Number.isFinite(log.power))
+                    .map(log => ({ x: log.time, y: log.power })),
+                heartrate: (activity.logs ?? [])
+                    .filter(log => Number.isFinite(log.time) && Number.isFinite(log.heartrate))
+                    .map(log => ({ x: log.time, y: log.heartrate })),
+                position: -1
+            };
+            return { plan, actuals };
+        }
         canShowDonate() {
             try {
                 if (this.isDonateShown) {

package/lib/cjs/devices/configuration/service.js

@@ -222,8 +222,8 @@ let DeviceConfigurationService = (() => {
                 if (c.capability === 'bike')
                     return;
                 const capability = c.capability;
-                if (!capabilties.includes(capability) && c.selected !== udid) {
-                    this.delete(udid, capability);
+                if (!capabilties.includes(capability)) {
+                    this.delete(udid, capability, true);
                 }
             });
             this.updateUserSettings();

package/lib/cjs/ui/service.js

@@ -208,7 +208,7 @@ let UserInterfaceServcie = (() => {
             try {
                 this.startQueueWorker();
                 this.startHeartbeatWorker();
-                const sent = false;
+                let sent = false;
                 const user = this.getUserSettings().getValue('user', {});
                 const id = this.getUserSettings().getValue('uuid', undefined);
                 this.getFeatureToggleSync().start(id);
@@ -223,7 +223,7 @@ let UserInterfaceServcie = (() => {
                     started: new Date().toISOString()
                 };
                 if (this.isMobile() || this.isOnline()) {
-                    this.sendMessage(topic, payload);
+                    sent = this.sendMessage(topic, payload);
                 }
                 if (!sent) {
                     this.queueMessage(topic, payload);
@@ -364,7 +364,8 @@ let UserInterfaceServcie = (() => {
                     version: this.version,
                     appVersion: appInfo.getAppVersion(),
                     uuid: this.getUserSettings().get('uuid', undefined),
-                    session: this.session
+                    session: this.session,
+                    'app-channel': this.platform
                 };
                 this.logger.logEvent({ message: 'setting globals', ...globals });
                 this.logger.setGlobal(globals);

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

@@ -93,7 +93,11 @@ let WorkoutListPageService = (() => {
         openPage() {
             try {
                 super.openPage();
-                this.logEvent({ message: 'page shown', page: 'Workouts' });
+                let pageType;
+                if (!this.getAppState().hasFeature('MOBILE_WORKOUTS')) {
+                    pageType = 'placeholder';
+                }
+                this.logEvent({ message: 'page shown', page: 'Workouts', pageType });
                 const { observer } = this.getWorkoutList().open();
                 this.listObserver = observer;
                 this.listObserver?.on('started', this.listUpdateHandler);
@@ -323,10 +327,12 @@ let WorkoutListPageService = (() => {
                 this.importPhase = 'importing';
                 this.importingFileName = file?.name;
                 this.emitImportUpdate();
+                this.logEvent({ message: 'workout import attempted', file: file?.name });
                 this.getWorkoutList().import(file, { showImportCards: false })
                     .then(([card]) => {
                     const group = this.getLastUsedImportGroup();
                     observer.emit('success');
+                    this.logEvent({ message: 'workout import succeeded', file: file?.name, workoutName: card.getTitle(), group });
                     if (generation !== this.importGeneration)
                         return;
                     if (group !== DEFAULT_IMPORT_GROUP)
@@ -337,6 +343,7 @@ let WorkoutListPageService = (() => {
                 })
                     .catch((err) => {
                     observer.emit('error', err);
+                    this.logEvent({ message: 'workout import failed', file: file?.name, error: err?.message });
                     if (generation !== this.importGeneration)
                         return;
                     this.importPhase = 'error';

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

@@ -91,8 +91,8 @@ let WorkoutRidePageService = (() => {
             this.workoutEventHandler['update'] = this.onWorkoutUpdate.bind(this);
             this.workoutEventHandler['forward'] = this.onWorkoutUpdate.bind(this);
             this.workoutEventHandler['backward'] = this.onWorkoutUpdate.bind(this);
-            this.workoutEventHandler['completed'] = this.onWorkoutFinished.bind(this);
-            this.workoutEventHandler['stopped'] = this.onWorkoutFinished.bind(this);
+            this.workoutEventHandler['completed'] = this.onFinished.bind(this);
+            this.workoutEventHandler['stopped'] = this.onFinished.bind(this);
         }
         openPage(simulate) {
             try {
@@ -119,7 +119,7 @@ let WorkoutRidePageService = (() => {
             try {
                 gd_eventlog_1.EventLogger.setGlobalConfig('page', null);
                 this.logEvent({ message: 'page closed', page: 'WorkoutRide' });
-                this.getRideDisplay().stop(true);
+                this.getRideDisplay().stop();
                 this.unregisterRideEventHandlers();
                 this.unsubscribeFromWorkoutObserver();
                 this.menuProps = null;
@@ -243,8 +243,7 @@ let WorkoutRidePageService = (() => {
         }
         onStop() {
             try {
-                this.getRideDisplay().stop(true);
-                this.emitNavigateBack();
+                this.finishRide();
             }
             catch (err) {
                 this.logError(err, 'onStop');
@@ -353,7 +352,17 @@ let WorkoutRidePageService = (() => {
         onWorkoutUpdate() {
             this.updatePageDisplay();
         }
-        onWorkoutFinished() {
+        onFinished() {
+            try {
+                this.menuProps = { showResume: false, finished: true, canStepBack: false, canStepForward: false };
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'onFinished');
+            }
+        }
+        finishRide() {
+            this.getRideDisplay().stop(true);
             this.emitNavigateBack();
         }
         subscribeToWorkoutObserver() {

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

@@ -42,6 +42,7 @@ import { IncyclistCapability } from "incyclist-devices";
 import { useDeviceConfiguration, useDeviceRide } from "../../devices";
 import { ActivitiesRepository, ActivityConverter, ActivityConverterFactory, DB_VERSION, DEFAULT_SPORT_ACTIVITY_TITLE } from "../base";
 import { v4 as generateUUID } from 'uuid';
+import { getWorkoutGraphSeries } from "../../workouts";
 import { addDetails, checkIsLoop, getElevationGainAt, getNextPosition, getPosition, getRouteHash, validateRoute } from "../../routes/base/utils/route";
 import { Route } from "../../routes/base/model/route";
 import { ActivityStatsCalculator } from "./stats";
@@ -419,14 +420,15 @@ let ActivityRideService = (() => {
                 const route = this.getRouteList().getSelected();
                 const startSettings = this.getRouteList().getStartSettings();
                 const isFreeRide = startSettings?.type === 'Free-Ride';
-                const isWorkout = this.activity?.routeType === 'None';
+                const showWorkoutSummary = this.activity?.routeType === 'None';
                 const showSave = this.activity !== undefined && !this.isSaveDone;
                 const showContinue = this.state !== 'completed';
                 const hasGPX = this.activity?.logs?.some((log) => !!log.lat && !!log.lng);
-                const showMap = hasGPX || isFreeRide || isWorkout || (route?.description?.hasGpx);
+                const showMap = hasGPX || isFreeRide || (route?.description?.hasGpx);
                 const preview = showMap ? undefined : route?.description?.previewUrl;
+                const workoutGraph = showWorkoutSummary ? this.buildWorkoutSummaryGraph(this.activity) : undefined;
                 if (!this.isSummaryShown) {
-                    this.logEvent({ message: 'activity summary shown', showSave, showContinue, showMap, fileLink: this.activity?.fitFileName });
+                    this.logEvent({ message: 'activity summary shown', showSave, showContinue, showMap, showWorkoutSummary, fileLink: this.activity?.fitFileName });
                 }
                 this.isSummaryShown = true;
                 const props = {
@@ -434,6 +436,8 @@ let ActivityRideService = (() => {
                     showSave,
                     showContinue,
                     showMap,
+                    showWorkoutSummary,
+                    workoutGraph,
                     showDonate: this.canShowDonate(),
                     preview,
                     units: this.getUnitConverter().getDefaultUnits()
@@ -445,6 +449,34 @@ let ActivityRideService = (() => {
                 return {};
             }
         }
+        buildWorkoutSummaryGraph(activity) {
+            const workout = activity?.workout;
+            if (!workout)
+                return undefined;
+            const ftp = activity.user?.ftp ?? 0;
+            const bars = getWorkoutGraphSeries(workout, { ftp, absValues: true });
+            const lastBarX = bars.length ? bars.at(-1).x : 0;
+            const lastLogTime = activity.logs?.length ? activity.logs.at(-1).time : 0;
+            const maxXCandidates = [lastLogTime, lastBarX, workout.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;
+            const plan = {
+                bars,
+                ftp,
+                ftpLine: ftp,
+                domain: { x: [0, maxX], y: [0, maxBarPower * 1.1] }
+            };
+            const actuals = {
+                power: (activity.logs ?? [])
+                    .filter(log => Number.isFinite(log.time) && Number.isFinite(log.power))
+                    .map(log => ({ x: log.time, y: log.power })),
+                heartrate: (activity.logs ?? [])
+                    .filter(log => Number.isFinite(log.time) && Number.isFinite(log.heartrate))
+                    .map(log => ({ x: log.time, y: log.heartrate })),
+                position: -1
+            };
+            return { plan, actuals };
+        }
         canShowDonate() {
             try {
                 if (this.isDonateShown) {

package/lib/esm/devices/configuration/service.js

@@ -216,8 +216,8 @@ let DeviceConfigurationService = (() => {
                 if (c.capability === 'bike')
                     return;
                 const capability = c.capability;
-                if (!capabilties.includes(capability) && c.selected !== udid) {
-                    this.delete(udid, capability);
+                if (!capabilties.includes(capability)) {
+                    this.delete(udid, capability, true);
                 }
             });
             this.updateUserSettings();

package/lib/esm/ui/service.js

@@ -205,7 +205,7 @@ let UserInterfaceServcie = (() => {
             try {
                 this.startQueueWorker();
                 this.startHeartbeatWorker();
-                const sent = false;
+                let sent = false;
                 const user = this.getUserSettings().getValue('user', {});
                 const id = this.getUserSettings().getValue('uuid', undefined);
                 this.getFeatureToggleSync().start(id);
@@ -220,7 +220,7 @@ let UserInterfaceServcie = (() => {
                     started: new Date().toISOString()
                 };
                 if (this.isMobile() || this.isOnline()) {
-                    this.sendMessage(topic, payload);
+                    sent = this.sendMessage(topic, payload);
                 }
                 if (!sent) {
                     this.queueMessage(topic, payload);
@@ -361,7 +361,8 @@ let UserInterfaceServcie = (() => {
                     version: this.version,
                     appVersion: appInfo.getAppVersion(),
                     uuid: this.getUserSettings().get('uuid', undefined),
-                    session: this.session
+                    session: this.session,
+                    'app-channel': this.platform
                 };
                 this.logger.logEvent({ message: 'setting globals', ...globals });
                 this.logger.setGlobal(globals);

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

@@ -90,7 +90,11 @@ let WorkoutListPageService = (() => {
         openPage() {
             try {
                 super.openPage();
-                this.logEvent({ message: 'page shown', page: 'Workouts' });
+                let pageType;
+                if (!this.getAppState().hasFeature('MOBILE_WORKOUTS')) {
+                    pageType = 'placeholder';
+                }
+                this.logEvent({ message: 'page shown', page: 'Workouts', pageType });
                 const { observer } = this.getWorkoutList().open();
                 this.listObserver = observer;
                 this.listObserver?.on('started', this.listUpdateHandler);
@@ -320,10 +324,12 @@ let WorkoutListPageService = (() => {
                 this.importPhase = 'importing';
                 this.importingFileName = file?.name;
                 this.emitImportUpdate();
+                this.logEvent({ message: 'workout import attempted', file: file?.name });
                 this.getWorkoutList().import(file, { showImportCards: false })
                     .then(([card]) => {
                     const group = this.getLastUsedImportGroup();
                     observer.emit('success');
+                    this.logEvent({ message: 'workout import succeeded', file: file?.name, workoutName: card.getTitle(), group });
                     if (generation !== this.importGeneration)
                         return;
                     if (group !== DEFAULT_IMPORT_GROUP)
@@ -334,6 +340,7 @@ let WorkoutListPageService = (() => {
                 })
                     .catch((err) => {
                     observer.emit('error', err);
+                    this.logEvent({ message: 'workout import failed', file: file?.name, error: err?.message });
                     if (generation !== this.importGeneration)
                         return;
                     this.importPhase = 'error';

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

@@ -88,8 +88,8 @@ let WorkoutRidePageService = (() => {
             this.workoutEventHandler['update'] = this.onWorkoutUpdate.bind(this);
             this.workoutEventHandler['forward'] = this.onWorkoutUpdate.bind(this);
             this.workoutEventHandler['backward'] = this.onWorkoutUpdate.bind(this);
-            this.workoutEventHandler['completed'] = this.onWorkoutFinished.bind(this);
-            this.workoutEventHandler['stopped'] = this.onWorkoutFinished.bind(this);
+            this.workoutEventHandler['completed'] = this.onFinished.bind(this);
+            this.workoutEventHandler['stopped'] = this.onFinished.bind(this);
         }
         openPage(simulate) {
             try {
@@ -116,7 +116,7 @@ let WorkoutRidePageService = (() => {
             try {
                 EventLogger.setGlobalConfig('page', null);
                 this.logEvent({ message: 'page closed', page: 'WorkoutRide' });
-                this.getRideDisplay().stop(true);
+                this.getRideDisplay().stop();
                 this.unregisterRideEventHandlers();
                 this.unsubscribeFromWorkoutObserver();
                 this.menuProps = null;
@@ -240,8 +240,7 @@ let WorkoutRidePageService = (() => {
         }
         onStop() {
             try {
-                this.getRideDisplay().stop(true);
-                this.emitNavigateBack();
+                this.finishRide();
             }
             catch (err) {
                 this.logError(err, 'onStop');
@@ -350,7 +349,17 @@ let WorkoutRidePageService = (() => {
         onWorkoutUpdate() {
             this.updatePageDisplay();
         }
-        onWorkoutFinished() {
+        onFinished() {
+            try {
+                this.menuProps = { showResume: false, finished: true, canStepBack: false, canStepForward: false };
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'onFinished');
+            }
+        }
+        finishRide() {
+            this.getRideDisplay().stop(true);
             this.emitNavigateBack();
         }
         subscribeToWorkoutObserver() {

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

@@ -6,7 +6,7 @@ import { ActivitiesRepository, ActivityConverterFactory, ActivityDetails, Activi
 import { FreeRideStartSettings } from "../../routes/list/types";
 import { RouteSettings } from "../../routes/list/cards/types";
 import { RoutePoint } from "../../routes/base/types";
-import { ActivityDashboardDataItem, ActivityState, ActivitySummaryDisplayProperties } from "./types";
+import { ActivityDashboardDataItem, ActivityState, ActivitySummaryDisplayProperties, ActivityWorkoutSummaryGraph } from "./types";
 import { Route } from "../../routes/base/model/route";
 import { ActivityStatsCalculator } from "./stats";
 import { ActivityDuration } from "./duration";
@@ -146,6 +146,7 @@ export declare class ActivityRideService extends IncyclistService {
         elevationGain?: undefined;
     };
     getActivitySummaryDisplayProperties(): ActivitySummaryDisplayProperties;
+    protected buildWorkoutSummaryGraph(activity?: ActivityDetails): ActivityWorkoutSummaryGraph | undefined;
     protected canShowDonate(): boolean;
     onDonateClicked(): void;
     getActivity(): ActivityDetails;

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

@@ -2,12 +2,19 @@ import { HealthStatus } from "../../devices";
 import { Dimension, Unit } from "../../i18n";
 import { RoutePoint } from "../../types";
 import { ActivityDetailsUI } from "../base";
+import { WorkoutGraphActuals, WorkoutGraphPlan } from "../../workouts";
 export type ActivityState = 'ininitalized' | 'active' | 'paused' | 'completed' | 'idle';
+export type ActivityWorkoutSummaryGraph = {
+    plan: WorkoutGraphPlan;
+    actuals: WorkoutGraphActuals;
+};
 export type ActivitySummaryDisplayProperties = {
     activity?: ActivityDetailsUI;
     showSave?: boolean;
     showContinue?: boolean;
     showMap?: boolean;
+    showWorkoutSummary?: boolean;
+    workoutGraph?: ActivityWorkoutSummaryGraph;
     preview?: string;
     units?: Record<Dimension, Unit>;
 };

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

@@ -40,7 +40,8 @@ export declare class WorkoutRidePageService extends IncyclistPageService impleme
     adjustLoad(deltaPct: number): PowerAdjustmentResult | undefined;
     protected onRideStateUpdate(state: CurrentRideState): void;
     protected onWorkoutUpdate(): void;
-    protected onWorkoutFinished(): void;
+    protected onFinished(): void;
+    protected finishRide(): void;
     protected subscribeToWorkoutObserver(): void;
     protected unsubscribeFromWorkoutObserver(): void;
     protected registerRideEventHandlers(): void;

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

@@ -1,6 +1,6 @@
 import type { IObserver } from "../../../base/typedefs";
 import type { IPageService } from "../../../base/pages";
-import type { RidePageDisplayProps } from "../../../ride/page/types";
+import type { RideMenuProps, RidePageDisplayProps } from "../../../ride/page/types";
 import type { WorkoutGraphPlanBar } from "../../base/graph/types";
 export interface WorkoutGraphPoint {
     x: number;
@@ -37,8 +37,7 @@ export interface WorkoutDashboardLine {
     text: string;
     mode: string | null;
 }
-export interface WorkoutRideMenuProps {
-    showResume: boolean;
+export interface WorkoutRideMenuProps extends RideMenuProps {
     canStepBack: boolean;
     canStepForward: boolean;
 }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.89",
+  "version": "1.7.91",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },
   "dependencies": {
     "@garmin/fitsdk": "^21.200.0",
     "axios": "^1.15.2",
-    "incyclist-devices": "^3.0.25",
+    "incyclist-devices": "^3.0.27",
     "promise.any": "^2.0.6",
     "semver": "^7.7.4",
     "tcx-builder": "^1.1.1",