incyclist-services 1.6.1 → 1.6.3

package/lib/activities/list/service.js

@@ -79,7 +79,7 @@ let ActivityListService = (() => {
         preload(props) {
             let preloadObserver = this.getPreloadObserver();
             try {
-                if (!preloadObserver) {
+                if (preloadObserver === undefined || preloadObserver === null) {
                     this.logEvent({ message: 'preload activity list' });
                     const promise = this.loadActivities();
                     preloadObserver = this.observers.preload = new observer_1.PromiseObserver(promise);
@@ -247,10 +247,17 @@ let ActivityListService = (() => {
                 if (!activity) {
                     return false;
                 }
-                const emitUpdate = () => { this.emitSelected('updated'); };
-                const observer = new observer_1.Observer();
-                observer.on('export', emitUpdate);
-                return yield activity.export(format, observer);
+                return new Promise(done => {
+                    const emitUpdate = (update) => __awaiter(this, void 0, void 0, function* () {
+                        this.exports = yield this.selected.getExports();
+                        this.emitSelected('updated');
+                        if (update.status === 'done')
+                            done(update.success);
+                    });
+                    const observer = new observer_1.Observer();
+                    observer.on('export', emitUpdate);
+                    activity.export(format, observer);
+                });
             });
         }
         upload(connectedApp) {
@@ -259,11 +266,24 @@ let ActivityListService = (() => {
                 if (!activity) {
                     return false;
                 }
-                const emitUpdate = () => { this.emitSelected('updated'); };
-                const observer = new observer_1.Observer();
-                observer.on('upload', emitUpdate);
-                observer.on('export', emitUpdate);
-                return yield activity.upload(connectedApp, observer);
+                return new Promise(done => {
+                    const emitUploadUpdate = (update) => {
+                        if (connectedApp === update.connectedApp) {
+                            this.emitSelected('updated');
+                            if (update.status === 'done') {
+                                done(update.success);
+                            }
+                        }
+                    };
+                    const emitExportUpdate = (update) => __awaiter(this, void 0, void 0, function* () {
+                        this.exports = yield this.selected.getExports();
+                        this.emitSelected('updated');
+                    });
+                    const observer = new observer_1.Observer();
+                    observer.on('upload', emitUploadUpdate);
+                    observer.on('export', emitExportUpdate);
+                    activity.upload(connectedApp, observer);
+                });
             });
         }
         openRoute() {

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/apps/base/api/strava/api.d.ts

@@ -28,6 +28,7 @@ export declare class StravaApi extends AppApiBase {
     protected verifyToken(): Promise<void>;
     protected isTokenStillValid(): boolean;
     protected verifyAuthentication(): Promise<void>;
+    protected waitForReady(): Promise<void>;
     protected waitForUploadResponse(response: StravaUploadResponse): Promise<StravaUploadResult>;
     protected createUpload(request: StravaUploadRequest): Promise<StravaUploadResponse>;
     protected getUploadById(id: string): Promise<StravaUploadResponse>;

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

@@ -125,11 +125,16 @@ class StravaApi extends base_1.AppApiBase {
             yield this.verifyToken();
         });
     }
+    waitForReady() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield (0, utils_1.sleep)(1000);
+        });
+    }
     waitForUploadResponse(response) {
         return __awaiter(this, void 0, void 0, function* () {
             let data = response;
             while (data.status !== 'Your activity is ready.' && !data.error) {
-                yield (0, utils_1.sleep)(1000);
+                yield this.waitForReady();
                 data = yield this.getUploadById(data.id_str);
             }
             if (data.error) {

package/lib/devices/configuration/service.js

@@ -391,7 +391,7 @@ let DeviceConfigurationService = (() => {
                 if (adapter.getSupportedCyclingModes) {
                     modes = adapter.getSupportedCyclingModes();
                 }
-                const options = modes.map(M => new M(adapter));
+                const options = modes.map(M => adapter.createMode(M));
                 mode = requestedMode || device.mode;
                 if (!mode) {
                     modeObj = adapter.getDefaultCyclingMode();

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');
@@ -173,6 +173,9 @@ let RideDisplayService = (() => {
         }
         pause(requester = 'user') {
             var _a, _b;
+            if (requester === 'device' && this.isResuming) {
+                return;
+            }
             try {
                 if (this.state !== 'Active')
                     return;
@@ -198,10 +201,8 @@ let RideDisplayService = (() => {
                 this.state = 'Active';
                 this.getActivityRide().resume();
                 this.getWorkoutRide().resume();
-                this.displayService.resume();
+                this.pauseReason = 'device';
                 (_b = this.observer) === null || _b === void 0 ? void 0 : _b.emit('state-update', this.state);
-                (0, utils_1.waitNextTick)().then(() => this.isResuming = false);
-                delete this.pauseReason;
             }
             catch (err) {
                 this.logError(err, 'resume');
@@ -545,10 +546,15 @@ let RideDisplayService = (() => {
                 const currentValues = this.getActivityRide().getCurrentValues();
                 if (!currentValues)
                     return;
-                if (currentValues.speed === 0) {
+                if (currentValues.speed === 0 && !this.isResuming) {
                     this.pause('device');
                     return;
                 }
+                if (currentValues.speed > 0 && this.isResuming) {
+                    this.displayService.resume();
+                    this.isResuming = false;
+                    delete this.pauseReason;
+                }
                 this.getRideModeService().onActivityUpdate(data, currentValues);
                 this.observer.emit('data-update', data, currentValues);
             }
@@ -591,7 +597,6 @@ let RideDisplayService = (() => {
             }
         }
         onLapCompleted(oldLap, newLap) {
-            console.log('# lap completed', oldLap, newLap);
         }
         onRouteUpdated(route) {
             this.getActivityRide().onRouteUpdate(route.points);
@@ -891,7 +896,7 @@ let RideDisplayService = (() => {
                 udid: d.udid,
                 isControl: d.isControl,
                 capabilities: d.capabilities,
-                status: d.isStarted ? 'Started' : 'Starting'
+                status: 'Starting'
             }));
             this.updateStartOverlay();
         }
@@ -974,6 +979,7 @@ let RideDisplayService = (() => {
             const pct = Math.round(completed / total * 100);
             this.logEvent({ message: 'onDeviceStartStatusUpdate', pct });
             startDevice.stateText = `uploading (${pct}%)`;
+            this.checkStartStatus();
         }
         onDeviceData(data, udid) {
             this.deviceData = data;

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

@@ -35,11 +35,13 @@ export declare class RLVDisplayService extends RouteDisplayService {
     protected infotext?: InfotextDisplayProps;
     protected videosInitialized: boolean;
     protected startTime: number;
+    protected isVideoPaused: boolean;
     constructor();
     initView(): void;
     getOverlayProps(overlay: any, props: CurrentRideDisplayProps): OverlayDisplayProps;
     protected addVideo(route: Route, isCurrent?: boolean, parent?: VideoState): Promise<void>;
     pause(): void;
+    resume(): void;
     getDisplayProperties(props: CurrentRideDisplayProps): RLVDisplayProps;
     protected getInfotextDisplayProps(): InfotextDisplayProps;
     protected checkFinishOptions(position: CurrentPosition): boolean;
@@ -74,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

@@ -62,6 +62,7 @@ let RLVDisplayService = (() => {
                 super();
                 this.currentVideo = __runInitializers(this, _instanceExtraInitializers);
                 this.videosInitialized = false;
+                this.isVideoPaused = false;
                 this.isInitialized = false;
             }
             initView() {
@@ -130,6 +131,12 @@ let RLVDisplayService = (() => {
             pause() {
                 super.pause();
                 this.currentVideo.syncHelper.pause();
+                this.isVideoPaused = true;
+            }
+            resume() {
+                super.resume();
+                this.currentVideo.syncHelper.resume();
+                this.isVideoPaused = false;
             }
             getDisplayProperties(props) {
                 var _b, _c, _d, _e;
@@ -345,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);
@@ -363,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);
@@ -380,7 +410,9 @@ let RLVDisplayService = (() => {
                 super.onActivityUpdate(activityPos, data);
                 const offset = (_b = this.offset) !== null && _b !== void 0 ? _b : 0;
                 const { routeDistance, speed } = activityPos;
-                this.currentVideo.syncHelper.onActivityUpdate(routeDistance - offset, speed);
+                if (!this.isVideoPaused) {
+                    this.currentVideo.syncHelper.onActivityUpdate(routeDistance - offset, speed);
+                }
             }
             initVideoSource(video) {
                 var _b, _c;
@@ -404,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/routes/list/service.d.ts

@@ -176,6 +176,7 @@ export declare class RouteListService extends IncyclistService implements IRoute
     private selectListForSource;
     private addCustomList;
     createPreview(descr: RouteInfo): Promise<unknown>;
+    protected checkExistingPreviewFiles(descr: RouteInfo): Promise<string | undefined>;
     protected doCreatePreview(descr: RouteInfo): Promise<string>;
     protected processPreviewQueue(): PromiseObserver<void>;
     protected findCard(target: Route | string): {

package/lib/routes/list/service.js

@@ -993,6 +993,45 @@ let RouteListService = (() => {
                 });
             });
         }
+        checkExistingPreviewFiles(descr) {
+            return __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                const videoUrl = descr.videoUrl || descr.downloadUrl;
+                const path = (0, api_1.getBindings)().path;
+                const fs = (0, api_1.getBindings)().fs;
+                let existingPreview;
+                let fileUrl = false;
+                try {
+                    let { dir, name } = (_a = path.parse(videoUrl)) !== null && _a !== void 0 ? _a : {};
+                    if (!dir.startsWith('htttp')) {
+                        if (dir.startsWith('video:')) {
+                            dir = dir.replace('video:', 'file:');
+                        }
+                        if (dir.startsWith('file:///')) {
+                            dir = dir.replace('file:///', '');
+                            fileUrl = true;
+                        }
+                        const check = (name) => __awaiter(this, void 0, void 0, function* () {
+                            if (existingPreview)
+                                return;
+                            if (yield fs.existsFile(name))
+                                existingPreview = name;
+                        });
+                        yield check(path.join(dir, 'preview.png'));
+                        yield check(path.join(dir, 'preview.jpg'));
+                        yield check(path.join(dir, `${name}_preview.png`));
+                        yield check(path.join(dir, `${name}_preview.jpg`));
+                        if (existingPreview) {
+                            this.logEvent({ message: 'found preview', title: descr.title, id: descr.id, video: videoUrl, existingPreview });
+                            descr.previewUrl = fileUrl ? `file:///${existingPreview}` : existingPreview;
+                            return descr.previewUrl;
+                        }
+                    }
+                }
+                catch (_b) {
+                }
+            });
+        }
         doCreatePreview(descr) {
             return __awaiter(this, void 0, void 0, function* () {
                 let props;
@@ -1005,6 +1044,9 @@ let RouteListService = (() => {
                 const fs = (0, api_1.getBindings)().fs;
                 const outDir = path.join(appInfo.getAppDir(), 'previewImg');
                 yield fs.ensureDir(outDir);
+                const existing = yield this.checkExistingPreviewFiles(descr);
+                if (existing)
+                    return existing;
                 if (!videoUrl)
                     return;
                 if (videoUrl.startsWith('http')) {

package/lib/video/VideoSyncHelper.js

@@ -24,12 +24,16 @@ class VideoSyncHelper extends service_1.IncyclistService {
         this.logPlaybackSummary();
         this.isPaused = true;
         this.send('rate-update', 0);
+        this.activityStatus.ts = Date.now();
+        this.rlvStatus.ts = Date.now();
     }
     resume() {
         if (this.isStopped)
             return;
         this.logEvent({ message: 'video resumed', route: this.route.details.title });
         this.isPaused = false;
+        this.activityStatus.ts = Date.now();
+        this.rlvStatus.ts = Date.now();
     }
     reset() {
         this.logEvent({ message: 'video reset', route: this.route.details.title });
@@ -64,7 +68,7 @@ class VideoSyncHelper extends service_1.IncyclistService {
         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;
-            if (this.isStopped)
+            if (this.isStopped || this.isPaused)
                 return;
             if (time > endTime - 0.3 && !this.loopMode && !this.rlvStatus.timeRequested) {
                 this.updateRate(0);
@@ -203,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 {
@@ -240,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;
             }
@@ -274,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');
@@ -305,6 +312,10 @@ class VideoSyncHelper extends service_1.IncyclistService {
         if (this.isPaused && rate > 0) {
             this.resume();
         }
+        else if (this.isPaused && rate === 0) {
+            delete this.rlvStatus.rateRequested;
+            return;
+        }
         this.rlvStatus.rateRequested = rate;
         this.send('rate-update', rate);
     }

package/package.json

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