incyclist-services 1.7.6 → 1.7.8

package/lib/cjs/activities/active-rides/service.js

@@ -286,7 +286,6 @@ let ActiveRidesService = (() => {
             const logInfo = all.map(r => `${r?.name}${r?.isUser ? '(*)' : ''}:${r?.avatar?.shirt ?? ''}-${distanceText(r)}-${r?.lap ?? ''}-${r?.power ?? '?'}W`)
                 .join('|');
             const cnt = (this.others?.length ?? 0) + 1;
-            console.log('# nearby riders log', logInfo, all);
             const event = { message: 'NearbyRiders', activityId: this.activity?.id, title: this.activity?.route?.title, cnt, nearbyRiders: logInfo };
             this.logEvent(event);
             this.prevLogTS = Date.now();
@@ -477,10 +476,15 @@ let ActiveRidesService = (() => {
                 const format = (v) => {
                     const [C, U] = this.getUnitConversionShortcuts();
                     let value = C(v, 'distance', { digits: 1 });
-                    const unit = U('distance');
+                    let unit = U('distance');
                     if (value >= 10) {
                         value = Math.round(value);
                     }
+                    if (value === 0) {
+                        const units = this.getUnitConverter().getUnits();
+                        unit = units === 'imperial' ? 'yd' : 'm';
+                        C(v, 'distance', { digits: 0, to: unit });
+                    }
                     return { value, unit };
                 };
                 const isLap = this.current?.ride?.isLap;
@@ -802,20 +806,12 @@ let ActiveRidesService = (() => {
                     return;
                 }
                 this.coaches = coaches.map(c => {
-                    const props = c.getDisplayProperties();
-                    const rideEntry = {
-                        id: `coach:${props.name}`,
-                        user: {
-                            name: props.name,
-                            id: `coach:${props.name}`,
-                        },
+                    const props = c.getRidersListDisplayProperties();
+                    let routeDistance = props.currentRideDistance;
+                    const entry = { ...props,
                         ride: this.current?.ride,
-                        tsLastUpdate: Date.now(),
-                        currentRideDistance: c.getProgess(),
-                        currentPosition: c.getPosition(),
-                        isCoach: true
                     };
-                    return rideEntry;
+                    return entry;
                 });
             }
             catch (err) {

package/lib/cjs/activities/list/utils.js

@@ -27,7 +27,7 @@ exports.createUIActivitySummary = createUIActivitySummary;
 const createUIActivityDetails = (details) => {
     if (!details)
         return details;
-    const ui = { ...details };
+    const ui = structuredClone(details);
     const [C, U] = (0, i18n_1.getUnitConversionShortcuts)();
     ui.distance = { value: C(details.distance, 'distance', { digits: 1 }), unit: U('distance') };
     if (ui.distance.value > 100)

package/lib/cjs/coaches/coach.js

@@ -4,6 +4,7 @@ exports.Coach = void 0;
 const gd_eventlog_1 = require("gd-eventlog");
 const incyclist_devices_1 = require("incyclist-devices");
 const i18n_1 = require("../i18n");
+const routes_1 = require("../routes");
 class Coach {
     _settings;
     _id;
@@ -12,6 +13,7 @@ class Coach {
     simulator;
     logger;
     position;
+    route;
     constructor(settings) {
         this._settings = settings;
         this._id = Date.now().toString();
@@ -29,8 +31,23 @@ class Coach {
             return 0;
         return lead;
     }
+    setRoute(route) {
+        this.route = route;
+    }
     setProgress(routeDistance) {
-        this.routeDistance = routeDistance;
+        try {
+            this.routeDistance = routeDistance;
+            if (!this.route?.details?.points)
+                return;
+            const isLap = this.route?.description?.isLoop;
+            const totalDistance = this.route?.description?.distance;
+            const lapDistance = isLap ? this.routeDistance % totalDistance : this.routeDistance;
+            const position = (0, routes_1.getPointAtDistance)(this.route, lapDistance, true);
+            this.setPosition(position);
+        }
+        catch (err) {
+            this.logger.logEvent({ message: 'error', fn: 'setProgress', error: err.message, stack: err.stack });
+        }
     }
     getProgess() {
         return this.routeDistance;
@@ -68,6 +85,20 @@ class Coach {
         };
         return props;
     }
+    getRidersListDisplayProperties() {
+        const { name } = this.settings;
+        return {
+            id: `coach:${name}`,
+            user: {
+                name: name,
+                id: `coach:${name}`,
+            },
+            tsLastUpdate: Date.now(),
+            currentRideDistance: this.getProgess(),
+            currentPosition: this.getPosition(),
+            isCoach: true
+        };
+    }
     update(settings) {
         const { name, power, speed: speedEdit, lead: leadEdit } = settings;
         const getValue = (v, d) => {
@@ -122,6 +153,7 @@ class Coach {
             return;
         this.simulator.stop();
         this.routeDistance = undefined;
+        this.route = undefined;
     }
     getUnitConversionShortcuts() {
         return (0, i18n_1.useUnitConverter)().getUnitConversionShortcuts();

package/lib/cjs/coaches/service.js

@@ -76,6 +76,7 @@ let CoachesService = (() => {
         coaches = (__runInitializers(this, _instanceExtraInitializers), []);
         observer;
         isPaused;
+        route;
         constructor() {
             super('Coaches');
             this.isPaused = false;
@@ -114,15 +115,18 @@ let CoachesService = (() => {
                 this.logError(err, 'deleteCoach');
             }
         }
-        async startRide() {
+        async startRide(route) {
             try {
                 if (this.observer) {
                     await this.stopRide();
                 }
-                if (!this.coaches)
+                if (!this.coaches?.length) {
+                    delete this.observer;
                     return null;
+                }
                 this.observer = new observer_1.Observer();
                 this.isPaused = false;
+                this.route = route;
                 const onDataUpdate = this.onCoachDataUpdate.bind(this);
                 this.coaches.forEach(c => {
                     const startSettings = this.routesService.getStartSettings();
@@ -131,6 +135,7 @@ let CoachesService = (() => {
                         pos = startSettings.startPos;
                     }
                     const lead = (isNaN(c.settings?.lead) ? 0 : c.settings?.lead) ?? 0;
+                    c.setRoute(route);
                     c.setProgress(lead + pos);
                     c.setRiderPosition(pos);
                     this.setCoachPosition(c, lead + pos);
@@ -152,7 +157,15 @@ let CoachesService = (() => {
             }
             return this.observer;
         }
+        updateRoute(route) {
+            this.route = route;
+            if (this.observer) {
+                this.coaches.forEach(c => { c.setRoute(route); });
+            }
+        }
         async stopRide() {
+            if (!this.observer)
+                return;
             try {
                 this.coaches.forEach(c => { c.stop(); });
                 this.isPaused = false;
@@ -163,6 +176,8 @@ let CoachesService = (() => {
             }
         }
         pauseRide() {
+            if (!this.observer)
+                return;
             try {
                 this.isPaused = true;
             }
@@ -171,6 +186,8 @@ let CoachesService = (() => {
             }
         }
         resumeRide() {
+            if (!this.observer)
+                return;
             try {
                 this.isPaused = false;
             }
@@ -197,10 +214,10 @@ let CoachesService = (() => {
                 return;
             const startSettings = this.routesService.getStartSettings();
             const { distance } = data;
-            const route = this.getRideDisplay().route;
+            const route = this.route;
             if (!route || !coach || !data)
                 return;
-            const prevRouteDistance = coach.getProgess();
+            const prevRouteDistance = coach.getProgess() ?? 0;
             const newRouteDistance = prevRouteDistance + data.distance;
             coach.setProgress(newRouteDistance);
             if (startSettings.type === 'Free-Ride')

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

@@ -735,7 +735,7 @@ let DeviceRideService = (() => {
             const adapters = this.rideAdapters?.filter(ai => ai.adapter.getInterface() === ifName);
             const stillHealthy = adapters.filter(ai => ai.isHealthy === undefined || ai.isHealthy);
             this.logEvent({ message: 'reconnect confirmed', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (Date.now() - unhealthy.tsLastData), tsLastData: unhealthy.tsLastData, stillHealthy: stillHealthy?.length, onSameInterface: adapters.length });
-            if (!stillHealthy?.length && adapters.length > 1) {
+            if (!stillHealthy?.length && adapters.length > 1 && ifName !== 'ble') {
                 await this.reconnectInterface(ifName, adapters);
             }
             else {

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

@@ -51,6 +51,7 @@ const FollowRouteDisplayService_1 = require("../route/FollowRouteDisplayService"
 const WorkoutDisplayService_1 = require("../workout/WorkoutDisplayService");
 const api_1 = require("../../api");
 const RLVDisplayService_1 = require("../route/RLVDisplayService");
+const coaches_1 = require("../../coaches");
 let RideDisplayService = (() => {
     let _classDecorators = [types_1.Singleton];
     let _classDescriptor;
@@ -66,6 +67,7 @@ let RideDisplayService = (() => {
     let _getUserSettings_decorators;
     let _getDeviceConfiguration_decorators;
     let _getUIBinding_decorators;
+    let _getCoaches_decorators;
     var RideDisplayService = class extends _classSuper {
         static { _classThis = this; }
         static {
@@ -78,6 +80,7 @@ let RideDisplayService = (() => {
             _getUserSettings_decorators = [decorators_1.Injectable];
             _getDeviceConfiguration_decorators = [decorators_1.Injectable];
             _getUIBinding_decorators = [decorators_1.Injectable];
+            _getCoaches_decorators = [decorators_1.Injectable];
             __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, _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, _getWorkoutList_decorators, { kind: "method", name: "getWorkoutList", static: false, private: false, access: { has: obj => "getWorkoutList" in obj, get: obj => obj.getWorkoutList }, metadata: _metadata }, null, _instanceExtraInitializers);
@@ -86,6 +89,7 @@ let RideDisplayService = (() => {
             __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, _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(this, null, _getUIBinding_decorators, { kind: "method", name: "getUIBinding", static: false, private: false, access: { has: obj => "getUIBinding" in obj, get: obj => obj.getUIBinding }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getCoaches_decorators, { kind: "method", name: "getCoaches", static: false, private: false, access: { has: obj => "getCoaches" in obj, get: obj => obj.getCoaches }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             RideDisplayService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -140,6 +144,7 @@ let RideDisplayService = (() => {
                 }
                 this.startDevices();
                 this.startRide();
+                this.getCoaches().startRide(this.route);
                 this.setState('Starting');
                 this.logEvent({ message: 'overlay shown', overlay: 'start overlay' });
             }
@@ -191,6 +196,7 @@ let RideDisplayService = (() => {
                     return;
                 this.logEvent({ message: "pause activity request", activity: this.activity?.id, userRequested: requester === 'user' });
                 this.state = 'Paused';
+                this.getCoaches().pauseRide();
                 if (requester === 'user') {
                     this.getActivityRide().pause(false);
                 }
@@ -210,6 +216,7 @@ let RideDisplayService = (() => {
                 this.logEvent({ message: "continue activity request", activity: this.activity?.id, userRequested: requester === 'user' });
                 this.isResuming = true;
                 this.state = 'Active';
+                this.getCoaches().resumeRide();
                 if (requester === 'user') {
                     this.getActivityRide().resume('user');
                 }
@@ -251,6 +258,7 @@ let RideDisplayService = (() => {
             }
             await this.stopRide({ exit, noStateUpdates: true });
             this.getActivityRide().cleanup();
+            this.getCoaches().stopRide();
             delete this.type;
         }
         toggleCyclingMode() {
@@ -533,7 +541,7 @@ let RideDisplayService = (() => {
                 return;
             this.resume('device');
         }
-        onActivityUpdate(data) {
+        onActivityUpdate() {
             if (this.state === 'Active') {
                 const currentValues = this.getActivityRide().getCurrentValues();
                 if (!currentValues)
@@ -543,6 +551,8 @@ let RideDisplayService = (() => {
                     this.isResuming = false;
                     delete this.pauseReason;
                 }
+                const { time, speed, routeDistance, distance } = currentValues;
+                const data = { time, speed, routeDistance, distance };
                 this.getRideModeService().onActivityUpdate(data, currentValues);
                 this.observer.emit('data-update', data, currentValues);
             }
@@ -1004,9 +1014,9 @@ let RideDisplayService = (() => {
         getStartOverlayProps = () => {
             const mode = this.getRideType();
             const readyToStart = this.isStartDeviceReadyToStart() && this.getRideModeService().isStartRideCompleted();
-            const devices = this.deviceInfo ?? [];
+            const devicesState = this.deviceInfo ?? [];
             const displayOverlayProps = this.getRideModeService().getStartOverlayProps() ?? {};
-            return { mode, rideState: this.state, devices, readyToStart, ...displayOverlayProps };
+            return { mode, rideState: this.state, devicesState, readyToStart, ...displayOverlayProps };
         };
         getDeviceStartSettings() {
             let forceErgMode = false;
@@ -1091,6 +1101,9 @@ let RideDisplayService = (() => {
         getUIBinding() {
             return (0, api_1.getBindings)().ui;
         }
+        getCoaches() {
+            return (0, coaches_1.getCoachesService)();
+        }
     };
     return RideDisplayService = _classThis;
 })();

package/lib/cjs/ride/route/RLVDisplayService.js

@@ -37,6 +37,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RLVDisplayService = void 0;
 const decorators_1 = require("../../base/decorators");
 const types_1 = require("../../base/types");
+const coaches_1 = require("../../coaches");
 const i18n_1 = require("../../i18n");
 const utils_1 = require("../../maps/MapArea/utils");
 const routes_1 = require("../../routes");
@@ -48,13 +49,16 @@ let RLVDisplayService = (() => {
     let _instanceExtraInitializers = [];
     let _getRouteList_decorators;
     let _getLocalization_decorators;
+    let _getCoaches_decorators;
     return class RLVDisplayService extends _classSuper {
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _getRouteList_decorators = [decorators_1.Injectable];
             _getLocalization_decorators = [decorators_1.Injectable];
+            _getCoaches_decorators = [decorators_1.Injectable];
             __esDecorate(this, null, _getRouteList_decorators, { kind: "method", name: "getRouteList", static: false, private: false, access: { has: obj => "getRouteList" in obj, get: obj => obj.getRouteList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getLocalization_decorators, { kind: "method", name: "getLocalization", static: false, private: false, access: { has: obj => "getLocalization" in obj, get: obj => obj.getLocalization }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getCoaches_decorators, { kind: "method", name: "getCoaches", static: false, private: false, access: { has: obj => "getCoaches" in obj, get: obj => obj.getCoaches }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
         currentVideo = __runInitializers(this, _instanceExtraInitializers);
@@ -255,6 +259,7 @@ let RLVDisplayService = (() => {
             (0, utils_1.concatPaths)(currentPoints, nextPoints, 'after');
             (0, routes_1.validateRoute)(this.getCurrentRoute(), false);
             this.emit('route-updated', this.getCurrentRoute());
+            this.getCoaches().updateRoute(this.getCurrentRoute());
             this.logEvent({ message: 'switching to next video', route: this.getCurrentRoute().details.title,
                 segment: this.currentVideo.route.description.title, offset: this.offset, segmentDistance: this.currentVideo.route.description.distance,
                 totalDistance: this.getCurrentRoute().details.distance });
@@ -561,6 +566,9 @@ let RLVDisplayService = (() => {
         getLocalization() {
             return (0, i18n_1.useLocalization)();
         }
+        getCoaches() {
+            return (0, coaches_1.getCoachesService)();
+        }
     };
 })();
 exports.RLVDisplayService = RLVDisplayService;

package/lib/esm/activities/active-rides/service.js

@@ -283,7 +283,6 @@ let ActiveRidesService = (() => {
             const logInfo = all.map(r => `${r?.name}${r?.isUser ? '(*)' : ''}:${r?.avatar?.shirt ?? ''}-${distanceText(r)}-${r?.lap ?? ''}-${r?.power ?? '?'}W`)
                 .join('|');
             const cnt = (this.others?.length ?? 0) + 1;
-            console.log('# nearby riders log', logInfo, all);
             const event = { message: 'NearbyRiders', activityId: this.activity?.id, title: this.activity?.route?.title, cnt, nearbyRiders: logInfo };
             this.logEvent(event);
             this.prevLogTS = Date.now();
@@ -474,10 +473,15 @@ let ActiveRidesService = (() => {
                 const format = (v) => {
                     const [C, U] = this.getUnitConversionShortcuts();
                     let value = C(v, 'distance', { digits: 1 });
-                    const unit = U('distance');
+                    let unit = U('distance');
                     if (value >= 10) {
                         value = Math.round(value);
                     }
+                    if (value === 0) {
+                        const units = this.getUnitConverter().getUnits();
+                        unit = units === 'imperial' ? 'yd' : 'm';
+                        C(v, 'distance', { digits: 0, to: unit });
+                    }
                     return { value, unit };
                 };
                 const isLap = this.current?.ride?.isLap;
@@ -799,20 +803,12 @@ let ActiveRidesService = (() => {
                     return;
                 }
                 this.coaches = coaches.map(c => {
-                    const props = c.getDisplayProperties();
-                    const rideEntry = {
-                        id: `coach:${props.name}`,
-                        user: {
-                            name: props.name,
-                            id: `coach:${props.name}`,
-                        },
+                    const props = c.getRidersListDisplayProperties();
+                    let routeDistance = props.currentRideDistance;
+                    const entry = { ...props,
                         ride: this.current?.ride,
-                        tsLastUpdate: Date.now(),
-                        currentRideDistance: c.getProgess(),
-                        currentPosition: c.getPosition(),
-                        isCoach: true
                     };
-                    return rideEntry;
+                    return entry;
                 });
             }
             catch (err) {

package/lib/esm/activities/list/utils.js

@@ -22,7 +22,7 @@ export const createUIActivitySummary = (summary) => {
 export const createUIActivityDetails = (details) => {
     if (!details)
         return details;
-    const ui = { ...details };
+    const ui = structuredClone(details);
     const [C, U] = getUnitConversionShortcuts();
     ui.distance = { value: C(details.distance, 'distance', { digits: 1 }), unit: U('distance') };
     if (ui.distance.value > 100)

package/lib/esm/coaches/coach.js

@@ -1,6 +1,7 @@
 import { EventLogger } from "gd-eventlog";
 import { AdapterFactory, INTERFACE } from 'incyclist-devices';
 import { useUnitConverter } from "../i18n";
+import { getPointAtDistance } from "../routes";
 export class Coach {
     _settings;
     _id;
@@ -9,6 +10,7 @@ export class Coach {
     simulator;
     logger;
     position;
+    route;
     constructor(settings) {
         this._settings = settings;
         this._id = Date.now().toString();
@@ -26,8 +28,23 @@ export class Coach {
             return 0;
         return lead;
     }
+    setRoute(route) {
+        this.route = route;
+    }
     setProgress(routeDistance) {
-        this.routeDistance = routeDistance;
+        try {
+            this.routeDistance = routeDistance;
+            if (!this.route?.details?.points)
+                return;
+            const isLap = this.route?.description?.isLoop;
+            const totalDistance = this.route?.description?.distance;
+            const lapDistance = isLap ? this.routeDistance % totalDistance : this.routeDistance;
+            const position = getPointAtDistance(this.route, lapDistance, true);
+            this.setPosition(position);
+        }
+        catch (err) {
+            this.logger.logEvent({ message: 'error', fn: 'setProgress', error: err.message, stack: err.stack });
+        }
     }
     getProgess() {
         return this.routeDistance;
@@ -65,6 +82,20 @@ export class Coach {
         };
         return props;
     }
+    getRidersListDisplayProperties() {
+        const { name } = this.settings;
+        return {
+            id: `coach:${name}`,
+            user: {
+                name: name,
+                id: `coach:${name}`,
+            },
+            tsLastUpdate: Date.now(),
+            currentRideDistance: this.getProgess(),
+            currentPosition: this.getPosition(),
+            isCoach: true
+        };
+    }
     update(settings) {
         const { name, power, speed: speedEdit, lead: leadEdit } = settings;
         const getValue = (v, d) => {
@@ -119,6 +150,7 @@ export class Coach {
             return;
         this.simulator.stop();
         this.routeDistance = undefined;
+        this.route = undefined;
     }
     getUnitConversionShortcuts() {
         return useUnitConverter().getUnitConversionShortcuts();

package/lib/esm/coaches/service.js

@@ -73,6 +73,7 @@ let CoachesService = (() => {
         coaches = (__runInitializers(this, _instanceExtraInitializers), []);
         observer;
         isPaused;
+        route;
         constructor() {
             super('Coaches');
             this.isPaused = false;
@@ -111,15 +112,18 @@ let CoachesService = (() => {
                 this.logError(err, 'deleteCoach');
             }
         }
-        async startRide() {
+        async startRide(route) {
             try {
                 if (this.observer) {
                     await this.stopRide();
                 }
-                if (!this.coaches)
+                if (!this.coaches?.length) {
+                    delete this.observer;
                     return null;
+                }
                 this.observer = new Observer();
                 this.isPaused = false;
+                this.route = route;
                 const onDataUpdate = this.onCoachDataUpdate.bind(this);
                 this.coaches.forEach(c => {
                     const startSettings = this.routesService.getStartSettings();
@@ -128,6 +132,7 @@ let CoachesService = (() => {
                         pos = startSettings.startPos;
                     }
                     const lead = (isNaN(c.settings?.lead) ? 0 : c.settings?.lead) ?? 0;
+                    c.setRoute(route);
                     c.setProgress(lead + pos);
                     c.setRiderPosition(pos);
                     this.setCoachPosition(c, lead + pos);
@@ -149,7 +154,15 @@ let CoachesService = (() => {
             }
             return this.observer;
         }
+        updateRoute(route) {
+            this.route = route;
+            if (this.observer) {
+                this.coaches.forEach(c => { c.setRoute(route); });
+            }
+        }
         async stopRide() {
+            if (!this.observer)
+                return;
             try {
                 this.coaches.forEach(c => { c.stop(); });
                 this.isPaused = false;
@@ -160,6 +173,8 @@ let CoachesService = (() => {
             }
         }
         pauseRide() {
+            if (!this.observer)
+                return;
             try {
                 this.isPaused = true;
             }
@@ -168,6 +183,8 @@ let CoachesService = (() => {
             }
         }
         resumeRide() {
+            if (!this.observer)
+                return;
             try {
                 this.isPaused = false;
             }
@@ -194,10 +211,10 @@ let CoachesService = (() => {
                 return;
             const startSettings = this.routesService.getStartSettings();
             const { distance } = data;
-            const route = this.getRideDisplay().route;
+            const route = this.route;
             if (!route || !coach || !data)
                 return;
-            const prevRouteDistance = coach.getProgess();
+            const prevRouteDistance = coach.getProgess() ?? 0;
             const newRouteDistance = prevRouteDistance + data.distance;
             coach.setProgress(newRouteDistance);
             if (startSettings.type === 'Free-Ride')

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

@@ -729,7 +729,7 @@ let DeviceRideService = (() => {
             const adapters = this.rideAdapters?.filter(ai => ai.adapter.getInterface() === ifName);
             const stillHealthy = adapters.filter(ai => ai.isHealthy === undefined || ai.isHealthy);
             this.logEvent({ message: 'reconnect confirmed', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (Date.now() - unhealthy.tsLastData), tsLastData: unhealthy.tsLastData, stillHealthy: stillHealthy?.length, onSameInterface: adapters.length });
-            if (!stillHealthy?.length && adapters.length > 1) {
+            if (!stillHealthy?.length && adapters.length > 1 && ifName !== 'ble') {
                 await this.reconnectInterface(ifName, adapters);
             }
             else {

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

@@ -48,6 +48,7 @@ import { FollowRouteDisplayService } from "../route/FollowRouteDisplayService";
 import { WorkoutDisplayService } from "../workout/WorkoutDisplayService";
 import { getBindings } from "../../api";
 import { RLVDisplayService } from "../route/RLVDisplayService";
+import { getCoachesService } from "../../coaches";
 let RideDisplayService = (() => {
     let _classDecorators = [Singleton];
     let _classDescriptor;
@@ -63,6 +64,7 @@ let RideDisplayService = (() => {
     let _getUserSettings_decorators;
     let _getDeviceConfiguration_decorators;
     let _getUIBinding_decorators;
+    let _getCoaches_decorators;
     var RideDisplayService = class extends _classSuper {
         static { _classThis = this; }
         static {
@@ -75,6 +77,7 @@ let RideDisplayService = (() => {
             _getUserSettings_decorators = [Injectable];
             _getDeviceConfiguration_decorators = [Injectable];
             _getUIBinding_decorators = [Injectable];
+            _getCoaches_decorators = [Injectable];
             __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, _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, _getWorkoutList_decorators, { kind: "method", name: "getWorkoutList", static: false, private: false, access: { has: obj => "getWorkoutList" in obj, get: obj => obj.getWorkoutList }, metadata: _metadata }, null, _instanceExtraInitializers);
@@ -83,6 +86,7 @@ let RideDisplayService = (() => {
             __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, _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(this, null, _getUIBinding_decorators, { kind: "method", name: "getUIBinding", static: false, private: false, access: { has: obj => "getUIBinding" in obj, get: obj => obj.getUIBinding }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getCoaches_decorators, { kind: "method", name: "getCoaches", static: false, private: false, access: { has: obj => "getCoaches" in obj, get: obj => obj.getCoaches }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             RideDisplayService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -137,6 +141,7 @@ let RideDisplayService = (() => {
                 }
                 this.startDevices();
                 this.startRide();
+                this.getCoaches().startRide(this.route);
                 this.setState('Starting');
                 this.logEvent({ message: 'overlay shown', overlay: 'start overlay' });
             }
@@ -188,6 +193,7 @@ let RideDisplayService = (() => {
                     return;
                 this.logEvent({ message: "pause activity request", activity: this.activity?.id, userRequested: requester === 'user' });
                 this.state = 'Paused';
+                this.getCoaches().pauseRide();
                 if (requester === 'user') {
                     this.getActivityRide().pause(false);
                 }
@@ -207,6 +213,7 @@ let RideDisplayService = (() => {
                 this.logEvent({ message: "continue activity request", activity: this.activity?.id, userRequested: requester === 'user' });
                 this.isResuming = true;
                 this.state = 'Active';
+                this.getCoaches().resumeRide();
                 if (requester === 'user') {
                     this.getActivityRide().resume('user');
                 }
@@ -248,6 +255,7 @@ let RideDisplayService = (() => {
             }
             await this.stopRide({ exit, noStateUpdates: true });
             this.getActivityRide().cleanup();
+            this.getCoaches().stopRide();
             delete this.type;
         }
         toggleCyclingMode() {
@@ -530,7 +538,7 @@ let RideDisplayService = (() => {
                 return;
             this.resume('device');
         }
-        onActivityUpdate(data) {
+        onActivityUpdate() {
             if (this.state === 'Active') {
                 const currentValues = this.getActivityRide().getCurrentValues();
                 if (!currentValues)
@@ -540,6 +548,8 @@ let RideDisplayService = (() => {
                     this.isResuming = false;
                     delete this.pauseReason;
                 }
+                const { time, speed, routeDistance, distance } = currentValues;
+                const data = { time, speed, routeDistance, distance };
                 this.getRideModeService().onActivityUpdate(data, currentValues);
                 this.observer.emit('data-update', data, currentValues);
             }
@@ -1001,9 +1011,9 @@ let RideDisplayService = (() => {
         getStartOverlayProps = () => {
             const mode = this.getRideType();
             const readyToStart = this.isStartDeviceReadyToStart() && this.getRideModeService().isStartRideCompleted();
-            const devices = this.deviceInfo ?? [];
+            const devicesState = this.deviceInfo ?? [];
             const displayOverlayProps = this.getRideModeService().getStartOverlayProps() ?? {};
-            return { mode, rideState: this.state, devices, readyToStart, ...displayOverlayProps };
+            return { mode, rideState: this.state, devicesState, readyToStart, ...displayOverlayProps };
         };
         getDeviceStartSettings() {
             let forceErgMode = false;
@@ -1088,6 +1098,9 @@ let RideDisplayService = (() => {
         getUIBinding() {
             return getBindings().ui;
         }
+        getCoaches() {
+            return getCoachesService();
+        }
     };
     return RideDisplayService = _classThis;
 })();

package/lib/esm/ride/route/RLVDisplayService.js

@@ -34,6 +34,7 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
 };
 import { Injectable } from "../../base/decorators";
 import { Observer } from "../../base/types";
+import { getCoachesService } from "../../coaches";
 import { useLocalization } from "../../i18n";
 import { concatPaths } from "../../maps/MapArea/utils";
 import { correctDistanceValues, getNextVideoId, hasNextVideo, useRouteList, validateRoute } from "../../routes";
@@ -45,13 +46,16 @@ let RLVDisplayService = (() => {
     let _instanceExtraInitializers = [];
     let _getRouteList_decorators;
     let _getLocalization_decorators;
+    let _getCoaches_decorators;
     return class RLVDisplayService extends _classSuper {
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _getRouteList_decorators = [Injectable];
             _getLocalization_decorators = [Injectable];
+            _getCoaches_decorators = [Injectable];
             __esDecorate(this, null, _getRouteList_decorators, { kind: "method", name: "getRouteList", static: false, private: false, access: { has: obj => "getRouteList" in obj, get: obj => obj.getRouteList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getLocalization_decorators, { kind: "method", name: "getLocalization", static: false, private: false, access: { has: obj => "getLocalization" in obj, get: obj => obj.getLocalization }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getCoaches_decorators, { kind: "method", name: "getCoaches", static: false, private: false, access: { has: obj => "getCoaches" in obj, get: obj => obj.getCoaches }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
         currentVideo = __runInitializers(this, _instanceExtraInitializers);
@@ -252,6 +256,7 @@ let RLVDisplayService = (() => {
             concatPaths(currentPoints, nextPoints, 'after');
             validateRoute(this.getCurrentRoute(), false);
             this.emit('route-updated', this.getCurrentRoute());
+            this.getCoaches().updateRoute(this.getCurrentRoute());
             this.logEvent({ message: 'switching to next video', route: this.getCurrentRoute().details.title,
                 segment: this.currentVideo.route.description.title, offset: this.offset, segmentDistance: this.currentVideo.route.description.distance,
                 totalDistance: this.getCurrentRoute().details.distance });
@@ -558,6 +563,9 @@ let RLVDisplayService = (() => {
         getLocalization() {
             return useLocalization();
         }
+        getCoaches() {
+            return getCoachesService();
+        }
     };
 })();
 export { RLVDisplayService };

package/lib/types/coaches/coach.d.ts

@@ -2,6 +2,8 @@ import { EventLogger } from "gd-eventlog";
 import { CoachEditProps, CoachSettings } from "./types";
 import { IncyclistDeviceAdapter } from 'incyclist-devices';
 import { RoutePoint } from "../routes/base/types";
+import { ActiveRideEntry } from "../activities";
+import { Route } from "../routes/base/model/route";
 export declare class Coach {
     protected _settings: CoachSettings;
     protected _id: string;
@@ -10,10 +12,12 @@ export declare class Coach {
     protected simulator: IncyclistDeviceAdapter;
     protected logger: EventLogger;
     protected position: RoutePoint;
+    protected route: Route;
     constructor(settings: CoachSettings);
     get id(): string;
     get settings(): CoachSettings;
     get lead(): number;
+    setRoute(route: Route): void;
     setProgress(routeDistance: number): void;
     getProgess(): number;
     setPosition(point: RoutePoint): void;
@@ -21,6 +25,7 @@ export declare class Coach {
     setRiderPosition(routeDistance: number): void;
     sendDeviceUpdate(request: any): void;
     getDisplayProperties(): CoachEditProps;
+    getRidersListDisplayProperties(): Partial<ActiveRideEntry>;
     update(settings: CoachEditProps): void;
     initSimulator(user: {
         weight: number;

package/lib/types/coaches/service.d.ts

@@ -6,16 +6,19 @@ import { UserSettingsService } from "../settings";
 import { Coach } from "./coach";
 import { DeviceData } from "incyclist-devices";
 import { RideDisplayService } from "../ride";
+import { Route } from "../routes/base/model/route";
 export declare class CoachesService extends IncyclistService {
     protected coaches: Array<Coach>;
     protected observer: Observer;
     protected isPaused: boolean;
+    protected route: Route;
     constructor();
     getCoaches(): Array<Coach>;
     openCoachEdit(coach?: Coach): Coach;
     saveCoach(coach: Coach): void;
     deleteCoach(coach: Coach): void;
-    startRide(): Promise<Observer | null>;
+    startRide(route: Route): Promise<Observer | null>;
+    updateRoute(route: Route): void;
     stopRide(): Promise<void>;
     pauseRide(): void;
     resumeRide(): void;

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

@@ -70,7 +70,7 @@ export declare class RideDisplayService extends IncyclistService implements ICur
     protected onActivityWentActive(): void;
     protected onActivityPaused(autoResume: any): void;
     protected onActivityResumed(): void;
-    protected onActivityUpdate(data: any): void;
+    protected onActivityUpdate(): void;
     protected onWorkoutStopped(): void;
     protected onWorkoutCompleted(): void;
     protected checkCyclingModeToggle(): void;
@@ -131,5 +131,6 @@ export declare class RideDisplayService extends IncyclistService implements ICur
     protected getUserSettings(): import("../../settings").UserSettingsService;
     protected getDeviceConfiguration(): import("../../devices").DeviceConfigurationService;
     protected getUIBinding(): INativeUI;
+    protected getCoaches(): import("../../coaches").CoachesService;
 }
 export declare const useRideDisplay: () => RideDisplayService;

package/lib/types/ride/route/RLVDisplayService.d.ts

@@ -94,5 +94,6 @@ export declare class RLVDisplayService extends RouteDisplayService {
     protected checkForAdditionalVideos(route?: Route): Promise<boolean>;
     protected getRouteList(): RouteListService;
     protected getLocalization(): LocalizationService;
+    protected getCoaches(): import("../../coaches").CoachesService;
 }
 export {};

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.6",
+  "version": "1.7.8",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },
   "dependencies": {
     "axios": "^1.13.4",
-    "incyclist-devices": "^3.0.3",
+    "incyclist-devices": "^3.0.6",
     "promise.any": "^2.0.6",
     "semver": "^7.7.3",
     "tcx-builder": "^1.1.1",