diff --git a/src/client.rs b/src/client.rs index f4819df..d2c4c17 100644 --- a/src/client.rs +++ b/src/client.rs @@ -66,7 +66,7 @@ async fn serve((ws_sender, mut ws_receiver): (WebSocketSender, WebSocketReceiver async fn execute(payload: Payload, debug: bool) -> Option { if debug { - println!("{:#?}", payload); + payload.print(); } let command = if cfg!(target_os = "windows") { "cmd" diff --git a/src/lib.rs b/src/lib.rs index 63c3d8e..bc5e7ed 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -11,17 +11,44 @@ pub enum Runner { Server, Client, } + +impl Runner { + fn print(&self) { + match self { + Runner::Server => println!("Runner = Server"), + Runner::Client => println!("Runner = Client"), + } + } +} #[derive(Debug)] pub enum RunnerMode { State(Runner, bool), } +impl RunnerMode { + pub fn print(&self) { + match self { + RunnerMode::State(runner, debug) => { + runner.print(); + println!("Debug = {}", debug); + } + } + } +} + #[derive(Debug, Clone)] pub struct Config { pub ip: IpAddr, pub port: u16, } +impl Config { + pub fn print(&self) { + println!("IP = {}", self.ip); + println!("Port = {}", self.port); + } +} + #[derive(Debug, Serialize, Deserialize, Clone)] pub struct Payload { pub sudo: bool, @@ -29,6 +56,14 @@ pub struct Payload { pub args: String, } +impl Payload { + fn print(&self) { + println!("sudo = {}", self.sudo); + println!("user = {}", self.user); + println!("args = {}", self.args); + } +} + #[derive(Debug, Serialize, Deserialize)] pub struct Report { pub payload: Payload, @@ -36,3 +71,24 @@ pub struct Report { pub stdout: String, pub stderr: String, } + +impl Report { + fn print(&self) { + println!("-------"); + println!("Payload ↓"); + self.payload.print(); + println!("-------"); + if !self.status.is_empty() { + println!("Status ↓ \n{}", self.status); + println!("-------"); + } + if !self.stdout.is_empty() { + println!("Stdout ↓ \n{}", self.stdout); + println!("-------"); + } + if !self.stderr.is_empty() { + println!("Stderr ↓ \n{}", self.stderr); + println!("-------"); + } + } +} diff --git a/src/main.rs b/src/main.rs index 0626937..07652d0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,23 +5,32 @@ async fn main() { println!("Hello, world!"); let args = take_args(); - println!("{:#?}", args); match args { - Some((runner_mode, config)) => match runner_mode { - RunnerMode::State(Runner::Server, false) => { - rust_remote::server::start(config, false).await + Some((runner_mode, config)) => { + println!("-------"); + println!("Runner Mode ↓"); + runner_mode.print(); + println!("-------"); + println!("Config ↓"); + config.print(); + println!("-------"); + + match runner_mode { + RunnerMode::State(Runner::Server, false) => { + rust_remote::server::start(config, false).await + } + RunnerMode::State(Runner::Server, true) => { + rust_remote::server::start(config, true).await + } + RunnerMode::State(Runner::Client, false) => { + rust_remote::client::start(config, false).await + } + RunnerMode::State(Runner::Client, true) => { + rust_remote::client::start(config, true).await + } } - RunnerMode::State(Runner::Server, true) => { - rust_remote::server::start(config, true).await - } - RunnerMode::State(Runner::Client, false) => { - rust_remote::client::start(config, false).await - } - RunnerMode::State(Runner::Client, true) => { - rust_remote::client::start(config, true).await - } - }, + } None => { eprintln!("Error: Take Args"); return; diff --git a/src/server.rs b/src/server.rs index d1eedbe..f35709e 100644 --- a/src/server.rs +++ b/src/server.rs @@ -10,7 +10,7 @@ use tokio::{ }; use tokio_tungstenite::{accept_async, tungstenite::Message, WebSocketStream}; -use crate::{Config, Payload}; +use crate::{Config, Payload, Report}; type WebSocketSender = SplitSink, Message>; type WebSocketReceiver = SplitStream>; @@ -34,8 +34,13 @@ pub async fn start(config: Config, debug: bool) { break; } tokio::spawn(async move { - let report = receive(ws_receiver, debug).await; - println!("{:#?}", report); + match receive(ws_receiver, debug).await { + Some(report) => match serde_json::from_str::(&report) { + Ok(report) => report.print(), + Err(_) => {} + }, + None => todo!(), + } }); } None => continue, @@ -83,7 +88,7 @@ async fn establish_connection( async fn payload_from_input(debug: bool) -> Option { println!("User"); - // let user = match get_input() { + // let user = match get_input(debug) { // Some(input) => input, // None => return None, // }; diff --git a/src/utils.rs b/src/utils.rs index 0d12ef0..d085165 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -4,7 +4,7 @@ use crate::{Config, Runner, RunnerMode}; pub fn take_args() -> Option<(RunnerMode, Config)> { let args: Vec = env::args().collect(); - let mut runner = Runner::Server; + let mut runner = Runner::Client; let mut debug = false; let mut ip = "127.0.0.1".to_string(); let mut port = "3444".to_string(); @@ -30,8 +30,6 @@ pub fn take_args() -> Option<(RunnerMode, Config)> { } }; - println!("{:#?}", ip); - let port = match port.parse::() { Ok(port) => port, Err(err_val) => { @@ -52,8 +50,8 @@ fn show_help() { println!("----------------------------------------------------------------------"); println!(" -i -> --ip | Specifies IP Address | 127.0.0.1"); println!(" -p -> --port | Specifies Port Address | 3444"); - println!(" -sv -> --server | Starts as a Server | True"); - println!(" -cl -> --client | Starts as a Client | False"); + println!(" -sv -> --server | Starts as a Server | False"); + println!(" -cl -> --client | Starts as a Client | True"); println!(" -d -> --debug | Starts in Debug Mode | False"); println!(" -h -> --help | Shows Help | False"); println!("\n\n\n");