Skip to content

Optimize web interface performance and async safety #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Cylae wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Optimize web interface performance and async safety #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Server Manager - Next-Gen Media Server Orchestrator 🚀

![Server Manager Banner](https://img.shields.io/badge/Status-Tested-brightgreen) ![Version](https://img.shields.io/badge/Version-1.0.7-blue) ![Rust](https://img.shields.io/badge/Built%20With-Rust-orange) ![Docker](https://img.shields.io/badge/Powered%20By-Docker-blue)
![Server Manager Banner](https://img.shields.io/badge/Status-Tested-brightgreen) ![Version](https://img.shields.io/badge/Version-1.0.8-blue) ![Rust](https://img.shields.io/badge/Built%20With-Rust-orange) ![Docker](https://img.shields.io/badge/Powered%20By-Docker-blue)

**Server Manager** is a powerful and intelligent tool written in Rust to deploy, manage, and optimize a complete personal media and cloud server stack. It detects your hardware and automatically configures 28 Docker services for optimal performance.

Expand Down
2 changes: 1 addition & 1 deletion server_manager/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "server_manager"
version = "1.0.7"
version = "1.0.8"
edition = "2021"

[dependencies]
Expand Down
35 changes: 35 additions & 0 deletions server_manager/src/core/users.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,27 @@ impl UserManager {
Ok(())
}

pub async fn add_user_async(
&mut self,
username: &str,
password: &str,
role: Role,
quota_gb: Option<u64>,
) -> Result<()> {
let mut manager = self.clone();
let username = username.to_string();
let password = password.to_string();

let updated_manager = tokio::task::spawn_blocking(move || {
manager.add_user(&username, &password, role, quota_gb)?;
Ok::<_, anyhow::Error>(manager)
})
.await??;

*self = updated_manager;
Ok(())
}

pub fn add_user(
&mut self,
username: &str,
Expand Down Expand Up @@ -137,6 +158,20 @@ impl UserManager {
self.save()
}

pub async fn delete_user_async(&mut self, username: &str) -> Result<()> {
let mut manager = self.clone();
let username = username.to_string();

let updated_manager = tokio::task::spawn_blocking(move || {
manager.delete_user(&username)?;
Ok::<_, anyhow::Error>(manager)
})
.await??;

*self = updated_manager;
Ok(())
}

pub fn delete_user(&mut self, username: &str) -> Result<()> {
if !self.users.contains_key(username) {
return Err(anyhow!("User not found"));
Expand Down
105 changes: 60 additions & 45 deletions server_manager/src/interface/web.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,12 @@ pub async fn start_server(port: u16) -> anyhow::Result<()> {
.with_expiry(Expiry::OnInactivity(Duration::hours(24)));

// Initialize System once
let mut sys = System::new_all();
sys.refresh_all();
let sys = tokio::task::spawn_blocking(|| {
let mut s = System::new_all();
s.refresh_all();
s
})
.await?;

let initial_config = Config::load().unwrap_or_default();
let initial_config_mtime = std::fs::metadata("config.yaml")
Expand Down Expand Up @@ -331,43 +335,55 @@ async fn dashboard(State(state): State<SharedState>, session: Session) -> impl I
let config = state.get_config().await;

// System Stats
let mut sys = state.system.lock().unwrap();
let now = SystemTime::now();
let mut last_refresh = state.last_system_refresh.lock().unwrap();

// Throttle refresh to max once every 500ms
if now
.duration_since(*last_refresh)
.unwrap_or_default()
.as_millis()
> 500
{
sys.refresh_cpu();
sys.refresh_memory();
sys.refresh_disks();
*last_refresh = now;
}
let ram_used = sys.used_memory() / 1024 / 1024; // MB
let ram_total = sys.total_memory() / 1024 / 1024; // MB
let swap_used = sys.used_swap() / 1024 / 1024; // MB
let swap_total = sys.total_swap() / 1024 / 1024; // MB
let cpu_usage = sys.global_cpu_info().cpu_usage();

// Simple Disk Usage (Root or fallback)
let mut disk_total = 0;
let mut disk_used = 0;

let target_disk = sys
.disks()
.iter()
.find(|d| d.mount_point() == std::path::Path::new("/"))
.or_else(|| sys.disks().first());

if let Some(disk) = target_disk {
disk_total = disk.total_space() / 1024 / 1024 / 1024; // GB
disk_used = (disk.total_space() - disk.available_space()) / 1024 / 1024 / 1024; // GB
}
drop(sys); // Release lock explicitely
let (cpu_usage, ram_used, ram_total, swap_used, swap_total, disk_used, disk_total) = {
let state = state.clone();
tokio::task::spawn_blocking(move || {
let mut sys = state.system.lock().expect("System lock poisoned");
let now = SystemTime::now();
let mut last_refresh = state
.last_system_refresh
.lock()
.expect("Last refresh lock poisoned");

// Throttle refresh to max once every 500ms
if now
.duration_since(*last_refresh)
.unwrap_or_default()
.as_millis()
> 500
{
sys.refresh_cpu();
sys.refresh_memory();
sys.refresh_disks();
*last_refresh = now;
}
let ram_used = sys.used_memory() / 1024 / 1024; // MB
let ram_total = sys.total_memory() / 1024 / 1024; // MB
let swap_used = sys.used_swap() / 1024 / 1024; // MB
let swap_total = sys.total_swap() / 1024 / 1024; // MB
let cpu_usage = sys.global_cpu_info().cpu_usage();

// Simple Disk Usage (Root or fallback)
let mut disk_total = 0;
let mut disk_used = 0;

let target_disk = sys
.disks()
.iter()
.find(|d| d.mount_point() == std::path::Path::new("/"))
.or_else(|| sys.disks().first());

if let Some(disk) = target_disk {
disk_total = disk.total_space() / 1024 / 1024 / 1024; // GB
disk_used = (disk.total_space() - disk.available_space()) / 1024 / 1024 / 1024; // GB
}
(
cpu_usage, ram_used, ram_total, swap_used, swap_total, disk_used, disk_total,
)
})
.await
.unwrap_or((0.0, 0, 0, 0, 0, 0, 0))
};

let mut html = String::with_capacity(8192);
write_html_head(&mut html, "Dashboard - Server Manager");
Expand Down Expand Up @@ -627,9 +643,10 @@ async fn add_user_handler(State(state): State<SharedState>, session: Session, Fo
};

let mut cache = state.users_cache.write().await;
let res = tokio::task::block_in_place(|| {
cache.manager.add_user(&payload.username, &payload.password, role_enum, quota_val)
});
let res = cache
.manager
.add_user_async(&payload.username, &payload.password, role_enum, quota_val)
.await;

if let Err(e) = res {
error!("Failed to add user: {}", e);
Expand Down Expand Up @@ -659,9 +676,7 @@ async fn delete_user_handler(State(state): State<SharedState>, session: Session,
}

let mut cache = state.users_cache.write().await;
let res = tokio::task::block_in_place(|| {
cache.manager.delete_user(&username)
});
let res = cache.manager.delete_user_async(&username).await;

if let Err(e) = res {
error!("Failed to delete user: {}", e);
Expand Down