config change

veilid-core/src/veilid_config.rs

@@ -15,7 +15,7 @@ cfg_if! {
     }
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Serialize, Deserialize)]
 pub struct VeilidConfigHTTPS {
     pub enabled: bool,
     pub listen_address: String,
@@ -23,7 +23,7 @@ pub struct VeilidConfigHTTPS {
     pub url: Option<String>, // Fixed URL is not optional for TLS-based protocols and is dynamically validated
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Serialize, Deserialize)]
 pub struct VeilidConfigHTTP {
     pub enabled: bool,
     pub listen_address: String,
@@ -31,13 +31,13 @@ pub struct VeilidConfigHTTP {
     pub url: Option<String>,
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Serialize, Deserialize)]
 pub struct VeilidConfigApplication {
     pub https: VeilidConfigHTTPS,
     pub http: VeilidConfigHTTP,
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Serialize, Deserialize)]
 pub struct VeilidConfigUDP {
     pub enabled: bool,
     pub socket_pool_size: u32,
@@ -45,7 +45,7 @@ pub struct VeilidConfigUDP {
     pub public_address: Option<String>,
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Serialize, Deserialize)]
 pub struct VeilidConfigTCP {
     pub connect: bool,
     pub listen: bool,
@@ -54,7 +54,7 @@ pub struct VeilidConfigTCP {
     pub public_address: Option<String>,
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Serialize, Deserialize)]
 pub struct VeilidConfigWS {
     pub connect: bool,
     pub listen: bool,
@@ -64,7 +64,7 @@ pub struct VeilidConfigWS {
     pub url: Option<String>,
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Serialize, Deserialize)]
 pub struct VeilidConfigWSS {
     pub connect: bool,
     pub listen: bool,
@@ -74,7 +74,7 @@ pub struct VeilidConfigWSS {
     pub url: Option<String>, // Fixed URL is not optional for TLS-based protocols and is dynamically validated
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Serialize, Deserialize)]
 pub struct VeilidConfigProtocol {
     pub udp: VeilidConfigUDP,
     pub tcp: VeilidConfigTCP,
@@ -82,14 +82,14 @@ pub struct VeilidConfigProtocol {
     pub wss: VeilidConfigWSS,
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Serialize, Deserialize)]
 pub struct VeilidConfigTLS {
     pub certificate_path: String,
     pub private_key_path: String,
     pub connection_initial_timeout_ms: u32,
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Serialize, Deserialize)]
 pub struct VeilidConfigDHT {
     pub resolve_node_timeout_ms: Option<u32>,
     pub resolve_node_count: u32,
@@ -106,7 +106,7 @@ pub struct VeilidConfigDHT {
     pub validate_dial_info_receipt_time_ms: u32,
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Serialize, Deserialize)]
 pub struct VeilidConfigRPC {
     pub concurrency: u32,
     pub queue_size: u32,
@@ -116,7 +116,7 @@ pub struct VeilidConfigRPC {
     pub max_route_hop_count: u8,
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Serialize, Deserialize)]
 pub struct VeilidConfigLeases {
     pub max_server_signal_leases: u32,
     pub max_server_relay_leases: u32,
@@ -124,7 +124,7 @@ pub struct VeilidConfigLeases {
     pub max_client_relay_leases: u32,
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Serialize, Deserialize)]
 pub struct VeilidConfigNetwork {
     pub max_connections: u32,
     pub connection_initial_timeout_ms: u32,
@@ -143,19 +143,19 @@ pub struct VeilidConfigNetwork {
     pub leases: VeilidConfigLeases,
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Serialize, Deserialize)]
 pub struct VeilidConfigTableStore {
     pub directory: String,
     pub delete: bool,
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Serialize, Deserialize)]
 pub struct VeilidConfigBlockStore {
     pub directory: String,
     pub delete: bool,
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Serialize, Deserialize)]
 pub struct VeilidConfigProtectedStore {
     pub allow_insecure_fallback: bool,
     pub always_use_insecure_storage: bool,
@@ -163,7 +163,7 @@ pub struct VeilidConfigProtectedStore {
     pub delete: bool,
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Serialize, Deserialize)]
 pub struct VeilidConfigCapabilities {
     pub protocol_udp: bool,
     pub protocol_connect_tcp: bool,
@@ -202,7 +202,7 @@ impl Default for VeilidConfigLogLevel {
     }
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Serialize, Deserialize)]
 pub struct VeilidConfigInner {
     pub program_name: String,
     pub namespace: String,
@@ -235,6 +235,16 @@ impl VeilidConfig {
         }
     }
 
+    pub async fn init_from_json(&mut self, config: String) -> Result<(), String> {
+        let mut inner = self.inner.write();
+        *inner = serde_json::from_str(&config).map_err(map_to_string)?;
+
+        // Validate settings
+        self.validate().await?;
+
+        Ok(())
+    }
+
     pub async fn init(&mut self, cb: ConfigCallback) -> Result<(), String> {
         macro_rules! get_config {
             ($key:expr) => {