incyclist-services 1.7.129 → 1.7.131

package/lib/cjs/activities/active-rides/service.js

@@ -579,7 +579,7 @@ let ActiveRidesService = (() => {
                 this.isOnline = this.getOnlineStatusMonitoring().onlineStatus;
                 if (this.isOnline)
                     this.onConnect({ initial: true });
-                this.getOnlineStatusMonitoring().start('activeRides', this.onOnlineStatusChange);
+                this.getOnlineStatusMonitoring().start('activeRides', this.onlineStatusHandler);
             }
         }
         onOnlineStatusChange(online) {

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

@@ -271,6 +271,14 @@ let DeviceAccessService = (() => {
             this.emit('interface-changed', ifaceName, { ...this.interfaces[ifaceName] });
             return disconnected;
         }
+        async pauseBackgroundActivity() {
+            const promises = Object.keys(this.interfaces).map((name) => this.getInterface(name)?.pauseBackgroundActivity?.());
+            await Promise.allSettled(promises);
+        }
+        async resumeBackgroundActivity() {
+            const promises = Object.keys(this.interfaces).map((name) => this.getInterface(name)?.resumeBackgroundActivity?.());
+            await Promise.allSettled(promises);
+        }
         async terminate(ifaceName) {
             await this.disconnect(ifaceName);
             if (!ifaceName) {

package/lib/cjs/ui/service.js

@@ -173,9 +173,11 @@ let UserInterfaceServcie = (() => {
                 this.appState = 'Background';
                 this.logEvent({ message: 'onAppPause called' });
                 this.stopHeartbeatWorker();
+                (0, devices_1.useDeviceAccess)().pauseBackgroundActivity()
+                    .catch((err) => { this.logError(err, 'onAppPause:pauseBackgroundActivity'); });
                 this.backgroundTimer = setTimeout(() => {
                     this.backgroundPausedByService = true;
-                    this.pause();
+                    this.pause().catch((err) => { this.logError(err, 'onAppPause:pause'); });
                 }, BACKGROUND_PAUSE_TIMEOUT_MS);
             }
             catch (err) {
@@ -200,8 +202,10 @@ let UserInterfaceServcie = (() => {
                 this.startHeartbeatWorker();
                 this.backgroundPausedByService = false;
                 this.appState = 'Active';
+                (0, devices_1.useDeviceAccess)().resumeBackgroundActivity()
+                    .catch((err) => { this.logError(err, 'onAppResume:resumeBackgroundActivity'); });
                 if (resumeRequired) {
-                    this.resume();
+                    this.resume().catch((err) => { this.logError(err, 'onAppResume:resume'); });
                 }
             }
             catch (err) {
@@ -239,16 +243,50 @@ let UserInterfaceServcie = (() => {
             }
         }
         async pause() {
-            await pages_1.IncyclistPageService.pausePage();
-            await (0, devices_1.useDeviceAccess)().disconnect();
-            if (this.getMessageQueue().disconnect)
-                this.getMessageQueue().disconnect();
+            this.logEvent({ message: 'pause started' });
+            try {
+                await pages_1.IncyclistPageService.pausePage();
+            }
+            catch (err) {
+                this.logError(err, 'pause:pausePage');
+            }
+            try {
+                await (0, devices_1.useDeviceAccess)().disconnect();
+            }
+            catch (err) {
+                this.logError(err, 'pause:disconnect');
+            }
+            try {
+                if (this.getMessageQueue().disconnect)
+                    this.getMessageQueue().disconnect();
+            }
+            catch (err) {
+                this.logError(err, 'pause:mqDisconnect');
+            }
+            this.logEvent({ message: 'pause finished' });
         }
         async resume() {
-            if (this.getMessageQueue().connect)
-                this.getMessageQueue().connect();
-            await (0, devices_1.useDeviceAccess)().connect();
-            await pages_1.IncyclistPageService.resumePage();
+            this.logEvent({ message: 'resume started' });
+            try {
+                if (this.getMessageQueue().connect)
+                    this.getMessageQueue().connect();
+            }
+            catch (err) {
+                this.logError(err, 'resume:mqConnect');
+            }
+            try {
+                await (0, devices_1.useDeviceAccess)().connect();
+            }
+            catch (err) {
+                this.logError(err, 'resume:connect');
+            }
+            try {
+                await pages_1.IncyclistPageService.resumePage();
+            }
+            catch (err) {
+                this.logError(err, 'resume:resumePage');
+            }
+            this.logEvent({ message: 'resume finished' });
         }
         startHeartbeatWorker() {
             if (this.heartbeatIv)

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

@@ -576,7 +576,7 @@ let ActiveRidesService = (() => {
                 this.isOnline = this.getOnlineStatusMonitoring().onlineStatus;
                 if (this.isOnline)
                     this.onConnect({ initial: true });
-                this.getOnlineStatusMonitoring().start('activeRides', this.onOnlineStatusChange);
+                this.getOnlineStatusMonitoring().start('activeRides', this.onlineStatusHandler);
             }
         }
         onOnlineStatusChange(online) {

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

@@ -265,6 +265,14 @@ let DeviceAccessService = (() => {
             this.emit('interface-changed', ifaceName, { ...this.interfaces[ifaceName] });
             return disconnected;
         }
+        async pauseBackgroundActivity() {
+            const promises = Object.keys(this.interfaces).map((name) => this.getInterface(name)?.pauseBackgroundActivity?.());
+            await Promise.allSettled(promises);
+        }
+        async resumeBackgroundActivity() {
+            const promises = Object.keys(this.interfaces).map((name) => this.getInterface(name)?.resumeBackgroundActivity?.());
+            await Promise.allSettled(promises);
+        }
         async terminate(ifaceName) {
             await this.disconnect(ifaceName);
             if (!ifaceName) {

package/lib/esm/ui/service.js

@@ -170,9 +170,11 @@ let UserInterfaceServcie = (() => {
                 this.appState = 'Background';
                 this.logEvent({ message: 'onAppPause called' });
                 this.stopHeartbeatWorker();
+                useDeviceAccess().pauseBackgroundActivity()
+                    .catch((err) => { this.logError(err, 'onAppPause:pauseBackgroundActivity'); });
                 this.backgroundTimer = setTimeout(() => {
                     this.backgroundPausedByService = true;
-                    this.pause();
+                    this.pause().catch((err) => { this.logError(err, 'onAppPause:pause'); });
                 }, BACKGROUND_PAUSE_TIMEOUT_MS);
             }
             catch (err) {
@@ -197,8 +199,10 @@ let UserInterfaceServcie = (() => {
                 this.startHeartbeatWorker();
                 this.backgroundPausedByService = false;
                 this.appState = 'Active';
+                useDeviceAccess().resumeBackgroundActivity()
+                    .catch((err) => { this.logError(err, 'onAppResume:resumeBackgroundActivity'); });
                 if (resumeRequired) {
-                    this.resume();
+                    this.resume().catch((err) => { this.logError(err, 'onAppResume:resume'); });
                 }
             }
             catch (err) {
@@ -236,16 +240,50 @@ let UserInterfaceServcie = (() => {
             }
         }
         async pause() {
-            await IncyclistPageService.pausePage();
-            await useDeviceAccess().disconnect();
-            if (this.getMessageQueue().disconnect)
-                this.getMessageQueue().disconnect();
+            this.logEvent({ message: 'pause started' });
+            try {
+                await IncyclistPageService.pausePage();
+            }
+            catch (err) {
+                this.logError(err, 'pause:pausePage');
+            }
+            try {
+                await useDeviceAccess().disconnect();
+            }
+            catch (err) {
+                this.logError(err, 'pause:disconnect');
+            }
+            try {
+                if (this.getMessageQueue().disconnect)
+                    this.getMessageQueue().disconnect();
+            }
+            catch (err) {
+                this.logError(err, 'pause:mqDisconnect');
+            }
+            this.logEvent({ message: 'pause finished' });
         }
         async resume() {
-            if (this.getMessageQueue().connect)
-                this.getMessageQueue().connect();
-            await useDeviceAccess().connect();
-            await IncyclistPageService.resumePage();
+            this.logEvent({ message: 'resume started' });
+            try {
+                if (this.getMessageQueue().connect)
+                    this.getMessageQueue().connect();
+            }
+            catch (err) {
+                this.logError(err, 'resume:mqConnect');
+            }
+            try {
+                await useDeviceAccess().connect();
+            }
+            catch (err) {
+                this.logError(err, 'resume:connect');
+            }
+            try {
+                await IncyclistPageService.resumePage();
+            }
+            catch (err) {
+                this.logError(err, 'resume:resumePage');
+            }
+            this.logEvent({ message: 'resume finished' });
         }
         startHeartbeatWorker() {
             if (this.heartbeatIv)

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

@@ -22,6 +22,8 @@ export declare class DeviceAccessService extends IncyclistService {
     connect(ifaceName?: string): Promise<boolean>;
     private getScanTimeout;
     disconnect(ifaceName?: string): Promise<boolean>;
+    pauseBackgroundActivity(): Promise<void>;
+    resumeBackgroundActivity(): Promise<void>;
     terminate(ifaceName?: string): Promise<void>;
     scan(filter?: ScanFilter, props?: {
         timeout?: number;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.129",
+  "version": "1.7.131",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },
   "dependencies": {
     "@garmin/fitsdk": "^21.213.0",
     "axios": "^1.19.0",
-    "incyclist-devices": "^3.0.34",
+    "incyclist-devices": "^3.0.35",
     "promise.any": "^2.0.6",
     "semver": "^7.7.4",
     "tcx-builder": "^1.1.1",