incyclist-services 1.8.0 → 1.8.1

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

@@ -101,6 +101,7 @@ let ActivityRideService = (() => {
         isSaveDone;
         isDonateShown;
         isSummaryShown;
+        stopPromise;
         statsCalculator;
         durationCalculator;
         deviceDataHandler = this.onDeviceData.bind(this);
@@ -183,6 +184,17 @@ let ActivityRideService = (() => {
             }
         }
         async stop() {
+            if (this.stopPromise !== undefined)
+                return this.stopPromise;
+            this.stopPromise = this.doStop();
+            try {
+                await this.stopPromise;
+            }
+            finally {
+                delete this.stopPromise;
+            }
+        }
+        async doStop() {
             this.stopWorker();
             if (!this.observer || !this.activity)
                 return;
@@ -206,7 +218,9 @@ let ActivityRideService = (() => {
             delete this.observer;
         }
         async cleanup() {
-            if (this.state !== 'idle' && this.state !== 'completed')
+            if (this.stopPromise !== undefined)
+                await this.stopPromise;
+            else if (this.state !== 'idle' && this.state !== 'completed')
                 await this.stop();
             delete this.activity;
         }
@@ -1161,7 +1175,7 @@ let ActivityRideService = (() => {
         getTotalDistance() {
             try {
                 const route = this.current.route;
-                if (!route)
+                if (!route || !this.activity)
                     return 0;
                 const isLoop = (0, route_1.checkIsLoop)(route);
                 const totalRouteDistance = this.current?.endPos ?? route.distance ?? route.points?.at(-1)?.routeDistance;
@@ -1181,7 +1195,7 @@ let ActivityRideService = (() => {
         getTotalElevation() {
             try {
                 const route = this.current.route;
-                if (!route)
+                if (!route || !this.activity)
                     return 0;
                 const isLoop = (0, route_1.checkIsLoop)(route);
                 const totalRouteDistance = this.current?.endPos ?? route.distance ?? route.points?.at(-1)?.routeDistance;

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

@@ -87,6 +87,8 @@ let RouteDownloadService = (() => {
             const observer = new types_1.DownloadObserver(this._download(route));
             this.downloads.push({ route, observer });
             this.emit('download-started', route, observer);
+            observer.once('done', () => { this.removeDownload(route); });
+            observer.once('error', () => { this.removeDownload(route); });
             return observer;
         }
         stopDownload(route) {
@@ -97,6 +99,12 @@ let RouteDownloadService = (() => {
             info.observer.stop();
             this.downloads.splice(idx, 1);
         }
+        removeDownload(route) {
+            const idx = this.downloads.findIndex(d => d.route.description.id === route.description.id);
+            if (idx === -1)
+                return;
+            this.downloads.splice(idx, 1);
+        }
         async deleteIncompleteFile(route, videoDir) {
             const { file } = await this.getDownloadFileName(route, videoDir);
             if (file) {

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

@@ -739,6 +739,7 @@ let RouteCard = (() => {
             try {
                 (0, service_1.getRouteList)().logEvent({ message: 'download stopped', route: this.route?.description?.title, });
                 this.getRouteDownload().stopDownload(this.route);
+                this.downloadObserver?.reset();
                 if (immediate) {
                     delete this.downloadObserver;
                 }
@@ -784,7 +785,7 @@ let RouteCard = (() => {
                 this.route.details.video.url = url;
                 this.updateRoute(this.route);
                 (0, sleep_1.sleep)(5).then(() => {
-                    this.downloadObserver.reset();
+                    this.downloadObserver?.reset();
                     delete this.downloadObserver;
                 });
                 if (this.list.getId() !== 'myRoutes') {
@@ -812,9 +813,9 @@ let RouteCard = (() => {
         async onDownloadError(err) {
             try {
                 (0, service_1.getRouteList)().logEvent({ message: 'download failed', reason: err.message, route: this.route?.description?.title });
-                this.downloadObserver.stop();
+                this.downloadObserver?.stop();
                 (0, sleep_1.sleep)(5).then(() => {
-                    this.downloadObserver.reset();
+                    this.downloadObserver?.reset();
                     delete this.downloadObserver;
                 });
             }

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

@@ -472,22 +472,37 @@ let RouteListService = (() => {
                 this.logError(err, 'stopSearch');
             }
         }
-        getFilterOptions() {
+        getFilterOptions(filters = {}) {
             let countries = [];
             let contentTypes = [];
             let routeTypes = [];
             let routeSources = [];
             try {
-                countries = this.getFilterCountries();
-                contentTypes = this.getFilterContentTypes();
-                routeTypes = this.getFilterRouteTypes();
-                routeSources = this.getFilterRouteSources();
+                countries = this.getFilterCountries(filters);
+                contentTypes = this.getFilterContentTypes(filters);
+                routeTypes = this.getFilterRouteTypes(filters);
+                routeSources = this.getFilterRouteSources(filters);
             }
             catch (err) {
                 this.logError(err, 'getFilterOption');
             }
             return { countries, contentTypes, routeTypes, routeSources };
         }
+        getRoutesForFilterOptions(filters, excludeKey) {
+            const activeFilters = { ...filters, [excludeKey]: undefined };
+            let routes = this.getAllSearchCards().map(c => c.getDisplayProperties());
+            if (!activeFilters.includeDeleted) {
+                routes = routes.filter(r => !r?.isDeleted);
+            }
+            routes = this.applyTitleFilter(activeFilters, routes);
+            routes = this.applyDistanceFilter(activeFilters, routes);
+            routes = this.applyElevationFilter(activeFilters, routes);
+            routes = this.applyCountryFilter(activeFilters, routes);
+            routes = this.applyContentTypeFilter(activeFilters, routes);
+            routes = this.applyRouteTypeFilter(activeFilters, routes);
+            routes = this.applySourceFilter(activeFilters, routes);
+            return routes;
+        }
         onResize() {
             try {
                 this.resetCards();
@@ -861,16 +876,28 @@ let RouteListService = (() => {
             this.emitLists('updated');
             return card;
         }
-        getFilterContentTypes() {
-            return ['GPX', 'Video'];
+        getFilterContentTypes(filters = {}) {
+            const options = [];
+            const routes = this.getRoutesForFilterOptions(filters, 'contentType');
+            if (routes.some(r => r.hasVideo))
+                options.push('Video');
+            if (routes.some(r => !r.hasVideo))
+                options.push('GPX');
+            return options;
         }
-        getFilterRouteTypes() {
-            return ['Loop', 'Point to Point'];
+        getFilterRouteTypes(filters = {}) {
+            const options = [];
+            const routes = this.getRoutesForFilterOptions(filters, 'routeType');
+            if (routes.some(r => r.isLoop))
+                options.push('Loop');
+            if (routes.some(r => !r.isLoop))
+                options.push('Point to Point');
+            return options;
         }
-        getFilterRouteSources() {
+        getFilterRouteSources(filters = {}) {
             const options = ['Local', 'Incyclist'];
-            this.getVisibleRoutes().forEach(r => {
-                const source = r.description.source;
+            this.getRoutesForFilterOptions(filters, 'routeSource').forEach(r => {
+                const source = r.source;
                 if (!source)
                     return;
                 const option = this.getAppsService().getName(source);
@@ -880,11 +907,11 @@ let RouteListService = (() => {
             });
             return options;
         }
-        getFilterCountries() {
+        getFilterCountries(filters = {}) {
             try {
                 const countries = [];
-                this.getVisibleRoutes().forEach(r => {
-                    const iso = r.description.country;
+                this.getRoutesForFilterOptions(filters, 'country').forEach(r => {
+                    const iso = r.country;
                     let country = 'Unknown';
                     if (iso)
                         country = (0, countries_1.getCountries)().getCountryFromIso(iso);

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

@@ -95,6 +95,7 @@ let ActivityRideService = (() => {
         isSaveDone;
         isDonateShown;
         isSummaryShown;
+        stopPromise;
         statsCalculator;
         durationCalculator;
         deviceDataHandler = this.onDeviceData.bind(this);
@@ -177,6 +178,17 @@ let ActivityRideService = (() => {
             }
         }
         async stop() {
+            if (this.stopPromise !== undefined)
+                return this.stopPromise;
+            this.stopPromise = this.doStop();
+            try {
+                await this.stopPromise;
+            }
+            finally {
+                delete this.stopPromise;
+            }
+        }
+        async doStop() {
             this.stopWorker();
             if (!this.observer || !this.activity)
                 return;
@@ -200,7 +212,9 @@ let ActivityRideService = (() => {
             delete this.observer;
         }
         async cleanup() {
-            if (this.state !== 'idle' && this.state !== 'completed')
+            if (this.stopPromise !== undefined)
+                await this.stopPromise;
+            else if (this.state !== 'idle' && this.state !== 'completed')
                 await this.stop();
             delete this.activity;
         }
@@ -1155,7 +1169,7 @@ let ActivityRideService = (() => {
         getTotalDistance() {
             try {
                 const route = this.current.route;
-                if (!route)
+                if (!route || !this.activity)
                     return 0;
                 const isLoop = checkIsLoop(route);
                 const totalRouteDistance = this.current?.endPos ?? route.distance ?? route.points?.at(-1)?.routeDistance;
@@ -1175,7 +1189,7 @@ let ActivityRideService = (() => {
         getTotalElevation() {
             try {
                 const route = this.current.route;
-                if (!route)
+                if (!route || !this.activity)
                     return 0;
                 const isLoop = checkIsLoop(route);
                 const totalRouteDistance = this.current?.endPos ?? route.distance ?? route.points?.at(-1)?.routeDistance;

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

@@ -84,6 +84,8 @@ let RouteDownloadService = (() => {
             const observer = new DownloadObserver(this._download(route));
             this.downloads.push({ route, observer });
             this.emit('download-started', route, observer);
+            observer.once('done', () => { this.removeDownload(route); });
+            observer.once('error', () => { this.removeDownload(route); });
             return observer;
         }
         stopDownload(route) {
@@ -94,6 +96,12 @@ let RouteDownloadService = (() => {
             info.observer.stop();
             this.downloads.splice(idx, 1);
         }
+        removeDownload(route) {
+            const idx = this.downloads.findIndex(d => d.route.description.id === route.description.id);
+            if (idx === -1)
+                return;
+            this.downloads.splice(idx, 1);
+        }
         async deleteIncompleteFile(route, videoDir) {
             const { file } = await this.getDownloadFileName(route, videoDir);
             if (file) {

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

@@ -736,6 +736,7 @@ let RouteCard = (() => {
             try {
                 getRouteList().logEvent({ message: 'download stopped', route: this.route?.description?.title, });
                 this.getRouteDownload().stopDownload(this.route);
+                this.downloadObserver?.reset();
                 if (immediate) {
                     delete this.downloadObserver;
                 }
@@ -781,7 +782,7 @@ let RouteCard = (() => {
                 this.route.details.video.url = url;
                 this.updateRoute(this.route);
                 sleep(5).then(() => {
-                    this.downloadObserver.reset();
+                    this.downloadObserver?.reset();
                     delete this.downloadObserver;
                 });
                 if (this.list.getId() !== 'myRoutes') {
@@ -809,9 +810,9 @@ let RouteCard = (() => {
         async onDownloadError(err) {
             try {
                 getRouteList().logEvent({ message: 'download failed', reason: err.message, route: this.route?.description?.title });
-                this.downloadObserver.stop();
+                this.downloadObserver?.stop();
                 sleep(5).then(() => {
-                    this.downloadObserver.reset();
+                    this.downloadObserver?.reset();
                     delete this.downloadObserver;
                 });
             }

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

@@ -466,22 +466,37 @@ let RouteListService = (() => {
                 this.logError(err, 'stopSearch');
             }
         }
-        getFilterOptions() {
+        getFilterOptions(filters = {}) {
             let countries = [];
             let contentTypes = [];
             let routeTypes = [];
             let routeSources = [];
             try {
-                countries = this.getFilterCountries();
-                contentTypes = this.getFilterContentTypes();
-                routeTypes = this.getFilterRouteTypes();
-                routeSources = this.getFilterRouteSources();
+                countries = this.getFilterCountries(filters);
+                contentTypes = this.getFilterContentTypes(filters);
+                routeTypes = this.getFilterRouteTypes(filters);
+                routeSources = this.getFilterRouteSources(filters);
             }
             catch (err) {
                 this.logError(err, 'getFilterOption');
             }
             return { countries, contentTypes, routeTypes, routeSources };
         }
+        getRoutesForFilterOptions(filters, excludeKey) {
+            const activeFilters = { ...filters, [excludeKey]: undefined };
+            let routes = this.getAllSearchCards().map(c => c.getDisplayProperties());
+            if (!activeFilters.includeDeleted) {
+                routes = routes.filter(r => !r?.isDeleted);
+            }
+            routes = this.applyTitleFilter(activeFilters, routes);
+            routes = this.applyDistanceFilter(activeFilters, routes);
+            routes = this.applyElevationFilter(activeFilters, routes);
+            routes = this.applyCountryFilter(activeFilters, routes);
+            routes = this.applyContentTypeFilter(activeFilters, routes);
+            routes = this.applyRouteTypeFilter(activeFilters, routes);
+            routes = this.applySourceFilter(activeFilters, routes);
+            return routes;
+        }
         onResize() {
             try {
                 this.resetCards();
@@ -855,16 +870,28 @@ let RouteListService = (() => {
             this.emitLists('updated');
             return card;
         }
-        getFilterContentTypes() {
-            return ['GPX', 'Video'];
+        getFilterContentTypes(filters = {}) {
+            const options = [];
+            const routes = this.getRoutesForFilterOptions(filters, 'contentType');
+            if (routes.some(r => r.hasVideo))
+                options.push('Video');
+            if (routes.some(r => !r.hasVideo))
+                options.push('GPX');
+            return options;
         }
-        getFilterRouteTypes() {
-            return ['Loop', 'Point to Point'];
+        getFilterRouteTypes(filters = {}) {
+            const options = [];
+            const routes = this.getRoutesForFilterOptions(filters, 'routeType');
+            if (routes.some(r => r.isLoop))
+                options.push('Loop');
+            if (routes.some(r => !r.isLoop))
+                options.push('Point to Point');
+            return options;
         }
-        getFilterRouteSources() {
+        getFilterRouteSources(filters = {}) {
             const options = ['Local', 'Incyclist'];
-            this.getVisibleRoutes().forEach(r => {
-                const source = r.description.source;
+            this.getRoutesForFilterOptions(filters, 'routeSource').forEach(r => {
+                const source = r.source;
                 if (!source)
                     return;
                 const option = this.getAppsService().getName(source);
@@ -874,11 +901,11 @@ let RouteListService = (() => {
             });
             return options;
         }
-        getFilterCountries() {
+        getFilterCountries(filters = {}) {
             try {
                 const countries = [];
-                this.getVisibleRoutes().forEach(r => {
-                    const iso = r.description.country;
+                this.getRoutesForFilterOptions(filters, 'country').forEach(r => {
+                    const iso = r.country;
                     let country = 'Unknown';
                     if (iso)
                         country = getCountries().getCountryFromIso(iso);

package/lib/types/activities/ride/service.d.ts

@@ -32,6 +32,7 @@ export declare class ActivityRideService extends IncyclistService {
     protected isSaveDone: boolean;
     protected isDonateShown: boolean;
     protected isSummaryShown: boolean;
+    protected stopPromise: Promise<void>;
     protected statsCalculator: ActivityStatsCalculator;
     protected durationCalculator: ActivityDuration;
     protected deviceDataHandler: any;
@@ -63,6 +64,7 @@ export declare class ActivityRideService extends IncyclistService {
     init(id?: string): Observer;
     start(): void;
     stop(): Promise<void>;
+    protected doStop(): Promise<void>;
     cleanup(): Promise<void>;
     pause(autoResume?: boolean): void;
     resume(requester?: 'user' | 'system'): void;

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

@@ -18,6 +18,7 @@ export declare class RouteDownloadService extends IncyclistService {
     }>;
     download(route: Route): DownloadObserver;
     stopDownload(route: Route): void;
+    protected removeDownload(route: Route): void;
     protected deleteIncompleteFile(route: Route, videoDir: string): Promise<void>;
     protected getObserver(route: Route): DownloadObserver;
     protected _download(route: Route): Promise<void>;

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

@@ -93,7 +93,8 @@ export declare class RouteListService extends IncyclistService implements IRoute
     private applyDistanceFilter;
     private applyTitleFilter;
     stopSearch(): void;
-    getFilterOptions(): SearchFilterOptions;
+    getFilterOptions(filters?: SearchFilter): SearchFilterOptions;
+    private getRoutesForFilterOptions;
     onResize(): void;
     onCarouselInitialized(list: CardList<Route>, item: any, itemsInSlide: any): void;
     onCarouselUpdated(list: any): void;
@@ -133,10 +134,10 @@ export declare class RouteListService extends IncyclistService implements IRoute
     getCard(id: string): RouteCard;
     addCardAgain(card: RouteCard): void;
     protected addImportCard(file: FileInfo): ActiveImportCard;
-    protected getFilterContentTypes(): Array<string>;
-    protected getFilterRouteTypes(): Array<string>;
-    protected getFilterRouteSources(): Array<string>;
-    protected getFilterCountries(): Array<string>;
+    protected getFilterContentTypes(filters?: SearchFilter): Array<string>;
+    protected getFilterRouteTypes(filters?: SearchFilter): Array<string>;
+    protected getFilterRouteSources(filters?: SearchFilter): Array<string>;
+    protected getFilterCountries(filters?: SearchFilter): Array<string>;
     existsBySourceUri(uri: string): boolean;
     getBySourceUri(uri: string): Route;
     addRoute(route: Route, source?: 'user' | 'system' | 'import'): void;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "incyclist-services",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },
   "dependencies": {
     "@garmin/fitsdk": "^21.213.0",
     "axios": "^1.19.0",
-    "incyclist-devices": "^3.0.37",
+    "incyclist-devices": "^3.0.38",
     "promise.any": "^2.0.6",
     "semver": "^7.7.4",
     "tcx-builder": "^1.1.1",
@@ -21,14 +21,14 @@
     "@types/jest": "^30.0.0",
     "@types/node": "^26.2.0",
     "@typescript-eslint/eslint-plugin": "^8.65.0",
-    "@typescript-eslint/parser": "^8.67.0",
+    "@typescript-eslint/parser": "^8.69.0",
     "dotenv": "^17.4.2",
     "eslint": "^10.9.1",
     "formdata-node": "^6.0.3",
-    "globals": "^17.9.0",
+    "globals": "^17.12.0",
     "jest": "^30.5.0",
     "jsdoc": "^4.0.5",
-    "ts-jest": "^29.4.9",
+    "ts-jest": "^29.4.12",
     "typedoc": "^0.28.20",
     "typedoc-plugin-markdown": "^4.12.0",
     "typedoc-plugin-no-inherit": "^1.6.1",