incyclist-services 1.7.120 → 1.7.121

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

@@ -342,6 +342,7 @@ let ActiveRidesService = (() => {
                         return;
                     const displayItem = {
                         isUser: item.sessionId === this.session,
+                        isCoach: item.isCoach,
                         name: this.getName(item),
                         diffDistance: this.getDistanceDiff(item),
                         distance: this.getDistance(item),
@@ -685,6 +686,7 @@ let ActiveRidesService = (() => {
                 if (!payload.user) {
                     this.getRemoteActivityDetails(session);
                 }
+                this.observer.emit('update', this.getDisplayProps());
             }
             catch (err) {
                 this.logError(err, 'onActivityStartEvent');
@@ -762,6 +764,7 @@ let ActiveRidesService = (() => {
                         this.logEvent({ message: 'group ride user joined', active: this.others.length + 1, activityId: this.activity?.id, route: this.activity.route?.title, routeHash: this.getRouteHash(), remote });
                     }
                 }
+                this.observer.emit('update', this.getDisplayProps());
             }
             catch (err) {
                 this.logError(err, 'onActivityStartEvent');
@@ -784,8 +787,10 @@ let ActiveRidesService = (() => {
             if (!this.others?.length)
                 return;
             const idx = this.others.findIndex(ar => ar.sessionId === session);
-            if (idx !== -1)
-                this.others.splice(idx, 1);
+            if (idx === -1)
+                return;
+            this.others.splice(idx, 1);
+            this.observer.emit('update', this.getDisplayProps());
             if (!this.isStarted)
                 return;
             if (this.others.length === 0) {

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

@@ -397,7 +397,7 @@ let DevicePairingService = (() => {
                 if (this.isScanning())
                     await this.stopScanning();
             }
-            this.state.capabilities.forEach(c => c.connectState = 'waiting');
+            (this.state.capabilities ?? []).forEach(c => c.connectState = 'waiting');
             this.state.waiting = true;
         }
         getCapability(capability) {
@@ -1361,7 +1361,7 @@ let DevicePairingService = (() => {
         pauseAdapters(adapters, enforced = false) {
             if (!adapters)
                 return;
-            const capabilities = this.state.capabilities;
+            const capabilities = this.state.capabilities ?? [];
             capabilities.forEach(c => {
                 if (!enforced && !c.selected && c.connectState === 'failed')
                     return;
@@ -1372,7 +1372,7 @@ let DevicePairingService = (() => {
         resumeAdapters(adapters = this.state.adapters) {
             if (!adapters?.length)
                 return;
-            const capabilities = this.state.capabilities;
+            const capabilities = this.state.capabilities ?? [];
             capabilities.forEach(c => {
                 if (!c.selected && c.connectState === 'failed')
                     return;

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

@@ -101,6 +101,8 @@ let RidePageService = (() => {
         prevRidesMode = 'list';
         gestureHintDismissed = false;
         prevRidesShown = false;
+        nearbyRiders;
+        nearbyRidersSubscribed = false;
         viewTransition = false;
         constructor() {
             super('RidePage');
@@ -142,6 +144,7 @@ let RidePageService = (() => {
                 gd_eventlog_1.EventLogger.setGlobalConfig('page', pageLogName);
                 this.gestureHintDismissed = false;
                 this.prevRidesShown = false;
+                this.nearbyRidersSubscribed = false;
                 super.openPage();
                 try {
                     const service = this.getRideDisplay();
@@ -888,7 +891,8 @@ let RidePageService = (() => {
                 gestureHint: this.buildGestureHint(startOverlayProps === null),
                 loadIncrement: this.getLoadIncrement(),
                 loadButtonMode: this.getLoadButtonMode(),
-                prevRides: this.buildPrevRides()
+                prevRides: this.buildPrevRides(),
+                nearbyRiders: this.nearbyRiders
             };
         }
         buildPrevRides() {
@@ -951,8 +955,55 @@ let RidePageService = (() => {
                 tsStart: row.tsStart
             };
         }
+        subscribeToNearbyRiders() {
+            try {
+                if (this.nearbyRidersSubscribed)
+                    return;
+                const observer = this.getActiveRidesObserver();
+                if (!observer)
+                    return;
+                observer.on('update', (rows) => {
+                    this.nearbyRiders = { rows: (rows ?? []).map(row => this.mapNearbyRiderRow(row)) };
+                    this.rideObserver?.emit('nearby-riders-update', this.nearbyRiders);
+                    this.updatePageDisplay();
+                });
+                this.nearbyRidersSubscribed = true;
+            }
+            catch (err) {
+                this.logError(err, 'subscribeToNearbyRiders');
+            }
+        }
+        mapNearbyRiderRow(row) {
+            return {
+                isUser: !!row.isUser,
+                isPaused: !!row.isPaused,
+                isCoach: !!row.isCoach,
+                name: row.name,
+                distance: row.distance ?? { value: 0, unit: '' },
+                diffDistance: row.diffDistance ?? { value: 0, unit: '' },
+                power: row.power,
+                mpower: row.mpower,
+                speed: row.speed,
+                avatar: row.avatar,
+                backgroundColor: row.backgroundColor,
+                textColor: row.textColor,
+                lat: row.lat,
+                lng: row.lng
+            };
+        }
+        getActiveRidesObserver() {
+            try {
+                const modeService = this.getRideDisplay()?.getRideModeService?.();
+                return modeService?.getActiveRidesObserver?.();
+            }
+            catch (err) {
+                this.logError(err, 'getActiveRidesObserver');
+                return undefined;
+            }
+        }
         onDisplayStateUpdate(state) {
             this.subscribeToWorkoutObserver();
+            this.subscribeToNearbyRiders();
             switch (state) {
                 case 'Paused':
                     this.menuProps = this.buildPausedMenuProps();

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

@@ -83,6 +83,7 @@ let RouteDisplayService = (() => {
         prevPowerTs;
         nearbyRiders;
         _startSettings;
+        activeRidesObserver;
         init(service) {
             try {
                 super.init(service);
@@ -369,6 +370,7 @@ let RouteDisplayService = (() => {
             const session = this.getAppInfo().session;
             try {
                 const observer = this.getActiveRides().init(session);
+                this.activeRidesObserver = observer;
                 observer.on('update', (data) => {
                     this.nearbyRiders = data.filter(ar => !ar.isUser);
                 });
@@ -380,11 +382,15 @@ let RouteDisplayService = (() => {
         cleanupActiveRides() {
             try {
                 this.getActiveRides().stop();
+                delete this.activeRidesObserver;
             }
             catch (err) {
                 this.logError(err, 'cleanupActiveRides');
             }
         }
+        getActiveRidesObserver() {
+            return this.activeRidesObserver;
+        }
         savePosition(_startPos) {
         }
         getOriginalRoute() {

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

@@ -339,6 +339,7 @@ let ActiveRidesService = (() => {
                         return;
                     const displayItem = {
                         isUser: item.sessionId === this.session,
+                        isCoach: item.isCoach,
                         name: this.getName(item),
                         diffDistance: this.getDistanceDiff(item),
                         distance: this.getDistance(item),
@@ -682,6 +683,7 @@ let ActiveRidesService = (() => {
                 if (!payload.user) {
                     this.getRemoteActivityDetails(session);
                 }
+                this.observer.emit('update', this.getDisplayProps());
             }
             catch (err) {
                 this.logError(err, 'onActivityStartEvent');
@@ -759,6 +761,7 @@ let ActiveRidesService = (() => {
                         this.logEvent({ message: 'group ride user joined', active: this.others.length + 1, activityId: this.activity?.id, route: this.activity.route?.title, routeHash: this.getRouteHash(), remote });
                     }
                 }
+                this.observer.emit('update', this.getDisplayProps());
             }
             catch (err) {
                 this.logError(err, 'onActivityStartEvent');
@@ -781,8 +784,10 @@ let ActiveRidesService = (() => {
             if (!this.others?.length)
                 return;
             const idx = this.others.findIndex(ar => ar.sessionId === session);
-            if (idx !== -1)
-                this.others.splice(idx, 1);
+            if (idx === -1)
+                return;
+            this.others.splice(idx, 1);
+            this.observer.emit('update', this.getDisplayProps());
             if (!this.isStarted)
                 return;
             if (this.others.length === 0) {

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

@@ -391,7 +391,7 @@ let DevicePairingService = (() => {
                 if (this.isScanning())
                     await this.stopScanning();
             }
-            this.state.capabilities.forEach(c => c.connectState = 'waiting');
+            (this.state.capabilities ?? []).forEach(c => c.connectState = 'waiting');
             this.state.waiting = true;
         }
         getCapability(capability) {
@@ -1355,7 +1355,7 @@ let DevicePairingService = (() => {
         pauseAdapters(adapters, enforced = false) {
             if (!adapters)
                 return;
-            const capabilities = this.state.capabilities;
+            const capabilities = this.state.capabilities ?? [];
             capabilities.forEach(c => {
                 if (!enforced && !c.selected && c.connectState === 'failed')
                     return;
@@ -1366,7 +1366,7 @@ let DevicePairingService = (() => {
         resumeAdapters(adapters = this.state.adapters) {
             if (!adapters?.length)
                 return;
-            const capabilities = this.state.capabilities;
+            const capabilities = this.state.capabilities ?? [];
             capabilities.forEach(c => {
                 if (!c.selected && c.connectState === 'failed')
                     return;

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

@@ -98,6 +98,8 @@ let RidePageService = (() => {
         prevRidesMode = 'list';
         gestureHintDismissed = false;
         prevRidesShown = false;
+        nearbyRiders;
+        nearbyRidersSubscribed = false;
         viewTransition = false;
         constructor() {
             super('RidePage');
@@ -139,6 +141,7 @@ let RidePageService = (() => {
                 EventLogger.setGlobalConfig('page', pageLogName);
                 this.gestureHintDismissed = false;
                 this.prevRidesShown = false;
+                this.nearbyRidersSubscribed = false;
                 super.openPage();
                 try {
                     const service = this.getRideDisplay();
@@ -885,7 +888,8 @@ let RidePageService = (() => {
                 gestureHint: this.buildGestureHint(startOverlayProps === null),
                 loadIncrement: this.getLoadIncrement(),
                 loadButtonMode: this.getLoadButtonMode(),
-                prevRides: this.buildPrevRides()
+                prevRides: this.buildPrevRides(),
+                nearbyRiders: this.nearbyRiders
             };
         }
         buildPrevRides() {
@@ -948,8 +952,55 @@ let RidePageService = (() => {
                 tsStart: row.tsStart
             };
         }
+        subscribeToNearbyRiders() {
+            try {
+                if (this.nearbyRidersSubscribed)
+                    return;
+                const observer = this.getActiveRidesObserver();
+                if (!observer)
+                    return;
+                observer.on('update', (rows) => {
+                    this.nearbyRiders = { rows: (rows ?? []).map(row => this.mapNearbyRiderRow(row)) };
+                    this.rideObserver?.emit('nearby-riders-update', this.nearbyRiders);
+                    this.updatePageDisplay();
+                });
+                this.nearbyRidersSubscribed = true;
+            }
+            catch (err) {
+                this.logError(err, 'subscribeToNearbyRiders');
+            }
+        }
+        mapNearbyRiderRow(row) {
+            return {
+                isUser: !!row.isUser,
+                isPaused: !!row.isPaused,
+                isCoach: !!row.isCoach,
+                name: row.name,
+                distance: row.distance ?? { value: 0, unit: '' },
+                diffDistance: row.diffDistance ?? { value: 0, unit: '' },
+                power: row.power,
+                mpower: row.mpower,
+                speed: row.speed,
+                avatar: row.avatar,
+                backgroundColor: row.backgroundColor,
+                textColor: row.textColor,
+                lat: row.lat,
+                lng: row.lng
+            };
+        }
+        getActiveRidesObserver() {
+            try {
+                const modeService = this.getRideDisplay()?.getRideModeService?.();
+                return modeService?.getActiveRidesObserver?.();
+            }
+            catch (err) {
+                this.logError(err, 'getActiveRidesObserver');
+                return undefined;
+            }
+        }
         onDisplayStateUpdate(state) {
             this.subscribeToWorkoutObserver();
+            this.subscribeToNearbyRiders();
             switch (state) {
                 case 'Paused':
                     this.menuProps = this.buildPausedMenuProps();

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

@@ -77,6 +77,7 @@ let RouteDisplayService = (() => {
         prevPowerTs;
         nearbyRiders;
         _startSettings;
+        activeRidesObserver;
         init(service) {
             try {
                 super.init(service);
@@ -363,6 +364,7 @@ let RouteDisplayService = (() => {
             const session = this.getAppInfo().session;
             try {
                 const observer = this.getActiveRides().init(session);
+                this.activeRidesObserver = observer;
                 observer.on('update', (data) => {
                     this.nearbyRiders = data.filter(ar => !ar.isUser);
                 });
@@ -374,11 +376,15 @@ let RouteDisplayService = (() => {
         cleanupActiveRides() {
             try {
                 this.getActiveRides().stop();
+                delete this.activeRidesObserver;
             }
             catch (err) {
                 this.logError(err, 'cleanupActiveRides');
             }
         }
+        getActiveRidesObserver() {
+            return this.activeRidesObserver;
+        }
         savePosition(_startPos) {
         }
         getOriginalRoute() {

package/lib/types/activities/active-rides/types.d.ts

@@ -78,6 +78,7 @@ export type ActiveRideListDisplayItem = {
     isUser?: boolean;
     avatar?: ActiveRideListAvatar;
     isPaused?: boolean;
+    isCoach?: boolean;
     name: string;
     distance?: number | {
         value: number;

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

@@ -1,8 +1,8 @@
 import { IncyclistPageService } from "../../base/pages";
 import { CurrentRideDisplayProps, CurrentRideState, IObserver, RideType } from "../../types";
-import { AnyRidePageDisplayProps, GPXRidePageDisplayProps, IRidePageService, PrevRidesRowProps, LoadControlButtonLabels, RideMenuProps, RidePageDisplayProps, StartGateProps, VideoRidePageDisplayProps, WorkoutDashboardLine, WorkoutGestureHint, WorkoutGraphActuals, WorkoutGraphPlan, WorkoutRideMenuProps, WorkoutRidePageDisplayProps, WorkoutUpcomingSteps } from "./types";
+import { AnyRidePageDisplayProps, GPXRidePageDisplayProps, IRidePageService, PrevRidesRowProps, NearbyRiderRowProps, LoadControlButtonLabels, RideMenuProps, RidePageDisplayProps, StartGateProps, VideoRidePageDisplayProps, WorkoutDashboardLine, WorkoutGestureHint, WorkoutGraphActuals, WorkoutGraphPlan, WorkoutRideMenuProps, WorkoutRidePageDisplayProps, WorkoutUpcomingSteps } from "./types";
 import { ISecretBinding } from "../../api/secret";
-import { PrevRidesListDisplayProps } from "../../activities";
+import { ActiveRideListDisplayItem, PrevRidesListDisplayProps } from "../../activities";
 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";
@@ -21,6 +21,8 @@ export declare class RidePageService extends IncyclistPageService implements IRi
     protected prevRidesMode: 'condensed' | 'list';
     protected gestureHintDismissed: boolean;
     protected prevRidesShown: boolean;
+    protected nearbyRiders?: RidePageDisplayProps['nearbyRiders'];
+    protected nearbyRidersSubscribed: boolean;
     protected viewTransition: boolean;
     constructor();
     initPage(): Promise<RideType | undefined>;
@@ -123,11 +125,17 @@ export declare class RidePageService extends IncyclistPageService implements IRi
             rows: PrevRidesRowProps[];
             hasMore: boolean;
         };
+        nearbyRiders: {
+            rows: NearbyRiderRowProps[];
+        };
     };
     protected buildPrevRides(): RidePageDisplayProps['prevRides'];
     protected onPrevRidesTick(): void;
     getPrevRidesRows(): PrevRidesRowProps[];
     protected mapPrevRidesRow(row: PrevRidesListDisplayProps): PrevRidesRowProps;
+    protected subscribeToNearbyRiders(): void;
+    protected mapNearbyRiderRow(row: ActiveRideListDisplayItem): NearbyRiderRowProps;
+    protected getActiveRidesObserver(): IObserver | undefined;
     protected onDisplayStateUpdate(state: CurrentRideState): void;
     protected updatePageDisplay(): void;
     protected registerHandlers(observer: IObserver | null | undefined, map: Record<string, any>): void;

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

@@ -5,6 +5,7 @@ import { CurrentPosition, CurrentRideState, GPXStartOverlayProps, RideViewType,
 import type { LoadButtonMode, PowerAdjustmentResult } from "../../workouts/ride/types";
 import type { WorkoutGraphPlanBar } from "../../workouts/base/graph/types";
 import type { Avatar } from "../../avatars";
+import type { ActiveRideListAvatar } from "../../activities";
 export interface StartGateProps {
     title: string;
     body: string;
@@ -48,6 +49,9 @@ export interface RidePageDisplayProps {
         rows: PrevRidesRowProps[];
         hasMore: boolean;
     };
+    nearbyRiders?: {
+        rows: NearbyRiderRowProps[];
+    };
 }
 export interface PrevRidesRowProps {
     position: number;
@@ -63,6 +67,31 @@ export interface PrevRidesRowProps {
     lng?: number;
     tsStart?: number;
 }
+export interface NearbyRiderRowProps {
+    isUser: boolean;
+    isPaused: boolean;
+    isCoach: boolean;
+    name: string;
+    distance: {
+        value: number;
+        unit: string;
+    };
+    diffDistance: {
+        value: number;
+        unit: string;
+    };
+    power?: number;
+    mpower?: number;
+    speed?: {
+        value: number;
+        unit: string;
+    };
+    avatar: ActiveRideListAvatar;
+    backgroundColor?: string;
+    textColor?: string;
+    lat?: number;
+    lng?: number;
+}
 export interface VideoRidePageDisplayProps extends RidePageDisplayProps {
     video?: VideoDisplayProps;
     videos?: VideoDisplayProps[];

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

@@ -8,6 +8,7 @@ import { RouteSettings } from "../../routes/list/cards/types";
 import { ActiveRideListDisplayItem, ScreenShotInfo } from "../../activities";
 import { ActivityUpdate, CurrentActivityData } from "../../activities/ride/types";
 import { RoutePoint } from "../../types";
+import { Observer } from "../../base/types";
 export declare class RouteDisplayService extends RideModeService {
     protected prevRequestSlope?: number;
     protected position?: CurrentPosition;
@@ -18,6 +19,7 @@ export declare class RouteDisplayService extends RideModeService {
     protected prevPowerTs?: number;
     protected nearbyRiders?: ActiveRideListDisplayItem[];
     protected _startSettings?: RouteSettings;
+    protected activeRidesObserver?: Observer;
     init(service: ICurrentRideService): void;
     getDeviceStartSettings(): {
         realityFactor: number;
@@ -60,6 +62,7 @@ export declare class RouteDisplayService extends RideModeService {
     protected checkFinishOptions(position: CurrentPosition): boolean;
     protected prepareActiveRides(): void;
     cleanupActiveRides(): void;
+    getActiveRidesObserver(): Observer | undefined;
     protected savePosition(_startPos?: number): void;
     getOriginalRoute(): Route;
     getCurrentRoute(): Route;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.120",
+  "version": "1.7.121",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },
   "dependencies": {
     "@garmin/fitsdk": "^21.213.0",
     "axios": "^1.19.0",
-    "incyclist-devices": "^3.0.33",
+    "incyclist-devices": "^3.0.34",
     "promise.any": "^2.0.6",
     "semver": "^7.7.4",
     "tcx-builder": "^1.1.1",