incyclist-services 1.3.18 → 1.3.20

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

@@ -60,6 +60,8 @@ export type ActivitySummary = {
     rideTime: number;
     distance: number;
     startPos: number;
+    endPos?: number;
+    segment?: string;
     realityFactor: number;
     uploadStatus: Array<UploadInfo>;
     isCompleted?: boolean;
@@ -133,6 +135,8 @@ export interface ActivityDetails {
     timePause: number;
     distance: number;
     startPos: number;
+    endPos?: number;
+    segment?: string;
     startpos?: number;
     endpos?: number;
     totalElevation: number;

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

@@ -4,6 +4,7 @@ import { Observer, PromiseObserver } from "../../../base/types/observer";
 import { ActivityDetails, ActivityInfo } from "../model";
 import { ActivitySearchCriteria } from "./types";
 export declare const DB_VERSION = "1";
+export declare const DB_NAME = "db";
 export declare class ActivitiesRepository {
     protected repo: JsonRepository;
     protected loadObserver: Observer;

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

@@ -47,7 +47,7 @@ var __setFunctionName = (this && this.__setFunctionName) || function (f, name, p
     return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActivitiesRepository = exports.DB_VERSION = void 0;
+exports.ActivitiesRepository = exports.DB_NAME = exports.DB_VERSION = void 0;
 const gd_eventlog_1 = require("gd-eventlog");
 const api_1 = require("../../../api");
 const types_1 = require("../../../base/types");
@@ -55,6 +55,7 @@ const observer_1 = require("../../../base/types/observer");
 const utils_1 = require("../../../utils");
 const utils_2 = require("../utils");
 exports.DB_VERSION = '1';
+exports.DB_NAME = 'db';
 let ActivitiesRepository = (() => {
     let _classDecorators = [types_1.Singleton];
     let _classDescriptor;
@@ -154,6 +155,9 @@ let ActivitiesRepository = (() => {
             if ((result === null || result === void 0 ? void 0 : result.length) > 0 && (criteria === null || criteria === void 0 ? void 0 : criteria.startPos) !== undefined) {
                 result = result.filter(ai => ai.summary.startPos === criteria.startPos);
             }
+            if ((result === null || result === void 0 ? void 0 : result.length) > 0 && (criteria === null || criteria === void 0 ? void 0 : criteria.endPos) !== undefined) {
+                result = result.filter(ai => ai.summary.endPos === criteria.endPos);
+            }
             if ((result === null || result === void 0 ? void 0 : result.length) > 0 && (criteria === null || criteria === void 0 ? void 0 : criteria.realityFactor) !== undefined) {
                 result = result.filter(ai => { var _a; return ((_a = ai.summary.realityFactor) !== null && _a !== void 0 ? _a : 100) === criteria.realityFactor; });
             }
@@ -180,6 +184,12 @@ let ActivitiesRepository = (() => {
                     });
                 }
             }
+            if ((result === null || result === void 0 ? void 0 : result.length) > 0 && (criteria === null || criteria === void 0 ? void 0 : criteria.minTime) !== undefined) {
+                result = result.filter(ai => ai.summary.rideTime >= criteria.minTime);
+            }
+            if ((result === null || result === void 0 ? void 0 : result.length) > 0 && (criteria === null || criteria === void 0 ? void 0 : criteria.minDistance) !== undefined) {
+                result = result.filter(ai => ai.summary.distance >= criteria.minDistance);
+            }
             return result;
         }
         writeRepo() {
@@ -194,7 +204,7 @@ let ActivitiesRepository = (() => {
                             isComplete,
                             activities: this.activities.map(ai => ai.summary)
                         };
-                        yield this.getRepo().write('db', dbData);
+                        yield this.getRepo().write(exports.DB_NAME, dbData);
                     }
                     catch (err) {
                         this.logger.logEvent({ message: 'could not safe repo', error: err.message });
@@ -235,7 +245,7 @@ let ActivitiesRepository = (() => {
         }
         loadSummaries() {
             return __awaiter(this, void 0, void 0, function* () {
-                const dbData = yield this.getRepo().read('db');
+                const dbData = yield this.getRepo().read(exports.DB_NAME);
                 if (dbData) {
                     const { activities = [] } = dbData;
                     this.activities = activities.map(summary => ({ summary }));
@@ -267,7 +277,7 @@ let ActivitiesRepository = (() => {
         }
         listActivities() {
             return __awaiter(this, void 0, void 0, function* () {
-                return this.getRepo().list(['db']);
+                return this.getRepo().list([exports.DB_NAME]);
             });
         }
         fixMissingHash() {

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

@@ -3,7 +3,10 @@ export interface ActivitySearchCriteria {
     routeId?: string;
     routeHash?: string;
     startPos?: number;
+    endPos?: number;
     realityFactor?: number;
     uploadStatus?: UploadInfo | Array<UploadInfo>;
     isSaved?: boolean;
+    minTime?: number;
+    minDistance?: number;
 }

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildSummary = void 0;
 const buildSummary = (activity, proposedName) => {
     var _a;
-    const { id, title, route, screenshots, startTime: startTimeUTC, time: rideTime, distance, startPos, realityFactor = 100, links, laps } = activity;
+    const { id, title, route, screenshots, startTime: startTimeUTC, time: rideTime, distance, startPos, endPos, segment, realityFactor = 100, links, laps } = activity;
     const name = proposedName !== null && proposedName !== void 0 ? proposedName : activity.name;
     const routeId = route === null || route === void 0 ? void 0 : route.id;
     const routeHash = route === null || route === void 0 ? void 0 : route.hash;
@@ -18,7 +18,7 @@ const buildSummary = (activity, proposedName) => {
         uploadStatus.push({ service: 'strava', status: 'success' });
     }
     return {
-        id, title, name, routeId, routeHash, previewImage, startTime, rideTime, distance, startPos, realityFactor, uploadStatus, laps
+        id, title, name, routeId, routeHash, previewImage, startTime, rideTime, distance, startPos, endPos, realityFactor, uploadStatus, laps
     };
 };
 exports.buildSummary = buildSummary;

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

@@ -9,9 +9,8 @@ export declare class ActivityListService extends IncyclistService {
     protected observer: Observer;
     constructor();
     preload(): PromiseObserver<void>;
-    getPastActivities(filter: ActivitySearchCriteria, props?: {
-        details: boolean;
-    }): Array<ActivityInfo>;
+    getPastActivities(filter: ActivitySearchCriteria): Array<ActivityInfo>;
+    getPastActivitiesWithDetails(filter: ActivitySearchCriteria): Promise<Array<ActivityInfo>>;
     protected loadActivities(): Promise<void>;
     protected getRepo(): ActivitiesRepository;
     protected get activities(): Array<ActivityInfo>;

package/lib/activities/list/service.js

@@ -92,13 +92,35 @@ let ActivityListService = (() => {
             }
             return this.preloadObserver;
         }
-        getPastActivities(filter, props) {
+        getPastActivities(filter) {
             var _a;
-            const activities = (_a = this.getRepo().search(filter)) !== null && _a !== void 0 ? _a : [];
-            if (props === null || props === void 0 ? void 0 : props.details) {
-                activities.forEach(ai => this.getRepo().getWithDetails(ai.summary.id));
+            try {
+                const activities = (_a = this.getRepo().search(filter)) !== null && _a !== void 0 ? _a : [];
+                return activities;
+            }
+            catch (err) {
+                this.logError(err, 'getPastActivities');
+                return [];
             }
-            return activities.filter(ai => ai.details !== undefined && ai.details !== null);
+        }
+        getPastActivitiesWithDetails(filter) {
+            return __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                try {
+                    const activities = (_a = this.getRepo().search(filter)) !== null && _a !== void 0 ? _a : [];
+                    const promises = [];
+                    activities.forEach(ai => {
+                        promises.push(this.getRepo().getWithDetails(ai.summary.id));
+                    });
+                    yield Promise.allSettled(promises);
+                    const res = activities.filter(a => a.details !== undefined && a.details !== null);
+                    return res;
+                }
+                catch (err) {
+                    this.logError(err, 'getPastActivitiesWithDetails');
+                    return [];
+                }
+            });
         }
         loadActivities() {
             return __awaiter(this, void 0, void 0, function* () {

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

@@ -68,7 +68,7 @@ export declare class ActivityRideService extends IncyclistService {
     getObserver(): Observer;
     addSceenshot(screenshot: ScreenShotInfo): void;
     onRouteUpdate(points: Array<RoutePoint>): void;
-    getPrevRideStats(activities: Array<ActivityInfo>, current: ActivityLogRecord): PastActivityInfo;
+    getPrevRideStats(current: ActivityLogRecord): PastActivityInfo;
     getPrevRidesListDisplay(maxEntries?: number): Array<PrevRidesListDisplayProps>;
     protected getPrevActivityLog(ai: ActivityInfo, current: ActivityLogRecord): PastActivityLogEntry | null;
     protected getCurrentActivityLog(ai: ActivityInfo, current: ActivityLogRecord): PastActivityLogEntry | null;

package/lib/activities/ride/service.js

@@ -137,9 +137,15 @@ let ActivityRideService = (() => {
             this.emit('started');
         }
         stop() {
+            var _a;
             this.stopWorker();
             if (!this.observer)
                 return;
+            if (this.state === 'paused') {
+                const pauseDuration = (Date.now() - this.tsPauseStart) / 1000;
+                this.activity.timePause = ((_a = this.activity.timePause) !== null && _a !== void 0 ? _a : 0) + pauseDuration;
+                this.current.tsUpdate = Date.now();
+            }
             (0, devices_1.useDeviceRide)().off('data', this.deviceDataHandler);
             this.state = 'completed';
             this.updateActivityTime();
@@ -351,8 +357,9 @@ let ActivityRideService = (() => {
             this.current.route.details.distance = points[points.length - 1].routeDistance;
             (0, route_1.addDetails)(this.current.route, this.current.route.details);
         }
-        getPrevRideStats(activities, current) {
+        getPrevRideStats(current) {
             var _a;
+            const activities = this.current.prevRides;
             if (!(activities === null || activities === void 0 ? void 0 : activities.length))
                 return [];
             const logs = (_a = activities.map(ai => { return this.getPrevActivityLog(ai, current); })) === null || _a === void 0 ? void 0 : _a.filter(a => a !== null);
@@ -361,7 +368,6 @@ let ActivityRideService = (() => {
             logs.push(this.getCurrentActivityLog(activities[0], current));
             const sorted = logs.sort((a, b) => b.distance - a.distance);
             this.current.prevRidesLogs = sorted;
-            console.log('~~~ PREV RIDES', activities.map(a => `${a.summary.name}:${a.summary.startTime}`), sorted);
             return sorted;
         }
         getPrevRidesListDisplay(maxEntries = 12) {
@@ -406,6 +412,14 @@ let ActivityRideService = (() => {
                     props.splice(currentIdx - 1, 1);
                 }
             }
+            let logInfo = '';
+            try {
+                logInfo = `(${props.length}/${prevRides.length})`
+                    + props.map(pr => { var _a, _b; return `${pr.position}:${(_a = pr.avatar) === null || _a === void 0 ? void 0 : _a.shirt}-${(_b = pr.avatar) === null || _b === void 0 ? void 0 : _b.helmet}:${pr.title}:${pr.timeGap}:${pr.distanceGap}`; })
+                        .join(',');
+            }
+            catch (_a) { }
+            this.logEvent({ message: 'PrevRides', prevRides: logInfo });
             return props;
         }
         getPrevActivityLog(ai, current) {
@@ -534,13 +548,17 @@ let ActivityRideService = (() => {
                 if (!this.current || !((_a = this.activity) === null || _a === void 0 ? void 0 : _a.route))
                     return;
                 this.current.showPrev = settings.showPrev;
+                this.current.prevRides = undefined;
                 const { startPos, realityFactor } = settings;
                 const routeId = this.activity.route.id;
                 const routeHash = this.activity.route.hash;
-                const filter = { routeId, routeHash, startPos, realityFactor };
-                const prevRides = (0, list_1.useActivityList)().getPastActivities(filter, { details: true })
-                    .filter(a => a.summary.rideTime > 60);
-                this.current.prevRides = prevRides;
+                const filter = { routeId, routeHash, startPos, realityFactor, minTime: 60, minDistance: 500 };
+                (0, list_1.useActivityList)()
+                    .getPastActivitiesWithDetails(filter)
+                    .then(prevRides => {
+                    this.current.prevRides = prevRides;
+                    this.observer.emit('list.init', prevRides);
+                });
             }
             catch (err) {
                 this.logError(err, 'initPrevActivities');
@@ -683,6 +701,7 @@ let ActivityRideService = (() => {
             const startTime = new Date(this.tsStart).toUTCString();
             this.current = { deviceData: {}, dataState: {} };
             let startPos = 0;
+            let endPos, segment;
             let realityFactor;
             let routeName;
             let routeId;
@@ -705,6 +724,8 @@ let ActivityRideService = (() => {
                         (0, route_1.validateRoute)(selectedRoute);
                         const s = startSettings;
                         startPos = s.startPos;
+                        endPos = s.endPos;
+                        segment = s.segment;
                         this.current.endPos = s.endPos;
                         realityFactor = s.realityFactor;
                         routeId = selectedRoute.description.id;
@@ -741,7 +762,7 @@ let ActivityRideService = (() => {
                 distance: 0,
                 totalElevation: 0,
                 logs: [],
-                startPos, realityFactor,
+                startPos, endPos, segment, realityFactor,
                 fileName
             };
             return activity;
@@ -844,7 +865,7 @@ let ActivityRideService = (() => {
                     this.activity.totalElevation = this.current.elevationGain;
                     let list;
                     if (this.current.showPrev) {
-                        list = this.getPrevRideStats(this.current.prevRides, logRecord);
+                        list = this.getPrevRideStats(logRecord);
                         this.emit('prevRides', list);
                     }
                     this.emit('data', data, list);

package/package.json

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