incyclist-services 1.1.89 → 1.1.91

package/lib/__tests__/utils/loadFile.js

@@ -17,7 +17,7 @@ const fs_1 = __importDefault(require("fs"));
 function loadFile(type, fileName) {
     return __awaiter(this, void 0, void 0, function* () {
         return new Promise((resolve, reject) => {
-            fs_1.default.readFile(fileName, type, (err, data) => {
+            fs_1.default.readFile(fileName, { encoding: type }, (err, data) => {
                 if (err)
                     return reject(err);
                 return resolve(data);

package/lib/base/cardlist/index.d.ts

@@ -1,7 +1,6 @@
 import { PromiseObserver } from "../types/observer";
 export interface Card<T> {
     getId(): string;
-    getState(): any;
     getData(): T;
     setData(data: T): any;
     getCardType(): any;

package/lib/base/types/index.d.ts

@@ -1 +1,2 @@
 export * from "./singleton";
+export * from './lists';

package/lib/base/types/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./singleton"), exports);
+__exportStar(require("./lists"), exports);

package/lib/base/types/lists.d.ts

@@ -0,0 +1,14 @@
+import { CardList } from "../cardlist";
+import { Observer } from "./observer";
+export interface IListService<T> {
+    close(): void;
+    getLists(): Array<CardList<T>>;
+}
+export type ListEvent = 'started' | 'stopped' | 'loaded' | 'updated' | 'selected';
+export declare class ListObserver<T> extends Observer {
+    protected service: IListService<T>;
+    constructor(service: IListService<T>);
+    stop(): void;
+    emit(event: ListEvent, ...payload: any[]): void;
+    getLists(): Array<CardList<T>>;
+}

package/lib/base/types/lists.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ListObserver = void 0;
+const observer_1 = require("./observer");
+class ListObserver extends observer_1.Observer {
+    constructor(service) {
+        super();
+        this.service = service;
+    }
+    stop() {
+        this.service.close();
+        this.emit('stopped');
+    }
+    emit(event, ...payload) {
+        this.emitter.emit(event, ...payload);
+    }
+    getLists() {
+        return this.service.getLists();
+    }
+}
+exports.ListObserver = ListObserver;

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

@@ -88,7 +88,6 @@ class IncyclistRoutesApi {
                 return (_a = res.data) === null || _a === void 0 ? void 0 : _a.url;
             }
             catch (err) {
-                this.logger.logEvent({ message: 'preview not found', routeId });
                 return undefined;
             }
         });

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

@@ -1,4 +1,4 @@
-import { DaumEpp, LocalizedText, RouteBase, RouteCategory, RouteInfoText, RoutePoint, RouteProvider, RouteType, VideoDescription } from "../types";
+import { DaumEpp, LocalizedText, RouteBase, RouteCategory, RouteInfoText, RoutePoint, RouteProvider, RouteSegment, RouteType, VideoDescription } from "../types";
 export type RouteDescriptionQuery = {
     category?: string;
     categories?: Array<string>;
@@ -24,6 +24,7 @@ export interface RouteApiDescription extends RouteBase {
     localizedTitle?: LocalizedText;
     previewUrl?: string;
     isDeleted?: boolean;
+    selectableSegments?: Array<RouteSegment>;
 }
 export type LegacyRouteGpxRepoDescription = {
     id: string;
@@ -63,9 +64,10 @@ export type RouteApiDetail = {
     video?: VideoDescription;
     epp?: DaumEpp;
     infoTexts?: Array<RouteInfoText>;
-    localizedTitle?: LocalizedText;
+    localizedTitle?: LocalizedText | string;
     previewUrl?: string;
     previewUrlLocal?: string;
     description?: LocalizedText;
     next?: string;
+    selectableSegments?: Array<RouteSegment>;
 };

package/lib/routes/base/parsers/gpx.js

@@ -138,10 +138,11 @@ class GPXParser extends xml_1.XMLParser {
             if (!route.id)
                 route.id = route.routeHash;
             const isLoop = (0, route_1.checkIsLoop)(route.points);
+            const localizedTitle = typeof (route.localizedTitle) === 'string' ? { en: route.localizedTitle } : route.localizedTitle;
             const info = {
                 id: route.id,
                 title: route.title,
-                localizedTitle: route.localizedTitle,
+                localizedTitle,
                 country: route.country,
                 distance: route.distance,
                 elevation: route.elevation,

package/lib/routes/base/parsers/xml.js

@@ -67,13 +67,16 @@ class XMLParser {
                 name = name.substring(3);
                 country = country || countryPrefix;
             }
+            let previewUrl = data['previewURL'];
+            if (previewUrl === null || previewUrl === void 0 ? void 0 : previewUrl.startsWith('https://www.reallifevideo.de/rlv.php'))
+                previewUrl = undefined;
             context.route = {
                 title: name,
                 originalName,
                 localizedTitle: data['title'] || name,
                 country: country,
                 id: data['id'],
-                previewUrl: data['previewURL'],
+                previewUrl,
                 previewUrlLocal: data['preview'],
                 distance: 0,
                 elevation: 0,
@@ -128,11 +131,12 @@ class XMLParser {
             if (!route.id)
                 route.id = (0, route_1.getRouteHash)(route);
             route.routeHash = (0, route_1.getRouteHash)(route);
+            const localizedTitle = typeof (route.localizedTitle) === 'string' ? { en: route.localizedTitle } : route.localizedTitle;
             const info = {
                 id: route.id,
                 originalName: route.originalName,
                 title: route.title,
-                localizedTitle: route.localizedTitle,
+                localizedTitle,
                 category: route.category,
                 country: route.country,
                 distance: route.distance,
@@ -291,7 +295,14 @@ const getVideoUrl = (info, route) => {
 };
 const getPreviewUrl = (info, route) => {
     const url = route === null || route === void 0 ? void 0 : route.previewUrl;
-    const file = route === null || route === void 0 ? void 0 : route.previewUrlLocal;
+    let file = route === null || route === void 0 ? void 0 : route.previewUrlLocal;
+    if (file) {
+        const path = (0, api_1.getBindings)().path;
+        const fs = (0, api_1.getBindings)().fs;
+        const filename = file.startsWith(info.ext) || file.match(/[A-Za-z]:.*/) ? file : path.join(info.dir, file);
+        if (!fs.existsSync(filename))
+            file = undefined;
+    }
     return (0, utils_1.getReferencedFileInfo)(info, { file, url }, 'file');
 };
 function createPoint(pos, altitude, prevDistance) {

package/lib/routes/base/utils/localization.js

@@ -3,7 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLocalizedData = void 0;
 const getLocalizedData = (data, language = 'en') => {
     const updated = Object.assign({}, data);
-    if (language && data.localizedTitle) {
+    let keys = [];
+    try {
+        keys = Object.keys(data.localizedTitle);
+    }
+    catch (_a) {
+    }
+    if (language && data.localizedTitle && keys.length > 0) {
         updated.title = data.localizedTitle[language];
         delete updated.localizedTitle;
     }

package/lib/routes/base/utils/route.d.ts

@@ -6,6 +6,7 @@ export declare const checkIsLoop: (_route: Route | Array<RoutePoint>) => boolean
 export declare const updateSlopes: (points: Array<RoutePoint>) => void;
 export declare const getSegments: (route: Route) => Array<RouteSegment>;
 export declare const validateRoute: (route: RouteApiDetail) => void;
+export declare const validateDistance: (points: Array<RoutePoint>) => void;
 export declare const getTotalElevation: (route: RouteApiDetail) => number;
 export declare const getTotalDistance: (route: RouteApiDetail) => number;
 export declare const getRouteHash: (route: RouteApiDetail) => string;

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPosition = exports.getNextPosition = exports.getRouteHash = exports.getTotalDistance = exports.getTotalElevation = exports.validateRoute = exports.getSegments = exports.updateSlopes = exports.checkIsLoop = void 0;
+exports.getPosition = exports.getNextPosition = exports.getRouteHash = exports.getTotalDistance = exports.getTotalElevation = exports.validateDistance = exports.validateRoute = exports.getSegments = exports.updateSlopes = exports.checkIsLoop = void 0;
 const utils_1 = require("../../../utils");
 const geo_1 = require("../../../utils/geo");
 const valid_1 = require("../../../utils/valid");
@@ -100,9 +100,25 @@ const validateRoute = (route) => {
     var _a;
     if (!((_a = route === null || route === void 0 ? void 0 : route.points) === null || _a === void 0 ? void 0 : _a.length))
         return;
+    (0, exports.validateDistance)(route.points);
     (0, exports.updateSlopes)(route.points);
 };
 exports.validateRoute = validateRoute;
+const validateDistance = (points) => {
+    let prev = undefined;
+    points.forEach((p, idx) => {
+        if (!p.routeDistance) {
+            if (idx == 0) {
+                p.routeDistance = 0;
+            }
+            else {
+                p.routeDistance = ((prev === null || prev === void 0 ? void 0 : prev.distance) || 0) + ((prev === null || prev === void 0 ? void 0 : prev.routeDistance) || 0);
+            }
+        }
+        prev = p;
+    });
+};
+exports.validateDistance = validateDistance;
 const getTotalElevation = (route) => {
     var _a;
     if (!((_a = route === null || route === void 0 ? void 0 : route.points) === null || _a === void 0 ? void 0 : _a.length))

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

@@ -152,6 +152,10 @@ class RouteCard extends base_1.BaseCard {
     getDisplayProperties() {
         try {
             const descr = this.getRouteDescription();
+            if (typeof (descr.localizedTitle) === 'string') {
+                descr.localizedTitle = { en: descr.localizedTitle };
+                this.save();
+            }
             let { points } = descr;
             if (points && !Array.isArray(points)) {
                 points = undefined;
@@ -199,7 +203,6 @@ class RouteCard extends base_1.BaseCard {
                 if (!route || (route.description.requiresDownload && !route.description.isDownloaded)) {
                     showNextOverwrite = false;
                 }
-                console.log('~~~ NEXT', route);
             }
         }
         catch (err) {
@@ -286,7 +289,6 @@ class RouteCard extends base_1.BaseCard {
     start() {
         try {
             const service = (0, service_1.getRouteList)();
-            console.log('~~~ start', this.startSettings);
             service.select(this.route);
             service.setStartSettings(Object.assign({ type: this.getCardType() }, this.startSettings));
             this.route.description.tsLastStart = Date.now();

package/lib/routes/list/cards/base.d.ts

@@ -8,7 +8,6 @@ export declare class BaseCard implements Card<Route> {
     reset(): void;
     delete(): PromiseObserver<boolean>;
     getId(): string;
-    getState(): void;
     getData(): Route;
     setData(_data: Route): void;
     getCardType(): void;

package/lib/routes/list/cards/base.js

@@ -19,9 +19,6 @@ class BaseCard {
     getId() {
         throw new Error("Method not implemented.");
     }
-    getState() {
-        throw new Error("Method not implemented.");
-    }
     getData() {
         throw new Error("Method not implemented.");
     }

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

@@ -54,6 +54,7 @@ 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;
@@ -192,6 +193,7 @@ let RoutesDbLoader = (() => {
             return cleaned;
         }
         loadDetailRecord(target) {
+            var _a;
             return __awaiter(this, void 0, void 0, function* () {
                 const description = (target.description || target);
                 const repo = (description === null || description === void 0 ? void 0 : description.hasVideo) ? this.getVideosRepo() : this.getRoutesRepo();
@@ -200,9 +202,21 @@ let RoutesDbLoader = (() => {
                     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), reason: err.message, stack: err.stack });
+                    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;
@@ -211,6 +225,14 @@ let RoutesDbLoader = (() => {
                     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);
+                if (!description.elevation) {
+                    description.elevation = (0, route_1.getTotalElevation)(details);
+                }
                 return details;
             });
         }

package/lib/routes/list/service.js

@@ -310,6 +310,10 @@ let RouteListService = (() => {
                         if (route.details)
                             return route.details;
                         route.details = yield this.db.getDetails(id);
+                        if (!route.details.video.selectableSegments && route.details.selectableSegments) {
+                            route.details.video.selectableSegments = route.details.selectableSegments;
+                            delete route.details.selectableSegments;
+                        }
                         return route.details;
                     }
                 }
@@ -361,32 +365,19 @@ let RouteListService = (() => {
                     try {
                         const { data, details } = yield parsers_1.RouteParser.parse(file);
                         const route = new route_1.Route(data, details);
+                        route.description.tsImported = Date.now();
                         const existing = this.findCard(route);
-                        let card;
                         if (existing) {
-                            if (existing.list.getId() === this.myRoutes.getId()) {
-                                card = existing.card;
-                                card.updateRoute(route);
-                                route.description.tsImported = Date.now();
-                            }
-                            else {
-                                existing.list.remove(existing.card);
-                                card = new RouteCard_1.RouteCard(route, { list: this.myRoutes });
-                                card.verify();
-                                card.save();
-                                card.enableDelete();
-                                this.myRoutes.add(card, true);
-                            }
+                            existing.list.remove(existing.card);
                         }
                         else {
-                            route.description.tsImported = Date.now();
-                            card = new RouteCard_1.RouteCard(route, { list: this.myRoutes });
-                            card.verify();
-                            card.save();
-                            card.enableDelete();
-                            this.myRoutes.add(card, true);
                             this.routes.push(route);
                         }
+                        const card = new RouteCard_1.RouteCard(route, { list: this.myRoutes });
+                        card.verify();
+                        card.save();
+                        card.enableDelete();
+                        this.myRoutes.add(card, true);
                         this.myRoutes.remove(importCard);
                         card.enableDelete(true);
                         this.emitLists('updated');
@@ -556,9 +547,10 @@ let RouteListService = (() => {
                         descr.previewUrl = previewUrl;
                         return;
                     }
+                    this.logEvent({ message: 'preview not found', title: descr.originalName || descr.title, id: descr.id });
                 }
                 catch (err) {
-                    console.log('~~~ ERR', err);
+                    this.logError(err, 'createPreview');
                 }
                 return new Promise(done => {
                     this.createPreviewQueue.push({ descr, done });

package/lib/src/api/appInfo/index.d.ts

@@ -0,0 +1,13 @@
+export type OSInfo = {
+    platform: string;
+    arch: string;
+    release: string;
+};
+export interface IAppInfo {
+    getOS(): OSInfo;
+    getAppVersion(): string;
+    getAppDir(): string;
+    getSourceDir(): string;
+    getTempDir(): string;
+    isApp(): boolean;
+}

package/lib/src/api/appInfo/index.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/src/api/bindings/index.d.ts

@@ -0,0 +1,16 @@
+import { IAppInfo } from '../appInfo';
+import { IDownloadManager } from '../download';
+import { IFileSystem } from '../fs';
+import { IPathBinding } from '../path';
+import { IFileLoader, IJsonRepositoryBinding } from '../repository';
+import { IVideoProcessor } from '../video';
+export declare class IncyclistBindings {
+    path?: IPathBinding;
+    db: IJsonRepositoryBinding;
+    loader?: IFileLoader;
+    video?: IVideoProcessor;
+    appInfo?: IAppInfo;
+    fs?: IFileSystem;
+    downloadManager?: IDownloadManager;
+}
+export declare const getBindings: () => IncyclistBindings;

package/lib/src/api/bindings/index.js

@@ -0,0 +1,62 @@
+"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 __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.getBindings = exports.IncyclistBindings = void 0;
+const types_1 = require("../../base/types");
+let IncyclistBindings = (() => {
+    let _classDecorators = [types_1.Singleton];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    var IncyclistBindings = _classThis = class {
+    };
+    __setFunctionName(_classThis, "IncyclistBindings");
+    (() => {
+        const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+        __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+        IncyclistBindings = _classThis = _classDescriptor.value;
+        if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        __runInitializers(_classThis, _classExtraInitializers);
+    })();
+    return IncyclistBindings = _classThis;
+})();
+exports.IncyclistBindings = IncyclistBindings;
+const getBindings = () => new IncyclistBindings();
+exports.getBindings = getBindings;

package/lib/src/api/download/index.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="node" />
+import EventEmitter from "events";
+export type DownloadProps = {
+    i?: string;
+};
+export interface IDownloadSession extends EventEmitter {
+    start(): any;
+    stop(): any;
+}
+export interface IDownloadManager {
+    createSession(url: string, fileName: string, props?: DownloadProps): IDownloadSession;
+}

package/lib/src/api/download/index.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/src/api/fs/index.d.ts

@@ -0,0 +1,10 @@
+export interface IFileSystem {
+    writeFile(...args: any[]): any;
+    readFile(...args: any[]): any;
+    appendFile(...args: any[]): any;
+    deleteFile(path: any): any;
+    createWriteStream(...args: any[]): any;
+    createReadStream(...args: any[]): any;
+    existsSync(path: string): boolean;
+    checkDir(path: string): void;
+}

package/lib/src/api/fs/index.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/src/api/index.d.ts

@@ -2,5 +2,7 @@ export * from './rest/index';
 export * from './rest/types';
 export * from './repository';
 export * from './path';
+export * from './bindings';
+export * from './overpass';
 import path from './path';
 export { path };

package/lib/src/api/index.js

@@ -22,5 +22,7 @@ __exportStar(require("./rest/index"), exports);
 __exportStar(require("./rest/types"), exports);
 __exportStar(require("./repository"), exports);
 __exportStar(require("./path"), exports);
+__exportStar(require("./bindings"), exports);
+__exportStar(require("./overpass"), exports);
 const path_1 = __importDefault(require("./path"));
 exports.path = path_1.default;

package/lib/src/api/overpass/index.d.ts

@@ -0,0 +1,10 @@
+export declare const OVERPASS_URL_DEFAULT: string;
+export declare class OverpassApi {
+    protected url: string;
+    constructor(props?: any);
+    bulkQuery(queryOL: string): Promise<JSON | string>;
+    singleQuery(queryOL: string): Promise<JSON | string>;
+    rotateUrl(): void;
+    query(queryOL: string): Promise<JSON | string>;
+}
+export declare const useOverpassApi: () => OverpassApi;