feat: publish_command.rs read config from file, add CtrlConfig

Author: timzaak

agent/ctrl_config.yml

@@ -0,0 +1,6 @@
+server: 'mqtt://127.0.0.1:1883'  # MQTT Server
+client_id: test_ctrl #MQTT Client ID
+#username: test_ctrl_username  #MQTT Username
+#password: password  #MQTT Password
+
+subscribe_client_id: test_client #MQTT Subscribe Client ID

agent/examples/publish_command.rs

@@ -15,29 +15,24 @@ async fn main() -> anyhow::Result<()> {
       "ls -ls".to_string()
     };
 
-    let username:Option<String> = None;
-    let password:Option<String> = None;
-
-    let config_path:PathBuf = "./config.yml".parse().unwrap();
-    let publish_client_id = "root";
-    //let username:Option<String> = Some("".to_string());
-    //let password:Option<String> = Some("".to_string());
+    let config_path:PathBuf = "./ctrl_config.yml".parse().unwrap();
+    //let config_path:PathBuf = "./config.prod.yml".parse().unwrap();
 
     let is_terminal = std::io::stdout().is_terminal();
 
     tracing_subscriber::fmt().with_env_filter(EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::from("debug")),)
         .with_ansi(is_terminal).init();
 
-    let config = mproxy::config::Config::new(Some(config_path)).unwrap();
+    let config = mproxy::config::CtrlConfig::new(config_path).unwrap();
 
-    let mqtt_url = format!("{}?client_id={}", &config.server, publish_client_id);
+    let mqtt_url = format!("{}?client_id={}", &config.server, &config.client_id);
     let mut options = MqttOptions::parse_url(&mqtt_url).unwrap();
-    if matches!(password, Some(_)) && matches!(username, Some(_)) {
-        options.set_credentials(username.unwrap(), password.unwrap());
+    if matches!(config.username, Some(_)) && matches!(config.password, Some(_)) {
+        options.set_credentials(config.username.clone().unwrap(), config.password.clone().unwrap());
     }
     let (client, mut eventloop) = AsyncClient::new(options,20);
 
-    let topic = config.get_response_command_topic();
+    let topic = config.get_subscribe_command_topic();
     client.subscribe(topic, QoS::ExactlyOnce).await?;
 
     tokio::spawn(async move {
@@ -63,7 +58,7 @@ async fn main() -> anyhow::Result<()> {
     });
     let command = RequestMessage::Cmd{command: command.to_string(), request_id: "test_request_id".to_string()};
     let command = serde_json::to_vec(&command).unwrap();
-    client.publish(config.get_command_topic(), QoS::ExactlyOnce, false, command).await?;
+    client.publish(config.get_publish_command_topic(), QoS::ExactlyOnce, false, command).await?;
     tokio::signal::ctrl_c().await?;
 
     Ok(())

agent/src/config.rs

@@ -14,7 +14,6 @@ pub struct Config {
     pub client_id: String,
     pub username: Option<String>,
     pub password: Option<String>,
-
 }
 
 impl Config {
@@ -49,6 +48,40 @@ impl Config {
     }
 }
 
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct CtrlConfig {
+    pub server: String,
+    pub client_id: String,
+    pub username: Option<String>,
+    pub password: Option<String>,
+    pub subscribe_client_id: String,
+    publish_command_topic: Option<String>,
+    subscribe_command_topic: Option<String>,
+}
+impl CtrlConfig {
+    pub fn new(config_path:PathBuf) -> anyhow::Result<Self> {
+        if !config_path.is_file() {
+            bail!("config file not found: {:?}", config_path);
+        }
+        info!("load config from {:?}", config_path);
+        let config = std::fs::read_to_string(config_path)?;
+        let config: Self = serde_yml::from_str(&config)?;
+        Ok(config)
+    }
+
+    pub fn get_publish_command_topic(&self) -> String {
+        self.publish_command_topic.clone().unwrap_or_else(||format!("cmd/{}", self.subscribe_client_id))
+
+    }
+    pub fn get_subscribe_command_topic(&self) ->  String {
+        self.subscribe_command_topic.clone().unwrap_or_else(||format!("cmd/{}/resp",  self.subscribe_client_id))
+    }
+}
+
+
+
+
 #[cfg(test)]
 mod test {
     use crate::config::Config;