incyclist-services 1.7.43 → 1.7.45

package/lib/cjs/activities/ride/service.js

@@ -256,7 +256,6 @@ let ActivityRideService = (() => {
                 }
                 catch { }
                 if (showLog) {
-                    console.log('# here', this.state);
                     this.logEvent({ message: 'Dashboard update', items: info.map(i => `${i.title}:${i.data[0]?.value ?? ''}:${i.data[1]?.value ?? ''}${i.data[1]?.label ? '(' + i.data[1]?.label + ')' : ''}`).join('|') });
                 }
                 return info;
@@ -465,6 +464,7 @@ let ActivityRideService = (() => {
                     this.saveObserver.emit(event, ...args);
             };
             const run = async () => {
+                await (0, sleep_1.sleep)(5);
                 let cntCompleted = 0;
                 let success = false;
                 const localEmitter = new node_events_1.EventEmitter();

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

@@ -1,172 +1,229 @@
 "use strict";
+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";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    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.RouteDownloadService = void 0;
+exports.useRouteDownload = exports.RouteDownloadService = void 0;
 const api_1 = require("../../api");
+const decorators_1 = require("../../base/decorators");
 const service_1 = require("../../base/service");
 const settings_1 = require("../../settings");
 const utils_1 = require("../../utils");
 const api_2 = require("../list/loaders/api");
 const db_1 = require("../list/loaders/db");
 const types_1 = require("./types");
-class RouteDownloadService extends service_1.IncyclistService {
-    downloads;
-    progressLogTs;
-    constructor() {
-        super('Routes');
-        this.progressLogTs = {};
-        this.downloads = [];
-    }
-    getRepo() {
-        return new db_1.RoutesDbLoader();
-    }
-    getRoutesApi() {
-        return new api_2.RoutesApiLoader();
-    }
-    download(route) {
-        const running = this.getObserver(route);
-        if (running) {
-            return running;
-        }
-        const observer = new types_1.DownloadObserver(this._download(route));
-        this.downloads.push({ route, observer });
-        return observer;
-    }
-    stopDownload(route) {
-        const idx = this.downloads.findIndex(d => d.route.description.id === route.description.id);
-        if (idx === -1)
-            return;
-        const info = this.downloads[idx];
-        info.observer.stop();
-        this.downloads.splice(idx, 1);
-    }
-    async deleteIncompleteFile(route, videoDir) {
-        const { file } = await this.getDownloadFileName(route, videoDir);
-        if (file) {
-            try {
-                const fs = (0, api_1.getBindings)().fs;
-                fs.unlink(file);
+let RouteDownloadService = (() => {
+    let _classDecorators = [decorators_1.Singleton];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = service_1.IncyclistService;
+    var RouteDownloadService = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            __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;
+        progressLogTs;
+        constructor() {
+            super('Routes');
+            this.progressLogTs = {};
+            this.downloads = [];
+        }
+        getRepo() {
+            return new db_1.RoutesDbLoader();
+        }
+        getRoutesApi() {
+            return new api_2.RoutesApiLoader();
+        }
+        getActiveDownloads() {
+            return this.downloads;
+        }
+        download(route) {
+            const running = this.getObserver(route);
+            if (running) {
+                return running;
             }
-            catch (err) {
-                this.logError(err, 'deleteIncompleteFile');
+            const observer = new types_1.DownloadObserver(this._download(route));
+            this.downloads.push({ route, observer });
+            this.emit('download-started', route, observer);
+            return observer;
+        }
+        stopDownload(route) {
+            const idx = this.downloads.findIndex(d => d.route.description.id === route.description.id);
+            if (idx === -1)
+                return;
+            const info = this.downloads[idx];
+            info.observer.stop();
+            this.downloads.splice(idx, 1);
+        }
+        async deleteIncompleteFile(route, videoDir) {
+            const { file } = await this.getDownloadFileName(route, videoDir);
+            if (file) {
+                try {
+                    const fs = (0, api_1.getBindings)().fs;
+                    fs.unlink(file);
+                }
+                catch (err) {
+                    this.logError(err, 'deleteIncompleteFile');
+                }
             }
         }
-    }
-    getObserver(route) {
-        const info = this.downloads.find(d => d.route.description.id === route.description.id);
-        return info?.observer;
-    }
-    async _download(route) {
-        await (0, utils_1.waitNextTick)();
-        const observer = this.getObserver(route);
-        try {
-            const videoDir = await this.waitForVideoDir(observer);
-            observer.once('stopped', () => {
-                this.deleteIncompleteFile(route, videoDir);
-            });
-            this.downloadRoute(route, videoDir, observer);
-        }
-        catch (err) {
-            observer.emit('error', err);
+        getObserver(route) {
+            const info = this.downloads.find(d => d.route.description.id === route.description.id);
+            return info?.observer;
         }
-    }
-    waitForVideoDir(observer) {
-        const settings = (0, settings_1.useUserSettings)();
-        const videoDir = settings.get('videos.directory', null);
-        if (!videoDir) {
-            const reqId = Date.now().toString();
-            const settingsObserver = settings.requestNotifyOnChange(reqId, 'videos.directory');
-            observer?.emit('videoDir.unknown');
-            return new Promise(done => {
-                settingsObserver.on('changed', (dir) => {
-                    observer?.emit('videoDir.ok');
-                    settings.stopNotifyOnChange(reqId);
-                    done(dir);
+        async _download(route) {
+            await (0, utils_1.waitNextTick)();
+            const observer = this.getObserver(route);
+            try {
+                const videoDir = await this.waitForVideoDir(observer);
+                observer.once('stopped', () => {
+                    this.deleteIncompleteFile(route, videoDir);
                 });
-            });
-        }
-        return videoDir;
-    }
-    async getDownloadFileName(route, targetDir) {
-        let url, file, error;
-        try {
-            const { path } = (0, api_1.getBindings)();
-            url = route?.description?.downloadUrl || route?.description?.videoUrl;
-            if (!url) {
-                url = await this.restoreFromRepo(route);
-            }
-            if (!url || !path) {
-                return { error: 'download not supported' };
+                this.downloadRoute(route, videoDir, observer);
             }
-            const info = path.parse(url);
-            if (!info) {
-                const logInfo = { ...route.description };
-                delete logInfo.points;
-                this.logEvent({ message: 'no URL specified', logInfo });
-                return { error: 'no URL specified' };
+            catch (err) {
+                observer.emit('error', err);
             }
-            file = path.join(targetDir, info.base);
         }
-        catch {
-            return {};
+        waitForVideoDir(observer) {
+            const settings = (0, settings_1.useUserSettings)();
+            const videoDir = settings.get('videos.directory', null);
+            if (!videoDir) {
+                const reqId = Date.now().toString();
+                const settingsObserver = settings.requestNotifyOnChange(reqId, 'videos.directory');
+                observer?.emit('videoDir.unknown');
+                return new Promise(done => {
+                    settingsObserver.on('changed', (dir) => {
+                        observer?.emit('videoDir.ok');
+                        settings.stopNotifyOnChange(reqId);
+                        done(dir);
+                    });
+                });
+            }
+            return videoDir;
         }
-        return { file, url };
-    }
-    async downloadRoute(route, targetDir, observer) {
-        let urlLog;
-        try {
-            const { file, url, error } = await this.getDownloadFileName(route, targetDir);
-            urlLog = url;
-            if (!file || error) {
-                observer.emit('error', new Error(error ?? 'download not supported'));
-                return;
+        async getDownloadFileName(route, targetDir) {
+            let url, file, error;
+            try {
+                const { path } = (0, api_1.getBindings)();
+                url = route?.description?.downloadUrl || route?.description?.videoUrl;
+                if (!url) {
+                    url = await this.restoreFromRepo(route);
+                }
+                if (!url || !path) {
+                    return { error: 'download not supported' };
+                }
+                const info = path.parse(url);
+                if (!info) {
+                    const logInfo = { ...route.description };
+                    delete logInfo.points;
+                    this.logEvent({ message: 'no URL specified', logInfo });
+                    return { error: 'no URL specified' };
+                }
+                file = path.join(targetDir, info.base);
             }
-            const { id, title } = route.description;
-            const { downloadManager } = (0, api_1.getBindings)();
-            if (!downloadManager) {
-                observer.emit('error', new Error('download not supported'));
-                return;
+            catch {
+                return {};
             }
-            const session = downloadManager.createSession(url, file);
-            if (!session) {
-                observer.emit('error', new Error(error ?? 'download not supported'));
-                return;
+            return { file, url };
+        }
+        async downloadRoute(route, targetDir, observer) {
+            let urlLog;
+            try {
+                const { file, url, error } = await this.getDownloadFileName(route, targetDir);
+                urlLog = url;
+                if (!file || error) {
+                    observer.emit('error', new Error(error ?? 'download not supported'));
+                    return;
+                }
+                const { id, title } = route.description;
+                const { downloadManager } = (0, api_1.getBindings)();
+                if (!downloadManager) {
+                    observer.emit('error', new Error('download not supported'));
+                    return;
+                }
+                const session = downloadManager.createSession(url, file);
+                if (!session) {
+                    observer.emit('error', new Error(error ?? 'download not supported'));
+                    return;
+                }
+                observer.setSession(session);
+                const onError = (err) => {
+                    this.logEvent({ message: 'download failed ', title, id, url, reason: err.message });
+                    observer.emit('error', err);
+                };
+                const onProgress = (pct, speed, bytes) => { this.onDownloadProgress(id, observer, pct, speed, bytes); };
+                this.logEvent({ message: 'start download', title, id, url });
+                session.on('started', () => { observer.emit('started'); });
+                session.on('close', () => { });
+                session.on('progress', onProgress);
+                session.on('error', onError);
+                session.once('done', () => {
+                    this.logEvent({ message: 'download finished ', title, id, url });
+                    observer.emit('done', `video:///${file}`);
+                });
+                session.start();
             }
-            observer.setSession(session);
-            const onError = (err) => {
-                this.logEvent({ message: 'download failed ', title, id, url, reason: err.message });
+            catch (err) {
+                this.logError(err, 'downloadRoute', { url: urlLog });
                 observer.emit('error', err);
-            };
-            const onProgress = (pct, speed, bytes) => { this.onDownloadProgress(id, observer, pct, speed, bytes); };
-            this.logEvent({ message: 'start download', title, id, url });
-            session.on('started', () => { observer.emit('started'); });
-            session.on('close', () => { });
-            session.on('progress', onProgress);
-            session.on('error', onError);
-            session.once('done', () => {
-                this.logEvent({ message: 'download finished ', title, id, url });
-                observer.emit('done', `video:///${file}`);
-            });
-            session.start();
-        }
-        catch (err) {
-            this.logError(err, 'downloadRoute', { url: urlLog });
-            observer.emit('error', err);
+            }
         }
-    }
-    async restoreFromRepo(route) {
-        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;
-        }
-        observer.emit('progress', Number(pct));
-    }
-}
+        async restoreFromRepo(route) {
+            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;
+            }
+            observer.emit('progress', Number(pct));
+        }
+    };
+    return RouteDownloadService = _classThis;
+})();
 exports.RouteDownloadService = RouteDownloadService;
+const useRouteDownload = () => new RouteDownloadService();
+exports.useRouteDownload = useRouteDownload;

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

@@ -44,6 +44,7 @@ const types_1 = require("../../base/types");
 const uuid_1 = require("uuid");
 const sleep_1 = require("../../utils/sleep");
 const devices_1 = require("../../devices");
+const service_1 = require("../download/service");
 let RoutesPageService = (() => {
     let _classDecorators = [decorators_1.Singleton];
     let _classDescriptor;
@@ -54,6 +55,7 @@ let RoutesPageService = (() => {
     let _getRouteList_decorators;
     let _getDevicePairing_decorators;
     let _getUserSettings_decorators;
+    let _getRouteDownload_decorators;
     var RoutesPageService = class extends _classSuper {
         static { _classThis = this; }
         static {
@@ -61,9 +63,11 @@ let RoutesPageService = (() => {
             _getRouteList_decorators = [decorators_1.Injectable];
             _getDevicePairing_decorators = [decorators_1.Injectable];
             _getUserSettings_decorators = [decorators_1.Injectable];
+            _getRouteDownload_decorators = [decorators_1.Injectable];
             __esDecorate(this, null, _getRouteList_decorators, { kind: "method", name: "getRouteList", static: false, private: false, access: { has: obj => "getRouteList" in obj, get: obj => obj.getRouteList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getDevicePairing_decorators, { kind: "method", name: "getDevicePairing", static: false, private: false, access: { has: obj => "getDevicePairing" in obj, get: obj => obj.getDevicePairing }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getRouteDownload_decorators, { kind: "method", name: "getRouteDownload", static: false, private: false, access: { has: obj => "getRouteDownload" in obj, get: obj => obj.getRouteDownload }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             RoutesPageService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -78,8 +82,12 @@ let RoutesPageService = (() => {
         showImportDialog = false;
         importObserver;
         importProps;
+        downloadCache;
+        downloadHandlers;
         constructor() {
             super('RoutesPage');
+            this.downloadCache = new Map();
+            this.downloadHandlers = new Map();
         }
         openPage() {
             try {
@@ -120,6 +128,8 @@ let RoutesPageService = (() => {
             try {
                 gd_eventlog_1.EventLogger.setGlobalConfig('page', null);
                 this.logEvent({ message: 'page closed', page: 'Routes' });
+                this.stopEventListener();
+                this.downloadCache.clear();
                 super.closePage();
             }
             catch (err) {
@@ -153,7 +163,9 @@ let RoutesPageService = (() => {
                 const filters = service.getFilters();
                 if (loading) {
                     return { loading, synchronizing: false, routes: [], displayType,
-                        filters, filterVisible, showImportDialog: false };
+                        filters, filterVisible,
+                        downloadRows: this.getDownloadDisplayProps(),
+                        showImportDialog: false };
                 }
                 else {
                     const showImport = false;
@@ -163,7 +175,9 @@ let RoutesPageService = (() => {
                     const detailRouteId = this.detailRouteId;
                     return { loading, synchronizing, routes, displayType,
                         filters, filterVisible, filterOptions,
-                        detailRouteId, showImportDialog: this.showImportDialog };
+                        detailRouteId,
+                        downloadRows: this.getDownloadDisplayProps(),
+                        showImportDialog: this.showImportDialog };
                 }
             }
             catch (err) {
@@ -269,6 +283,9 @@ let RoutesPageService = (() => {
                 this.logError(err, 'getImportDisplayProps');
             }
         }
+        getDownloadDisplayProps() {
+            return Array.from(this.downloadCache.values());
+        }
         updatePageDisplay() {
             this.getPageObserver()?.emit('page-update');
         }
@@ -293,6 +310,8 @@ let RoutesPageService = (() => {
             observer.on('sync-start', this.syncStartHandler);
             observer.on('sync-done', this.syncStopHandler);
             observer.on('selected', this.updateSelectStateHandler);
+            this.subscribeAllActiveDownloads();
+            this.getRouteDownload().on('download-started', this.downloadStartedHandler);
         }
         stopEventListener(final) {
             const { observer } = this.serviceState;
@@ -305,7 +324,56 @@ let RoutesPageService = (() => {
             observer.off('sync-start', this.syncStartHandler);
             observer.off('sync-done', this.syncStopHandler);
             observer.off('selected', this.updateSelectStateHandler);
+            this.unsubscribeAllActiveDownloads();
+            this.getRouteDownload().off('download-started', this.downloadStartedHandler);
         }
+        subscribeToActiveDownload(route, observer) {
+            const routeId = route.description.id;
+            const title = route.description.title;
+            if (this.downloadHandlers.has(routeId))
+                return;
+            const onProgress = (pct) => {
+                this.downloadCache.set(routeId, { routeId, title, status: 'downloading', pct });
+                this.updatePageDisplay();
+            };
+            const onDone = () => {
+                this.downloadCache.set(routeId, { routeId, title, status: 'done' });
+                this.downloadHandlers.delete(routeId);
+                this.updatePageDisplay();
+            };
+            const onError = () => {
+                this.downloadCache.set(routeId, { routeId, title, status: 'failed' });
+                this.downloadHandlers.delete(routeId);
+                this.updatePageDisplay();
+            };
+            this.downloadHandlers.set(routeId, { onProgress, onDone, onError });
+            this.downloadCache.set(routeId, { routeId, title, status: 'downloading' });
+            observer.on('progress', onProgress);
+            observer.on('done', onDone);
+            observer.on('error', onError);
+            this.updatePageDisplay();
+        }
+        subscribeAllActiveDownloads() {
+            this.getRouteDownload().getActiveDownloads().forEach(({ route, observer }) => {
+                this.subscribeToActiveDownload(route, observer);
+            });
+        }
+        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);
+                }
+            }
+            this.downloadHandlers.clear();
+        }
+        downloadStartedHandler = (route, observer) => {
+            this.subscribeToActiveDownload(route, observer);
+        };
         onSycncStart() {
             this.updatePageDisplay();
         }
@@ -357,6 +425,9 @@ let RoutesPageService = (() => {
         getUserSettings() {
             return (0, settings_1.useUserSettings)();
         }
+        getRouteDownload() {
+            return (0, service_1.useRouteDownload)();
+        }
     };
     return RoutesPageService = _classThis;
 })();

package/lib/esm/activities/ride/service.js

@@ -250,7 +250,6 @@ let ActivityRideService = (() => {
                 }
                 catch { }
                 if (showLog) {
-                    console.log('# here', this.state);
                     this.logEvent({ message: 'Dashboard update', items: info.map(i => `${i.title}:${i.data[0]?.value ?? ''}:${i.data[1]?.value ?? ''}${i.data[1]?.label ? '(' + i.data[1]?.label + ')' : ''}`).join('|') });
                 }
                 return info;
@@ -459,6 +458,7 @@ let ActivityRideService = (() => {
                     this.saveObserver.emit(event, ...args);
             };
             const run = async () => {
+                await sleep(5);
                 let cntCompleted = 0;
                 let success = false;
                 const localEmitter = new EventEmitter();