switched to http

Cargo.toml

@@ -4,6 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+actix-web = "4.11.0"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
 sysinfo = "0.36.0"

src/main.rs

@@ -1,142 +1,25 @@
-pub mod app_manager;
-pub mod server_config;
+mod app_manager;
+mod server_config;
+use actix_web::{get, post, web, App, HttpServer, Responder, Result};
+use sysinfo::{Disks, Networks, System};
 
 use crate::server_config::ServerStats;
-use std::sync::Arc;
-use std::thread::spawn;
-use std::{net::TcpListener, sync::Mutex};
-use sysinfo::{Disks, Networks, System};
-use tungstenite::accept;
 
-#[derive(Debug, Clone, serde::Deserialize, serde::Serialize)]
-pub enum Method {
-    Install(app_manager::App),
-    Edit(usize, app_manager::App),
-    Uninstall(usize),
-    Toggle(usize, bool),
-    Start(usize),
-    Stop(usize),
-    Restart(usize),
-}
+#[get("/")]
+async fn sys_info() -> Result<impl Responder> {
+    let mut sys = System::new_all();
+    let mut disks: Disks = Disks::new_with_refreshed_list();
+    let mut networks: Networks = Networks::new_with_refreshed_list();
 
-fn main() {
-    println!("SentryX server starting...");
-    let apps = app_manager::init();
-    println!("Loaded {} apps", apps.len());
+    networks.refresh(true);
+    disks.refresh(true);
 
-    let server = TcpListener::bind("0.0.0.0:5273").unwrap();
-    println!("Listening on 127.0.0.1:5273");
-    for stream in server.incoming() {
-        let mut apps = apps.clone();
+    sys.refresh_all();
 
-        spawn(move || {
-            let websocket = Arc::new(Mutex::new(accept(stream.unwrap()).unwrap()));
-            let reader_socket = Arc::clone(&websocket);
-            let config = Arc::new(server_config::ServerConfig::new());
-            println!("Client connected, awaiting master key...");
+    std::thread::sleep(std::time::Duration::from_millis(200));
 
-            {
-                let master_key = reader_socket.lock().unwrap().read().unwrap();
+    sys.refresh_cpu_all();
 
-                if !master_key.is_text()
-                    || master_key.to_text().unwrap() != config.master_key.clone()
-                {
-                    println!("Invalid master key from client");
-                    websocket
-                        .lock()
-                        .unwrap()
-                        .send(tungstenite::Message::text("!Invalid master key"))
-                        .unwrap();
-                    return;
-                }
-
-                println!("Client authenticated successfully");
-
-                websocket
-                    .lock()
-                    .unwrap()
-                    .send(tungstenite::Message::text("Success"))
-                    .unwrap();
-            }
-
-            std::thread::spawn(move || loop {
-                let mth: Method = serde_json::from_str(
-                    &reader_socket
-                        .lock()
-                        .unwrap()
-                        .read()
-                        .unwrap()
-                        .to_text()
-                        .unwrap(),
-                )
-                .unwrap();
-
-                println!("Received command: {:?}", mth);
-
-                match mth {
-                    Method::Install(app) => {
-                        println!("→ Installing app: {}", app.repo);
-                        app_manager::install_app(&mut apps, app);
-                    }
-                    Method::Edit(i, app) => {
-                        println!("→ Editing app at index {}: {}", i, app.repo);
-                        if let Some(existing_app) = apps.get_mut(i) {
-                            *existing_app = app;
-                            app_manager::save_apps(&apps);
-                        }
-                    }
-                    Method::Uninstall(i) => {
-                        println!("→ Uninstalling app at index {}", i);
-                        app_manager::uninstall_app(&mut apps, i);
-                    }
-                    Method::Toggle(index, enable) => {
-                        println!("→ Toggling app at index {} to {}", index, enable);
-                        app_manager::toggle_app_state(&apps, index, enable);
-                    }
-                    Method::Start(index) => {
-                        println!("→ Starting app at index {}", index);
-                        app_manager::start_app(&apps, index);
-                    }
-                    Method::Stop(index) => {
-                        println!("→ Stopping app at index {}", index);
-                        app_manager::stop_app(&apps, index);
-                    }
-                    Method::Restart(index) => {
-                        println!("→ Restarting app at index {}", index);
-                        app_manager::restart_app(&apps, index);
-                    }
-                }
-            });
-
-            let mut sys = System::new_all();
-            let mut networks = Networks::new();
-            let mut disks = Disks::new();
-
-            while websocket.lock().unwrap().can_write() {
-                sys.refresh_all();
-                std::thread::sleep(std::time::Duration::from_millis(200));
-                sys.refresh_all();
-                networks.refresh(true);
-                disks.refresh(true);
-
-                println!("→ Sending system stats update...");
-                websocket
-                    .lock()
-                    .unwrap()
-                    .send(tungstenite::Message::text(
-                        serde_json::to_string(&get_system_info(&mut sys, &networks, &disks))
-                            .unwrap(),
-                    ))
-                    .unwrap();
-
-                std::thread::sleep(std::time::Duration::from_secs(2));
-            }
-            println!("Client disconnected, cleaning up...");
-        });
-    }
-}
-
-fn get_system_info(sys: &mut System, networks: &Networks, disks: &Disks) -> ServerStats {
     let cpus = sys.cpus();
     let total_cpu_usage: f32 = cpus.iter().map(|cpu| cpu.cpu_usage()).sum();
     let average_cpu_usage = total_cpu_usage / cpus.len() as f32;
@@ -156,10 +39,38 @@ fn get_system_info(sys: &mut System, networks: &Networks, disks: &Disks) -> Serv
         ((used_disk_space as f32 / total_disk_space as f32) * 100.0) as u8
     };
 
-    ServerStats {
+    Ok(web::Json(ServerStats {
         memory: (sys.used_memory() as f32 / sys.total_memory() as f32 * 100.0) as u8,
         cpu: average_cpu_usage as u8,
         disk: disk_usage_percentage,
         network: network_usage,
+    }))
+}
+
+#[get("/apps")]
+async fn get_apps() -> Result<impl Responder> {
+    let apps = app_manager::init();
+    Ok(web::Json(apps))
+}
+
+#[get("/app/{app_index}")]
+async fn get_app(id: web::Path<usize>) -> Result<impl Responder> {
+    let apps = app_manager::init();
+    match apps.get(*id) {
+        Some(app) => Ok(web::Json(app.clone())),
+        None => Err(actix_web::error::ErrorNotFound("App not found")),
     }
 }
+
+#[actix_web::main]
+async fn main() -> std::io::Result<()> {
+    HttpServer::new(|| {
+        App::new()
+            .service(sys_info)
+            .service(get_apps)
+            .service(get_app)
+    })
+    .bind(("127.0.0.1", 8080))?
+    .run()
+    .await
+}