incyclist-services 1.3.3 → 1.3.5

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

@@ -28,6 +28,7 @@ export declare class ActivityRideService extends IncyclistService {
         speed: number;
     };
     protected saveObserver: PromiseObserver<boolean>;
+    protected isSaveDone: boolean;
     protected statsCalculator: ActivityStatsCalculator;
     protected durationCalculator: ActivityDuration;
     protected deviceDataHandler: any;
@@ -52,7 +53,7 @@ export declare class ActivityRideService extends IncyclistService {
     pause(autoResume?: boolean): void;
     resume(requester?: 'user' | 'system'): void;
     getDashboardDisplayProperties(): any[];
-    getActivitySummaryDisplayProperties(): void;
+    getActivitySummaryDisplayProperties(): {};
     getActivity(): ActivityDetails;
     setTitle(title: string): void;
     delete(): Promise<void>;
@@ -72,6 +73,7 @@ export declare class ActivityRideService extends IncyclistService {
     protected getRepo(): ActivitiesRepository;
     protected createLogRecord(): ActivityLogRecord;
     protected createActivity(requestedId?: string): ActivityDetails;
+    protected changeTitle(newTitle: string): void;
     protected updateActivityState(): void;
     protected getTotalDistance(): number;
     protected getTotalElevation(): number;
@@ -91,5 +93,6 @@ export declare class ActivityRideService extends IncyclistService {
     protected getDeviceConfiguration(): import("../../devices").DeviceConfigurationService;
     protected getActivityUploadFactory(): ActivityUploadFactory;
     protected getActivityConverterfactory(): ActivityConverterFactory;
+    protected getFileSystemBinding(): import("../../api/fs").IFileSystem;
 }
 export declare const useActivityRide: () => ActivityRideService;

package/lib/activities/ride/service.js

@@ -64,6 +64,7 @@ const route_2 = require("../../routes/base/model/route");
 const stats_1 = require("./stats");
 const duration_1 = require("./duration");
 const upload_1 = require("../upload");
+const api_1 = require("../../api");
 const SAVE_INTERVAL = 5000;
 let ActivityRideService = (() => {
     let _classDecorators = [types_1.Singleton];
@@ -116,6 +117,7 @@ let ActivityRideService = (() => {
             this.state = 'active';
             this.tsStart = Date.now();
             this.tsPauseStart = undefined;
+            this.isSaveDone = false;
             this.logEvent({ message: 'activity started' });
             this.startWorker();
             this.emit('started');
@@ -158,6 +160,7 @@ let ActivityRideService = (() => {
             this.logEvent({ message: 'activity resumed', requester });
             this.updateActivityTime();
             this._save();
+            this.isSaveDone = false;
         }
         getDashboardDisplayProperties() {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
@@ -223,6 +226,26 @@ let ActivityRideService = (() => {
             }
         }
         getActivitySummaryDisplayProperties() {
+            var _a, _b;
+            try {
+                const route = (0, routes_1.useRouteList)().getSelected();
+                const showSave = this.activity !== undefined && !this.isSaveDone;
+                const showContinue = this.state !== 'completed';
+                const showMap = (_a = route === null || route === void 0 ? void 0 : route.description) === null || _a === void 0 ? void 0 : _a.hasGpx;
+                const preview = showMap ? undefined : (_b = route === null || route === void 0 ? void 0 : route.description) === null || _b === void 0 ? void 0 : _b.previewUrl;
+                const props = {
+                    activity: this.activity,
+                    showSave,
+                    showContinue,
+                    showMap,
+                    preview
+                };
+                return props;
+            }
+            catch (err) {
+                this.logError(err, 'getActivitySummaryDisplayProperties()');
+                return {};
+            }
         }
         getActivity() {
             return this.activity;
@@ -244,12 +267,14 @@ let ActivityRideService = (() => {
             });
         }
         save() {
+            console.log('~~~ ActivityRide.save', this.saveObserver !== undefined, this.isSaveDone);
             if (this.saveObserver) {
                 return this.saveObserver;
             }
             const emit = (event, ...args) => {
                 if (this.saveObserver)
                     this.saveObserver.emit(event, ...args);
+                console.log('~~~ ActivityRide.emit', event, args, this.saveObserver !== undefined, this.isSaveDone);
             };
             const run = () => __awaiter(this, void 0, void 0, function* () {
                 let success = false;
@@ -272,6 +297,7 @@ let ActivityRideService = (() => {
                         uploadSuccess = yield this.upload(format);
                     }
                     success = convertSuccess && uploadSuccess;
+                    this.isSaveDone = true;
                 }
                 catch (err) {
                     success = false;
@@ -283,6 +309,7 @@ let ActivityRideService = (() => {
                 return success;
             });
             this.saveObserver = new observer_1.PromiseObserver(run());
+            console.log('~~~ ActivityRide.save returns', this.saveObserver !== undefined, this.isSaveDone);
             return this.saveObserver;
         }
         getObserver() {
@@ -385,19 +412,39 @@ let ActivityRideService = (() => {
         }
         convert(format) {
             return __awaiter(this, void 0, void 0, function* () {
-                this.saveObserver.emit('convert.start', format);
+                const emit = (event, ...args) => {
+                    if (this.saveObserver)
+                        this.saveObserver.emit(event, ...args);
+                    else {
+                        try {
+                            throw new Error('');
+                        }
+                        catch (err) {
+                            console.log('~~~ WARN: emitting on non existing observer', event.args, err.stack);
+                        }
+                    }
+                };
+                const fs = this.getFileSystemBinding();
+                emit('convert.start', format);
                 try {
-                    base_1.ActivityConverter.convert(this.activity, format);
-                    this.saveObserver.emit('convert.done', format, true);
-                    if (format.toLowerCase() === 'fit')
-                        this.activity.fitFileName = this.activity.fileName.replace('json', 'fit');
-                    if (format.toLowerCase() === 'tcx')
-                        this.activity.tcxFileName = this.activity.fileName.replace('json', 'tcx');
+                    let data;
+                    data = yield base_1.ActivityConverter.convert(this.activity, format);
+                    emit('convert.done', format, true);
+                    if (format.toLowerCase() === 'fit') {
+                        const fileName = this.activity.fileName.replace('json', 'fit');
+                        yield fs.writeFile(fileName, Buffer.from(data));
+                        this.activity.fitFileName = fileName;
+                    }
+                    if (format.toLowerCase() === 'tcx') {
+                        const fileName = this.activity.fileName.replace('json', 'tcx');
+                        yield fs.writeFile(fileName, Buffer.from(data));
+                        this.activity.tcxFileName = fileName;
+                    }
                     yield this._save();
                     return true;
                 }
                 catch (err) {
-                    this.saveObserver.emit('convert.error', format, err);
+                    emit('convert.error', format, err);
                     return false;
                 }
             });
@@ -405,9 +452,9 @@ let ActivityRideService = (() => {
         upload(format) {
             return __awaiter(this, void 0, void 0, function* () {
                 const factory = this.getActivityUploadFactory();
-                this.saveObserver.emit('upload.start');
+                this.saveObserver.emit('upload.start', format);
                 try {
-                    yield factory.upload(this.activity, format);
+                    yield factory.upload(this.activity, format.toLowerCase());
                     this.saveObserver.emit('upload.done', format, true);
                     return true;
                 }
@@ -521,6 +568,11 @@ let ActivityRideService = (() => {
             };
             return activity;
         }
+        changeTitle(newTitle) {
+            if (!(newTitle === null || newTitle === void 0 ? void 0 : newTitle.length))
+                return;
+            this.activity.title = newTitle;
+        }
         updateActivityState() {
             var _a, _b;
             if (this.state !== 'active')
@@ -711,6 +763,9 @@ let ActivityRideService = (() => {
         getActivityConverterfactory() {
             return new base_1.ActivityConverterFactory();
         }
+        getFileSystemBinding() {
+            return (0, api_1.getBindings)().fs;
+        }
     };
     __setFunctionName(_classThis, "ActivityRideService");
     (() => {

package/lib/activities/upload/strava.js

@@ -162,7 +162,7 @@ let StravaUpload = (() => {
                     this.logger.logEvent({ message: 'Strava Upload', format });
                     const fileName = activity[`${format}FileName`];
                     const res = yield this.getApi().upload(fileName, {
-                        name: activity.name,
+                        name: activity.title,
                         description: '',
                         format: this.getStravaFormat(format)
                     });
@@ -211,7 +211,7 @@ let StravaUpload = (() => {
                 this.getUserSettings().set('user.auth.strava', {
                     accesstoken: this.config.accessToken,
                     refreshToken: this.config.refreshToken,
-                    expiration: this.config.expiration.toUTCString()
+                    expiration: this.config.expiration.toISOString()
                 });
             }
             catch (err) {

package/lib/apps/base/api/base.js

@@ -27,12 +27,15 @@ class AppApiBase {
     }
     postForm(form) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             try {
                 const fp = this.getFormBinding();
-                return yield fp.post(form);
+                const response = yield fp.post(form);
+                if ((_a = response.data) === null || _a === void 0 ? void 0 : _a.data)
+                    response.data = (_b = response.data) === null || _b === void 0 ? void 0 : _b.data;
+                return response;
             }
             catch (err) {
-                console.log('~~~ POST ERROR', err);
                 throw err;
             }
         });

package/lib/apps/base/api/strava/api.js

@@ -104,7 +104,7 @@ class StravaApi extends base_1.AppApiBase {
     }
     createUpload(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e;
             const reqOpts = {
                 headers: {
                     Authorization: 'Bearer ' + this.config.accessToken
@@ -116,7 +116,7 @@ class StravaApi extends base_1.AppApiBase {
                 return response.data;
             }
             else {
-                throw new Error(((_c = (_b = (_a = response.error) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.error) || response.error.message || response.error || `HTTP error ${response.status}`);
+                throw new Error(((_c = (_b = (_a = response.error) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.error) || ((_e = (_d = response.error) === null || _d === void 0 ? void 0 : _d.response) === null || _e === void 0 ? void 0 : _e.message) || response.error.message || `HTTP error ${response.status}`);
             }
         });
     }

package/lib/apps/base/api/velohero/api.js

@@ -60,7 +60,7 @@ class VeloHeroApi extends base_1.AppApiBase {
     }
     upload(fileName, props) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f, _g;
             if (!this.loginResponse && (!(props === null || props === void 0 ? void 0 : props.username) && !(props === null || props === void 0 ? void 0 : props.password))) {
                 throw new Error('not authenticated');
             }
@@ -78,7 +78,8 @@ class VeloHeroApi extends base_1.AppApiBase {
                 return true;
             }
             else {
-                throw new Error(((_e = (_d = (_c = response.error) === null || _c === void 0 ? void 0 : _c.response) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.error) || response.error.message || response.error || `HTTP error ${response.status}`);
+                const errMessage = ((_e = (_d = (_c = response.error) === null || _c === void 0 ? void 0 : _c.response) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.error) || ((_g = (_f = response.error) === null || _f === void 0 ? void 0 : _f.response) === null || _g === void 0 ? void 0 : _g.message) || response.error.message;
+                throw new Error(errMessage || `HTTP error ${response.status}`);
             }
         });
     }

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

@@ -67,7 +67,7 @@ class GPXParser extends xml_1.XMLParser {
                     const point = {
                         lat: Number(gpxPt.lat),
                         lng: Number(gpxPt.lon),
-                        elevation: gpxPt.ele ? Number(gpxPt.ele) : undefined,
+                        elevation: gpxPt.ele ? Number(gpxPt.ele) : prev === null || prev === void 0 ? void 0 : prev.elevation,
                         routeDistance: 0,
                         distance: 0
                     };

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

@@ -254,7 +254,7 @@ const getNextPosition = (route, props) => {
     if (props.routeDistance === undefined && (props.prev === undefined || props.prev.routeDistance === undefined)) {
         return;
     }
-    let pPrev = props.prev || Object.assign(Object.assign({}, points[0]), { lap: 1 });
+    let pPrev = Object.assign({}, (props.prev || Object.assign(Object.assign({}, points[0]), { lap: 1 })));
     const distance = props.distance !== undefined ? props.distance : props.routeDistance - getLapTotalDistance(route, pPrev);
     const targetRouteDistance = props.routeDistance !== undefined ? props.routeDistance : getLapTotalDistance(route, pPrev) + distance;
     let point, p;
@@ -375,6 +375,7 @@ function updatePoint(pPrev, point, props, p, distance, targetRouteInLap, route,
         const distanceToPrev = targetRouteInLap - pPrev.routeDistance;
         pDest = utils_1.geo.getPointBetween(pPrev, p, distanceToPrev);
         point.cnt = pPrev.cnt;
+        point.slope = pPrev.slope;
     }
     point.lat = pDest.lat;
     point.lng = pDest.lng;

package/package.json

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