feat: implement initial project structure and core service/client communication logic

Author: dkmstr

crates/builder/src/lib.rs

@@ -1,5 +1,5 @@
 // uds-build/src/lib.rs
-use chrono::{Datelike, Utc, NaiveDate};
+use chrono::{Datelike, NaiveDate, Utc};
 use winres::WindowsResource;
 
 pub struct BuildInfo<'a> {
@@ -41,7 +41,10 @@ pub fn build_windows(build_info: BuildInfo) {
     res.set_language(0x0409);
 
     res.set("FileVersion", &format!("{major}.{minor}.{patch}.{build}"));
-    res.set("ProductVersion", &format!("{major}.{minor}.{patch}.{build}"));
+    res.set(
+        "ProductVersion",
+        &format!("{major}.{minor}.{patch}.{build}"),
+    );
     res.set("ProductName", build_info.product_name);
     res.set("FileDescription", build_info.description);
     res.set(

crates/client/build.rs

@@ -28,13 +28,11 @@ Author: Adolfo Gómez, dkmaster at dkmon dot com
 */
 fn main() {
     #[cfg(windows)]
-    builder::build_windows(
-        builder::BuildInfo {
-            product_name: "UDS Actor Client",
-            description: "UDS Actor Client",
-            icon: None,
-            bmp: None,
-            requires_admin: false,
-        }
-    );
+    builder::build_windows(builder::BuildInfo {
+        product_name: "UDS Actor Client",
+        description: "UDS Actor Client",
+        icon: None,
+        bmp: None,
+        requires_admin: false,
+    });
 }

crates/client/src/gui.rs

@@ -3,7 +3,6 @@ use tokio::process::Command;
 
 use shared::log;
 
-
 // We have created a separate gui helper because on linux
 // at session close the X windows (xrdp for example) destroys de X server.
 // fltk fails and do a Fl::fatal, that in turn executes "exit(1)" which makes

crates/client/src/platform.rs

@@ -2,12 +2,16 @@ use anyhow::Result;
 use std::sync::Arc;
 
 use shared::{
-    system,
     sync::OnceSignal,
+    system,
     ws::client::{WsClient, websocket_client_tasks},
 };
 
-use crate::{gui, session::SessionManagement, ws_reqs::{WsReqs, WsRequester}};
+use crate::{
+    gui,
+    session::SessionManagement,
+    ws_reqs::{WsReqs, WsRequester},
+};
 
 #[derive(Clone)]
 pub struct Platform {

crates/client/src/tasks/deadline.rs

@@ -51,9 +51,7 @@ pub async fn task(
 
     // Deadline timer, simply wait until deadline is reached inside the session_manager
     // But leave a 5 mins to notify before deadline
-    if stop.wait_timeout(deadline)
-        .await
-        .is_err()
+    if stop.wait_timeout(deadline).await.is_err()
     // Timeout without being signaled
     {
         log::info!("Deadline notification reached, notifying user");

crates/client/src/tasks/idle.rs

@@ -131,7 +131,7 @@ mod tests {
     async fn test_idle_task_idle() {
         log::setup_logging("debug", shared::log::LogType::Tests);
 
-        let (platform, calls, _ ,_) = mock_platform(None, None, None, None, 43902).await;
+        let (platform, calls, _, _) = mock_platform(None, None, None, None, 43902).await;
         let session_manager = platform.session_manager();
 
         // Run idle task in a separate task with a short max_idle (10 seconds)

crates/client/src/testing/mock.rs

@@ -92,9 +92,8 @@ pub async fn mock_platform(
         mpsc::channel::<shared::ws::types::RpcEnvelope<shared::ws::types::RpcMessage>>(32);
     let ws_client = WsClient { from_ws, to_ws };
 
-    let ws_requester = ws_requester.unwrap_or_else(|| {
-        std::sync::Arc::new(WsReqsMock::new(calls.clone()))
-    });
+    let ws_requester =
+        ws_requester.unwrap_or_else(|| std::sync::Arc::new(WsReqsMock::new(calls.clone())));
 
     (
         crate::platform::Platform::new_with_params(

crates/client/src/unix/mod.rs

@@ -29,7 +29,9 @@ impl SessionManagement for UnixSessionManager {
     }
 }
 
-pub async fn new_session_manager(stop: OnceSignal) -> std::sync::Arc<dyn SessionManagement + Send + Sync> {
+pub async fn new_session_manager(
+    stop: OnceSignal,
+) -> std::sync::Arc<dyn SessionManagement + Send + Sync> {
     std::sync::Arc::new(UnixSessionManager::new(stop).await)
 }
 

crates/client/src/windows/mod.rs

@@ -69,7 +69,9 @@ impl SessionManagement for WindowsSessionManager {
     }
 }
 
-pub async fn new_session_manager(stop: OnceSignal) -> std::sync::Arc<dyn SessionManagement + Send + Sync> {
+pub async fn new_session_manager(
+    stop: OnceSignal,
+) -> std::sync::Arc<dyn SessionManagement + Send + Sync> {
     std::sync::Arc::new(WindowsSessionManager::new(stop).await)
 }
 
@@ -85,8 +87,9 @@ mod tests {
         let stop = session_close.get_stop();
         let _fake_closer = tokio::spawn({
             async move {
-            session_close.get_stop().wait().await;
-        }});
+                session_close.get_stop().wait().await;
+            }
+        });
         // wait a bit to simulate work
         tokio::time::sleep(std::time::Duration::from_secs(1)).await;
         event.signal();
@@ -104,8 +107,9 @@ mod tests {
         let stop = session_close.get_stop();
         let _fake_closer = tokio::spawn({
             async move {
-            session_close.get_stop().wait().await;
-        }});
+                session_close.get_stop().wait().await;
+            }
+        });
         // wait a bit to simulate work
         tokio::time::sleep(std::time::Duration::from_secs(1)).await;
         stop.set();

crates/client/src/ws_reqs.rs

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
 use shared::{
-    system,
     sync::OnceSignal,
+    system,
     ws::{
         client::WsClient,
         types::{LoginRequest, LoginResponse, LogoutRequest, RpcEnvelope, RpcMessage},
@@ -24,7 +24,11 @@ pub struct WsRequester {
 
 impl WsRequester {
     pub fn new(operations: Arc<dyn system::System>, ws_client: WsClient, stop: OnceSignal) -> Self {
-        Self { operations, ws_client, stop }
+        Self {
+            operations,
+            ws_client,
+            stop,
+        }
     }
 }