incyclist-services 1.2.2 → 1.3.0

package/lib/activities/base/api/consts.d.ts

@@ -0,0 +1,2 @@
+export declare const FITCONVERT_API = "FITCONVERT_API";
+export declare const DEFAULT_FIT_API = "https://dlws.incyclist.com/api/v1/fit/convert";

package/lib/activities/base/api/consts.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_FIT_API = exports.FITCONVERT_API = void 0;
+const DEFAULT_FIT_API_PROD = 'https://dlws.incyclist.com/api/v1/fit/convert';
+exports.FITCONVERT_API = 'FITCONVERT_API';
+exports.DEFAULT_FIT_API = DEFAULT_FIT_API_PROD;

package/lib/activities/base/api/fitconvert.d.ts

@@ -0,0 +1,8 @@
+import { AxiosInstance } from "axios";
+import { FitExportActivity } from "../model";
+export declare class IncyclistFitConvertApi {
+    protected api: AxiosInstance;
+    convertToFit(data: FitExportActivity): Promise<ArrayBuffer>;
+    protected getApi(): AxiosInstance;
+    protected getBaseUrl(): string;
+}

package/lib/activities/base/api/fitconvert.js

@@ -0,0 +1,57 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IncyclistFitConvertApi = void 0;
+const settings_1 = require("../../../settings");
+const consts_1 = require("./consts");
+const utils_1 = require("../../../utils");
+const api_1 = require("../../../api");
+class IncyclistFitConvertApi {
+    convertToFit(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let url;
+            try {
+                const baseUrl = this.getBaseUrl();
+                const requestUrl = `${baseUrl}/activity/${data.id}`;
+                const response = yield this.getApi().post(requestUrl, data);
+                url = response.data;
+            }
+            catch (error) {
+                throw new Error(`convert failed: (phase convert), reason: ${error.message}`);
+            }
+            try {
+                const response = yield this.getApi().get(url, { responseType: 'arraybuffer' });
+                return response.data;
+            }
+            catch (error) {
+                throw new Error(`convert failed: (phase download), reason: ${error.message}`);
+            }
+        });
+    }
+    getApi() {
+        if (!this.api) {
+            this.api = api_1.IncyclistRestApiClient.getClient();
+            return this.api;
+        }
+        return this.api;
+    }
+    getBaseUrl() {
+        let baseUrl;
+        try {
+            baseUrl = (0, settings_1.useUserSettings)().get(consts_1.FITCONVERT_API, consts_1.DEFAULT_FIT_API);
+        }
+        catch (_a) {
+            baseUrl = consts_1.DEFAULT_FIT_API;
+        }
+        return (0, utils_1.trimTrailingChars)(baseUrl, '/');
+    }
+}
+exports.IncyclistFitConvertApi = IncyclistFitConvertApi;

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

@@ -0,0 +1 @@
+export * from './fitconvert';

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

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./fitconvert"), exports);

package/lib/activities/base/convert/converter.d.ts

@@ -0,0 +1,6 @@
+import { ActivityDetails } from "../model";
+import { ActivityConverterFactory } from "./factory";
+export declare class ActivityConverter {
+    static factory?: ActivityConverterFactory;
+    static convert(activity: ActivityDetails, format: string): Promise<unknown>;
+}

package/lib/activities/base/convert/converter.js

@@ -0,0 +1,28 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActivityConverter = void 0;
+const factory_1 = require("./factory");
+const fit_1 = require("./fit");
+const tcx_1 = require("./tcx");
+class ActivityConverter {
+    static convert(activity, format) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!ActivityConverter.factory) {
+                ActivityConverter.factory = new factory_1.ActivityConverterFactory();
+                ActivityConverter.factory.add('fit', new fit_1.RemoteFitConverter());
+                ActivityConverter.factory.add('tcx', new tcx_1.TcxConverter());
+            }
+            return yield ActivityConverter.factory.convert(activity, format);
+        });
+    }
+}
+exports.ActivityConverter = ActivityConverter;

package/lib/activities/base/convert/factory.d.ts

@@ -0,0 +1,8 @@
+import { ActivityDetails } from "../model";
+import { IActivityConverter } from "./types";
+export declare class ActivityConverterFactory {
+    protected converters: Record<string, IActivityConverter>;
+    constructor();
+    add(format: string, converter: IActivityConverter): void;
+    convert(activity: ActivityDetails, targetFormat: string): Promise<any>;
+}

package/lib/activities/base/convert/factory.js

@@ -0,0 +1,89 @@
+"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.ActivityConverterFactory = void 0;
+const types_1 = require("../../../base/types");
+let ActivityConverterFactory = (() => {
+    let _classDecorators = [types_1.Singleton];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    var ActivityConverterFactory = _classThis = class {
+        constructor() {
+            this.converters = {};
+        }
+        add(format, converter) {
+            if (!format || !converter)
+                return;
+            this.converters[format.toLowerCase()] = converter;
+        }
+        convert(activity, targetFormat) {
+            return __awaiter(this, void 0, void 0, function* () {
+                if (!activity || !targetFormat)
+                    throw new Error('illegal use: activity and format need to be specified');
+                const format = targetFormat.toLowerCase();
+                const converter = this.converters[format];
+                if (!converter)
+                    throw new Error(`unknown format: ${targetFormat}`);
+                const res = yield converter.convert(activity);
+                return res;
+            });
+        }
+    };
+    __setFunctionName(_classThis, "ActivityConverterFactory");
+    (() => {
+        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);
+        ActivityConverterFactory = _classThis = _classDescriptor.value;
+        if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        __runInitializers(_classThis, _classExtraInitializers);
+    })();
+    return ActivityConverterFactory = _classThis;
+})();
+exports.ActivityConverterFactory = ActivityConverterFactory;

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

@@ -0,0 +1 @@
+export * from './remote-fit';

package/lib/activities/base/convert/fit/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./remote-fit"), exports);

package/lib/activities/base/convert/fit/remote-fit.d.ts

@@ -0,0 +1,13 @@
+import { EventLogger } from 'gd-eventlog';
+import { IncyclistFitConvertApi } from '../../api/fitconvert';
+import { ActivityDetails, ActivityLogRecord, FitExportActivity, FitLogEntry } from '../../model';
+export declare class RemoteFitConverter {
+    protected logger: EventLogger;
+    protected api: IncyclistFitConvertApi;
+    constructor();
+    convert(activity: ActivityDetails): Promise<ArrayBuffer>;
+    protected getApi(): IncyclistFitConvertApi;
+    protected getFitActivity(activity: ActivityDetails): FitExportActivity;
+    protected mapLogToFit(log: ActivityLogRecord): FitLogEntry;
+    protected getUserSettings(): import("../../../../settings").UserSettingsService;
+}

package/lib/activities/base/convert/fit/remote-fit.js

@@ -0,0 +1,61 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RemoteFitConverter = void 0;
+const gd_eventlog_1 = require("gd-eventlog");
+const fitconvert_1 = require("../../api/fitconvert");
+const settings_1 = require("../../../../settings");
+class RemoteFitConverter {
+    constructor() {
+        this.logger = new gd_eventlog_1.EventLogger('RemoteFitExporter');
+    }
+    convert(activity) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.logger.logEvent({ message: 'convert start', format: 'FIT' });
+                const content = this.getFitActivity(activity);
+                const data = yield this.getApi().convertToFit(content);
+                this.logger.logEvent({ message: 'convert success', format: 'FIT' });
+                return data;
+            }
+            catch (err) {
+                this.logger.logEvent({ message: 'convert result', format: 'FIT', result: 'error', reason: err.message });
+                throw err;
+            }
+        });
+    }
+    getApi() {
+        if (!this.api)
+            this.api = new fitconvert_1.IncyclistFitConvertApi();
+        return this.api;
+    }
+    getFitActivity(activity) {
+        const { id, title, time, timeTotal, timePause, distance } = activity;
+        const status = 'created';
+        const startTime = new Date(activity.startTime).toISOString();
+        const logs = activity.logs.map(this.mapLogToFit.bind(this));
+        const screenshots = [];
+        const laps = [];
+        const user = {
+            id: this.getUserSettings().get('uuid', undefined),
+            weight: activity.user.weight
+        };
+        return { id, title, status, logs, laps, startTime, time, timeTotal, timePause, distance, user, screenshots };
+    }
+    mapLogToFit(log) {
+        const { time, speed, slope, cadence, heartrate, distance, power, lat, lng, elevation } = log;
+        return { time, speed, slope, cadence, heartrate, distance, power, lat, lon: lng, elevation };
+    }
+    getUserSettings() {
+        return (0, settings_1.useUserSettings)();
+    }
+}
+exports.RemoteFitConverter = RemoteFitConverter;

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

@@ -0,0 +1,4 @@
+export * from './factory';
+export * from './tcx';
+export * from './fit';
+export * from './converter';

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

@@ -0,0 +1,20 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./factory"), exports);
+__exportStar(require("./tcx"), exports);
+__exportStar(require("./fit"), exports);
+__exportStar(require("./converter"), exports);

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

@@ -0,0 +1 @@
+export * from './tcx';

package/lib/activities/base/convert/tcx/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./tcx"), exports);

package/lib/activities/base/convert/tcx/tcx.d.ts

@@ -0,0 +1,12 @@
+import { EventLogger } from 'gd-eventlog';
+import { TrackPoint, ActivityLap } from 'tcx-builder';
+import { IActivityConverter } from '../types';
+import { ActivityDetails } from '../../model';
+export declare class TcxConverter implements IActivityConverter {
+    protected logger: EventLogger;
+    constructor();
+    convert(activity: ActivityDetails): Promise<string>;
+    protected createLaps(startTime: Date, activity: ActivityDetails, trackPoints: TrackPoint[]): ActivityLap[];
+    protected creatTrackPoints(activity: ActivityDetails, startTime: Date): TrackPoint[];
+    protected getRideService(): import("../../../ride").ActivityRideService;
+}

package/lib/activities/base/convert/tcx/tcx.js

@@ -0,0 +1,87 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TcxConverter = void 0;
+const gd_eventlog_1 = require("gd-eventlog");
+const tcx_builder_1 = require("tcx-builder");
+const ride_1 = require("../../../ride");
+class TcxConverter {
+    constructor() {
+        this.logger = new gd_eventlog_1.EventLogger('TcxExporter');
+    }
+    convert(activity) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.logger.logEvent({ message: 'convert start', format: 'TCX' });
+            try {
+                const startTime = new Date(activity.startTime);
+                const trackPoints = this.creatTrackPoints(activity, startTime);
+                const laps = this.createLaps(startTime, activity, trackPoints);
+                const tcxActivity = new tcx_builder_1.Activity('Biking', { Id: startTime, Notes: 'Incyclist Ride', Laps: laps });
+                const activityList = new tcx_builder_1.ActivityList({ activity: [tcxActivity] });
+                const tcxObj = new tcx_builder_1.TrainingCenterDatabase({ activities: activityList });
+                const xml = tcxObj.toXml();
+                this.logger.logEvent({ message: 'convert success', format: 'TCX' });
+                return xml;
+            }
+            catch (err) {
+                this.logger.logEvent({ message: 'convert result', format: 'TCX', result: 'error', error: err.message });
+                throw err;
+            }
+        });
+    }
+    createLaps(startTime, activity, trackPoints) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        const lap = new tcx_builder_1.ActivityLap(startTime, {
+            Calories: 0,
+            DistanceMeters: activity.distance,
+            Intensity: 'Active',
+            TotalTimeSeconds: activity.time,
+            TriggerMethod: 'Distance',
+            MaximumSpeed: ((_b = (_a = activity.stats) === null || _a === void 0 ? void 0 : _a.speed) === null || _b === void 0 ? void 0 : _b.max) || 0,
+            MaximumHeartRateBpm: ((_c = activity.stats) === null || _c === void 0 ? void 0 : _c.hrm) ? new tcx_builder_1.HeartRateInBeatsPerMinute({ value: (_d = activity.stats.hrm) === null || _d === void 0 ? void 0 : _d.max }) : undefined,
+            AverageHeartRateBpm: ((_e = activity.stats) === null || _e === void 0 ? void 0 : _e.hrm) ? new tcx_builder_1.HeartRateInBeatsPerMinute({ value: (_f = activity.stats.hrm) === null || _f === void 0 ? void 0 : _f.avg }) : undefined,
+            Cadence: (_h = (_g = activity.stats) === null || _g === void 0 ? void 0 : _g.cadence) === null || _h === void 0 ? void 0 : _h.avg,
+            Track: new tcx_builder_1.Track({ trackPoints })
+        });
+        return [lap];
+    }
+    creatTrackPoints(activity, startTime) {
+        return activity.logs.map((log) => {
+            const tp = new tcx_builder_1.TrackPoint({
+                time: log ? new Date(startTime.valueOf() + log.time * 1000) : undefined,
+                altitudeMeters: log === null || log === void 0 ? void 0 : log.elevation,
+                distanceMeters: log === null || log === void 0 ? void 0 : log.distance,
+                heartRateBpm: (log === null || log === void 0 ? void 0 : log.heartrate) ? new tcx_builder_1.HeartRateBpm(log.heartrate) : undefined,
+                cadence: log === null || log === void 0 ? void 0 : log.cadence,
+                sensorState: 'Present',
+                extensions: new tcx_builder_1.TrackPointExtensions({
+                    Speed: log === null || log === void 0 ? void 0 : log.speed,
+                    Watts: log === null || log === void 0 ? void 0 : log.power,
+                }),
+            });
+            const lat = log === null || log === void 0 ? void 0 : log.lat;
+            let lng;
+            if ((activity === null || activity === void 0 ? void 0 : activity.type) === 'IncyclistActivity') {
+                lng = log === null || log === void 0 ? void 0 : log.lng;
+            }
+            else {
+                lng = log === null || log === void 0 ? void 0 : log.lon;
+            }
+            if (!isNaN(Number(lat !== null && lat !== void 0 ? lat : 'XX')) && !isNaN(Number(lng !== null && lng !== void 0 ? lng : 'XX')))
+                tp.Position = new tcx_builder_1.Position(lat, lng);
+            return tp;
+        });
+    }
+    getRideService() {
+        return (0, ride_1.useActivityRide)();
+    }
+}
+exports.TcxConverter = TcxConverter;

package/lib/activities/base/convert/types.d.ts

@@ -0,0 +1,7 @@
+import { ActivityDetails } from "../model";
+export interface IActivityConverter {
+    convert(activity: ActivityDetails): any;
+}
+export declare class ActivityConverter implements IActivityConverter {
+    convert(activity?: ActivityDetails): void;
+}

package/lib/activities/base/convert/types.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActivityConverter = void 0;
+class ActivityConverter {
+    convert(activity) {
+        throw new Error("Method not implemented.");
+    }
+}
+exports.ActivityConverter = ActivityConverter;

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

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

package/lib/activities/base/index.js

@@ -17,3 +17,5 @@ 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);

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

@@ -2,7 +2,7 @@ import { RoutePoint } from "../../../routes/base/types";
 export type ActivityUser = {
     uuid?: string;
     weight: number;
-    ftp: number;
+    ftp?: number;
 };
 export type ActivityRoute = {
     id?: string;
@@ -18,20 +18,6 @@ export type ActivityStatsRecord = {
     minAllowed?: number;
     weighted?: number;
 };
-export type ActivityLogRecord = {
-    time: number;
-    timeDelta: number;
-    speed: number;
-    slope?: number;
-    cadence: number;
-    heartrate?: number;
-    distance?: number;
-    power: number;
-    lat?: number;
-    lon?: number;
-    lng?: number;
-    elevation?: number;
-};
 export type ActivityStats = {
     hrm?: ActivityStatsRecord;
     cadence?: ActivityStatsRecord;
@@ -124,7 +110,7 @@ export type FitExportActivity = {
     logs: Array<FitLogEntry>;
     laps: Array<FitLapEntry>;
     startTime: string;
-    stopTime: string;
+    stopTime?: string;
     time: number;
     timeTotal: number;
     distance: number;
@@ -162,6 +148,20 @@ export interface ActivityDetails {
     fitFileName?: string;
     links?: ActivityAppLinks;
 }
+export type ActivityLogRecord = {
+    time: number;
+    timeDelta: number;
+    speed: number;
+    slope?: number;
+    cadence: number;
+    heartrate?: number;
+    distance?: number;
+    power: number;
+    lat?: number;
+    lng?: number;
+    elevation?: number;
+    lon?: number;
+};
 export type ActivityInfo = {
     summary: ActivitySummary;
     details?: ActivityDetails;

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

@@ -74,8 +74,8 @@ let ActivitiesRepository = (() => {
         stopLoad() {
             this.emitDone();
         }
-        save(activity, writeDetails = true) {
-            return __awaiter(this, void 0, void 0, function* () {
+        save(activity_1) {
+            return __awaiter(this, arguments, void 0, function* (activity, writeDetails = true) {
                 const stringify = (json) => { try {
                     JSON.stringify(json);
                 }
@@ -321,8 +321,8 @@ let ActivitiesRepository = (() => {
             });
         }
         scanForNewActivities() {
-            var _a;
             return __awaiter(this, void 0, void 0, function* () {
+                var _a;
                 try {
                     let names = yield this.listActivities();
                     if (!names)

package/lib/activities/index.d.ts

@@ -1,3 +1,4 @@
 export * from './base';
 export * from './list';
 export * from './ride';
+export * from './upload';

package/lib/activities/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./base"), exports);
 __exportStar(require("./list"), exports);
 __exportStar(require("./ride"), exports);
+__exportStar(require("./upload"), exports);

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

@@ -3,7 +3,7 @@ import { IncyclistService } from "../../base/service";
 import { Observer } from "../../base/types/observer";
 import { DeviceData } from "incyclist-devices";
 import { ExtendedIncyclistCapability, HealthStatus } from "../../devices";
-import { ActivitiesRepository, ActivityDetails, ActivityLogRecord, ActivityRouteType, FitExportActivity, FitLogEntry, ScreenShotInfo } from "../base";
+import { ActivitiesRepository, ActivityDetails, ActivityLogRecord, ActivityRouteType, ScreenShotInfo } from "../base";
 import { FreeRideStartSettings } from "../../routes/list/types";
 import { RoutePoint } from "../../routes/base/types";
 import { ActivityState } from "./types";
@@ -53,8 +53,6 @@ export declare class ActivityRideService extends IncyclistService {
     getDashboardDisplayProperties(): any[];
     getActivitySummaryDisplayProperties(): void;
     getActivity(): ActivityDetails;
-    protected mapLogToFit(log: ActivityLogRecord): FitLogEntry;
-    getFitActivity(): FitExportActivity;
     save(): Promise<void>;
     getObserver(): Observer;
     addSceenshot(screenshot: ScreenShotInfo): void;