incyclist-services 1.5.71 → 1.6.2

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/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/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/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/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');
@@ -180,6 +173,9 @@ let RideDisplayService = (() => {
         }
         pause(requester = 'user') {
             var _a, _b;
+            if (requester === 'device' && this.isResuming) {
+                return;
+            }
             try {
                 if (this.state !== 'Active')
                     return;
@@ -205,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');
@@ -552,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);
             }
@@ -598,7 +597,6 @@ let RideDisplayService = (() => {
             }
         }
         onLapCompleted(oldLap, newLap) {
-            console.log('# lap completed', oldLap, newLap);
         }
         onRouteUpdated(route) {
             this.getActivityRide().onRouteUpdate(route.points);
@@ -898,7 +896,7 @@ let RideDisplayService = (() => {
                 udid: d.udid,
                 isControl: d.isControl,
                 capabilities: d.capabilities,
-                status: d.isStarted ? 'Started' : 'Starting'
+                status: 'Starting'
             }));
             this.updateStartOverlay();
         }
@@ -981,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;

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;
@@ -380,7 +387,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;

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/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);
@@ -305,6 +309,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.5.71",
+  "version": "1.6.2",
   "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.7",
     "promise.any": "^2.0.6",
     "semver": "^7.6.3",
     "tcx-builder": "^1.1.1",