incyclist-services 1.7.21 → 1.7.23

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

@@ -135,12 +135,12 @@ let RLVDisplayService = (() => {
         }
         pause() {
             super.pause();
-            this.currentVideo.syncHelper.pause();
+            this.currentVideo?.syncHelper.pause();
             this.isVideoPaused = true;
         }
         resume() {
             super.resume();
-            this.currentVideo.syncHelper.resume();
+            this.currentVideo?.syncHelper.resume();
             this.isVideoPaused = false;
         }
         getDisplayProperties(props) {
@@ -157,14 +157,14 @@ let RLVDisplayService = (() => {
             if (this.videos.length === 1) {
                 const autoConvert = this.currentVideo?.playback === 'converted';
                 const video = {
-                    src: this.currentVideo.source,
+                    src: this.currentVideo?.source,
                     startTime,
                     autoConvert,
                     info: this.getInfotextDisplayProps(),
                     muted: true,
                     loop: this.isLoopEnabled() ? true : undefined,
-                    playback: this.currentVideo.playback,
-                    observer: this.currentVideo.observer,
+                    playback: this.currentVideo?.playback,
+                    observer: this.currentVideo?.observer,
                     onLoaded: this.onVideoLoaded.bind(this),
                     onLoadError: this.onVideoLoadError.bind(this),
                     onPlaybackError: this.onVideoPlaybackError.bind(this),
@@ -239,8 +239,8 @@ let RLVDisplayService = (() => {
         }
         onNextVideo() {
             const old = this.currentVideo;
-            const next = this.currentVideo.next;
-            if (!next)
+            const next = this.currentVideo?.next;
+            if (!next || !old)
                 return;
             old.isCurrent = false;
             old.isInitial = false;
@@ -261,13 +261,13 @@ let RLVDisplayService = (() => {
             this.emit('route-updated', this.getCurrentRoute());
             this.getCoaches().updateRoute(this.getCurrentRoute());
             this.logEvent({ message: 'switching to next video', route: this.getCurrentRoute().details.title,
-                segment: this.currentVideo.route.description.title, offset: this.offset, segmentDistance: this.currentVideo.route.description.distance,
+                segment: this.currentVideo?.route.description.title, offset: this.offset, segmentDistance: this.currentVideo?.route.description.distance,
                 totalDistance: this.getCurrentRoute().details.distance });
         }
         checkInfotextDisplayProps(time) {
             if (!this.currentVideo?.info)
                 return;
-            const info = this.currentVideo.info.find(i => i.start <= time && i.stop > time);
+            const info = this.currentVideo?.info.find(i => i.start <= time && i.stop > time);
             if (info) {
                 this.infotext = info.props;
             }
@@ -323,7 +323,7 @@ let RLVDisplayService = (() => {
         }
         async stop() {
             try {
-                this.currentVideo.syncHelper.stop();
+                this.currentVideo?.syncHelper.stop();
                 delete this.startTime;
                 await super.stop();
             }
@@ -339,7 +339,7 @@ let RLVDisplayService = (() => {
             if (this.currentRoute?.description?.hasGpx && !this.currentRoute?.points?.length) {
                 state = 'Start:Failed';
                 const errMessage = 'Invalid route (GPX missing)';
-                if (!this.currentVideo.error) {
+                if (!this.currentVideo?.error) {
                     this.logError(new Error(errMessage), 'getVideoState', { route: this.currentVideo.route });
                 }
                 this.currentVideo.error = errMessage;
@@ -357,7 +357,7 @@ let RLVDisplayService = (() => {
             return state;
         }
         getVideoLoadProgress() {
-            return { loaded: this.currentVideo?.loaded, bufferTime: this.currentVideo.bufferTime };
+            return { loaded: this.currentVideo?.loaded, bufferTime: this.currentVideo?.bufferTime };
         }
         onConvertUpdate(progress, frames, time) {
             if (!this.currentVideo || this.currentVideo.loaded)
@@ -433,7 +433,7 @@ let RLVDisplayService = (() => {
         }
         onVideoEnded(video = this.currentVideo) {
             video.syncHelper.onVideoEnded();
-            if (this.currentVideo.next) {
+            if (this.currentVideo?.next) {
                 this.onNextVideo();
             }
         }
@@ -442,7 +442,7 @@ let RLVDisplayService = (() => {
             const offset = this.offset ?? 0;
             const { routeDistance, speed } = activityPos;
             if (!this.isVideoPaused) {
-                this.currentVideo.syncHelper.onActivityUpdate(routeDistance - offset, speed);
+                this.currentVideo?.syncHelper.onActivityUpdate(routeDistance - offset, speed);
             }
         }
         initVideoSource(video) {
@@ -468,18 +468,21 @@ let RLVDisplayService = (() => {
         buildVideoError(error, video = this.currentVideo) {
             const src = this.getVideoUrl(video);
             const remote = src?.startsWith('http');
-            switch (error.code) {
-                case MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED:
-                    if (error.message.includes('Format error'))
+            try {
+                switch (error.code) {
+                    case MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED:
+                        if (error.message.includes('Format error'))
+                            return remote ? 'Could not load video' : 'Could not open video file';
+                        return 'Could not decode video';
+                    case MediaError.MEDIA_ERR_NETWORK:
                         return remote ? 'Could not load video' : 'Could not open video file';
-                    return 'Could not decode video';
-                case MediaError.MEDIA_ERR_NETWORK:
-                    return remote ? 'Could not load video' : 'Could not open video file';
-                case MediaError.MEDIA_ERR_ABORTED:
-                    return 'The playback was canceled';
-                case MediaError.MEDIA_ERR_DECODE:
-                    return 'Could not decode video';
+                    case MediaError.MEDIA_ERR_ABORTED:
+                        return 'The playback was canceled';
+                    case MediaError.MEDIA_ERR_DECODE:
+                        return 'Could not decode video';
+                }
             }
+            catch { }
             return error.message;
         }
         getVideoUrl(video) {
@@ -528,11 +531,11 @@ let RLVDisplayService = (() => {
                 let distance = startPos;
                 if (startPos === undefined) {
                     distance = this.isLoopEnabled() ? lapDistance : routeDistance - (this.offset ?? 0);
-                    if (distance > this.currentVideo.route.details.distance) {
+                    if (distance > this.currentVideo?.route.details.distance) {
                         distance = 0;
                     }
                 }
-                const routeId = this.currentVideo.route.description.id;
+                const routeId = this.currentVideo?.route.description.id;
                 this.getUserSettings().set(`routeSelection.video.prevSetting.${routeId}.startPos`, distance);
             }
             catch (err) {

package/lib/cjs/ride/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -43,6 +43,7 @@ const settings_1 = require("../../settings");
 const types_1 = require("../../base/types");
 const uuid_1 = require("uuid");
 const sleep_1 = require("../../utils/sleep");
+const devices_1 = require("../../devices");
 let RoutesPageService = (() => {
     let _classDecorators = [decorators_1.Singleton];
     let _classDescriptor;
@@ -51,14 +52,17 @@ let RoutesPageService = (() => {
     let _classSuper = pages_1.IncyclistPageService;
     let _instanceExtraInitializers = [];
     let _getRouteList_decorators;
+    let _getDevicePairing_decorators;
     let _getUserSettings_decorators;
     var RoutesPageService = class extends _classSuper {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _getRouteList_decorators = [decorators_1.Injectable];
+            _getDevicePairing_decorators = [decorators_1.Injectable];
             _getUserSettings_decorators = [decorators_1.Injectable];
             __esDecorate(this, null, _getRouteList_decorators, { kind: "method", name: "getRouteList", static: false, private: false, access: { has: obj => "getRouteList" in obj, get: obj => obj.getRouteList }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getDevicePairing_decorators, { kind: "method", name: "getDevicePairing", static: false, private: false, access: { has: obj => "getDevicePairing" in obj, get: obj => obj.getDevicePairing }, metadata: _metadata }, null, _instanceExtraInitializers);
             __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);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             RoutesPageService = _classThis = _classDescriptor.value;
@@ -144,6 +148,15 @@ let RoutesPageService = (() => {
             if (card)
                 card.delete();
         }
+        start() {
+            const service = this.getRouteList();
+            const pairing = this.getDevicePairing();
+            const { id, title, videoUrl } = service.getStartSettings() ?? {};
+            this.logEvent({ message: 'Attempting to start a ride', id, title, videoUrl, readyToStart: pairing.isReadyToStart(), });
+            service.close();
+            const next = pairing.isReadyToStart() ? '/rideDeviceOK' : '/pairingStart';
+            this.moveTo(next);
+        }
         startImport(info) {
             if (this.importObserver)
                 return this.importObserver;
@@ -251,6 +264,9 @@ let RoutesPageService = (() => {
         getRouteList() {
             return (0, list_1.useRouteList)();
         }
+        getDevicePairing() {
+            return (0, devices_1.useDevicePairing)();
+        }
         getUserSettings() {
             return (0, settings_1.useUserSettings)();
         }

package/lib/esm/activities/active-rides/mq.js

@@ -82,9 +82,9 @@ let ActiveRideListMessageQueue = (() => {
                 if (existing.subscribed)
                     return;
             }
-            this.getMessageQueue().subscribe(topic);
             if (!existing)
                 this.subscribed.push({ topic, filter, handler });
+            this.getMessageQueue().subscribe(topic);
         }
         unsubscribe(topic) {
             const mq = this.getMessageQueue();
@@ -134,8 +134,13 @@ let ActiveRideListMessageQueue = (() => {
             this.subscribeEnabled = false;
         }
         onTopicSubscribed(topic) {
-            const existing = this.subscribed.find(s => s.topic === topic);
-            existing.subscribed = true;
+            const subscribed = this.subscribed ?? [];
+            const existing = subscribed.find(s => s.topic === topic);
+            if (existing)
+                existing.subscribed = true;
+            else {
+                this.logEvent({ message: 'Warning: subscribe confirmation received but no existing record', topic, subscribed: subscribed.map(s => s.topic).join('') });
+            }
             this.logEvent({ message: 'Subscribed to topic', topic });
         }
         onTopicMessage(topic, message) {

package/lib/esm/activities/types.js

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

package/lib/esm/apps/base/app/index.js

@@ -51,6 +51,7 @@ let ConnectedAppService = (() => {
         appKey;
         isInitialized;
         id;
+        credentials;
         constructor(service, appKey) {
             super(service);
             this.service = service;
@@ -64,7 +65,12 @@ let ConnectedAppService = (() => {
                 return true;
             if (!this.getUserSettings().isInitialized)
                 return false;
-            this.isInitialized = this.initAuth();
+            try {
+                this.isInitialized = this.checkAuth();
+            }
+            catch {
+                this.isInitialized = this.initAuth();
+            }
             return this.isInitialized;
         }
         connect(credentials) {
@@ -82,6 +88,9 @@ let ConnectedAppService = (() => {
         initAuth() {
             throw new Error('method not implemented');
         }
+        checkAuth() {
+            throw new Error('method not implemented');
+        }
         ensureInitialized() {
             if (!this.isInitialized)
                 this.init();

package/lib/esm/apps/komoot/KomootAppConnection.js

@@ -59,9 +59,10 @@ let KomootAppConnection = (() => {
         }
         _isConnecting = __runInitializers(this, _instanceExtraInitializers);
         api;
-        credentials;
         constructor() {
             super('KomootAppConnection', 'komoot');
+            this.api = new KomootApi();
+            this.iniAuth();
         }
         async connect(credentials) {
             this.ensureInitialized();
@@ -104,11 +105,17 @@ let KomootAppConnection = (() => {
             return this.credentials;
         }
         getApi() {
-            if (!this.api)
-                this.api = new KomootApi();
             return this.api;
         }
-        initAuth() {
+        iniAuth() {
+            const api = this.getApi();
+            if (this.credentials) {
+                api.setAuth(this.credentials);
+                return true;
+            }
+            return false;
+        }
+        checkAuth() {
             let isInitialized = false;
             let credentials;
             if (!this.getUserSettings().isInitialized) {
@@ -124,7 +131,7 @@ let KomootAppConnection = (() => {
                         credentials = this.decrypt(CRYPT_ALGO, auth);
                     }
                 }
-                this.logEvent({ message: 'Komoot init done', hasCredentials: (valid(this.credentials?.username) && valid(this.credentials?.password)) });
+                this.logEvent({ message: 'Komoot init done', hasCredentials: (valid(credentials?.username) && valid(credentials?.password)) });
                 isInitialized = true;
             }
             catch (err) {
@@ -132,10 +139,7 @@ let KomootAppConnection = (() => {
                 isInitialized = false;
             }
             this.setupEventListeners();
-            this.credentials = credentials;
-            if (credentials) {
-                this.getApi().setAuth(credentials);
-            }
+            this.credentials = { ...credentials };
             return isInitialized;
         }
         getAuthConfig() {

package/lib/esm/apps/velohero/VeloHeroAppConnection.js

@@ -59,7 +59,6 @@ let VeloHeroAppConnection = (() => {
         }
         _isConnecting = __runInitializers(this, _instanceExtraInitializers);
         api;
-        credentials;
         constructor() {
             super('VeloHeroAppConnection', 'velohero');
         }

package/lib/esm/base/pages/service.js

@@ -36,14 +36,18 @@ import { IncyclistService } from "../service";
 import { Observer } from "../types";
 import { Injectable } from "../decorators";
 import { useAppState } from "../../appstate";
+import { getBindings } from "../../api";
 let IncyclistPageService = (() => {
     let _classSuper = IncyclistService;
     let _instanceExtraInitializers = [];
+    let _getBindings_decorators;
     let _getAppState_decorators;
     return class IncyclistPageService extends _classSuper {
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getBindings_decorators = [Injectable];
             _getAppState_decorators = [Injectable];
+            __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, _getAppState_decorators, { kind: "method", name: "getAppState", static: false, private: false, access: { has: obj => "getAppState" in obj, get: obj => obj.getAppState }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
@@ -90,6 +94,28 @@ let IncyclistPageService = (() => {
                 delete this.pageObserver;
             }
         }
+        getPrevContentPage() {
+            const contentPage = this.getAppState().getPersistedState('page');
+            return contentPage ?? 'routes';
+        }
+        moveTo(route, close = true) {
+            if (route === '$contentPage') {
+                const prevContentPage = this.getPrevContentPage();
+                this.getUIBinding().openPage(prevContentPage);
+            }
+            else {
+                this.getUIBinding().openPage(route);
+            }
+            if (close) {
+                this.closePage();
+            }
+        }
+        getUIBinding() {
+            return this.getBindings().ui;
+        }
+        getBindings() {
+            return getBindings();
+        }
         getAppState() {
             return useAppState();
         }

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

@@ -40,7 +40,6 @@ import { PairingPageStateMachine } from './statemachine';
 import { PageLogObserver } from './logobserver';
 import { useDeviceAccess } from '../access';
 import { useDeviceConfiguration } from '../configuration';
-import { getBindings } from '../../api';
 import { useIncyclist } from '../../ui';
 import { Observer } from '../../base/types';
 let DevicesPageService = (() => {
@@ -52,7 +51,6 @@ let DevicesPageService = (() => {
     let _instanceExtraInitializers = [];
     let _getDevicePairing_decorators;
     let _getDeviceConfiguration_decorators;
-    let _getBindings_decorators;
     let _getIncyclist_decorators;
     var DevicesPageService = class extends _classSuper {
         static { _classThis = this; }
@@ -60,11 +58,9 @@ let DevicesPageService = (() => {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _getDevicePairing_decorators = [Injectable];
             _getDeviceConfiguration_decorators = [Injectable];
-            _getBindings_decorators = [Injectable];
             _getIncyclist_decorators = [Injectable];
             __esDecorate(this, null, _getDevicePairing_decorators, { kind: "method", name: "getDevicePairing", static: false, private: false, access: { has: obj => "getDevicePairing" in obj, get: obj => obj.getDevicePairing }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getDeviceConfiguration_decorators, { kind: "method", name: "getDeviceConfiguration", static: false, private: false, access: { has: obj => "getDeviceConfiguration" in obj, get: obj => obj.getDeviceConfiguration }, 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, _getIncyclist_decorators, { kind: "method", name: "getIncyclist", static: false, private: false, access: { has: obj => "getIncyclist" in obj, get: obj => obj.getIncyclist }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             DevicesPageService = _classThis = _classDescriptor.value;
@@ -77,14 +73,16 @@ let DevicesPageService = (() => {
         openedCapability;
         openedInterfaceSettings;
         interfaceSettingsObserver;
+        isPairingForRide = false;
         constructor() {
-            super('Pairing');
+            super('pairing');
             this.stateMachine = new PairingPageStateMachine();
             this.logObserver = new PageLogObserver('Pairing');
         }
-        openPage() {
+        openPage(forRide) {
             try {
-                this.logEvent({ message: 'page shown', page: 'Pairing' });
+                this.logEvent({ message: 'page shown', page: 'Pairing', forRide });
+                this.isPairingForRide = forRide ?? false;
                 EventLogger.setGlobalConfig('page', 'Pairing');
                 super.openPage();
                 if (this.promiseOpen !== undefined) {
@@ -109,6 +107,7 @@ let DevicesPageService = (() => {
             try {
                 this.logEvent({ message: 'page closed', page: 'Pairing' });
                 EventLogger.setGlobalConfig('page', null);
+                this.isPairingForRide = false;
                 super.closePage();
                 this.stop();
                 this.stateMachine.stop();
@@ -356,26 +355,32 @@ let DevicesPageService = (() => {
             this.getDevicePairing().prepareStart();
             this.getDevicePairing().setReadyToStart();
             this.getAppState().setState('paired', true);
-            this.moveTo('/rideDeviceOK');
+            const prevContentPage = this.getPrevContentPage();
+            const prevPage = this.getAppState().getState('prevPage');
+            if (!prevPage) {
+                this.moveTo(prevContentPage);
+            }
+            else {
+                if (this.isPairingForRide)
+                    this.moveTo('/rideDeviceOK');
+                else
+                    this.moveTo(prevContentPage);
+            }
         }
         onSimulate() {
             const simulator = this.getDeviceConfiguration().getSimulatorAdapterId();
             this.getDevicePairing().prepareStart([simulator]);
-            this.moveTo('/rideSimulate');
+            const prevContentPage = this.getPrevContentPage();
+            const prevPage = this.getAppState().getState('prevPage');
+            if (this.isPairingForRide)
+                this.moveTo('/rideSimulate');
+            else
+                this.moveTo(prevContentPage);
         }
         onCancel() {
             const nextPage = this.getAppState().getState('prevPage');
             this.moveTo(`/${nextPage}`);
         }
-        moveTo(route, close = true) {
-            if (!this.getUIBinding()) {
-                console.log('# navigate to ', route);
-            }
-            this.getUIBinding().openPage(route);
-            if (close) {
-                this.closePage();
-            }
-        }
         async start() {
             this.getDevicePairing().usage = 'page';
             this.getDevicePairing().start(() => {
@@ -388,18 +393,12 @@ let DevicesPageService = (() => {
         get state() {
             return this.getDevicePairing().getState();
         }
-        getUIBinding() {
-            return this.getBindings().ui;
-        }
         getDevicePairing() {
             return useDevicePairing();
         }
         getDeviceConfiguration() {
             return useDeviceConfiguration();
         }
-        getBindings() {
-            return getBindings();
-        }
         getIncyclist() {
             return useIncyclist();
         }

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

@@ -912,7 +912,6 @@ let DevicePairingService = (() => {
                 return false;
             const control = this.getCapability(IncyclistCapability.Control);
             const power = this.getCapability(IncyclistCapability.Power);
-            console.log('# check pairing success', control?.connectState, power?.connectState);
             const success = (control?.connectState === 'connected' || power?.connectState === 'connected');
             this.state.canStartRide = success;
             return success;
@@ -1002,7 +1001,6 @@ let DevicePairingService = (() => {
             this.state.check = { preparing };
             this.state.interfaces = this.access.enrichWithAccessState(this.state.interfaces);
             this.emit('pairing-start');
-            console.log('# start pairing', this.state.capabilities.map(c => `${c.capability}:${c.connectState}`));
             const { isReady, busyRequired } = this.isReadyToPair();
             if (!isReady) {
                 this.logEvent({ message: 'Pairing: waiting for interfaces', interfaces: busyRequired?.name });
@@ -1073,7 +1071,6 @@ let DevicePairingService = (() => {
             this.state.capabilities.forEach(c => {
                 c.connectState = c.connectState === 'connected' ? 'connected' : 'waiting';
             });
-            console.log('# setPairingConnectState', this.state.capabilities.map(c => `${c.capability}:${c.connectState}`));
             const all = adapters ?? [];
             all.forEach(ai => {
                 if (ai.adapter.isStarted()) {

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

@@ -1,2 +1 @@
 export * from './service';
-export * from './model';

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

@@ -0,0 +1 @@
+export {};

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

@@ -199,7 +199,7 @@ let RideDisplayService = (() => {
                 }
                 this.getWorkoutRide().pause();
                 this.displayService.pause();
-                this.observer?.emit('state-update', this.state);
+                this.observer?.emit('state-update', this.state, { pauseReason: requester });
                 this.pauseReason = requester;
             }
             catch (err) {
@@ -1011,7 +1011,7 @@ let RideDisplayService = (() => {
             const readyToStart = this.isStartDeviceReadyToStart() && this.getRideModeService().isStartRideCompleted();
             const devicesState = this.deviceInfo ?? [];
             const displayOverlayProps = this.getRideModeService().getStartOverlayProps() ?? {};
-            return { mode, rideState: this.state, devicesState, readyToStart, ...displayOverlayProps };
+            return { mode, rideState: this.state, devicesState, devices: devicesState, readyToStart, ...displayOverlayProps };
         };
         getDeviceStartSettings() {
             let forceErgMode = false;

package/lib/esm/ride/index.js

@@ -1,2 +1,3 @@
 export * from './base';
 export * from './display';
+export * from './page';

package/lib/esm/ride/page/index.js

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