incyclist-services 1.7.58 → 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/ui/service.js

@@ -183,15 +183,18 @@ let UserInterfaceServcie = (() => {
             this.isTerminated = false;
             this.isTerminating = false;
             try {
+                let resumeRequired = true;
+                if (this.backgroundTimer) {
+                    clearTimeout(this.backgroundTimer);
+                    resumeRequired = false;
+                }
+                this.logEvent({ message: 'onAppResume called' });
                 this.startHeartbeatWorker();
                 this.backgroundPausedByService = false;
                 this.appState = 'Active';
-                this.logEvent({ message: 'onAppResume called' });
-                if (this.backgroundTimer) {
-                    clearTimeout(this.backgroundTimer);
-                    return;
+                if (resumeRequired) {
+                    this.resume();
                 }
-                this.resume();
             }
             catch (err) {
                 this.logError(err, 'onAppPause');
@@ -228,15 +231,15 @@ let UserInterfaceServcie = (() => {
         }
         async pause() {
             await pages_1.IncyclistPageService.pausePage();
-            (0, devices_1.useDeviceAccess)().disconnect();
+            await (0, devices_1.useDeviceAccess)().disconnect();
             if (this.getMessageQueue().disconnect)
                 this.getMessageQueue().disconnect();
         }
-        resume() {
+        async resume() {
             if (this.getMessageQueue().connect)
                 this.getMessageQueue().connect();
-            (0, devices_1.useDeviceAccess)().connect();
-            pages_1.IncyclistPageService.resumePage();
+            await (0, devices_1.useDeviceAccess)().connect();
+            await pages_1.IncyclistPageService.resumePage();
         }
         startHeartbeatWorker() {
             if (this.heartbeatIv)

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/ui/service.js

@@ -180,15 +180,18 @@ let UserInterfaceServcie = (() => {
             this.isTerminated = false;
             this.isTerminating = false;
             try {
+                let resumeRequired = true;
+                if (this.backgroundTimer) {
+                    clearTimeout(this.backgroundTimer);
+                    resumeRequired = false;
+                }
+                this.logEvent({ message: 'onAppResume called' });
                 this.startHeartbeatWorker();
                 this.backgroundPausedByService = false;
                 this.appState = 'Active';
-                this.logEvent({ message: 'onAppResume called' });
-                if (this.backgroundTimer) {
-                    clearTimeout(this.backgroundTimer);
-                    return;
+                if (resumeRequired) {
+                    this.resume();
                 }
-                this.resume();
             }
             catch (err) {
                 this.logError(err, 'onAppPause');
@@ -225,15 +228,15 @@ let UserInterfaceServcie = (() => {
         }
         async pause() {
             await IncyclistPageService.pausePage();
-            useDeviceAccess().disconnect();
+            await useDeviceAccess().disconnect();
             if (this.getMessageQueue().disconnect)
                 this.getMessageQueue().disconnect();
         }
-        resume() {
+        async resume() {
             if (this.getMessageQueue().connect)
                 this.getMessageQueue().connect();
-            useDeviceAccess().connect();
-            IncyclistPageService.resumePage();
+            await useDeviceAccess().connect();
+            await IncyclistPageService.resumePage();
         }
         startHeartbeatWorker() {
             if (this.heartbeatIv)

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/ui/service.d.ts

@@ -29,7 +29,7 @@ export declare class UserInterfaceServcie extends IncyclistService {
     onAppResume(): Promise<boolean>;
     protected onSessionStart(): void;
     protected pause(): Promise<void>;
-    protected resume(): 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.58",
+  "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",