incyclist-services 1.3.51 → 1.3.53

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

@@ -1,5 +1,5 @@
 export * from './repo';
 export * from './model';
-export * from './utils';
 export * from './convert';
 export * from './api/fitconvert';
+export * from './utils';

package/lib/activities/base/index.js

@@ -16,6 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./repo"), exports);
 __exportStar(require("./model"), exports);
-__exportStar(require("./utils"), exports);
 __exportStar(require("./convert"), exports);
 __exportStar(require("./api/fitconvert"), exports);
+__exportStar(require("./utils"), exports);

package/lib/activities/base/model/index.d.ts

@@ -1,4 +1,5 @@
 import { RoutePoint } from "../../../routes/base/types";
+export declare const DEFAULT_ACTIVITY_TITLE = "Incyclist Ride";
 export type ActivityUser = {
     uuid?: string;
     weight: number;
@@ -8,6 +9,7 @@ export type ActivityRoute = {
     id?: string;
     hash: string;
     name: string;
+    title?: string;
 };
 export type ActivityStatsRecord = {
     min: number;
@@ -26,12 +28,14 @@ export type ActivityStats = {
     power: ActivityStatsRecord;
     powerCurve?: Record<string, number>;
 };
-export type StravaAppLink = {
-    upload_id: number;
-    activity_id: number;
-};
+export interface ActivityAppLink {
+    error?: string;
+    activity_id?: string;
+    url?: string;
+}
 export type ActivityAppLinks = {
-    strava?: StravaAppLink;
+    strava?: ActivityAppLink;
+    velohero?: ActivityAppLink;
 };
 export type ScreenShotInfo = {
     fileName: string;
@@ -63,6 +67,7 @@ export type ActivitySummary = {
     endPos?: number;
     segment?: string;
     realityFactor: number;
+    totalElevation: number;
     uploadStatus: Array<UploadInfo>;
     isCompleted?: boolean;
     isSaved?: boolean;

package/lib/activities/base/model/index.js

@@ -1,2 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_ACTIVITY_TITLE = void 0;
+exports.DEFAULT_ACTIVITY_TITLE = 'Incyclist Ride';

package/lib/activities/base/repo/db.d.ts

@@ -3,7 +3,7 @@ import { JsonRepository } from "../../../api";
 import { Observer, PromiseObserver } from "../../../base/types/observer";
 import { ActivityDetails, ActivityInfo } from "../model";
 import { ActivitySearchCriteria } from "./types";
-export declare const DB_VERSION = "3";
+export declare const DB_VERSION = "4";
 export declare const DB_NAME = "db";
 export declare class ActivitiesRepository {
     protected repo: JsonRepository;
@@ -18,6 +18,8 @@ export declare class ActivitiesRepository {
     load(): Observer;
     stopLoad(): void;
     save(activity: ActivityInfo, writeDetails?: boolean): Promise<void>;
+    migrate(activity: ActivityInfo, writeSummary?: boolean): ActivityDetails;
+    migrateDB(): Promise<void>;
     getFilename(activityName: string): string;
     delete(activity: ActivityInfo | string): Promise<void>;
     get(id: string): ActivityInfo;
@@ -43,6 +45,7 @@ export declare class ActivitiesRepository {
     protected listActivities(): Promise<Array<string>>;
     protected fixMissingHash(): Promise<void>;
     protected loadDetailsByName(name: string): Promise<ActivityDetails>;
+    protected loadDetailsById(id: string): Promise<ActivityDetails>;
     protected loadDetails(name: string, id?: string): Promise<void>;
     protected bulkAddActivities(names: Array<string>): Promise<void>;
     protected writeDetails(activity: ActivityInfo): Promise<void>;
@@ -51,4 +54,5 @@ export declare class ActivitiesRepository {
     protected getActivity(id: string): ActivityInfo;
     protected logError(err: Error, fn: string, logProps?: any): void;
     protected getRepo(): JsonRepository;
+    protected getRouteList(): import("../../../routes").RouteListService;
 }

package/lib/activities/base/repo/db.js

@@ -54,7 +54,9 @@ const types_1 = require("../../../base/types");
 const observer_1 = require("../../../base/types/observer");
 const utils_1 = require("../../../utils");
 const utils_2 = require("../utils");
-exports.DB_VERSION = '3';
+const routes_1 = require("../../../routes");
+const factory_1 = require("./migration/factory");
+exports.DB_VERSION = '4';
 exports.DB_NAME = 'db';
 let ActivitiesRepository = (() => {
     let _classDecorators = [types_1.Singleton];
@@ -100,6 +102,73 @@ let ActivitiesRepository = (() => {
                 }
             });
         }
+        migrate(activity, writeSummary = true) {
+            try {
+                const { details } = activity !== null && activity !== void 0 ? activity : {};
+                if (!details)
+                    return;
+                let summaryChanged = false;
+                let detailsChanged = false;
+                const { version } = details;
+                if (version === exports.DB_VERSION)
+                    return details;
+                const verNo = version === undefined ? 0 : Number(version);
+                const currentVerNo = Number(exports.DB_VERSION);
+                factory_1.ActivitiesDBMigratorFactory.inject('repo', this);
+                factory_1.ActivitiesDBMigratorFactory.inject('routeList', this.getRouteList());
+                for (let i = 1; i <= currentVerNo; i++) {
+                    if (verNo < i) {
+                        const migrater = factory_1.ActivitiesDBMigratorFactory.create(i - 1);
+                        if (migrater) {
+                            const res = migrater.migrate(activity);
+                            summaryChanged = summaryChanged || (res === null || res === void 0 ? void 0 : res.summaryChanged);
+                            detailsChanged = detailsChanged || (res === null || res === void 0 ? void 0 : res.detailsChanged);
+                        }
+                    }
+                }
+                details.version = exports.DB_VERSION;
+                this.writeDetails(activity);
+                if (summaryChanged && writeSummary) {
+                    this.writeRepo();
+                }
+                return details;
+            }
+            catch (err) {
+                this.logError(err, 'migrate', { activity });
+            }
+        }
+        migrateDB() {
+            return __awaiter(this, void 0, void 0, function* () {
+                let deleted = [];
+                try {
+                    const promises = [];
+                    this.activities.forEach(activity => {
+                        if (activity.details) {
+                            const details = this.migrate(activity);
+                            activity.summary = (0, utils_2.buildSummary)(details !== null && details !== void 0 ? details : activity.details);
+                        }
+                        else
+                            promises.push(this.loadDetailsById(activity.summary.id).then((details) => {
+                                if (!details) {
+                                    deleted.push(activity.summary.id);
+                                    return;
+                                }
+                                const updated = Object.assign(Object.assign({}, activity), { details });
+                                const updatedDetails = this.migrate(updated, false);
+                                activity.summary = (0, utils_2.buildSummary)(updatedDetails !== null && updatedDetails !== void 0 ? updatedDetails : details);
+                            }));
+                    });
+                    yield Promise.allSettled(promises);
+                    if (deleted.length) {
+                        this.activities = this.activities.filter(ai => !deleted.includes(ai.summary.id));
+                    }
+                    yield this.writeRepo();
+                }
+                catch (err) {
+                    this.logError(err, 'migrateDB');
+                }
+            });
+        }
         getFilename(activityName) {
             const baseDir = this.getRepo().getPath();
             const path = (0, api_1.getBindings)().path;
@@ -302,6 +371,16 @@ let ActivitiesRepository = (() => {
                         this.write(true);
                     }
                     yield this.fixMissingHash();
+                    if (dbData.version !== exports.DB_VERSION) {
+                        this.logger.logEvent({ message: 'migrating activities database', from: exports.DB_VERSION, to: exports.DB_VERSION });
+                        try {
+                            yield this.migrateDB();
+                            this.logger.logEvent({ message: 'finished migrating activities database', from: exports.DB_VERSION, to: exports.DB_VERSION });
+                        }
+                        catch (err) {
+                            this.logError(err, 'loadSummaries');
+                        }
+                    }
                     return;
                 }
                 yield this.buildFromLegacy();
@@ -354,6 +433,12 @@ let ActivitiesRepository = (() => {
                 return details;
             });
         }
+        loadDetailsById(id) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const activity = this.getActivity(id);
+                return yield this.loadDetailsByName(activity.summary.name);
+            });
+        }
         loadDetails(name, id) {
             return __awaiter(this, void 0, void 0, function* () {
                 const details = yield this.loadDetailsByName(name);
@@ -431,6 +516,9 @@ let ActivitiesRepository = (() => {
                 this.repo = api_1.JsonRepository.create('activities');
             return this.repo;
         }
+        getRouteList() {
+            return (0, routes_1.useRouteList)();
+        }
     };
     __setFunctionName(_classThis, "ActivitiesRepository");
     (() => {

package/lib/activities/base/repo/migration/factory.d.ts

@@ -0,0 +1,7 @@
+import { ActivitiesDBMigrator, IActivityDBMigrator } from "./types";
+export declare class ActivitiesDBMigratorFactory {
+    static readonly migrators: Array<typeof ActivitiesDBMigrator>;
+    static readonly injected: Record<string, any>;
+    static inject(string: any, value: any): void;
+    static create(version: number): IActivityDBMigrator;
+}

package/lib/activities/base/repo/migration/factory.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActivitiesDBMigratorFactory = void 0;
+const v0_1 = require("./v0");
+const v1_1 = require("./v1");
+const v2_1 = require("./v2");
+const v3_1 = require("./v3");
+class ActivitiesDBMigratorFactory {
+    static inject(string, value) {
+        this.injected[string] = value;
+    }
+    static create(version) {
+        const Migrator = this.migrators[version];
+        if (Migrator)
+            return new Migrator(this.injected);
+    }
+}
+exports.ActivitiesDBMigratorFactory = ActivitiesDBMigratorFactory;
+ActivitiesDBMigratorFactory.migrators = [
+    v0_1.MigrationV0,
+    v1_1.MigrationV1,
+    v2_1.MigrationV2,
+    v3_1.MigrationV3
+];
+ActivitiesDBMigratorFactory.injected = {};

package/lib/activities/base/repo/migration/types.d.ts

@@ -0,0 +1,15 @@
+import { RouteListService } from "../../../../routes";
+import { ActivityInfo } from "../../model";
+export type MigrationResult = {
+    summaryChanged?: boolean;
+    detailsChanged?: boolean;
+};
+export interface IActivityDBMigrator {
+    migrate(activity: ActivityInfo): MigrationResult;
+}
+export declare class ActivitiesDBMigrator implements IActivityDBMigrator {
+    protected injected: Record<string, any>;
+    constructor(injected?: Record<string, any>);
+    migrate(activity: ActivityInfo): MigrationResult;
+    getRouteList(): RouteListService;
+}

package/lib/activities/base/repo/migration/types.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActivitiesDBMigrator = void 0;
+const routes_1 = require("../../../../routes");
+class ActivitiesDBMigrator {
+    constructor(injected = {}) {
+        this.injected = injected;
+    }
+    migrate(activity) {
+        throw new Error("Method not implemented.");
+    }
+    getRouteList() {
+        var _a;
+        return (_a = this.injected['routeList']) !== null && _a !== void 0 ? _a : (0, routes_1.useRouteList)();
+    }
+}
+exports.ActivitiesDBMigrator = ActivitiesDBMigrator;

package/lib/activities/base/repo/migration/v0 copy.d.ts

@@ -0,0 +1,5 @@
+import { ActivityInfo } from "../../model";
+import { ActivitiesDBMigrator, MigrationResult } from "./types";
+export declare class MigrationV0 extends ActivitiesDBMigrator {
+    migrate(activity: ActivityInfo): MigrationResult;
+}

package/lib/activities/base/repo/migration/v0 copy.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MigrationV0 = void 0;
+const utils_1 = require("../../utils");
+const types_1 = require("./types");
+class MigrationV0 extends types_1.ActivitiesDBMigrator {
+    migrate(activity) {
+        if (!activity)
+            return {};
+        const { summary, details } = activity;
+        details.logs.forEach(log => {
+            log.lng = log.lon;
+            delete log.lon;
+        });
+        details.name = summary.name;
+        details.totalElevation = summary.totalElevation = (0, utils_1.getTotalElevation)(details);
+        return { summaryChanged: true };
+    }
+}
+exports.MigrationV0 = MigrationV0;

package/lib/activities/base/repo/migration/v0.d.ts

@@ -0,0 +1,5 @@
+import { ActivityInfo } from "../../model";
+import { ActivitiesDBMigrator, MigrationResult } from "./types";
+export declare class MigrationV0 extends ActivitiesDBMigrator {
+    migrate(activity: ActivityInfo): MigrationResult;
+}

package/lib/activities/base/repo/migration/v0.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MigrationV0 = void 0;
+const utils_1 = require("../../utils");
+const types_1 = require("./types");
+class MigrationV0 extends types_1.ActivitiesDBMigrator {
+    migrate(activity) {
+        const { summary, details } = activity;
+        details.logs.forEach(log => {
+            log.lng = log.lon;
+            delete log.lon;
+        });
+        details.name = summary.name;
+        details.totalElevation = summary.totalElevation = (0, utils_1.getTotalElevation)(details);
+        return { summaryChanged: true };
+    }
+}
+exports.MigrationV0 = MigrationV0;

package/lib/activities/base/repo/migration/v1 copy.d.ts

@@ -0,0 +1,5 @@
+import { ActivityInfo } from "../../model";
+import { ActivitiesDBMigrator, MigrationResult } from "./types";
+export declare class MigrationV1 extends ActivitiesDBMigrator {
+    migrate(activity: ActivityInfo): MigrationResult;
+}

package/lib/activities/base/repo/migration/v1 copy.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MigrationV1 = void 0;
+const types_1 = require("./types");
+class MigrationV1 extends types_1.ActivitiesDBMigrator {
+    migrate(activity) {
+        if (!activity)
+            return {};
+        const { summary, details } = activity;
+        let detailsChanged = false;
+        if (details.routeType === 'Video' && details.route) {
+            const route = this.getRouteList().getRouteDescription(details.route.id);
+            if (route.originalName) {
+                details.route.name = route.originalName;
+                detailsChanged = true;
+            }
+        }
+        return { detailsChanged };
+    }
+}
+exports.MigrationV1 = MigrationV1;

package/lib/activities/base/repo/migration/v1.d.ts

@@ -0,0 +1,5 @@
+import { ActivityInfo } from "../../model";
+import { ActivitiesDBMigrator, MigrationResult } from "./types";
+export declare class MigrationV1 extends ActivitiesDBMigrator {
+    migrate(activity: ActivityInfo): MigrationResult;
+}

package/lib/activities/base/repo/migration/v1.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MigrationV1 = void 0;
+const types_1 = require("./types");
+class MigrationV1 extends types_1.ActivitiesDBMigrator {
+    migrate(activity) {
+        const { details } = activity;
+        let detailsChanged = false;
+        if (details.routeType === 'Video' && details.route) {
+            const route = this.getRouteList().getRouteDescription(details.route.id);
+            if (route === null || route === void 0 ? void 0 : route.originalName) {
+                details.route.name = route.originalName;
+                detailsChanged = true;
+            }
+        }
+        return { detailsChanged };
+    }
+}
+exports.MigrationV1 = MigrationV1;

package/lib/activities/base/repo/migration/v2.d.ts

@@ -0,0 +1,5 @@
+import { ActivityInfo } from "../../model";
+import { ActivitiesDBMigrator, MigrationResult } from "./types";
+export declare class MigrationV2 extends ActivitiesDBMigrator {
+    migrate(activity: ActivityInfo): MigrationResult;
+}

package/lib/activities/base/repo/migration/v2.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MigrationV2 = void 0;
+const types_1 = require("./types");
+class MigrationV2 extends types_1.ActivitiesDBMigrator {
+    migrate(activity) {
+        activity.details.startTime = new Date(activity.details.startTime).toISOString();
+        return { detailsChanged: true };
+    }
+}
+exports.MigrationV2 = MigrationV2;

package/lib/activities/base/repo/migration/v3.d.ts

@@ -0,0 +1,5 @@
+import { ActivityInfo } from "../../model";
+import { ActivitiesDBMigrator, MigrationResult } from "./types";
+export declare class MigrationV3 extends ActivitiesDBMigrator {
+    migrate(activity: ActivityInfo): MigrationResult;
+}

package/lib/activities/base/repo/migration/v3.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MigrationV3 = void 0;
+const model_1 = require("../../model");
+const types_1 = require("./types");
+class MigrationV3 extends types_1.ActivitiesDBMigrator {
+    migrate(activity) {
+        const { summary, details } = activity;
+        let detailsChanged = false;
+        if (details.routeType === 'Video' && details.route) {
+            const route = this.getRouteList().getRouteDescription(details.route.id);
+            if (route === null || route === void 0 ? void 0 : route.title) {
+                details.route.title = route.title;
+                detailsChanged = true;
+            }
+        }
+        if (summary.title === model_1.DEFAULT_ACTIVITY_TITLE) {
+            if (details.routeType === 'Video' && details.route)
+                summary.title = details.route.title;
+            else if (details.route)
+                summary.title = details.route.name;
+        }
+        summary.totalElevation = details.totalElevation;
+        return { detailsChanged, summaryChanged: true };
+    }
+}
+exports.MigrationV3 = MigrationV3;

package/lib/activities/base/utils/activity.d.ts

@@ -0,0 +1,32 @@
+import { PromiseObserver } from "../../../base/types";
+import { DisplayExportInfo, DisplayUploadInfo } from "../../list";
+import { ActivityInfo } from "../model";
+import { ActivitiesRepository } from "../repo";
+import { RouteCard, RouteSettings } from "../../../routes/list/cards/RouteCard";
+import { OnlineStateMonitoringService } from "../../../monitoring";
+export declare class Activity implements ActivityInfo {
+    protected info: ActivityInfo;
+    protected loadingObserver: PromiseObserver<void>;
+    constructor(info: ActivityInfo);
+    get summary(): import("../model").ActivitySummary;
+    set summary(summary: import("../model").ActivitySummary);
+    get details(): import("../model").ActivityDetails;
+    set details(details: import("../model").ActivityDetails);
+    get id(): string;
+    setLoading(loading: PromiseObserver<void>): void;
+    isLoading(): boolean;
+    load(): Promise<void>;
+    isComplete(): boolean;
+    getTitle(): string;
+    getElevation(): number;
+    getExports(): Array<DisplayExportInfo>;
+    isRouteAvailable(): boolean;
+    getUploadStatus(): Array<DisplayUploadInfo>;
+    canStart(): boolean;
+    getRouteCard(): RouteCard;
+    createStartSettings(): RouteSettings;
+    protected getOnlineMonitoring(): OnlineStateMonitoringService;
+    protected save(): Promise<void>;
+    protected getRepo(): ActivitiesRepository;
+    protected getAppsService(): import("../../../apps").AppsService;
+}