feat: support command with args

Author: timzaak

agent/Cargo.lock

@@ -22,5 +22,7 @@ serde = { version = "1.0.202", features = ["derive"] }
 serde_json = "1.0"
 etcetera = "0.8"
 
+shellish_parse = "2"
+
 [build-dependencies]
 #vergen = { version = "9.0.0-beta.2" ,features = ["build"]}

agent/Cargo.toml

@@ -1,3 +1,4 @@
+use std::env;
 use std::path::PathBuf;
 use rumqttc::v5::{AsyncClient, MqttOptions, Incoming};
 use rumqttc::v5::mqttbytes::QoS;
@@ -6,8 +7,13 @@ use mproxy::message::{RequestMessage, ResponseMessage};
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
+    let args:Vec<String> = env::args().collect();
+    let command = if args.len() > 1 {
+        args.iter().skip(1).map(|x|x.to_string()).collect::<Vec<_>>().join(" ")
+    } else {
+      "ls -ls".to_string()
+    };
 
-    let command = "ls";
     let config_path:PathBuf = "./config.yml".parse().unwrap();
 
     let is_atty = atty::is(atty::Stream::Stdout);
@@ -33,7 +39,7 @@ async fn main() -> anyhow::Result<()> {
                             let resp: ResponseMessage = serde_json::from_slice(data.payload.as_ref()).unwrap();
 
                             match resp {
-                                ResponseMessage::Ok {data, seq,..} => println!("recv:{data}, seq: {seq}"),
+                                ResponseMessage::Ok {data, seq, pid, ..} => println!("[{pid}][{seq}] {data}"),
                                 ResponseMessage::Err {message,..} => eprintln!("{message}"),
                             }
                         }

agent/examples/publish_command.rs

@@ -26,8 +26,19 @@ impl Handler {
             info!("begin to handle cmd: {:?}",&cmd);
             match cmd {
                 RequestMessage::Cmd { command,request_id } => {
+                    let command_parsed = shellish_parse::parse(&command,false);
+                    let command_parsed = match command_parsed {
+                        Ok(result) => result,
+                        Err(e) => {
+                            let _ = self.connection.publish_response(&self.publish_topic,  ResponseMessage::Err {request_id: request_id.clone(), message:format!("{}", e)}).await;
+                            continue;
+                        }
+                    };
+
                     let mut seq:u32 = 1;
-                    let mut command = Command::new(&command);
+                    let mut command = Command::new(&command_parsed[0]);
+                    command.args(&command_parsed[1..]);
+
                     command.stdout(Stdio::piped()).stderr(Stdio::piped());
                     match command.spawn() {
                         Ok(mut child) => {
@@ -69,8 +80,15 @@ mod test {
 
 
     #[test]
-    pub fn parse() {
+    fn parse() {
+        let v = shellish_parse::parse("ls -ls #tes",false).unwrap();
+        println!("{v:?}");
+    }
+
+    #[test]
+    fn command_run() {
         let mut cmd = Command::new("ls");
+        cmd.arg("-ls");
         cmd.stdout(Stdio::piped()).stderr(Stdio::piped());
         let mut child = cmd
             .spawn().unwrap();