From 755c65f1f1e133887f906e1cee85cc0c2b3b6497 Mon Sep 17 00:00:00 2001 From: ZeroZipp Date: Fri, 22 May 2026 08:40:06 +0200 Subject: [PATCH] cleanup --- src/app/client.rs | 6 ++++-- src/app/command.rs | 4 ++-- src/app/config.rs | 2 -- src/app/connection.rs | 2 +- src/app/mod.rs | 5 ----- src/main.rs | 8 +++++++- 6 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 src/app/mod.rs diff --git a/src/app/client.rs b/src/app/client.rs index c9b9356..81981da 100644 --- a/src/app/client.rs +++ b/src/app/client.rs @@ -65,7 +65,7 @@ async fn process_messages( let mut ping_interval = tokio::time::interval_at(Instant::now() + config.ping_interval, config.ping_interval); - let pong_timer = tokio::time::sleep(Duration::from_secs(0)); + let pong_timer = tokio::time::sleep(std::time::Duration::ZERO); tokio::pin!(pong_timer); let mut awaiting_pong = false; @@ -88,7 +88,9 @@ async fn process_messages( return Err("Server did not respond to ping".into()); } next_message = stream.next() => { - if handle_stream_message(next_message, &outgoing_tx, config.max_output_bytes).await? { + if handle_stream_message(next_message, &outgoing_tx, config.max_output_bytes) + .await? + { awaiting_pong = false; } } diff --git a/src/app/command.rs b/src/app/command.rs index b37ecd4..4916de3 100644 --- a/src/app/command.rs +++ b/src/app/command.rs @@ -5,10 +5,10 @@ use tokio::{ process::Command, }; -pub async fn execute(command: &str, max_output_bytes: u64) -> (i32, String, String) { +pub async fn execute(command_line: &str, max_output_bytes: u64) -> (i32, String, String) { let mut child = match Command::new("sh") .arg("-c") - .arg(command) + .arg(command_line) .stdout(Stdio::piped()) .stderr(Stdio::piped()) .spawn() diff --git a/src/app/config.rs b/src/app/config.rs index 7fd1261..fadf6a3 100644 --- a/src/app/config.rs +++ b/src/app/config.rs @@ -21,11 +21,9 @@ impl Config { pub fn from_env() -> Result { let token = std::env::var("TOKEN") .map_err(|_| "TOKEN environment variable is required".to_string())?; - let device_id = std::env::var("DEVICE_ID").unwrap_or_else(|_| Self::DEFAULT_DEVICE_ID.to_string()); validate_device_id(&device_id).map_err(|e| format!("Invalid DEVICE_ID: {e}"))?; - let base_url = std::env::var("BASE_URL").unwrap_or_else(|_| Self::DEFAULT_BASE_URL.to_string()); diff --git a/src/app/connection.rs b/src/app/connection.rs index 359cbb8..1a28029 100644 --- a/src/app/connection.rs +++ b/src/app/connection.rs @@ -14,7 +14,7 @@ use crate::app::{config::Config, protocol::ClientMsg}; pub type Socket = tokio_tungstenite::WebSocketStream>; pub type SocketReader = SplitStream; -type SocketWriter = SplitSink; +pub type SocketWriter = SplitSink; pub enum OutgoingMessage { Application(ClientMsg), diff --git a/src/app/mod.rs b/src/app/mod.rs deleted file mode 100644 index b7f4742..0000000 --- a/src/app/mod.rs +++ /dev/null @@ -1,5 +0,0 @@ -pub mod client; -pub mod command; -pub mod config; -pub mod connection; -pub mod protocol; diff --git a/src/main.rs b/src/main.rs index 8d59ac0..c2ffe9d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,10 @@ -mod app; +mod app { + pub mod client; + pub mod command; + pub mod config; + pub mod connection; + pub mod protocol; +} #[tokio::main] async fn main() {