diff --git a/noxis-cli/src/main.rs b/noxis-cli/src/main.rs index 023c977..718ec2f 100644 --- a/noxis-cli/src/main.rs +++ b/noxis-cli/src/main.rs @@ -1,11 +1,16 @@ mod cli; +mod net; use clap::Parser; use cli::Cli; +use net::{create_tcp_stream, try_send}; +use anyhow::Result; -fn main() -> Result<(), std::io::Error>{ +#[tokio::main] +async fn main() -> Result<()>{ let cli = Cli::parse(); dbg!(&cli); - println!("{:?}", cli); + // println!("{:?}", cli); + try_send(create_tcp_stream().await, cli).await?; Ok(()) } diff --git a/noxis-rs/src/main.rs b/noxis-rs/src/main.rs index 7ca43bc..556521e 100644 --- a/noxis-rs/src/main.rs +++ b/noxis-rs/src/main.rs @@ -13,8 +13,6 @@ use std::sync::Arc; use std::time::Duration; use tokio::sync::mpsc; use utils::*; - -#[allow(unused_imports)] use options::preboot::PrebootParams; #[tokio::main(flavor = "multi_thread")] diff --git a/noxis-rs/src/options/cli_pipeline.rs b/noxis-rs/src/options/cli_pipeline.rs index fbeb74d..b189a36 100644 --- a/noxis-rs/src/options/cli_pipeline.rs +++ b/noxis-rs/src/options/cli_pipeline.rs @@ -47,15 +47,14 @@ async fn process_connection(mut stream: TcpStream) { let buf_reader = BufReader::new(stream.borrow_mut()); let mut rqst = buf_reader.lines(); + while let Ok(Some(line)) = rqst.next_line().await { if line.is_empty() { break; } println!("{}", line); } - // .map(|result| result.unwrap()) - // .take_while(|line| !line.is_empty()) - // .collect(); + let response = "HTTP/1.1 200 OK\r\nContent-Length: 13\r\nContent-Type: text/plain\r\n\r\nHello, World!"; stream.write_all(response.as_bytes()).await.unwrap(); } diff --git a/noxis-rs/src/options/config.rs b/noxis-rs/src/options/config.rs index d3cb106..4d95aa1 100644 --- a/noxis-rs/src/options/config.rs +++ b/noxis-rs/src/options/config.rs @@ -322,7 +322,7 @@ pub async fn subscribe_config_stream(actual_prcs: Arc, params: Arc {