incyclist-services 1.6.8 → 1.7.1

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

@@ -1,4 +1,3 @@
-"use strict";
 var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
     var useValue = arguments.length > 2;
     for (var i = 0; i < initializers.length; i++) {
@@ -33,39 +32,25 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __setFunctionName = (this && this.__setFunctionName) || function (f, name, prefix) {
-    if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
-    return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useActiveRides = exports.ActiveRidesService = void 0;
-const avatars_1 = require("../../avatars");
-const decorators_1 = require("../../base/decorators");
-const service_1 = require("../../base/service");
-const types_1 = require("../../base/types");
-const coaches_1 = require("../../coaches");
-const monitoring_1 = require("../../monitoring");
-const routes_1 = require("../../routes");
-const settings_1 = require("../../settings");
-const utils_1 = require("../../utils");
-const active_rides_1 = require("../base/api/active-rides");
-const ride_1 = require("../ride");
-const mq_1 = require("./mq");
+import { useAvatars } from "../../avatars";
+import { Injectable } from "../../base/decorators";
+import { IncyclistService } from "../../base/service";
+import { Observer, Singleton } from "../../base/types";
+import { getCoachesService } from "../../coaches";
+import { useUnitConverter } from "../../i18n";
+import { useOnlineStatusMonitoring } from "../../monitoring";
+import { useRouteList } from "../../routes";
+import { useUserSettings } from "../../settings";
+import { waitNextTick } from "../../utils";
+import { IncyclistActiveRidesApi } from "../base/api/active-rides";
+import { useActivityRide } from "../ride";
+import { ActiveRideListMessageQueue } from "./mq";
 let ActiveRidesService = (() => {
-    let _classDecorators = [types_1.Singleton];
+    let _classDecorators = [Singleton];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
-    let _classSuper = service_1.IncyclistService;
+    let _classSuper = IncyclistService;
     let _instanceExtraInitializers = [];
     let _getOnlineStatusMonitoring_decorators;
     let _getIncyclistActiveRidesApi_decorators;
@@ -73,19 +58,52 @@ let ActiveRidesService = (() => {
     let _getActivityRide_decorators;
     let _getRouteList_decorators;
     let _getCoachesService_decorators;
-    var ActiveRidesService = _classThis = class extends _classSuper {
+    let _getUnitConverter_decorators;
+    var ActiveRidesService = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getOnlineStatusMonitoring_decorators = [Injectable];
+            _getIncyclistActiveRidesApi_decorators = [Injectable];
+            _getUserSettings_decorators = [Injectable];
+            _getActivityRide_decorators = [Injectable];
+            _getRouteList_decorators = [Injectable];
+            _getCoachesService_decorators = [Injectable];
+            _getUnitConverter_decorators = [Injectable];
+            __esDecorate(this, null, _getOnlineStatusMonitoring_decorators, { kind: "method", name: "getOnlineStatusMonitoring", static: false, private: false, access: { has: obj => "getOnlineStatusMonitoring" in obj, get: obj => obj.getOnlineStatusMonitoring }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getIncyclistActiveRidesApi_decorators, { kind: "method", name: "getIncyclistActiveRidesApi", static: false, private: false, access: { has: obj => "getIncyclistActiveRidesApi" in obj, get: obj => obj.getIncyclistActiveRidesApi }, 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);
+            __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, _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, _getCoachesService_decorators, { kind: "method", name: "getCoachesService", static: false, private: false, access: { has: obj => "getCoachesService" in obj, get: obj => obj.getCoachesService }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getUnitConverter_decorators, { kind: "method", name: "getUnitConverter", static: false, private: false, access: { has: obj => "getUnitConverter" in obj, get: obj => obj.getUnitConverter }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            ActiveRidesService = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        session = __runInitializers(this, _instanceExtraInitializers);
+        maxLength;
+        observer;
+        current;
+        others;
+        coaches;
+        isSubscribed;
+        isOnline;
+        apiState = { busy: false };
+        mq;
+        prevLogTS = 0;
+        isStarted = false;
+        routeListObserver;
+        routesStats = [];
+        activityEventHandlers = {
+            update: this.onActivityUpdateEvent.bind(this),
+            start: this.onActivityStartEvent.bind(this),
+            stop: this.onActivityStopEvent.bind(this)
+        };
+        onlineStatusHandler;
         constructor() {
             super('ActiveRides');
-            this.session = __runInitializers(this, _instanceExtraInitializers);
-            this.apiState = { busy: false };
-            this.prevLogTS = 0;
-            this.isStarted = false;
-            this.routesStats = [];
-            this.activityEventHandlers = {
-                update: this.onActivityUpdateEvent.bind(this),
-                start: this.onActivityStartEvent.bind(this),
-                stop: this.onActivityStopEvent.bind(this)
-            };
             const routeList = this.getRouteList();
             routeList.on('opened', this.onRoutePageOpened.bind(this));
             routeList.on('closed', () => {
@@ -103,7 +121,7 @@ let ActiveRidesService = (() => {
                 this.session = session;
                 this.startOnlineCheck();
                 this.start(session);
-                this.observer = new types_1.Observer();
+                this.observer = new Observer();
                 return this.observer;
             }
             catch (err) {
@@ -111,19 +129,18 @@ let ActiveRidesService = (() => {
             }
         }
         get() {
-            var _a, _b, _c, _d;
             this.updateCoaches();
             try {
                 if (!this.current || (!this.others && !this.coaches))
                     return [];
-                if (!((_a = this.others) === null || _a === void 0 ? void 0 : _a.length) && !((_b = this.coaches) === null || _b === void 0 ? void 0 : _b.length))
+                if (!this.others?.length && !this.coaches?.length)
                     return [];
                 const list = [
                     this.current,
-                    ...(_c = this.others) !== null && _c !== void 0 ? _c : [],
-                    ...(_d = this.coaches) !== null && _d !== void 0 ? _d : []
+                    ...this.others ?? [],
+                    ...this.coaches ?? []
                 ];
-                return list !== null && list !== void 0 ? list : [];
+                return list ?? [];
             }
             catch (err) {
                 this.logError(err, 'get');
@@ -134,12 +151,11 @@ let ActiveRidesService = (() => {
             return this.observer;
         }
         stop() {
-            var _a, _b;
             if (!this.current)
                 return;
             try {
                 if (this.isStarted) {
-                    this.logEvent({ message: 'group ride finished', reason: 'activity stopped', activityId: (_a = this.activity) === null || _a === void 0 ? void 0 : _a.id, route: (_b = this.activity.route) === null || _b === void 0 ? void 0 : _b.title, routeHash: this.getRouteHash() });
+                    this.logEvent({ message: 'group ride finished', reason: 'activity stopped', activityId: this.activity?.id, route: this.activity.route?.title, routeHash: this.getRouteHash() });
                 }
                 this.publishStopEvent();
                 this.cleanup();
@@ -161,48 +177,43 @@ let ActiveRidesService = (() => {
             });
             return map;
         }
-        onRoutePageOpened(observer) {
-            return __awaiter(this, void 0, void 0, function* () {
-                this.routeListObserver = observer;
-                yield this.getActiveRideCounts();
-                this.routeListObserver.emit('stats-update', this.routesStats);
-            });
+        async onRoutePageOpened(observer) {
+            this.routeListObserver = observer;
+            await this.getActiveRideCounts();
+            this.routeListObserver.emit('stats-update', this.routesStats);
         }
-        getActiveRideCounts() {
-            return __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const isOnline = this.getOnlineStatusMonitoring().onlineStatus;
-                    if (!isOnline)
-                        return;
-                    const activeRides = yield this.getApi().getAll();
-                    const routes = this.getRouteList().getAllRoutes();
-                    const counts = [];
-                    routes.forEach(route => {
-                        var _a;
-                        const routeRides = (_a = activeRides.filter(ar => ar.ride.routeHash === route.description.routeHash)) !== null && _a !== void 0 ? _a : [];
-                        const count = routeRides.length;
-                        counts.push({
-                            count,
-                            routeId: route.description.id,
-                            routeHash: route.description.routeHash
-                        });
+        async getActiveRideCounts() {
+            try {
+                const isOnline = this.getOnlineStatusMonitoring().onlineStatus;
+                if (!isOnline)
+                    return;
+                const activeRides = await this.getApi().getAll();
+                const routes = this.getRouteList().getAllRoutes();
+                const counts = [];
+                routes.forEach(route => {
+                    const routeRides = activeRides.filter(ar => ar.ride.routeHash === route.description.routeHash) ?? [];
+                    const count = routeRides.length;
+                    counts.push({
+                        count,
+                        routeId: route.description.id,
+                        routeHash: route.description.routeHash
                     });
-                    this.routesStats = counts;
-                    return counts;
-                }
-                catch (err) {
-                    const isOnline = this.getOnlineStatusMonitoring().onlineStatus;
-                    if (isOnline)
-                        this.logError(err, 'getActiveRideCounts');
-                }
-                return [];
-            });
+                });
+                this.routesStats = counts;
+                return counts;
+            }
+            catch (err) {
+                const isOnline = this.getOnlineStatusMonitoring().onlineStatus;
+                if (isOnline)
+                    this.logError(err, 'getActiveRideCounts');
+            }
+            return [];
         }
         start(session) {
             if (this.onlineStatusHandler || this.isOnline) {
                 this.initList();
             }
-            (0, utils_1.waitNextTick)().then(() => {
+            waitNextTick().then(() => {
                 this.publishStartEvent();
             });
             const observer = this.getActivityRide().getObserver();
@@ -212,33 +223,30 @@ let ActiveRidesService = (() => {
             observer.on('resumed', this.onActivityResumed.bind(this));
             this.subscribeActivityEvents();
         }
-        initList() {
-            return __awaiter(this, void 0, void 0, function* () {
-                var _a, _b, _c, _d, _e, _f;
-                try {
-                    this.addCurrentActivity();
-                    if (!this.others && this.isOnline) {
-                        if (this.apiState.busy) {
-                            yield ((_a = this.apiState.promise) === null || _a === void 0 ? void 0 : _a.catch(() => { }));
-                            if (this.others)
-                                return;
-                        }
-                        const routeHash = this.getRouteHash();
-                        const promise = this.getApi().getByRouteHash(routeHash);
-                        this.apiState = { busy: true, promise };
-                        const others = (_b = yield promise) !== null && _b !== void 0 ? _b : [];
-                        this.others = this.current ? others.filter(e => { var _a, _b; return e.sessionId !== this.current.sessionId && ((_a = e.user) === null || _a === void 0 ? void 0 : _a.id) !== ((_b = this.current.user) === null || _b === void 0 ? void 0 : _b.id); }) : others;
-                        if (this.current && ((_c = this.others) === null || _c === void 0 ? void 0 : _c.length) > 0) {
-                            this.isStarted = true;
-                            this.logEvent({ message: 'group ride started', active: ((_d = this.others) === null || _d === void 0 ? void 0 : _d.length) + 1, activityId: (_e = this.activity) === null || _e === void 0 ? void 0 : _e.id, route: (_f = this.activity.route) === null || _f === void 0 ? void 0 : _f.title, routeHash: this.getRouteHash() });
-                        }
+        async initList() {
+            try {
+                this.addCurrentActivity();
+                if (!this.others && this.isOnline) {
+                    if (this.apiState.busy) {
+                        await this.apiState.promise?.catch(() => { });
+                        if (this.others)
+                            return;
+                    }
+                    const routeHash = this.getRouteHash();
+                    const promise = this.getApi().getByRouteHash(routeHash);
+                    this.apiState = { busy: true, promise };
+                    const others = await promise ?? [];
+                    this.others = this.current ? others.filter(e => e.sessionId !== this.current.sessionId && e.user?.id !== this.current.user?.id) : others;
+                    if (this.current && this.others?.length > 0) {
+                        this.isStarted = true;
+                        this.logEvent({ message: 'group ride started', active: this.others?.length + 1, activityId: this.activity?.id, route: this.activity.route?.title, routeHash: this.getRouteHash() });
                     }
                 }
-                catch (err) {
-                    this.logError(err, 'initList');
-                }
-                this.apiState = { busy: false };
-            });
+            }
+            catch (err) {
+                this.logError(err, 'initList');
+            }
+            this.apiState = { busy: false };
         }
         onActivityUpdated() {
             if (!this.current || !this.activity)
@@ -266,21 +274,21 @@ let ActiveRidesService = (() => {
             this.logNearbyRiders(displayProps);
         }
         logNearbyRiders(displayProps) {
-            var _a, _b, _c, _d, _e, _f;
-            if (!this.current || !((_a = this.others) === null || _a === void 0 ? void 0 : _a.length))
+            if (!this.current || !this.others?.length)
                 return;
             if (Date.now() - this.prevLogTS < 1000)
                 return;
             const all = displayProps;
-            const logInfo = all.map(r => { var _a, _b, _c, _d, _e; return `${r.name}${r.isUser ? '(*)' : ''}:${(_b = (_a = r.avatar) === null || _a === void 0 ? void 0 : _a.shirt) !== null && _b !== void 0 ? _b : ''}-${(((_c = r.distance) !== null && _c !== void 0 ? _c : 0) / 1000).toFixed(1)}km-${(_d = r.lap) !== null && _d !== void 0 ? _d : ''}-${(_e = r.power) !== null && _e !== void 0 ? _e : '?'}W`; })
+            const distanceText = (r) => typeof r?.distance === 'number' ? `${((r?.distance ?? 0) / 1000).toFixed(1)}km` : `${r?.distance?.value}${r?.distance?.unit}`;
+            const logInfo = all.map(r => `${r?.name}${r?.isUser ? '(*)' : ''}:${r?.avatar?.shirt ?? ''}-${distanceText(r)}-${r?.lap ?? ''}-${r?.power ?? '?'}W`)
                 .join('|');
-            const cnt = ((_c = (_b = this.others) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) + 1;
-            const event = { message: 'NearbyRiders', activityId: (_d = this.activity) === null || _d === void 0 ? void 0 : _d.id, title: (_f = (_e = this.activity) === null || _e === void 0 ? void 0 : _e.route) === null || _f === void 0 ? void 0 : _f.title, cnt, nearbyRiders: logInfo };
+            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();
         }
         onActivityPaused() {
-            var _a;
             if (!this.current)
                 return;
             try {
@@ -292,7 +300,7 @@ let ActiveRidesService = (() => {
                     position: this.current.currentPosition,
                     rideDistance: this.current.currentRideDistance,
                     speed: 0, power: 0, cadence: 0, heartrate: undefined, lap: this.current.currentLap,
-                    duration: (_a = this.getActivityRide().getCurrentValues()) === null || _a === void 0 ? void 0 : _a.time,
+                    duration: this.getActivityRide().getCurrentValues()?.time,
                     isPaused: true
                 };
                 this.publishUpdateEvent(payload);
@@ -328,21 +336,20 @@ let ActiveRidesService = (() => {
                     return [];
                 const displayProps = [];
                 items.forEach(item => {
-                    var _a, _b, _c, _d;
-                    if (!(item === null || item === void 0 ? void 0 : item.id) && !((_b = (_a = item === null || item === void 0 ? void 0 : item.user) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.length) && (item === null || item === void 0 ? void 0 : item.sessionId) !== this.session)
+                    if (!item?.id && !item?.user?.name?.length && item?.sessionId !== this.session)
                         return;
                     const displayItem = {
                         isUser: item.sessionId === this.session,
                         name: this.getName(item),
                         diffDistance: this.getDistanceDiff(item),
-                        distance: item.currentRideDistance,
+                        distance: this.getDistance(item),
                         avatar: this.getAvatar(item),
                         lap: this.getLap(item, true),
                         power: item.currentPower,
                         mpower: this.getRelativePower(item),
-                        speed: item.currentSpeed,
-                        lat: (_c = item.currentPosition) === null || _c === void 0 ? void 0 : _c.lat,
-                        lng: (_d = item.currentPosition) === null || _d === void 0 ? void 0 : _d.lng,
+                        speed: this.getSpeed(item),
+                        lat: item.currentPosition?.lat,
+                        lng: item.currentPosition?.lng,
                     };
                     displayProps.push(displayItem);
                 });
@@ -364,19 +371,18 @@ let ActiveRidesService = (() => {
             }
         }
         validName(str) {
-            if (!(str === null || str === void 0 ? void 0 : str.length))
+            if (!str?.length)
                 return false;
             if (str === 'undefined' || str === 'undefined undefined')
                 return false;
             return true;
         }
         getName(item) {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
-            if (item.sessionId === this.session || ((_a = item.user) === null || _a === void 0 ? void 0 : _a.id) === ((_b = this.current.user) === null || _b === void 0 ? void 0 : _b.id)) {
-                const name = ((_d = (_c = item.user) === null || _c === void 0 ? void 0 : _c.name) === null || _d === void 0 ? void 0 : _d.length) ? (_e = item.user) === null || _e === void 0 ? void 0 : _e.name : 'You';
+            if (item.sessionId === this.session || item.user?.id === this.current.user?.id) {
+                const name = item.user?.name?.length ? item.user?.name : 'You';
                 return name;
             }
-            const name = this.validName((_f = item.user) === null || _f === void 0 ? void 0 : _f.name) ? (_g = item.user) === null || _g === void 0 ? void 0 : _g.name : this.randomName((_h = item.user) === null || _h === void 0 ? void 0 : _h.id);
+            const name = this.validName(item.user?.name) ? item.user?.name : this.randomName(item.user?.id);
             return name;
         }
         randomName(id) {
@@ -403,22 +409,19 @@ let ActiveRidesService = (() => {
             };
         }
         getAvatar(item) {
-            var _a, _b;
-            const avatars = (0, avatars_1.useAvatars)();
-            const id = item.sessionId === this.session ? 'current' : (_b = (_a = item.user) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : item.sessionId;
+            const avatars = useAvatars();
+            const id = item.sessionId === this.session ? 'current' : item.user?.id ?? item.sessionId;
             const avatar = avatars.get(id);
             if (item.isCoach)
                 avatar.type = 'coach';
             return avatar;
         }
         getRelativePower(r) {
-            var _a;
-            if (((_a = r.user) === null || _a === void 0 ? void 0 : _a.weight) && r.currentPower)
+            if (r.user?.weight && r.currentPower)
                 return r.currentPower / r.user.weight;
         }
         getLap(r, overwrite = false) {
-            var _a, _b;
-            const isLap = (_b = (_a = this.current) === null || _a === void 0 ? void 0 : _a.ride) === null || _b === void 0 ? void 0 : _b.isLap;
+            const isLap = this.current?.ride?.isLap;
             if (!overwrite && r.currentLap)
                 return r.currentLap;
             if (isLap) {
@@ -426,39 +429,83 @@ let ActiveRidesService = (() => {
                 return Math.floor(r.currentRideDistance / route.distance) + 1;
             }
         }
-        getDistance(r) {
+        getRoutePosDistance(r) {
             const lap = this.getLap(r);
             const route = this.current ? this.current.ride : r.ride;
             if (lap && route)
                 return r.currentRideDistance % route.distance;
             return r.currentRideDistance || 0;
         }
+        getSpeed(r) {
+            try {
+                const format = (v) => {
+                    const [C, U] = this.getUnitConversionShortcuts();
+                    const value = C(v, 'speed', { digits: 1 });
+                    const unit = U('speed');
+                    return { value, unit };
+                };
+                return format(r.currentSpeed);
+            }
+            catch (err) {
+                this.logError(err, 'getSpeed');
+            }
+        }
+        getDistance(r) {
+            try {
+                const format = (v) => {
+                    const [C, U] = this.getUnitConversionShortcuts();
+                    let value = C(v, 'distance', { digits: 1 });
+                    const unit = U('distance');
+                    if (value >= 100) {
+                        value = Math.round(value);
+                    }
+                    return { value, unit };
+                };
+                return format(r.currentRideDistance);
+            }
+            catch (err) {
+                this.logError(err, 'getDistance');
+            }
+        }
         getDistanceDiff(r) {
-            var _a, _b;
             if (!r)
                 return;
-            const isLap = (_b = (_a = this.current) === null || _a === void 0 ? void 0 : _a.ride) === null || _b === void 0 ? void 0 : _b.isLap;
-            const distance = this.getDistance(r);
-            const myDistance = this.getDistance(this.current);
-            if (distance === undefined || myDistance === undefined)
-                return;
-            if (!isLap)
-                return myDistance - distance;
-            const distances = [myDistance - distance, myDistance + this.current.ride.distance - distance, myDistance - this.current.ride.distance - distance];
-            distances.sort((a, b) => Math.abs(a) - Math.abs(b));
-            return distances[0];
+            try {
+                const format = (v) => {
+                    const [C, U] = this.getUnitConversionShortcuts();
+                    let value = C(v, 'distance', { digits: 1 });
+                    const unit = U('distance');
+                    if (value >= 10) {
+                        value = Math.round(value);
+                    }
+                    return { value, unit };
+                };
+                const isLap = this.current?.ride?.isLap;
+                const distance = this.getRoutePosDistance(r);
+                const myDistance = this.getRoutePosDistance(this.current);
+                if (distance === undefined || myDistance === undefined)
+                    return;
+                if (!isLap) {
+                    return format(myDistance - distance);
+                }
+                const distances = [myDistance - distance, myDistance + this.current.ride.distance - distance, myDistance - this.current.ride.distance - distance];
+                distances.sort((a, b) => Math.abs(a) - Math.abs(b));
+                return format(distances[0]);
+            }
+            catch (err) {
+                this.logError(err, 'getDistanceDiff');
+            }
         }
         getRideInfo() {
-            var _a, _b, _c, _d, _e, _f;
             const route = {
-                title: (_a = this.activity.route) === null || _a === void 0 ? void 0 : _a.title,
-                activityId: (_b = this.activity) === null || _b === void 0 ? void 0 : _b.id,
+                title: this.activity.route?.title,
+                activityId: this.activity?.id,
                 type: this.getType(this.activity.routeType),
                 startPos: this.activity.startPos,
                 realityFactor: this.activity.realityFactor,
-                isLap: (_d = (_c = this.getRouteList().getSelected()) === null || _c === void 0 ? void 0 : _c.description) === null || _d === void 0 ? void 0 : _d.isLoop,
+                isLap: this.getRouteList().getSelected()?.description?.isLoop,
                 routeHash: this.getRouteHash(),
-                distance: (_f = (_e = this.getRouteList().getSelected()) === null || _e === void 0 ? void 0 : _e.description) === null || _f === void 0 ? void 0 : _f.distance
+                distance: this.getRouteList().getSelected()?.description?.distance
             };
             return route;
         }
@@ -474,11 +521,10 @@ let ActiveRidesService = (() => {
             return this.getActivityRide().getActivity();
         }
         getRouteHash() {
-            var _a, _b, _c;
-            if (((_a = this.activity) === null || _a === void 0 ? void 0 : _a.routeType) === 'Free-Ride') {
+            if (this.activity?.routeType === 'Free-Ride') {
                 return ('free:' + Date.now());
             }
-            return (_c = (_b = this.activity) === null || _b === void 0 ? void 0 : _b.route) === null || _c === void 0 ? void 0 : _c.hash;
+            return this.activity?.route?.hash;
         }
         getUserName(user) {
             if (!user)
@@ -492,12 +538,11 @@ let ActiveRidesService = (() => {
             return undefined;
         }
         getUser() {
-            var _a, _b, _c, _d, _e;
             const userFromSettings = this.getUserSettings().get('user', {});
             const user = {
-                id: (_b = (_a = this.activity.user) === null || _a === void 0 ? void 0 : _a.uuid) !== null && _b !== void 0 ? _b : userFromSettings.id,
-                name: (_c = userFromSettings.username) !== null && _c !== void 0 ? _c : this.getUserName(userFromSettings),
-                weight: (_e = (_d = this.activity.user) === null || _d === void 0 ? void 0 : _d.weight) !== null && _e !== void 0 ? _e : userFromSettings.weight,
+                id: this.activity.user?.uuid ?? userFromSettings.id,
+                name: userFromSettings.username ?? this.getUserName(userFromSettings),
+                weight: this.activity.user?.weight ?? userFromSettings.weight,
                 ftp: userFromSettings.ftp,
                 gender: userFromSettings.gender
             };
@@ -512,8 +557,7 @@ let ActiveRidesService = (() => {
             return bike;
         }
         getCurrentPosition() {
-            var _a, _b;
-            const logs = (_b = (_a = this.activity) === null || _a === void 0 ? void 0 : _a.logs) !== null && _b !== void 0 ? _b : [];
+            const logs = this.activity?.logs ?? [];
             if (!logs.length)
                 return;
             const point = logs[logs.length - 1];
@@ -548,26 +592,21 @@ let ActiveRidesService = (() => {
             this.getMessageQueue().onDisconnect();
             this.isSubscribed = false;
         }
-        onConnect(props) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const { initial = false } = props !== null && props !== void 0 ? props : {};
-                yield this.initList();
-                this.getMessageQueue().onConnect();
-                if (!initial && this.current && !this.isSubscribed)
-                    this.subscribeActivityEvents();
-            });
-        }
-        subscribeActivityEvents() {
-            return __awaiter(this, void 0, void 0, function* () {
-                var _a, _b;
-                const hash = (_a = this.current) === null || _a === void 0 ? void 0 : _a.ride.routeHash;
-                const session = (_b = this.current) === null || _b === void 0 ? void 0 : _b.sessionId;
-                const updateTopic = `incyclist/activity/+/${hash}/+`;
-                this.getMessageQueue().subscribe(updateTopic, this.onActivityEvent.bind(this), 'incyclist/activity');
-                const infoTopic = `incyclist/session/${session}/info`;
-                this.getMessageQueue().subscribe(infoTopic, this.onInfoEvent.bind(this), 'incyclist/session');
-                this.isSubscribed = true;
-            });
+        async onConnect(props) {
+            const { initial = false } = props ?? {};
+            await this.initList();
+            this.getMessageQueue().onConnect();
+            if (!initial && this.current && !this.isSubscribed)
+                this.subscribeActivityEvents();
+        }
+        async subscribeActivityEvents() {
+            const hash = this.current?.ride.routeHash;
+            const session = this.current?.sessionId;
+            const updateTopic = `incyclist/activity/+/${hash}/+`;
+            this.getMessageQueue().subscribe(updateTopic, this.onActivityEvent.bind(this), 'incyclist/activity');
+            const infoTopic = `incyclist/session/${session}/info`;
+            this.getMessageQueue().subscribe(infoTopic, this.onInfoEvent.bind(this), 'incyclist/session');
+            this.isSubscribed = true;
         }
         onInfoEvent(topic) {
             const keys = topic.split('/');
@@ -611,25 +650,30 @@ let ActiveRidesService = (() => {
             this.getMessageQueue().sendMessage(topic, payload);
         }
         onActivityStartEvent(session, payload) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-            const prevActive = (_a = this.others) === null || _a === void 0 ? void 0 : _a.length;
+            const prevActive = this.others?.length;
             try {
-                const others = (_b = this.others) !== null && _b !== void 0 ? _b : [];
+                const others = this.others ?? [];
                 if (others.some(ar => ar.sessionId === session))
                     return;
-                if (((_c = payload.user) === null || _c === void 0 ? void 0 : _c.id) && ((_d = payload.user) === null || _d === void 0 ? void 0 : _d.id) === ((_e = this.current.user) === null || _e === void 0 ? void 0 : _e.id))
+                if (payload.user?.id && payload.user?.id === this.current.user?.id)
                     return;
-                if (((_f = payload.user) === null || _f === void 0 ? void 0 : _f.id) && others.some(ar => { var _a, _b; return ((_a = ar.user) === null || _a === void 0 ? void 0 : _a.id) === ((_b = payload.user) === null || _b === void 0 ? void 0 : _b.id); }))
+                if (payload.user?.id && others.some(ar => ar.user?.id === payload.user?.id))
                     return;
-                const entry = Object.assign(Object.assign({ id: Date.now().toString(), tsLastUpdate: Date.now() }, payload), { sessionId: session });
+                const entry = {
+                    id: Date.now().toString(),
+                    tsLastUpdate: Date.now(),
+                    ...payload,
+                    sessionId: session
+                };
                 this.addActiveRide(entry);
+                const remote = { uuid: payload.user?.id, session };
                 if (prevActive === 0) {
                     this.isStarted = true;
-                    this.logEvent({ message: 'group ride started', active: this.others.length + 1, activityId: (_g = this.activity) === null || _g === void 0 ? void 0 : _g.id, route: (_h = this.activity.route) === null || _h === void 0 ? void 0 : _h.title, routeHash: this.getRouteHash() });
+                    this.logEvent({ message: 'group ride started', active: this.others.length + 1, activityId: this.activity?.id, route: this.activity.route?.title, routeHash: this.getRouteHash(), remote });
                 }
                 else {
                     this.isStarted = true;
-                    this.logEvent({ message: 'group ride user joined', active: this.others.length + 1, activityId: (_j = this.activity) === null || _j === void 0 ? void 0 : _j.id, route: (_k = this.activity.route) === null || _k === void 0 ? void 0 : _k.title, routeHash: this.getRouteHash(), user: (_l = payload === null || payload === void 0 ? void 0 : payload.user) === null || _l === void 0 ? void 0 : _l.id });
+                    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 });
                 }
                 if (!payload.user) {
                     this.getRemoteActivityDetails(session);
@@ -639,31 +683,28 @@ let ActiveRidesService = (() => {
                 this.logError(err, 'onActivityStartEvent');
             }
         }
-        getRemoteActivityDetails(sessionId) {
-            return __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                const items = yield this.getApi().getBySessionId(sessionId);
-                if (!items.length)
+        async getRemoteActivityDetails(sessionId) {
+            const items = await this.getApi().getBySessionId(sessionId);
+            if (!items.length)
+                return;
+            let item = items[0];
+            if (item.sessionId !== sessionId) {
+                item = items.find(i => i.sessionId === sessionId);
+                if (!item)
                     return;
-                let item = items[0];
-                if (item.sessionId !== sessionId) {
-                    item = items.find(i => i.sessionId === sessionId);
-                    if (!item)
-                        return;
-                }
-                const others = (_a = this.others) !== null && _a !== void 0 ? _a : [];
-                const localItem = others.find(e => e.sessionId === sessionId);
-                if (localItem) {
-                    localItem.user = item.user;
-                    localItem.id = item.id;
-                    localItem.bike = item.bike;
-                    localItem.ride = item.ride;
-                }
-                else {
-                    this.addActiveRide(item);
-                }
-                return item;
-            });
+            }
+            const others = this.others ?? [];
+            const localItem = others.find(e => e.sessionId === sessionId);
+            if (localItem) {
+                localItem.user = item.user;
+                localItem.id = item.id;
+                localItem.bike = item.bike;
+                localItem.ride = item.ride;
+            }
+            else {
+                this.addActiveRide(item);
+            }
+            return item;
         }
         publishUpdateEvent(payload) {
             if (!this.current || !this.isOnline)
@@ -671,57 +712,53 @@ let ActiveRidesService = (() => {
             const topic = `incyclist/activity/${this.session}/${this.getRouteHash()}/update`;
             this.getMessageQueue().sendMessage(topic, payload);
         }
-        onActivityUpdateEvent(session, payload) {
-            return __awaiter(this, void 0, void 0, function* () {
-                var _a, _b, _c, _d, _e, _f, _g;
-                try {
-                    if (session === this.session)
-                        return;
-                    const others = (_a = this.others) !== null && _a !== void 0 ? _a : [];
-                    const existing = others.find(ar => ar.sessionId === session);
-                    const prevActive = (_b = this.others) === null || _b === void 0 ? void 0 : _b.length;
-                    if (existing === null || existing === void 0 ? void 0 : existing.user) {
-                        existing.currentPosition = payload.position;
-                        existing.currentDuration = payload.duration;
-                        existing.currentPower = payload.power;
-                        existing.currentRideDistance = payload.rideDistance;
-                        existing.currentSpeed = payload.speed;
-                        existing.currentLap = payload.lap;
-                        existing.tsLastUpdate = Date.now();
+        async onActivityUpdateEvent(session, payload) {
+            try {
+                if (session === this.session)
+                    return;
+                const others = this.others ?? [];
+                const existing = others.find(ar => ar.sessionId === session);
+                const prevActive = this.others?.length;
+                if (existing?.user) {
+                    existing.currentPosition = payload.position;
+                    existing.currentDuration = payload.duration;
+                    existing.currentPower = payload.power;
+                    existing.currentRideDistance = payload.rideDistance;
+                    existing.currentSpeed = payload.speed;
+                    existing.currentLap = payload.lap;
+                    existing.tsLastUpdate = Date.now();
+                }
+                else {
+                    const item = await this.getRemoteActivityDetails(session);
+                    if (!item) {
+                        const entry = {
+                            id: Date.now().toString(),
+                            tsLastUpdate: Date.now(),
+                            sessionId: session,
+                            currentPosition: payload.position,
+                            currentDuration: payload.duration,
+                            currentPower: payload.power,
+                            currentRideDistance: payload.rideDistance,
+                            currentSpeed: payload.speed,
+                            currentLap: payload.lap
+                        };
+                        if (!existing) {
+                            this.addActiveRide(entry);
+                        }
+                    }
+                    this.isStarted = true;
+                    const remote = (item === undefined || item === null) ? { session } : { uuid: item.user?.id, session: item.sessionId };
+                    if (prevActive === 0) {
+                        this.logEvent({ message: 'group ride started', active: this.others.length + 1, activityId: this.activity?.id, route: this.activity.route?.title, routeHash: this.getRouteHash(), remote });
                     }
                     else {
-                        const item = yield this.getRemoteActivityDetails(session);
-                        if (!item) {
-                            const entry = {
-                                id: Date.now().toString(),
-                                tsLastUpdate: Date.now(),
-                                sessionId: session,
-                                currentPosition: payload.position,
-                                currentDuration: payload.duration,
-                                currentPower: payload.power,
-                                currentRideDistance: payload.rideDistance,
-                                currentSpeed: payload.speed,
-                                currentLap: payload.lap
-                            };
-                            if (!existing) {
-                                this.addActiveRide(entry);
-                            }
-                        }
-                        if (prevActive === 0) {
-                            this.isStarted = true;
-                            this.logEvent({ message: 'group ride started', active: this.others.length + 1, activityId: (_c = this.activity) === null || _c === void 0 ? void 0 : _c.id, route: (_d = this.activity.route) === null || _d === void 0 ? void 0 : _d.title, routeHash: this.getRouteHash() });
-                        }
-                        else {
-                            this.isStarted = true;
-                            this.logEvent({ message: 'group ride user joined', active: this.others.length + 1, activityId: (_e = this.activity) === null || _e === void 0 ? void 0 : _e.id, route: (_f = this.activity.route) === null || _f === void 0 ? void 0 : _f.title, routeHash: this.getRouteHash(),
-                                remote: { uuid: (_g = item.user) === null || _g === void 0 ? void 0 : _g.id, session: item.sessionId } });
-                        }
+                        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 });
                     }
                 }
-                catch (err) {
-                    this.logError(err, 'onActivityStartEvent');
-                }
-            });
+            }
+            catch (err) {
+                this.logError(err, 'onActivityStartEvent');
+            }
         }
         addActiveRide(ride) {
             if (!this.others)
@@ -735,10 +772,9 @@ let ActiveRidesService = (() => {
             this.getMessageQueue().sendMessage(topic, this.current);
         }
         onActivityStopEvent(session, payload) {
-            var _a, _b, _c, _d, _e;
             if (session === this.session)
                 return;
-            if (!((_a = this.others) === null || _a === void 0 ? void 0 : _a.length))
+            if (!this.others?.length)
                 return;
             const idx = this.others.findIndex(ar => ar.sessionId === session);
             if (idx !== -1)
@@ -746,10 +782,10 @@ let ActiveRidesService = (() => {
             if (!this.isStarted)
                 return;
             if (this.others.length === 0) {
-                this.logEvent({ message: 'group ride finished', reason: 'all riders left', activityId: (_b = this.activity) === null || _b === void 0 ? void 0 : _b.id, route: (_c = this.activity.route) === null || _c === void 0 ? void 0 : _c.title, routeHash: this.getRouteHash() });
+                this.logEvent({ message: 'group ride finished', reason: 'all riders left', activityId: this.activity?.id, route: this.activity.route?.title, routeHash: this.getRouteHash() });
             }
             else {
-                this.logEvent({ message: 'group ride user left', active: this.others.length + 1, activityId: (_d = this.activity) === null || _d === void 0 ? void 0 : _d.id, route: (_e = this.activity.route) === null || _e === void 0 ? void 0 : _e.title, routeHash: this.getRouteHash() });
+                this.logEvent({ message: 'group ride user left', active: this.others.length + 1, activityId: this.activity?.id, route: this.activity.route?.title, routeHash: this.getRouteHash() });
             }
         }
         updateCoaches() {
@@ -758,12 +794,11 @@ let ActiveRidesService = (() => {
                     return;
                 const coachesService = this.getCoachesService();
                 const coaches = coachesService.getCoaches();
-                if (!(coaches === null || coaches === void 0 ? void 0 : coaches.length)) {
+                if (!coaches?.length) {
                     this.coaches = undefined;
                     return;
                 }
                 this.coaches = coaches.map(c => {
-                    var _a;
                     const props = c.getDisplayProperties();
                     const rideEntry = {
                         id: `coach:${props.name}`,
@@ -771,7 +806,7 @@ let ActiveRidesService = (() => {
                             name: props.name,
                             id: `coach:${props.name}`,
                         },
-                        ride: (_a = this.current) === null || _a === void 0 ? void 0 : _a.ride,
+                        ride: this.current?.ride,
                         tsLastUpdate: Date.now(),
                         currentRideDistance: c.getProgess(),
                         currentPosition: c.getPosition(),
@@ -795,26 +830,32 @@ let ActiveRidesService = (() => {
             this.observer.stop();
         }
         getOnlineStatusMonitoring() {
-            return (0, monitoring_1.useOnlineStatusMonitoring)();
+            return useOnlineStatusMonitoring();
         }
         getIncyclistActiveRidesApi() {
-            return new active_rides_1.IncyclistActiveRidesApi();
+            return new IncyclistActiveRidesApi();
         }
         getUserSettings() {
-            return (0, settings_1.useUserSettings)();
+            return useUserSettings();
         }
         getActivityRide() {
-            return (0, ride_1.useActivityRide)();
+            return useActivityRide();
         }
         getRouteList() {
-            return (0, routes_1.useRouteList)();
+            return useRouteList();
         }
         getCoachesService() {
-            return (0, coaches_1.getCoachesService)();
+            return getCoachesService();
+        }
+        getUnitConverter() {
+            return useUnitConverter();
+        }
+        getUnitConversionShortcuts() {
+            return this.getUnitConverter().getUnitConversionShortcuts();
         }
         getMessageQueue() {
             if (!this.mq)
-                this.mq = new mq_1.ActiveRideListMessageQueue();
+                this.mq = new ActiveRideListMessageQueue();
             return this.mq;
         }
         getApi() {
@@ -827,29 +868,7 @@ let ActiveRidesService = (() => {
             }
         }
     };
-    __setFunctionName(_classThis, "ActiveRidesService");
-    (() => {
-        var _a;
-        const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create((_a = _classSuper[Symbol.metadata]) !== null && _a !== void 0 ? _a : null) : void 0;
-        _getOnlineStatusMonitoring_decorators = [decorators_1.Injectable];
-        _getIncyclistActiveRidesApi_decorators = [decorators_1.Injectable];
-        _getUserSettings_decorators = [decorators_1.Injectable];
-        _getActivityRide_decorators = [decorators_1.Injectable];
-        _getRouteList_decorators = [decorators_1.Injectable];
-        _getCoachesService_decorators = [decorators_1.Injectable];
-        __esDecorate(_classThis, null, _getOnlineStatusMonitoring_decorators, { kind: "method", name: "getOnlineStatusMonitoring", static: false, private: false, access: { has: obj => "getOnlineStatusMonitoring" in obj, get: obj => obj.getOnlineStatusMonitoring }, metadata: _metadata }, null, _instanceExtraInitializers);
-        __esDecorate(_classThis, null, _getIncyclistActiveRidesApi_decorators, { kind: "method", name: "getIncyclistActiveRidesApi", static: false, private: false, access: { has: obj => "getIncyclistActiveRidesApi" in obj, get: obj => obj.getIncyclistActiveRidesApi }, metadata: _metadata }, null, _instanceExtraInitializers);
-        __esDecorate(_classThis, 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(_classThis, 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(_classThis, 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(_classThis, null, _getCoachesService_decorators, { kind: "method", name: "getCoachesService", static: false, private: false, access: { has: obj => "getCoachesService" in obj, get: obj => obj.getCoachesService }, metadata: _metadata }, null, _instanceExtraInitializers);
-        __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
-        ActiveRidesService = _classThis = _classDescriptor.value;
-        if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-        __runInitializers(_classThis, _classExtraInitializers);
-    })();
     return ActiveRidesService = _classThis;
 })();
-exports.ActiveRidesService = ActiveRidesService;
-const useActiveRides = () => { return new ActiveRidesService(); };
-exports.useActiveRides = useActiveRides;
+export { ActiveRidesService };
+export const useActiveRides = () => { return new ActiveRidesService(); };