From 9e802db6d3dfac15e10faa324d2497ebb52582a4 Mon Sep 17 00:00:00 2001
From: DJ2LS <dj2ls@proton.me>
Date: Thu, 9 Nov 2023 19:46:29 +0100
Subject: [PATCH] introduced api module

---
 gui/src/components/main.vue                |  4 ++--
 gui/src/components/settings_chat.vue       | 14 +++++------
 gui/src/components/settings_exp.vue        |  9 +++----
 gui/src/components/settings_hamlib.vue     | 28 +++++++++++-----------
 gui/src/components/settings_modem.vue      | 28 +++++++++++-----------
 gui/src/components/settings_rigcontrol.vue |  4 ++--
 gui/src/components/settings_station.vue    |  8 +++----
 gui/src/components/settings_web.vue        |  8 ++++---
 gui/src/js/api.js                          | 28 ++++++++++++++++++++++
 gui/src/js/event_sock.js                   |  1 -
 gui/src/js/settingsHandler.ts              | 13 ----------
 11 files changed, 81 insertions(+), 64 deletions(-)
 create mode 100644 gui/src/js/api.js

diff --git a/gui/src/components/main.vue b/gui/src/components/main.vue
index d6a54623..f67d1337 100644
--- a/gui/src/components/main.vue
+++ b/gui/src/components/main.vue
@@ -19,7 +19,7 @@ import chat from "./chat.vue";
 import infoScreen from "./infoScreen.vue";
 
 import { stopTransmission } from "../js/sock.js";
-import { fetchSettings } from "../js/settingsHandler.js";
+import { getModemConfig } from "../js/api";
 
 function stopAllTransmissions() {
   console.log("stopping transmissions");
@@ -113,7 +113,7 @@ function stopAllTransmissions() {
               role="tab"
               aria-controls="list-settings"
               title="Settings"
-              @click="fetchSettings"
+              @click="getModemConfig"
               ><i class="bi bi-gear-wide-connected h3"></i
             ></a>
 
diff --git a/gui/src/components/settings_chat.vue b/gui/src/components/settings_chat.vue
index 296b4faf..17bad7ca 100644
--- a/gui/src/components/settings_chat.vue
+++ b/gui/src/components/settings_chat.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { saveSettings } from "../js/settingsHandler";
+import { saveModemConfig } from "../js/api";
 
 import { setActivePinia } from "pinia";
 import pinia from "../store/index";
@@ -18,7 +18,7 @@ const settings = useSettingsStore(pinia);
           class="form-check-input"
           type="checkbox"
           id="enable_is_writing"
-          @change="saveSettings"
+          @change="saveModemConfig"
           v-model="settings.enable_is_writing"
           true-value="True"
           false-value="False"
@@ -39,7 +39,7 @@ const settings = useSettingsStore(pinia);
           class="form-check-input"
           type="checkbox"
           id="enable_request_profile"
-          @change="saveSettings"
+          @change="saveModemConfig"
           v-model="settings.enable_request_profile"
           true-value="True"
           false-value="False"
@@ -59,7 +59,7 @@ const settings = useSettingsStore(pinia);
           class="form-check-input"
           type="checkbox"
           id="enable_request_shared_folder"
-          @change="saveSettings"
+          @change="saveModemConfig"
           v-model="settings.enable_request_shared_folder"
           true-value="True"
           false-value="False"
@@ -75,7 +75,7 @@ const settings = useSettingsStore(pinia);
       type="text"
       class="form-control w-50"
       id="shared_folder_path"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.shared_folder_path"
       disabled
     />
@@ -92,7 +92,7 @@ const settings = useSettingsStore(pinia);
           class="form-check-input"
           type="checkbox"
           id="enable_auto_retry"
-          @change="saveSettings"
+          @change="saveModemConfig"
           v-model="settings.enable_auto_retry"
           true-value="True"
           false-value="False"
@@ -106,7 +106,7 @@ const settings = useSettingsStore(pinia);
     <select
       class="form-select form-select-sm w-50"
       id="max_retry_attempts"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.max_retry_attempts"
     >
       <option value="1">1</option>
diff --git a/gui/src/components/settings_exp.vue b/gui/src/components/settings_exp.vue
index 7649f280..e68b8c53 100644
--- a/gui/src/components/settings_exp.vue
+++ b/gui/src/components/settings_exp.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import { saveSettings } from "../js/settingsHandler";
+import { saveModemConfig } from "../js/api";
+
 
 import { setActivePinia } from "pinia";
 import pinia from "../store/index";
@@ -18,7 +19,7 @@ const settings = useSettingsStore(pinia);
           class="form-check-input"
           type="checkbox"
           id="autoTuneSwitch"
-          @change="saveSettings"
+          @change="saveModemConfig"
           v-model="settings.auto_tune"
           true-value="True"
           false-value="False"
@@ -37,7 +38,7 @@ const settings = useSettingsStore(pinia);
           class="form-check-input"
           type="checkbox"
           id="fskModeSwitch"
-          @change="saveSettings"
+          @change="saveModemConfig"
           v-model="settings.enable_fsk"
           true-value="True"
           false-value="False"
@@ -57,7 +58,7 @@ const settings = useSettingsStore(pinia);
           class="form-check-input"
           type="checkbox"
           id="enableMeshSwitch"
-          @change="saveSettings"
+          @change="saveModemConfig"
           v-model="settings.enable_mesh_features"
           true-value="True"
           false-value="False"
diff --git a/gui/src/components/settings_hamlib.vue b/gui/src/components/settings_hamlib.vue
index 234d883e..c02f74df 100644
--- a/gui/src/components/settings_hamlib.vue
+++ b/gui/src/components/settings_hamlib.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { saveSettings } from "../js/settingsHandler";
+import { saveModemConfig } from "../js/api";
 
 import { setActivePinia } from "pinia";
 import pinia from "../store/index";
@@ -20,7 +20,7 @@ const settings = useSettingsStore(pinia);
       id="hamlib_rigctld_path"
       aria-label="Device IP"
       aria-describedby="basic-addon1"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.hamlib_rigctld_path"
     />
   </div>
@@ -35,7 +35,7 @@ const settings = useSettingsStore(pinia);
       id="hamlib_rigctld_server_port"
       aria-label="Device Port"
       aria-describedby="basic-addon1"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.hamlib_rigctld_server_port"
     />
   </div>
@@ -73,7 +73,7 @@ const settings = useSettingsStore(pinia);
       class="form-select form-select-sm"
       aria-label=".form-select-sm"
       id="hamlib_deviceid"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.hamlib_deviceid"
     >
       <option selected value="-- ignore --">-- ignore --</option>
@@ -350,7 +350,7 @@ const settings = useSettingsStore(pinia);
       aria-label=".form-select-sm"
       id="hamlib_deviceport"
       style="width: 7rem"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-html="settings.getSerialDevices()"
     ></select>
   </div>
@@ -362,7 +362,7 @@ const settings = useSettingsStore(pinia);
       class="form-select form-select-sm"
       aria-label=".form-select-sm"
       id="hamlib_serialspeed"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.hamlib_serialspeed"
     >
       <option selected value="ignore">-- ignore --</option>
@@ -385,7 +385,7 @@ const settings = useSettingsStore(pinia);
       class="form-select form-select-sm"
       aria-label=".form-select-sm"
       id="hamlib_data_bits"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.hamlib_data_bits"
     >
       <option selected value="ignore">-- ignore --</option>
@@ -400,7 +400,7 @@ const settings = useSettingsStore(pinia);
       class="form-select form-select-sm"
       aria-label=".form-select-sm"
       id="hamlib_stop_bits"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.hamlib_stop_bits"
     >
       <option selected value="ignore">-- ignore --</option>
@@ -415,7 +415,7 @@ const settings = useSettingsStore(pinia);
       class="form-select form-select-sm"
       aria-label=".form-select-sm"
       id="hamlib_handshake"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.hamlib_handshake"
     >
       <option selected value="ignore">-- ignore --</option>
@@ -429,7 +429,7 @@ const settings = useSettingsStore(pinia);
       class="form-select form-select-sm"
       aria-label=".form-select-sm"
       id="hamlib_ptt_port"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.hamlib_ptt_port"
     >
       <option selected value="ignore">-- ignore --</option>
@@ -443,7 +443,7 @@ const settings = useSettingsStore(pinia);
       aria-label=".form-select-sm"
       id="hamlib_pttprotocol"
       style="width: 0.5rem"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.hamlib_pttprotocol"
     >
       <option selected value="ignore">-- ignore --</option>
@@ -464,7 +464,7 @@ const settings = useSettingsStore(pinia);
       aria-label=".form-select-sm"
       id="hamlib_dcd"
       style="width: 0.5rem"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.hamlib_dcd"
     >
       <option selected value="ignore">-- ignore --</option>
@@ -484,7 +484,7 @@ const settings = useSettingsStore(pinia);
       aria-label=".form-select-sm"
       id="hamlib_dtrstate"
       style="width: 0.5rem"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.hamlib_dtrstate"
     >
       <option selected value="ignore">-- ignore --</option>
@@ -522,7 +522,7 @@ const settings = useSettingsStore(pinia);
       id="hamlib_rigctld_custom_args"
       aria-label="Custom arguments"
       aria-describedby="basic-addon1"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.hamlib_rigctld_custom_args"
     />
   </div>
diff --git a/gui/src/components/settings_modem.vue b/gui/src/components/settings_modem.vue
index b07ea866..a2a3b6bf 100644
--- a/gui/src/components/settings_modem.vue
+++ b/gui/src/components/settings_modem.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { saveSettings } from "../js/settingsHandler";
+import { saveModemConfig } from "../js/api";
 
 import { setActivePinia } from "pinia";
 import pinia from "../store/index";
@@ -72,7 +72,7 @@ function startStopModem() {
       maxlength="5"
       max="65534"
       min="1025"
-      @change="saveSettings()"
+      @change="saveModemConfig()"
       v-model="settings.modem_port"
     />
   </div>
@@ -84,7 +84,7 @@ function startStopModem() {
       class="form-control"
       placeholder="modem host"
       id="modem_port"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.modem_host"
     />
   </div>
@@ -96,7 +96,7 @@ function startStopModem() {
       class="form-select form-select-sm"
       id="rx_audio"
       aria-label=".form-select-sm"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.rx_audio"
       v-html="audio.getInputDevices()"
     ></select>
@@ -109,7 +109,7 @@ function startStopModem() {
       class="form-select form-select-sm"
       id="tx_audio"
       aria-label=".form-select-sm"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.tx_audio"
       v-html="audio.getOutputDevices()"
     ></select>
@@ -120,7 +120,7 @@ function startStopModem() {
     <select
       class="form-select form-select-sm"
       id="tx_delay"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.tx_delay"
     >
       <option value="0">0</option>
@@ -153,7 +153,7 @@ function startStopModem() {
     <select
       class="form-select form-select-sm"
       id="tuning_range_fmin"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.tuning_range_fmin"
     >
       <option value="-50.0">-50.0</option>
@@ -166,7 +166,7 @@ function startStopModem() {
     <select
       class="form-select form-select-sm"
       id="tuning_range_fmax"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.tuning_range_fmax"
     >
       <option value="50.0">50.0</option>
@@ -183,7 +183,7 @@ function startStopModem() {
       aria-label=".form-select-sm"
       id="beaconInterval"
       style="width: 6rem"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.beacon_interval"
     >
       <option value="60">60 secs</option>
@@ -204,7 +204,7 @@ function startStopModem() {
           class="form-check-input"
           type="checkbox"
           id="fftSwitch"
-          @change="saveSettings"
+          @change="saveModemConfig"
           v-model="settings.enable_fft"
           true-value="True"
           false-value="False"
@@ -221,7 +221,7 @@ function startStopModem() {
           class="form-check-input"
           type="checkbox"
           id="scatterSwitch"
-          @change="saveSettings"
+          @change="saveModemConfig"
           v-model="settings.enable_scatter"
           true-value="True"
           false-value="False"
@@ -241,7 +241,7 @@ function startStopModem() {
           v-model="settings.low_bandwidth_mode"
           true-value="True"
           false-value="False"
-          @change="saveSettings"
+          @change="saveModemConfig"
         />
         <label class="form-check-label" for="250HzModeSwitch">250Hz</label>
       </div>
@@ -258,7 +258,7 @@ function startStopModem() {
           v-model="settings.respond_to_cq"
           true-value="True"
           false-value="False"
-          @change="saveSettings"
+          @change="saveModemConfig"
         />
         <label class="form-check-label" for="respondCQSwitch">QRV</label>
       </div>
@@ -270,7 +270,7 @@ function startStopModem() {
       <select
         class="form-select form-select-sm"
         id="rx_buffer_size"
-        @change="saveSettings"
+        @change="saveModemConfig"
         v-model="settings.rx_buffer_size"
       >
         <option value="1">1</option>
diff --git a/gui/src/components/settings_rigcontrol.vue b/gui/src/components/settings_rigcontrol.vue
index df800a07..71c8a2f9 100644
--- a/gui/src/components/settings_rigcontrol.vue
+++ b/gui/src/components/settings_rigcontrol.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { saveSettings } from "../js/settingsHandler";
+import { saveModemConfig } from "../js/api";
 
 import { setActivePinia } from "pinia";
 import pinia from "../store/index";
@@ -17,7 +17,7 @@ const settings = useSettingsStore(pinia);
       class="form-select form-select-sm"
       aria-label=".form-select-sm"
       id="rigcontrol_radiocontrol"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.radiocontrol"
     >
       <option selected value="disabled">
diff --git a/gui/src/components/settings_station.vue b/gui/src/components/settings_station.vue
index 32d7a897..8a865702 100644
--- a/gui/src/components/settings_station.vue
+++ b/gui/src/components/settings_station.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { saveSettings } from "../js/settingsHandler";
+import { saveModemConfig } from "../js/api";
 
 import { setActivePinia } from "pinia";
 import pinia from "../store/index";
@@ -21,7 +21,7 @@ const settings = useSettingsStore(pinia);
       id="myCall"
       aria-label="Station Callsign"
       aria-describedby="basic-addon1"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.mycall"
     />
   </div>
@@ -32,7 +32,7 @@ const settings = useSettingsStore(pinia);
     <select
       class="form-select form-select-sm w-50"
       id="myCallSSID"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.myssid"
     >
       <option selected value="0">0</option>
@@ -65,7 +65,7 @@ const settings = useSettingsStore(pinia);
       maxlength="6"
       aria-label="Station Grid Locator"
       aria-describedby="basic-addon1"
-      @change="saveSettings"
+      @change="saveModemConfig"
       v-model="settings.mygrid"
     />
   </div>
diff --git a/gui/src/components/settings_web.vue b/gui/src/components/settings_web.vue
index 7162d25d..2ef7ba03 100644
--- a/gui/src/components/settings_web.vue
+++ b/gui/src/components/settings_web.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { saveSettings } from "../js/settingsHandler";
+import { saveModemConfig } from "../js/api";
+
+
 
 import { setActivePinia } from "pinia";
 import pinia from "../store/index";
@@ -18,7 +20,7 @@ const settings = useSettingsStore(pinia);
           class="form-check-input"
           type="checkbox"
           id="ExplorerSwitch"
-          @change="saveSettings"
+          @change="saveModemConfig"
           v-model="settings.enable_explorer"
           true-value="True"
           false-value="False"
@@ -35,7 +37,7 @@ const settings = useSettingsStore(pinia);
           class="form-check-input"
           type="checkbox"
           id="ExplorerStatsSwitch"
-          @change="saveSettings"
+          @change="saveModemConfig"
           v-model="settings.explorer_stats"
           true-value="True"
           false-value="False"
diff --git a/gui/src/js/api.js b/gui/src/js/api.js
new file mode 100644
index 00000000..cfb7963d
--- /dev/null
+++ b/gui/src/js/api.js
@@ -0,0 +1,28 @@
+import { getModemConfigAsJSON } from "./settingsHandler.ts";
+
+
+
+export function getModemConfig(){
+
+  // fetch Settings
+  getFromServer("localhost", 5000, "config");
+  getFromServer("localhost", 5000, "devices/audio");
+  getFromServer("localhost", 5000, "devices/serial");
+
+}
+
+
+export function saveModemConfig(){
+  postToServer("localhost", 5000, "config", getModemConfigAsJSON());
+
+}
+
+export function fetchSettings() {
+
+}
+
+export function saveSettings() {
+  // save settings via post
+  console.log("post settings");
+
+}
diff --git a/gui/src/js/event_sock.js b/gui/src/js/event_sock.js
index 408609ce..18ee69e3 100644
--- a/gui/src/js/event_sock.js
+++ b/gui/src/js/event_sock.js
@@ -7,7 +7,6 @@ function connect(endpoint, dispatcher) {
   // handle opening
   socket.addEventListener("open", function (event) {
     console.log("Connected to the WebSocket server: " + endpoint);
-    retries = 0; // Reset the retries back to 0 since the connection was successful
   });
 
   // handle data
diff --git a/gui/src/js/settingsHandler.ts b/gui/src/js/settingsHandler.ts
index a457d12f..bc96711d 100644
--- a/gui/src/js/settingsHandler.ts
+++ b/gui/src/js/settingsHandler.ts
@@ -224,16 +224,3 @@ export function getModemConfigAsJSON() {
 
   return configData;
 }
-
-export function fetchSettings() {
-  // fetch Settings
-  getFromServer("localhost", 5000, "config");
-  getFromServer("localhost", 5000, "devices/audio");
-  getFromServer("localhost", 5000, "devices/serial");
-}
-
-export function saveSettings() {
-  // save settings via post
-  console.log("post settings");
-  postToServer("localhost", 5000, "config", getModemConfigAsJSON());
-}