incyclist-services 1.7.70 → 1.7.72

package/lib/esm/{src/apps/strava/StravaAppConnection.js → apps/trainingpeaks/TrainingPeaksAppConnection.js}

@@ -32,12 +32,12 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
-import { getBindings } from "../../api";
-import { Injectable, Singleton } from "../../base/decorators";
-import { valid } from "../../utils/valid";
-import { StravaApi } from "../base/api";
-import { ConnectedAppService } from "../base/app";
-let StravaAppConnection = (() => {
+import { getBindings } from '../../api';
+import { Injectable, Singleton } from '../../base/decorators';
+import { valid } from '../../utils/valid';
+import { TrainingPeaksApi } from '../base/api/trainingpeaks';
+import { ConnectedAppService } from '../base/app';
+let TrainingPeaksAppConnection = (() => {
     let _classDecorators = [Singleton];
     let _classDescriptor;
     let _classExtraInitializers = [];
@@ -45,14 +45,14 @@ let StravaAppConnection = (() => {
     let _classSuper = ConnectedAppService;
     let _instanceExtraInitializers = [];
     let _getSecretBindings_decorators;
-    var StravaAppConnection = class extends _classSuper {
+    var TrainingPeaksAppConnection = class extends _classSuper {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _getSecretBindings_decorators = [Injectable];
             __esDecorate(this, null, _getSecretBindings_decorators, { kind: "method", name: "getSecretBindings", static: false, private: false, access: { has: obj => "getSecretBindings" in obj, get: obj => obj.getSecretBindings }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
-            StravaAppConnection = _classThis = _classDescriptor.value;
+            TrainingPeaksAppConnection = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
             __runInitializers(_classThis, _classExtraInitializers);
         }
@@ -60,11 +60,11 @@ let StravaAppConnection = (() => {
         api;
         tokenUpdateHandler = this.updateConfig.bind(this);
         constructor() {
-            super('StravaAppConnection', 'strava');
+            super('TrainingPeaksAppConnection', 'trainingpeaks');
         }
         async connect(credentials) {
             this.ensureInitialized();
-            this.logEvent({ message: 'Connect with Strava' });
+            this.logEvent({ message: 'Connect with TrainingPeaks' });
             try {
                 const isConnected = this.isConnected();
                 const config = this.buildConfigFromCredentials(credentials);
@@ -75,7 +75,7 @@ let StravaAppConnection = (() => {
                     this.initApi(config);
                     this.saveCredentials(config);
                 }
-                this.logEvent({ message: 'Connect with Strava success' });
+                this.logEvent({ message: 'Connect with TrainingPeaks success' });
                 return true;
             }
             catch (err) {
@@ -100,12 +100,11 @@ let StravaAppConnection = (() => {
             if (!this.isInitialized) {
                 this.init();
             }
-            return (valid(this.config));
+            return valid(this.config);
         }
         getCredentials() {
-            const userSettings = this.getUserSettings();
             try {
-                return userSettings.get('user.auth.strava', null);
+                return this.getUserSettings().get('user.auth.trainingpeaks', null);
             }
             catch {
                 return null;
@@ -113,22 +112,22 @@ let StravaAppConnection = (() => {
         }
         getApi() {
             if (!this.api)
-                this.api = new StravaApi();
+                this.api = new TrainingPeaksApi();
             return this.api;
         }
         initAuth() {
             let isInitialized = false;
             try {
                 const auth = this.getCredentials();
-                const clientId = this.getSecret('STRAVA_CLIENT_ID');
-                const clientSecret = this.getSecret('STRAVA_CLIENT_SECRET');
+                const clientId = this.getSecret('TRAININGPEAKS_CLIENT_ID');
+                const clientSecret = this.getSecret('TRAININGPEAKS_CLIENT_SECRET');
                 if (clientId && clientSecret && auth) {
-                    this.logEvent({ message: 'Strava init done', hasCredentials: true });
+                    this.logEvent({ message: 'TrainingPeaks init done', hasCredentials: true });
                     this.config = this.buildConfigFromCredentials(auth);
                     this.initApi(this.config);
                 }
                 else {
-                    this.logEvent({ message: 'Strava init done', hasCredentials: false });
+                    this.logEvent({ message: 'TrainingPeaks init done', hasCredentials: false });
                 }
                 isInitialized = true;
             }
@@ -149,42 +148,42 @@ let StravaAppConnection = (() => {
                 this.config = config;
             try {
                 if (!this.isConnected()) {
-                    this.logEvent({ message: 'Strava Delete Credentials' });
-                    this.getUserSettings().set('user.auth.strava', null);
+                    this.logEvent({ message: 'TrainingPeaks delete credentials' });
+                    this.getUserSettings().set('user.auth.trainingpeaks', null);
                     return;
                 }
-                this.logEvent({ message: 'Strava Save Credentials' });
-                this.getUserSettings().set('user.auth.strava', {
+                this.logEvent({ message: 'TrainingPeaks save credentials' });
+                this.getUserSettings().set('user.auth.trainingpeaks', {
                     accesstoken: this.config.accessToken,
                     refreshtoken: this.config.refreshToken,
-                    expiration: this.config.expiration?.toISOString()
+                    expiration: this.config.expiration?.valueOf().toString()
                 });
             }
             catch (err) {
                 this.logEvent({ message: 'error', fn: 'saveCredentials', error: err.message, stack: err.stack });
             }
-            this.logEvent({ message: 'Strava Save Credentials done' });
-        }
-        getSecret(key) {
-            return this.getSecretBindings()?.getSecret(key);
+            this.logEvent({ message: 'TrainingPeaks save credentials done' });
         }
         buildConfigFromCredentials(credentials) {
             return {
-                clientId: this.getSecret('STRAVA_CLIENT_ID'),
-                clientSecret: this.getSecret('STRAVA_CLIENT_SECRET'),
+                clientId: this.getSecret('TRAININGPEAKS_CLIENT_ID'),
+                clientSecret: this.getSecret('TRAININGPEAKS_CLIENT_SECRET'),
                 accessToken: credentials?.accesstoken,
                 refreshToken: credentials?.refreshtoken,
-                expiration: credentials?.expiration ? new Date(credentials.expiration) : undefined
+                expiration: credentials?.expiration ? new Date(Number(credentials.expiration)) : undefined
             };
         }
         initApi(config) {
             const observer = this.getApi().init(config);
             observer.on('token.updated', this.tokenUpdateHandler);
         }
+        getSecret(key) {
+            return this.getSecretBindings()?.getSecret(key);
+        }
         getSecretBindings() {
             return getBindings()?.secret;
         }
     };
-    return StravaAppConnection = _classThis;
+    return TrainingPeaksAppConnection = _classThis;
 })();
-export { StravaAppConnection };
+export { TrainingPeaksAppConnection };

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

@@ -1356,8 +1356,15 @@ let DeviceRideService = (() => {
         canEnforceSimulator() {
             const selected = 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 = useUserSettings().getValue('preferences.rideView', null);
+                if (rideView === 'map')
+                    return true;
+            }
             return useUserSettings().isNewUser();
         }
         logEvent(event) {

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

@@ -188,7 +188,6 @@ let RideDisplayService = (() => {
             }
         }
         pause(requester = 'user') {
-            console.log('# PAUSE', requester);
             try {
                 if (this.state !== 'Active')
                     return;
@@ -375,7 +374,7 @@ let RideDisplayService = (() => {
                 return { ...props, ...childProps };
             }
             catch (err) {
-                this.logError(err, 'getDisplayProperties');
+                this.logError(err, 'getDisplayProperties', { state: this.state });
                 return { state: this.state };
             }
         }
@@ -423,7 +422,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';
@@ -447,7 +446,6 @@ let RideDisplayService = (() => {
                 }
                 if (prevState !== 'Starting')
                     this.enableScreensaver();
-                this.state = 'Idle';
             }
             catch (err) {
                 this.logError(err, 'stopRide');
@@ -456,9 +454,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/esm/ride/page/service.js

@@ -193,6 +193,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();
             }
@@ -220,6 +226,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();
@@ -333,6 +348,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/esm/ride/route/GpxDisplayService.js

@@ -37,7 +37,7 @@ import { useGoogleMaps } from "../../apps";
 import { Injectable } from "../../base/decorators";
 import { Observer } from "../../base/types";
 import { getHeading } from "../../routes";
-import { useUserSettings } from "../../settings";
+import { useRideSettingsDisplay } from "../../settings/display";
 import { RouteDisplayService } from "./RouteDisplayService";
 const SV_UPDATE_FREQ = 3000;
 const SV_MIN_READY = 1500;
@@ -45,18 +45,18 @@ const SV_MIN_DELAY = 1000;
 let GpxDisplayService = (() => {
     let _classSuper = 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 = [Injectable];
             _getGoogleMaps_decorators = [Injectable];
             _getBindings_decorators = [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 = [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);
@@ -75,7 +75,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();
@@ -118,7 +118,7 @@ let GpxDisplayService = (() => {
             };
         }
         getStartOverlayProps() {
-            const rideView = this.getRideView();
+            const rideView = this.getRideSettingsDisplay().getRideView();
             if (rideView === 'map' || this.isMobile()) {
                 return {
                     mapType: this.getRideViewName(),
@@ -132,7 +132,7 @@ let GpxDisplayService = (() => {
             };
         }
         isStartRideCompleted() {
-            const rideView = this.getRideView();
+            const rideView = this.getRideSettingsDisplay().getRideView();
             if (rideView === 'map' || this.isMobile()) {
                 this.mapLoaded = true;
                 return true;
@@ -141,7 +141,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) };
             }
@@ -157,13 +157,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',
@@ -258,7 +255,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) {
@@ -305,8 +302,8 @@ let GpxDisplayService = (() => {
         isMobile() {
             return this.getBindings().appInfo?.getChannel() === 'mobile';
         }
-        getUserSettings() {
-            return useUserSettings();
+        isIOS() {
+            return this.getBindings().appInfo?.getOS().platform === 'ios';
         }
         getGoogleMaps() {
             return useGoogleMaps();
@@ -314,6 +311,9 @@ let GpxDisplayService = (() => {
         getBindings() {
             return getBindings();
         }
+        getRideSettingsDisplay() {
+            return useRideSettingsDisplay();
+        }
     };
 })();
 export { GpxDisplayService };

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

@@ -270,7 +270,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/esm/settings/display/ride/service.js

@@ -80,8 +80,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');
@@ -92,6 +94,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');
@@ -99,6 +103,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');
@@ -106,6 +114,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';
         }
@@ -113,7 +128,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 useUserSettings();
@@ -121,6 +136,9 @@ let RideSettingsDisplayService = (() => {
         getBindings() {
             return getBindings();
         }
+        getSecretBinding() {
+            return this.getBindings().secret;
+        }
     };
     return RideSettingsDisplayService = _classThis;
 })();