incyclist-services 1.4.5 → 1.4.6

package/lib/devices/ride/service.d.ts

@@ -14,6 +14,7 @@ export declare class DeviceRideService extends IncyclistService {
     protected originalMode: CyclingMode;
     protected deviceDataHandler: any;
     protected lazyInitDone: boolean;
+    protected lastDataInfo: Record<string, number>;
     constructor();
     protected waitForInit(): Promise<void>;
     lazyInit(): Promise<void>;
@@ -36,6 +37,8 @@ export declare class DeviceRideService extends IncyclistService {
     private handleStartFailure;
     private handleStartSuccess;
     startHealthCheck(ai: AdapterRideInfo): void;
+    private updateOnDatahandler;
+    private removeOnDatahandler;
     stopHealthCheck(ai: AdapterRideInfo): void;
     prepareReconnect(unhealthy: AdapterRideInfo): Promise<void>;
     private reconnectInterface;
@@ -55,6 +58,10 @@ export declare class DeviceRideService extends IncyclistService {
     resume(): void;
     protected verifySelected(selectedDevices: any, capability: IncyclistCapability): void;
     onData(deviceSettings: DeviceSettings, data: DeviceData): void;
+    protected registerData(adapterInfo: AdapterRideInfo, data: DeviceData): void;
+    protected getLastDataTS(adapterInfo: AdapterRideInfo): number;
+    protected setLastDataTS(adapterInfo: AdapterRideInfo, ts: number): number;
+    protected clearLastDataTS(adapterInfo: AdapterRideInfo): void;
     private getEnabledCapabilities;
     isUpdateBusy(): boolean;
     waitForUpdateFinish(): Promise<void>;

package/lib/devices/ride/service.js

@@ -81,6 +81,7 @@ let DeviceRideService = (() => {
             this.initizialized = __runInitializers(this, _instanceExtraInitializers);
             this.data = {};
             this.deviceDataHandler = this.onData.bind(this);
+            this.lastDataInfo = {};
             this.initizialized = false;
             this.simulatorEnforced = false;
             this.lazyInitDone = false;
@@ -533,29 +534,28 @@ let DeviceRideService = (() => {
                     yield ai.adapter.pause().catch(console.log);
                 if (ai.adapter.isControllable())
                     this.setSerialPortInUse(ai.adapter);
-                if (startType === 'pair') {
-                    ai.adapter.on('data', this.deviceDataHandler);
-                }
-                else if (startType === 'start') {
+                if (startType === 'start') {
                     this.startHealthCheck(ai);
                 }
                 ai.isStarted = true;
             });
         }
         startHealthCheck(ai) {
+            this.updateOnDatahandler(ai);
             const check = () => {
                 if (!ai.ivToCheck)
                     return;
                 const tsNow = Date.now();
+                const tsLastData = this.getLastDataTS(ai);
                 const isPaused = ai.adapter.isPaused();
                 const prevStatus = ai.dataStatus;
-                if (isPaused || !ai.tsLastData) {
-                    ai.tsLastData = tsNow;
+                if (isPaused || !tsLastData) {
+                    this.setLastDataTS(ai, tsNow);
                     ai.dataStatus = 'green';
                     return;
                 }
-                const isAmber = (tsNow - ai.tsLastData) > NO_DATA_THRESHOLD;
-                const isRed = (tsNow - ai.tsLastData) > UNHEALTHY_THRESHOLD;
+                const isAmber = (tsNow - tsLastData) > NO_DATA_THRESHOLD;
+                const isRed = (tsNow - tsLastData) > UNHEALTHY_THRESHOLD;
                 ai.dataStatus = 'green';
                 if (isAmber)
                     ai.dataStatus = 'amber';
@@ -563,7 +563,7 @@ let DeviceRideService = (() => {
                     ai.dataStatus = 'red';
                 if (ai.isHealthy && (isAmber || isRed)) {
                     ai.isHealthy = false;
-                    this.logEvent({ message: 'device unhealthy', device: ai.adapter.getUniqueName(), udid: ai.udid, noDataSince: (tsNow - ai.tsLastData), tsLastData: ai.tsLastData });
+                    this.logEvent({ message: 'device unhealthy', device: ai.adapter.getUniqueName(), udid: ai.udid, noDataSince: (tsNow - tsLastData), tsLastData: new Date(tsLastData).toISOString() });
                     this.prepareReconnect(ai);
                 }
                 else if (!ai.isHealthy && !isAmber && !isRed) {
@@ -583,11 +583,22 @@ let DeviceRideService = (() => {
             ai.ivToCheck = (0, timers_1.setInterval)(() => { check(); }, 1000);
             ai.isHealthy = true;
         }
+        updateOnDatahandler(ai) {
+            this.logEvent({ message: 'init health check', device: ai.adapter.getName(), udid: ai.udid });
+            ai.adapter.off('data', this.deviceDataHandler);
+            ai.adapter.on('data', this.deviceDataHandler);
+        }
+        removeOnDatahandler(ai) {
+            this.logEvent({ message: 'cleanup health check', device: ai.adapter.getName(), udid: ai.udid });
+            ai.adapter.off('data', this.deviceDataHandler);
+        }
         stopHealthCheck(ai) {
             if (ai.ivToCheck) {
                 clearInterval(ai.ivToCheck);
                 delete ai.ivToCheck;
                 delete ai.isHealthy;
+                this.removeOnDatahandler(ai);
+                this.lastDataInfo = {};
             }
         }
         prepareReconnect(unhealthy) {
@@ -870,7 +881,7 @@ let DeviceRideService = (() => {
             const adapterInfo = adapters === null || adapters === void 0 ? void 0 : adapters.find(ai => ai.adapter.isEqual(deviceSettings));
             if (!adapterInfo)
                 return;
-            adapterInfo.tsLastData = data.timestamp || Date.now();
+            this.registerData(adapterInfo, data);
             adapters === null || adapters === void 0 ? void 0 : adapters.forEach(ai => ai.capabilities = ai.adapter.getCapabilities());
             const selectedDevices = config.getSelectedDevices();
             this.verifySelected(selectedDevices, incyclist_devices_1.IncyclistCapability.Speed);
@@ -909,6 +920,23 @@ let DeviceRideService = (() => {
                 });
             }
         }
+        registerData(adapterInfo, data) {
+            var _a;
+            const udid = adapterInfo.udid;
+            this.lastDataInfo[udid] = (_a = data.timestamp) !== null && _a !== void 0 ? _a : Date.now();
+        }
+        getLastDataTS(adapterInfo) {
+            const udid = adapterInfo.udid;
+            return this.lastDataInfo[udid];
+        }
+        setLastDataTS(adapterInfo, ts) {
+            const udid = adapterInfo.udid;
+            return this.lastDataInfo[udid] = ts;
+        }
+        clearLastDataTS(adapterInfo) {
+            const udid = adapterInfo.udid;
+            delete this.lastDataInfo[udid];
+        }
         getEnabledCapabilities(adapterInfo, selected) {
             const adapters = this.getSelectedAdapters();
             const config = this.getDeviceConfiguration();
@@ -988,7 +1016,6 @@ let DeviceRideService = (() => {
         toggleCyclingMode() {
             return __awaiter(this, void 0, void 0, function* () {
                 var _a, _b;
-                console.log('~~~ toggle CyclingMode');
                 if (!this.isToggleEnabled())
                     return;
                 const { adapter } = (_a = this.getControlAdapter()) !== null && _a !== void 0 ? _a : {};
@@ -1014,7 +1041,6 @@ let DeviceRideService = (() => {
         }
         resetCyclingMode() {
             return __awaiter(this, arguments, void 0, function* (sendInit = false) {
-                console.log('~~~ reset CyclingMode');
                 try {
                     const adapterInfo = this.getControlAdapter();
                     if (!(adapterInfo === null || adapterInfo === void 0 ? void 0 : adapterInfo.adapter))
@@ -1043,7 +1069,6 @@ let DeviceRideService = (() => {
         }
         enforceERG() {
             return __awaiter(this, void 0, void 0, function* () {
-                console.log('~~~ enforce ERG');
                 try {
                     const adapters = this.getSelectedAdapters();
                     const adapterInfo = adapters === null || adapters === void 0 ? void 0 : adapters.find(ai => ai.adapter.hasCapability(incyclist_devices_1.IncyclistCapability.Control));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "axios": "^1.7.7",
-    "incyclist-devices": "^2.3.6",
+    "incyclist-devices": "^2.3.7",
     "promise.any": "^2.0.6",
     "semver": "^7.6.3",
     "tcx-builder": "^1.1.1",