incyclist-services 1.7.70 → 1.7.72

package/lib/cjs/devices/ride/service.js

@@ -1362,8 +1362,15 @@ let DeviceRideService = (() => {
         canEnforceSimulator() {
             const selected = (0, routes_1.getRouteList)().getSelected();
             const personalApiKey = this.getGoogleMaps().hasPersonalApiKey();
+            if (!selected?.description)
+                return false;
             if (selected?.description?.hasVideo || personalApiKey)
                 return true;
+            if (!selected.description.hasVideo) {
+                const rideView = (0, settings_1.useUserSettings)().getValue('preferences.rideView', null);
+                if (rideView === 'map')
+                    return true;
+            }
             return (0, settings_1.useUserSettings)().isNewUser();
         }
         logEvent(event) {

package/lib/cjs/ride/display/service.js

@@ -191,7 +191,6 @@ let RideDisplayService = (() => {
             }
         }
         pause(requester = 'user') {
-            console.log('# PAUSE', requester);
             try {
                 if (this.state !== 'Active')
                     return;
@@ -378,7 +377,7 @@ let RideDisplayService = (() => {
                 return { ...props, ...childProps };
             }
             catch (err) {
-                this.logError(err, 'getDisplayProperties');
+                this.logError(err, 'getDisplayProperties', { state: this.state });
                 return { state: this.state };
             }
         }
@@ -426,7 +425,7 @@ let RideDisplayService = (() => {
         async stopRide(props = {}) {
             try {
                 if (this.state !== 'Starting' && this.state !== 'Idle') {
-                    this.logEvent({ message: "activity stopped", activity: this.activity?.id });
+                    this.logEvent({ message: "activity stopped", activity: this.activity?.id, lastState: this.state });
                 }
                 const prevState = this.state;
                 this.state = prevState === 'Starting' ? 'Closing' : 'Finished';
@@ -450,7 +449,6 @@ let RideDisplayService = (() => {
                 }
                 if (prevState !== 'Starting')
                     this.enableScreensaver();
-                this.state = 'Idle';
             }
             catch (err) {
                 this.logError(err, 'stopRide');
@@ -459,9 +457,10 @@ let RideDisplayService = (() => {
         }
         async closePrevRide() {
             try {
-                if (this.observer || (this.state !== 'Idle')) {
+                if (this.observer || (this.state !== 'Idle' && this.state !== 'Finished')) {
                     await this.stopRide({ noStateUpdates: true });
                 }
+                this.state = 'Idle';
             }
             catch (err) {
                 this.logError(err, 'init');

package/lib/cjs/ride/page/service.js

@@ -196,6 +196,12 @@ let RidePageService = (() => {
         }
         onMenuClose() {
             try {
+                const state = this.getRideDisplay().getState();
+                if (state === 'Finished' || this.menuProps.finished) {
+                    this.moveToPreviousPage();
+                    this.closePage();
+                    return;
+                }
                 this.menuProps = null;
                 this.updatePageDisplay();
             }
@@ -223,6 +229,15 @@ let RidePageService = (() => {
                 this.logError(err, 'onResume');
             }
         }
+        onFinished() {
+            try {
+                this.menuProps = { showResume: false, finished: true };
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'onResume');
+            }
+        }
         onEndRide() {
             try {
                 this.getRideDisplay().stop();
@@ -336,6 +351,9 @@ let RidePageService = (() => {
                 case 'Paused':
                     this.menuProps = { showResume: true };
                     break;
+                case 'Finished':
+                    this.menuProps = { showResume: false, finished: true };
+                    break;
                 case 'Active':
                     this.menuProps = null;
                     break;

package/lib/cjs/ride/route/GpxDisplayService.js

@@ -40,7 +40,7 @@ const apps_1 = require("../../apps");
 const decorators_1 = require("../../base/decorators");
 const types_1 = require("../../base/types");
 const routes_1 = require("../../routes");
-const settings_1 = require("../../settings");
+const display_1 = require("../../settings/display");
 const RouteDisplayService_1 = require("./RouteDisplayService");
 const SV_UPDATE_FREQ = 3000;
 const SV_MIN_READY = 1500;
@@ -48,18 +48,18 @@ const SV_MIN_DELAY = 1000;
 let GpxDisplayService = (() => {
     let _classSuper = RouteDisplayService_1.RouteDisplayService;
     let _instanceExtraInitializers = [];
-    let _getUserSettings_decorators;
     let _getGoogleMaps_decorators;
     let _getBindings_decorators;
+    let _getRideSettingsDisplay_decorators;
     return class GpxDisplayService extends _classSuper {
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-            _getUserSettings_decorators = [decorators_1.Injectable];
             _getGoogleMaps_decorators = [decorators_1.Injectable];
             _getBindings_decorators = [decorators_1.Injectable];
-            __esDecorate(this, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
+            _getRideSettingsDisplay_decorators = [decorators_1.Injectable];
             __esDecorate(this, null, _getGoogleMaps_decorators, { kind: "method", name: "getGoogleMaps", static: false, private: false, access: { has: obj => "getGoogleMaps" in obj, get: obj => obj.getGoogleMaps }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getBindings_decorators, { kind: "method", name: "getBindings", static: false, private: false, access: { has: obj => "getBindings" in obj, get: obj => obj.getBindings }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getRideSettingsDisplay_decorators, { kind: "method", name: "getRideSettingsDisplay", static: false, private: false, access: { has: obj => "getRideSettingsDisplay" in obj, get: obj => obj.getRideSettingsDisplay }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
         mapLoaded = (__runInitializers(this, _instanceExtraInitializers), false);
@@ -78,7 +78,7 @@ let GpxDisplayService = (() => {
         }
         initView() {
             try {
-                const rideView = this.getRideView();
+                const rideView = this.getRideSettingsDisplay().getRideView();
                 if (rideView === 'sv') {
                     const updateFreq = this.getDefaultUpdateFrequency();
                     const minimalPause = this.getMinimalPause();
@@ -121,7 +121,7 @@ let GpxDisplayService = (() => {
             };
         }
         getStartOverlayProps() {
-            const rideView = this.getRideView();
+            const rideView = this.getRideSettingsDisplay().getRideView();
             if (rideView === 'map' || this.isMobile()) {
                 return {
                     mapType: this.getRideViewName(),
@@ -135,7 +135,7 @@ let GpxDisplayService = (() => {
             };
         }
         isStartRideCompleted() {
-            const rideView = this.getRideView();
+            const rideView = this.getRideSettingsDisplay().getRideView();
             if (rideView === 'map' || this.isMobile()) {
                 this.mapLoaded = true;
                 return true;
@@ -144,7 +144,7 @@ let GpxDisplayService = (() => {
         }
         getDisplayProperties(props) {
             let routeProps = super.getDisplayProperties(props);
-            const rideView = this.getRideView();
+            const rideView = this.getRideSettingsDisplay().getRideView();
             if (rideView === 'sv') {
                 routeProps = { ...routeProps, ...this.getStreetViewProps(props) };
             }
@@ -160,13 +160,10 @@ let GpxDisplayService = (() => {
             };
         }
         getRideView() {
-            if (this.isMobile())
-                return 'sv';
-            const rideView = this.getUserSettings().get('preferences.rideView', 'sv');
-            return rideView;
+            return this.getRideSettingsDisplay().getRideView();
         }
         getRideViewName() {
-            const rideView = this.getRideView();
+            const rideView = this.getRideSettingsDisplay().getRideView();
             const map = {
                 map: 'Map',
                 sv: 'Street View',
@@ -261,7 +258,7 @@ let GpxDisplayService = (() => {
         }
         onPositionUpdate(state) {
             const { route, position } = state ?? {};
-            const rideView = this.getRideView();
+            const rideView = this.getRideSettingsDisplay().getRideView();
             if (rideView === 'sv') {
                 const sincePrev = Date.now() - (this.tsPrevSVUpdate ?? 0);
                 if (sincePrev > this.getStreetViewUpdateDelay() - 25) {
@@ -308,8 +305,8 @@ let GpxDisplayService = (() => {
         isMobile() {
             return this.getBindings().appInfo?.getChannel() === 'mobile';
         }
-        getUserSettings() {
-            return (0, settings_1.useUserSettings)();
+        isIOS() {
+            return this.getBindings().appInfo?.getOS().platform === 'ios';
         }
         getGoogleMaps() {
             return (0, apps_1.useGoogleMaps)();
@@ -317,6 +314,9 @@ let GpxDisplayService = (() => {
         getBindings() {
             return (0, api_1.getBindings)();
         }
+        getRideSettingsDisplay() {
+            return (0, display_1.useRideSettingsDisplay)();
+        }
     };
 })();
 exports.GpxDisplayService = GpxDisplayService;

package/lib/cjs/ride/route/RouteDisplayService.js

@@ -276,7 +276,7 @@ let RouteDisplayService = (() => {
                 const mode = this.getDeviceRide().getCyclingMode();
                 const isSIM = mode?.isSIM();
                 const realityFactor = this.startSettings?.realityFactor ?? 100;
-                const targetSlope = (this.position.slope ?? 0) * realityFactor / 100;
+                const targetSlope = (this.position?.slope ?? 0) * realityFactor / 100;
                 if (props?.limits && !isSIM) {
                     delete this.prevRequestSlope;
                     return { ...props?.limits, slope: targetSlope };

package/lib/cjs/settings/display/ride/service.js

@@ -83,8 +83,10 @@ let RideSettingsDisplayService = (() => {
             };
         }
         setRideView(rideView) {
+            if (this.isRestricted())
+                return;
             try {
-                this.getUserSettings().get('preferences.rideView', rideView);
+                this.getUserSettings().set('preferences.rideView', rideView);
             }
             catch (err) {
                 this.logError(err, 'setRideView');
@@ -95,6 +97,8 @@ let RideSettingsDisplayService = (() => {
                 this.observer.emit('changed', this.getDisplayProps());
         }
         getRideView() {
+            if (this.isRestricted())
+                return 'map';
             if (this.isMobile() && !this.isAndroid())
                 return 'map';
             const rideView = this.getUserSettings().get('preferences.rideView', 'sv');
@@ -102,6 +106,10 @@ let RideSettingsDisplayService = (() => {
         }
         getRideViewOptions() {
             const map = new Map();
+            if (this.isRestricted()) {
+                map.set('map', 'Map');
+                return map;
+            }
             if (!this.isIOS())
                 map.set('sv', 'Street View');
             map.set('map', 'Map');
@@ -109,6 +117,13 @@ let RideSettingsDisplayService = (() => {
                 map.set('sat', 'Satellite View');
             return map;
         }
+        isRestricted() {
+            if (this.isMobile()) {
+                const secretsStatus = this.getSecretBinding()?.getSecretsStatus?.();
+                return (secretsStatus === 'stale' || secretsStatus === 'missing' || secretsStatus === undefined);
+            }
+            return false;
+        }
         isMobile() {
             return this.getBindings().appInfo?.getChannel() === 'mobile';
         }
@@ -116,7 +131,7 @@ let RideSettingsDisplayService = (() => {
             return this.getBindings().appInfo?.getOS()?.platform === 'android';
         }
         isIOS() {
-            return this.getBindings().appInfo?.getOS()?.platform === 'darwin';
+            return this.getBindings().appInfo?.getOS()?.platform === 'ios';
         }
         getUserSettings() {
             return (0, service_2.useUserSettings)();
@@ -124,6 +139,9 @@ let RideSettingsDisplayService = (() => {
         getBindings() {
             return (0, api_1.getBindings)();
         }
+        getSecretBinding() {
+            return this.getBindings().secret;
+        }
     };
     return RideSettingsDisplayService = _classThis;
 })();

package/lib/esm/{src/activities/upload/intervals.js → activities/upload/trainingpeaks.js}

@@ -32,110 +32,92 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
-import { IncyclistService } from "../../base/service";
-import { Singleton } from "../../base/types";
-import { Injectable } from "../../base/decorators/Injection";
-import { ActivityUploadFactory } from "./factory";
-import { IntervalsAppConnection } from "../../apps/intervals/IntervalsAppConnection";
-let IntervalsUpload = (() => {
+import { Injectable } from '../../base/decorators/Injection';
+import { IncyclistService } from '../../base/service';
+import { Singleton } from '../../base/types';
+import { TrainingPeaksAppConnection } from '../../apps/trainingpeaks/TrainingPeaksAppConnection';
+import { ActivityUploadFactory } from './factory';
+let TrainingPeaksUpload = (() => {
     let _classDecorators = [Singleton];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
     let _classSuper = IncyclistService;
     let _instanceExtraInitializers = [];
-    let _getIntervalsAppConnection_decorators;
-    var IntervalsUpload = class extends _classSuper {
+    let _getConnection_decorators;
+    var TrainingPeaksUpload = class extends _classSuper {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-            _getIntervalsAppConnection_decorators = [Injectable];
-            __esDecorate(this, null, _getIntervalsAppConnection_decorators, { kind: "method", name: "getIntervalsAppConnection", static: false, private: false, access: { has: obj => "getIntervalsAppConnection" in obj, get: obj => obj.getIntervalsAppConnection }, metadata: _metadata }, null, _instanceExtraInitializers);
+            _getConnection_decorators = [Injectable];
+            __esDecorate(this, null, _getConnection_decorators, { kind: "method", name: "getConnection", static: false, private: false, access: { has: obj => "getConnection" in obj, get: obj => obj.getConnection }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
-            IntervalsUpload = _classThis = _classDescriptor.value;
+            TrainingPeaksUpload = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
             __runInitializers(_classThis, _classExtraInitializers);
         }
         isInitialized = __runInitializers(this, _instanceExtraInitializers);
-        connection = new IntervalsAppConnection();
+        connection = new TrainingPeaksAppConnection();
         constructor() {
-            super('IntervalsUpload');
+            super('TrainingPeaksUpload');
             this.isInitialized = false;
             this.init();
         }
         init() {
             if (this.isInitialized)
                 return true;
-            this.isInitialized = this.getIntervalsAppConnection().init();
+            this.isInitialized = this.getConnection().init();
             return this.isInitialized;
         }
         isConnected() {
-            return this.getIntervalsAppConnection().isConnected();
+            return this.getConnection().isConnected();
         }
         async upload(activity, format = 'TCX') {
             try {
                 const ok = this.ensureInitialized();
                 if (!ok) {
-                    this.logEvent({ message: 'Intervals.icu Upload skipped', reason: 'not initialized' });
+                    this.logEvent({ message: 'TrainingPeaks upload skipped', reason: 'not initialized' });
                     return false;
                 }
                 if (!this.isConnected())
                     return false;
                 const lcFormat = format.toLowerCase();
                 const ucFormat = format.toUpperCase();
-                this.logEvent({ message: 'Intervals.icu Upload', format: ucFormat });
+                this.logEvent({ message: 'TrainingPeaks upload', format: ucFormat });
                 if (!activity.links)
                     activity.links = {};
                 const fileName = activity[`${lcFormat}FileName`];
-                const res = await this.getApi().upload(fileName, {
-                    name: activity.title,
-                    description: '',
-                    format: this.getIntervalsFormat(format)
-                });
-                this.logEvent({ message: 'Intervals.icu Upload success', activityId: res.intervalsId });
-                activity.links.intervals = {
-                    activity_id: res.intervalsId,
-                    url: this.getUrl(res.intervalsId)
+                const res = await this.getApi().upload(fileName, { name: activity.title, description: '' });
+                this.logEvent({ message: 'TrainingPeaks upload success', activityId: res.trainingPeaksId });
+                activity.links.trainingpeaks = {
+                    activity_id: String(res.trainingPeaksId),
+                    url: this.getUrl(res.trainingPeaksId)
                 };
                 return true;
             }
             catch (err) {
-                this.logEvent({ message: 'Intervals.icu Upload failure', error: err.message });
-                activity.links.intervals = {
-                    error: err.message
-                };
+                this.logEvent({ message: 'TrainingPeaks upload failure', error: err.message });
+                activity.links.trainingpeaks = { error: err.message };
                 return false;
             }
         }
         getUrl(activityId) {
-            return `https://intervals.icu/activities/${activityId}`;
-        }
-        getIntervalsFormat(format) {
-            switch (format.toLowerCase()) {
-                case 'tcx':
-                    return 'tcx';
-                case 'fit':
-                    return 'fit';
-                case 'gox':
-                    return 'gpx';
-                default:
-                    return null;
-            }
+            return `https://www.trainingpeaks.com/athlete/workouts/${activityId}`;
         }
         ensureInitialized() {
             if (!this.isInitialized)
                 this.init();
             return this.isInitialized;
         }
-        getIntervalsAppConnection() {
+        getConnection() {
             return this.connection;
         }
         getApi() {
-            return this.getIntervalsAppConnection().getApi();
+            return this.getConnection().getApi();
         }
     };
-    return IntervalsUpload = _classThis;
+    return TrainingPeaksUpload = _classThis;
 })();
-export { IntervalsUpload };
+export { TrainingPeaksUpload };
 const factory = new ActivityUploadFactory();
-factory.add('intervals', new IntervalsUpload());
+factory.add('trainingpeaks', new TrainingPeaksUpload());

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

@@ -0,0 +1,143 @@
+import { EventLogger } from 'gd-eventlog';
+import { Observer } from '../../../../base/types/observer';
+import { valid } from '../../../../utils/valid';
+import { sleep } from '../../../../utils/sleep';
+import { AppApiBase } from '../base';
+const UPLOAD_POLL_INTERVAL_MS = 2000;
+const UPLOAD_TIMEOUT_MS = 60000;
+export class TrainingPeaksApi extends AppApiBase {
+    config;
+    logger;
+    observer;
+    constructor() {
+        super();
+        this.logger = new EventLogger('TrainingPeaksApi');
+        this.observer = new Observer();
+    }
+    getBaseUrl() {
+        return process.env.TRAININGPEAKS_API || 'https://api.sandbox.trainingpeaks.com';
+    }
+    getOauthBaseUrl() {
+        return process.env.TRAININGPEAKS_OAUTH_URL || 'https://oauth.sandbox.trainingpeaks.com';
+    }
+    init(config) {
+        this.config = config;
+        return this.observer;
+    }
+    update(config) {
+        if (!this.config)
+            throw new Error('update not allowed before init');
+        this.config = { ...this.config, ...config };
+    }
+    isAuthenticated() {
+        return valid(this.config?.accessToken);
+    }
+    async getLoggedInAthlete() {
+        await this.verifyAuthentication();
+        const response = await this.get('/v1/athlete/profile');
+        return response.data;
+    }
+    async getCalendarWorkouts(opts) {
+        await this.verifyAuthentication();
+        const oldest = opts?.oldest ?? new Date();
+        const newest = opts?.newest ?? new Date(oldest.valueOf() + 30 * 24 * 60 * 60 * 1000);
+        const fmt = (d) => d.toISOString().slice(0, 10);
+        const response = await this.get(`/v2/workouts/${fmt(oldest)}/${fmt(newest)}`);
+        return response.data;
+    }
+    async getWorkoutFile(id, format = 'zwo') {
+        await this.verifyAuthentication();
+        const response = await this.get(`/v2/workouts/wod/file/${id}?format=${format}`);
+        return response.data;
+    }
+    async upload(fileName, props) {
+        await this.verifyAuthentication();
+        const reqOpts = {
+            headers: { Authorization: `bearer ${this.config.accessToken}` }
+        };
+        const form = await this.createForm('/v3/file', { file: { type: 'file', fileName } }, reqOpts);
+        const response = await this.postForm(form);
+        const location = response.headers?.['location'] ?? '';
+        const trackingId = location.split('/').filter(Boolean).pop();
+        if (!trackingId) {
+            throw new Error('TrainingPeaks upload failed: no tracking ID returned');
+        }
+        return this.waitForUploadComplete(trackingId, props?.externalId);
+    }
+    async getUploadStatus(trackingId) {
+        await this.verifyAuthentication();
+        const response = await this.get(`/v3/status/${trackingId}`);
+        return response.data;
+    }
+    async verifyAuthentication() {
+        if (!this.isAuthenticated())
+            throw new Error('not authenticated');
+        await this.verifyToken();
+    }
+    async verifyToken() {
+        if (!this.isTokenStillValid()) {
+            try {
+                await this.refreshToken();
+            }
+            catch {
+                throw new Error('token refresh failed');
+            }
+        }
+    }
+    isTokenStillValid() {
+        if (!this.config?.expiration)
+            return false;
+        return Date.now() < this.config.expiration.valueOf();
+    }
+    async refreshToken() {
+        this.logger.logEvent({ message: 'TrainingPeaks refresh token start' });
+        try {
+            const response = await this.getApi().request({
+                method: 'post',
+                url: `${this.getOauthBaseUrl()}/oauth/token`,
+                data: new URLSearchParams({
+                    grant_type: 'refresh_token',
+                    refresh_token: this.config.refreshToken,
+                    client_id: this.config.clientId,
+                    client_secret: this.config.clientSecret,
+                }).toString(),
+                headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+            });
+            const data = response.data;
+            this.config.accessToken = data.access_token;
+            this.config.refreshToken = data.refresh_token;
+            this.config.expiration = new Date(Date.now() + data.expires_in * 1000);
+            this.logger.logEvent({ message: 'TrainingPeaks refresh token success' });
+            this.observer.emit('token.updated', this.config);
+        }
+        catch (err) {
+            this.logger.logEvent({ message: 'TrainingPeaks refresh token error', error: err.message });
+            throw err;
+        }
+    }
+    async waitForUploadComplete(trackingId, externalId) {
+        const deadline = Date.now() + UPLOAD_TIMEOUT_MS;
+        while (Date.now() < deadline) {
+            const status = await this.getUploadStatus(trackingId);
+            if (status.Completed) {
+                if (!status.WorkoutIds?.length) {
+                    throw new Error(`TrainingPeaks upload failed: ${status.Status}`);
+                }
+                return { trainingPeaksId: status.WorkoutIds[0], externalId };
+            }
+            await sleep(UPLOAD_POLL_INTERVAL_MS);
+        }
+        throw new Error('TrainingPeaks upload timed out');
+    }
+    async get(url, config) {
+        const props = config ?? {};
+        const response = await this.getApi().request({
+            method: 'get',
+            url: this.getBaseUrl() + url,
+            headers: { Authorization: `bearer ${this.config.accessToken}` },
+            validateStatus: (status) => (status >= 200 && status < 300) || status === 403,
+            ...props
+        });
+        return response;
+    }
+}

package/lib/esm/apps/base/api/trainingpeaks/index.js

@@ -0,0 +1 @@
+export { TrainingPeaksApi } from './api';