incyclist-services 1.6.2 → 1.6.3

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

@@ -76,13 +76,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

@@ -352,9 +352,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 +373,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 +436,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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "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",