Some structural changes and improvements

src/utils/structs.rs

@@ -3,12 +3,12 @@ use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::sync::atomic::AtomicUsize;
 
-pub type InnerMap = (String, u16, bool, bool, bool);
+// pub type InnerMap = BackendConfig;
 pub type UpstreamsDashMap = DashMap<String, DashMap<String, (Vec<InnerMap>, AtomicUsize)>>;
 pub type UpstreamsIdMap = DashMap<String, InnerMap>;
 pub type Headers = DashMap<String, DashMap<String, Vec<(String, String)>>>;
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Default, Clone, Serialize, Deserialize)]
 pub struct ServiceMapping {
     pub proxy: String,
     pub real: String,
@@ -22,32 +22,38 @@ pub struct Extraparams {
     pub rate_limit: Option<isize>,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Default, Debug, Serialize, Deserialize)]
 pub struct Consul {
     pub servers: Option<Vec<String>>,
     pub services: Option<Vec<ServiceMapping>>,
     pub token: Option<String>,
 }
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Default, Serialize, Deserialize)]
 pub struct Config {
     pub provider: String,
     pub sticky_sessions: bool,
     pub to_https: Option<bool>,
+    #[serde(default)]
     pub upstreams: Option<HashMap<String, HostConfig>>,
+    #[serde(default)]
     pub globals: Option<HashMap<String, Vec<String>>>,
+    #[serde(default)]
     pub headers: Option<Vec<String>>,
+    #[serde(default)]
     pub authorization: Option<HashMap<String, String>>,
+    #[serde(default)]
     pub consul: Option<Consul>,
+    #[serde(default)]
     pub rate_limit: Option<isize>,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Default, Serialize, Deserialize)]
 pub struct HostConfig {
     pub paths: HashMap<String, PathConfig>,
     pub rate_limit: Option<isize>,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Default, Serialize, Deserialize)]
 pub struct PathConfig {
     pub servers: Vec<String>,
     pub to_https: Option<bool>,
@@ -63,7 +69,7 @@ pub struct Configuration {
     pub extraparams: Extraparams,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Default, Serialize, Deserialize)]
 pub struct AppConfig {
     pub hc_interval: u16,
     pub hc_method: String,
@@ -83,3 +89,62 @@ pub struct AppConfig {
     pub file_server_address: Option<String>,
     pub file_server_folder: Option<String>,
 }
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct InnerMap {
+    pub address: String,
+    pub port: u16,
+    pub is_ssl: bool,
+    pub is_http2: bool,
+    pub to_https: bool,
+}
+
+impl InnerMap {
+    pub fn new() -> Self {
+        Self {
+            address: String::new(),
+            port: 0,
+            is_ssl: false,
+            is_http2: false,
+            to_https: false,
+        }
+    }
+}
+
+/*
+impl InnerMap {
+    pub fn new(address: String, port: u16) -> Self {
+        Self {
+            address,
+            port,
+            is_ssl: false,  // Default values
+            is_http2: false,
+            to_https: false,
+        }
+    }
+    pub fn address(&self) -> &str {
+        &self.address
+    }
+
+    pub fn port(&self) -> u16 {
+        self.port
+    }
+
+    // Setters with validation
+    pub fn with_ssl(mut self, ssl: bool) -> Result<Self, String> {
+        self.is_ssl = ssl;
+        Ok(self)
+    }
+
+    pub fn with_http2(mut self, http2: bool) -> Result<Self, String> {
+        self.is_http2 = http2;
+        Ok(self)
+    }
+
+    pub fn with_to_https(mut self, to_https: bool) -> Result<Self, String> {
+        self.to_https = to_https;
+        Ok(self)
+    }
+}
+
+*/