incyclist-services 1.6.2 → 1.6.4

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

@@ -56,6 +56,7 @@ export declare class ActivityRideService extends IncyclistService {
         prevRidesLogs?: PastActivityInfo;
         lap?: number;
         pointsErrorLogged?: boolean;
+        info?: string;
     };
     constructor();
     init(id?: string): Observer;

package/lib/activities/ride/service.js

@@ -225,7 +225,15 @@ let ActivityRideService = (() => {
                 const display = Math.floor(time / 3) % 2;
                 const avgMaxStats = (display === 0) ? this.getAverageValues() : this.getMaximumValues();
                 const info = this.buildDashboardInfo(currentValues, avgMaxStats, display);
-                this.logEvent({ message: 'Dashboard update', items: info.map(i => { var _a, _b, _c, _d, _e, _f; return `${i.title}:${(_b = (_a = i.data[0]) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : ''}:${(_d = (_c = i.data[1]) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : ''}${((_e = i.data[1]) === null || _e === void 0 ? void 0 : _e.label) ? '(' + ((_f = i.data[1]) === null || _f === void 0 ? void 0 : _f.label) + ')' : ''}`; }).join('|') });
+                let showLog = true;
+                try {
+                    const infoStr = JSON.stringify(info);
+                    showLog = infoStr !== this.current.info;
+                    this.current.info = infoStr;
+                }
+                catch (_a) { }
+                if (showLog)
+                    this.logEvent({ message: 'Dashboard update', items: info.map(i => { var _a, _b, _c, _d, _e, _f; return `${i.title}:${(_b = (_a = i.data[0]) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : ''}:${(_d = (_c = i.data[1]) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : ''}${((_e = i.data[1]) === null || _e === void 0 ? void 0 : _e.label) ? '(' + ((_f = i.data[1]) === null || _f === void 0 ? void 0 : _f.label) + ')' : ''}`; }).join('|') });
                 return info;
             }
             catch (err) {
@@ -654,6 +662,7 @@ let ActivityRideService = (() => {
                 }
                 this.current.deviceData = Object.assign(Object.assign({}, this.current.deviceData), update);
                 if (this.state !== 'active') {
+                    this.emit('data');
                     if (this.state === 'paused' && (data.power > 0 || data.cadence > 0) && this.current.isAutoResume) {
                         this.resume('system');
                         return;

package/lib/devices/pairing/service.js

@@ -831,7 +831,7 @@ class DevicePairingService extends service_2.IncyclistService {
     }
     checkPairingSuccess() {
         const configReadyToRide = this.configuration.canStartRide();
-        if (!configReadyToRide)
+        if (!configReadyToRide || this.isScanning())
             return false;
         const control = this.getCapability(incyclist_devices_1.IncyclistCapability.Control);
         const power = this.getCapability(incyclist_devices_1.IncyclistCapability.Power);

package/lib/ride/display/service.js

@@ -164,7 +164,7 @@ let RideDisplayService = (() => {
                 try {
                     const props = this.getStartOverlayProps();
                     this.logEvent({ message: 'button clicked', overlay: 'start overlay', button: 'Cancel', reason: 'user cancel', state: props, eventSource: 'user' });
-                    yield this.stopRide();
+                    yield this.stopRide({ noStateUpdates: true });
                 }
                 catch (err) {
                     this.logError(err, 'cancelStart');

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

@@ -3,7 +3,7 @@ import { Observer } from "../../base/types";
 import { LocalizationService } from "../../i18n";
 import { RouteListService } from "../../routes";
 import { Route } from "../../routes/base/model/route";
-import { RouteInfoText } from "../../routes/base/types";
+import { RouteInfoText, RoutePoint } from "../../routes/base/types";
 import { VideoConversion, VideoSyncHelper } from "../../video";
 import { CurrentPosition, CurrentRideDisplayProps, InfotextDisplayProps, OverlayDisplayProps, RLVDisplayProps } from "../base";
 import { RouteDisplayService } from "./RouteDisplayService";
@@ -45,6 +45,7 @@ export declare class RLVDisplayService extends RouteDisplayService {
     getDisplayProperties(props: CurrentRideDisplayProps): RLVDisplayProps;
     protected getInfotextDisplayProps(): InfotextDisplayProps;
     protected checkFinishOptions(position: CurrentPosition): boolean;
+    protected preparePointsForMerge(currentPoints: RoutePoint[], nextPoints: RoutePoint[]): void;
     protected onNextVideo(): void;
     protected checkInfotextDisplayProps(time: number): void;
     protected getUIText(input: string): string;
@@ -76,13 +77,14 @@ export declare class RLVDisplayService extends RouteDisplayService {
         start: number;
         end: number;
     }>, video?: VideoState): void;
+    protected getCode(error: MediaError): any;
     protected onVideoPlaybackError(error: MediaError, video?: VideoState): void;
     protected onVideoPlayBackUpdate(time: number, rate: number, e: any, video?: VideoState): void;
     protected onVideoEnded(video?: VideoState): void;
     onActivityUpdate(activityPos: ActivityUpdate, data: any): void;
     protected initVideoSource(video: VideoState): VideoConversion;
     protected initMp4VideoSource(video: VideoState): void;
-    protected buildVideoError(error: MediaError): string;
+    protected buildVideoError(error: MediaError, video?: VideoState): string;
     protected getVideoUrl(video: VideoState): string;
     protected getVideoTime(routeDistance: number, video?: VideoState): number;
     protected initAviVideoSource(video: VideoState): VideoConversion;

package/lib/ride/route/RLVDisplayService.js

@@ -49,6 +49,7 @@ const types_1 = require("../../base/types");
 const i18n_1 = require("../../i18n");
 const utils_1 = require("../../maps/MapArea/utils");
 const routes_1 = require("../../routes");
+const geo_1 = require("../../utils/geo");
 const video_1 = require("../../video");
 const RouteDisplayService_1 = require("./RouteDisplayService");
 let RLVDisplayService = (() => {
@@ -209,6 +210,22 @@ let RLVDisplayService = (() => {
                     return false;
                 }
             }
+            preparePointsForMerge(currentPoints, nextPoints) {
+                (0, routes_1.correctDistanceValues)(currentPoints);
+                (0, routes_1.correctDistanceValues)(nextPoints);
+                nextPoints.forEach(p => {
+                    delete p.routeDistance;
+                    delete p.cnt;
+                    delete p.elevationGain;
+                    delete p.slope;
+                });
+                const pLastCurrent = currentPoints[currentPoints.length - 1];
+                const pFirstNext = nextPoints[0];
+                const distance = (0, geo_1.distanceBetween)(pLastCurrent, pFirstNext);
+                const elevationGain = distance < 5 ? 0 : pLastCurrent.slope * distance / 100;
+                const elevationDelta = (pLastCurrent.elevation + elevationGain) - pFirstNext.elevation;
+                nextPoints.forEach(p => { p.elevation += elevationDelta; });
+            }
             onNextVideo() {
                 const old = this.currentVideo;
                 const next = this.currentVideo.next;
@@ -225,8 +242,11 @@ let RLVDisplayService = (() => {
                 setTimeout(() => {
                     old.syncHelper.reset();
                 }, 2000);
-                (0, utils_1.concatPaths)(this.getCurrentRoute().details.points, next.route.details.points, 'after');
-                (0, routes_1.validateRoute)(this.getCurrentRoute(), true);
+                const currentPoints = this.getCurrentRoute().details.points;
+                const nextPoints = next.route.details.points;
+                this.preparePointsForMerge(currentPoints, nextPoints);
+                (0, utils_1.concatPaths)(currentPoints, nextPoints, 'after');
+                (0, routes_1.validateRoute)(this.getCurrentRoute(), false);
                 this.emit('route-updated', this.getCurrentRoute());
                 this.logEvent({ message: 'switching to next video', route: this.getCurrentRoute().details.title,
                     segment: this.currentVideo.route.description.title, offset: this.offset, segmentDistance: this.currentVideo.route.description.distance,
@@ -352,9 +372,12 @@ let RLVDisplayService = (() => {
             }
             onVideoLoadError(error, video = this.currentVideo) {
                 video.loaded = false;
-                video.error = this.buildVideoError(error);
-                if (!video.isInitial) {
-                    this.logEvent({ message: 'could not load next video', video: this.getVideoUrl(video), error: error.message, errorCode: error.code });
+                video.error = this.buildVideoError(error, video);
+                if (video.isInitial) {
+                    this.logEvent({ message: 'could not load video', video: this.getVideoUrl(video), error: error.message, errorCode: this.getCode(error) });
+                }
+                else {
+                    this.logEvent({ message: 'could not load next video', video: this.getVideoUrl(video), error: error.message, errorCode: this.getCode(error) });
                     const errIdx = this.videos.indexOf(video);
                     if (errIdx !== -1) {
                         this.videos.splice(errIdx);
@@ -370,7 +393,27 @@ let RLVDisplayService = (() => {
             onVideoWaiting(time, rate, bufferedTime, buffers, video = this.currentVideo) {
                 video.syncHelper.onVideoWaiting(time, rate, bufferedTime, buffers);
             }
+            getCode(error) {
+                const codes = ['MEDIA_ERR_ABORTED', 'MEDIA_ERR_NETWORK', 'MEDIA_ERR_DECODE', 'MEDIA_ERR_SRC_NOT_SUPPORTED'];
+                try {
+                    let codeStr;
+                    if (error.code !== undefined) {
+                        codeStr = codes === null || codes === void 0 ? void 0 : codes[error.code - 1];
+                        if (codeStr) {
+                            codeStr = `${codeStr} (${error.code})`;
+                        }
+                        else {
+                            codeStr = error.code.toString();
+                        }
+                    }
+                    return codeStr;
+                }
+                catch (err) {
+                    this.logError(err, 'getCode');
+                }
+            }
             onVideoPlaybackError(error, video = this.currentVideo) {
+                this.logEvent({ message: 'video playback error', video: this.getVideoUrl(video), error: error.message, errorCode: this.getCode(error) });
             }
             onVideoPlayBackUpdate(time, rate, e, video = this.currentVideo) {
                 video.syncHelper.onVideoPlaybackUpdate(time, rate, e);
@@ -413,7 +456,21 @@ let RLVDisplayService = (() => {
                     video.playback = 'native';
                 }
             }
-            buildVideoError(error) {
+            buildVideoError(error, video = this.currentVideo) {
+                const src = this.getVideoUrl(video);
+                const remote = src === null || src === void 0 ? void 0 : src.startsWith('http');
+                switch (error.code) {
+                    case MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED:
+                        if (error.message.includes('Format error'))
+                            return remote ? 'Could not load video' : 'Could not open video file';
+                        return 'Could not decode video';
+                    case MediaError.MEDIA_ERR_NETWORK:
+                        return remote ? 'Could not load video' : 'Could not open video file';
+                    case MediaError.MEDIA_ERR_ABORTED:
+                        return 'The playback was canceled';
+                    case MediaError.MEDIA_ERR_DECODE:
+                        return 'Could not decode video';
+                }
                 return error.message;
             }
             getVideoUrl(video) {

package/lib/ride/route/RouteDisplayService.js

@@ -89,12 +89,12 @@ let RouteDisplayService = (() => {
                     return;
                 }
                 try {
+                    const prevPosition = Object.assign({}, this.position);
                     const newPosition = this.updatePosition(activityPos);
                     if (!newPosition)
                         return;
                     const isCompleted = this.checkFinishOptions(newPosition);
                     if (!isCompleted) {
-                        const prevPosition = this.position;
                         this.position = Object.assign({}, newPosition);
                         const { lat, lng, routeDistance, lap } = newPosition;
                         this.onPositionUpdate({ route: this.getOriginalRoute(), position: this.position });
@@ -275,7 +275,7 @@ let RouteDisplayService = (() => {
                         const current = this.toLapPoint(this.position);
                         props = { routeDistance: activityPos === null || activityPos === void 0 ? void 0 : activityPos.routeDistance, prev: current };
                         const next = (0, routes_1.getNextPosition)(this.getCurrentRoute(), props);
-                        return this.fromLapPoint(next);
+                        this.position = this.fromLapPoint(next);
                     }
                     return this.position;
                 }

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

@@ -7,6 +7,7 @@ export declare const validateSlopes: (points: Array<RoutePoint>) => void;
 export declare const updateSlopes: (points: Array<RoutePoint>, validateOnly?: boolean) => void;
 export declare const getSegments: (route: Route) => Array<RouteSegment>;
 export declare const addDetails: (route: Route, details: RouteApiDetail) => void;
+export declare const correctDistanceValues: (points: RoutePoint[]) => void;
 export declare const validateRoute: (route: Route | RouteApiDetail, reset?: boolean) => void;
 export declare const validateDistance: (points: Array<RoutePoint>) => void;
 export declare const getTotalElevation: (route: RouteApiDetail) => number;

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNextVideoId = exports.hasNextVideo = exports.createFromJson = exports.getPointAtDistance = exports.getHeading = exports.getPosition = exports.getNextPosition = exports.getRouteHash = exports.getTotalDistance = exports.updateCnt = exports.updateElevationGain = exports.getElevationGainAt = exports.getTotalElevation = exports.validateDistance = exports.validateRoute = exports.addDetails = exports.getSegments = exports.updateSlopes = exports.validateSlopes = exports.checkIsLoop = void 0;
+exports.getNextVideoId = exports.hasNextVideo = exports.createFromJson = exports.getPointAtDistance = exports.getHeading = exports.getPosition = exports.getNextPosition = exports.getRouteHash = exports.getTotalDistance = exports.updateCnt = exports.updateElevationGain = exports.getElevationGainAt = exports.getTotalElevation = exports.validateDistance = exports.validateRoute = exports.correctDistanceValues = exports.addDetails = exports.getSegments = exports.updateSlopes = exports.validateSlopes = exports.checkIsLoop = void 0;
 const utils_1 = require("../../../utils");
 const clone_1 = __importDefault(require("../../../utils/clone"));
 const geo_1 = require("../../../utils/geo");
@@ -179,6 +179,15 @@ const addVideoDetails = (route, details) => {
     route.description.hasGpx = details.points.find(p => p.lat && p.lng) !== undefined;
     route.description.next = (_c = details.video) === null || _c === void 0 ? void 0 : _c.next;
 };
+const correctDistanceValues = (points) => {
+    points.forEach((p, idx) => {
+        if (idx == 0) {
+            return;
+        }
+        p.distance = p.routeDistance - points[idx - 1].routeDistance;
+    });
+};
+exports.correctDistanceValues = correctDistanceValues;
 const validateRoute = (route, reset = false) => {
     var _a;
     if (!((_a = route === null || route === void 0 ? void 0 : route.points) === null || _a === void 0 ? void 0 : _a.length))

package/lib/video/VideoSyncHelper.js

@@ -207,7 +207,7 @@ class VideoSyncHelper extends service_1.IncyclistService {
         this.onUpdate(updates);
     }
     onUpdate(updates = []) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         if (this.isStopped || this.rlvStatus.timeRequested)
             return;
         try {
@@ -244,13 +244,16 @@ class VideoSyncHelper extends service_1.IncyclistService {
                     this.logEvent({ message: 'video debug', videoState: this.rlvStatus, activityState: this.activityStatus });
                 }
             };
-            if (this.loopMode && this.rlvStatus.lap > this.activityStatus.lap) {
-                rlvDistance = rlvDistance + totalDistance;
+            if (this.loopMode && actDistance > totalDistance) {
+                actDistance = actDistance % totalDistance;
+                rlvDistance = rlvDistance % totalDistance;
             }
-            else if (this.loopMode && this.rlvStatus.lap < this.activityStatus.lap) {
-                actDistance = actDistance + totalDistance;
+            let delta = rlvDistance - actDistance;
+            if (this.loopMode) {
+                const deltaActAhead = rlvDistance - (actDistance + totalDistance);
+                const deltaRlvAhead = (rlvDistance + totalDistance) - actDistance;
+                delta = [delta, deltaActAhead, deltaRlvAhead].reduce((best, cur) => Math.abs(cur) < Math.abs(best) ? cur : best, delta);
             }
-            const delta = rlvDistance - actDistance;
             if (Math.abs(delta) > Math.abs(this.maxDelta)) {
                 this.maxDelta = delta;
             }
@@ -278,13 +281,13 @@ class VideoSyncHelper extends service_1.IncyclistService {
                         return;
                     }
                     const tTarget = 5;
-                    const maxCorrection = Math.max(20, this.rlvStatus.time < 100 ? 15 : this.bufferedTime / 2.5 * 15);
+                    const maxCorrection = Math.max(20, this.rlvStatus.time < 100 ? 15 : ((_c = this.bufferedTime) !== null && _c !== void 0 ? _c : 0) / 2.5 * 15);
                     const correction = Math.sign(delta) * Math.min(Math.abs(delta), maxCorrection);
                     const rate = (this.activityStatus.speed - correction / tTarget * 3.6) / this.rlvStatus.speed;
                     this.updateRate(rate);
                 }
             }
-            this.cpuTime = ((_c = this.cpuTime) !== null && _c !== void 0 ? _c : 0) + (Date.now() - tsStart);
+            this.cpuTime = ((_d = this.cpuTime) !== null && _d !== void 0 ? _d : 0) + (Date.now() - tsStart);
         }
         catch (err) {
             this.logError(err, 'onUpdate');

package/lib/workouts/list/service.js

@@ -93,7 +93,10 @@ let WorkoutListService = (() => {
             this.getWorkoutCalendar().off('updated', this.onUpdate);
             this.getWorkoutCalendar().reset();
         }
-        getSelected() { return this.selectedWorkout; }
+        getSelected() {
+            const workoutShown = this.getAppState().getState('workoutShown');
+            return workoutShown ? this.selectedWorkout : undefined;
+        }
         setScreenProps(props) { this.screenProps = props; }
         getScreenProps() { return this.screenProps; }
         open() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.6.2",
+  "version": "1.6.4",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "axios": "^1.8.2",
-    "incyclist-devices": "^2.4.7",
+    "incyclist-devices": "^2.4.9",
     "promise.any": "^2.0.6",
     "semver": "^7.6.3",
     "tcx-builder": "^1.1.1",