incyclist-services 1.3.27 → 1.3.29

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

@@ -157,7 +157,7 @@ export declare class ActivityRideService extends IncyclistService {
     protected getTotalElevation(): number;
     protected update(): void;
     protected createFreeRide(settings: FreeRideStartSettings): Route;
-    protected getMode(routeType: ActivityRouteType): "video" | "follow route" | "free ride";
+    protected getMode(routeType: ActivityRouteType): "video" | "free ride" | "follow route";
     protected updateActivityTime(): void;
     getRideProps(): any;
     protected logActivityUpdateMessage(): void;

package/lib/routes/base/api/index.d.ts

@@ -18,4 +18,5 @@ export default class IncyclistRoutesApi {
     getRoutePreview(routeId: string): Promise<string>;
     reload(): Promise<void>;
     protected _get(url: string, ...args: any[]): Promise<import("axios").AxiosResponse<any, any>>;
+    protected _reset(): void;
 }

package/lib/routes/base/api/index.js

@@ -111,5 +111,8 @@ class IncyclistRoutesApi {
             return yield api.get(baseUrl + url, ...args);
         });
     }
+    _reset() {
+        IncyclistRoutesApi._instance = undefined;
+    }
 }
 exports.default = IncyclistRoutesApi;

package/lib/routes/list/loaders/api.e2e.test copy.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/routes/list/loaders/api.e2e.test copy.js

@@ -0,0 +1,69 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const api_1 = __importDefault(require("../../base/api"));
+const consts_1 = require("../../base/api/consts");
+const api_2 = require("./api");
+const service_1 = require("../service");
+const utils_1 = require("../../../utils");
+describe('RouteApiLoader', () => {
+    describe('load', () => {
+        test('e2e test - should only be executed manually', () => __awaiter(void 0, void 0, void 0, function* () {
+            var _a;
+            const api = api_1.default.getInstance();
+            api['getBaseUrl'] = jest.fn().mockReturnValue(consts_1.DEFAULT_ROUTE_API);
+            const list = new service_1.RouteListService();
+            list.createPreview = jest.fn().mockResolvedValue(true);
+            const loader = new api_2.RoutesApiLoader();
+            const routes = [];
+            const run = () => new Promise(done => {
+                let added = 0;
+                let updated = 0;
+                const observer = loader.load();
+                observer.on('route.added', route => {
+                    routes.push(route);
+                    added++;
+                });
+                observer.on('route.updated', route => {
+                    updated++;
+                });
+                observer.on('done', () => __awaiter(void 0, void 0, void 0, function* () {
+                    console.log('added:', added);
+                    console.log('updated:', updated);
+                    yield (0, utils_1.waitNextTick)();
+                    done({ added, updated });
+                }));
+            });
+            const run1 = yield run();
+            console.log(run1);
+            expect(routes.length).toBe(14);
+            expect(run1.updated).toBe(6);
+            const existing = Array.from(routes);
+            api['getRouteDescriptionFromDB'] = jest.fn((id) => existing.find(r => r.description.id === id));
+            const run2 = yield run();
+            expect(routes.length).toBe(14);
+            expect(run2.updated).toBe(0);
+            expect(run2.added).toBe(0);
+            const updateTarget = existing.find(r => { var _a; return (_a = r.description.version) !== null && _a !== void 0 ? _a : 0 > 1; });
+            if (updateTarget) {
+                const prevVersion = (_a = updateTarget.description.version) !== null && _a !== void 0 ? _a : 1;
+                updateTarget.description.version = prevVersion - 1;
+                const run3 = yield run();
+                expect(routes.length).toBe(14);
+                expect(run3.updated).toBe(1);
+                expect(run3.added).toBe(0);
+            }
+        }), 20000);
+    });
+});

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

@@ -76,6 +76,7 @@ class RoutesApiLoader extends types_1.Loader {
                 yield this.loadDetails(loadDetailRequired);
             this.loadObserver.emit('done');
             yield (0, utils_1.waitNextTick)();
+            this.loadObserver.stop();
             delete this.loadObserver;
         });
     }

package/lib/routes/list/loaders/db.d.ts

@@ -39,6 +39,5 @@ export declare class RoutesDbLoader extends DBLoader<RouteInfoDBEntry> {
     protected getRoutesRepo(): JsonRepository;
     protected getDetailsRepo(route: Route): JsonRepository;
     protected writeDetails(route: Route): Promise<void>;
-    protected deleteRoute(id: string): Promise<PromiseObserver<void>>;
-    protected _deleteRoute(id: any): Promise<void>;
+    protected deleteRouteDetails(route: Route): Promise<void>;
 }

package/lib/routes/list/loaders/db.js

@@ -46,6 +46,9 @@ var __setFunctionName = (this && this.__setFunctionName) || function (f, name, p
     if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
     return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoutesDbLoader = void 0;
 const api_1 = require("../../../api");
@@ -55,6 +58,7 @@ const LegacyDB_1 = require("./LegacyDB");
 const DBLoader_1 = require("./DBLoader");
 const utils_1 = require("../../../utils");
 const route_1 = require("../../base/utils/route");
+const clone_1 = __importDefault(require("../../../utils/clone"));
 let RoutesDbLoader = (() => {
     let _classDecorators = [types_1.Singleton];
     let _classDescriptor;
@@ -74,15 +78,20 @@ let RoutesDbLoader = (() => {
                     return JSON.stringify(json);
                 }
                 catch (_a) { } };
-                let prev;
+                const updatedDescr = this.buildRouteDBInfo(route.description);
                 const idx = this.routeDescriptions.findIndex(d => d.id === route.description.id);
-                if (idx === -1)
-                    this.routeDescriptions.push(route.description);
+                let changed = false;
+                if (idx === -1) {
+                    this.routeDescriptions.push((0, clone_1.default)(updatedDescr));
+                    changed = true;
+                }
                 else {
-                    prev = stringify(this.buildRouteDBInfo(this.routeDescriptions[idx]));
-                    this.routeDescriptions[idx] = route.description;
+                    const prev = stringify(this.routeDescriptions[idx]);
+                    const updated = stringify(updatedDescr);
+                    changed = (prev !== updated);
+                    if (changed)
+                        this.routeDescriptions[idx] = (0, clone_1.default)(updatedDescr);
                 }
-                const changed = !prev || stringify(this.buildRouteDBInfo(this.routeDescriptions[idx])) !== prev;
                 if (changed) {
                     this.isDirty = true;
                     this.write();
@@ -103,8 +112,8 @@ let RoutesDbLoader = (() => {
                     throw new Error('route not found');
                 this.routeDescriptions.splice(idx, 1);
                 this.isDirty = true;
-                this.write();
-                yield this.deleteRoute(id);
+                yield this.writeRepo();
+                yield this.deleteRouteDetails(route);
             });
         }
         getDescription(id) {
@@ -127,6 +136,7 @@ let RoutesDbLoader = (() => {
                 const save = () => __awaiter(this, void 0, void 0, function* () {
                     try {
                         yield this.routesRepo.write('db', this.routeDescriptions.map(this.buildRouteDBInfo.bind(this)));
+                        this.isDirty = false;
                     }
                     catch (err) {
                         this.logger.logEvent({ message: 'could not safe repo', error: err.message });
@@ -302,29 +312,29 @@ let RoutesDbLoader = (() => {
                 process.nextTick(() => { delete this.routesSaveObserver[id]; });
             });
         }
-        deleteRoute(id) {
+        deleteRouteDetails(route) {
             return __awaiter(this, void 0, void 0, function* () {
-                if (!this.routesRepo)
+                const repo = this.getDetailsRepo(route);
+                if (!repo)
                     return;
+                const id = route.description.id;
                 if (this.routesSaveObserver[id])
-                    return this.routesSaveObserver[id];
-                this.routesSaveObserver[id] = new observer_1.PromiseObserver(this._deleteRoute(id));
+                    yield this.routesSaveObserver[id].wait();
+                const _deleteRoute = (id) => __awaiter(this, void 0, void 0, function* () {
+                    yield (0, utils_1.waitNextTick)();
+                    try {
+                        yield repo.delete(id);
+                        (0, utils_1.waitNextTick)().then(() => { delete this.routesSaveObserver[id]; });
+                    }
+                    catch (err) {
+                        (0, utils_1.waitNextTick)().then(() => { delete this.routesSaveObserver[id]; });
+                        throw err;
+                    }
+                });
+                this.routesSaveObserver[id] = new observer_1.PromiseObserver(_deleteRoute(id));
                 yield this.routesSaveObserver[id].start();
             });
         }
-        _deleteRoute(id) {
-            return __awaiter(this, void 0, void 0, function* () {
-                yield (0, utils_1.waitNextTick)();
-                try {
-                    yield this.routesRepo.delete(id);
-                    (0, utils_1.waitNextTick)().then(() => { delete this.routesSaveObserver[id]; });
-                }
-                catch (err) {
-                    (0, utils_1.waitNextTick)().then(() => { delete this.routesSaveObserver[id]; });
-                    throw err;
-                }
-            });
-        }
     };
     __setFunctionName(_classThis, "RoutesDbLoader");
     (() => {

package/lib/routes/list/loaders/db_new.d.ts

@@ -0,0 +1,44 @@
+import { JsonRepository } from "../../../api";
+import { Observer, PromiseObserver } from "../../../base/types/observer";
+import { Route } from "../../base/model/route";
+import { RouteInfo } from "../../base/types";
+import { RoutesLegacyDbLoader } from "./LegacyDB";
+import { RouteInfoDBEntry } from "./types";
+import { DBLoader } from "./DBLoader";
+import { RouteApiDetail } from "../../base/api/types";
+export declare class RoutesDbLoader extends DBLoader<RouteInfoDBEntry> {
+    protected loadObserver: Observer;
+    protected saveObserver: PromiseObserver<void>;
+    protected videosRepo: JsonRepository;
+    protected routesRepo: JsonRepository;
+    protected routeDescriptions: Array<RouteInfoDBEntry>;
+    protected tsLastWrite: number;
+    protected isDirty: boolean;
+    protected routesSaveObserver: {
+        [index: string]: PromiseObserver<void>;
+    };
+    constructor();
+    save(route: Route, enforcedWriteDetails?: boolean): Promise<void>;
+    delete(route: Route): Promise<void>;
+    getDescription(id: string): RouteInfo;
+    getDetails(id: string): Promise<RouteApiDetail>;
+    protected writeRepo(): Promise<void>;
+    protected write(): void;
+    protected getLegacyLoader(): RoutesLegacyDbLoader;
+    protected buildRouteInfo(descr: RouteInfoDBEntry): RouteInfo;
+    protected buildRouteDBInfo(descr: RouteInfo): RouteInfoDBEntry;
+    protected loadFromLegacy(): Promise<Array<RouteInfoDBEntry>>;
+    protected loadDescriptions(): Promise<Array<RouteInfoDBEntry>>;
+    protected removeDuplicates(routes: Array<RouteInfoDBEntry>): any[];
+    protected verifyImportDate(routes: Array<RouteInfoDBEntry>): void;
+    protected loadDetailRecord(target: Route | RouteInfo): Promise<RouteApiDetail>;
+    private validateDetails;
+    private validateDescription;
+    protected loadDetails(route: Route, alreadyAdded?: boolean): Promise<void>;
+    protected getVideoRepo(): JsonRepository;
+    protected getRoutesRepo(): JsonRepository;
+    protected getDetailsRepo(route: Route): JsonRepository;
+    protected writeDetails(route: Route): Promise<void>;
+    protected deleteRoute(id: string): Promise<PromiseObserver<void>>;
+    protected _deleteRoute(id: any): Promise<void>;
+}

package/lib/routes/list/loaders/db_new.js

@@ -0,0 +1,349 @@
+"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;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __setFunctionName = (this && this.__setFunctionName) || function (f, name, prefix) {
+    if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
+    return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RoutesDbLoader = void 0;
+const api_1 = require("../../../api");
+const types_1 = require("../../../base/types");
+const observer_1 = require("../../../base/types/observer");
+const LegacyDB_1 = require("./LegacyDB");
+const DBLoader_1 = require("./DBLoader");
+const utils_1 = require("../../../utils");
+const route_1 = require("../../base/utils/route");
+const clone_1 = __importDefault(require("../../../utils/clone"));
+let RoutesDbLoader = (() => {
+    let _classDecorators = [types_1.Singleton];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = DBLoader_1.DBLoader;
+    var RoutesDbLoader = _classThis = class extends _classSuper {
+        constructor() {
+            super();
+            this.routesSaveObserver = {};
+            this.routeDescriptions = [];
+            this.isDirty = true;
+        }
+        save(route_2) {
+            return __awaiter(this, arguments, void 0, function* (route, enforcedWriteDetails = false) {
+                const stringify = (json) => { try {
+                    return JSON.stringify(json);
+                }
+                catch (_a) { } };
+                const updatedDescr = this.buildRouteDBInfo(route.description);
+                const idx = this.routeDescriptions.findIndex(d => d.id === route.description.id);
+                let changed = false;
+                if (idx === -1) {
+                    this.routeDescriptions.push((0, clone_1.default)(updatedDescr));
+                    changed = true;
+                }
+                else {
+                    const prev = stringify(this.routeDescriptions[idx]);
+                    const updated = stringify(updatedDescr);
+                    changed = (prev !== updated);
+                    if (changed)
+                        this.routeDescriptions[idx] = (0, clone_1.default)(updatedDescr);
+                }
+                if (changed) {
+                    this.isDirty = true;
+                    this.write();
+                    this.writeDetails(route);
+                }
+                else {
+                    const details = yield this.loadDetailRecord(route);
+                    if (!details || enforcedWriteDetails)
+                        this.writeDetails(route);
+                }
+            });
+        }
+        delete(route) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const id = route.description.id;
+                const idx = this.routeDescriptions.findIndex(d => d.id === id);
+                if (idx == -1)
+                    throw new Error('route not found');
+                this.routeDescriptions.splice(idx, 1);
+                this.isDirty = true;
+                this.write();
+                yield this.deleteRoute(id);
+            });
+        }
+        getDescription(id) {
+            const descr = this.routeDescriptions.find(d => d.id === id);
+            return descr;
+        }
+        getDetails(id) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const descr = this.routeDescriptions.find(d => d.id === id);
+                if (!descr)
+                    return;
+                const details = yield this.loadDetailRecord(descr);
+                return details;
+            });
+        }
+        writeRepo() {
+            return __awaiter(this, void 0, void 0, function* () {
+                if (this.saveObserver)
+                    yield this.saveObserver.wait();
+                const save = () => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        yield this.routesRepo.write('db', this.routeDescriptions.map(this.buildRouteDBInfo.bind(this)));
+                    }
+                    catch (err) {
+                        this.logger.logEvent({ message: 'could not safe repo', error: err.message });
+                    }
+                });
+                this.saveObserver = new observer_1.PromiseObserver(save());
+                yield this.saveObserver.start();
+                process.nextTick(() => { delete this.saveObserver; });
+            });
+        }
+        write() {
+            if (this.isDirty && (this.tsLastWrite === undefined || Date.now() - this.tsLastWrite >= 1000)) {
+                this.isDirty = false;
+                this.tsLastWrite = Date.now();
+                this.writeRepo();
+            }
+            if (this.isDirty && Date.now() - this.tsLastWrite < 1000) {
+                setTimeout(() => { this.write(); }, this.tsLastWrite + 1000 - Date.now());
+            }
+        }
+        getLegacyLoader() {
+            return new LegacyDB_1.RoutesLegacyDbLoader();
+        }
+        buildRouteInfo(descr) {
+            return descr;
+        }
+        buildRouteDBInfo(descr) {
+            const data = Object.assign({}, descr);
+            delete data.points;
+            return data;
+        }
+        loadFromLegacy() {
+            return __awaiter(this, void 0, void 0, function* () {
+                return new Promise(done => {
+                    const observer = this.getLegacyLoader().load();
+                    const descriptions = [];
+                    observer.on('route.added', (r) => { descriptions.push(r.description); });
+                    observer.on('done', () => done(descriptions));
+                });
+            });
+        }
+        loadDescriptions() {
+            return __awaiter(this, void 0, void 0, function* () {
+                const descriptions = yield this.getRoutesRepo().read('db');
+                if (descriptions) {
+                    const routes = descriptions;
+                    const cleaned = this.removeDuplicates(routes);
+                    return cleaned;
+                }
+                const legacy = yield this.loadFromLegacy();
+                return legacy;
+            });
+        }
+        removeDuplicates(routes) {
+            const ids = routes.map(r => r.legacyId || r.id);
+            const uniqueIds = ids.filter((d, pos) => ids.indexOf(d) === pos);
+            const cleaned = [];
+            uniqueIds.forEach(id => {
+                const routeWithLegacy = routes.find(r => r.legacyId === id);
+                const route = routeWithLegacy || routes.find(r => r.id === id);
+                if (route)
+                    cleaned.push(route);
+            });
+            return cleaned;
+        }
+        verifyImportDate(routes) {
+            let changed = false;
+            routes.forEach(r => {
+                if (!r.tsImported) {
+                    r.tsImported = Date.now();
+                    changed = true;
+                }
+            });
+            if (changed) {
+                this.isDirty = true;
+                this.write();
+            }
+        }
+        loadDetailRecord(target) {
+            return __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                const description = (target.description || target);
+                const repo = (description === null || description === void 0 ? void 0 : description.hasVideo) ? this.getVideosRepo() : this.getRoutesRepo();
+                let details;
+                try {
+                    const id = description.legacyId || description.id;
+                    details = (yield repo.read(id));
+                    description.originalName = details.title;
+                    if (description.hasVideo) {
+                        description.segments = ((_a = details.video) === null || _a === void 0 ? void 0 : _a.selectableSegments) || (details === null || details === void 0 ? void 0 : details.selectableSegments);
+                    }
+                }
+                catch (err) {
+                    this.logger.logEvent({ message: 'could not load route details', id: (description === null || description === void 0 ? void 0 : description.legacyId) || (description === null || description === void 0 ? void 0 : description.id), title: description === null || description === void 0 ? void 0 : description.title, reason: err.message, stack: err.stack });
+                    if (description.id && description.legacyId !== description.id) {
+                        try {
+                            details = (yield repo.read(description.id));
+                            description.originalName = details.title;
+                        }
+                        catch (err) {
+                            this.logger.logEvent({ message: 'could not load route details', id: (description === null || description === void 0 ? void 0 : description.legacyId) || (description === null || description === void 0 ? void 0 : description.id), title: description === null || description === void 0 ? void 0 : description.title, reason: err.message, stack: err.stack });
+                        }
+                    }
+                }
+                if (!details) {
+                    return;
+                }
+                this.validateDetails(details);
+                this.validateDescription(description, details);
+                return details;
+            });
+        }
+        validateDetails(details) {
+            if (!details.points || !Array.isArray(details.points)) {
+                details.points = details.decoded;
+                delete details.decoded;
+            }
+            if (details.localizedTitle && typeof (details.localizedTitle) === 'string') {
+                details.localizedTitle = { en: details.localizedTitle };
+            }
+            (0, route_1.validateDistance)(details.points);
+            (0, route_1.updateSlopes)(details.points);
+        }
+        validateDescription(description, details) {
+            if (!description.elevation) {
+                description.elevation = (0, route_1.getTotalElevation)(details);
+            }
+        }
+        loadDetails(route, alreadyAdded) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const details = yield this.loadDetailRecord(route);
+                (0, route_1.addDetails)(route, details);
+                this.verifyRouteHash(route);
+                if (alreadyAdded)
+                    this.emitRouteUpdate(route);
+                this.emitRouteAdded(route);
+                this.verifyCountry(route);
+            });
+        }
+        getVideoRepo() {
+            if (!this.videosRepo)
+                this.videosRepo = api_1.JsonRepository.create('videos');
+            return this.videosRepo;
+        }
+        getRoutesRepo() {
+            if (!this.routesRepo)
+                this.routesRepo = api_1.JsonRepository.create('routes');
+            return this.routesRepo;
+        }
+        getDetailsRepo(route) {
+            var _a;
+            return ((_a = route === null || route === void 0 ? void 0 : route.description) === null || _a === void 0 ? void 0 : _a.hasVideo) ? this.getVideoRepo() : this.getRoutesRepo();
+        }
+        writeDetails(route) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const repo = this.getDetailsRepo(route);
+                if (!repo) {
+                    return;
+                }
+                const id = route.description.legacyId || route.description.id;
+                if (this.routesSaveObserver[id]) {
+                    yield this.routesSaveObserver[id].wait();
+                }
+                const save = () => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        yield repo.write(id, route.details);
+                    }
+                    catch (err) {
+                    }
+                });
+                this.routesSaveObserver[id] = new observer_1.PromiseObserver(save());
+                yield this.routesSaveObserver[id].start();
+                process.nextTick(() => { delete this.routesSaveObserver[id]; });
+            });
+        }
+        deleteRoute(id) {
+            return __awaiter(this, void 0, void 0, function* () {
+                if (!this.routesRepo)
+                    return;
+                if (this.routesSaveObserver[id])
+                    return this.routesSaveObserver[id];
+                this.routesSaveObserver[id] = new observer_1.PromiseObserver(this._deleteRoute(id));
+                yield this.routesSaveObserver[id].start();
+            });
+        }
+        _deleteRoute(id) {
+            return __awaiter(this, void 0, void 0, function* () {
+                yield (0, utils_1.waitNextTick)();
+                try {
+                    yield this.routesRepo.delete(id);
+                    (0, utils_1.waitNextTick)().then(() => { delete this.routesSaveObserver[id]; });
+                }
+                catch (err) {
+                    (0, utils_1.waitNextTick)().then(() => { delete this.routesSaveObserver[id]; });
+                    throw err;
+                }
+            });
+        }
+    };
+    __setFunctionName(_classThis, "RoutesDbLoader");
+    (() => {
+        var _a;
+        const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create((_a = _classSuper[Symbol.metadata]) !== null && _a !== void 0 ? _a : null) : void 0;
+        __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+        RoutesDbLoader = _classThis = _classDescriptor.value;
+        if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        __runInitializers(_classThis, _classExtraInitializers);
+    })();
+    return RoutesDbLoader = _classThis;
+})();
+exports.RoutesDbLoader = RoutesDbLoader;

package/lib/routes/list/loaders/db_old.d.ts

@@ -0,0 +1,44 @@
+import { JsonRepository } from "../../../api";
+import { Observer, PromiseObserver } from "../../../base/types/observer";
+import { Route } from "../../base/model/route";
+import { RouteInfo } from "../../base/types";
+import { RoutesLegacyDbLoader } from "./LegacyDB";
+import { RouteInfoDBEntry } from "./types";
+import { DBLoader } from "./DBLoader";
+import { RouteApiDetail } from "../../base/api/types";
+export declare class RoutesDbLoader extends DBLoader<RouteInfoDBEntry> {
+    protected loadObserver: Observer;
+    protected saveObserver: PromiseObserver<void>;
+    protected videosRepo: JsonRepository;
+    protected routesRepo: JsonRepository;
+    protected routeDescriptions: Array<RouteInfoDBEntry>;
+    protected tsLastWrite: number;
+    protected isDirty: boolean;
+    protected routesSaveObserver: {
+        [index: string]: PromiseObserver<void>;
+    };
+    constructor();
+    save(route: Route, enforcedWriteDetails?: boolean): Promise<void>;
+    delete(route: Route): Promise<void>;
+    getDescription(id: string): RouteInfo;
+    getDetails(id: string): Promise<RouteApiDetail>;
+    protected writeRepo(): Promise<void>;
+    protected write(): void;
+    protected getLegacyLoader(): RoutesLegacyDbLoader;
+    protected buildRouteInfo(descr: RouteInfoDBEntry): RouteInfo;
+    protected buildRouteDBInfo(descr: RouteInfo): RouteInfoDBEntry;
+    protected loadFromLegacy(): Promise<Array<RouteInfoDBEntry>>;
+    protected loadDescriptions(): Promise<Array<RouteInfoDBEntry>>;
+    protected removeDuplicates(routes: Array<RouteInfoDBEntry>): any[];
+    protected verifyImportDate(routes: Array<RouteInfoDBEntry>): void;
+    protected loadDetailRecord(target: Route | RouteInfo): Promise<RouteApiDetail>;
+    private validateDetails;
+    private validateDescription;
+    protected loadDetails(route: Route, alreadyAdded?: boolean): Promise<void>;
+    protected getVideoRepo(): JsonRepository;
+    protected getRoutesRepo(): JsonRepository;
+    protected getDetailsRepo(route: Route): JsonRepository;
+    protected writeDetails(route: Route): Promise<void>;
+    protected deleteRoute(id: string): Promise<PromiseObserver<void>>;
+    protected _deleteRoute(id: any): Promise<void>;
+}

package/lib/routes/list/loaders/db_old.js

@@ -0,0 +1,340 @@
+"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;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __setFunctionName = (this && this.__setFunctionName) || function (f, name, prefix) {
+    if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
+    return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RoutesDbLoader = void 0;
+const api_1 = require("../../../api");
+const types_1 = require("../../../base/types");
+const observer_1 = require("../../../base/types/observer");
+const LegacyDB_1 = require("./LegacyDB");
+const DBLoader_1 = require("./DBLoader");
+const utils_1 = require("../../../utils");
+const route_1 = require("../../base/utils/route");
+let RoutesDbLoader = (() => {
+    let _classDecorators = [types_1.Singleton];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = DBLoader_1.DBLoader;
+    var RoutesDbLoader = _classThis = class extends _classSuper {
+        constructor() {
+            super();
+            this.routesSaveObserver = {};
+            this.routeDescriptions = [];
+            this.isDirty = true;
+        }
+        save(route_2) {
+            return __awaiter(this, arguments, void 0, function* (route, enforcedWriteDetails = false) {
+                const stringify = (json) => { try {
+                    return JSON.stringify(json);
+                }
+                catch (_a) { } };
+                let prev;
+                const idx = this.routeDescriptions.findIndex(d => d.id === route.description.id);
+                if (idx === -1)
+                    this.routeDescriptions.push(route.description);
+                else {
+                    prev = stringify(this.buildRouteDBInfo(this.routeDescriptions[idx]));
+                    this.routeDescriptions[idx] = route.description;
+                }
+                const changed = !prev || stringify(this.buildRouteDBInfo(this.routeDescriptions[idx])) !== prev;
+                if (changed) {
+                    this.isDirty = true;
+                    this.write();
+                    this.writeDetails(route);
+                }
+                else {
+                    const details = yield this.loadDetailRecord(route);
+                    if (!details || enforcedWriteDetails)
+                        this.writeDetails(route);
+                }
+            });
+        }
+        delete(route) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const id = route.description.id;
+                const idx = this.routeDescriptions.findIndex(d => d.id === id);
+                if (idx == -1)
+                    throw new Error('route not found');
+                this.routeDescriptions.splice(idx, 1);
+                this.isDirty = true;
+                this.write();
+                yield this.deleteRoute(id);
+            });
+        }
+        getDescription(id) {
+            const descr = this.routeDescriptions.find(d => d.id === id);
+            return descr;
+        }
+        getDetails(id) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const descr = this.routeDescriptions.find(d => d.id === id);
+                if (!descr)
+                    return;
+                const details = yield this.loadDetailRecord(descr);
+                return details;
+            });
+        }
+        writeRepo() {
+            return __awaiter(this, void 0, void 0, function* () {
+                if (this.saveObserver)
+                    yield this.saveObserver.wait();
+                const save = () => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        yield this.routesRepo.write('db', this.routeDescriptions.map(this.buildRouteDBInfo.bind(this)));
+                    }
+                    catch (err) {
+                        this.logger.logEvent({ message: 'could not safe repo', error: err.message });
+                    }
+                });
+                this.saveObserver = new observer_1.PromiseObserver(save());
+                yield this.saveObserver.start();
+                process.nextTick(() => { delete this.saveObserver; });
+            });
+        }
+        write() {
+            if (this.isDirty && (this.tsLastWrite === undefined || Date.now() - this.tsLastWrite >= 1000)) {
+                this.isDirty = false;
+                this.tsLastWrite = Date.now();
+                this.writeRepo();
+            }
+            if (this.isDirty && Date.now() - this.tsLastWrite < 1000) {
+                setTimeout(() => { this.write(); }, this.tsLastWrite + 1000 - Date.now());
+            }
+        }
+        getLegacyLoader() {
+            return new LegacyDB_1.RoutesLegacyDbLoader();
+        }
+        buildRouteInfo(descr) {
+            return descr;
+        }
+        buildRouteDBInfo(descr) {
+            const data = Object.assign({}, descr);
+            delete data.points;
+            return data;
+        }
+        loadFromLegacy() {
+            return __awaiter(this, void 0, void 0, function* () {
+                return new Promise(done => {
+                    const observer = this.getLegacyLoader().load();
+                    const descriptions = [];
+                    observer.on('route.added', (r) => { descriptions.push(r.description); });
+                    observer.on('done', () => done(descriptions));
+                });
+            });
+        }
+        loadDescriptions() {
+            return __awaiter(this, void 0, void 0, function* () {
+                const descriptions = yield this.getRoutesRepo().read('db');
+                if (descriptions) {
+                    const routes = descriptions;
+                    const cleaned = this.removeDuplicates(routes);
+                    return cleaned;
+                }
+                const legacy = yield this.loadFromLegacy();
+                return legacy;
+            });
+        }
+        removeDuplicates(routes) {
+            const ids = routes.map(r => r.legacyId || r.id);
+            const uniqueIds = ids.filter((d, pos) => ids.indexOf(d) === pos);
+            const cleaned = [];
+            uniqueIds.forEach(id => {
+                const routeWithLegacy = routes.find(r => r.legacyId === id);
+                const route = routeWithLegacy || routes.find(r => r.id === id);
+                if (route)
+                    cleaned.push(route);
+            });
+            return cleaned;
+        }
+        verifyImportDate(routes) {
+            let changed = false;
+            routes.forEach(r => {
+                if (!r.tsImported) {
+                    r.tsImported = Date.now();
+                    changed = true;
+                }
+            });
+            if (changed) {
+                this.isDirty = true;
+                this.write();
+            }
+        }
+        loadDetailRecord(target) {
+            return __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                const description = (target.description || target);
+                const repo = (description === null || description === void 0 ? void 0 : description.hasVideo) ? this.getVideosRepo() : this.getRoutesRepo();
+                let details;
+                try {
+                    const id = description.legacyId || description.id;
+                    details = (yield repo.read(id));
+                    description.originalName = details.title;
+                    if (description.hasVideo) {
+                        description.segments = ((_a = details.video) === null || _a === void 0 ? void 0 : _a.selectableSegments) || (details === null || details === void 0 ? void 0 : details.selectableSegments);
+                    }
+                }
+                catch (err) {
+                    this.logger.logEvent({ message: 'could not load route details', id: (description === null || description === void 0 ? void 0 : description.legacyId) || (description === null || description === void 0 ? void 0 : description.id), title: description === null || description === void 0 ? void 0 : description.title, reason: err.message, stack: err.stack });
+                    if (description.id && description.legacyId !== description.id) {
+                        try {
+                            details = (yield repo.read(description.id));
+                            description.originalName = details.title;
+                        }
+                        catch (err) {
+                            this.logger.logEvent({ message: 'could not load route details', id: (description === null || description === void 0 ? void 0 : description.legacyId) || (description === null || description === void 0 ? void 0 : description.id), title: description === null || description === void 0 ? void 0 : description.title, reason: err.message, stack: err.stack });
+                        }
+                    }
+                }
+                if (!details) {
+                    return;
+                }
+                this.validateDetails(details);
+                this.validateDescription(description, details);
+                return details;
+            });
+        }
+        validateDetails(details) {
+            if (!details.points || !Array.isArray(details.points)) {
+                details.points = details.decoded;
+                delete details.decoded;
+            }
+            if (details.localizedTitle && typeof (details.localizedTitle) === 'string') {
+                details.localizedTitle = { en: details.localizedTitle };
+            }
+            (0, route_1.validateDistance)(details.points);
+            (0, route_1.updateSlopes)(details.points);
+        }
+        validateDescription(description, details) {
+            if (!description.elevation) {
+                description.elevation = (0, route_1.getTotalElevation)(details);
+            }
+        }
+        loadDetails(route, alreadyAdded) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const details = yield this.loadDetailRecord(route);
+                (0, route_1.addDetails)(route, details);
+                this.verifyRouteHash(route);
+                if (alreadyAdded)
+                    this.emitRouteUpdate(route);
+                this.emitRouteAdded(route);
+                this.verifyCountry(route);
+            });
+        }
+        getVideoRepo() {
+            if (!this.videosRepo)
+                this.videosRepo = api_1.JsonRepository.create('videos');
+            return this.videosRepo;
+        }
+        getRoutesRepo() {
+            if (!this.routesRepo)
+                this.routesRepo = api_1.JsonRepository.create('routes');
+            return this.routesRepo;
+        }
+        getDetailsRepo(route) {
+            var _a;
+            return ((_a = route === null || route === void 0 ? void 0 : route.description) === null || _a === void 0 ? void 0 : _a.hasVideo) ? this.getVideoRepo() : this.getRoutesRepo();
+        }
+        writeDetails(route) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const repo = this.getDetailsRepo(route);
+                if (!repo) {
+                    return;
+                }
+                const id = route.description.legacyId || route.description.id;
+                if (this.routesSaveObserver[id]) {
+                    yield this.routesSaveObserver[id].wait();
+                }
+                const save = () => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        yield repo.write(id, route.details);
+                    }
+                    catch (err) {
+                    }
+                });
+                this.routesSaveObserver[id] = new observer_1.PromiseObserver(save());
+                yield this.routesSaveObserver[id].start();
+                process.nextTick(() => { delete this.routesSaveObserver[id]; });
+            });
+        }
+        deleteRoute(id) {
+            return __awaiter(this, void 0, void 0, function* () {
+                if (!this.routesRepo)
+                    return;
+                if (this.routesSaveObserver[id])
+                    return this.routesSaveObserver[id];
+                this.routesSaveObserver[id] = new observer_1.PromiseObserver(this._deleteRoute(id));
+                yield this.routesSaveObserver[id].start();
+            });
+        }
+        _deleteRoute(id) {
+            return __awaiter(this, void 0, void 0, function* () {
+                yield (0, utils_1.waitNextTick)();
+                try {
+                    yield this.routesRepo.delete(id);
+                    (0, utils_1.waitNextTick)().then(() => { delete this.routesSaveObserver[id]; });
+                }
+                catch (err) {
+                    (0, utils_1.waitNextTick)().then(() => { delete this.routesSaveObserver[id]; });
+                    throw err;
+                }
+            });
+        }
+    };
+    __setFunctionName(_classThis, "RoutesDbLoader");
+    (() => {
+        var _a;
+        const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create((_a = _classSuper[Symbol.metadata]) !== null && _a !== void 0 ? _a : null) : void 0;
+        __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+        RoutesDbLoader = _classThis = _classDescriptor.value;
+        if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        __runInitializers(_classThis, _classExtraInitializers);
+    })();
+    return RoutesDbLoader = _classThis;
+})();
+exports.RoutesDbLoader = RoutesDbLoader;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.3.27",
+  "version": "1.3.29",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },