incyclist-services 1.7.5 → 1.7.6

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

@@ -126,8 +126,9 @@ let ActivityRideService = (() => {
                         }
                     }
                     this.durationCalculator = new duration_1.ActivityDuration(this.activity);
-                    this.getDeviceRide().on('data', this.deviceDataHandler);
-                    this.getDeviceRide().on('gear-change', this.gearChangeHandler);
+                    const ride = this.getDeviceRide();
+                    ride.on('data', this.deviceDataHandler);
+                    ride.on('gear-change', this.gearChangeHandler);
                     (0, utils_1.waitNextTick)().then(() => {
                         this.emit('initialized');
                     });
@@ -213,6 +214,10 @@ let ActivityRideService = (() => {
         resume(requester = 'user') {
             if (this.state !== 'paused')
                 return;
+            if (requester === 'user') {
+                this.current.isAutoResume = true;
+                return;
+            }
             const pauseDuration = (Date.now() - this.tsPauseStart) / 1000;
             this.tsPauseStart = undefined;
             this.current.isAutoResume = false;
@@ -293,7 +298,7 @@ let ActivityRideService = (() => {
         }
         getCurrentValues() {
             const distance = (this.activity?.distance ?? 0) / 1000;
-            const speed = (this.current.deviceData?.speed ?? 0);
+            let speed = (this.current.deviceData?.speed ?? 0);
             const power = (this.current.deviceData?.power ?? 0);
             const slope = this.current.position?.slope;
             const heartrate = this.current.deviceData?.heartrate;
@@ -303,13 +308,16 @@ let ActivityRideService = (() => {
             const lap = this.current.lap;
             const routeDistance = this.current.routeDistance;
             const gear = this.current.deviceData?.gearStr;
+            if (this.state != 'active') {
+                speed = 0;
+            }
             let distanceRemaining = (this.getTotalDistance() / 1000 - distance);
             if (isNaN(distanceRemaining))
                 distanceRemaining = undefined;
             if (distanceRemaining < 0)
                 distanceRemaining = 0;
             let timeRemaining;
-            if (speed > 0) {
+            if (speed > 0 && this.durationCalculator) {
                 timeRemaining = this.durationCalculator.getRemainingTime({ route: this.current.route, speed: this.current.deviceData?.speed, routePos: this.activity.distance + (this.activity?.startPos ?? 0), endPos: this.current?.endPos });
             }
             return { position, distance, routeDistance, time, speed, power, slope, heartrate, cadence, timeRemaining, distanceRemaining, lap, gear };
@@ -719,17 +727,24 @@ let ActivityRideService = (() => {
                     update.speed = 0;
                 }
                 this.current.deviceData = { ...this.current.deviceData, ...update };
-                if (this.state !== 'active') {
-                    this.emit('data');
-                    if (this.state === 'paused' && (data.power > 0 || data.cadence > 0) && this.current.isAutoResume) {
+                if (this.state === 'active') {
+                    if (update.speed === 0) {
+                        this.pause(true);
+                        return;
+                    }
+                }
+                else if (this.state === 'paused') {
+                    if ((data.power > 0 || data.cadence > 0) && this.current.isAutoResume) {
                         this.resume('system');
                         return;
                     }
+                    this.emit('data');
+                }
+                else {
                     if (this.state === 'ininitalized' && (data.speed > 0)) {
                         this.start();
-                        return;
                     }
-                    this.current.deviceData.speed = 0;
+                    this.emit('data');
                     return;
                 }
             }

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

@@ -62,11 +62,20 @@ let DevicePairingService = (() => {
     let _classSuper = service_2.IncyclistService;
     let _instanceExtraInitializers = [];
     let _getUnitConverter_decorators;
+    let _getDeviceConfiguration_decorators;
+    let _getDeviceAccess_decorators;
+    let _getDeviceRide_decorators;
     return class DevicePairingService extends _classSuper {
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _getUnitConverter_decorators = [decorators_1.Injectable];
+            _getDeviceConfiguration_decorators = [decorators_1.Injectable];
+            _getDeviceAccess_decorators = [decorators_1.Injectable];
+            _getDeviceRide_decorators = [decorators_1.Injectable];
             __esDecorate(this, null, _getUnitConverter_decorators, { kind: "method", name: "getUnitConverter", static: false, private: false, access: { has: obj => "getUnitConverter" in obj, get: obj => obj.getUnitConverter }, 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, _getDeviceAccess_decorators, { kind: "method", name: "getDeviceAccess", static: false, private: false, access: { has: obj => "getDeviceAccess" in obj, get: obj => obj.getDeviceAccess }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getDeviceRide_decorators, { kind: "method", name: "getDeviceRide", static: false, private: false, access: { has: obj => "getDeviceRide" in obj, get: obj => obj.getDeviceRide }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
         static _instance;
@@ -403,10 +412,10 @@ let DevicePairingService = (() => {
             if (this.state.initialized)
                 return;
             return new Promise(done => {
-                this.access = this.access || (0, service_1.useDeviceAccess)();
-                this.rideService = this.rideService || (0, ride_1.useDeviceRide)();
+                this.configuration = this.getDeviceConfiguration();
+                this.access = this.access || this.getDeviceAccess();
+                this.rideService = this.rideService || this.getDeviceRide();
                 this.onScanningDataHandler = this.rideService.onData.bind(this.rideService);
-                this.configuration = this.configuration || (0, configuration_1.useDeviceConfiguration)();
                 if (this.configuration.isInitialized()) {
                     this.state.initialized = true;
                     return done();
@@ -718,7 +727,6 @@ let DevicePairingService = (() => {
             }
         }
         onDeviceData(data, udid) {
-            console.log('# got data', data);
             const capabilities = this.state.capabilities;
             if (!this.state.data) {
                 this.state.data = [];
@@ -1370,6 +1378,15 @@ let DevicePairingService = (() => {
         getUnitConverter() {
             return (0, i18n_1.useUnitConverter)();
         }
+        getDeviceConfiguration() {
+            return this.configuration ?? (0, configuration_1.useDeviceConfiguration)();
+        }
+        getDeviceAccess() {
+            return this.access ?? (0, service_1.useDeviceAccess)();
+        }
+        getDeviceRide() {
+            return this.rideService ?? (0, ride_1.useDeviceRide)();
+        }
     };
 })();
 exports.DevicePairingService = DevicePairingService;

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

@@ -186,15 +186,14 @@ let RideDisplayService = (() => {
             }
         }
         pause(requester = 'user') {
-            if (requester === 'device' && this.isResuming) {
-                return;
-            }
             try {
                 if (this.state !== 'Active')
                     return;
                 this.logEvent({ message: "pause activity request", activity: this.activity?.id, userRequested: requester === 'user' });
                 this.state = 'Paused';
-                this.getActivityRide().pause(requester === 'device');
+                if (requester === 'user') {
+                    this.getActivityRide().pause(false);
+                }
                 this.getWorkoutRide().pause();
                 this.displayService.pause();
                 this.observer?.emit('state-update', this.state);
@@ -206,12 +205,14 @@ let RideDisplayService = (() => {
         }
         resume(requester = 'user') {
             try {
-                if (this.state !== 'Paused' || this.isResuming)
+                if (this.state !== 'Paused')
                     return;
                 this.logEvent({ message: "continue activity request", activity: this.activity?.id, userRequested: requester === 'user' });
                 this.isResuming = true;
                 this.state = 'Active';
-                this.getActivityRide().resume();
+                if (requester === 'user') {
+                    this.getActivityRide().resume('user');
+                }
                 this.getWorkoutRide().resume();
                 this.pauseReason = 'device';
                 this.observer?.emit('state-update', this.state);
@@ -525,8 +526,7 @@ let RideDisplayService = (() => {
         onActivityPaused(autoResume) {
             if (this.state === 'Paused')
                 return;
-            if (autoResume && this.state === 'Active')
-                this.pause('device');
+            this.pause('device');
         }
         onActivityResumed() {
             if (this.state !== 'Paused')
@@ -538,10 +538,6 @@ let RideDisplayService = (() => {
                 const currentValues = this.getActivityRide().getCurrentValues();
                 if (!currentValues)
                     return;
-                if (currentValues.speed === 0 && !this.isResuming) {
-                    this.pause('device');
-                    return;
-                }
                 if (currentValues.speed > 0 && this.isResuming) {
                     this.displayService.resume();
                     this.isResuming = false;

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

@@ -104,7 +104,6 @@ let RouteDisplayService = (() => {
             if (data.power > 0)
                 this.prevPowerTs = Date.now();
             if (data.power === 0 && (data.speed === 0 || data.speed < 5 && (Date.now() - (this.prevPowerTs ?? 0)) > MAX_INACTIVITY)) {
-                this.service.pause('device');
                 return;
             }
             try {

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

@@ -120,8 +120,9 @@ let ActivityRideService = (() => {
                         }
                     }
                     this.durationCalculator = new ActivityDuration(this.activity);
-                    this.getDeviceRide().on('data', this.deviceDataHandler);
-                    this.getDeviceRide().on('gear-change', this.gearChangeHandler);
+                    const ride = this.getDeviceRide();
+                    ride.on('data', this.deviceDataHandler);
+                    ride.on('gear-change', this.gearChangeHandler);
                     waitNextTick().then(() => {
                         this.emit('initialized');
                     });
@@ -207,6 +208,10 @@ let ActivityRideService = (() => {
         resume(requester = 'user') {
             if (this.state !== 'paused')
                 return;
+            if (requester === 'user') {
+                this.current.isAutoResume = true;
+                return;
+            }
             const pauseDuration = (Date.now() - this.tsPauseStart) / 1000;
             this.tsPauseStart = undefined;
             this.current.isAutoResume = false;
@@ -287,7 +292,7 @@ let ActivityRideService = (() => {
         }
         getCurrentValues() {
             const distance = (this.activity?.distance ?? 0) / 1000;
-            const speed = (this.current.deviceData?.speed ?? 0);
+            let speed = (this.current.deviceData?.speed ?? 0);
             const power = (this.current.deviceData?.power ?? 0);
             const slope = this.current.position?.slope;
             const heartrate = this.current.deviceData?.heartrate;
@@ -297,13 +302,16 @@ let ActivityRideService = (() => {
             const lap = this.current.lap;
             const routeDistance = this.current.routeDistance;
             const gear = this.current.deviceData?.gearStr;
+            if (this.state != 'active') {
+                speed = 0;
+            }
             let distanceRemaining = (this.getTotalDistance() / 1000 - distance);
             if (isNaN(distanceRemaining))
                 distanceRemaining = undefined;
             if (distanceRemaining < 0)
                 distanceRemaining = 0;
             let timeRemaining;
-            if (speed > 0) {
+            if (speed > 0 && this.durationCalculator) {
                 timeRemaining = this.durationCalculator.getRemainingTime({ route: this.current.route, speed: this.current.deviceData?.speed, routePos: this.activity.distance + (this.activity?.startPos ?? 0), endPos: this.current?.endPos });
             }
             return { position, distance, routeDistance, time, speed, power, slope, heartrate, cadence, timeRemaining, distanceRemaining, lap, gear };
@@ -713,17 +721,24 @@ let ActivityRideService = (() => {
                     update.speed = 0;
                 }
                 this.current.deviceData = { ...this.current.deviceData, ...update };
-                if (this.state !== 'active') {
-                    this.emit('data');
-                    if (this.state === 'paused' && (data.power > 0 || data.cadence > 0) && this.current.isAutoResume) {
+                if (this.state === 'active') {
+                    if (update.speed === 0) {
+                        this.pause(true);
+                        return;
+                    }
+                }
+                else if (this.state === 'paused') {
+                    if ((data.power > 0 || data.cadence > 0) && this.current.isAutoResume) {
                         this.resume('system');
                         return;
                     }
+                    this.emit('data');
+                }
+                else {
                     if (this.state === 'ininitalized' && (data.speed > 0)) {
                         this.start();
-                        return;
                     }
-                    this.current.deviceData.speed = 0;
+                    this.emit('data');
                     return;
                 }
             }

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

@@ -56,11 +56,20 @@ let DevicePairingService = (() => {
     let _classSuper = IncyclistService;
     let _instanceExtraInitializers = [];
     let _getUnitConverter_decorators;
+    let _getDeviceConfiguration_decorators;
+    let _getDeviceAccess_decorators;
+    let _getDeviceRide_decorators;
     return class DevicePairingService extends _classSuper {
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _getUnitConverter_decorators = [Injectable];
+            _getDeviceConfiguration_decorators = [Injectable];
+            _getDeviceAccess_decorators = [Injectable];
+            _getDeviceRide_decorators = [Injectable];
             __esDecorate(this, null, _getUnitConverter_decorators, { kind: "method", name: "getUnitConverter", static: false, private: false, access: { has: obj => "getUnitConverter" in obj, get: obj => obj.getUnitConverter }, 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, _getDeviceAccess_decorators, { kind: "method", name: "getDeviceAccess", static: false, private: false, access: { has: obj => "getDeviceAccess" in obj, get: obj => obj.getDeviceAccess }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getDeviceRide_decorators, { kind: "method", name: "getDeviceRide", static: false, private: false, access: { has: obj => "getDeviceRide" in obj, get: obj => obj.getDeviceRide }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
         static _instance;
@@ -397,10 +406,10 @@ let DevicePairingService = (() => {
             if (this.state.initialized)
                 return;
             return new Promise(done => {
-                this.access = this.access || useDeviceAccess();
-                this.rideService = this.rideService || useDeviceRide();
+                this.configuration = this.getDeviceConfiguration();
+                this.access = this.access || this.getDeviceAccess();
+                this.rideService = this.rideService || this.getDeviceRide();
                 this.onScanningDataHandler = this.rideService.onData.bind(this.rideService);
-                this.configuration = this.configuration || useDeviceConfiguration();
                 if (this.configuration.isInitialized()) {
                     this.state.initialized = true;
                     return done();
@@ -712,7 +721,6 @@ let DevicePairingService = (() => {
             }
         }
         onDeviceData(data, udid) {
-            console.log('# got data', data);
             const capabilities = this.state.capabilities;
             if (!this.state.data) {
                 this.state.data = [];
@@ -1364,6 +1372,15 @@ let DevicePairingService = (() => {
         getUnitConverter() {
             return useUnitConverter();
         }
+        getDeviceConfiguration() {
+            return this.configuration ?? useDeviceConfiguration();
+        }
+        getDeviceAccess() {
+            return this.access ?? useDeviceAccess();
+        }
+        getDeviceRide() {
+            return this.rideService ?? useDeviceRide();
+        }
     };
 })();
 export { DevicePairingService };

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

@@ -183,15 +183,14 @@ let RideDisplayService = (() => {
             }
         }
         pause(requester = 'user') {
-            if (requester === 'device' && this.isResuming) {
-                return;
-            }
             try {
                 if (this.state !== 'Active')
                     return;
                 this.logEvent({ message: "pause activity request", activity: this.activity?.id, userRequested: requester === 'user' });
                 this.state = 'Paused';
-                this.getActivityRide().pause(requester === 'device');
+                if (requester === 'user') {
+                    this.getActivityRide().pause(false);
+                }
                 this.getWorkoutRide().pause();
                 this.displayService.pause();
                 this.observer?.emit('state-update', this.state);
@@ -203,12 +202,14 @@ let RideDisplayService = (() => {
         }
         resume(requester = 'user') {
             try {
-                if (this.state !== 'Paused' || this.isResuming)
+                if (this.state !== 'Paused')
                     return;
                 this.logEvent({ message: "continue activity request", activity: this.activity?.id, userRequested: requester === 'user' });
                 this.isResuming = true;
                 this.state = 'Active';
-                this.getActivityRide().resume();
+                if (requester === 'user') {
+                    this.getActivityRide().resume('user');
+                }
                 this.getWorkoutRide().resume();
                 this.pauseReason = 'device';
                 this.observer?.emit('state-update', this.state);
@@ -522,8 +523,7 @@ let RideDisplayService = (() => {
         onActivityPaused(autoResume) {
             if (this.state === 'Paused')
                 return;
-            if (autoResume && this.state === 'Active')
-                this.pause('device');
+            this.pause('device');
         }
         onActivityResumed() {
             if (this.state !== 'Paused')
@@ -535,10 +535,6 @@ let RideDisplayService = (() => {
                 const currentValues = this.getActivityRide().getCurrentValues();
                 if (!currentValues)
                     return;
-                if (currentValues.speed === 0 && !this.isResuming) {
-                    this.pause('device');
-                    return;
-                }
                 if (currentValues.speed > 0 && this.isResuming) {
                     this.displayService.resume();
                     this.isResuming = false;

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

@@ -98,7 +98,6 @@ let RouteDisplayService = (() => {
             if (data.power > 0)
                 this.prevPowerTs = Date.now();
             if (data.power === 0 && (data.speed === 0 || data.speed < 5 && (Date.now() - (this.prevPowerTs ?? 0)) > MAX_INACTIVITY)) {
-                this.service.pause('device');
                 return;
             }
             try {

package/lib/types/devices/pairing/service.d.ts

@@ -138,5 +138,8 @@ export declare class DevicePairingService extends IncyclistService {
     protected mappedCapabilities(capabilities: DeviceConfigurationInfo): Array<CapabilityData>;
     reset(): void;
     protected getUnitConverter(): import("../../i18n").UnitConverterService;
+    protected getDeviceConfiguration(): DeviceConfigurationService;
+    protected getDeviceAccess(): DeviceAccessService;
+    protected getDeviceRide(): DeviceRideService;
 }
 export declare const useDevicePairing: () => DevicePairingService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.5",
+  "version": "1.7.6",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },