incyclist-services 1.5.70 → 1.6.1

package/lib/appstate/index.d.ts

@@ -1 +1,2 @@
 export * from './service';
+export * from './types';

package/lib/appstate/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./service"), exports);
+__exportStar(require("./types"), exports);

package/lib/appstate/service.d.ts

@@ -1,7 +1,9 @@
 import { IncyclistService } from "../base/service";
+import { AppFeature } from "./types";
 export declare class AppStateService extends IncyclistService {
     protected state: Record<string, any>;
     constructor();
+    hasFeature(feature: AppFeature): any;
     getPersistedState(key: string): any;
     setPersistedState(key: string, value: any): void;
     getState(key: string): any;

package/lib/appstate/service.js

@@ -56,6 +56,9 @@ let AppStateService = (() => {
             super('AppState');
             this.state = (__runInitializers(this, _instanceExtraInitializers), {});
         }
+        hasFeature(feature) {
+            return this.getSetting(feature, false);
+        }
         getPersistedState(key) {
             return this.getSetting(`state.${key}`, undefined);
         }

package/lib/devices/ride/service.js

@@ -125,7 +125,7 @@ let DeviceRideService = (() => {
             return this.data;
         }
         getRideAdapters() {
-            var _a, _b;
+            var _a, _b, _c, _d, _e;
             if ((_a = this.rideAdapters) === null || _a === void 0 ? void 0 : _a.length)
                 return this.rideAdapters;
             try {
@@ -150,11 +150,24 @@ let DeviceRideService = (() => {
                 if (this.simulatorEnforced) {
                     this.setRequestedCapabilties(this.rideAdapters);
                 }
+                if (this.rideAdapters.length === 0) {
+                    const devices = this.getDeviceConfiguration();
+                    const adapter = (_c = (_b = devices.getSelected(incyclist_devices_1.IncyclistCapability.Control)) !== null && _b !== void 0 ? _b : devices.getSelected(incyclist_devices_1.IncyclistCapability.Power)) !== null && _c !== void 0 ? _c : devices.getSelected(incyclist_devices_1.IncyclistCapability.Speed);
+                    if (adapter) {
+                        const adapters = (_d = this.getConfiguredAdapters(true)) !== null && _d !== void 0 ? _d : [];
+                        this.logEvent({ message: 'error',
+                            error: 'incorrect device configuration',
+                            adapters: adapters.map(ai => `${ai.udid}, ${ai.isControl ? '(C)' : ''}`).join('|'),
+                            configuredControlDevice: configuredControlDevice === null || configuredControlDevice === void 0 ? void 0 : configuredControlDevice.udid,
+                            controlDevice: controlDevice === null || controlDevice === void 0 ? void 0 : controlDevice.udid,
+                            simulatorEnforced: this.simulatorEnforced });
+                    }
+                }
                 return this.rideAdapters;
             }
             catch (err) {
                 this.logError(err, 'getRideAdapters');
-                return (_b = this.rideAdapters) !== null && _b !== void 0 ? _b : [];
+                return (_e = this.rideAdapters) !== null && _e !== void 0 ? _e : [];
             }
         }
         getAllAdapters() {
@@ -547,6 +560,7 @@ let DeviceRideService = (() => {
                     logProps.bikeType = (_b = bike.getCyclingMode()) === null || _b === void 0 ? void 0 : _b.getSetting('bikeType');
                 }
                 startProps.capabilities = ai.capabilities;
+                ai.isStarted = false;
                 this.logEvent(Object.assign({ message: `${startType} ${sType} request` }, logProps));
                 return ai.adapter.start(startProps)
                     .then((success) => __awaiter(this, void 0, void 0, function* () {
@@ -901,8 +915,8 @@ let DeviceRideService = (() => {
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.lazyInit();
                 this.cleanInternalCache();
-                delete this.rideAdapters;
                 const adapters = this.getRideAdapters();
+                this.logEvent({ message: 'sending start request', retry: false, deviceInfo: adapters === null || adapters === void 0 ? void 0 : adapters.map(this.getAdapterStateInfo.bind(this)) });
                 this.emit('start-request', adapters === null || adapters === void 0 ? void 0 : adapters.map(this.getAdapterStateInfo.bind(this)));
                 const goodToGo = yield this.waitForPreviousStartToFinish();
                 if (!goodToGo)
@@ -915,7 +929,8 @@ let DeviceRideService = (() => {
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.lazyInit();
                 const selected = this.getRideAdapters();
-                this.emit('start-request', selected === null || selected === void 0 ? void 0 : selected.map(this.getAdapterStateInfo));
+                this.logEvent({ message: 'sending start request', retry: true, deviceInfo: selected === null || selected === void 0 ? void 0 : selected.map(this.getAdapterStateInfo.bind(this)) });
+                this.emit('start-request', selected === null || selected === void 0 ? void 0 : selected.map(this.getAdapterStateInfo.bind(this)));
                 const adapters = selected.filter(ai => !ai.adapter.isStarted());
                 const goodToGo = yield this.waitForPreviousStartToFinish();
                 if (!goodToGo)

package/lib/ride/display/service.js

@@ -99,21 +99,14 @@ let RideDisplayService = (() => {
         }
         init() {
             return __awaiter(this, void 0, void 0, function* () {
-                var _a, _b, _c;
                 yield this.closePrevRide();
                 this.observer = new types_1.Observer();
                 try {
                     this.displayService = this.getRideModeService(true);
-                    const ftNewUI = this.getUserSettings().get('NEW_GPX_UI', false);
-                    const isVideo = this.getRideType() === 'Video';
-                    const isMp4 = isVideo && ((_c = (_b = (_a = this.route) === null || _a === void 0 ? void 0 : _a.description) === null || _b === void 0 ? void 0 : _b.videoFormat) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === 'mp4';
-                    const showLegacy = isVideo && !isMp4 && !ftNewUI;
-                    if (!showLegacy) {
-                        this.displayService.init(this);
-                        this.displayService.on('lap-completed', this.onLapCompleted.bind(this));
-                        this.displayService.on('route-completed', this.onRouteCompleted.bind(this));
-                        this.hideAll = false;
-                    }
+                    this.displayService.init(this);
+                    this.displayService.on('lap-completed', this.onLapCompleted.bind(this));
+                    this.displayService.on('route-completed', this.onRouteCompleted.bind(this));
+                    this.hideAll = false;
                 }
                 catch (err) {
                     this.logError(err, 'init');
@@ -795,7 +788,6 @@ let RideDisplayService = (() => {
                 .on('route-updated', this.onRouteUpdated.bind(this));
         }
         onStateUpdate() {
-            console.log('# state update', this.state);
             this.checkStartStatus();
             this.updateStartOverlay();
         }
@@ -1016,6 +1008,9 @@ let RideDisplayService = (() => {
         isStartDeviceReadyToStart() {
             var _a, _b;
             const devices = (_a = this.deviceInfo) !== null && _a !== void 0 ? _a : [];
+            if (devices.length === 0) {
+                return false;
+            }
             const mandatory = (_b = devices === null || devices === void 0 ? void 0 : devices.filter(d => d.isControl)) !== null && _b !== void 0 ? _b : [];
             return !(mandatory === null || mandatory === void 0 ? void 0 : mandatory.length) || mandatory.filter(d => d.status === 'Started').length == mandatory.length;
         }

package/lib/ride/route/RLVDisplayService.js

@@ -189,11 +189,11 @@ let RLVDisplayService = (() => {
                 return this.infotext;
             }
             checkFinishOptions(position) {
-                var _b, _c;
-                if (this.videos.length === 0 || !((_b = this.currentVideo) === null || _b === void 0 ? void 0 : _b.loaded)) {
+                var _b, _c, _d, _e;
+                if (!((_b = this.videos) === null || _b === void 0 ? void 0 : _b.length) || !((_c = this.currentVideo) === null || _c === void 0 ? void 0 : _c.loaded)) {
                     return super.checkFinishOptions(position);
                 }
-                if (!((_c = this.currentVideo) === null || _c === void 0 ? void 0 : _c.next)) {
+                if (!((_d = this.currentVideo) === null || _d === void 0 ? void 0 : _d.next) || ((_e = this.videos) === null || _e === void 0 ? void 0 : _e.length) === 1) {
                     return super.checkFinishOptions(position);
                 }
                 const finished = this.checkIsRouteFinished(position);
@@ -347,8 +347,12 @@ let RLVDisplayService = (() => {
                 video.loaded = false;
                 video.error = this.buildVideoError(error);
                 if (!video.isInitial) {
-                    this.logEvent({ message: 'could not load next video', error: this.buildVideoError(error) });
-                    this.videos = [this.currentVideo];
+                    this.logEvent({ message: 'could not load next video', video: this.getVideoUrl(video), error: error.message, errorCode: error.code });
+                    const errIdx = this.videos.indexOf(video);
+                    if (errIdx !== -1) {
+                        this.videos.splice(errIdx);
+                        this.logEvent({ message: 'changed video config', videos: this.videos.map(v => this.getVideoUrl(v)).join('|') });
+                    }
                 }
                 this.emit('state-update');
             }

package/lib/routes/base/utils/route.d.ts

@@ -31,9 +31,9 @@ export interface GetPositionProps {
     nearest?: boolean;
     latlng?: LatLng;
 }
-export declare const getPosition: (route: Route, props: GetPositionProps) => RoutePoint;
+export declare const getPosition: (src: Route | Array<RoutePoint>, props: GetPositionProps) => RoutePoint;
 export declare const getHeading: (route: Route, point: RoutePoint) => number;
-export declare const getPointAtDistance: (route: Route | RouteApiDetail, routeDistance: number, nearest?: boolean) => RoutePoint;
+export declare const getPointAtDistance: (src: Route | RouteApiDetail | Array<RoutePoint>, routeDistance: number, nearest?: boolean) => RoutePoint;
 interface LegacyRouteApiDetail extends RouteApiDetail {
     decoded?: Array<RoutePoint>;
 }

package/lib/routes/base/utils/route.js

@@ -359,18 +359,26 @@ const getNextPosition = (route, props) => {
     return lapPoint;
 };
 exports.getNextPosition = getNextPosition;
-const getPosition = (route, props) => {
-    if (props === undefined || route.points === undefined)
+const getPosition = (src, props) => {
+    let route;
+    let points;
+    if (Array.isArray(src)) {
+        points = src;
+    }
+    else {
+        route = src;
+    }
+    if (props === undefined || ((route === null || route === void 0 ? void 0 : route.points) === undefined && !(points === null || points === void 0 ? void 0 : points.length)))
         return;
     const { cnt, distance, nearest = true, latlng } = props;
     if (props.cnt !== undefined) {
-        return getPointAtIndex(route, cnt);
+        return getPointAtIndex(src, cnt);
     }
     if (props.distance !== undefined) {
-        return (0, exports.getPointAtDistance)(route, distance, nearest);
+        return (0, exports.getPointAtDistance)(src, distance, nearest);
     }
     if (props.latlng !== undefined) {
-        return getPointAtLatLng(route, latlng, nearest);
+        return getPointAtLatLng(src, latlng, nearest);
     }
 };
 exports.getPosition = getPosition;
@@ -394,16 +402,16 @@ const getHeading = (route, point) => {
     return (0, geo_1.calculateHeaderFromPoints)(p1, p2);
 };
 exports.getHeading = getHeading;
-const getPointAtIndex = (route, idx) => {
-    const points = route.points;
+const getPointAtIndex = (src, idx) => {
+    const points = Array.isArray(src) ? src : src.points;
     if (idx >= points.length || idx < 0)
         return;
     const point = Object.assign({}, points[idx]);
     point.cnt = idx;
     return point;
 };
-const getPointAtDistance = (route, routeDistance, nearest = true) => {
-    const points = route.points;
+const getPointAtDistance = (src, routeDistance, nearest = true) => {
+    const points = Array.isArray(src) ? src : src.points;
     if (!points)
         return;
     const exact = !nearest;
@@ -432,9 +440,9 @@ const getPointAtDistance = (route, routeDistance, nearest = true) => {
     return point;
 };
 exports.getPointAtDistance = getPointAtDistance;
-const getPointAtLatLng = (route, latlng, nearest = true) => {
-    const points = route.points;
-    if (!points || !route.description.hasGpx)
+const getPointAtLatLng = (src, latlng, nearest = true) => {
+    const points = Array.isArray(src) ? src : src.points;
+    if (!points)
         return;
     const exact = !nearest;
     let cnt = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.5.70",
+  "version": "1.6.1",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },