incyclist-services 1.6.4 → 1.6.5

package/lib/ride/base/base.d.ts

@@ -1,4 +1,4 @@
-import { DeviceData, UpdateRequest } from "incyclist-devices";
+import { CyclingMode, DeviceData, UpdateRequest } from "incyclist-devices";
 import { Observer } from "../../base/types";
 import { ActiveWorkoutLimit } from "../../workouts";
 import { CurrentRideDisplayProps, ICurrentRideService, IRideModeService, IRideModeServiceDisplayProps } from "./types";
@@ -39,8 +39,11 @@ export declare class RideModeService extends IncyclistService implements IRideMo
     }): UpdateRequest;
     sendUpdate(request?: UpdateRequest): Promise<void>;
     protected processPowerDeltaRequest(request: UpdateRequest): void;
+    protected isForcedERG(): boolean;
+    protected updatePropsForForcedERG(mode: CyclingMode, logProps: any): void;
     protected getBikeLogProps(): object;
     protected getDashboardColumns(): number;
     protected getDeviceRide(): import("../../devices").DeviceRideService;
     protected getWorkoutRide(): import("../../workouts").WorkoutRide;
+    protected getWorkoutList(): import("../../workouts").WorkoutListService;
 }

package/lib/ride/base/base.js

@@ -54,6 +54,7 @@ let RideModeService = (() => {
     let _classSuper = service_1.IncyclistService;
     let _instanceExtraInitializers = [];
     let _getDeviceRide_decorators;
+    let _getWorkoutList_decorators;
     return _a = class RideModeService extends _classSuper {
             constructor() {
                 super('Ride');
@@ -169,6 +170,31 @@ let RideModeService = (() => {
                 }
                 send(request);
             }
+            isForcedERG() {
+                var _b;
+                let forceErgMode = false;
+                if (this.getWorkoutList().getSelected()) {
+                    forceErgMode = (_b = this.getWorkoutList().getStartSettings()) === null || _b === void 0 ? void 0 : _b.useErgMode;
+                }
+                return forceErgMode;
+            }
+            updatePropsForForcedERG(mode, logProps) {
+                try {
+                    const isSIM = typeof (mode === null || mode === void 0 ? void 0 : mode.isSIM) === 'function' ? mode.isSIM() : false;
+                    if (this.isForcedERG()) {
+                        if (isSIM) {
+                            logProps.bikeMode = 'ERG (Workout)';
+                        }
+                        delete logProps['virtshift'];
+                        delete logProps['startGear'];
+                        delete logProps['slopeAdj'];
+                        delete logProps['slopeAsjDown'];
+                    }
+                }
+                catch (err) {
+                    this.logError(err, 'updatePropsForForcedERG');
+                }
+            }
             getBikeLogProps() {
                 var _b, _c, _d;
                 const device = this.getDeviceRide().getControlAdapter();
@@ -176,10 +202,13 @@ let RideModeService = (() => {
                     return {};
                 const mode = this.getDeviceRide().getCyclingMode();
                 if ((mode === null || mode === void 0 ? void 0 : mode.getName()) === 'Simulator') {
-                    return { bike: 'Simulator', interface: 'Simulator', mode: 'Simulator' };
+                    return { bike: 'Simulator', interface: 'Simulator', bikeMode: 'Simulator' };
                 }
+                let bikeMode = mode === null || mode === void 0 ? void 0 : mode.getName();
                 const settings = (_b = mode === null || mode === void 0 ? void 0 : mode.getSettings()) !== null && _b !== void 0 ? _b : {};
-                return Object.assign({ bike: (_c = device.adapter) === null || _c === void 0 ? void 0 : _c.getDisplayName(), interface: (_d = device.adapter) === null || _d === void 0 ? void 0 : _d.getInterface(), bikeMode: mode === null || mode === void 0 ? void 0 : mode.getName() }, settings);
+                const logProps = Object.assign({ bikeMode }, settings);
+                this.updatePropsForForcedERG(mode, logProps);
+                return Object.assign({ bike: (_c = device.adapter) === null || _c === void 0 ? void 0 : _c.getDisplayName(), interface: (_d = device.adapter) === null || _d === void 0 ? void 0 : _d.getInterface() }, logProps);
             }
             getDashboardColumns() {
                 const mode = this.getDeviceRide().getCyclingMode();
@@ -193,12 +222,17 @@ let RideModeService = (() => {
             getWorkoutRide() {
                 return (0, workouts_1.useWorkoutRide)();
             }
+            getWorkoutList() {
+                return (0, workouts_1.useWorkoutList)();
+            }
         },
         (() => {
             var _b;
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create((_b = _classSuper[Symbol.metadata]) !== null && _b !== void 0 ? _b : null) : void 0;
             _getDeviceRide_decorators = [decorators_1.Injectable];
+            _getWorkoutList_decorators = [decorators_1.Injectable];
             __esDecorate(_a, 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(_a, null, _getWorkoutList_decorators, { kind: "method", name: "getWorkoutList", static: false, private: false, access: { has: obj => "getWorkoutList" in obj, get: obj => obj.getWorkoutList }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         })(),
         _a;

package/lib/ride/route/RLVDisplayService.js

@@ -387,7 +387,6 @@ let RLVDisplayService = (() => {
                 this.emit('state-update');
             }
             onVideoStalled(time, bufferedTime, buffers, video = this.currentVideo) {
-                this.logEvent({ message: 'video stalled', bufferedTime, buffers });
                 video.syncHelper.onVideoStalled(time, bufferedTime);
             }
             onVideoWaiting(time, rate, bufferedTime, buffers, video = this.currentVideo) {

package/lib/video/VideoSyncHelper.d.ts

@@ -33,6 +33,7 @@ export declare class VideoSyncHelper extends IncyclistService {
         loopMode?: boolean;
         observer?: Observer;
     });
+    logEvent(event: any): void;
     pause(): void;
     resume(): void;
     reset(): void;
@@ -45,7 +46,7 @@ export declare class VideoSyncHelper extends IncyclistService {
         networkState?: number;
         bufferedTime?: number;
     }): void;
-    onVideoStalled(time: number, bufferedTime: number): void;
+    onVideoStalled(time: number, _bufferedTime: number): void;
     onVideoWaiting(time: number, rate: number, bufferedTime: number, buffers: Array<{
         start: number;
         end: number;
@@ -70,4 +71,6 @@ export declare class VideoSyncHelper extends IncyclistService {
     protected validateMappings(route: Route): void;
     protected initCorrectedMapping(routeData: RouteApiDetail): import("../routes/base/types").VideoMapping[];
     protected logPlaybackSummary(): void;
+    protected checkIfStalled(): void;
+    protected checkIfStalledEnded(time: number): void;
 }

package/lib/video/VideoSyncHelper.js

@@ -19,8 +19,17 @@ class VideoSyncHelper extends service_1.IncyclistService {
         this.initCorrectedMapping((_a = this.route) === null || _a === void 0 ? void 0 : _a.details);
         this.init(startPos, props);
     }
+    logEvent(event) {
+        var _a, _b;
+        if (!event)
+            return;
+        const route = (_b = (_a = this.route) === null || _a === void 0 ? void 0 : _a.details) === null || _b === void 0 ? void 0 : _b.title;
+        const syncId = this.id;
+        const logEvent = Object.assign({ message: event.message, route, syncId }, event);
+        super.logEvent(logEvent);
+    }
     pause() {
-        this.logEvent({ message: 'video paused', route: this.route.details.title });
+        this.logEvent({ message: 'video paused' });
         this.logPlaybackSummary();
         this.isPaused = true;
         this.send('rate-update', 0);
@@ -30,18 +39,18 @@ class VideoSyncHelper extends service_1.IncyclistService {
     resume() {
         if (this.isStopped)
             return;
-        this.logEvent({ message: 'video resumed', route: this.route.details.title });
+        this.logEvent({ message: 'video resumed' });
         this.isPaused = false;
         this.activityStatus.ts = Date.now();
         this.rlvStatus.ts = Date.now();
     }
     reset() {
-        this.logEvent({ message: 'video reset', route: this.route.details.title });
+        this.logEvent({ message: 'video reset' });
         this.init(0, { loopMode: this.loopMode, observer: this.observer });
         delete this.endTime;
     }
     stop() {
-        this.logEvent({ message: 'video stopped', route: this.route.details.title });
+        this.logEvent({ message: 'video stopped' });
         this.send('rate-update', 0);
         this.isPaused = true;
         this.isStopped = true;
@@ -64,7 +73,7 @@ class VideoSyncHelper extends service_1.IncyclistService {
         this.isStopped = true;
     }
     onVideoPlaybackUpdate(time, rate, e) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         try {
             this.endTime = (_a = this.endTime) !== null && _a !== void 0 ? _a : this.getVideoTimeByPosition((_b = this.route.description) === null || _b === void 0 ? void 0 : _b.distance);
             const endTime = this.endTime;
@@ -92,6 +101,7 @@ class VideoSyncHelper extends service_1.IncyclistService {
             }
             else if (this.rlvStatus.rateRequested !== undefined && rate >= this.rlvStatus.rateRequested) {
                 delete this.rlvStatus.rateRequested;
+                delete this.rlvStatus.tsLastRateRequest;
                 if (this.tsLastIssue !== undefined) {
                     const timeSinceLastIssue = (Date.now() - this.tsLastIssue) / 1000;
                     const timeSinceLastRateIncrease = (Date.now() - ((_d = this.tsLastRateIncrease) !== null && _d !== void 0 ? _d : 0)) / 1000;
@@ -113,15 +123,19 @@ class VideoSyncHelper extends service_1.IncyclistService {
                     this.maxSuccessRate = Math.max(this.maxSuccessRate, rate);
                 }
             }
-            else {
+            else if (this.rlvStatus.rateRequested !== undefined && (Date.now() - ((_e = this.rlvStatus.rateRequested) !== null && _e !== void 0 ? _e : 0) > 2000)) {
+                delete this.rlvStatus.rateRequested;
+                delete this.rlvStatus.rateRequested;
+                this.logEvent({ message: 'video rate update timeout' });
             }
+            this.checkIfStalledEnded(time);
+            this.rlvPrev = Object.assign({}, this.rlvStatus);
             if (this.isPaused) {
                 this.rlvStatus.ts = Date.now();
                 this.rlvStatus.time = time;
                 this.rlvStatus.rate = 0;
                 return;
             }
-            this.rlvPrev = Object.assign({}, this.rlvStatus);
             this.rlvStatus.ts = Date.now();
             this.rlvStatus.time = time;
             this.rlvStatus.rate = rate;
@@ -153,14 +167,16 @@ class VideoSyncHelper extends service_1.IncyclistService {
             if (this.rlvStatus.speed !== this.rlvPrev.speed) {
                 updates.push('rlv:speed');
             }
-            this.cpuTime = ((_e = this.cpuTime) !== null && _e !== void 0 ? _e : 0) + (Date.now() - tsStart);
+            this.cpuTime = ((_f = this.cpuTime) !== null && _f !== void 0 ? _f : 0) + (Date.now() - tsStart);
             this.onUpdate(updates);
         }
         catch (err) {
             this.logError(err, 'onVideoPlaybackUpdate');
         }
     }
-    onVideoStalled(time, bufferedTime) {
+    onVideoStalled(time, _bufferedTime) {
+        this.logEvent({ message: 'video stalled', time, source: 'event' });
+        this.rlvStatus.isStalled = true;
     }
     onVideoWaiting(time, rate, bufferedTime, buffers) {
         this.logEvent({ message: 'video waiting', time, bufferedTime, buffers });
@@ -204,6 +220,7 @@ class VideoSyncHelper extends service_1.IncyclistService {
         this.activityStatus.ts = Date.now();
         this.activityStatus.routeDistance = distance;
         this.activityStatus.speed = speed;
+        this.checkIfStalled();
         this.onUpdate(updates);
     }
     onUpdate(updates = []) {
@@ -267,8 +284,18 @@ class VideoSyncHelper extends service_1.IncyclistService {
                     if (newTime - this.rlvStatus.time > 1) {
                         this.logEvent({ message: 'video forwarded', newTime });
                         this.updateTime(newTime);
+                        this.prevDelta = delta;
+                    }
+                    else {
+                        const time = this.rlvStatus.time;
+                        const vt = this.loopMode ? this.getLapTime(time) : (time > this.getTotalTime() ? this.getTotalTime() : time);
+                        const mapping = this.getMappingByTime(vt);
+                        this.logEvent({ message: 'video forwarded skipped',
+                            newTime, rlvTime: this.rlvStatus.time, rlvSpeed: this.rlvStatus.speed, rate: this.rlvStatus.rate,
+                            routeDistance: this.rlvStatus.routeDistance, tDelta: Date.now() - this.rlvStatus.ts,
+                            mapping
+                        });
                     }
-                    this.prevDelta = delta;
                 }
                 else {
                     this.prevDelta = delta;
@@ -294,8 +321,12 @@ class VideoSyncHelper extends service_1.IncyclistService {
         }
     }
     updateRate(requested) {
-        if (requested === undefined || isNaN(requested))
+        if (requested === undefined)
+            return;
+        if (isNaN(requested)) {
+            delete this.rlvStatus.rateRequested;
             return;
+        }
         if (!this.isPaused && !this.isStopped && this.rlvStatus.rate !== undefined && Math.abs(requested - this.rlvStatus.rate) < 0.01) {
             delete this.rlvStatus.rateRequested;
             return;
@@ -317,6 +348,7 @@ class VideoSyncHelper extends service_1.IncyclistService {
             return;
         }
         this.rlvStatus.rateRequested = rate;
+        this.rlvStatus.tsLastRateRequest = Date.now();
         this.send('rate-update', rate);
     }
     updateTime(time) {
@@ -324,6 +356,7 @@ class VideoSyncHelper extends service_1.IncyclistService {
             return;
         this.rlvStatus.timeRequested = time;
         delete this.rlvStatus.rateRequested;
+        delete this.rlvStatus.tsLastRateRequest;
         delete this.tsLastIssue;
         delete this.tsLastRateIncrease;
         this.send('time-update', time);
@@ -541,8 +574,25 @@ class VideoSyncHelper extends service_1.IncyclistService {
         if (Date.now() - ((_a = this.tsLastSummeryLog) !== null && _a !== void 0 ? _a : 0) < 60000)
             return;
         const totalTime = Date.now() - this.tsStart;
-        this.logEvent({ message: 'video playback summary', syncId: this.id, route: this.route.details.title, routeId: this.route.description.id, maxDelta: n(this.maxDelta, 1), cntWaiting: this.cntWaitingEvents, totalTime: f(totalTime !== null && totalTime !== void 0 ? totalTime : 0), cpuTime: f((_b = this.cpuTime) !== null && _b !== void 0 ? _b : 0), pct: n(this.cpuTime / totalTime * 100, 1) });
+        this.logEvent({ message: 'video playback summary', routeId: this.route.description.id, maxDelta: n(this.maxDelta, 1), cntWaiting: this.cntWaitingEvents, totalTime: f(totalTime !== null && totalTime !== void 0 ? totalTime : 0), cpuTime: f((_b = this.cpuTime) !== null && _b !== void 0 ? _b : 0), pct: n(this.cpuTime / totalTime * 100, 1) });
         this.tsLastSummeryLog = Date.now();
     }
+    checkIfStalled() {
+        if (this.rlvStatus.tsVideoUpdate === undefined)
+            return;
+        const timeSinceLastUpdate = Date.now() - this.rlvStatus.tsVideoUpdate;
+        if (timeSinceLastUpdate > 2000 && !this.rlvStatus.isStalled) {
+            this.rlvStatus.isStalled = true;
+            this.logEvent({ message: 'video stalled', time: this.rlvStatus.time, source: 'timeout' });
+        }
+    }
+    checkIfStalledEnded(time) {
+        if (!this.rlvStatus.isStalled)
+            return;
+        if (time > this.rlvPrev.time) {
+            this.rlvStatus.isStalled = false;
+            this.logEvent({ message: 'video playback unstalled' });
+        }
+    }
 }
 exports.VideoSyncHelper = VideoSyncHelper;

package/lib/video/types.d.ts

@@ -1,6 +1,7 @@
 export type RLVPlaybackStatus = {
     rate: number;
     rateRequested?: number;
+    tsLastRateRequest?: number;
     time: number;
     timeRequested?: number;
     tsLastTimeRequest?: number;
@@ -10,6 +11,7 @@ export type RLVPlaybackStatus = {
     tsVideoUpdate?: number;
     lap: number;
     lapRequested?: boolean;
+    isStalled?: boolean;
 };
 export type RLVActivityStatus = {
     routeDistance: number;

package/lib/workouts/ride/service.js

@@ -196,6 +196,9 @@ let WorkoutRide = (() => {
                 const ts = this.trainingTime;
                 const wo = this.workout;
                 const limits = wo.getLimits(ts);
+                if (!limits) {
+                    return;
+                }
                 this.manualTimeOffset += limits.remaining;
                 this.update();
                 this.observer.emit('forward', ts, limits.remaining);
@@ -205,10 +208,14 @@ let WorkoutRide = (() => {
             }
         }
         backward() {
+            var _a;
             try {
                 const ts = this.trainingTime;
                 const wo = this.workout;
                 const limits = wo.getLimits(ts, true);
+                if (!limits) {
+                    return;
+                }
                 const completed = limits.duration - limits.remaining;
                 const stepBusyLmit = Math.min(15, limits.duration / 2);
                 let diff = completed;
@@ -237,7 +244,14 @@ let WorkoutRide = (() => {
                 this.observer.emit('backward', ts, diff, jumpType, limits === null || limits === void 0 ? void 0 : limits.step, target);
             }
             catch (err) {
-                this.logError(err, 'backward');
+                let limits;
+                let ts;
+                try {
+                    ts = this.trainingTime;
+                    limits = (_a = this.workout) === null || _a === void 0 ? void 0 : _a.getLimits(ts, true);
+                }
+                catch (_b) { }
+                this.logError(err, 'backward', { ts, limits });
             }
         }
         powerUp(delta) {

package/package.json

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