From 3c9c115931794f7e370f68361031fe0241e2aea6 Mon Sep 17 00:00:00 2001
From: DJ2LS <dj2ls@proton.me>
Date: Thu, 8 Feb 2024 13:39:18 +0100
Subject: [PATCH] adjusted health status check

---
 gui/src/components/main_modem_healthcheck.vue | 11 ++---------
 gui/src/js/api.js                             |  2 +-
 gui/src/js/eventHandler.js                    | 16 ++++++++++++++++
 gui/src/js/event_sock.js                      |  8 ++++----
 gui/src/js/freedata.ts                        |  2 +-
 5 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/gui/src/components/main_modem_healthcheck.vue b/gui/src/components/main_modem_healthcheck.vue
index 951ef1a4..eac73b61 100644
--- a/gui/src/components/main_modem_healthcheck.vue
+++ b/gui/src/components/main_modem_healthcheck.vue
@@ -6,15 +6,8 @@ setActivePinia(pinia);
 import { useStateStore } from "../store/stateStore.js";
 const state = useStateStore(pinia);
 
-function getOverallHealth() {
-  //Return a number indicating health for icon bg color; lower the number the healthier
-  let health = 0;
-  if (state.modem_connection !== "connected") health += 5;
-  if (!state.is_modem_running) health += 3;
-  if (state.radio_status === false) health += 2;
-  if (process.env.FDUpdateAvail === "1") health += 1;
-  return health;
-}
+import { getOverallHealth } from "../js/eventHandler.js"
+
 </script>
 <template>
   <a
diff --git a/gui/src/js/api.js b/gui/src/js/api.js
index e53ba099..e51c006b 100644
--- a/gui/src/js/api.js
+++ b/gui/src/js/api.js
@@ -19,7 +19,7 @@ async function apiGet(endpoint) {
     }
     return await response.json();
   } catch (error) {
-    console.error("Error getting from REST:", error);
+    //console.error("Error getting from REST:", error);
   }
 }
 
diff --git a/gui/src/js/eventHandler.js b/gui/src/js/eventHandler.js
index 3c0d33d5..65e211dd 100644
--- a/gui/src/js/eventHandler.js
+++ b/gui/src/js/eventHandler.js
@@ -129,6 +129,7 @@ export function eventDispatcher(data) {
       displayToast("success", "bi-ethernet", message, 5000);
       stateStore.modem_connection = "connected";
       getModemState();
+      getOverallHealth();
       getConfig();
       getAudioDevices();
       getSerialDevices();
@@ -318,3 +319,18 @@ function build_HSL() {
   }
   stateStore.heard_stations.sort((a, b) => b.timestamp - a.timestamp); // b - a for reverse sort
 }
+
+export function getOverallHealth() {
+  //Return a number indicating health for icon bg color; lower the number the healthier
+  let health = 0;
+  if (stateStore.modem_connection !== "connected") {
+    health += 5;
+    stateStore.is_modem_running = false;
+    stateStore.radio_status = false;
+
+  }
+  if (!stateStore.is_modem_running) health += 3;
+  if (stateStore.radio_status === false) health += 2;
+  if (process.env.FDUpdateAvail === "1") health += 1;
+  return health;
+}
\ No newline at end of file
diff --git a/gui/src/js/event_sock.js b/gui/src/js/event_sock.js
index 510c137c..954b45c5 100644
--- a/gui/src/js/event_sock.js
+++ b/gui/src/js/event_sock.js
@@ -19,7 +19,7 @@ function connect(endpoint, dispatcher) {
 
   // handle opening
   socket.addEventListener("open", function (event) {
-    console.log("Connected to the WebSocket server: " + endpoint);
+    //console.log("Connected to the WebSocket server: " + endpoint);
   });
 
   // handle data
@@ -30,18 +30,18 @@ function connect(endpoint, dispatcher) {
 
   // handle errors
   socket.addEventListener("error", function (event) {
-    console.error("WebSocket error:", event);
+    //console.error("WebSocket error:", event);
     connectionFailed(endpoint, event);
   });
 
   // handle closing and reconnect
   socket.addEventListener("close", function (event) {
-    console.log("WebSocket connection closed:", event.code);
+    //console.log("WebSocket connection closed:", event.code);
 
     // Reconnect handler
     if (!event.wasClean) {
       setTimeout(() => {
-        console.log("Reconnecting to websocket");
+        //console.log("Reconnecting to websocket");
         connect(endpoint, dispatcher);
       }, 1000);
     }
diff --git a/gui/src/js/freedata.ts b/gui/src/js/freedata.ts
index 4ef51720..0b70bcfa 100644
--- a/gui/src/js/freedata.ts
+++ b/gui/src/js/freedata.ts
@@ -127,4 +127,4 @@ export function getAppDataPath() {
   }
 
   return appDataPath;
-}
+}
\ No newline at end of file