incyclist-services 1.7.26 → 1.7.28

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

@@ -218,7 +218,8 @@ let DevicesPageService = (() => {
         enableInterface(i) { }
         disableInterface(i) { }
         reconnectInterface(i) { }
-        refreshInterface(i) { }
+        refreshInterface(i) {
+        }
         closeInterfaceSettings() {
             this.openedInterfaceSettings = undefined;
             this.interfaceSettingsObserver?.stop();

package/lib/cjs/routes/base/utils/route.js

@@ -310,7 +310,6 @@ const getTotalDistance = (route) => {
 };
 exports.getTotalDistance = getTotalDistance;
 const getRouteHash = (route) => {
-    console.log('# getRouteHash', 'crypto binding:', getCryptoBinding());
     const cryptoImpl = getCryptoBinding() ?? require('crypto');
     let json;
     if (!route?.points) {

package/lib/cjs/routes/list/loaders/api.js

@@ -11,7 +11,7 @@ const route_1 = require("../../base/model/route");
 const route_2 = require("../../base/utils/route");
 const db_1 = require("./db");
 const types_1 = require("./types");
-const utils_1 = require("../../../utils");
+const sleep_1 = require("../../../utils/sleep");
 const valid = (v) => (v !== undefined && v !== null);
 class ApiError extends Error {
     _type;
@@ -67,10 +67,12 @@ class RoutesApiLoader extends types_1.Loader {
                 await this.processRouteFromApi(p.value[j], loadDetailRequired);
             }
         }
-        if (loadDetailRequired.length > 0)
+        this.loadObserver.emit('loaded');
+        if (loadDetailRequired.length > 0) {
             await this.loadDetails(loadDetailRequired, true);
+        }
         this.loadObserver.emit('done');
-        await (0, utils_1.waitNextTick)();
+        await (0, sleep_1.sleep)(1);
         this.loadObserver.stop();
         delete this.loadObserver;
     }
@@ -111,10 +113,11 @@ class RoutesApiLoader extends types_1.Loader {
             this.verifyRouteHash(route);
         }
         if (!existing) {
-            if (isComplete)
-                this.emitRouteAdded(route);
-            else
-                items.push({ route, added: true });
+            this.emitRouteAdded(route);
+            items.push({ route, added: true });
+            if (isComplete) {
+                this.save(route, false);
+            }
         }
         else {
             this.save(route, true);
@@ -123,6 +126,7 @@ class RoutesApiLoader extends types_1.Loader {
         }
     }
     stopLoad() {
+        this.loadObserver?.stop();
         delete this.loadObserver;
     }
     getDescriptionFromDB(id) {
@@ -182,7 +186,7 @@ class RoutesApiLoader extends types_1.Loader {
         });
         for (const element of success) {
             const item = element;
-            this.emitRouteEvents(!item.added, item.route);
+            this.emitRouteEvents(item.added === true, item.route);
             await this.verifyCountry(item.route);
             this.verifyRouteHash(item.route);
             if (save)

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

@@ -67,6 +67,8 @@ const appstate_1 = require("../../appstate");
 const i18n_1 = require("../../i18n");
 const clone_1 = __importDefault(require("../../utils/clone"));
 const SYNC_INTERVAL = 5 * 60 * 1000;
+const PRELOAD_DESKTOP = 20;
+const PRELOAD_MOBILE = 10;
 let RouteListService = (() => {
     let _classDecorators = [types_1.Singleton];
     let _classDescriptor;
@@ -79,6 +81,7 @@ let RouteListService = (() => {
     let _getAppState_decorators;
     let _getAppsService_decorators;
     let _getUnitConverter_decorators;
+    let _getBindings_decorators;
     var RouteListService = class extends _classSuper {
         static { _classThis = this; }
         static {
@@ -88,11 +91,13 @@ let RouteListService = (() => {
             _getAppState_decorators = [decorators_1.Injectable];
             _getAppsService_decorators = [decorators_1.Injectable];
             _getUnitConverter_decorators = [decorators_1.Injectable];
+            _getBindings_decorators = [decorators_1.Injectable];
             __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, _getRouteSyncFactory_decorators, { kind: "method", name: "getRouteSyncFactory", static: false, private: false, access: { has: obj => "getRouteSyncFactory" in obj, get: obj => obj.getRouteSyncFactory }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getAppState_decorators, { kind: "method", name: "getAppState", static: false, private: false, access: { has: obj => "getAppState" in obj, get: obj => obj.getAppState }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getAppsService_decorators, { kind: "method", name: "getAppsService", static: false, private: false, access: { has: obj => "getAppsService" in obj, get: obj => obj.getAppsService }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getUnitConverter_decorators, { kind: "method", name: "getUnitConverter", static: false, private: false, access: { has: obj => "getUnitConverter" in obj, get: obj => obj.getUnitConverter }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __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);
             RouteListService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -321,7 +326,8 @@ let RouteListService = (() => {
                 routes.sort((a, b) => a.title > b.title ? 1 : -1);
                 const units = this.getUnitConverter().getDefaultUnits();
                 if (!filters) {
-                    return { routes, filters, observer: this.observer, units };
+                    const cards = routes.map(r => this.getCard(r.id));
+                    return { routes, cards, filters, observer: this.observer, units };
                 }
                 if (!filters.includeDeleted)
                     routes = routes.filter(r => !r?.isDeleted);
@@ -494,6 +500,9 @@ let RouteListService = (() => {
             }
         }
         preload() {
+            if (this.preloadObserver) {
+                return this.preloadObserver;
+            }
             try {
                 this.logEvent({ message: 'preload route list' });
                 if (!this.isStillLoading()) {
@@ -504,23 +513,26 @@ let RouteListService = (() => {
                         this.initialized = true;
                         this.logEvent({ message: 'preload route list completed' });
                         this.updateRepoStats();
-                        this.emitLists('loaded', { log: true });
-                        process.nextTick(() => { delete this.preloadObserver; });
+                        (0, sleep_1.sleep)(0).then(() => {
+                            delete this.preloadObserver;
+                            this.emit('load-done');
+                            this.emitLists('loaded', { log: true });
+                        });
                     })
                         .catch((err) => {
                         this.logError(err, 'preload');
                         this.preloadObserver?.stop();
-                        process.nextTick(() => { delete this.preloadObserver; });
-                    })
-                        .finally(() => {
-                        this.emit('load-done');
+                        (0, sleep_1.sleep)(0).then(() => {
+                            delete this.preloadObserver;
+                            this.emit('load-done');
+                        });
                     });
                 }
             }
             catch (err) {
                 this.logError(err, 'preload');
                 this.preloadObserver?.stop();
-                process.nextTick(() => { delete this.preloadObserver; });
+                (0, sleep_1.sleep)(0).then(() => { delete this.preloadObserver; });
             }
             return this.preloadObserver;
         }
@@ -780,8 +792,9 @@ let RouteListService = (() => {
         }
         addRoute(route, source = 'system') {
             this.routes.push(route);
-            if (route.description?.isDeleted)
+            if (route.description?.isDeleted) {
                 return;
+            }
             if (!route.description?.isDeleted) {
                 if (source === 'user') {
                     this.logEvent({ message: 'route added', route: route.description.title, source: route.description.source });
@@ -845,8 +858,9 @@ let RouteListService = (() => {
                     .catch(() => {
                 });
             };
+            const maxPreload = this.isMobile() ? PRELOAD_MOBILE : PRELOAD_DESKTOP;
             cards.forEach(card => {
-                if (!card || promises.length > 19)
+                if (!card || promises.length > maxPreload)
                     return;
                 if (!card.getRouteData()) {
                     promises.push(loadDetails(card));
@@ -977,6 +991,7 @@ let RouteListService = (() => {
                 const update = this.update.bind(this);
                 observer.on('route.added', add);
                 observer.on('route.updated', update);
+                observer.on('loaded', done);
                 observer.on('done', done);
             });
         }
@@ -1256,6 +1271,14 @@ let RouteListService = (() => {
                 }
             }
         }
+        isMobile() {
+            const { appInfo } = this.getBindings();
+            if (!appInfo) {
+                return false;
+            }
+            const channel = appInfo?.getChannel();
+            return channel === 'mobile';
+        }
         getUserSettings() {
             return (0, settings_1.useUserSettings)();
         }
@@ -1271,6 +1294,9 @@ let RouteListService = (() => {
         getUnitConverter() {
             return (0, i18n_1.useUnitConverter)();
         }
+        getBindings() {
+            return (0, api_1.getBindings)();
+        }
         reset() {
             super.reset();
             if (this.syncInfo?.iv) {

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

@@ -94,13 +94,13 @@ let RoutesPageService = (() => {
                         if (this.serviceState.observer) {
                             this.startEventListener();
                         }
+                        (0, sleep_1.sleep)(5).then(() => {
+                            this.updatePageDisplay();
+                        });
                     };
                     if (service.isStillLoading()) {
                         service.once('load-done', () => {
                             start();
-                            (0, sleep_1.sleep)(5).then(() => {
-                                this.updatePageDisplay();
-                            });
                         });
                     }
                     else {

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

@@ -215,7 +215,8 @@ let DevicesPageService = (() => {
         enableInterface(i) { }
         disableInterface(i) { }
         reconnectInterface(i) { }
-        refreshInterface(i) { }
+        refreshInterface(i) {
+        }
         closeInterfaceSettings() {
             this.openedInterfaceSettings = undefined;
             this.interfaceSettingsObserver?.stop();

package/lib/esm/routes/base/utils/route.js

@@ -291,7 +291,6 @@ export const getTotalDistance = (route) => {
     return route.points[route.points.length - 1].routeDistance;
 };
 export const getRouteHash = (route) => {
-    console.log('# getRouteHash', 'crypto binding:', getCryptoBinding());
     const cryptoImpl = getCryptoBinding() ?? require('crypto');
     let json;
     if (!route?.points) {

package/lib/esm/routes/list/loaders/api.js

@@ -5,7 +5,7 @@ import { Route } from "../../base/model/route";
 import { addDetails } from "../../base/utils/route";
 import { RoutesDbLoader } from "./db";
 import { Loader } from "./types";
-import { waitNextTick } from "../../../utils";
+import { sleep } from "../../../utils/sleep";
 const valid = (v) => (v !== undefined && v !== null);
 class ApiError extends Error {
     _type;
@@ -61,10 +61,12 @@ export class RoutesApiLoader extends Loader {
                 await this.processRouteFromApi(p.value[j], loadDetailRequired);
             }
         }
-        if (loadDetailRequired.length > 0)
+        this.loadObserver.emit('loaded');
+        if (loadDetailRequired.length > 0) {
             await this.loadDetails(loadDetailRequired, true);
+        }
         this.loadObserver.emit('done');
-        await waitNextTick();
+        await sleep(1);
         this.loadObserver.stop();
         delete this.loadObserver;
     }
@@ -105,10 +107,11 @@ export class RoutesApiLoader extends Loader {
             this.verifyRouteHash(route);
         }
         if (!existing) {
-            if (isComplete)
-                this.emitRouteAdded(route);
-            else
-                items.push({ route, added: true });
+            this.emitRouteAdded(route);
+            items.push({ route, added: true });
+            if (isComplete) {
+                this.save(route, false);
+            }
         }
         else {
             this.save(route, true);
@@ -117,6 +120,7 @@ export class RoutesApiLoader extends Loader {
         }
     }
     stopLoad() {
+        this.loadObserver?.stop();
         delete this.loadObserver;
     }
     getDescriptionFromDB(id) {
@@ -176,7 +180,7 @@ export class RoutesApiLoader extends Loader {
         });
         for (const element of success) {
             const item = element;
-            this.emitRouteEvents(!item.added, item.route);
+            this.emitRouteEvents(item.added === true, item.route);
             await this.verifyCountry(item.route);
             this.verifyRouteHash(item.route);
             if (save)

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

@@ -61,6 +61,8 @@ import { useAppState } from "../../appstate";
 import { useUnitConverter } from "../../i18n";
 import clone from "../../utils/clone";
 const SYNC_INTERVAL = 5 * 60 * 1000;
+const PRELOAD_DESKTOP = 20;
+const PRELOAD_MOBILE = 10;
 let RouteListService = (() => {
     let _classDecorators = [Singleton];
     let _classDescriptor;
@@ -73,6 +75,7 @@ let RouteListService = (() => {
     let _getAppState_decorators;
     let _getAppsService_decorators;
     let _getUnitConverter_decorators;
+    let _getBindings_decorators;
     var RouteListService = class extends _classSuper {
         static { _classThis = this; }
         static {
@@ -82,11 +85,13 @@ let RouteListService = (() => {
             _getAppState_decorators = [Injectable];
             _getAppsService_decorators = [Injectable];
             _getUnitConverter_decorators = [Injectable];
+            _getBindings_decorators = [Injectable];
             __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, _getRouteSyncFactory_decorators, { kind: "method", name: "getRouteSyncFactory", static: false, private: false, access: { has: obj => "getRouteSyncFactory" in obj, get: obj => obj.getRouteSyncFactory }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getAppState_decorators, { kind: "method", name: "getAppState", static: false, private: false, access: { has: obj => "getAppState" in obj, get: obj => obj.getAppState }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getAppsService_decorators, { kind: "method", name: "getAppsService", static: false, private: false, access: { has: obj => "getAppsService" in obj, get: obj => obj.getAppsService }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getUnitConverter_decorators, { kind: "method", name: "getUnitConverter", static: false, private: false, access: { has: obj => "getUnitConverter" in obj, get: obj => obj.getUnitConverter }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __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);
             RouteListService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -315,7 +320,8 @@ let RouteListService = (() => {
                 routes.sort((a, b) => a.title > b.title ? 1 : -1);
                 const units = this.getUnitConverter().getDefaultUnits();
                 if (!filters) {
-                    return { routes, filters, observer: this.observer, units };
+                    const cards = routes.map(r => this.getCard(r.id));
+                    return { routes, cards, filters, observer: this.observer, units };
                 }
                 if (!filters.includeDeleted)
                     routes = routes.filter(r => !r?.isDeleted);
@@ -488,6 +494,9 @@ let RouteListService = (() => {
             }
         }
         preload() {
+            if (this.preloadObserver) {
+                return this.preloadObserver;
+            }
             try {
                 this.logEvent({ message: 'preload route list' });
                 if (!this.isStillLoading()) {
@@ -498,23 +507,26 @@ let RouteListService = (() => {
                         this.initialized = true;
                         this.logEvent({ message: 'preload route list completed' });
                         this.updateRepoStats();
-                        this.emitLists('loaded', { log: true });
-                        process.nextTick(() => { delete this.preloadObserver; });
+                        sleep(0).then(() => {
+                            delete this.preloadObserver;
+                            this.emit('load-done');
+                            this.emitLists('loaded', { log: true });
+                        });
                     })
                         .catch((err) => {
                         this.logError(err, 'preload');
                         this.preloadObserver?.stop();
-                        process.nextTick(() => { delete this.preloadObserver; });
-                    })
-                        .finally(() => {
-                        this.emit('load-done');
+                        sleep(0).then(() => {
+                            delete this.preloadObserver;
+                            this.emit('load-done');
+                        });
                     });
                 }
             }
             catch (err) {
                 this.logError(err, 'preload');
                 this.preloadObserver?.stop();
-                process.nextTick(() => { delete this.preloadObserver; });
+                sleep(0).then(() => { delete this.preloadObserver; });
             }
             return this.preloadObserver;
         }
@@ -774,8 +786,9 @@ let RouteListService = (() => {
         }
         addRoute(route, source = 'system') {
             this.routes.push(route);
-            if (route.description?.isDeleted)
+            if (route.description?.isDeleted) {
                 return;
+            }
             if (!route.description?.isDeleted) {
                 if (source === 'user') {
                     this.logEvent({ message: 'route added', route: route.description.title, source: route.description.source });
@@ -839,8 +852,9 @@ let RouteListService = (() => {
                     .catch(() => {
                 });
             };
+            const maxPreload = this.isMobile() ? PRELOAD_MOBILE : PRELOAD_DESKTOP;
             cards.forEach(card => {
-                if (!card || promises.length > 19)
+                if (!card || promises.length > maxPreload)
                     return;
                 if (!card.getRouteData()) {
                     promises.push(loadDetails(card));
@@ -971,6 +985,7 @@ let RouteListService = (() => {
                 const update = this.update.bind(this);
                 observer.on('route.added', add);
                 observer.on('route.updated', update);
+                observer.on('loaded', done);
                 observer.on('done', done);
             });
         }
@@ -1250,6 +1265,14 @@ let RouteListService = (() => {
                 }
             }
         }
+        isMobile() {
+            const { appInfo } = this.getBindings();
+            if (!appInfo) {
+                return false;
+            }
+            const channel = appInfo?.getChannel();
+            return channel === 'mobile';
+        }
         getUserSettings() {
             return useUserSettings();
         }
@@ -1265,6 +1288,9 @@ let RouteListService = (() => {
         getUnitConverter() {
             return useUnitConverter();
         }
+        getBindings() {
+            return getBindings();
+        }
         reset() {
             super.reset();
             if (this.syncInfo?.iv) {

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

@@ -91,13 +91,13 @@ let RoutesPageService = (() => {
                         if (this.serviceState.observer) {
                             this.startEventListener();
                         }
+                        sleep(5).then(() => {
+                            this.updatePageDisplay();
+                        });
                     };
                     if (service.isStillLoading()) {
                         service.once('load-done', () => {
                             start();
-                            sleep(5).then(() => {
-                                this.updatePageDisplay();
-                            });
                         });
                     }
                     else {

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

@@ -151,11 +151,13 @@ export declare class RouteListService extends IncyclistService implements IRoute
     protected getAllSearchCards(): RouteCard[];
     protected handleConfigChanges(): void;
     protected onRouteStatsUpdate(stats: ActiveRideCount[]): void;
+    protected isMobile(): boolean;
     protected getUserSettings(): import("../../settings").UserSettingsService;
     protected getRouteSyncFactory(): RouteSyncFactory;
     protected getAppState(): import("../../appstate").AppStateService;
-    getAppsService(): import("../../apps").AppsService;
-    getUnitConverter(): import("../../i18n").UnitConverterService;
+    protected getAppsService(): import("../../apps").AppsService;
+    protected getUnitConverter(): import("../../i18n").UnitConverterService;
+    protected getBindings(): import("../../api").IncyclistBindings;
     reset(): void;
 }
 export declare const useRouteList: () => RouteListService;

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

@@ -1,5 +1,6 @@
 export type * from './page/types';
 export type * from './list/types';
+export type * from './list/cards/types';
 export type * from './base/api/types';
 export type * from './base/types';
 export type RouteImportStatus = 'idle' | 'parsing' | 'error' | 'success';

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.26",
+  "version": "1.7.28",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },
   "dependencies": {
-    "axios": "^1.13.5",
-    "incyclist-devices": "^3.0.9",
+    "axios": "^1.13.6",
+    "incyclist-devices": "^3.0.10",
     "promise.any": "^2.0.6",
     "semver": "^7.7.4",
     "tcx-builder": "^1.1.1",
@@ -17,13 +17,13 @@
     "@serialport/binding-mock": "^10.2.2",
     "@serialport/bindings-interface": "^1.2.2",
     "@types/jest": "^30.0.0",
-    "@types/node": "^25.3.0",
-    "@typescript-eslint/eslint-plugin": "^8.56.0",
-    "@typescript-eslint/parser": "^8.56.0",
+    "@types/node": "^25.5.0",
+    "@typescript-eslint/eslint-plugin": "^8.57.0",
+    "@typescript-eslint/parser": "^8.57.0",
     "dotenv": "^17.3.1",
-    "eslint": "^10.0.1",
+    "eslint": "^10.0.3",
     "formdata-node": "^6.0.3",
-    "jest": "^30.2.0",
+    "jest": "^30.3.0",
     "jsdoc": "^4.0.5",
     "ts-jest": "^29.4.6",
     "typedoc": "^0.28.17",