incyclist-services 1.7.42 → 1.7.44

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

@@ -42,10 +42,10 @@ const types_1 = require("../../base/types");
 const observer_1 = require("../../base/types/observer");
 const i18n_1 = require("../../i18n");
 const routes_1 = require("../../routes");
-const utils_1 = require("../../utils");
+const sleep_1 = require("../../utils/sleep");
 const base_1 = require("../base");
 const upload_1 = require("../upload");
-const utils_2 = require("./utils");
+const utils_1 = require("./utils");
 let ActivityListService = (() => {
     let _classDecorators = [types_1.Singleton];
     let _classDescriptor;
@@ -104,13 +104,13 @@ let ActivityListService = (() => {
                             this.logEvent({ message: 'preload activity list completed', cnt: this.activities?.length });
                             this.initialized = true;
                             this.emitLists('loaded');
-                            process.nextTick(() => { delete this.observers.preload; });
+                            (0, sleep_1.sleep)(5).then(() => { delete this.observers.preload; });
                         });
                     })
                         .catch((err) => {
                         this.logError(err, 'preload');
                         this.initialized = false;
-                        process.nextTick(() => { delete this.observers.preload; });
+                        (0, sleep_1.sleep)(5).then(() => { delete this.observers.preload; });
                     });
                 }
                 else {
@@ -162,7 +162,7 @@ let ActivityListService = (() => {
             try {
                 const activity = this.getActivity(id);
                 if (activity.details) {
-                    (0, utils_1.waitNextTick)().then(() => observer.emit('loaded', activity.details));
+                    (0, sleep_1.sleep)(5).then(() => observer.emit('loaded', activity.details));
                     return observer;
                 }
                 this.getRepo().getWithDetails(id).then(ai => {
@@ -375,12 +375,12 @@ let ActivityListService = (() => {
             const loading = this.isStillLoading();
             const observer = loading ? this.getListObserver() : undefined;
             const activities = loading ? undefined : this.getPastActivities();
-            const activitiesUI = activities === undefined ? undefined : activities.map(utils_2.createUIActivityInfo);
+            const activitiesUI = activities === undefined ? undefined : activities.map(utils_1.createUIActivityInfo);
             const filter = this.filter;
             return { filter, activities: activitiesUI, loading, observer };
         }
         getSelectedActivityDisplayProps() {
-            const activity = (0, utils_2.createUIActivityDetails)(this.selected.details);
+            const activity = (0, utils_1.createUIActivityDetails)(this.selected.details);
             const [C, U] = this.getUnitConverter().getUnitConversionShortcuts();
             const logs = activity?.logs ?? [];
             const points = logs.map(p => ({ lat: p.lat, lng: p.lng ?? p.lon }));

package/lib/cjs/activities/list/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createUIActivityDetails = exports.createUIActivitySummary = exports.createUIActivityInfo = void 0;
+exports._createUIActivityDetails = exports.createUIActivityDetails = exports.createUIActivitySummary = exports.createUIActivityInfo = void 0;
 const i18n_1 = require("../../i18n");
 const createUIActivityInfo = (a) => {
     if (!a)
@@ -8,7 +8,7 @@ const createUIActivityInfo = (a) => {
     const { summary, details } = a;
     return {
         summary: (0, exports.createUIActivitySummary)(summary),
-        details: (0, exports.createUIActivityDetails)(details)
+        details: undefined
     };
 };
 exports.createUIActivityInfo = createUIActivityInfo;
@@ -25,6 +25,38 @@ const createUIActivitySummary = (summary) => {
 };
 exports.createUIActivitySummary = createUIActivitySummary;
 const createUIActivityDetails = (details) => {
+    if (!details)
+        return details;
+    const ui = { ...details };
+    const [C, U] = (0, i18n_1.getUnitConversionShortcuts)();
+    const formatSpeed = (v) => {
+        return { value: C(v, 'speed', { digits: 1 }), unit: U('speed') };
+    };
+    if (details.stats?.speed) {
+        ui.stats = {
+            ...details.stats,
+            speed: { ...details.stats.speed }
+        };
+        const fields = ['min', 'max', 'avg'];
+        for (const field of fields) {
+            ui.stats.speed[field] = formatSpeed(ui.stats.speed[field]);
+        }
+    }
+    ui.distance = { value: C(details.distance, 'distance', { digits: 1 }), unit: U('distance') };
+    ui.totalElevation = { value: C(details.totalElevation, 'elevation', { digits: 0 }), unit: U('elevation') };
+    ui.logs = (details.logs ?? []).map(log => {
+        const { speed, distance, elevation } = log;
+        return {
+            ...log,
+            speed: C(speed, 'speed', { digits: 1 }),
+            distance: C(distance, 'distance', { digits: 2 }),
+            elevation: C(elevation, 'elevation', { digits: 0 }),
+        };
+    });
+    return ui;
+};
+exports.createUIActivityDetails = createUIActivityDetails;
+const _createUIActivityDetails = (details) => {
     if (!details)
         return details;
     const ui = structuredClone(details);
@@ -53,4 +85,4 @@ const createUIActivityDetails = (details) => {
     }
     return ui;
 };
-exports.createUIActivityDetails = createUIActivityDetails;
+exports._createUIActivityDetails = _createUIActivityDetails;

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

@@ -62,17 +62,23 @@ let ActivitiesPageService = (() => {
         updateStateHandler = (__runInitializers(this, _instanceExtraInitializers), this.onStateUpdate.bind(this));
         listState;
         detailActivityId;
+        isOpen = false;
         constructor() {
             super('ActivitiesPage');
         }
         openPage() {
+            if (this.isOpen) {
+                this.getActivityList().closeList();
+                this.stopEventListener();
+            }
             try {
-                this.logEvent({ message: 'page shown', page: 'Routes' });
-                gd_eventlog_1.EventLogger.setGlobalConfig('page', 'Routes');
+                this.logEvent({ message: 'page shown', page: 'Activities' });
+                gd_eventlog_1.EventLogger.setGlobalConfig('page', 'Activities');
                 super.openPage();
                 const service = this.getActivityList();
                 this.listState = service.openList();
                 this.startEventListener();
+                this.isOpen = true;
                 (0, sleep_1.sleep)(5).then(() => {
                     this.updatePageDisplay();
                 });
@@ -85,9 +91,10 @@ let ActivitiesPageService = (() => {
         closePage() {
             try {
                 gd_eventlog_1.EventLogger.setGlobalConfig('page', null);
-                this.logEvent({ message: 'page closed', page: 'Routes' });
+                this.logEvent({ message: 'page closed', page: 'Activities' });
                 this.getActivityList().closeList();
                 this.stopEventListener();
+                this.isOpen = false;
                 super.closePage();
             }
             catch (err) {
@@ -122,6 +129,7 @@ let ActivitiesPageService = (() => {
         }
         onOpenActivity(id) {
             try {
+                this.getActivityList().select(id);
                 this.detailActivityId = id === null ? undefined : id;
                 this.updatePageDisplay();
             }
@@ -131,7 +139,7 @@ let ActivitiesPageService = (() => {
         }
         onCloseActivity() {
             try {
-                delete this.detailActivityId;
+                this.detailActivityId = null;
                 this.updatePageDisplay();
             }
             catch (err) {

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;

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

@@ -631,7 +631,7 @@ let DeviceRideService = (() => {
                     if (modes.length > 0) {
                         mode = new modes[0](bike);
                         const modeInfo = config.getModeSettings(ai.udid, mode);
-                        settings = modeInfo.settings;
+                        settings = modeInfo?.settings;
                     }
                 }
                 if (!isControlDisabled) {

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;