incyclist-services 1.7.45 → 1.7.46

package/lib/cjs/routes/download/service.js

@@ -1,4 +1,11 @@
 "use strict";
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
 var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
     function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
     var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
@@ -26,13 +33,6 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
-var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i = 0; i < initializers.length; i++) {
-        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
-    }
-    return useValue ? value : void 0;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useRouteDownload = exports.RouteDownloadService = void 0;
 const api_1 = require("../../api");
@@ -49,16 +49,20 @@ let RouteDownloadService = (() => {
     let _classExtraInitializers = [];
     let _classThis;
     let _classSuper = service_1.IncyclistService;
+    let _instanceExtraInitializers = [];
+    let _getBindings_decorators;
     var RouteDownloadService = class extends _classSuper {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getBindings_decorators = [decorators_1.Injectable];
+            __esDecorate(this, null, _getBindings_decorators, { kind: "method", name: "getBindings", static: false, private: false, access: { has: obj => "getBindings" in obj, get: obj => obj.getBindings }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             RouteDownloadService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
             __runInitializers(_classThis, _classExtraInitializers);
         }
-        downloads;
+        downloads = __runInitializers(this, _instanceExtraInitializers);
         progressLogTs;
         constructor() {
             super('Routes');
@@ -97,7 +101,7 @@ let RouteDownloadService = (() => {
             if (file) {
                 try {
                     const fs = (0, api_1.getBindings)().fs;
-                    fs.unlink(file);
+                    fs?.unlink(file);
                 }
                 catch (err) {
                     this.logError(err, 'deleteIncompleteFile');
@@ -111,18 +115,35 @@ let RouteDownloadService = (() => {
         async _download(route) {
             await (0, utils_1.waitNextTick)();
             const observer = this.getObserver(route);
+            if (!observer)
+                return;
             try {
                 const videoDir = await this.waitForVideoDir(observer);
-                observer.once('stopped', () => {
-                    this.deleteIncompleteFile(route, videoDir);
-                });
-                this.downloadRoute(route, videoDir, observer);
+                if (videoDir) {
+                    observer.once('stopped', () => {
+                        this.deleteIncompleteFile(route, videoDir);
+                    });
+                    this.downloadRoute(route, videoDir, observer);
+                }
+                else {
+                    this.logEvent({ message: 'could not start download', reason: 'video dir not specified' });
+                }
             }
             catch (err) {
                 observer.emit('error', err);
             }
         }
         waitForVideoDir(observer) {
+            if (this.isMobile()) {
+                try {
+                    const getVideoDir = this.getBindings()?.downloadManager?.getVideoDir;
+                    if (getVideoDir) {
+                        const videoDir = getVideoDir();
+                        return Promise.resolve(videoDir);
+                    }
+                }
+                catch { }
+            }
             const settings = (0, settings_1.useUserSettings)();
             const videoDir = settings.get('videos.directory', null);
             if (!videoDir) {
@@ -169,12 +190,12 @@ let RouteDownloadService = (() => {
             try {
                 const { file, url, error } = await this.getDownloadFileName(route, targetDir);
                 urlLog = url;
-                if (!file || error) {
+                if (!file || error || !url) {
                     observer.emit('error', new Error(error ?? 'download not supported'));
                     return;
                 }
                 const { id, title } = route.description;
-                const { downloadManager } = (0, api_1.getBindings)();
+                const { downloadManager } = this.getBindings();
                 if (!downloadManager) {
                     observer.emit('error', new Error('download not supported'));
                     return;
@@ -207,20 +228,30 @@ let RouteDownloadService = (() => {
             }
         }
         async restoreFromRepo(route) {
+            if (!route?.description?.id)
+                return;
             await this.getRoutesApi().loadDetails([{ route, added: false }], true);
             await (0, utils_1.waitNextTick)();
             const descr = this.getRepo().getDescription(route.description.id);
             return descr?.downloadUrl || descr?.videoUrl;
         }
         onDownloadProgress(id, observer, pct, speed, downloaded) {
-            const prev = this.progressLogTs[id] || 0;
-            const ts = Date.now();
-            if (ts - prev > 1000) {
-                this.logEvent({ message: 'download progress', pctComplete: pct, downloaded, downloadSpeed: speed });
-                this.progressLogTs[id] = ts;
+            if (!this.isMobile()) {
+                const prev = this.progressLogTs[id] || 0;
+                const ts = Date.now();
+                if (ts - prev > 5000) {
+                    this.logEvent({ message: 'download progress', pctComplete: pct, downloaded, downloadSpeed: speed });
+                    this.progressLogTs[id] = ts;
+                }
             }
             observer.emit('progress', Number(pct));
         }
+        isMobile() {
+            return this.getBindings()?.appInfo?.getChannel() === 'mobile';
+        }
+        getBindings() {
+            return (0, api_1.getBindings)();
+        }
     };
     return RouteDownloadService = _classThis;
 })();

package/lib/cjs/routes/list/cards/RouteCard.js

@@ -98,7 +98,7 @@ let RouteCard = (() => {
         deleteObserver;
         ready;
         logger;
-        cntActive;
+        cntActive = 0;
         constructor(route, props) {
             super();
             const { list } = props || {};
@@ -114,9 +114,11 @@ let RouteCard = (() => {
         }
         canStart(status) {
             try {
-                const { isOnline } = status;
-                const route = this.route.description;
-                if (!route.hasVideo || !(route.isLocal || route.isDownloaded) || route.videoUrl.startsWith('http'))
+                const { isOnline } = status ?? {};
+                const route = this.route?.description;
+                if (!route)
+                    return false;
+                if (!route.hasVideo || !(route.isLocal || route.isDownloaded) || route.videoUrl?.startsWith('http'))
                     return isOnline;
                 if (route.requiresDownload)
                     return isOnline;
@@ -285,6 +287,7 @@ let RouteCard = (() => {
             }
             catch (err) {
                 this.logError(err, 'getDisplayProperties');
+                return null;
             }
         }
         getMarkers(settings) {
@@ -294,7 +297,8 @@ let RouteCard = (() => {
                 this.adjustStartPosAvi(startSettings);
                 const startDistance = startSettings.startPos ?? 0;
                 const startPos = (0, route_1.getPosition)(this.route, { distance: startDistance, nearest: true });
-                markers.push(startPos);
+                if (startPos)
+                    markers.push(startPos);
             }
             catch (err) {
                 this.logError(err, 'getMarkers');
@@ -308,7 +312,9 @@ let RouteCard = (() => {
                 if (startPos !== undefined && startPos !== null) {
                     const startDistance = C(startPos.value, 'distance', { from: startPos.unit, to: 'm' });
                     const position = (0, route_1.getPosition)(this.route, { distance: startDistance, nearest: true });
-                    markers.push(position);
+                    if (position) {
+                        markers.push(position);
+                    }
                 }
             }
             catch (err) {
@@ -517,7 +523,7 @@ let RouteCard = (() => {
                 deleted = false;
             }
             finally {
-                this.deleteObserver.emit('done', deleted);
+                this.deleteObserver?.emit('done', deleted);
                 (0, utils_1.waitNextTick)().then(() => {
                     delete this.deleteObserver;
                     this.emitUpdate();
@@ -609,7 +615,7 @@ let RouteCard = (() => {
                         return v;
                     };
                     (0, service_1.getRouteList)().logEvent({ message: 'download started', route: routeDescr?.title, videoUrl: lv(routeDescr?.videoUrl), downloadUrl: lv(routeDescr?.downloadUrl) });
-                    const dl = new service_2.RouteDownloadService();
+                    const dl = this.getRouteDownload();
                     this.downloadObserver = dl.download(this.route);
                     this.downloadObserver
                         .on('done', this.onDownloadCompleted.bind(this))
@@ -623,19 +629,41 @@ let RouteCard = (() => {
         }
         stopDownload(immediate = false) {
             try {
-                (0, service_1.getRouteList)().logEvent({ message: 'download stopped', route: this.route?.description?.title });
-                this.getCurrentDownload()?.stop();
+                (0, service_1.getRouteList)().logEvent({ message: 'download stopped', route: this.route?.description?.title, });
+                this.getRouteDownload().stopDownload(this.route);
                 if (immediate) {
                     delete this.downloadObserver;
                 }
                 else {
-                    (0, utils_1.waitNextTick)().then(() => { delete this.downloadObserver; });
+                    (0, sleep_1.sleep)(5).then(() => { delete this.downloadObserver; });
                 }
             }
             catch (err) {
                 this.logError(err, 'stopDownload');
             }
         }
+        async deleteDownload() {
+            try {
+                const descr = this.getRouteDescription();
+                const videoUrl = descr.videoUrl;
+                if (videoUrl?.startsWith('video:///') || videoUrl?.startsWith('file:///')) {
+                    const filePath = videoUrl.startsWith('video:///')
+                        ? videoUrl.replace('video:///', '')
+                        : videoUrl.replace('file:///', '');
+                    const fs = (0, api_1.getBindings)().fs;
+                    if (fs) {
+                        const exists = await this.fileExists(filePath);
+                        if (exists) {
+                            await fs.unlink(filePath);
+                        }
+                    }
+                }
+                await this.resetDownload();
+            }
+            catch (err) {
+                this.logError(err, 'deleteDownload');
+            }
+        }
         async onDownloadCompleted(url) {
             try {
                 (0, service_1.getRouteList)().logEvent({ message: 'download completed', route: this.route?.description?.title });
@@ -647,7 +675,7 @@ let RouteCard = (() => {
                 this.route.details.video.file = undefined;
                 this.route.details.video.url = url;
                 this.updateRoute(this.route);
-                (0, utils_1.waitNextTick)().then(() => {
+                (0, sleep_1.sleep)(5).then(() => {
                     this.downloadObserver.reset();
                     delete this.downloadObserver;
                 });
@@ -677,7 +705,7 @@ let RouteCard = (() => {
             try {
                 (0, service_1.getRouteList)().logEvent({ message: 'download failed', reason: err.message, route: this.route?.description?.title });
                 this.downloadObserver.stop();
-                (0, utils_1.waitNextTick)().then(() => {
+                (0, sleep_1.sleep)(5).then(() => {
                     this.downloadObserver.reset();
                     delete this.downloadObserver;
                 });
@@ -882,6 +910,9 @@ let RouteCard = (() => {
         getOnlineStatusMonitoring() {
             return (0, monitoring_1.useOnlineStatusMonitoring)();
         }
+        getRouteDownload() {
+            return (0, service_2.useRouteDownload)();
+        }
     };
 })();
 exports.RouteCard = RouteCard;

package/lib/cjs/routes/page/service.js

@@ -84,6 +84,7 @@ let RoutesPageService = (() => {
         importProps;
         downloadCache;
         downloadHandlers;
+        downloadObserver = new types_1.Observer();
         constructor() {
             super('RoutesPage');
             this.downloadCache = new Map();
@@ -118,11 +119,11 @@ let RoutesPageService = (() => {
                 catch (err) {
                     this.logError(err, 'openPage');
                 }
-                return this.getPageObserver();
             }
             catch (err) {
                 this.logError(err, 'openPage');
             }
+            return this.getPageObserver();
         }
         closePage() {
             try {
@@ -130,13 +131,14 @@ let RoutesPageService = (() => {
                 this.logEvent({ message: 'page closed', page: 'Routes' });
                 this.stopEventListener();
                 this.downloadCache.clear();
+                this.downloadObserver.stop();
                 super.closePage();
             }
             catch (err) {
                 this.logError(err, 'closePage');
             }
         }
-        pausePage() {
+        async pausePage() {
             try {
                 this.stopEventListener();
                 return super.pausePage();
@@ -145,7 +147,7 @@ let RoutesPageService = (() => {
                 this.logError(err, 'pausePage');
             }
         }
-        resumePage() {
+        async resumePage() {
             try {
                 this.startEventListener();
                 return super.resumePage();
@@ -164,7 +166,7 @@ let RoutesPageService = (() => {
                 if (loading) {
                     return { loading, synchronizing: false, routes: [], displayType,
                         filters, filterVisible,
-                        downloadRows: this.getDownloadDisplayProps(),
+                        downloadObserver: this.downloadObserver,
                         showImportDialog: false };
                 }
                 else {
@@ -176,7 +178,7 @@ let RoutesPageService = (() => {
                     return { loading, synchronizing, routes, displayType,
                         filters, filterVisible, filterOptions,
                         detailRouteId,
-                        downloadRows: this.getDownloadDisplayProps(),
+                        downloadObserver: this.downloadObserver,
                         showImportDialog: this.showImportDialog };
                 }
             }
@@ -235,7 +237,8 @@ let RoutesPageService = (() => {
             try {
                 const service = this.getRouteList();
                 const pairing = this.getDevicePairing();
-                const { id, title, videoUrl } = service.getStartSettings() ?? {};
+                const setttings = service.getStartSettings() ?? {};
+                const { id, title, videoUrl } = setttings;
                 this.logEvent({ message: 'Attempting to start a ride', id, title, videoUrl, readyToStart: pairing.isReadyToStart(), });
                 service.close();
                 const next = pairing.isReadyToStart() ? '/rideDeviceOK' : '/pairingStart';
@@ -255,11 +258,11 @@ let RoutesPageService = (() => {
                 imports.forEach((i) => {
                     this.prepareSingleImport(i);
                 });
-                return this.importObserver;
             }
             catch (err) {
                 this.logError(err, 'start');
             }
+            return this.importObserver;
         }
         onImportClosed() {
             try {
@@ -276,12 +279,7 @@ let RoutesPageService = (() => {
             }
         }
         getImportDisplayProps() {
-            try {
-                return this.importProps;
-            }
-            catch (err) {
-                this.logError(err, 'getImportDisplayProps');
-            }
+            return this.importProps;
         }
         getDownloadDisplayProps() {
             return Array.from(this.downloadCache.values());
@@ -290,7 +288,7 @@ let RoutesPageService = (() => {
             this.getPageObserver()?.emit('page-update');
         }
         getRoutesDisplayProps() {
-            const { routes } = this.serviceState ?? {};
+            const { routes = [] } = this.serviceState ?? {};
             const getRouteProps = (routeProps) => {
                 return {
                     ...routeProps,
@@ -302,7 +300,7 @@ let RoutesPageService = (() => {
             return this.getRouteList().getFilters();
         }
         startEventListener() {
-            const { observer } = this.serviceState;
+            const { observer } = this.serviceState ?? {};
             if (!observer)
                 return;
             observer.on('updated', this.updateStateHandler);
@@ -314,7 +312,7 @@ let RoutesPageService = (() => {
             this.getRouteDownload().on('download-started', this.downloadStartedHandler);
         }
         stopEventListener(final) {
-            const { observer } = this.serviceState;
+            const { observer } = this.serviceState ?? {};
             if (!observer)
                 return;
             if (final)
@@ -328,29 +326,37 @@ let RoutesPageService = (() => {
             this.getRouteDownload().off('download-started', this.downloadStartedHandler);
         }
         subscribeToActiveDownload(route, observer) {
-            const routeId = route.description.id;
-            const title = route.description.title;
+            const routeId = route?.description?.id;
+            const title = route?.description?.title ?? '';
+            if (!routeId)
+                return;
             if (this.downloadHandlers.has(routeId))
                 return;
             const onProgress = (pct) => {
                 this.downloadCache.set(routeId, { routeId, title, status: 'downloading', pct });
-                this.updatePageDisplay();
+                this.emitDownloadUpdate();
             };
             const onDone = () => {
                 this.downloadCache.set(routeId, { routeId, title, status: 'done' });
                 this.downloadHandlers.delete(routeId);
-                this.updatePageDisplay();
+                this.emitDownloadUpdate();
             };
             const onError = () => {
                 this.downloadCache.set(routeId, { routeId, title, status: 'failed' });
                 this.downloadHandlers.delete(routeId);
-                this.updatePageDisplay();
+                this.emitDownloadUpdate();
+            };
+            const onStopped = () => {
+                this.downloadCache.delete(routeId);
+                this.downloadHandlers.delete(routeId);
+                this.emitDownloadUpdate();
             };
-            this.downloadHandlers.set(routeId, { onProgress, onDone, onError });
+            this.downloadHandlers.set(routeId, { onProgress, onDone, onError, onStopped });
             this.downloadCache.set(routeId, { routeId, title, status: 'downloading' });
             observer.on('progress', onProgress);
             observer.on('done', onDone);
             observer.on('error', onError);
+            observer.on('stopped', onStopped);
             this.updatePageDisplay();
         }
         subscribeAllActiveDownloads() {
@@ -361,12 +367,15 @@ let RoutesPageService = (() => {
         unsubscribeAllActiveDownloads() {
             const active = this.getRouteDownload().getActiveDownloads();
             for (const { route, observer } of active) {
-                const routeId = route.description.id;
-                const handlers = this.downloadHandlers.get(routeId);
-                if (handlers) {
-                    observer.off('progress', handlers.onProgress);
-                    observer.off('done', handlers.onDone);
-                    observer.off('error', handlers.onError);
+                const routeId = route?.description?.id;
+                if (routeId) {
+                    const handlers = this.downloadHandlers.get(routeId);
+                    if (handlers) {
+                        observer.off('progress', handlers.onProgress);
+                        observer.off('done', handlers.onDone);
+                        observer.off('error', handlers.onError);
+                        observer.off('stopped', handlers.onStopped);
+                    }
                 }
             }
             this.downloadHandlers.clear();
@@ -374,6 +383,13 @@ let RoutesPageService = (() => {
         downloadStartedHandler = (route, observer) => {
             this.subscribeToActiveDownload(route, observer);
         };
+        emitDownloadUpdate() {
+            this.downloadObserver.emit('download-update', {
+                rows: this.getDownloadDisplayProps(),
+                count: Array.from(this.downloadCache.values())
+                    .filter(r => r.status === 'downloading').length
+            });
+        }
         onSycncStart() {
             this.updatePageDisplay();
         }
@@ -384,8 +400,7 @@ let RoutesPageService = (() => {
             this.updatePageDisplay();
         }
         onDialogClosed() {
-            const route = this.getRouteList().getSelected();
-            this.detailRouteId = null;
+            this.detailRouteId = undefined;
             this.updatePageDisplay();
         }
         prepareSingleImport(file) {
@@ -395,6 +410,7 @@ let RoutesPageService = (() => {
                 status: 'idle',
                 fileName: file.name
             };
+            this.importProps = this.importProps ?? [];
             this.importProps.push(props);
             observer.once('success', () => {
                 props.status = 'success';

package/lib/esm/routes/download/service.js

@@ -1,3 +1,10 @@
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
 var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
     function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
     var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
@@ -25,15 +32,8 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
-var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i = 0; i < initializers.length; i++) {
-        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
-    }
-    return useValue ? value : void 0;
-};
 import { getBindings } from "../../api";
-import { Singleton } from "../../base/decorators";
+import { Injectable, Singleton } from "../../base/decorators";
 import { IncyclistService } from "../../base/service";
 import { useUserSettings } from "../../settings";
 import { waitNextTick } from "../../utils";
@@ -46,16 +46,20 @@ let RouteDownloadService = (() => {
     let _classExtraInitializers = [];
     let _classThis;
     let _classSuper = IncyclistService;
+    let _instanceExtraInitializers = [];
+    let _getBindings_decorators;
     var RouteDownloadService = class extends _classSuper {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getBindings_decorators = [Injectable];
+            __esDecorate(this, null, _getBindings_decorators, { kind: "method", name: "getBindings", static: false, private: false, access: { has: obj => "getBindings" in obj, get: obj => obj.getBindings }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             RouteDownloadService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
             __runInitializers(_classThis, _classExtraInitializers);
         }
-        downloads;
+        downloads = __runInitializers(this, _instanceExtraInitializers);
         progressLogTs;
         constructor() {
             super('Routes');
@@ -94,7 +98,7 @@ let RouteDownloadService = (() => {
             if (file) {
                 try {
                     const fs = getBindings().fs;
-                    fs.unlink(file);
+                    fs?.unlink(file);
                 }
                 catch (err) {
                     this.logError(err, 'deleteIncompleteFile');
@@ -108,18 +112,35 @@ let RouteDownloadService = (() => {
         async _download(route) {
             await waitNextTick();
             const observer = this.getObserver(route);
+            if (!observer)
+                return;
             try {
                 const videoDir = await this.waitForVideoDir(observer);
-                observer.once('stopped', () => {
-                    this.deleteIncompleteFile(route, videoDir);
-                });
-                this.downloadRoute(route, videoDir, observer);
+                if (videoDir) {
+                    observer.once('stopped', () => {
+                        this.deleteIncompleteFile(route, videoDir);
+                    });
+                    this.downloadRoute(route, videoDir, observer);
+                }
+                else {
+                    this.logEvent({ message: 'could not start download', reason: 'video dir not specified' });
+                }
             }
             catch (err) {
                 observer.emit('error', err);
             }
         }
         waitForVideoDir(observer) {
+            if (this.isMobile()) {
+                try {
+                    const getVideoDir = this.getBindings()?.downloadManager?.getVideoDir;
+                    if (getVideoDir) {
+                        const videoDir = getVideoDir();
+                        return Promise.resolve(videoDir);
+                    }
+                }
+                catch { }
+            }
             const settings = useUserSettings();
             const videoDir = settings.get('videos.directory', null);
             if (!videoDir) {
@@ -166,12 +187,12 @@ let RouteDownloadService = (() => {
             try {
                 const { file, url, error } = await this.getDownloadFileName(route, targetDir);
                 urlLog = url;
-                if (!file || error) {
+                if (!file || error || !url) {
                     observer.emit('error', new Error(error ?? 'download not supported'));
                     return;
                 }
                 const { id, title } = route.description;
-                const { downloadManager } = getBindings();
+                const { downloadManager } = this.getBindings();
                 if (!downloadManager) {
                     observer.emit('error', new Error('download not supported'));
                     return;
@@ -204,20 +225,30 @@ let RouteDownloadService = (() => {
             }
         }
         async restoreFromRepo(route) {
+            if (!route?.description?.id)
+                return;
             await this.getRoutesApi().loadDetails([{ route, added: false }], true);
             await waitNextTick();
             const descr = this.getRepo().getDescription(route.description.id);
             return descr?.downloadUrl || descr?.videoUrl;
         }
         onDownloadProgress(id, observer, pct, speed, downloaded) {
-            const prev = this.progressLogTs[id] || 0;
-            const ts = Date.now();
-            if (ts - prev > 1000) {
-                this.logEvent({ message: 'download progress', pctComplete: pct, downloaded, downloadSpeed: speed });
-                this.progressLogTs[id] = ts;
+            if (!this.isMobile()) {
+                const prev = this.progressLogTs[id] || 0;
+                const ts = Date.now();
+                if (ts - prev > 5000) {
+                    this.logEvent({ message: 'download progress', pctComplete: pct, downloaded, downloadSpeed: speed });
+                    this.progressLogTs[id] = ts;
+                }
             }
             observer.emit('progress', Number(pct));
         }
+        isMobile() {
+            return this.getBindings()?.appInfo?.getChannel() === 'mobile';
+        }
+        getBindings() {
+            return getBindings();
+        }
     };
     return RouteDownloadService = _classThis;
 })();

package/lib/esm/routes/list/cards/RouteCard.js

@@ -41,7 +41,7 @@ import { getRouteList, useRouteList } from "../service";
 import { RoutesDbLoader } from "../loaders/db";
 import { valid } from "../../../utils/valid";
 import { waitNextTick } from "../../../utils";
-import { RouteDownloadService } from "../../download/service";
+import { useRouteDownload } from "../../download/service";
 import { EventLogger } from "gd-eventlog";
 import { checkIsLoop, getNextVideoId, getPosition, updateSlopes } from "../../base/utils/route";
 import { getWorkoutList } from "../../../workouts";
@@ -95,7 +95,7 @@ let RouteCard = (() => {
         deleteObserver;
         ready;
         logger;
-        cntActive;
+        cntActive = 0;
         constructor(route, props) {
             super();
             const { list } = props || {};
@@ -111,9 +111,11 @@ let RouteCard = (() => {
         }
         canStart(status) {
             try {
-                const { isOnline } = status;
-                const route = this.route.description;
-                if (!route.hasVideo || !(route.isLocal || route.isDownloaded) || route.videoUrl.startsWith('http'))
+                const { isOnline } = status ?? {};
+                const route = this.route?.description;
+                if (!route)
+                    return false;
+                if (!route.hasVideo || !(route.isLocal || route.isDownloaded) || route.videoUrl?.startsWith('http'))
                     return isOnline;
                 if (route.requiresDownload)
                     return isOnline;
@@ -282,6 +284,7 @@ let RouteCard = (() => {
             }
             catch (err) {
                 this.logError(err, 'getDisplayProperties');
+                return null;
             }
         }
         getMarkers(settings) {
@@ -291,7 +294,8 @@ let RouteCard = (() => {
                 this.adjustStartPosAvi(startSettings);
                 const startDistance = startSettings.startPos ?? 0;
                 const startPos = getPosition(this.route, { distance: startDistance, nearest: true });
-                markers.push(startPos);
+                if (startPos)
+                    markers.push(startPos);
             }
             catch (err) {
                 this.logError(err, 'getMarkers');
@@ -305,7 +309,9 @@ let RouteCard = (() => {
                 if (startPos !== undefined && startPos !== null) {
                     const startDistance = C(startPos.value, 'distance', { from: startPos.unit, to: 'm' });
                     const position = getPosition(this.route, { distance: startDistance, nearest: true });
-                    markers.push(position);
+                    if (position) {
+                        markers.push(position);
+                    }
                 }
             }
             catch (err) {
@@ -514,7 +520,7 @@ let RouteCard = (() => {
                 deleted = false;
             }
             finally {
-                this.deleteObserver.emit('done', deleted);
+                this.deleteObserver?.emit('done', deleted);
                 waitNextTick().then(() => {
                     delete this.deleteObserver;
                     this.emitUpdate();
@@ -606,7 +612,7 @@ let RouteCard = (() => {
                         return v;
                     };
                     getRouteList().logEvent({ message: 'download started', route: routeDescr?.title, videoUrl: lv(routeDescr?.videoUrl), downloadUrl: lv(routeDescr?.downloadUrl) });
-                    const dl = new RouteDownloadService();
+                    const dl = this.getRouteDownload();
                     this.downloadObserver = dl.download(this.route);
                     this.downloadObserver
                         .on('done', this.onDownloadCompleted.bind(this))
@@ -620,19 +626,41 @@ let RouteCard = (() => {
         }
         stopDownload(immediate = false) {
             try {
-                getRouteList().logEvent({ message: 'download stopped', route: this.route?.description?.title });
-                this.getCurrentDownload()?.stop();
+                getRouteList().logEvent({ message: 'download stopped', route: this.route?.description?.title, });
+                this.getRouteDownload().stopDownload(this.route);
                 if (immediate) {
                     delete this.downloadObserver;
                 }
                 else {
-                    waitNextTick().then(() => { delete this.downloadObserver; });
+                    sleep(5).then(() => { delete this.downloadObserver; });
                 }
             }
             catch (err) {
                 this.logError(err, 'stopDownload');
             }
         }
+        async deleteDownload() {
+            try {
+                const descr = this.getRouteDescription();
+                const videoUrl = descr.videoUrl;
+                if (videoUrl?.startsWith('video:///') || videoUrl?.startsWith('file:///')) {
+                    const filePath = videoUrl.startsWith('video:///')
+                        ? videoUrl.replace('video:///', '')
+                        : videoUrl.replace('file:///', '');
+                    const fs = getBindings().fs;
+                    if (fs) {
+                        const exists = await this.fileExists(filePath);
+                        if (exists) {
+                            await fs.unlink(filePath);
+                        }
+                    }
+                }
+                await this.resetDownload();
+            }
+            catch (err) {
+                this.logError(err, 'deleteDownload');
+            }
+        }
         async onDownloadCompleted(url) {
             try {
                 getRouteList().logEvent({ message: 'download completed', route: this.route?.description?.title });
@@ -644,7 +672,7 @@ let RouteCard = (() => {
                 this.route.details.video.file = undefined;
                 this.route.details.video.url = url;
                 this.updateRoute(this.route);
-                waitNextTick().then(() => {
+                sleep(5).then(() => {
                     this.downloadObserver.reset();
                     delete this.downloadObserver;
                 });
@@ -674,7 +702,7 @@ let RouteCard = (() => {
             try {
                 getRouteList().logEvent({ message: 'download failed', reason: err.message, route: this.route?.description?.title });
                 this.downloadObserver.stop();
-                waitNextTick().then(() => {
+                sleep(5).then(() => {
                     this.downloadObserver.reset();
                     delete this.downloadObserver;
                 });
@@ -879,6 +907,9 @@ let RouteCard = (() => {
         getOnlineStatusMonitoring() {
             return useOnlineStatusMonitoring();
         }
+        getRouteDownload() {
+            return useRouteDownload();
+        }
     };
 })();
 export { RouteCard };

package/lib/esm/routes/page/service.js

@@ -81,6 +81,7 @@ let RoutesPageService = (() => {
         importProps;
         downloadCache;
         downloadHandlers;
+        downloadObserver = new Observer();
         constructor() {
             super('RoutesPage');
             this.downloadCache = new Map();
@@ -115,11 +116,11 @@ let RoutesPageService = (() => {
                 catch (err) {
                     this.logError(err, 'openPage');
                 }
-                return this.getPageObserver();
             }
             catch (err) {
                 this.logError(err, 'openPage');
             }
+            return this.getPageObserver();
         }
         closePage() {
             try {
@@ -127,13 +128,14 @@ let RoutesPageService = (() => {
                 this.logEvent({ message: 'page closed', page: 'Routes' });
                 this.stopEventListener();
                 this.downloadCache.clear();
+                this.downloadObserver.stop();
                 super.closePage();
             }
             catch (err) {
                 this.logError(err, 'closePage');
             }
         }
-        pausePage() {
+        async pausePage() {
             try {
                 this.stopEventListener();
                 return super.pausePage();
@@ -142,7 +144,7 @@ let RoutesPageService = (() => {
                 this.logError(err, 'pausePage');
             }
         }
-        resumePage() {
+        async resumePage() {
             try {
                 this.startEventListener();
                 return super.resumePage();
@@ -161,7 +163,7 @@ let RoutesPageService = (() => {
                 if (loading) {
                     return { loading, synchronizing: false, routes: [], displayType,
                         filters, filterVisible,
-                        downloadRows: this.getDownloadDisplayProps(),
+                        downloadObserver: this.downloadObserver,
                         showImportDialog: false };
                 }
                 else {
@@ -173,7 +175,7 @@ let RoutesPageService = (() => {
                     return { loading, synchronizing, routes, displayType,
                         filters, filterVisible, filterOptions,
                         detailRouteId,
-                        downloadRows: this.getDownloadDisplayProps(),
+                        downloadObserver: this.downloadObserver,
                         showImportDialog: this.showImportDialog };
                 }
             }
@@ -232,7 +234,8 @@ let RoutesPageService = (() => {
             try {
                 const service = this.getRouteList();
                 const pairing = this.getDevicePairing();
-                const { id, title, videoUrl } = service.getStartSettings() ?? {};
+                const setttings = service.getStartSettings() ?? {};
+                const { id, title, videoUrl } = setttings;
                 this.logEvent({ message: 'Attempting to start a ride', id, title, videoUrl, readyToStart: pairing.isReadyToStart(), });
                 service.close();
                 const next = pairing.isReadyToStart() ? '/rideDeviceOK' : '/pairingStart';
@@ -252,11 +255,11 @@ let RoutesPageService = (() => {
                 imports.forEach((i) => {
                     this.prepareSingleImport(i);
                 });
-                return this.importObserver;
             }
             catch (err) {
                 this.logError(err, 'start');
             }
+            return this.importObserver;
         }
         onImportClosed() {
             try {
@@ -273,12 +276,7 @@ let RoutesPageService = (() => {
             }
         }
         getImportDisplayProps() {
-            try {
-                return this.importProps;
-            }
-            catch (err) {
-                this.logError(err, 'getImportDisplayProps');
-            }
+            return this.importProps;
         }
         getDownloadDisplayProps() {
             return Array.from(this.downloadCache.values());
@@ -287,7 +285,7 @@ let RoutesPageService = (() => {
             this.getPageObserver()?.emit('page-update');
         }
         getRoutesDisplayProps() {
-            const { routes } = this.serviceState ?? {};
+            const { routes = [] } = this.serviceState ?? {};
             const getRouteProps = (routeProps) => {
                 return {
                     ...routeProps,
@@ -299,7 +297,7 @@ let RoutesPageService = (() => {
             return this.getRouteList().getFilters();
         }
         startEventListener() {
-            const { observer } = this.serviceState;
+            const { observer } = this.serviceState ?? {};
             if (!observer)
                 return;
             observer.on('updated', this.updateStateHandler);
@@ -311,7 +309,7 @@ let RoutesPageService = (() => {
             this.getRouteDownload().on('download-started', this.downloadStartedHandler);
         }
         stopEventListener(final) {
-            const { observer } = this.serviceState;
+            const { observer } = this.serviceState ?? {};
             if (!observer)
                 return;
             if (final)
@@ -325,29 +323,37 @@ let RoutesPageService = (() => {
             this.getRouteDownload().off('download-started', this.downloadStartedHandler);
         }
         subscribeToActiveDownload(route, observer) {
-            const routeId = route.description.id;
-            const title = route.description.title;
+            const routeId = route?.description?.id;
+            const title = route?.description?.title ?? '';
+            if (!routeId)
+                return;
             if (this.downloadHandlers.has(routeId))
                 return;
             const onProgress = (pct) => {
                 this.downloadCache.set(routeId, { routeId, title, status: 'downloading', pct });
-                this.updatePageDisplay();
+                this.emitDownloadUpdate();
             };
             const onDone = () => {
                 this.downloadCache.set(routeId, { routeId, title, status: 'done' });
                 this.downloadHandlers.delete(routeId);
-                this.updatePageDisplay();
+                this.emitDownloadUpdate();
             };
             const onError = () => {
                 this.downloadCache.set(routeId, { routeId, title, status: 'failed' });
                 this.downloadHandlers.delete(routeId);
-                this.updatePageDisplay();
+                this.emitDownloadUpdate();
+            };
+            const onStopped = () => {
+                this.downloadCache.delete(routeId);
+                this.downloadHandlers.delete(routeId);
+                this.emitDownloadUpdate();
             };
-            this.downloadHandlers.set(routeId, { onProgress, onDone, onError });
+            this.downloadHandlers.set(routeId, { onProgress, onDone, onError, onStopped });
             this.downloadCache.set(routeId, { routeId, title, status: 'downloading' });
             observer.on('progress', onProgress);
             observer.on('done', onDone);
             observer.on('error', onError);
+            observer.on('stopped', onStopped);
             this.updatePageDisplay();
         }
         subscribeAllActiveDownloads() {
@@ -358,12 +364,15 @@ let RoutesPageService = (() => {
         unsubscribeAllActiveDownloads() {
             const active = this.getRouteDownload().getActiveDownloads();
             for (const { route, observer } of active) {
-                const routeId = route.description.id;
-                const handlers = this.downloadHandlers.get(routeId);
-                if (handlers) {
-                    observer.off('progress', handlers.onProgress);
-                    observer.off('done', handlers.onDone);
-                    observer.off('error', handlers.onError);
+                const routeId = route?.description?.id;
+                if (routeId) {
+                    const handlers = this.downloadHandlers.get(routeId);
+                    if (handlers) {
+                        observer.off('progress', handlers.onProgress);
+                        observer.off('done', handlers.onDone);
+                        observer.off('error', handlers.onError);
+                        observer.off('stopped', handlers.onStopped);
+                    }
                 }
             }
             this.downloadHandlers.clear();
@@ -371,6 +380,13 @@ let RoutesPageService = (() => {
         downloadStartedHandler = (route, observer) => {
             this.subscribeToActiveDownload(route, observer);
         };
+        emitDownloadUpdate() {
+            this.downloadObserver.emit('download-update', {
+                rows: this.getDownloadDisplayProps(),
+                count: Array.from(this.downloadCache.values())
+                    .filter(r => r.status === 'downloading').length
+            });
+        }
         onSycncStart() {
             this.updatePageDisplay();
         }
@@ -381,8 +397,7 @@ let RoutesPageService = (() => {
             this.updatePageDisplay();
         }
         onDialogClosed() {
-            const route = this.getRouteList().getSelected();
-            this.detailRouteId = null;
+            this.detailRouteId = undefined;
             this.updatePageDisplay();
         }
         prepareSingleImport(file) {
@@ -392,6 +407,7 @@ let RoutesPageService = (() => {
                 status: 'idle',
                 fileName: file.name
             };
+            this.importProps = this.importProps ?? [];
             this.importProps.push(props);
             observer.once('success', () => {
                 props.status = 'success';

package/lib/types/api/download/index.d.ts

@@ -8,4 +8,5 @@ export interface IDownloadSession extends EventEmitter {
 }
 export interface IDownloadManager {
     createSession(url: string, fileName: string, props?: DownloadProps): IDownloadSession;
+    getVideoDir?(): string;
 }

package/lib/types/routes/download/service.d.ts

@@ -21,7 +21,7 @@ export declare class RouteDownloadService extends IncyclistService {
     protected deleteIncompleteFile(route: Route, videoDir: string): Promise<void>;
     protected getObserver(route: Route): DownloadObserver;
     protected _download(route: Route): Promise<void>;
-    protected waitForVideoDir(observer: DownloadObserver): any;
+    protected waitForVideoDir(observer: DownloadObserver): Promise<string | undefined>;
     protected getDownloadFileName(route: Route, targetDir: string): Promise<{
         file?: string;
         url?: string;
@@ -29,6 +29,8 @@ export declare class RouteDownloadService extends IncyclistService {
     }>;
     protected downloadRoute(route: Route, targetDir: string, observer: DownloadObserver): Promise<void>;
     protected restoreFromRepo(route: Route): Promise<string>;
-    protected onDownloadProgress(id: string, observer: DownloadObserver, pct: any, speed: any, downloaded: any): void;
+    protected onDownloadProgress(id: string, observer: DownloadObserver, pct: number | string, speed: number | string, downloaded: number | string): void;
+    protected isMobile(): boolean;
+    protected getBindings(): import("../../api").IncyclistBindings;
 }
 export declare const useRouteDownload: () => RouteDownloadService;

package/lib/types/routes/list/cards/RouteCard.d.ts

@@ -16,20 +16,20 @@ export declare const DEFAULT_FILTERS: {
     extensions: string[];
 }[];
 declare class ConvertObserver extends Observer {
-    protected conversion: Observer;
+    protected conversion?: Observer;
     constructor();
     setConversion(conversion: Observer): void;
     stop(): void;
 }
 export declare class RouteCard extends BaseCard implements Card<Route> {
-    protected downloadObserver: DownloadObserver;
-    protected convertObserver: ConvertObserver;
+    protected downloadObserver?: DownloadObserver;
+    protected convertObserver?: ConvertObserver;
     protected route: Route;
-    protected list: CardList<Route>;
+    protected list?: CardList<Route>;
     protected deleteable: boolean;
-    protected startSettings: RouteSettings;
+    protected startSettings?: RouteSettings;
     protected cardObserver: Observer;
-    protected deleteObserver: PromiseObserver<boolean>;
+    protected deleteObserver?: PromiseObserver<boolean>;
     protected ready: boolean;
     protected logger: EventLogger;
     protected cntActive: number;
@@ -42,7 +42,7 @@ export declare class RouteCard extends BaseCard implements Card<Route> {
     verify(): void;
     protected isVideoMissing(): Promise<boolean>;
     videoExists(): Promise<boolean>;
-    protected fileExists(path: any): Promise<boolean>;
+    protected fileExists(path: string): Promise<boolean>;
     cleanupEncoding(path: string): string;
     previewMissing(): boolean;
     setInitialized(init: boolean): void;
@@ -84,6 +84,7 @@ export declare class RouteCard extends BaseCard implements Card<Route> {
     onVideoSelected(info: FileInfo): Promise<"Could not open file" | "Unsupported video format - Please select MP4 or AVI">;
     download(): Observer;
     stopDownload(immediate?: boolean): void;
+    deleteDownload(): Promise<void>;
     protected onDownloadCompleted(url: string): Promise<void>;
     private saveOriginalVideoUrl;
     private restoreVideoUrl;
@@ -113,5 +114,6 @@ export declare class RouteCard extends BaseCard implements Card<Route> {
     protected isMobile(): boolean;
     protected getBindings(): import("../../../api").IncyclistBindings;
     protected getOnlineStatusMonitoring(): import("../../../monitoring").OnlineStateMonitoringService;
+    protected getRouteDownload(): import("../../download/service").RouteDownloadService;
 }
 export {};

package/lib/types/routes/list/cards/types.d.ts

@@ -2,6 +2,7 @@ import { ImportFilter } from "../../../base/cardlist/types";
 import { Observer } from "../../../base/types/observer";
 import { Unit } from "../../../i18n";
 import { RouteInfo } from "../../base/types";
+import { DownloadObserver } from "../../download/types";
 import { RouteStartSettings } from "../types";
 export type RouteCardType = 'Import' | 'Route' | 'Free-Ride' | 'ActiveImport';
 export interface RouteImportProps {
@@ -26,14 +27,15 @@ export interface SummaryCardDisplayProps extends RouteInfo {
     loading?: boolean;
     isNew?: boolean;
     cntActive?: number;
-    totalDistance: {
+    totalDistance?: {
         value: number;
         unit: Unit;
     };
-    totalElevation: {
+    totalElevation?: {
         value: number;
         unit: Unit;
     };
+    downloadObserver?: DownloadObserver;
 }
 export interface DetailCardDisplayProps {
 }

package/lib/types/routes/page/service.d.ts

@@ -6,7 +6,7 @@ import { Observer } from "../../base/types";
 import { Route } from "../base/model/route";
 import { DownloadObserver } from "../download/types";
 export declare class RoutesPageService extends IncyclistPageService implements IRoutePageService {
-    protected serviceState: SearchState;
+    protected serviceState: SearchState | undefined;
     protected detailRouteId: string | undefined;
     protected updateStateHandler: any;
     protected syncStartHandler: any;
@@ -14,13 +14,15 @@ export declare class RoutesPageService extends IncyclistPageService implements I
     protected updateSelectStateHandler: any;
     protected showImportDialog: boolean;
     protected importObserver: Observer | undefined;
-    protected importProps: Array<RouteImportDisplayProps>;
+    protected importProps: Array<RouteImportDisplayProps> | undefined;
     protected downloadCache: Map<string, DownloadRowDisplayProps>;
     protected downloadHandlers: Map<string, {
         onProgress: (pct: number) => void;
         onDone: () => void;
         onError: () => void;
+        onStopped: () => void;
     }>;
+    protected downloadObserver: Observer;
     constructor();
     openPage(): IObserver;
     closePage(): void;
@@ -46,6 +48,7 @@ export declare class RoutesPageService extends IncyclistPageService implements I
     protected subscribeAllActiveDownloads(): void;
     protected unsubscribeAllActiveDownloads(): void;
     protected downloadStartedHandler: (route: Route, observer: DownloadObserver) => void;
+    protected emitDownloadUpdate(): void;
     protected onSycncStart(): void;
     protected onSyncStop(): void;
     protected onStateUpdate(): void;

package/lib/types/routes/page/types.d.ts

@@ -13,13 +13,13 @@ export interface RoutePageDisplayProps {
     filterOptions?: SearchFilterOptions;
     routes?: Array<RouteItemProps>;
     detailRouteId?: string;
-    downloadRows?: DownloadRowDisplayProps[];
+    downloadObserver?: IObserver;
     showImportDialog?: boolean;
 }
 export interface RouteItemProps extends SummaryCardDisplayProps {
 }
 export interface IPageCallBacks {
-    onFilterChanged(filters: SearchFilter): any;
+    onFilterChanged(filters: SearchFilter): void;
     onImportClicked(): void;
     onFilterVisibleChange(visible: boolean): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.45",
+  "version": "1.7.46",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },