incyclist-services 1.7.57 → 1.7.59

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

@@ -222,7 +222,7 @@ let DeviceAccessService = (() => {
                 this.interfaces[ifaceName].state = 'connecting';
                 this.emit('interface-changed', ifaceName, { ...this.interfaces[ifaceName], state: 'connecting' });
                 await impl.disconnect();
-                const connected = await impl.connect();
+                const connected = await impl.connect(true);
                 const state = connected ? 'connected' : 'disconnected';
                 this.interfaces[ifaceName].state = state;
                 this.emit('interface-changed', ifaceName, this.interfaces[ifaceName]);

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

@@ -205,9 +205,10 @@ let DevicePairingService = (() => {
         async prepareStart(adapterFilter = []) {
             const stillPairing = this.isPairing();
             const stillScanning = this.isScanning();
+            const adapters = this.state?.adapters ?? [];
             this.logEvent({ message: 'Stop Pairing (OK)', stillPairing, stillScanning });
             try {
-                this.pauseAdapters(this.state.adapters.filter(a => !adapterFilter.includes(a.udid)));
+                this.pauseAdapters(adapters.filter(a => !adapterFilter.includes(a.udid)));
                 if (this.isPairing()) {
                     this.removePairingCallbacks();
                 }

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

@@ -42,7 +42,7 @@ const display_1 = require("../display");
 const sleep_1 = require("../../utils/sleep");
 const api_1 = require("../../api");
 const monitoring_1 = require("../../monitoring");
-const BACKGROUND_PAUSE_TIMEOUT_MS = 60000;
+const BACKGROUND_PAUSE_TIMEOUT_MS = 300000;
 let RidePageService = (() => {
     let _classDecorators = [decorators_1.Singleton];
     let _classDescriptor;

package/lib/cjs/ui/service.js

@@ -50,6 +50,7 @@ const monitoring_1 = require("../monitoring");
 const appstate_1 = require("../appstate");
 const pages_1 = require("../base/pages");
 const utils_1 = require("../utils");
+const BACKGROUND_PAUSE_TIMEOUT_MS = 300000;
 let UserInterfaceServcie = (() => {
     let _classDecorators = [decorators_1.Singleton];
     let _classDescriptor;
@@ -91,6 +92,8 @@ let UserInterfaceServcie = (() => {
         heartbeatIv;
         appFeatures;
         appState = 'Inactive';
+        backgroundTimer;
+        backgroundPausedByService = false;
         constructor() {
             super('Incyclist');
             this.bindings = this.getBindings();
@@ -162,8 +165,10 @@ let UserInterfaceServcie = (() => {
                 this.appState = 'Background';
                 this.logEvent({ message: 'onAppPause called' });
                 this.stopHeartbeatWorker();
-                await pages_1.IncyclistPageService.pausePage();
-                (0, devices_1.useDeviceAccess)().disconnect();
+                this.backgroundTimer = setTimeout(() => {
+                    this.backgroundPausedByService = true;
+                    this.pause();
+                }, BACKGROUND_PAUSE_TIMEOUT_MS);
             }
             catch (err) {
                 this.logError(err, 'onAppPause');
@@ -178,11 +183,18 @@ let UserInterfaceServcie = (() => {
             this.isTerminated = false;
             this.isTerminating = false;
             try {
-                this.appState = 'Active';
+                let resumeRequired = true;
+                if (this.backgroundTimer) {
+                    clearTimeout(this.backgroundTimer);
+                    resumeRequired = false;
+                }
                 this.logEvent({ message: 'onAppResume called' });
-                (0, devices_1.useDeviceAccess)().connect();
-                pages_1.IncyclistPageService.resumePage();
                 this.startHeartbeatWorker();
+                this.backgroundPausedByService = false;
+                this.appState = 'Active';
+                if (resumeRequired) {
+                    this.resume();
+                }
             }
             catch (err) {
                 this.logError(err, 'onAppPause');
@@ -217,6 +229,18 @@ let UserInterfaceServcie = (() => {
                 this.logError(err, 'onSessionStart');
             }
         }
+        async pause() {
+            await pages_1.IncyclistPageService.pausePage();
+            await (0, devices_1.useDeviceAccess)().disconnect();
+            if (this.getMessageQueue().disconnect)
+                this.getMessageQueue().disconnect();
+        }
+        async resume() {
+            if (this.getMessageQueue().connect)
+                this.getMessageQueue().connect();
+            await (0, devices_1.useDeviceAccess)().connect();
+            await pages_1.IncyclistPageService.resumePage();
+        }
         startHeartbeatWorker() {
             if (this.heartbeatIv)
                 return;

package/lib/cjs/video/VideoSyncHelper.js

@@ -442,7 +442,7 @@ class VideoSyncHelper extends service_1.IncyclistService {
             }
             const s0 = mapping.distance;
             const v = mapping.videoSpeed / 3.6;
-            const t = mapping.time + (distance - s0) / v;
+            const t = mapping.time === 0 ? mapping.time + distance / v : mapping.time + (distance - s0) / v;
             if (!Number.isNaN(t)) {
                 return t;
             }

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

@@ -216,7 +216,7 @@ let DeviceAccessService = (() => {
                 this.interfaces[ifaceName].state = 'connecting';
                 this.emit('interface-changed', ifaceName, { ...this.interfaces[ifaceName], state: 'connecting' });
                 await impl.disconnect();
-                const connected = await impl.connect();
+                const connected = await impl.connect(true);
                 const state = connected ? 'connected' : 'disconnected';
                 this.interfaces[ifaceName].state = state;
                 this.emit('interface-changed', ifaceName, this.interfaces[ifaceName]);

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

@@ -199,9 +199,10 @@ let DevicePairingService = (() => {
         async prepareStart(adapterFilter = []) {
             const stillPairing = this.isPairing();
             const stillScanning = this.isScanning();
+            const adapters = this.state?.adapters ?? [];
             this.logEvent({ message: 'Stop Pairing (OK)', stillPairing, stillScanning });
             try {
-                this.pauseAdapters(this.state.adapters.filter(a => !adapterFilter.includes(a.udid)));
+                this.pauseAdapters(adapters.filter(a => !adapterFilter.includes(a.udid)));
                 if (this.isPairing()) {
                     this.removePairingCallbacks();
                 }

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

@@ -39,7 +39,7 @@ import { useRideDisplay } from "../display";
 import { sleep } from "../../utils/sleep";
 import { getBindings } from "../../api";
 import { useOnlineStatusMonitoring } from "../../monitoring";
-const BACKGROUND_PAUSE_TIMEOUT_MS = 60000;
+const BACKGROUND_PAUSE_TIMEOUT_MS = 300000;
 let RidePageService = (() => {
     let _classDecorators = [Singleton];
     let _classDescriptor;

package/lib/esm/ui/service.js

@@ -47,6 +47,7 @@ import { useOnlineStatusMonitoring } from "../monitoring";
 import { useAppState } from "../appstate";
 import { IncyclistPageService } from "../base/pages";
 import { waitNextTick } from "../utils";
+const BACKGROUND_PAUSE_TIMEOUT_MS = 300000;
 let UserInterfaceServcie = (() => {
     let _classDecorators = [Singleton];
     let _classDescriptor;
@@ -88,6 +89,8 @@ let UserInterfaceServcie = (() => {
         heartbeatIv;
         appFeatures;
         appState = 'Inactive';
+        backgroundTimer;
+        backgroundPausedByService = false;
         constructor() {
             super('Incyclist');
             this.bindings = this.getBindings();
@@ -159,8 +162,10 @@ let UserInterfaceServcie = (() => {
                 this.appState = 'Background';
                 this.logEvent({ message: 'onAppPause called' });
                 this.stopHeartbeatWorker();
-                await IncyclistPageService.pausePage();
-                useDeviceAccess().disconnect();
+                this.backgroundTimer = setTimeout(() => {
+                    this.backgroundPausedByService = true;
+                    this.pause();
+                }, BACKGROUND_PAUSE_TIMEOUT_MS);
             }
             catch (err) {
                 this.logError(err, 'onAppPause');
@@ -175,11 +180,18 @@ let UserInterfaceServcie = (() => {
             this.isTerminated = false;
             this.isTerminating = false;
             try {
-                this.appState = 'Active';
+                let resumeRequired = true;
+                if (this.backgroundTimer) {
+                    clearTimeout(this.backgroundTimer);
+                    resumeRequired = false;
+                }
                 this.logEvent({ message: 'onAppResume called' });
-                useDeviceAccess().connect();
-                IncyclistPageService.resumePage();
                 this.startHeartbeatWorker();
+                this.backgroundPausedByService = false;
+                this.appState = 'Active';
+                if (resumeRequired) {
+                    this.resume();
+                }
             }
             catch (err) {
                 this.logError(err, 'onAppPause');
@@ -214,6 +226,18 @@ let UserInterfaceServcie = (() => {
                 this.logError(err, 'onSessionStart');
             }
         }
+        async pause() {
+            await IncyclistPageService.pausePage();
+            await useDeviceAccess().disconnect();
+            if (this.getMessageQueue().disconnect)
+                this.getMessageQueue().disconnect();
+        }
+        async resume() {
+            if (this.getMessageQueue().connect)
+                this.getMessageQueue().connect();
+            await useDeviceAccess().connect();
+            await IncyclistPageService.resumePage();
+        }
         startHeartbeatWorker() {
             if (this.heartbeatIv)
                 return;

package/lib/esm/video/VideoSyncHelper.js

@@ -439,7 +439,7 @@ export class VideoSyncHelper extends IncyclistService {
             }
             const s0 = mapping.distance;
             const v = mapping.videoSpeed / 3.6;
-            const t = mapping.time + (distance - s0) / v;
+            const t = mapping.time === 0 ? mapping.time + distance / v : mapping.time + (distance - s0) / v;
             if (!Number.isNaN(t)) {
                 return t;
             }

package/lib/types/api/mq/index.d.ts

@@ -4,4 +4,6 @@ export interface IMessageQueueBinding extends EventEmitter {
     subscribe(topic: string): any;
     unsubscribe(topic: string): any;
     publish(topic: string, payload: object): any;
+    connect?(): Promise<boolean>;
+    disconnect?(): void;
 }

package/lib/types/ui/service.d.ts

@@ -18,6 +18,8 @@ export declare class UserInterfaceServcie extends IncyclistService {
     protected heartbeatIv: NodeJS.Timeout;
     protected appFeatures: AppFeatures;
     protected appState: 'Inactive' | 'Active' | 'Background' | 'Stopped';
+    protected backgroundTimer: NodeJS.Timeout | undefined;
+    protected backgroundPausedByService: boolean;
     constructor();
     getBindings(): IncyclistBindings;
     setBindings(bindings: IncyclistBindings): void;
@@ -26,6 +28,8 @@ export declare class UserInterfaceServcie extends IncyclistService {
     onAppPause(): Promise<boolean>;
     onAppResume(): Promise<boolean>;
     protected onSessionStart(): void;
+    protected pause(): Promise<void>;
+    protected resume(): Promise<void>;
     protected startHeartbeatWorker(): void;
     protected stopHeartbeatWorker(): void;
     protected sendHeartbeat(): void;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.57",
+  "version": "1.7.59",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },
   "dependencies": {
     "@garmin/fitsdk": "^21.200.0",
     "axios": "^1.15.2",
-    "incyclist-devices": "^3.0.14",
+    "incyclist-devices": "^3.0.15",
     "promise.any": "^2.0.6",
     "semver": "^7.7.4",
     "tcx-builder": "^1.1.1",