incyclist-services 1.0.69 → 1.0.70

package/lib/devices/ride/service.js

@@ -476,6 +476,7 @@ class DeviceRideService extends events_1.default {
         const check = () => {
             const tsNow = Date.now();
             const isPaused = ai.adapter.isPaused();
+            const prevStatus = ai.dataStatus;
             if (isPaused || !ai.tsLastData) {
                 ai.tsLastData = tsNow;
                 ai.dataStatus = 'green';
@@ -491,16 +492,16 @@ class DeviceRideService extends events_1.default {
             if (ai.isHealthy && (isAmber || isRed)) {
                 ai.isHealthy = false;
                 this.logEvent({ message: 'device unhealthy', device: ai.adapter.getUniqueName(), udid: ai.udid });
-                const { enabledCapabilities } = this.getEnabledCapabilities(ai);
-                this.emit('unhealthy', ai.udid, ai.dataStatus, enabledCapabilities);
                 console.log('~~~~ health check: prepare reconnect');
                 this.prepareReconnect(ai);
             }
             else if (!ai.isHealthy && !isAmber && !isRed) {
-                const { enabledCapabilities } = this.getEnabledCapabilities(ai);
                 ai.isHealthy = true;
                 this.logEvent({ message: 'device healthy', device: ai.adapter.getUniqueName(), udid: ai.udid });
-                this.emit('healthy', ai.udid, ai.dataStatus, enabledCapabilities);
+            }
+            if (ai.dataStatus !== prevStatus) {
+                const { enabledCapabilities } = this.getEnabledCapabilities(ai);
+                this.emit('health', ai.udid, ai.dataStatus, enabledCapabilities);
             }
         };
         ai.ivToCheck = (0, timers_1.setInterval)(check, 1000);
@@ -542,6 +543,7 @@ class DeviceRideService extends events_1.default {
             this.once('stop-ride', () => { stopRequested = true; });
             const i = incyclist_devices_1.InterfaceFactory.create(ifName);
             try {
+                console.log('~~~~ health check: stop Adapters', ifName);
                 const promisesStop = [];
                 adapters.map(ai => {
                     if (ai.isRestarting) {
@@ -556,11 +558,13 @@ class DeviceRideService extends events_1.default {
                 if (promisesStop.length > 0) {
                     yield Promise.allSettled(promisesStop);
                 }
+                console.log('~~~~ health check: reconnect interface', ifName);
                 if (!stopRequested) {
                     yield i.disconnect();
                     yield (0, sleep_1.sleep)(1000);
                     yield i.connect();
                 }
+                console.log('~~~~ health check: start adapters', ifName);
                 if (!stopRequested) {
                     const promisesStart = [];
                     adapters.map(ai => { promisesStart.push(ai.adapter.start()); });
@@ -571,12 +575,14 @@ class DeviceRideService extends events_1.default {
             }
             catch (err) {
                 this.logger.logEvent({ message: 'restart interface failed', interface: ifName, reason: err.message });
+                console.log('~~~~ health check: restart interface error', ifName, err);
             }
             adapters.map(ai => {
                 if (ai.adapter.isStarted()) {
                     ai.tsLastData = Date.now();
                 }
                 else {
+                    console.log('~~~~ health check: adapter still not healthy', ifName, ai.udid);
                     ai.isRestarting = false;
                     this.prepareReconnect(ai);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.0.69",
+  "version": "1.0.70",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "axios": "^1.6.1",
-    "incyclist-devices": "^2.1.28",
+    "incyclist-devices": "^2.1.29",
     "uuid": "^9.0.0",
     "xml2js": "^0.6.2"
   }