incyclist-services 1.7.94 → 1.7.96

package/lib/cjs/activities/upload/index.js

@@ -14,7 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./velohero"), exports);
 __exportStar(require("./strava"), exports);
 __exportStar(require("./intervals"), exports);
 __exportStar(require("./types"), exports);

package/lib/cjs/apps/index.js

@@ -18,4 +18,3 @@ __exportStar(require("./base"), exports);
 __exportStar(require("./googleMaps"), exports);
 __exportStar(require("./service"), exports);
 __exportStar(require("./strava"), exports);
-__exportStar(require("./velohero"), exports);

package/lib/cjs/apps/service.js

@@ -43,7 +43,6 @@ const settings_1 = require("../settings");
 const base_1 = require("./base");
 const IntervalsAppConnection_1 = require("./intervals/IntervalsAppConnection");
 const komoot_1 = require("./komoot");
-const VeloHeroAppConnection_1 = require("./velohero/VeloHeroAppConnection");
 let AppsService = (() => {
     let _classDecorators = [types_1.Singleton];
     let _classDescriptor;
@@ -67,7 +66,7 @@ let AppsService = (() => {
             __runInitializers(_classThis, _classExtraInitializers);
         }
         services = (__runInitializers(this, _instanceExtraInitializers), {
-            ActivityUpload: ['strava', 'velohero', 'intervals'],
+            ActivityUpload: ['strava', 'intervals'],
             WorkoutUpload: [],
             WorkoutDownload: ['intervals'],
             ActivityDownload: [],
@@ -75,7 +74,6 @@ let AppsService = (() => {
         });
         serviceMap = [
             { name: 'Strava', key: 'strava', iconUrl: 'https://static.cdnlogo.com/logos/s/42/strava-wordmark.svg', connection: new base_1.StravaAppConnection() },
-            { name: 'VeloHero', key: 'velohero', iconUrl: 'images/velo-white.png', connection: new VeloHeroAppConnection_1.VeloHeroAppConnection() },
             { name: 'Komoot', key: 'komoot', iconUrl: 'https://www.komoot.com/assets/4d8ae313eec53e6e.svg', connection: new komoot_1.KomootAppConnection() },
             { name: 'Intervals.icu', key: 'intervals', iconUrl: 'images/intervals.png', connection: new IntervalsAppConnection_1.IntervalsAppConnection() },
         ];

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

@@ -95,9 +95,15 @@ let DevicesPageService = (() => {
                 if (this.promiseOpen !== undefined) {
                     return this.getPageObserver();
                 }
-                this.stateMachine.start(() => {
+                const onStateMachineUpdate = () => {
                     this.getPageObserver().emit('page-update');
-                });
+                };
+                this.stateMachine.start(onStateMachineUpdate);
+                if (this.stateMachine.state !== 'Idle') {
+                    this.logEvent({ message: 'state machine was not in expected state on open, resetting', page: 'Pairing', state: this.stateMachine.state });
+                    this.stateMachine.stop();
+                    this.stateMachine.start(onStateMachineUpdate);
+                }
                 this.promiseOpen = new Promise((done) => {
                     this.start()
                         .catch((err) => { this.logError(err, 'openPage'); })
@@ -321,7 +327,7 @@ let DevicesPageService = (() => {
             this.updatePage();
         }
         async closeDeviceSelection(enabled) {
-            this.logEvent({ message: 'capability closed', capability: this.openedCapability });
+            this.logEvent({ message: 'capability closed', capability: this.openedCapability, enabled, caller: new Error().stack });
             if (!enabled) {
                 const all = this.state.capabilities ?? [];
                 const requested = all.find(c => c.capability === this.openedCapability);

package/lib/cjs/devices/page/statemachine.js

@@ -68,6 +68,8 @@ let PairingPageStateMachine = (() => {
         selectStateChangeCallback;
         retryTimeout;
         selectionTimeout;
+        pairingPromise;
+        scanningPromise;
         constructor() {
             this.logger = new gd_eventlog_1.EventLogger('PairingPageState');
         }
@@ -99,6 +101,8 @@ let PairingPageStateMachine = (() => {
                 this.unregisterServiceEventHandlers();
                 delete this.stateChangeCallback;
                 this.resetTimeouts();
+                delete this.pairingPromise;
+                delete this.scanningPromise;
                 this.setState('Closed');
                 this.logIncomingEvent('stop', prev, 'Closed');
             }
@@ -199,14 +203,20 @@ let PairingPageStateMachine = (() => {
                         this.resetTimeouts();
                         this.setState('Done');
                     }
-                    else {
+                    else if (!this.pairingPromise) {
                         this.setState('Pairing');
-                        service.startPairing(adapters, {});
+                        this.pairingPromise = Promise.resolve(service.startPairing(adapters, {}))
+                            .catch(err => { this.logError(err, 'startPairing'); })
+                            .finally(() => { delete this.pairingPromise; });
                     }
                 }
                 else if (this.selectState === 'Closed' || this.selectState === 'Active') {
-                    this.setState('Scanning');
-                    service.startScanning(adapters, {});
+                    if (!this.scanningPromise) {
+                        this.setState('Scanning');
+                        this.scanningPromise = Promise.resolve(service.startScanning(adapters, {}))
+                            .catch(err => { this.logError(err, 'startScanning'); })
+                            .finally(() => { delete this.scanningPromise; });
+                    }
                 }
                 if (this.state !== oldState)
                     this.logger.logEvent({ message: 'state changed', stateTransition: { from: oldState, to: this.state } });

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

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVirtualShiftingEnabled = isVirtualShiftingEnabled;
+exports.getLoadButtonMode = getLoadButtonMode;
+function isVirtualShiftingEnabled(mode) {
+    try {
+        if (!mode)
+            return false;
+        if (mode.isSIM()) {
+            const virtshiftMode = mode.getSetting('virtshift');
+            return (virtshiftMode === 'Mixed' || virtshiftMode === 'Incyclist' || virtshiftMode === 'SmartTrainer' || virtshiftMode === 'Enabled');
+        }
+        if (mode.isResistance()) {
+            return true;
+        }
+        return false;
+    }
+    catch {
+        return false;
+    }
+}
+function getLoadButtonMode(mode) {
+    if (!mode)
+        return 'power';
+    if (mode.isSIM() || mode.isResistance()) {
+        return isVirtualShiftingEnabled(mode) ? 'gear' : 'hidden';
+    }
+    return 'power';
+}

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

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./service"), exports);
+__exportStar(require("./cyclingMode"), exports);

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

@@ -432,8 +432,11 @@ let RideDisplayService = (() => {
                 this.observer?.stop({ immediately: props.noStateUpdates });
                 if (props.noStateUpdates)
                     delete this.observer;
-                else
-                    (0, utils_1.waitNextTick)().then(() => delete this.observer);
+                else {
+                    const observerToClear = this.observer;
+                    (0, utils_1.waitNextTick)().then(() => { if (this.observer === observerToClear)
+                        delete this.observer; });
+                }
                 if (prevState === 'Finished' || prevState === 'Idle' || prevState === 'Closing') {
                     this.state = 'Idle';
                     return;
@@ -553,7 +556,7 @@ let RideDisplayService = (() => {
                 const { time, speed, routeDistance, distance } = currentValues;
                 const data = { time, speed, routeDistance, distance };
                 this.getRideModeService().onActivityUpdate(data, currentValues);
-                this.observer.emit('data-update', data, currentValues);
+                this.observer?.emit('data-update', data, currentValues);
             }
         }
         onWorkoutStopped() {
@@ -1085,16 +1088,7 @@ let RideDisplayService = (() => {
         isVirtualShiftingEnabled() {
             try {
                 const mode = this.getDeviceRide().getCyclingMode();
-                if (!mode)
-                    return false;
-                if (mode.isSIM()) {
-                    const virtshiftMode = mode.getSetting('virtshift');
-                    return (virtshiftMode === 'Mixed' || virtshiftMode === 'Incyclist' || virtshiftMode === 'SmartTrainer' || virtshiftMode === 'Enabled');
-                }
-                if (mode.isResistance()) {
-                    return true;
-                }
-                return false;
+                return (0, devices_1.isVirtualShiftingEnabled)(mode);
             }
             catch (err) {
                 this.logError(err, 'isVirtualShiftingEnabled');

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

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./service"), exports);
+__exportStar(require("./types"), exports);