incyclist-services 1.5.1 → 1.5.2

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

@@ -24,6 +24,7 @@ export declare class ActiveRidesService extends IncyclistService {
     };
     protected mq: ActiveRideListMessageQueue;
     protected prevLogTS: number;
+    protected isStarted: boolean;
     protected readonly activityEventHandlers: {
         update: any;
         start: any;

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

@@ -79,6 +79,7 @@ let ActiveRidesService = (() => {
             this.session = __runInitializers(this, _instanceExtraInitializers);
             this.apiState = { busy: false };
             this.prevLogTS = 0;
+            this.isStarted = false;
             this.activityEventHandlers = {
                 update: this.onActivityUpdateEvent.bind(this),
                 start: this.onActivityStartEvent.bind(this),
@@ -168,6 +169,7 @@ let ActiveRidesService = (() => {
                         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: this.others.length + 1, activityId: (_d = this.activity) === null || _d === void 0 ? void 0 : _d.id, routeHash: this.getRouteHash() });
                         }
                     }
@@ -219,6 +221,8 @@ let ActiveRidesService = (() => {
         }
         onActivityPaused() {
             var _a;
+            if (!this.current)
+                return;
             try {
                 this.current.currentSpeed = 0;
                 this.current.currentPower = 0;
@@ -496,9 +500,11 @@ let ActiveRidesService = (() => {
                 const entry = Object.assign(Object.assign({ id: Date.now().toString(), tsLastUpdate: Date.now() }, payload), { sessionId: session });
                 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, routeHash: this.getRouteHash() });
                 }
                 else {
+                    this.isStarted = true;
                     this.logEvent({ message: 'group ride user joined', active: this.others.length + 1, activityId: (_d = this.activity) === null || _d === void 0 ? void 0 : _d.id, routeHash: this.getRouteHash() });
                 }
                 if (!payload.user) {
@@ -569,9 +575,11 @@ let ActiveRidesService = (() => {
                             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, routeHash: this.getRouteHash() });
                         }
                         else {
+                            this.isStarted = true;
                             this.logEvent({ message: 'group ride user joined', active: this.others.length + 1, activityId: (_d = this.activity) === null || _d === void 0 ? void 0 : _d.id, routeHash: this.getRouteHash() });
                         }
                     }
@@ -601,6 +609,8 @@ let ActiveRidesService = (() => {
             const idx = this.others.findIndex(ar => ar.sessionId === session);
             if (idx !== -1)
                 this.others.splice(idx, 1);
+            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, routeHash: this.getRouteHash() });
             }
@@ -640,6 +650,7 @@ let ActiveRidesService = (() => {
             delete this.others;
             delete this.coaches;
             delete this.session;
+            this.isStarted = false;
             this.getMessageQueue().unsubscribeAll();
             this.isSubscribed = false;
             this.observer.stop();

package/lib/activities/base/repo/db.js

@@ -504,7 +504,7 @@ let ActivitiesRepository = (() => {
                     names = names.filter(name => !known.includes(name));
                     return names;
                 }
-                catch (err) {
+                catch (_b) {
                     return null;
                 }
             });

package/lib/activities/ride/service.js

@@ -993,12 +993,12 @@ let ActivityRideService = (() => {
             this.activity.time = this.activity.timeTotal - ((_a = this.activity.timePause) !== null && _a !== void 0 ? _a : 0);
         }
         getRideProps() {
-            var _a, _b, _c;
+            var _a, _b;
             const { startPos, realityFactor, routeType } = this.activity;
-            const { title } = (_b = (_a = this.current.route) === null || _a === void 0 ? void 0 : _a.description) !== null && _b !== void 0 ? _b : {};
+            const title = (_a = this.current.route) === null || _a === void 0 ? void 0 : _a.getLocalizedTitle('en');
             let rideProps;
             if (routeType === 'Free-Ride') {
-                const { lat, lng } = (_c = this.current.position) !== null && _c !== void 0 ? _c : {};
+                const { lat, lng } = (_b = this.current.position) !== null && _b !== void 0 ? _b : {};
                 rideProps = { route: 'Free Ride', lat, lng };
             }
             else if (routeType === 'None') {

package/lib/api/overpass/index.js

@@ -66,7 +66,8 @@ let OverpassApi = (() => {
     let _classThis;
     var OverpassApi = _classThis = class {
         constructor(props) {
-            this.url = (props === null || props === void 0 ? void 0 : props.url) || mirrors[0];
+            var _a;
+            this.url = (_a = props === null || props === void 0 ? void 0 : props.url) !== null && _a !== void 0 ? _a : mirrors[0];
         }
         bulkQuery(queryOL) {
             return __awaiter(this, void 0, void 0, function* () {

package/lib/api/repository/json/index.js

@@ -46,7 +46,7 @@ class JsonRepository {
                 if (str === '{}' || str.length < 2)
                     return null;
             }
-            catch (err) {
+            catch (_a) {
                 return null;
             }
             return data;
@@ -74,7 +74,7 @@ class JsonRepository {
                 this.access = access;
                 return true;
             }
-            catch (err) {
+            catch (_a) {
                 return false;
             }
         });

package/lib/api/rest/api.js

@@ -26,8 +26,8 @@ class ApiClient {
         }
     }
     client() {
-        if (!this.axios)
-            this.axios = axios_1.default;
+        var _a;
+        this.axios = (_a = this.axios) !== null && _a !== void 0 ? _a : axios_1.default;
         return this.axios;
     }
     onRequest(req) {
@@ -40,14 +40,14 @@ class ApiClient {
             this.requests.push({ tid, ts });
         }
         catch (err) {
-            this.logger.logEvent({ message: 'error', fn: 'onRequest()', error: err.message || err, stack: err.stack });
+            this.logger.logEvent({ message: 'error', fn: 'onRequest()', error: err.message, stack: err.stack });
         }
         return req;
     }
     onResponse(res) {
         if (!res)
             return;
-        const { config, status } = res || {};
+        const { config, status } = res !== null && res !== void 0 ? res : {};
         const { headers = {}, url, method, params } = config;
         const tid = headers['x-transaction-id'];
         if (!tid)
@@ -61,7 +61,7 @@ class ApiClient {
             }
         }
         catch (err) {
-            this.logger.logEvent({ message: 'error', fn: 'onResponse', error: err.message || err, tid, stack: err.stack });
+            this.logger.logEvent({ message: 'error', fn: 'onResponse', error: err.message, tid, stack: err.stack });
         }
         return res;
     }

package/lib/apps/base/api/strava/api.js

@@ -105,7 +105,7 @@ class StravaApi extends base_1.AppApiBase {
                 try {
                     yield this.refreshToken();
                 }
-                catch (err) {
+                catch (_a) {
                     throw new Error('token refresh failed');
                 }
             }
@@ -149,7 +149,7 @@ class StravaApi extends base_1.AppApiBase {
     }
     createUpload(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             const reqOpts = {
                 headers: {
                     Authorization: 'Bearer ' + this.config.accessToken
@@ -161,7 +161,7 @@ class StravaApi extends base_1.AppApiBase {
                 return response.data;
             }
             else {
-                throw new Error(((_c = (_b = (_a = response.error) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.error) || ((_e = (_d = response.error) === null || _d === void 0 ? void 0 : _d.response) === null || _e === void 0 ? void 0 : _e.message) || response.error.message || `HTTP error ${response.status}`);
+                throw new Error((_h = (_g = (_d = (_c = (_b = (_a = response.error) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.error) !== null && _d !== void 0 ? _d : (_f = (_e = response.error) === null || _e === void 0 ? void 0 : _e.response) === null || _f === void 0 ? void 0 : _f.message) !== null && _g !== void 0 ? _g : response.error.message) !== null && _h !== void 0 ? _h : `HTTP error ${response.status}`);
             }
         });
     }

package/lib/apps/base/api/velohero/api.js

@@ -60,7 +60,7 @@ class VeloHeroApi extends base_1.AppApiBase {
     }
     upload(fileName, props) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             if (!this.loginResponse && (!(props === null || props === void 0 ? void 0 : props.username) && !(props === null || props === void 0 ? void 0 : props.password))) {
                 throw new Error('not authenticated');
             }
@@ -78,8 +78,8 @@ class VeloHeroApi extends base_1.AppApiBase {
                 return response.data;
             }
             else {
-                const errMessage = ((_e = (_d = (_c = response.error) === null || _c === void 0 ? void 0 : _c.response) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.error) || ((_g = (_f = response.error) === null || _f === void 0 ? void 0 : _f.response) === null || _g === void 0 ? void 0 : _g.message) || response.error.message;
-                throw new Error(errMessage || `HTTP error ${response.status}`);
+                const errMessage = (_j = (_f = (_e = (_d = (_c = response.error) === null || _c === void 0 ? void 0 : _c.response) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.error) !== null && _f !== void 0 ? _f : (_h = (_g = response.error) === null || _g === void 0 ? void 0 : _g.response) === null || _h === void 0 ? void 0 : _h.message) !== null && _j !== void 0 ? _j : response.error.message;
+                throw new Error(errMessage !== null && errMessage !== void 0 ? errMessage : `HTTP error ${response.status}`);
             }
         });
     }

package/lib/base/service.js

@@ -29,7 +29,7 @@ class IncyclistService extends events_1.default {
         this.debug = enabled;
     }
     logError(err, fn, args) {
-        const logInfo = args || {};
+        const logInfo = args !== null && args !== void 0 ? args : {};
         this.logEvent(Object.assign(Object.assign({ message: 'Error', fn }, logInfo), { error: err.message, stack: err.stack }));
     }
     reset() {

package/lib/coaches/coach.js

@@ -74,14 +74,14 @@ class Coach {
         }
     }
     initSimulator(user, bikeType) {
+        var _a;
         const { type, target } = this.settings;
         const mode = type === 'power' ? 'Power' : 'Speed';
         const power = type === 'power' ? target : undefined;
         const speed = type === 'speed' ? target : undefined;
         const deviceSettings = { name: this.settings.name, interface: incyclist_devices_1.INTERFACE.SIMULATOR };
         const props = { port: '', isBot: true, user, settings: { bikeType, mode, power, speed } };
-        if (!this.simulator)
-            this.simulator = incyclist_devices_1.AdapterFactory.create(deviceSettings, props);
+        this.simulator = (_a = this.simulator) !== null && _a !== void 0 ? _a : incyclist_devices_1.AdapterFactory.create(deviceSettings, props);
     }
     start(onData) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -94,7 +94,7 @@ class Coach {
                 });
             }
             catch (err) {
-                this.logger.logEvent({ message: 'error', fn: 'startCoach()', coach: this.settings.name, error: err.message || err });
+                this.logger.logEvent({ message: 'error', fn: 'startCoach()', coach: this.settings.name, error: err.message });
             }
         });
     }

package/lib/coaches/service.d.ts

@@ -24,7 +24,7 @@ export declare class CoachesService extends IncyclistService {
     protected onCoachDataUpdate(coach: Coach, data: IncyclistAdapterData): void;
     protected setCoachPosition(coach: Coach, distance: number): void;
     protected get routesService(): RouteListService;
-    protected get rideService(): DeviceRideService;
+    protected getDeviceRide(): DeviceRideService;
     protected get deviceConfig(): DeviceConfigurationService;
     protected get pairingService(): DevicePairingService;
     protected get userService(): UserSettingsService;

package/lib/coaches/service.js

@@ -1,4 +1,11 @@
 "use strict";
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
 var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
     function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
     var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
@@ -26,13 +33,6 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
-var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i = 0; i < initializers.length; i++) {
-        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
-    }
-    return useValue ? value : void 0;
-};
 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) {
@@ -48,7 +48,6 @@ var __setFunctionName = (this && this.__setFunctionName) || function (f, name, p
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCoachesService = exports.CoachesService = void 0;
-const incyclist_devices_1 = require("incyclist-devices");
 const service_1 = require("../base/service");
 const types_1 = require("../base/types");
 const observer_1 = require("../base/types/observer");
@@ -59,16 +58,19 @@ const utils_1 = require("../utils");
 const coach_1 = require("./coach");
 const route_1 = require("../routes/base/utils/route");
 const activities_1 = require("../activities");
+const decorators_1 = require("../base/decorators");
 let CoachesService = (() => {
     let _classDecorators = [types_1.Singleton];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
     let _classSuper = service_1.IncyclistService;
+    let _instanceExtraInitializers = [];
+    let _getDeviceRide_decorators;
     var CoachesService = _classThis = class extends _classSuper {
         constructor() {
             super('Coaches');
-            this.coaches = [];
+            this.coaches = (__runInitializers(this, _instanceExtraInitializers), []);
             this.isPaused = false;
         }
         getCoaches() {
@@ -117,7 +119,7 @@ let CoachesService = (() => {
                     this.isPaused = false;
                     const onDataUpdate = this.onCoachDataUpdate.bind(this);
                     this.coaches.forEach(c => {
-                        var _a, _b, _c;
+                        var _a, _b, _c, _d;
                         const startSettings = this.routesService.getStartSettings();
                         let pos = 0;
                         if (startSettings.type === 'Route') {
@@ -128,8 +130,8 @@ let CoachesService = (() => {
                         c.setRiderPosition(pos);
                         this.setCoachPosition(c, lead + pos);
                         const user = this.userService.get('user', {});
-                        const adapter = this.deviceConfig.getSelected(incyclist_devices_1.IncyclistCapability.Control);
-                        const bikeType = adapter.getCyclingMode().getSetting('bikeType') || 'Race';
+                        const mode = this.getDeviceRide().getCyclingMode();
+                        const bikeType = (_d = mode === null || mode === void 0 ? void 0 : mode.getSetting('bikeType')) !== null && _d !== void 0 ? _d : 'Race';
                         c.initSimulator(user, bikeType);
                         c.start(onDataUpdate);
                     });
@@ -222,7 +224,7 @@ let CoachesService = (() => {
         get routesService() {
             return (0, routes_1.useRouteList)();
         }
-        get rideService() {
+        getDeviceRide() {
             return (0, devices_1.useDeviceRide)();
         }
         get deviceConfig() {
@@ -239,6 +241,8 @@ let CoachesService = (() => {
     (() => {
         var _a;
         const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create((_a = _classSuper[Symbol.metadata]) !== null && _a !== void 0 ? _a : null) : void 0;
+        _getDeviceRide_decorators = [decorators_1.Injectable];
+        __esDecorate(_classThis, null, _getDeviceRide_decorators, { kind: "method", name: "getDeviceRide", static: false, private: false, access: { has: obj => "getDeviceRide" in obj, get: obj => obj.getDeviceRide }, metadata: _metadata }, null, _instanceExtraInitializers);
         __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
         CoachesService = _classThis = _classDescriptor.value;
         if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });

package/lib/devices/access/service.js

@@ -276,6 +276,21 @@ let DeviceAccessService = (() => {
                 const detected = [];
                 const onDataHandlers = {};
                 const { includeKnown = false } = props;
+                const isKnown = (adapters, deviceSettings) => {
+                    if (adapters.find(a => a.isEqual(deviceSettings))) {
+                        return true;
+                    }
+                    if (filter.profile && deviceSettings.profile !== filter.profile) {
+                        return true;
+                    }
+                    if (filter.protocol && deviceSettings.protocol !== filter.protocol) {
+                        return true;
+                    }
+                    if (filter.protocols && !filter.protocols.includes(deviceSettings.protocol)) {
+                        return true;
+                    }
+                    return false;
+                };
                 if (!this.isScanning()) {
                     this.emitScanStateChange('start-requested');
                     this.scanState = {
@@ -298,22 +313,11 @@ let DeviceAccessService = (() => {
                         };
                         const onDevice = (deviceSettings) => __awaiter(this, void 0, void 0, function* () {
                             if (!includeKnown) {
-                                if (adapters.find(a => a.isEqual(deviceSettings))) {
-                                    return;
-                                }
-                                if (filter.profile && deviceSettings.profile !== filter.profile) {
-                                    return;
-                                }
-                                if (filter.protocol && deviceSettings.protocol !== filter.protocol) {
+                                if (isKnown(adapters, deviceSettings))
                                     return;
-                                }
-                                if (filter.protocols && !filter.protocols.includes(deviceSettings.protocol)) {
-                                    return;
-                                }
                             }
                             const adapter = incyclist_devices_1.AdapterFactory.create(deviceSettings);
                             if (!adapter) {
-                                console.log('~~~ no adapter', deviceSettings);
                                 return;
                             }
                             if (filter.capabilities) {
@@ -380,12 +384,16 @@ let DeviceAccessService = (() => {
                     });
                 }
                 let onDeviceHandler;
+                const checkIsNew = (detectedAdapters, deviceSettings) => {
+                    const isKnown = knownAdapters.some(ai => ai.adapter.isEqual(deviceSettings));
+                    const isAlreadyDetected = detectedAdapters.some(ai => ai.adapter.isEqual(deviceSettings));
+                    return !isKnown && !isAlreadyDetected;
+                };
                 const waitForMaxDevices = () => {
                     const detectedAdapters = [];
                     return new Promise(resolve => {
                         onDeviceHandler = (deviceSettings) => {
-                            const isNew = knownAdapters.find(ai => ai.adapter.isEqual(deviceSettings)) === undefined &&
-                                detectedAdapters.find(ai => ai.adapter.isEqual(deviceSettings)) === undefined;
+                            const isNew = checkIsNew(detectedAdapters, deviceSettings);
                             if (isNew) {
                                 const adapter = incyclist_devices_1.AdapterFactory.create(deviceSettings);
                                 detectedAdapters.push({ udid: `detected #${devices.length + 1}`, adapter, capabilities: adapter.getCapabilities() });

package/lib/devices/configuration/service.js

@@ -155,15 +155,15 @@ let DeviceConfigurationService = (() => {
             this.emitCapabiltyChanged();
         }
         select(udid, capability, props) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             this.logEvent({ message: 'select device', udid, capability, props });
-            const { emit = true } = props || {};
+            const { emit = true } = props !== null && props !== void 0 ? props : {};
             const deviceSettings = (_b = (_a = this.settings.devices) === null || _a === void 0 ? void 0 : _a.find(d => d.udid === udid)) === null || _b === void 0 ? void 0 : _b.settings;
             if (!deviceSettings)
                 return;
-            const adapter = this.adapters[udid] || this.getAdapterFromSetting(deviceSettings);
+            const adapter = (_c = this.adapters[udid]) !== null && _c !== void 0 ? _c : this.getAdapterFromSetting(deviceSettings);
             if (!adapter) {
-                this.logEvent({ message: 'error: could not find adapter', fn: 'select', udid, capability, adapters: (_c = Object.keys(this.adapters)) === null || _c === void 0 ? void 0 : _c.join(',') });
+                this.logEvent({ message: 'error: could not find adapter', fn: 'select', udid, capability, adapters: (_d = Object.keys(this.adapters)) === null || _d === void 0 ? void 0 : _d.join(',') });
                 return;
             }
             if (capability === 'bike')
@@ -307,7 +307,7 @@ let DeviceConfigurationService = (() => {
             return canStart;
         }
         getModeSettings(requestedUdid, requestedMode) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             const { capabilities, devices } = this.settings;
             if (!this.isInitialized())
                 return;
@@ -340,7 +340,7 @@ let DeviceConfigurationService = (() => {
                 else {
                     modeObj = options.find(m => m.getName() === mode);
                 }
-                settings = (device.modes ? device.modes[mode] : undefined) || {};
+                settings = (_d = (device.modes ? device.modes[mode] : undefined)) !== null && _d !== void 0 ? _d : {};
                 if (!settings && modeObj) {
                     settings = modeObj.getSettings();
                 }
@@ -777,12 +777,13 @@ let DeviceConfigurationService = (() => {
                         capability: c.capability,
                         disabled: c.disabled || false,
                         devices: ((_a = c.devices) !== null && _a !== void 0 ? _a : []).filter(udid => devices.find(d => d.udid === udid)).map(udid => {
+                            var _a, _b;
                             const adapter = adapters[udid];
                             const device = devices.find(d => d.udid === udid);
                             const mode = device.mode;
                             const modeSetting = device.modes ? device.modes[mode] : undefined;
                             const interfaceName = device.settings.interface;
-                            const name = (device === null || device === void 0 ? void 0 : device.displayName) || (adapter === null || adapter === void 0 ? void 0 : adapter.getUniqueName()) || (adapter === null || adapter === void 0 ? void 0 : adapter.getName());
+                            const name = (_b = (_a = device === null || device === void 0 ? void 0 : device.displayName) !== null && _a !== void 0 ? _a : adapter === null || adapter === void 0 ? void 0 : adapter.getUniqueName()) !== null && _b !== void 0 ? _b : adapter === null || adapter === void 0 ? void 0 : adapter.getName();
                             return { udid, name, interface: interfaceName, selected: udid === c.selected, mode, modeSetting };
                         })
                     };

package/lib/devices/ride/service.d.ts

@@ -1,8 +1,11 @@
 import { IncyclistDeviceSettings } from "../configuration";
-import { AdapterRideInfo, AdapterStateInfo, PreparedRoute, RideServiceCheckFilter, RideServiceDeviceProperties } from "./model";
+import { AdapterRideInfo, AdapterStateInfo, LegacyRoute, PreparedRoute, RideServiceCheckFilter, RideServiceDeviceProperties } from "./model";
 import { EventLogger } from 'gd-eventlog';
-import { CyclingMode, DeviceData, DeviceSettings, IncyclistCapability, IncyclistDeviceAdapter, UpdateRequest } from "incyclist-devices";
+import { CyclingMode, DeviceData, DeviceSettings, ICyclingMode, IncyclistCapability, IncyclistDeviceAdapter, UpdateRequest } from "incyclist-devices";
 import { IncyclistService } from "../../base/service";
+import { Route } from "../../routes/base/model/route";
+import { RouteApiDetail } from "../../routes/base/api/types";
+import { DaumEppProgramEntry, RoutePoint } from "../../routes/base/types";
 type DuplicateInfo = {
     udid: string;
     info: AdapterRideInfo;
@@ -30,6 +33,34 @@ export declare class DeviceRideService extends IncyclistService {
     protected getAllAdapters(): AdapterRideInfo[];
     protected getConfiguredAdapters(onlySelected?: boolean): AdapterRideInfo[];
     prepareEppRoute(props: RideServiceDeviceProperties): PreparedRoute;
+    protected getRouteInfo(route: Route | LegacyRoute): {
+        routeData: RouteApiDetail;
+        title: string;
+        isLap: boolean;
+    };
+    protected incrementEppProgramId(): any;
+    protected parseEppData(routeData: RouteApiDetail, startPos: number, isLap: boolean, eppPreferences: any, rideMode: string, realityFactor: number): {
+        name: string;
+        description: string;
+        programId: any;
+        type: string;
+        totalDistance: number;
+        lapMode: boolean;
+        minElevation: number;
+        maxElevation: number;
+        sampleRate: number;
+        points: {
+            elevation: number;
+            distance: number;
+        }[];
+    };
+    protected updateEppFromStartPoint(originalPoints: DaumEppProgramEntry[], startPos: number, offset: number, isLap: boolean, routeData: RouteApiDetail): DaumEppProgramEntry[];
+    protected createEppDataFromPoints(routeData: RouteApiDetail, startPos: number, isLap: boolean, eppPreferences: any, rideMode: string, realityFactor: number): PreparedRoute;
+    protected addEppPoints(routeData: RouteApiDetail, points: RoutePoint[], eppRoute: PreparedRoute, startPos: number, realityFactor: number): void;
+    protected updatePointsFromStartPos(routeData: RouteApiDetail, startPos: number, isLap: boolean): {
+        points: any;
+        totalDistance: number;
+    };
     waitForPreviousStartToFinish(): Promise<boolean>;
     startCheck(filter: RideServiceCheckFilter): Promise<void>;
     getAdapters(filter: RideServiceCheckFilter): AdapterRideInfo[];
@@ -73,7 +104,7 @@ export declare class DeviceRideService extends IncyclistService {
     isUpdateBusy(): boolean;
     waitForUpdateFinish(): Promise<void>;
     sendUpdate(request: UpdateRequest): Promise<void>;
-    getCyclingMode(udid?: string): CyclingMode;
+    getCyclingMode(udid?: string): ICyclingMode;
     isToggleEnabled(): boolean;
     toggleCyclingMode(): Promise<void>;
     resetCyclingMode(sendInit?: boolean): Promise<{