fixed bug where if there are no servers the editor spawns with an empty

json object "{}"

Author: Sturdyfool11

src/configuration.rs

@@ -20,6 +20,8 @@ impl Config {
         self.port = new_config.port;
         self.servers = new_config.servers.clone();
         self.themes_folder = new_config.themes_folder.clone();
+        self.slave = new_config.slave;
+        self.slave_connections = new_config.slave_connections.clone();
     }
 
     pub fn update_config_file(&self, file_path: &str) {

src/html_src/index.js

@@ -404,6 +404,15 @@ $(document).ready(function () {
   var justStarted = true;
   var editor; // Monaco editor instance
 
+  // Send requestConfig at startup
+  function sendRequestConfig() {
+    if (socket && socket.readyState === WebSocket.OPEN) {
+      socket.send(JSON.stringify({ type: "requestConfig" }));
+    } else {
+      setTimeout(sendRequestConfig, 100);
+    }
+  }
+
   // Initialize Monaco Editor
   function initMonacoEditor() {
     if (typeof monaco !== "undefined") {
@@ -468,19 +477,23 @@ $(document).ready(function () {
   socket.onmessage = function (message) {
     var obj = JSON.parse(message.data);
     switch (obj.type) {
+      case "ConfigInfo":
+        // Always update config editor with received config
+        window.config = obj.config;
+        const jsonConfig = JSON.stringify(obj.config, undefined, 4);
+        $(".editorText").val(jsonConfig);
+        if (editor) {
+          editor.setValue(jsonConfig);
+        }
+        justStarted = false;
+        break;
       case "ServerInfo":
         for (index in obj.servers) {
           var server = obj.servers[index];
           let serverName = server.name;
           addDropdownNoDupe(serverName, !server.active);
           if (justStarted) {
-            window.config = obj.config;
-            const jsonConfig = JSON.stringify(obj.config, undefined, 4);
-            $(".editorText").val(jsonConfig);
-            if (editor) {
-              editor.setValue(jsonConfig);
-            }
-            justStarted = false;
+            // Do not update config here, wait for ConfigInfo
             var lines = server.output.split("\r\n");
             for (linePos in lines) {
               var line = lines[linePos];
@@ -490,15 +503,6 @@ $(document).ready(function () {
               p.innerHTML = line;
             }
           }
-          if (JSON.stringify(window.config) != JSON.stringify(obj.config)) {
-            //the config is out of sync, copy it to the config textarea
-            const jsonConfig = JSON.stringify(obj.config, undefined, 4);
-            $(".editorText").val(jsonConfig);
-            if (editor) {
-              editor.setValue(jsonConfig);
-            }
-            window.config = obj.config;
-          }
         }
         window.serverInfoObj = obj;
         break;
@@ -598,6 +602,9 @@ $(document).ready(function () {
 
   // Server will send theme list after connection
 
+  // Request config at startup (only once)
+  sendRequestConfig();
+
   // if (typeof InstallTrigger !== 'undefined') { // Check if Firefox
   // 	document.getElementById('scrollable-div').classList.add('scrollbar'); // broke firefox
   // }

src/messages.rs

@@ -39,6 +39,12 @@ pub struct StdinInput {
     pub value: String,
 }
 
+#[derive(Clone, Serialize, Deserialize)]
+pub struct ConfigInfo {
+    pub r#type: String,
+    pub config: crate::configuration::Config,
+}
+
 #[derive(Clone, Serialize, Deserialize)]
 pub struct GetThemesList {
     pub r#type: String, // Should be "getThemesList"

src/websocket.rs

@@ -91,6 +91,14 @@ async fn process_message(text: String, state: AppState) {
         }
     }
     match ev_type {
+        "requestConfig" => {
+            let config = state.config.lock().await;
+            let config_info = crate::messages::ConfigInfo {
+                r#type: "ConfigInfo".to_owned(),
+                config: config.clone(),
+            };
+            let _ = state.tx.send(serde_json::to_string(&config_info).unwrap());
+        }
         "requestInfo" => {
             let servers = state.servers.lock().await;
             let val: SInfoRequestMessage = serde_json::from_str(&text).unwrap();
@@ -373,6 +381,12 @@ async fn process_message(text: String, state: AppState) {
                     servers.push(desc_clone.into_instance());
                 }
             }
+            // Broadcast ConfigInfo to all clients
+            let config_info = crate::messages::ConfigInfo {
+                r#type: "ConfigInfo".to_owned(),
+                config: config.clone(),
+            };
+            let _ = state.tx.send(serde_json::to_string(&config_info).unwrap());
             drop(config);
             drop(servers)
         }