fix: remove unnecessary SSE user auth check - login already guards access

- Move SSE initialization inside Effect closure to capture signals properly
- Fix closure capture issue where torrents/stats/notifications were borrowed before being passed to async block
- SSE now starts correctly when user is authenticated

Cargo.toml

@@ -17,4 +17,5 @@ strip = true
 incremental = false
 
 [patch.crates-io]
-coarsetime = { path = "third_party/coarsetime" }
+coarsetime = { path = "patches/coarsetime" }
+

backend/Cargo.toml

@@ -4,15 +4,15 @@ version = "0.1.0"
 edition = "2021"
 
 [features]
-default = ["push-notifications", "swagger"]
+default = ["swagger"] # push-notifications kaldırıldı
 push-notifications = ["web-push", "openssl"]
 swagger = ["utoipa-swagger-ui"]
 
 [dependencies]
 axum = { version = "0.8", features = ["macros", "ws"] }
 tokio = { version = "1", features = ["full"] }
-tower = { version = "0.4", features = ["util", "timeout"] }
-tower-http = { version = "0.5", features = ["fs", "trace", "cors", "compression-full"] }
+tower = { version = "0.5", features = ["util", "timeout"] }
+tower-http = { version = "0.6", features = ["fs", "trace", "cors", "compression-full"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 tracing = "0.1"
@@ -21,16 +21,15 @@ tokio-stream = "0.1"
 bytes = "1"
 futures = "0.3"
 quick-xml = { version = "0.31", features = ["serde", "serialize"] }
-# We might need `tokio-util` for codecs if we implement SCGI manually
 tokio-util = { version = "0.7", features = ["codec", "io"] }
 clap = { version = "4.4", features = ["derive", "env"] }
 rust-embed = "8.2"
 mime_guess = "2.0"
-shared = { path = "../shared" }
+shared = { path = "../shared", features = ["ssr"] }
 thiserror = "2.0.18"
 dotenvy = "0.15.7"
 utoipa = { version = "5.4.0", features = ["axum_extras"] }
-utoipa-swagger-ui = { version = "9.0.2", features = ["axum"], optional = true }
+utoipa-swagger-ui = { version = "9.0", features = ["axum"], optional = true }
 web-push = { version = "0.10", default-features = false, features = ["hyper-client"], optional = true }
 base64 = "0.22"
 openssl = { version = "0.10", features = ["vendored"], optional = true }
@@ -42,3 +41,7 @@ anyhow = "1.0.101"
 time = { version = "0.3.47", features = ["serde", "formatting", "parsing"] }
 tower_governor = "0.8.0"
 governor = "0.10.4"
+
+# Leptos
+leptos = { version = "0.8.15", features = ["nightly"] }
+leptos_axum = { version = "0.8.7" }

backend/src/handlers/mod.rs

@@ -1,20 +1,9 @@
-use crate::{
-    xmlrpc::{self, RpcParam},
-    AppState,
-};
-#[cfg(feature = "push-notifications")]
-use crate::push;
 use axum::{
-    extract::{Json, Path, State},
     http::{header, StatusCode, Uri},
     response::IntoResponse,
     BoxError,
 };
 use rust_embed::RustEmbed;
-use shared::{
-    AddTorrentRequest, GlobalLimitRequest, SetFilePriorityRequest, SetLabelRequest, TorrentActionRequest,
-    TorrentFile,     TorrentPeer, TorrentTracker,
-};
 
 pub mod auth;
 pub mod setup;
@@ -39,7 +28,6 @@ pub async fn static_handler(uri: Uri) -> impl IntoResponse {
             if path.contains('.') {
                 return StatusCode::NOT_FOUND.into_response();
             }
-            // Fallback to index.html for SPA routing
             match Asset::get("index.html") {
                 Some(content) => {
                     let mime = mime_guess::from_path("index.html").first_or_octet_stream();
@@ -51,614 +39,6 @@ pub async fn static_handler(uri: Uri) -> impl IntoResponse {
     }
 }
 
-// --- TORRENT ACTIONS ---
-
-/// Add a new torrent via magnet link or URL
-#[utoipa::path(
-    post,
-    path = "/api/torrents/add",
-    request_body = AddTorrentRequest,
-    responses(
-        (status = 200, description = "Torrent added successfully"),
-        (status = 500, description = "Internal server error or rTorrent fault")
-    )
-)]
-pub async fn add_torrent_handler(
-    State(state): State<AppState>,
-    Json(payload): Json<AddTorrentRequest>,
-) -> StatusCode {
-    tracing::info!(
-        "Received add_torrent request. URI length: {}",
-        payload.uri.len()
-    );
-    let client = xmlrpc::RtorrentClient::new(&state.scgi_socket_path);
-    let params = vec![RpcParam::from(""), RpcParam::from(payload.uri.as_str())];
-
-    match client.call("load.start", &params).await {
-        Ok(response) => {
-            tracing::debug!("rTorrent response to load.start: {}", response);
-            if response.contains("faultCode") {
-                tracing::error!("rTorrent returned fault: {}", response);
-                return StatusCode::INTERNAL_SERVER_ERROR;
-            }
-            // Note: Frontend shows its own toast, no SSE notification needed
-            StatusCode::OK
-        }
-        Err(e) => {
-            tracing::error!("Failed to add torrent: {}", e);
-            // Note: Frontend shows its own toast, no SSE notification needed
-            StatusCode::INTERNAL_SERVER_ERROR
-        }
-    }
-}
-
-/// Perform an action on a torrent (start, stop, delete)
-#[utoipa::path(
-    post,
-    path = "/api/torrents/action",
-    request_body = TorrentActionRequest,
-    responses(
-        (status = 200, description = "Action executed successfully"),
-        (status = 400, description = "Invalid action or request"),
-        (status = 403, description = "Forbidden: Security risk detected"),
-        (status = 500, description = "Internal server error")
-    )
-)]
-pub async fn handle_torrent_action(
-    State(state): State<AppState>,
-    Json(payload): Json<TorrentActionRequest>,
-) -> impl IntoResponse {
-    tracing::info!(
-        "Received action: {} for hash: {}",
-        payload.action,
-        payload.hash
-    );
-
-    let client = xmlrpc::RtorrentClient::new(&state.scgi_socket_path);
-
-    // Special handling for delete_with_data
-    if payload.action == "delete_with_data" {
-        return match delete_torrent_with_data(&client, &payload.hash).await {
-            Ok(msg) => {
-                // Note: Frontend shows its own toast
-                (StatusCode::OK, msg).into_response()
-            }
-            Err((status, msg)) => (status, msg).into_response(),
-        };
-    }
-
-    let method = match payload.action.as_str() {
-        "start" => "d.start",
-        "stop" => "d.stop",
-        "delete" => "d.erase",
-        _ => return (StatusCode::BAD_REQUEST, "Invalid action").into_response(),
-    };
-
-    let params = vec![RpcParam::from(payload.hash.as_str())];
-
-    match client.call(method, &params).await {
-        Ok(_) => {
-            // Note: Frontend shows its own toast, no SSE notification needed
-            (StatusCode::OK, "Action executed").into_response()
-        }
-        Err(e) => {
-            tracing::error!("RPC error: {}", e);
-            (
-                StatusCode::INTERNAL_SERVER_ERROR,
-                "Failed to execute action",
-            )
-                .into_response()
-        }
-    }
-}
-
-/// Helper function to handle secure deletion of torrent data
-async fn delete_torrent_with_data(
-    client: &xmlrpc::RtorrentClient,
-    hash: &str,
-) -> Result<&'static str, (StatusCode, String)> {
-    let params_hash = vec![RpcParam::from(hash)];
-
-    // 1. Get Base Path
-    let path_xml = client
-        .call("d.base_path", &params_hash)
-        .await
-        .map_err(|e| {
-            (
-                StatusCode::INTERNAL_SERVER_ERROR,
-                format!("Failed to call rTorrent: {}", e),
-            )
-        })?;
-
-    let path = xmlrpc::parse_string_response(&path_xml).map_err(|e| {
-        (
-            StatusCode::INTERNAL_SERVER_ERROR,
-            format!("Failed to parse path: {}", e),
-        )
-    })?;
-
-    // 1.5 Get Default Download Directory (Sandbox Root)
-    let root_xml = client.call("directory.default", &[]).await.map_err(|e| {
-        (
-            StatusCode::INTERNAL_SERVER_ERROR,
-            format!("Failed to get valid download root: {}", e),
-        )
-    })?;
-
-    let root_path_str = xmlrpc::parse_string_response(&root_xml).map_err(|e| {
-        (
-            StatusCode::INTERNAL_SERVER_ERROR,
-            format!("Failed to parse root path: {}", e),
-        )
-    })?;
-
-    // Resolve Paths (Canonicalize) to prevent .. traversal and symlink attacks
-    let root_path = tokio::fs::canonicalize(std::path::Path::new(&root_path_str))
-        .await
-        .map_err(|e| {
-            (
-                StatusCode::INTERNAL_SERVER_ERROR,
-                format!("Invalid download root configuration (on server): {}", e),
-            )
-        })?;
-
-    // Check if target path exists before trying to resolve it
-    let target_path_raw = std::path::Path::new(&path);
-    if !tokio::fs::try_exists(target_path_raw)
-        .await
-        .unwrap_or(false)
-    {
-        tracing::warn!(
-            "Data path not found: {:?}. Removing torrent only.",
-            target_path_raw
-        );
-        // If file doesn't exist, we just remove the torrent entry
-        client.call("d.erase", &params_hash).await.map_err(|e| {
-            (
-                StatusCode::INTERNAL_SERVER_ERROR,
-                format!("Failed to erase torrent: {}", e),
-            )
-        })?;
-
-        return Ok("Torrent removed (Data not found)");
-    }
-
-    let target_path = tokio::fs::canonicalize(target_path_raw)
-        .await
-        .map_err(|e| {
-            (
-                StatusCode::INTERNAL_SERVER_ERROR,
-                format!("Invalid data path: {}", e),
-            )
-        })?;
-
-    tracing::info!(
-        "Delete request: Target='{:?}', Root='{:?}'",
-        target_path,
-        root_path
-    );
-
-    // SECURITY CHECK: Ensure path is inside root_path
-    if !target_path.starts_with(&root_path) {
-        tracing::error!(
-            "Security Risk: Attempted to delete path outside download directory: {:?}",
-            target_path
-        );
-        return Err((
-            StatusCode::FORBIDDEN,
-            "Security Error: Cannot delete files outside default download directory".to_string(),
-        ));
-    }
-
-    // SECURITY CHECK: Ensure we are not deleting the root itself
-    if target_path == root_path {
-        return Err((
-            StatusCode::BAD_REQUEST,
-            "Security Error: Cannot delete the download root directory itself".to_string(),
-        ));
-    }
-
-    // 2. Erase Torrent first
-    client.call("d.erase", &params_hash).await.map_err(|e| {
-        tracing::warn!("Failed to erase torrent entry: {}", e);
-        (
-            StatusCode::INTERNAL_SERVER_ERROR,
-            format!("Failed to erase torrent: {}", e),
-        )
-    })?;
-
-    // 3. Delete Files via Native FS
-    let delete_result = if target_path.is_dir() {
-        tokio::fs::remove_dir_all(&target_path).await
-    } else {
-        tokio::fs::remove_file(&target_path).await
-    };
-
-    match delete_result {
-        Ok(_) => Ok("Torrent and data deleted"),
-        Err(e) => {
-            tracing::error!("Failed to delete data at {:?}: {}", target_path, e);
-            Err((
-                StatusCode::INTERNAL_SERVER_ERROR,
-                format!("Failed to delete data: {}", e),
-            ))
-        }
-    }
-}
-
-// --- NEW HANDLERS ---
-
-/// Get rTorrent version
-#[utoipa::path(
-    get,
-    path = "/api/system/version",
-    responses(
-        (status = 200, description = "rTorrent version", body = String),
-        (status = 500, description = "Internal server error")
-    )
-)]
-pub async fn get_version_handler(State(state): State<AppState>) -> impl IntoResponse {
-    let client = xmlrpc::RtorrentClient::new(&state.scgi_socket_path);
-    match client.call("system.client_version", &[]).await {
-        Ok(xml) => {
-            let version = xmlrpc::parse_string_response(&xml).unwrap_or(xml);
-            (StatusCode::OK, version).into_response()
-        }
-        Err(e) => {
-            tracing::error!("Failed to get version: {}", e);
-            (StatusCode::INTERNAL_SERVER_ERROR, "Failed to get version").into_response()
-        }
-    }
-}
-
-/// Get files for a torrent
-#[utoipa::path(
-    get,
-    path = "/api/torrents/{hash}/files",
-    responses(
-        (status = 200, description = "Files list", body = Vec<TorrentFile>),
-        (status = 500, description = "Internal server error")
-    ),
-    params(
-        ("hash" = String, Path, description = "Torrent Hash")
-    )
-)]
-pub async fn get_files_handler(
-    State(state): State<AppState>,
-    Path(hash): Path<String>,
-) -> impl IntoResponse {
-    let client = xmlrpc::RtorrentClient::new(&state.scgi_socket_path);
-    let params = vec![
-        RpcParam::from(hash.as_str()),
-        RpcParam::from(""),
-        RpcParam::from("f.path="),
-        RpcParam::from("f.size_bytes="),
-        RpcParam::from("f.completed_chunks="),
-        RpcParam::from("f.priority="),
-    ];
-
-    match client.call("f.multicall", &params).await {
-        Ok(xml) => match xmlrpc::parse_multicall_response(&xml) {
-            Ok(rows) => {
-                let files: Vec<TorrentFile> = rows
-                    .into_iter()
-                    .enumerate()
-                    .map(|(idx, row)| TorrentFile {
-                        index: idx as u32,
-                        path: row.get(0).cloned().unwrap_or_default(),
-                        size: row.get(1).and_then(|s| s.parse().ok()).unwrap_or(0),
-                        completed_chunks: row.get(2).and_then(|s| s.parse().ok()).unwrap_or(0),
-                        priority: row.get(3).and_then(|s| s.parse().ok()).unwrap_or(0),
-                    })
-                    .collect();
-                (StatusCode::OK, Json(files)).into_response()
-            }
-            Err(e) => (
-                StatusCode::INTERNAL_SERVER_ERROR,
-                format!("Parse error: {}", e),
-            )
-                .into_response(),
-        },
-        Err(e) => (
-            StatusCode::INTERNAL_SERVER_ERROR,
-            format!("RPC error: {}", e),
-        )
-            .into_response(),
-    }
-}
-
-/// Get peers for a torrent
-#[utoipa::path(
-    get,
-    path = "/api/torrents/{hash}/peers",
-    responses(
-        (status = 200, description = "Peers list", body = Vec<TorrentPeer>),
-        (status = 500, description = "Internal server error")
-    ),
-    params(
-        ("hash" = String, Path, description = "Torrent Hash")
-    )
-)]
-pub async fn get_peers_handler(
-    State(state): State<AppState>,
-    Path(hash): Path<String>,
-) -> impl IntoResponse {
-    let client = xmlrpc::RtorrentClient::new(&state.scgi_socket_path);
-    let params = vec![
-        RpcParam::from(hash.as_str()),
-        RpcParam::from(""),
-        RpcParam::from("p.address="),
-        RpcParam::from("p.client_version="),
-        RpcParam::from("p.down_rate="),
-        RpcParam::from("p.up_rate="),
-        RpcParam::from("p.completed_percent="),
-    ];
-
-    match client.call("p.multicall", &params).await {
-        Ok(xml) => match xmlrpc::parse_multicall_response(&xml) {
-            Ok(rows) => {
-                let peers: Vec<TorrentPeer> = rows
-                    .into_iter()
-                    .map(|row| TorrentPeer {
-                        ip: row.get(0).cloned().unwrap_or_default(),
-                        client: row.get(1).cloned().unwrap_or_default(),
-                        down_rate: row.get(2).and_then(|s| s.parse().ok()).unwrap_or(0),
-                        up_rate: row.get(3).and_then(|s| s.parse().ok()).unwrap_or(0),
-                        progress: row.get(4).and_then(|s| s.parse().ok()).unwrap_or(0.0),
-                    })
-                    .collect();
-                (StatusCode::OK, Json(peers)).into_response()
-            }
-            Err(e) => (
-                StatusCode::INTERNAL_SERVER_ERROR,
-                format!("Parse error: {}", e),
-            )
-                .into_response(),
-        },
-        Err(e) => (
-            StatusCode::INTERNAL_SERVER_ERROR,
-            format!("RPC error: {}", e),
-        )
-            .into_response(),
-    }
-}
-
-/// Get trackers for a torrent
-#[utoipa::path(
-    get,
-    path = "/api/torrents/{hash}/trackers",
-    responses(
-        (status = 200, description = "Trackers list", body = Vec<TorrentTracker>),
-        (status = 500, description = "Internal server error")
-    ),
-    params(
-        ("hash" = String, Path, description = "Torrent Hash")
-    )
-)]
-pub async fn get_trackers_handler(
-    State(state): State<AppState>,
-    Path(hash): Path<String>,
-) -> impl IntoResponse {
-    let client = xmlrpc::RtorrentClient::new(&state.scgi_socket_path);
-    let params = vec![
-        RpcParam::from(hash.as_str()),
-        RpcParam::from(""),
-        RpcParam::from("t.url="),
-        RpcParam::from("t.activity_date_last="),
-        RpcParam::from("t.message="),
-    ];
-
-    match client.call("t.multicall", &params).await {
-        Ok(xml) => {
-            match xmlrpc::parse_multicall_response(&xml) {
-                Ok(rows) => {
-                    let trackers: Vec<TorrentTracker> = rows
-                        .into_iter()
-                        .map(|row| {
-                            TorrentTracker {
-                                url: row.get(0).cloned().unwrap_or_default(),
-                                status: "Unknown".to_string(), // Derive from type/activity?
-                                message: row.get(2).cloned().unwrap_or_default(),
-                            }
-                        })
-                        .collect();
-                    (StatusCode::OK, Json(trackers)).into_response()
-                }
-                Err(e) => (
-                    StatusCode::INTERNAL_SERVER_ERROR,
-                    format!("Parse error: {}", e),
-                )
-                    .into_response(),
-            }
-        }
-        Err(e) => (
-            StatusCode::INTERNAL_SERVER_ERROR,
-            format!("RPC error: {}", e),
-        )
-            .into_response(),
-    }
-}
-
-/// Set file priority
-#[utoipa::path(
-    post,
-    path = "/api/torrents/files/priority",
-    request_body = SetFilePriorityRequest,
-    responses(
-        (status = 200, description = "Priority updated"),
-        (status = 500, description = "Internal server error")
-    )
-)]
-pub async fn set_file_priority_handler(
-    State(state): State<AppState>,
-    Json(payload): Json<SetFilePriorityRequest>,
-) -> impl IntoResponse {
-    let client = xmlrpc::RtorrentClient::new(&state.scgi_socket_path);
-
-    // f.set_priority takes "hash", index, priority
-    // Priority: 0 (off), 1 (normal), 2 (high)
-    // f.set_priority is tricky. Let's send as string first as before, or int if we knew.
-    // Usually priorities are small integers.
-    // But since we are updating everything to RpcParam, let's use Int if possible or String.
-    // The previous implementation used string. Let's stick to string for now or try Int.
-    // Actually, f.set_priority likely takes an integer.
-
-    let target = format!("{}:f{}", payload.hash, payload.file_index);
-    let params = vec![
-        RpcParam::from(target.as_str()),
-        RpcParam::from(payload.priority as i64),
-    ];
-
-    match client.call("f.set_priority", &params).await {
-        Ok(_) => {
-            let _ = client
-                .call(
-                    "d.update_priorities",
-                    &[RpcParam::from(payload.hash.as_str())],
-                )
-                .await;
-            (StatusCode::OK, "Priority updated").into_response()
-        }
-        Err(e) => (
-            StatusCode::INTERNAL_SERVER_ERROR,
-            format!("RPC error: {}", e),
-        )
-            .into_response(),
-    }
-}
-
-/// Set torrent label
-#[utoipa::path(
-    post,
-    path = "/api/torrents/label",
-    request_body = SetLabelRequest,
-    responses(
-        (status = 200, description = "Label updated"),
-        (status = 500, description = "Internal server error")
-    )
-)]
-pub async fn set_label_handler(
-    State(state): State<AppState>,
-    Json(payload): Json<SetLabelRequest>,
-) -> impl IntoResponse {
-    let client = xmlrpc::RtorrentClient::new(&state.scgi_socket_path);
-    let params = vec![
-        RpcParam::from(payload.hash.as_str()),
-        RpcParam::from(payload.label),
-    ];
-
-    match client.call("d.custom1.set", &params).await {
-        Ok(_) => (StatusCode::OK, "Label updated").into_response(),
-        Err(e) => (
-            StatusCode::INTERNAL_SERVER_ERROR,
-            format!("RPC error: {}", e),
-        )
-            .into_response(),
-    }
-}
-
-/// Get global speed limits
-#[utoipa::path(
-    get,
-    path = "/api/settings/global-limits",
-    responses(
-        (status = 200, description = "Current limits", body = GlobalLimitRequest),
-        (status = 500, description = "Internal server error")
-    )
-)]
-pub async fn get_global_limit_handler(State(state): State<AppState>) -> impl IntoResponse {
-    let client = xmlrpc::RtorrentClient::new(&state.scgi_socket_path);
-    // throttle.global_down.max_rate, throttle.global_up.max_rate
-    let down_fut = client.call("throttle.global_down.max_rate", &[]);
-    let up_fut = client.call("throttle.global_up.max_rate", &[]);
-
-    let down = match down_fut.await {
-        Ok(xml) => xmlrpc::parse_i64_response(&xml).unwrap_or(0),
-        Err(_) => -1,
-    };
-
-    let up = match up_fut.await {
-        Ok(xml) => xmlrpc::parse_i64_response(&xml).unwrap_or(0),
-        Err(_) => -1,
-    };
-
-    let resp = GlobalLimitRequest {
-        max_download_rate: Some(down),
-        max_upload_rate: Some(up),
-    };
-
-    (StatusCode::OK, Json(resp)).into_response()
-}
-
-/// Set global speed limits
-#[utoipa::path(
-    post,
-    path = "/api/settings/global-limits",
-    request_body = GlobalLimitRequest,
-    responses(
-        (status = 200, description = "Limits updated"),
-        (status = 500, description = "Internal server error")
-    )
-)]
-pub async fn set_global_limit_handler(
-    State(state): State<AppState>,
-    Json(payload): Json<GlobalLimitRequest>,
-) -> impl IntoResponse {
-    let client = xmlrpc::RtorrentClient::new(&state.scgi_socket_path);
-
-    // Use throttle.global_*.max_rate.set_kb which is more reliable than .set (which is buggy)
-    // The .set_kb method expects KB/s, so we convert bytes to KB
-
-    if let Some(down) = payload.max_download_rate {
-        // Convert bytes/s to KB/s (divide by 1024)
-        let down_kb = down / 1024;
-        tracing::info!(
-            "Setting download limit: {} bytes/s = {} KB/s",
-            down,
-            down_kb
-        );
-
-        // Use set_kb with empty string as first param (throttle name), then value
-        if let Err(e) = client
-            .call(
-                "throttle.global_down.max_rate.set_kb",
-                &[RpcParam::from(""), RpcParam::Int(down_kb)],
-            )
-            .await
-        {
-            tracing::error!("Failed to set download limit: {}", e);
-            return (
-                StatusCode::INTERNAL_SERVER_ERROR,
-                format!("Failed to set down limit: {}", e),
-            )
-                .into_response();
-        }
-    }
-
-    if let Some(up) = payload.max_upload_rate {
-        // Convert bytes/s to KB/s
-        let up_kb = up / 1024;
-        tracing::info!("Setting upload limit: {} bytes/s = {} KB/s", up, up_kb);
-
-        if let Err(e) = client
-            .call(
-                "throttle.global_up.max_rate.set_kb",
-                &[RpcParam::from(""), RpcParam::Int(up_kb)],
-            )
-            .await
-        {
-            tracing::error!("Failed to set upload limit: {}", e);
-            return (
-                StatusCode::INTERNAL_SERVER_ERROR,
-                format!("Failed to set up limit: {}", e),
-            )
-                .into_response();
-        }
-    }
-
-    (StatusCode::OK, "Limits updated").into_response()
-}
-
 pub async fn handle_timeout_error(err: BoxError) -> (StatusCode, &'static str) {
     if err.is::<tower::timeout::error::Elapsed>() {
         (StatusCode::REQUEST_TIMEOUT, "Request timed out")
@@ -670,43 +50,20 @@ pub async fn handle_timeout_error(err: BoxError) -> (StatusCode, &'static str) {
     }
 }
 
-// --- PUSH NOTIFICATION HANDLERS ---
-
 #[cfg(feature = "push-notifications")]
-/// Get VAPID public key for push subscription
-#[utoipa::path(
-    get,
-    path = "/api/push/public-key",
-    responses(
-        (status = 200, description = "VAPID public key", body = String)
-    )
-)]
 pub async fn get_push_public_key_handler(
-    State(state): State<AppState>,
+    axum::extract::State(state): axum::extract::State<crate::AppState>,
 ) -> impl IntoResponse {
     let public_key = state.push_store.get_public_key();
-    (StatusCode::OK, Json(serde_json::json!({ "publicKey": public_key }))).into_response()
+    (StatusCode::OK, axum::extract::Json(serde_json::json!({ "publicKey": public_key }))).into_response()
 }
 
-
 #[cfg(feature = "push-notifications")]
-/// Subscribe to push notifications
-#[utoipa::path(
-    post,
-    path = "/api/push/subscribe",
-    request_body = push::PushSubscription,
-    responses(
-        (status = 200, description = "Subscription saved"),
-        (status = 400, description = "Invalid subscription data")
-    )
-)]
 pub async fn subscribe_push_handler(
-    State(state): State<AppState>,
-    Json(subscription): Json<push::PushSubscription>,
+    axum::extract::State(state): axum::extract::State<crate::AppState>,
+    axum::extract::Json(subscription): axum::extract::Json<crate::push::PushSubscription>,
 ) -> impl IntoResponse {
     tracing::info!("Received push subscription: {:?}", subscription);
-
     state.push_store.add_subscription(subscription).await;
-
     (StatusCode::OK, "Subscription saved").into_response()
 }

backend/src/main.rs

@@ -4,9 +4,9 @@ mod handlers;
 #[cfg(feature = "push-notifications")]
 mod push;
 mod rate_limit;
-mod scgi;
 mod sse;
-mod xmlrpc;
+
+use shared::xmlrpc;
 
 use axum::error_handling::HandleErrorLayer;
 use axum::{
@@ -45,6 +45,7 @@ pub struct AppState {
     pub db: db::Db,
     #[cfg(feature = "push-notifications")]
     pub push_store: push::PushSubscriptionStore,
+    pub notify_poll: Arc<tokio::sync::Notify>,
 }
 
 async fn auth_middleware(
@@ -58,6 +59,7 @@ async fn auth_middleware(
     if path.starts_with("/api/auth/login")
        || path.starts_with("/api/auth/check") // Used by frontend to decide where to go
        || path.starts_with("/api/setup")
+       || path.starts_with("/api/server_fns")
        || path.starts_with("/swagger-ui")
        || path.starts_with("/api-docs")
        || !path.starts_with("/api/") // Allow static files (frontend)
@@ -105,16 +107,6 @@ struct Args {
 #[derive(OpenApi)]
 #[openapi(
     paths(
-        handlers::add_torrent_handler,
-        handlers::handle_torrent_action,
-        handlers::get_version_handler,
-        handlers::get_files_handler,
-        handlers::get_peers_handler,
-        handlers::get_trackers_handler,
-        handlers::set_file_priority_handler,
-        handlers::set_label_handler,
-        handlers::get_global_limit_handler,
-        handlers::set_global_limit_handler,
         handlers::get_push_public_key_handler,
         handlers::subscribe_push_handler,
         handlers::auth::login_handler,
@@ -154,16 +146,6 @@ struct ApiDoc;
 #[derive(OpenApi)]
 #[openapi(
     paths(
-        handlers::add_torrent_handler,
-        handlers::handle_torrent_action,
-        handlers::get_version_handler,
-        handlers::get_files_handler,
-        handlers::get_peers_handler,
-        handlers::get_trackers_handler,
-        handlers::set_file_priority_handler,
-        handlers::set_label_handler,
-        handlers::get_global_limit_handler,
-        handlers::set_global_limit_handler,
         handlers::auth::login_handler,
         handlers::auth::logout_handler,
         handlers::auth::check_auth_handler,
@@ -334,7 +316,9 @@ async fn main() {
     };
 
     #[cfg(not(feature = "push-notifications"))]
-    let push_store = ();
+    let _push_store = ();
+
+    let notify_poll = Arc::new(tokio::sync::Notify::new());
 
     let app_state = AppState {
         tx: tx.clone(),
@@ -343,6 +327,7 @@ async fn main() {
         db: db.clone(),
         #[cfg(feature = "push-notifications")]
         push_store,
+        notify_poll: notify_poll.clone(),
     };
 
     // Spawn background task to poll rTorrent
@@ -351,6 +336,7 @@ async fn main() {
     let socket_path = args.socket.clone(); // Clone for background task
     #[cfg(feature = "push-notifications")]
     let push_store_clone = app_state.push_store.clone();
+    let notify_poll_clone = notify_poll.clone();
 
     tokio::spawn(async move {
         let client = xmlrpc::RtorrentClient::new(&socket_path);
@@ -359,6 +345,14 @@ async fn main() {
         let mut backoff_duration = Duration::from_secs(1);
 
         loop {
+            // Determine polling interval based on active clients
+            let active_clients = event_bus_tx.receiver_count();
+            let loop_interval = if active_clients > 0 {
+                Duration::from_secs(1)
+            } else {
+                Duration::from_secs(30)
+            };
+
             // 1. Fetch Torrents
             let torrents_result = sse::fetch_torrents(&client).await;
 
@@ -429,6 +423,14 @@ async fn main() {
                     }
 
                     previous_torrents = new_torrents;
+
+                    // Success case: wait for the determined interval OR a wakeup notification
+                    tokio::select! {
+                        _ = tokio::time::sleep(loop_interval) => {},
+                        _ = notify_poll_clone.notified() => {
+                            tracing::debug!("Background loop awakened by new client connection");
+                        }
+                    }
                 }
                 Err(e) => {
                     tracing::error!("Error fetching torrents in background: {}", e);
@@ -449,20 +451,15 @@ async fn main() {
                         "Backoff: Sleeping for {:?} due to rTorrent error.",
                         backoff_duration
                     );
+                    
+                    tokio::time::sleep(backoff_duration).await;
                 }
             }
 
             // Handle Stats
-            match stats_result {
-                Ok(stats) => {
-                    let _ = event_bus_tx.send(AppEvent::Stats(stats));
-                }
-                Err(e) => {
-                    tracing::warn!("Error fetching global stats: {}", e);
-                }
+            if let Ok(stats) = stats_result {
+                let _ = event_bus_tx.send(AppEvent::Stats(stats));
             }
-
-            tokio::time::sleep(backoff_duration).await;
         }
     });
 
@@ -471,7 +468,8 @@ async fn main() {
     #[cfg(feature = "swagger")]
     let app = app.merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()));
 
-    // Setup & Auth Routes
+    // Setup & Auth Routes (cookie-based, stay as REST)
+    let scgi_path_for_ctx = args.socket.clone();
     let app = app
         .route("/api/setup/status", get(handlers::setup::get_setup_status_handler))
         .route("/api/setup", post(handlers::setup::setup_handler))
@@ -483,36 +481,21 @@ async fn main() {
         )
         .route("/api/auth/logout", post(handlers::auth::logout_handler))
         .route("/api/auth/check", get(handlers::auth::check_auth_handler))
-        // App Routes
         .route("/api/events", get(sse::sse_handler))
-        .route("/api/torrents/add", post(handlers::add_torrent_handler))
-        .route(
-            "/api/torrents/action",
-            post(handlers::handle_torrent_action),
-        )
-        .route("/api/system/version", get(handlers::get_version_handler))
-        .route(
-            "/api/torrents/{hash}/files",
-            get(handlers::get_files_handler),
-        )
-        .route(
-            "/api/torrents/{hash}/peers",
-            get(handlers::get_peers_handler),
-        )
-        .route(
-            "/api/torrents/{hash}/trackers",
-            get(handlers::get_trackers_handler),
-        )
-        .route(
-            "/api/torrents/files/priority",
-            post(handlers::set_file_priority_handler),
-        )
-        .route("/api/torrents/label", post(handlers::set_label_handler))
-        .route(
-            "/api/settings/global-limits",
-            get(handlers::get_global_limit_handler).post(handlers::set_global_limit_handler),
-        )
-        .fallback(handlers::static_handler); // Serve static files for everything else
+        .route("/api/server_fns/{*fn_name}", post({
+            let scgi_path = scgi_path_for_ctx.clone();
+            move |req: Request<Body>| {
+                leptos_axum::handle_server_fns_with_context(
+                    move || {
+                        leptos::context::provide_context(shared::ServerContext {
+                            scgi_socket_path: scgi_path.clone(),
+                        });
+                    },
+                    req,
+                )
+            }
+        }))
+        .fallback(handlers::static_handler);
 
     #[cfg(feature = "push-notifications")]
     let app = app

backend/src/sse.rs

@@ -1,4 +1,4 @@
-use crate::xmlrpc::{
+use shared::xmlrpc::{
     parse_i64_response, parse_multicall_response, RpcParam, RtorrentClient, XmlRpcError,
 };
 use crate::AppState;
@@ -195,6 +195,9 @@ pub async fn fetch_global_stats(client: &RtorrentClient) -> Result<GlobalStats,
 pub async fn sse_handler(
     State(state): State<AppState>,
 ) -> Sse<impl Stream<Item = Result<Event, Infallible>>> {
+    // Notify background worker to wake up and poll immediately
+    state.notify_poll.notify_one();
+
     // Get initial value synchronously (from the watch channel's current state)
     let initial_rx = state.tx.subscribe();
     let initial_torrents = initial_rx.borrow().clone();

frontend/Cargo.toml

@@ -7,26 +7,27 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-leptos = { version = "0.6", features = ["csr"] }
-leptos_router = { version = "0.6", features = ["csr"] }
+leptos = { version = "0.8.15", features = ["csr"] }
+leptos_router = { version = "0.8.11" }
 
 console_error_panic_hook = "0.1"
 console_log = "1"
 log = "0.4"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-gloo-net = "0.5"
+gloo-net = "0.6"
 gloo-timers = { version = "0.3", features = ["futures"] }
 wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.4"
 uuid = { version = "1", features = ["v4", "js"] }
 futures = "0.3"
 chrono = { version = "0.4", features = ["serde", "wasm-bindgen"] }
-web-sys = { version = "0.3", features = ["HtmlDivElement", "HtmlUListElement", "HtmlLiElement", "HtmlAnchorElement", "MouseEvent", "Event", "Window", "Document", "Element", "DomTokenList", "CssStyleDeclaration", "Storage", "TouchEvent", "TouchList", "Touch", "Navigator", "Notification", "NotificationOptions", "NotificationPermission", "ServiceWorkerContainer", "ServiceWorkerRegistration", "PushManager", "PushSubscription", "PushSubscriptionOptions", "PushSubscriptionOptionsInit", "HtmlDetailsElement"] }
-shared = { path = "../shared" }
+web-sys = { version = "0.3", features = ["HtmlDivElement", "HtmlUListElement", "HtmlLiElement", "HtmlAnchorElement", "MouseEvent", "Event", "Window", "Document", "Element", "DomTokenList", "CssStyleDeclaration", "Storage", "TouchEvent", "TouchList", "Touch", "Navigator", "Notification", "NotificationOptions", "NotificationPermission", "ServiceWorkerContainer", "ServiceWorkerRegistration", "PushManager", "PushSubscription", "PushSubscriptionOptions", "PushSubscriptionOptionsInit", "HtmlDetailsElement", "HtmlInputElement", "HtmlFormElement", "HtmlDialogElement", "ProgressEvent"] }
+shared = { path = "../shared", features = ["hydrate"] }
 tailwind_fuse = "0.3.2"
 js-sys = "0.3.85"
 base64 = "0.22.1"
 serde-wasm-bindgen = "0.6.5"
-leptos-use = "0.13"
-codee = "0.2"
+leptos-use = { version = "0.16", features = ["storage"] }
+codee = "0.3"
+thiserror = "2.0"

frontend/src/api/mod.rs

@@ -0,0 +1,214 @@
+use gloo_net::http::Request;
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub enum ApiError {
+    #[error("Network error")]
+    Network,
+    #[error("Server error: {status}")]
+    Server { status: u16 },
+    #[error("Login failed")]
+    LoginFailed,
+    #[error("Unauthorized")]
+    Unauthorized,
+    #[error("Too many requests")]
+    RateLimited,
+    #[error("Server function error: {0}")]
+    ServerFn(String),
+}
+
+fn base_url() -> String {
+    "/api".to_string()
+}
+
+pub mod auth {
+    use super::*;
+
+    #[derive(serde::Serialize)]
+    pub struct LoginRequest {
+        pub username: String,
+        pub password: String,
+        pub remember_me: bool,
+    }
+
+    pub async fn login(
+        username: &str,
+        password: &str,
+        remember_me: bool,
+    ) -> Result<(), ApiError> {
+        let req = LoginRequest {
+            username: username.to_string(),
+            password: password.to_string(),
+            remember_me,
+        };
+        let resp = Request::post(&format!("{}/auth/login", base_url()))
+            .json(&req)
+            .map_err(|_| ApiError::Network)?
+            .send()
+            .await
+            .map_err(|_| ApiError::Network)?;
+
+        if resp.ok() {
+            Ok(())
+        } else if resp.status() == 429 {
+            Err(ApiError::RateLimited)
+        } else {
+            Err(ApiError::LoginFailed)
+        }
+    }
+
+    pub async fn logout() -> Result<(), ApiError> {
+        Request::post(&format!("{}/auth/logout", base_url()))
+            .send()
+            .await
+            .map_err(|_| ApiError::Network)?;
+        Ok(())
+    }
+
+    pub async fn check_auth() -> Result<bool, ApiError> {
+        let resp = Request::get(&format!("{}/auth/check", base_url()))
+            .send()
+            .await
+            .map_err(|_| ApiError::Network)?;
+        Ok(resp.ok())
+    }
+
+    #[derive(serde::Deserialize)]
+    pub struct UserResponse {
+        pub username: String,
+    }
+
+    pub async fn get_user() -> Result<UserResponse, ApiError> {
+        let resp = Request::get(&format!("{}/auth/check", base_url()))
+            .send()
+            .await
+            .map_err(|_| ApiError::Network)?;
+        let user = resp.json().await.map_err(|_| ApiError::Network)?;
+        Ok(user)
+    }
+}
+
+pub mod setup {
+    use super::*;
+
+    #[derive(serde::Serialize)]
+    pub struct SetupRequest {
+        pub username: String,
+        pub password: String,
+    }
+
+    #[derive(serde::Deserialize)]
+    pub struct SetupStatusResponse {
+        pub completed: bool,
+    }
+
+    pub async fn get_status() -> Result<SetupStatusResponse, ApiError> {
+        let resp = Request::get(&format!("{}/setup/status", base_url()))
+            .send()
+            .await
+            .map_err(|_| ApiError::Network)?;
+        let status = resp.json().await.map_err(|_| ApiError::Network)?;
+        Ok(status)
+    }
+
+    pub async fn setup(username: &str, password: &str) -> Result<(), ApiError> {
+        let req = SetupRequest {
+            username: username.to_string(),
+            password: password.to_string(),
+        };
+        Request::post(&format!("{}/setup", base_url()))
+            .json(&req)
+            .map_err(|_| ApiError::Network)?
+            .send()
+            .await
+            .map_err(|_| ApiError::Network)?;
+        Ok(())
+    }
+}
+
+pub mod settings {
+    use super::*;
+    use shared::GlobalLimitRequest;
+
+    pub async fn set_global_limits(req: &GlobalLimitRequest) -> Result<(), ApiError> {
+        shared::server_fns::settings::set_global_limits(
+            req.max_download_rate,
+            req.max_upload_rate,
+        )
+        .await
+        .map_err(|e| ApiError::ServerFn(e.to_string()))
+    }
+}
+
+pub mod push {
+    use super::*;
+    use crate::store::PushSubscriptionData;
+
+    pub async fn get_public_key() -> Result<String, ApiError> {
+        let resp = Request::get(&format!("{}/push/public-key", base_url()))
+            .send()
+            .await
+            .map_err(|_| ApiError::Network)?;
+        let key = resp.text().await.map_err(|_| ApiError::Network)?;
+        Ok(key)
+    }
+
+    pub async fn subscribe(req: &PushSubscriptionData) -> Result<(), ApiError> {
+        Request::post(&format!("{}/push/subscribe", base_url()))
+            .json(req)
+            .map_err(|_| ApiError::Network)?
+            .send()
+            .await
+            .map_err(|_| ApiError::Network)?;
+        Ok(())
+    }
+}
+
+pub mod torrent {
+    use super::*;
+
+    pub async fn add(uri: &str) -> Result<(), ApiError> {
+        shared::server_fns::torrent::add_torrent(uri.to_string())
+            .await
+            .map_err(|e| ApiError::ServerFn(e.to_string()))
+    }
+
+    pub async fn action(hash: &str, action: &str) -> Result<(), ApiError> {
+        shared::server_fns::torrent::torrent_action(hash.to_string(), action.to_string())
+            .await
+            .map(|_| ())
+            .map_err(|e| ApiError::ServerFn(e.to_string()))
+    }
+
+    pub async fn delete(hash: &str) -> Result<(), ApiError> {
+        action(hash, "delete").await
+    }
+
+    pub async fn delete_with_data(hash: &str) -> Result<(), ApiError> {
+        action(hash, "delete_with_data").await
+    }
+
+    pub async fn start(hash: &str) -> Result<(), ApiError> {
+        action(hash, "start").await
+    }
+
+    pub async fn stop(hash: &str) -> Result<(), ApiError> {
+        action(hash, "stop").await
+    }
+
+    pub async fn set_label(hash: &str, label: &str) -> Result<(), ApiError> {
+        shared::server_fns::torrent::set_label(hash.to_string(), label.to_string())
+            .await
+            .map_err(|e| ApiError::ServerFn(e.to_string()))
+    }
+
+    pub async fn set_priority(hash: &str, file_index: u32, priority: u8) -> Result<(), ApiError> {
+        shared::server_fns::torrent::set_file_priority(
+            hash.to_string(),
+            file_index,
+            priority,
+        )
+        .await
+        .map_err(|e| ApiError::ServerFn(e.to_string()))
+    }
+}

frontend/src/app.rs

@@ -3,100 +3,68 @@ use crate::components::toast::ToastContainer;
 use crate::components::torrent::table::TorrentTable;
 use crate::components::auth::login::Login;
 use crate::components::auth::setup::Setup;
-use leptos::*;
-use leptos_router::*;
-use serde::Deserialize;
-
-#[derive(Deserialize)]
-struct SetupStatus {
-    completed: bool,
-}
-
-#[derive(Deserialize)]
-struct UserResponse {
-    username: String,
-}
+use crate::api;
+use leptos::prelude::*;
+use leptos::task::spawn_local;
+use leptos_router::components::{Router, Routes, Route};
+use leptos_router::hooks::use_navigate;
 
 #[component]
 pub fn App() -> impl IntoView {
     crate::store::provide_torrent_store();
+    let store = use_context::<crate::store::TorrentStore>();
 
-    // Auth State
-    let (is_loading, set_is_loading) = create_signal(true);
-    let (is_authenticated, set_is_authenticated) = create_signal(false);
+    let is_loading = signal(true);
+    let is_authenticated = signal(false);
+    let needs_setup = signal(false);
 
-    // Check Auth & Setup Status on load
-    create_effect(move |_| {
+    Effect::new(move |_| {
         spawn_local(async move {
-            logging::log!("App initialization started...");
+            log::info!("App initialization started...");
 
-            // 1. Check Setup Status
-            let setup_res = gloo_net::http::Request::get("/api/setup/status").send().await;
+            let setup_res = api::setup::get_status().await;
 
             match setup_res {
-                Ok(resp) => {
-                    if resp.ok() {
-                        match resp.json::<SetupStatus>().await {
-                            Ok(status) => {
-                                if !status.completed {
-                                    logging::log!("Setup not completed, redirecting to /setup");
-                                    let navigate = use_navigate();
-                                    navigate("/setup", Default::default());
-                                    set_is_loading.set(false);
-                                    return;
-                                }
-                            }
-                            Err(e) => logging::error!("Failed to parse setup status: {}", e),
-                        }
+                Ok(status) => {
+                    if !status.completed {
+                        log::info!("Setup not completed");
+                        needs_setup.1.set(true);
+                        is_loading.1.set(false);
+                        return;
                     }
                 }
-                Err(e) => logging::error!("Network error checking setup status: {}", e),
+                Err(e) => log::error!("Failed to get setup status: {:?}", e),
             }
 
-            // 2. Check Auth Status
-            let auth_res = gloo_net::http::Request::get("/api/auth/check").send().await;
+            let auth_res = api::auth::check_auth().await;
 
-                        match auth_res {
-                            Ok(resp) => {
-                                if resp.status() == 200 {
-                                    logging::log!("Authenticated!");
+            match auth_res {
+                Ok(true) => {
+                    log::info!("Authenticated!");
 
-                                    // Parse user info
-                                    if let Ok(user_info) = resp.json::<UserResponse>().await {
-                                        if let Some(store) = use_context::<crate::store::TorrentStore>() {
-                                            store.user.set(Some(user_info.username));
-                                        }
-                                    }
-
-                                    set_is_authenticated.set(true);
-
-                                    // If user is already authenticated but on login/setup page, redirect to home
-                                    let pathname = window().location().pathname().unwrap_or_default();
-                                    if pathname == "/login" || pathname == "/setup" {
-                                        logging::log!("Already authenticated, redirecting to home");
-                                        let navigate = use_navigate();
-                                        navigate("/", Default::default());
-                                    }
-                                } else {
-                                    logging::log!("Not authenticated, redirecting to /login");
-                                    let navigate = use_navigate();
-                                    let pathname = window().location().pathname().unwrap_or_default();
-                                    if pathname != "/login" && pathname != "/setup" {
-                                         navigate("/login", Default::default());
-                                    }
-                                }
-                            }
-                            Err(e) => logging::error!("Network error checking auth status: {}", e),
+                    if let Ok(user_info) = api::auth::get_user().await {
+                        if let Some(s) = store {
+                            s.user.set(Some(user_info.username));
                         }
-            set_is_loading.set(false);
+                    }
+
+                    is_authenticated.1.set(true);
+                }
+                Ok(false) => {
+                    log::info!("Not authenticated");
+                }
+                Err(e) => {
+                    log::error!("Auth check failed: {:?}", e);
+                }
+            }
+
+            is_loading.1.set(false);
         });
     });
-    // Initialize push notifications (Only if authenticated)
-    create_effect(move |_| {
-        if is_authenticated.get() {
+
+    Effect::new(move |_| {
+        if is_authenticated.0.get() {
             spawn_local(async {
-                // ... (Push notification logic kept same, shortened for brevity in this replace)
-                // Wait a bit for service worker to be ready
                 gloo_timers::future::TimeoutFuture::new(2000).await;
 
                 if crate::utils::platform::supports_push_notifications() && !crate::utils::platform::is_safari() {
@@ -109,18 +77,55 @@ pub fn App() -> impl IntoView {
     view! {
         <div class="relative w-full h-screen" style="height: 100dvh;">
             <Router>
-                <Routes>
-                    <Route path="/login" view=move || view! { <Login /> } />
-                    <Route path="/setup" view=move || view! { <Setup /> } />
+                <Routes fallback=|| view! { <div class="p-4">"404 Not Found"</div> }>
+                    <Route path=leptos_router::path!("/login") view=move || {
+                        let authenticated = is_authenticated.0.get();
+                        let setup_needed = needs_setup.0.get();
+                        
+                        Effect::new(move |_| {
+                            if setup_needed {
+                                let navigate = use_navigate();
+                                navigate("/setup", Default::default());
+                            } else if authenticated {
+                                log::info!("Already authenticated, redirecting to home");
+                                let navigate = use_navigate();
+                                navigate("/", Default::default());
+                            }
+                        });
+                        
+                        view! { <Login /> }
+                    } />
+                    <Route path=leptos_router::path!("/setup") view=move || {
+                        Effect::new(move |_| {
+                            if is_authenticated.0.get() {
+                                let navigate = use_navigate();
+                                navigate("/", Default::default());
+                            }
+                        });
+                        
+                        view! { <Setup /> }
+                    } />
 
-                    <Route path="/" view=move || {
+                    <Route path=leptos_router::path!("/") view=move || {
+                        Effect::new(move |_| {
+                            if !is_loading.0.get() && needs_setup.0.get() {
+                                log::info!("Setup not completed, redirecting to setup");
+                                let navigate = use_navigate();
+                                navigate("/setup", Default::default());
+                            } else if !is_loading.0.get() && !is_authenticated.0.get() {
+                                log::info!("Not authenticated, redirecting to login");
+                                let navigate = use_navigate();
+                                navigate("/login", Default::default());
+                            }
+                        });
+                        
                         view! {
-                            <Show when=move || !is_loading.get() fallback=|| view! {
+                            <Show when=move || !is_loading.0.get() fallback=|| view! {
                                 <div class="flex items-center justify-center h-screen bg-base-100">
                                     <span class="loading loading-spinner loading-lg"></span>
                                 </div>
                             }>
-                                <Show when=move || is_authenticated.get() fallback=|| ()>
+                                <Show when=move || is_authenticated.0.get() fallback=|| ()>
                                     <Protected>
                                         <TorrentTable />
                                     </Protected>
@@ -129,10 +134,17 @@ pub fn App() -> impl IntoView {
                         }
                     }/>
 
-                    <Route path="/settings" view=move || {
+                    <Route path=leptos_router::path!("/settings") view=move || {
+                        Effect::new(move |_| {
+                            if !is_authenticated.0.get() {
+                                let navigate = use_navigate();
+                                navigate("/login", Default::default());
+                            }
+                        });
+                        
                         view! {
-                            <Show when=move || !is_loading.get() fallback=|| ()>
-                                <Show when=move || is_authenticated.get() fallback=|| ()>
+                            <Show when=move || !is_loading.0.get() fallback=|| ()>
+                                <Show when=move || is_authenticated.0.get() fallback=|| ()>
                                     <Protected>
                                         <div class="p-4">"Settings Page (Coming Soon)"</div>
                                     </Protected>

frontend/src/components/auth/login.rs

@@ -1,60 +1,39 @@
-use leptos::*;
-use serde::Serialize;
-
-#[derive(Serialize)]
-struct LoginRequest {
-    username: String,
-    password: String,
-    remember_me: bool,
-}
+use leptos::prelude::*;
+use leptos::task::spawn_local;
+use crate::api;
 
 #[component]
 pub fn Login() -> impl IntoView {
-    let (username, set_username) = create_signal(String::new());
-    let (password, set_password) = create_signal(String::new());
-    let (remember_me, set_remember_me) = create_signal(false);
-    let (error, set_error) = create_signal(Option::<String>::None);
-    let (loading, set_loading) = create_signal(false);
+    let username = signal(String::new());
+    let password = signal(String::new());
+    let remember_me = signal(false);
+    let error = signal(Option::<String>::None);
+    let loading = signal(false);
 
     let handle_login = move |ev: web_sys::SubmitEvent| {
         ev.prevent_default();
-        set_loading.set(true);
-        set_error.set(None);
+        loading.1.set(true);
+        error.1.set(None);
 
-        logging::log!("Attempting login for user: {}", username.get());
+        let user = username.0.get();
+        let pass = password.0.get();
+        let rem = remember_me.0.get();
+
+        log::info!("Attempting login for user: {}", user);
 
         spawn_local(async move {
-            let req = LoginRequest {
-                username: username.get(),
-                password: password.get(),
-                remember_me: remember_me.get(),
-            };
-
-            let client = gloo_net::http::Request::post("/api/auth/login")
-                .json(&req)
-                .expect("Failed to create request");
-
-            match client.send().await {
-                Ok(resp) => {
-                    logging::log!("Login response status: {}", resp.status());
-                    if resp.ok() {
-                        logging::log!("Login successful, redirecting...");
-                        // Force a full reload to re-run auth checks in App.rs
-                        let _ = window().location().set_href("/");
-                    } else if resp.status() == 429 {
-                        set_error.set(Some("Çok fazla başarısız deneme yaptınız. Lütfen bir süre bekleyip tekrar deneyin.".to_string()));
-                    } else {
-                        let text = resp.text().await.unwrap_or_default();
-                        logging::error!("Login failed: {}", text);
-                        set_error.set(Some("Kullanıcı adı veya şifre hatalı".to_string()));
-                    }
+            match api::auth::login(&user, &pass, rem).await {
+                Ok(_) => {
+                    log::info!("Login successful, redirecting...");
+                    let window = web_sys::window().expect("window should exist");
+                    let _ = window.location().set_href("/");
                 }
                 Err(e) => {
-                    logging::error!("Network error: {}", e);
-                    set_error.set(Some("Bağlantı hatası".to_string()));
+                    log::error!("Login failed: {:?}", e);
+                    error.1.set(Some("Geçersiz kullanıcı adı veya şifre".to_string()));
+                    loading.1.set(false);
                 }
             }
-            set_loading.set(false);
         });
     };
 
@@ -62,66 +41,73 @@ pub fn Login() -> impl IntoView {
         <div class="flex items-center justify-center min-h-screen bg-base-200">
             <div class="card w-full max-w-sm shadow-xl bg-base-100">
                 <div class="card-body">
-                    <h2 class="card-title justify-center mb-4">"VibeTorrent Giriş"</h2>
+                    <div class="flex flex-col items-center mb-6">
+                        <div class="w-16 h-16 bg-primary rounded-2xl flex items-center justify-center text-primary-content shadow-lg mb-4">
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-10 h-10">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M15.362 5.214A8.252 8.252 0 0112 21 8.25 8.25 0 016.038 7.048 8.287 8.287 0 009 9.6a8.983 8.983 0 013.361-6.867 8.21 8.25 0 003 2.48z" />
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M12 18a3.75 3.75 0 00.495-7.467 5.99 5.99 0 00-1.925 3.546 5.974 5.974 0 01-2.133-1A3.75 3.75 0 0012 18z" />
+                            </svg>
+                        </div>
+                        <h2 class="card-title text-2xl font-bold">"VibeTorrent"</h2>
+                        <p class="text-base-content/60 text-sm">"Hesabınıza giriş yapın"</p>
+                    </div>
 
-                    <form on:submit=handle_login>
-                        <div class="form-control w-full">
+                    <form on:submit=handle_login class="space-y-4">
+                        <div class="form-control">
                             <label class="label">
                                 <span class="label-text">"Kullanıcı Adı"</span>
                             </label>
-                            <input
-                                type="text"
-                                placeholder="Kullanıcı adınız"
-                                class="input input-bordered w-full"
-                                prop:value=username
-                                on:input=move |ev| set_username.set(event_target_value(&ev))
-                                disabled=move || loading.get()
+                            <input 
+                                type="text" 
+                                placeholder="Kullanıcı adınız" 
+                                class="input input-bordered w-full" 
+                                prop:value=move || username.0.get()
+                                on:input=move |ev| username.1.set(event_target_value(&ev))
+                                disabled=move || loading.0.get()
+                                required 
                             />
                         </div>
-
-                        <div class="form-control w-full mt-4">
+                        <div class="form-control">
                             <label class="label">
                                 <span class="label-text">"Şifre"</span>
                             </label>
-                            <input
-                                type="password"
-                                placeholder="******"
-                                class="input input-bordered w-full"
-                                prop:value=password
-                                on:input=move |ev| set_password.set(event_target_value(&ev))
-                                disabled=move || loading.get()
+                            <input 
+                                type="password" 
+                                placeholder="******" 
+                                class="input input-bordered w-full" 
+                                prop:value=move || password.0.get()
+                                on:input=move |ev| password.1.set(event_target_value(&ev))
+                                disabled=move || loading.0.get()
+                                required 
                             />
                         </div>
 
-                        <div class="form-control mt-4">
+                        <div class="form-control">
                             <label class="label cursor-pointer justify-start gap-3">
-                                <input
-                                    type="checkbox"
-                                    class="checkbox checkbox-primary checkbox-sm"
-                                    prop:checked=remember_me
-                                    on:change=move |ev| set_remember_me.set(event_target_checked(&ev))
-                                    disabled=move || loading.get()
+                                <input 
+                                    type="checkbox" 
+                                    class="checkbox checkbox-primary checkbox-sm" 
+                                    prop:checked=move || remember_me.0.get()
+                                    on:change=move |ev| remember_me.1.set(event_target_checked(&ev))
                                 />
-                                <span class="label-text">"Beni Hatırla"</span>
+                                <span class="label-text">"Beni hatırla"</span>
                             </label>
                         </div>
 
-                        <Show when=move || error.get().is_some()>
-                            <div class="alert alert-error mt-4 text-sm py-2">
-                                <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
-                                <span>{move || error.get()}</span>
+                        <Show when=move || error.0.get().is_some() fallback=|| ()>
+                            <div class="alert alert-error text-xs py-2 shadow-sm">
+                                <span>{move || error.0.get().unwrap_or_default()}</span>
                             </div>
                         </Show>
 
-                        <div class="card-actions justify-end mt-6">
-                            <button
-                                class="btn btn-primary w-full"
+                        <div class="form-control mt-6">
+                            <button 
+                                class="btn btn-primary w-full" 
                                 type="submit"
-                                disabled=move || loading.get()
+                                disabled=move || loading.0.get()
                             >
-                                <Show when=move || loading.get() fallback=|| "Giriş Yap">
+                                <Show when=move || loading.0.get() fallback=|| "Giriş Yap">
                                     <span class="loading loading-spinner"></span>
-                                    "Giriş Yapılıyor..."
                                 </Show>
                             </button>
                         </div>
@@ -130,4 +116,4 @@ pub fn Login() -> impl IntoView {
             </div>
         </div>
     }
-}
+}

frontend/src/components/auth/setup.rs

@@ -1,66 +1,49 @@
-use leptos::*;
-use serde::Serialize;
-
-#[derive(Serialize)]
-struct SetupRequest {
-    username: String,
-    password: String,
-}
+use leptos::prelude::*;
+use leptos::task::spawn_local;
+use crate::api;
 
 #[component]
 pub fn Setup() -> impl IntoView {
-    let (username, set_username) = create_signal(String::new());
-    let (password, set_password) = create_signal(String::new());
-    let (confirm_password, set_confirm_password) = create_signal(String::new());
-    let (error, set_error) = create_signal(Option::<String>::None);
-    let (loading, set_loading) = create_signal(false);
+    let username = signal(String::new());
+    let password = signal(String::new());
+    let confirm_password = signal(String::new());
+    let error = signal(Option::<String>::None);
+    let loading = signal(false);
 
     let handle_setup = move |ev: web_sys::SubmitEvent| {
         ev.prevent_default();
-        set_loading.set(true);
-        set_error.set(None);
-
-        let pass = password.get();
-        let confirm = confirm_password.get();
-
+        
+        let pass = password.0.get();
+        let confirm = confirm_password.0.get();
+        
         if pass != confirm {
-            set_error.set(Some("Şifreler eşleşmiyor".to_string()));
-            set_loading.set(false);
+            error.1.set(Some("Şifreler eşleşmiyor".to_string()));
             return;
         }
 
         if pass.len() < 6 {
-            set_error.set(Some("Şifre en az 6 karakter olmalıdır".to_string()));
-            set_loading.set(false);
+            error.1.set(Some("Şifre en az 6 karakter olmalıdır".to_string()));
             return;
         }
 
+        loading.1.set(true);
+        error.1.set(None);
+
+        let user = username.0.get();
+
         spawn_local(async move {
-            let req = SetupRequest {
-                username: username.get(),
-                password: pass,
-            };
-
-            let client = gloo_net::http::Request::post("/api/setup")
-                .json(&req)
-                .expect("Failed to create request");
-
-            match client.send().await {
-                Ok(resp) => {
-                    if resp.ok() {
-                        // Redirect to home after setup (auto-login handled by backend)
-                        // Full reload to ensure auth state is refreshed
-                        let _ = window().location().set_href("/");
-                    } else {
-                        let text = resp.text().await.unwrap_or_default();
-                        set_error.set(Some(format!("Hata: {}", text)));
-                    }
+            match api::setup::setup(&user, &pass).await {
+                Ok(_) => {
+                    log::info!("Setup completed successfully, redirecting...");
+                    let window = web_sys::window().expect("window should exist");
+                    let _ = window.location().set_href("/");
                 }
-                Err(_) => {
-                    set_error.set(Some("Bağlantı hatası".to_string()));
+                Err(e) => {
+                    log::error!("Setup failed: {:?}", e);
+                    error.1.set(Some(format!("Hata: {:?}", e)));
+                    loading.1.set(false);
                 }
             }
-            set_loading.set(false);
         });
     };
 
@@ -68,71 +51,74 @@ pub fn Setup() -> impl IntoView {
         <div class="flex items-center justify-center min-h-screen bg-base-200">
             <div class="card w-full max-w-md shadow-xl bg-base-100">
                 <div class="card-body">
-                    <h2 class="card-title justify-center mb-2">"VibeTorrent Kurulumu"</h2>
-                    <p class="text-center text-sm opacity-70 mb-4">"Yönetici hesabınızı oluşturun"</p>
+                    <div class="flex flex-col items-center mb-6 text-center">
+                        <div class="w-16 h-16 bg-primary rounded-2xl flex items-center justify-center text-primary-content shadow-lg mb-4">
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-10 h-10">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M11.42 15.17L17.25 21A2.652 2.652 0 0021 17.25l-5.877-5.877M11.42 15.17l2.496-3.03c.317-.384.74-.626 1.208-.766M11.42 15.17l-4.655 5.653a2.548 2.548 0 11-3.586-3.586l6.837-5.63m5.108-3.497a2.548 2.548 0 113.586 3.586l-6.837 5.63m-5.108 3.497l2.496-3.03c.317-.384.74-.626 1.208-.766M15.75 9.25a2.548 2.548 0 11-5.096 0 2.548 2.548 0 015.096 0z" />
+                            </svg>
+                        </div>
+                        <h2 class="card-title text-2xl font-bold">"VibeTorrent Kurulumu"</h2>
+                        <p class="text-base-content/60 text-sm">"Yönetici hesabınızı oluşturun"</p>
+                    </div>
 
-                    <form on:submit=handle_setup>
-                        <div class="form-control w-full">
+                    <form on:submit=handle_setup class="space-y-4">
+                        <div class="form-control">
                             <label class="label">
-                                <span class="label-text">"Kullanıcı Adı"</span>
+                                <span class="label-text">"Yönetici Kullanıcı Adı"</span>
                             </label>
-                            <input
-                                type="text"
-                                placeholder="admin"
-                                class="input input-bordered w-full"
-                                prop:value=username
-                                on:input=move |ev| set_username.set(event_target_value(&ev))
-                                disabled=move || loading.get()
-                                required
+                            <input 
+                                type="text" 
+                                placeholder="admin" 
+                                class="input input-bordered w-full" 
+                                prop:value=move || username.0.get()
+                                on:input=move |ev| username.1.set(event_target_value(&ev))
+                                disabled=move || loading.0.get()
+                                required 
                             />
                         </div>
-
-                        <div class="form-control w-full mt-4">
+                        <div class="form-control">
                             <label class="label">
                                 <span class="label-text">"Şifre"</span>
                             </label>
-                            <input
-                                type="password"
-                                placeholder="******"
-                                class="input input-bordered w-full"
-                                prop:value=password
-                                on:input=move |ev| set_password.set(event_target_value(&ev))
-                                disabled=move || loading.get()
-                                required
+                            <input 
+                                type="password" 
+                                placeholder="******" 
+                                class="input input-bordered w-full" 
+                                prop:value=move || password.0.get()
+                                on:input=move |ev| password.1.set(event_target_value(&ev))
+                                disabled=move || loading.0.get()
+                                required 
                             />
                         </div>
-
-                        <div class="form-control w-full mt-4">
+                        <div class="form-control">
                             <label class="label">
-                                <span class="label-text">"Şifre Tekrar"</span>
+                                <span class="label-text">"Şifre Onay"</span>
                             </label>
-                            <input
-                                type="password"
-                                placeholder="******"
-                                class="input input-bordered w-full"
-                                prop:value=confirm_password
-                                on:input=move |ev| set_confirm_password.set(event_target_value(&ev))
-                                disabled=move || loading.get()
-                                required
+                            <input 
+                                type="password" 
+                                placeholder="******" 
+                                class="input input-bordered w-full" 
+                                prop:value=move || confirm_password.0.get()
+                                on:input=move |ev| confirm_password.1.set(event_target_value(&ev))
+                                disabled=move || loading.0.get()
+                                required 
                             />
                         </div>
 
-                        <Show when=move || error.get().is_some()>
-                            <div class="alert alert-error mt-4 text-sm py-2">
-                                <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
-                                <span>{move || error.get()}</span>
+                        <Show when=move || error.0.get().is_some() fallback=|| ()>
+                            <div class="alert alert-error text-xs py-2 shadow-sm">
+                                <span>{move || error.0.get().unwrap_or_default()}</span>
                             </div>
                         </Show>
 
-                        <div class="card-actions justify-end mt-6">
-                            <button
-                                class="btn btn-primary w-full"
+                        <div class="form-control mt-6">
+                            <button 
+                                class="btn btn-primary w-full" 
                                 type="submit"
-                                disabled=move || loading.get()
+                                disabled=move || loading.0.get()
                             >
-                                <Show when=move || loading.get() fallback=|| "Kurulumu Tamamla">
+                                <Show when=move || loading.0.get() fallback=|| "Kurulumu Tamamla">
                                     <span class="loading loading-spinner"></span>
-                                    "İşleniyor..."
                                 </Show>
                             </button>
                         </div>
@@ -141,4 +127,4 @@ pub fn Setup() -> impl IntoView {
             </div>
         </div>
     }
-}
+}

frontend/src/components/context_menu.rs

@@ -1,95 +1,97 @@
-use leptos::*;
+use leptos::prelude::*;
+use leptos::html;
 use leptos_use::on_click_outside;
 
+fn handle_action(
+    hash: String,
+    action: &str,
+    on_action: Callback<(String, String)>,
+    on_close: Callback<()>,
+) {
+    log::info!("ContextMenu: Action '{}' for hash '{}'", action, hash);
+    on_action.run((action.to_string(), hash));
+    on_close.run(());
+}
+
 #[component]
 pub fn ContextMenu(
     position: (i32, i32),
-    visible: bool,
     torrent_hash: String,
     on_close: Callback<()>,
-    on_action: Callback<(String, String)>, // (Action, Hash)
+    on_action: Callback<(String, String)>,
 ) -> impl IntoView {
-    let container_ref = create_node_ref::<html::Div>();
+    let container_ref = NodeRef::<html::Div>::new();
     
-    let _ = on_click_outside(container_ref, move |_| on_close.call(()));
+    let _ = on_click_outside(container_ref, move |_| on_close.run(()));
 
-    let handle_action = move |action: &str| {
-        let hash = torrent_hash.clone();
-        let action_str = action.to_string();
-        
-        logging::log!("ContextMenu: Action '{}' for hash '{}'", action_str, hash);
-        on_action.call((action_str, hash)); // Delegate FIRST
-        on_close.call(()); // Close menu AFTER
-    };
-
-    if !visible {
-        return view! {}.into_view();
-    }
+    let (x, y) = position;
+    
+    let hash1 = torrent_hash.clone();
+    let hash2 = torrent_hash.clone();
+    let hash3 = torrent_hash.clone();
+    let hash4 = torrent_hash.clone();
+    let hash5 = torrent_hash;
 
     view! {
         <div 
             node_ref=container_ref
             class="fixed z-[100] min-w-[200px] animate-in fade-in zoom-in-95 duration-100"
-            style=format!("left: {}px; top: {}px", position.0, position.1)
+            style=format!("left: {}px; top: {}px;", x, y)
             on:contextmenu=move |e| e.prevent_default()
         >
-            <ul class="menu bg-base-200 text-base-content rounded-box shadow-xl border border-white/5 p-2 gap-1">
-
-                
+            <ul class="menu bg-base-200 shadow-xl rounded-box border border-base-300 p-1 gap-0.5">
                 <li>
-                    <button 
-                        class="gap-3 active:bg-primary active:text-primary-content"
-                        on:click={
-                            let handle_action = handle_action.clone();
-                            move |_| handle_action("start")
-                        }
-                    >
-                        <svg class="w-4 h-4 text-success" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M14.752 11.168l-3.197-2.132A1 1 0 0010 9.87v4.263a1 1 0 001.555.832l3.197-2.132a1 1 0 000-1.664z" /><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 12a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
-                        "Resume"
+                    <button class="flex items-center gap-3 px-3 py-2 hover:bg-primary hover:text-primary-content rounded-lg transition-colors" on:click=move |_| {
+                        handle_action(hash1.clone(), "start", on_action.clone(), on_close.clone());
+                    }>
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z" />
+                        </svg>
+                        <span>"Start"</span>
                     </button>
                 </li>
-
-                <li>    
-                    <button 
-                        class="gap-3 active:bg-primary active:text-primary-content"
-                        on:click={
-                            let handle_action = handle_action.clone();
-                            move |_| handle_action("stop")
-                        }
-                    >
-                        <svg class="w-4 h-4 text-warning" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 9v6m4-6v6m7-3a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
-                        "Pause"
+                <li>
+                    <button class="flex items-center gap-3 px-3 py-2 hover:bg-primary hover:text-primary-content rounded-lg transition-colors" on:click=move |_| {
+                        handle_action(hash2.clone(), "stop", on_action.clone(), on_close.clone());
+                    }>
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 5.25v13.5m-7.5-13.5v13.5" />
+                        </svg>
+                        <span>"Stop"</span>
                     </button>
                 </li>
-                
-                <div class="divider my-0 h-px p-0 opacity-10"></div>
-                
                 <li>
-                    <button 
-                        class="gap-3 text-error hover:bg-error/10 active:bg-error active:text-error-content"
-                        on:click={
-                            let handle_action = handle_action.clone();
-                            move |_| handle_action("delete")
-                        }
-                    >
-                        <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" /></svg>
-                        "Delete"
+                    <button class="flex items-center gap-3 px-3 py-2 hover:bg-primary hover:text-primary-content rounded-lg transition-colors" on:click=move |_| {
+                        handle_action(hash3.clone(), "recheck", on_action.clone(), on_close.clone());
+                    }>
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0l3.181 3.183a8.25 8.25 0 0013.803-3.7M4.031 9.865a8.25 8.25 0 0113.803-3.7l3.181 3.182m0-4.991v4.99" />
+                        </svg>
+                        <span>"Recheck"</span>
                     </button>
                 </li>
-                
+                <div class="divider my-0.5 opacity-50"></div>
                 <li>
-                    <button 
-                        class="gap-3 text-error hover:bg-error/10 active:bg-error active:text-error-content text-xs"
-                        on:click={
-                            let handle_action = handle_action.clone();
-                            move |_| handle_action("delete_with_data")
-                        }
-                    >
-                        <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 10V3L4 14h7v7l9-11h-7z" /></svg>
-                        <span>"Delete with Data"</span>
+                    <button class="flex items-center gap-3 px-3 py-2 text-error hover:bg-error hover:text-error-content rounded-lg transition-colors" on:click=move |_| {
+                        handle_action(hash4.clone(), "delete", on_action.clone(), on_close.clone());
+                    }>
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.164h-2.34c-1.18 0-2.09.984-2.09 2.164v.916m7.5 0a48.667 48.667 0 00-7.5 0" />
+                        </svg>
+                        <span>"Remove"</span>
+                    </button>
+                </li>
+                <li>
+                    <button class="flex items-center gap-3 px-3 py-2 text-error hover:bg-error hover:text-error-content rounded-lg transition-colors" on:click=move |_| {
+                        handle_action(hash5.clone(), "delete_with_data", on_action.clone(), on_close.clone());
+                    }>
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M20.25 7.5l-.625 10.632a2.25 2.25 0 01-2.247 2.118H6.622a2.25 2.25 0 01-2.247-2.118L3.75 7.5m6 4.125l2.25 2.25m0 0l2.25 2.25M12 13.875l2.25-2.25M12 13.875l-2.25-2.25M3.375 7.5h17.25c.621 0 1.125-.504 1.125-1.125v-1.5c0-.621-.504-1.125-1.125-1.125H3.375c-.621 0-1.125.504-1.125 1.125v1.5c0 .621.504 1.125 1.125 1.125z" />
+                        </svg>
+                        <span>"Remove Data"</span>
                     </button>
                 </li>
             </ul>
         </div>
-    }.into_view()
+    }
 }

frontend/src/components/layout/protected.rs

@@ -1,30 +1,32 @@
-use leptos::*;
+use leptos::prelude::*;
 use crate::components::layout::sidebar::Sidebar;
-use crate::components::layout::statusbar::StatusBar;
 use crate::components::layout::toolbar::Toolbar;
+use crate::components::layout::statusbar::StatusBar;
 
 #[component]
 pub fn Protected(children: Children) -> impl IntoView {
     view! {
         <div class="drawer lg:drawer-open h-full w-full">
             <input id="my-drawer" type="checkbox" class="drawer-toggle" />
-
-            <div class="drawer-content flex flex-col h-full overflow-hidden bg-base-100 text-base-content text-sm select-none">
+            
+            <div class="drawer-content flex flex-col h-full overflow-hidden bg-base-100">
+                // --- TOOLBAR (TOP) ---
                 <Toolbar />
-
-                <main class="flex-1 flex flex-col min-w-0 bg-base-100 overflow-hidden pb-8">
+                
+                // --- MAIN CONTENT ---
+                <main class="flex-1 overflow-hidden relative">
                     {children()}
                 </main>
 
+                // --- STATUS BAR (BOTTOM) ---
                 <StatusBar />
             </div>
 
-            <div class="drawer-side z-40 transition-none duration-0">
-                <label for="my-drawer" aria-label="close sidebar" class="drawer-overlay transition-none duration-0"></label>
-                <div class="menu p-0 min-h-full bg-base-200 text-base-content border-r border-base-300 transition-none duration-0">
-                    <Sidebar />
-                </div>
+            // --- SIDEBAR (DRAWER) ---
+            <div class="drawer-side z-[100]">
+                <label for="my-drawer" aria-label="close sidebar" class="drawer-overlay"></label>
+                <Sidebar />
             </div>
         </div>
     }
-}
+}

frontend/src/components/layout/sidebar.rs

@@ -1,56 +1,53 @@
+use leptos::prelude::*;
 use leptos::wasm_bindgen::JsCast;
-use leptos::*;
+use leptos::task::spawn_local;
+use crate::api;
 
 #[component]
 pub fn Sidebar() -> impl IntoView {
     let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
 
-    let total_count = move || store.torrents.get().len();
+    let total_count = move || store.torrents.with(|map| map.len());
     let downloading_count = move || {
-        store
-            .torrents
-            .get()
-            .iter()
-            .filter(|t| t.status == shared::TorrentStatus::Downloading)
-            .count()
+        store.torrents.with(|map| {
+            map.values()
+                .filter(|t| t.status == shared::TorrentStatus::Downloading)
+                .count()
+        })
     };
     let seeding_count = move || {
-        store
-            .torrents
-            .get()
-            .iter()
-            .filter(|t| t.status == shared::TorrentStatus::Seeding)
-            .count()
+        store.torrents.with(|map| {
+            map.values()
+                .filter(|t| t.status == shared::TorrentStatus::Seeding)
+                .count()
+        })
     };
     let completed_count = move || {
-        store
-            .torrents
-            .get()
-            .iter()
-            .filter(|t| {
-                t.status == shared::TorrentStatus::Seeding
-                    || (t.status == shared::TorrentStatus::Paused && t.percent_complete >= 100.0)
-            })
-            .count()
+        store.torrents.with(|map| {
+            map.values()
+                .filter(|t| {
+                    t.status == shared::TorrentStatus::Seeding
+                        || (t.status == shared::TorrentStatus::Paused && t.percent_complete >= 100.0)
+                })
+                .count()
+        })
     };
     let paused_count = move || {
-        store
-            .torrents
-            .get()
-            .iter()
-            .filter(|t| t.status == shared::TorrentStatus::Paused)
-            .count()
+        store.torrents.with(|map| {
+            map.values()
+                .filter(|t| t.status == shared::TorrentStatus::Paused)
+                .count()
+        })
     };
     let inactive_count = move || {
-        store
-            .torrents
-            .get()
-            .iter()
-            .filter(|t| {
-                t.status == shared::TorrentStatus::Paused
-                    || t.status == shared::TorrentStatus::Error
-            })
-            .count()
+        store.torrents.with(|map| {
+            map.values()
+                .filter(|t| {
+                    t.status == shared::TorrentStatus::Paused
+                        || t.status == shared::TorrentStatus::Error
+                })
+                .count()
+        })
     };
 
     let close_drawer = move || {
@@ -76,200 +73,105 @@ pub fn Sidebar() -> impl IntoView {
 
     let handle_logout = move |_| {
         spawn_local(async move {
-            let client = gloo_net::http::Request::post("/api/auth/logout");
-            if let Ok(resp) = client.send().await {
-                if resp.ok() {
-                    // Force full reload to clear state
-                    let _ = window().location().set_href("/login");
-                }
+            if api::auth::logout().await.is_ok() {
+                let window = web_sys::window().expect("window should exist");
+                let _ = window.location().set_href("/login");
             }
         });
     };
 
-                let username = move || {
-
-                    store.user.get().unwrap_or_else(|| "User".to_string())
-
-                };
-
-
-
-                let first_letter = move || {
-
-                    username().chars().next().unwrap_or('?').to_uppercase().to_string()
-
-                };
-
-
-
-                view! {
-
-                    <div class="w-64 min-h-[100dvh] flex flex-col bg-base-200 border-r border-base-300 pb-8" style="padding-top: env(safe-area-inset-top);">
-
-                        <div class="p-2 flex-1 overflow-y-auto">
-
-                            <ul class="menu w-full rounded-box gap-1">
-
-                                <li class="menu-title text-primary uppercase font-bold px-4">"Filters"</li>
-
-                                <li>
-
-                                    <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::All))} on:click=move |_| set_filter(crate::store::FilterStatus::All)>
-
-                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
-
-                                            <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5" />
-
-                                        </svg>
-
-                                        "All"
-
-                                        <span class="badge badge-sm badge-ghost ml-auto">{total_count}</span>
-
-                                    </button>
-
-                                </li>
-
-                                <li>
-
-                                    <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Downloading))} on:click=move |_| set_filter(crate::store::FilterStatus::Downloading)>
-
-                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
-
-                                            <path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5M16.5 12L12 16.5m0 0L7.5 12m4.5 4.5V3" />
-
-                                        </svg>
-
-                                        "Downloading"
-
-                                        <span class="badge badge-sm badge-ghost ml-auto">{downloading_count}</span>
-
-                                    </button>
-
-                                </li>
-
-                                <li>
-
-                                    <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Seeding))} on:click=move |_| set_filter(crate::store::FilterStatus::Seeding)>
-
-                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
-
-                                            <path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5m-13.5-9L12 3m0 0l4.5 4.5M12 3v13.5" />
-
-                                        </svg>
-
-                                        "Seeding"
-
-                                        <span class="badge badge-sm badge-ghost ml-auto">{seeding_count}</span>
-
-                                    </button>
-
-                                </li>
-
-                                <li>
-
-                                    <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Completed))} on:click=move |_| set_filter(crate::store::FilterStatus::Completed)>
-
-                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
-
-                                            <path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
-
-                                        </svg>
-
-                                        "Completed"
-
-                                        <span class="badge badge-sm badge-ghost ml-auto">{completed_count}</span>
-
-                                    </button>
-
-                                </li>
-
-                                <li>
-
-                                    <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Paused))} on:click=move |_| set_filter(crate::store::FilterStatus::Paused)>
-
-                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
-
-                                            <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 5.25v13.5m-7.5-13.5v13.5" />
-
-                                        </svg>
-
-                                        "Paused"
-
-                                        <span class="badge badge-sm badge-ghost ml-auto">{paused_count}</span>
-
-                                    </button>
-
-                                </li>
-
-                                <li>
-
-                                    <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Inactive))} on:click=move |_| set_filter(crate::store::FilterStatus::Inactive)>
-
-                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
-
-                                            <path stroke-linecap="round" stroke-linejoin="round" d="M18.364 18.364A9 9 0 005.636 5.636m12.728 12.728A9 9 0 015.636 5.636m12.728 12.728L5.636 5.636" />
-
-                                        </svg>
-
-                                        "Inactive"
-
-                                         <span class="badge badge-sm badge-ghost ml-auto">{inactive_count}</span>
-
-                                    </button>
-
-                                </li>
-
-                            </ul>
-
+    let username = move || {
+        store.user.get().unwrap_or_else(|| "User".to_string())
+    };
+
+    let first_letter = move || {
+        username().chars().next().unwrap_or('?').to_uppercase().to_string()
+    };
+
+    view! {
+        <div class="w-64 min-h-[100dvh] flex flex-col bg-base-200 border-r border-base-300 pb-8" style="padding-top: env(safe-area-inset-top);">
+            <div class="p-2 flex-1 overflow-y-auto">
+                <ul class="menu w-full rounded-box gap-1">
+                    <li class="menu-title text-primary uppercase font-bold px-4">"Filters"</li>
+                    <li>
+                        <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::All))} on:click=move |_| set_filter(crate::store::FilterStatus::All)>
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5" />
+                            </svg>
+                            "All"
+                            <span class="badge badge-sm badge-ghost ml-auto">{total_count}</span>
+                        </button>
+                    </li>
+                    <li>
+                        <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Downloading))} on:click=move |_| set_filter(crate::store::FilterStatus::Downloading)>
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5M16.5 12L12 16.5m0 0L7.5 12m4.5 4.5V3" />
+                            </svg>
+                            "Downloading"
+                            <span class="badge badge-sm badge-ghost ml-auto">{downloading_count}</span>
+                        </button>
+                    </li>
+                    <li>
+                        <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Seeding))} on:click=move |_| set_filter(crate::store::FilterStatus::Seeding)>
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5m-13.5-9L12 3m0 0l4.5 4.5M12 3v13.5" />
+                            </svg>
+                            "Seeding"
+                            <span class="badge badge-sm badge-ghost ml-auto">{seeding_count}</span>
+                        </button>
+                    </li>
+                    <li>
+                        <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Completed))} on:click=move |_| set_filter(crate::store::FilterStatus::Completed)>
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
+                            </svg>
+                            "Completed"
+                            <span class="badge badge-sm badge-ghost ml-auto">{completed_count}</span>
+                        </button>
+                    </li>
+                    <li>
+                        <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Paused))} on:click=move |_| set_filter(crate::store::FilterStatus::Paused)>
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 5.25v13.5m-7.5-13.5v13.5" />
+                            </svg>
+                            "Paused"
+                            <span class="badge badge-sm badge-ghost ml-auto">{paused_count}</span>
+                        </button>
+                    </li>
+                    <li>
+                        <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Inactive))} on:click=move |_| set_filter(crate::store::FilterStatus::Inactive)>
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M18.364 18.364A9 9 0 005.636 5.636m12.728 12.728A9 9 0 015.636 5.636m12.728 12.728L5.636 5.636" />
+                            </svg>
+                            "Inactive"
+                             <span class="badge badge-sm badge-ghost ml-auto">{inactive_count}</span>
+                        </button>
+                    </li>
+                </ul>
+            </div>
+
+            <div class="p-4 border-t border-base-300 bg-base-200/50">
+                <div class="flex items-center gap-3">
+                    <div class="avatar">
+                        <div class="w-8 rounded-full bg-neutral text-neutral-content ring ring-primary ring-offset-base-100 ring-offset-1">
+                            <span class="text-sm font-bold flex items-center justify-center h-full">{first_letter}</span>
                         </div>
-
-
-
-                        <div class="p-4 border-t border-base-300 bg-base-200/50">
-
-                            <div class="flex items-center gap-3">
-
-                                <div class="avatar">
-
-                                    <div class="w-8 rounded-full bg-neutral text-neutral-content ring ring-primary ring-offset-base-100 ring-offset-1">
-
-                                        <span class="text-sm font-bold flex items-center justify-center h-full">{first_letter}</span>
-
-                                    </div>
-
-                                </div>
-
-                                <div class="flex-1 overflow-hidden">
-
-                                    <div class="font-bold text-sm truncate">{username}</div>
-
-                                    <div class="text-[10px] text-base-content/60 truncate">"Online"</div>
-
-                                </div>
-
-                                <button
-
-                                    class="btn btn-ghost btn-xs btn-square text-error hover:bg-error/10"
-
-                                    title="Logout"
-
-                                    on:click=handle_logout
-
-                                >
-
-                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
-
-                                        <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 9V5.25A2.25 2.25 0 0013.5 3h-6a2.25 2.25 0 00-2.25 2.25v13.5A2.25 2.25 0 007.5 21h6a2.25 2.25 0 002.25-2.25V15M12 9l-3 3m0 0l3 3m-3-3h12.75" />
-
-                                    </svg>
-
-                                </button>
-
-                            </div>
-
-                        </div>
-
                     </div>
-
-                }}
+                    <div class="flex-1 overflow-hidden">
+                        <div class="font-bold text-sm truncate">{username}</div>
+                        <div class="text-[10px] text-base-content/60 truncate">"Online"</div>
+                    </div>
+                    <button
+                        class="btn btn-ghost btn-xs btn-square text-error hover:bg-error/10"
+                        title="Logout"
+                        on:click=handle_logout
+                    >
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 9V5.25A2.25 2.25 0 0013.5 3h-6a2.25 2.25 0 00-2.25 2.25v13.5A2.25 2.25 0 007.5 21h6a2.25 2.25 0 002.25-2.25V15M12 9l-3 3m0 0l3 3m-3-3h12.75" />
+                        </svg>
+                    </button>
+                </div>
+            </div>
+        </div>
+    }
+}

frontend/src/components/layout/statusbar.rs

@@ -1,7 +1,9 @@
-use leptos::*;
+use leptos::prelude::*;
+use leptos::html;
 use leptos_use::storage::use_local_storage;
-use codee::string::FromToStringCodec;
+use ::codee::string::FromToStringCodec;
 use shared::GlobalLimitRequest;
+use crate::api;
 
 fn format_bytes(bytes: i64) -> String {
     const UNITS: [&str; 6] = ["B", "KB", "MB", "GB", "TB", "PB"];
@@ -28,16 +30,16 @@ pub fn StatusBar() -> impl IntoView {
     let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
     let stats = store.global_stats;
 
-    // Use leptos-use for reactive localStorage management
     let (current_theme, set_current_theme, _) = use_local_storage::<String, FromToStringCodec>("vibetorrent_theme");
 
     // Initialize with default if empty
-    if current_theme.get_untracked().is_empty() {
+    let current_theme_val = current_theme.get();
+    if current_theme_val.is_empty() {
         set_current_theme.set("dark".to_string());
     }
 
     // Automatically sync theme to document attribute
-    create_effect(move |_| {
+    Effect::new(move |_| {
         let theme = current_theme.get().to_lowercase();
         if let Some(doc) = document().document_element() {
             let _ = doc.set_attribute("data-theme", &theme);
@@ -45,7 +47,7 @@ pub fn StatusBar() -> impl IntoView {
     });
 
     // Preset limits in bytes/s
-    let limits: Vec<(i64, &str)> = vec![
+    let limits: Vec<(i64, &str)> = vec!(
         (0, "Unlimited"),
         (100 * 1024, "100 KB/s"),
         (500 * 1024, "500 KB/s"),
@@ -54,55 +56,38 @@ pub fn StatusBar() -> impl IntoView {
         (5 * 1024 * 1024, "5 MB/s"),
         (10 * 1024 * 1024, "10 MB/s"),
         (20 * 1024 * 1024, "20 MB/s"),
-    ];
+    );
 
     let set_limit = move |limit_type: &str, val: i64| {
         let limit_type = limit_type.to_string();
-        logging::log!("Setting {} limit to {}", limit_type, val);
+        log::info!("Setting {} limit to {}", limit_type, val);
 
-        spawn_local(async move {
-            let req_body = if limit_type == "down" {
-                GlobalLimitRequest {
-                    max_download_rate: Some(val),
-                    max_upload_rate: None,
-                }
+        let req = if limit_type == "down" {
+            GlobalLimitRequest {
+                max_download_rate: Some(val),
+                max_upload_rate: None,
+            }
+        } else {
+            GlobalLimitRequest {
+                max_download_rate: None,
+                max_upload_rate: Some(val),
+            }
+        };
+
+        leptos::task::spawn_local(async move {
+            if let Err(e) = api::settings::set_global_limits(&req).await {
+                log::error!("Failed to set limit: {:?}", e);
             } else {
-                GlobalLimitRequest {
-                    max_download_rate: None,
-                    max_upload_rate: Some(val),
-                }
-            };
-
-            let client =
-                gloo_net::http::Request::post("/api/settings/global-limits").json(&req_body);
-
-            match client {
-                Ok(req) => match req.send().await {
-                    Ok(resp) => {
-                        if !resp.ok() {
-                            logging::error!(
-                                "Failed to set limit: {} {}",
-                                resp.status(),
-                                resp.status_text()
-                            );
-                        } else {
-                            logging::log!("Limit set successfully");
-                        }
-                    }
-                    Err(e) => logging::error!("Network error setting limit: {}", e),
-                },
-                Err(e) => logging::error!("Failed to create request: {}", e),
+                log::info!("Limit set successfully");
             }
         });
     };
 
-        // Refs for click outside detection (Handled globally via JS in index.html for better iOS support)
-        let down_details_ref = create_node_ref::<html::Details>();
-        let up_details_ref = create_node_ref::<html::Details>();
-        let theme_details_ref = create_node_ref::<html::Details>();
+        let down_details_ref = NodeRef::<html::Details>::new();
+        let up_details_ref = NodeRef::<html::Details>::new();
+        let theme_details_ref = NodeRef::<html::Details>::new();
 
-        // Helper to close a details element
-        let close_details = |node_ref: NodeRef<html::Details>| {
+        let close_details = move |node_ref: NodeRef<html::Details>| {
             if let Some(el) = node_ref.get_untracked() {
                 el.set_open(false);
             }
@@ -209,16 +194,19 @@ pub fn StatusBar() -> impl IntoView {
                                     "light", "dark", "dim", "nord", "cupcake", "dracula", "cyberpunk", "emerald", "sunset", "abyss"
                                 ];
                                 themes.into_iter().map(|theme| {
+                                    let theme_name = theme.to_string();
+                                    let theme_name_for_class = theme_name.clone();
+                                    let theme_name_for_onclick = theme_name.clone();
                                     view! {
                                         <li>
                                             <button
-                                                class=move || if current_theme.get() == theme { "bg-primary/10 text-primary font-bold text-xs capitalize" } else { "text-xs capitalize" }
+                                                class=move || if current_theme.get() == theme_name_for_class { "bg-primary/10 text-primary font-bold text-xs capitalize" } else { "text-xs capitalize" }
                                                 on:click=move |_| {
-                                                    set_current_theme.set(theme.to_string());
+                                                    set_current_theme.set(theme_name_for_onclick.clone());
                                                     close_details(theme_details_ref);
                                                 }
                                             >
-                                                {theme}
+                                                {theme_name}
                                             </button>
                                         </li>
                                     }
@@ -231,7 +219,7 @@ pub fn StatusBar() -> impl IntoView {
                     title="Settings & Notification Permissions"
                     on:click=move |_| {
                         // Request push notification permission when settings button is clicked
-                        spawn_local(async {
+                        leptos::task::spawn_local(async {
                             log::info!("Settings button clicked - requesting push notification permission");
 
                             // Check current permission state before requesting
@@ -276,11 +264,11 @@ pub fn StatusBar() -> impl IntoView {
                     }
                 >
                      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
-                        <path stroke-linecap="round" stroke-linejoin="round" d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.324.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 011.37.49l1.296 2.247a1.125 1.125 0 01-.26 1.431l-1.003.827c-.293.24-.438.613-.431.992a6.759 6.759 0 010 .255c-.007.378.138.75.43.99l1.005.828c.424.35.534.954.26 1.43l-1.298 2.247a1.125 1.125 0 01-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.57 6.57 0 01-.22.128c-.331.183-.581.495-.644.869l-.212 1.28c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.02-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 01-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 01-1.369-.49l-1.297-2.247a1.125 1.125 0 01.26-1.431l1.004-.827c.292-.24.437-.613.43-.992a6.932 6.932 0 010-.255c.007-.378-.138-.75-.43-.99l-1.004-.828a1.125 1.125 0 01-.26-1.43l1.297-2.247a1.125 1.125 0 011.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.087.22-.128.332-.183.582-.495.644-.869l.214-1.281z" />
+                        <path stroke-linecap="round" stroke-linejoin="round" d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.324.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 011.37.49l1.296 2.247a1.125 1.125 0 01-.26 1.431l-1.003.827c-.293.24-.438.613-.431.992a6.759 6.759 0 010 .255c-.007.378.138.75.43.99l1.005.828c.424.35.534.954.26 1.43l-1.298 2.247a1.125 1.125 0 01-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.57 6.57 0 01-.22.128c-.331.183-.581.495-.644.869l-.212 1.28c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.02-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 01-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 01-1.369-.49l-1.297-2.247a1.125 1.125 0 012.6-1.431l1.004-.827c.292-.24.437-.613.43-.992a6.932 6.932 0 010-.255c.007-.378-.138-.75-.43-.99l-1.004-.828a1.125 1.125 0 01-.26-1.43l1.297-2.247a1.125 1.125 0 011.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.087.22-.128.332-.183.582-.495.644-.869l.214-1.281z" />
                         <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
                     </svg>
                 </button>
             </div>
         </div>
     }
-}
+}

frontend/src/components/layout/toolbar.rs

@@ -1,8 +1,9 @@
-use leptos::*;
+use leptos::prelude::*;
+use crate::components::torrent::add_torrent::AddTorrentDialog;
 
 #[component]
 pub fn Toolbar() -> impl IntoView {
-    let (show_add_modal, set_show_add_modal) = create_signal(false);
+    let show_add_modal = signal(false);
     let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
 
     view! {
@@ -11,54 +12,48 @@ pub fn Toolbar() -> impl IntoView {
                 <label for="my-drawer" class="btn btn-square btn-ghost lg:hidden drawer-button">
                     <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="inline-block w-5 h-5 stroke-current"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16"></path></svg>
                 </label>
-
-                <div class="flex gap-2">
-                    <button
-                        class="btn btn-sm btn-primary gap-2 font-normal"
-                        title="Add Magnet Link"
-                        on:click=move |_| set_show_add_modal.set(true)
+                
+                <div class="flex items-center gap-3">
+                    <button 
+                        class="btn btn-primary btn-sm md:btn-md gap-2 shadow-md hover:shadow-primary/20 transition-all"
+                        on:click=move |_| show_add_modal.1.set(true)
                     >
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="w-4 h-4 md:w-5 md:h-5">
                             <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
                         </svg>
-                         "Add Torrent"
+                        <span class="hidden sm:inline">"Add Torrent"</span>
+                        <span class="sm:hidden">"Add"</span>
                     </button>
                 </div>
-
-
             </div>
 
-            <div class="navbar-end gap-2 px-4">
-                 <div class="join">
-                    <input
-                        type="text"
-                        placeholder="Search..."
-                        class="input input-sm input-bordered join-item w-full max-w-xs focus:outline-none"
-                        prop:value=move || store.search_query.get()
-                        on:input=move |ev| store.search_query.set(event_target_value(&ev))
-                        on:keydown=move |ev: web_sys::KeyboardEvent| {
-                            if ev.key() == "Escape" {
-                                store.search_query.set(String::new());
-                            }
-                        }
-                    />
-                    <Show when=move || !store.search_query.get().is_empty()>
-                        <button
-                            class="btn btn-sm btn-ghost join-item border-base-content/20 border-l-0 px-2"
-                            title="Clear Search"
-                            on:click=move |_| store.search_query.set(String::new())
-                        >
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4 opacity-70">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
-                            </svg>
-                        </button>
-                    </Show>
-                 </div>
+            <div class="navbar-center hidden md:flex">
+                <div class="join shadow-sm border border-base-200">
+                    <div class="relative">
+                        <input 
+                            type="text" 
+                            placeholder="Search..." 
+                            class="input input-sm input-bordered join-item w-full max-w-xs focus:outline-none" 
+                            prop:value=move || store.search_query.get()
+                            on:input=move |ev| store.search_query.set(event_target_value(&ev))
+                        />
+                        <Show when=move || !store.search_query.get().is_empty()>
+                            <button 
+                                class="absolute right-2 top-1/2 -translate-y-1/2 btn btn-ghost btn-xs btn-circle"
+                                on:click=move |_| store.search_query.set(String::new())
+                            >
+                                "×"
+                            </button>
+                        </Show>
+                    </div>
+                </div>
             </div>
 
-            <Show when=move || show_add_modal.get()>
-                <crate::components::torrent::add_torrent::AddTorrentModal on_close=move |_| set_show_add_modal.set(false) />
-            </Show>
+            <div class="navbar-end px-4 gap-2">
+                <Show when=move || show_add_modal.0.get()>
+                    <AddTorrentDialog on_close=Callback::new(move |()| show_add_modal.1.set(false)) />
+                </Show>
+            </div>
         </div>
     }
-}
+}

frontend/src/components/mod.rs

@@ -1,6 +1,5 @@
 pub mod context_menu;
 pub mod layout;
-pub mod modal;
 pub mod toast;
 pub mod torrent;
 pub mod auth;

frontend/src/components/modal.rs

@@ -1,56 +0,0 @@
-use leptos::*;
-
-#[component]
-pub fn Modal(
-    #[prop(into)] title: String,
-    children: Children,
-    #[prop(into)] on_confirm: Callback<()>,
-    #[prop(into)] on_cancel: Callback<()>,
-    #[prop(into)] visible: Signal<bool>,
-    #[prop(into, default = "Confirm".to_string())] confirm_text: String,
-    #[prop(into, default = "Cancel".to_string())] cancel_text: String,
-    #[prop(into, default = false)] is_danger: bool,
-) -> impl IntoView {
-    let title = store_value(title);
-    // Eagerly render children to a Fragment, which is Clone
-    let child_view = store_value(children());
-    let on_confirm = store_value(on_confirm);
-    let on_cancel = store_value(on_cancel);
-    let confirm_text = store_value(confirm_text);
-    let cancel_text = store_value(cancel_text);
-    
-    view! {
-        <Show when=move || visible.get() fallback=|| ()>
-            <div class="fixed inset-0 bg-background/80 backdrop-blur-sm flex items-end md:items-center justify-center z-[200] animate-in fade-in duration-200 sm:p-4">
-                <div class="bg-card p-6 rounded-t-2xl md:rounded-lg w-full max-w-sm shadow-xl border border-border ring-0 transform transition-all animate-in slide-in-from-bottom-10 md:slide-in-from-bottom-0 md:zoom-in-95">
-                    <h3 class="text-lg font-semibold text-card-foreground mb-4">{title.get_value()}</h3>
-                    
-                    <div class="text-muted-foreground mb-6 text-sm">
-                        {child_view.with_value(|c| c.clone())}
-                    </div>
-                    
-                    <div class="flex justify-end gap-3">
-                        <button 
-                            class="inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border border-input bg-background hover:bg-accent hover:text-accent-foreground h-10 px-4 py-2"
-                            on:click=move |_| on_cancel.with_value(|cb| cb.call(()))
-                        >
-                            {cancel_text.get_value()}
-                        </button>
-                        <button 
-                            class=move || crate::utils::cn(format!("inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 h-10 px-4 py-2 {}", 
-                                if is_danger { "bg-destructive text-destructive-foreground hover:bg-destructive/90" } 
-                                else { "bg-primary text-primary-foreground hover:bg-primary/90" }
-                            ))
-                            on:click=move |_| {
-                                logging::log!("Modal: Confirm clicked");
-                                on_confirm.with_value(|cb| cb.call(()))
-                            }
-                        >
-                            {confirm_text.get_value()}
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </Show>
-    }
-}

frontend/src/components/toast.rs

@@ -1,4 +1,4 @@
-use leptos::*;
+use leptos::prelude::*;
 use shared::NotificationLevel;
 
 // ============================================================================
@@ -29,22 +29,22 @@ fn ToastItem(
             <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="stroke-current shrink-0 w-6 h-6">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>
             </svg>
-        }.into_view(),
+        }.into_any(),
         NotificationLevel::Success => view! {
             <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"></path>
             </svg>
-        }.into_view(),
+        }.into_any(),
         NotificationLevel::Warning => view! {
             <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"></path>
             </svg>
-        }.into_view(),
+        }.into_any(),
         NotificationLevel::Error => view! {
             <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z"></path>
             </svg>
-        }.into_view(),
+        }.into_any(),
     };
     
     view! {

frontend/src/components/torrent/add_torrent.rs

@@ -1,126 +1,108 @@
-use leptos::*;
-use leptos::html::Dialog;
-use crate::store::{show_toast_with_signal, TorrentStore};
-use shared::{AddTorrentRequest, NotificationLevel};
-
+use leptos::prelude::*;
+use leptos::html;
+use leptos::task::spawn_local;
+use crate::store::TorrentStore;
+use crate::api;
 
 #[component]
-pub fn AddTorrentModal(
-    #[prop(into)]
+pub fn AddTorrentDialog(
     on_close: Callback<()>,
 ) -> impl IntoView {
     let store = use_context::<TorrentStore>().expect("TorrentStore not provided");
     let notifications = store.notifications;
-    
-    let dialog_ref = create_node_ref::<Dialog>();
-    let (uri, set_uri) = create_signal(String::new());
-    let (is_loading, set_loading) = create_signal(false);
-    let (error_msg, set_error_msg) = create_signal(Option::<String>::None);
 
-    // Effect to open the dialog when the component mounts/renders
-    create_effect(move |_| {
+    let dialog_ref = NodeRef::<html::Dialog>::new();
+    let uri = signal(String::new());
+    let is_loading = signal(false);
+    let error_msg = signal(Option::<String>::None);
+
+    Effect::new(move |_| {
         if let Some(dialog) = dialog_ref.get() {
             let _ = dialog.show_modal();
         }
     });
 
-    let handle_submit = move |_| {
-        let uri_val = uri.get();
+    let handle_submit = move |ev: web_sys::SubmitEvent| {
+        ev.prevent_default();
+        let uri_val = uri.0.get();
+        
         if uri_val.is_empty() {
-            show_toast_with_signal(notifications, NotificationLevel::Warning, "Lütfen bir Magnet URI veya URL girin");
-            set_error_msg.set(Some("Please enter a Magnet URI or URL".to_string()));
+            error_msg.1.set(Some("Please enter a Magnet URI or URL".to_string()));
             return;
         }
 
-        set_loading.set(true);
-        set_error_msg.set(None);
+        is_loading.1.set(true);
+        error_msg.1.set(None);
 
+        let on_close = on_close.clone();
         spawn_local(async move {
-            let req_body = AddTorrentRequest { uri: uri_val };
-
-            match gloo_net::http::Request::post("/api/torrents/add")
-                .json(&req_body)
-            {
-                Ok(req) => {
-                    match req.send().await {
-                        Ok(resp) => {
-                            if resp.ok() {
-                                logging::log!("Torrent added successfully");
-                                show_toast_with_signal(notifications, NotificationLevel::Success, "Torrent eklendi");
-                                set_loading.set(false);
-                                if let Some(dialog) = dialog_ref.get() {
-                                    dialog.close();
-                                }
-                                on_close.call(());
-                            } else {
-                                let status = resp.status();
-                                let text = resp.text().await.unwrap_or_default();
-                                logging::error!("Failed to add torrent: {} - {}", status, text);
-                                show_toast_with_signal(notifications, NotificationLevel::Error, "Torrent eklenemedi");
-                                set_error_msg.set(Some(format!("Error {}: {}", status, text)));
-                                set_loading.set(false);
-                            }
-                        }
-                        Err(e) => {
-                            logging::error!("Network error: {}", e);
-                            show_toast_with_signal(notifications, NotificationLevel::Error, "Bağlantı hatası");
-                            set_error_msg.set(Some(format!("Network Error: {}", e)));
-                            set_loading.set(false);
-                        }
+            match api::torrent::add(&uri_val).await {
+                Ok(_) => {
+                    log::info!("Torrent added successfully");
+                    crate::store::show_toast_with_signal(
+                        notifications, 
+                        shared::NotificationLevel::Success, 
+                        "Torrent başarıyla eklendi"
+                    );
+                    if let Some(dialog) = dialog_ref.get() {
+                        dialog.close();
                     }
+                    on_close.run(());
                 }
                 Err(e) => {
-                    logging::error!("Serialization error: {}", e);
-                    show_toast_with_signal(notifications, NotificationLevel::Error, "İstek hatası");
-                    set_error_msg.set(Some(format!("Request Error: {}", e)));
-                    set_loading.set(false);
+                    log::error!("Failed to add torrent: {:?}", e);
+                    error_msg.1.set(Some(format!("Hata: {:?}", e)));
+                    is_loading.1.set(false);
                 }
             }
         });
     };
 
-    let handle_close = move |_| {
+    let handle_cancel = move |_| {
         if let Some(dialog) = dialog_ref.get() {
             dialog.close();
         }
-        on_close.call(());
+        on_close.run(());
     };
 
     view! {
         <dialog node_ref=dialog_ref class="modal modal-bottom sm:modal-middle">
             <div class="modal-box">
                 <h3 class="font-bold text-lg">"Add Torrent"</h3>
-                <p class="py-4">"Enter a Magnet URI or direct URL to a .torrent file."</p>
+                <p class="py-4 text-sm opacity-70">"Enter a Magnet link or a .torrent file URL."</p>
                 
-                <div class="form-control w-full">
-                    <input 
-                        type="text" 
-                        placeholder="magnet:?xt=urn:btih:..." 
-                        class="input input-bordered w-full" 
-                        prop:value=uri
-                        on:input=move |ev| set_uri.set(event_target_value(&ev))
-                        disabled=is_loading
-                    />
-                </div>
+                <form on:submit=handle_submit>
+                    <div class="form-control w-full">
+                        <input 
+                            type="text" 
+                            placeholder="magnet:?xt=urn:btih:..." 
+                            class="input input-bordered w-full" 
+                            prop:value=move || uri.0.get()
+                            on:input=move |ev| uri.1.set(event_target_value(&ev))
+                            disabled=move || is_loading.0.get()
+                            autofocus
+                        />
+                    </div>
+                    
+                    <div class="modal-action">
+                        <button type="button" class="btn btn-ghost" on:click=handle_cancel>"Cancel"</button>
+                        <button type="submit" class="btn btn-primary" disabled=move || is_loading.0.get()>
+                            {move || if is_loading.0.get() {
+                                leptos::either::Either::Left(view! { <span class="loading loading-spinner"></span> "Adding..." })
+                            } else {
+                                leptos::either::Either::Right(view! { "Add" })
+                            }}
+                        </button>
+                    </div>
+                </form>
 
-                <div class="modal-action">
-                    <button class="btn" on:click=handle_close disabled=is_loading>"Cancel"</button>
-                    <button class="btn btn-primary" on:click=handle_submit disabled=is_loading>
-                        {move || if is_loading.get() {
-                            view! { <span class="loading loading-spinner"></span> "Adding..." }.into_view()
-                        } else {
-                            view! { "Add" }.into_view()
-                        }}
-                    </button>
-                </div>
-                
-                {move || error_msg.get().map(|msg| view! {
+                {move || error_msg.0.get().map(|msg| view! {
                     <div class="text-error text-sm mt-2">{msg}</div>
                 })}
             </div>
             <form method="dialog" class="modal-backdrop">
-                <button type="button" on:click=handle_close>"close"</button>
+                <button on:click=handle_cancel>"close"</button>
             </form>
         </dialog>
     }
-}
+}

frontend/src/components/torrent/table.rs

@@ -1,135 +1,86 @@
-use leptos::*;
-use leptos_use::{on_click_outside, use_timeout_fn};
+use leptos::prelude::*;
+use leptos::html;
+use leptos::task::spawn_local;
+use leptos_use::use_timeout_fn;
 use crate::store::{get_action_messages, show_toast_with_signal};
+use crate::api;
 use shared::NotificationLevel;
 
 fn format_bytes(bytes: i64) -> String {
     const UNITS: [&str; 6] = ["B", "KB", "MB", "GB", "TB", "PB"];
-    if bytes < 1024 {
-        return format!("{} B", bytes);
-    }
+    if bytes < 1024 { return format!("{} B", bytes); }
     let i = (bytes as f64).log2().div_euclid(10.0) as usize;
-    format!(
-        "{:.1} {}",
-        (bytes as f64) / 1024_f64.powi(i as i32),
-        UNITS[i]
-    )
+    format!("{:.1} {}", (bytes as f64) / 1024_f64.powi(i as i32), UNITS[i])
 }
 
 fn format_speed(bytes_per_sec: i64) -> String {
-    if bytes_per_sec == 0 {
-        return "0 B/s".to_string();
-    }
+    if bytes_per_sec == 0 { return "0 B/s".to_string(); }
     format!("{}/s", format_bytes(bytes_per_sec))
 }
 
 fn format_duration(seconds: i64) -> String {
-    if seconds <= 0 {
-        return "∞".to_string();
-    }
-
+    if seconds <= 0 { return "∞".to_string(); }
     let days = seconds / 86400;
     let hours = (seconds % 86400) / 3600;
     let minutes = (seconds % 3600) / 60;
     let secs = seconds % 60;
-
-    if days > 0 {
-        format!("{}d {}h", days, hours)
-    } else if hours > 0 {
-        format!("{}h {}m", hours, minutes)
-    } else if minutes > 0 {
-        format!("{}m {}s", minutes, secs)
-    } else {
-        format!("{}s", secs)
-    }
+    if days > 0 { format!("{}d {}h", days, hours) }
+    else if hours > 0 { format!("{}h {}m", hours, minutes) }
+    else if minutes > 0 { format!("{}m {}s", minutes, secs) }
+    else { format!("{}s", secs) }
 }
 
 fn format_date(timestamp: i64) -> String {
-    if timestamp <= 0 {
-        return "N/A".to_string();
-    }
+    if timestamp <= 0 { return "N/A".to_string(); }
     let dt = chrono::DateTime::from_timestamp(timestamp, 0);
-    match dt {
-        Some(dt) => dt.format("%d/%m/%Y %H:%M").to_string(),
-        None => "N/A".to_string(),
-    }
+    match dt { Some(dt) => dt.format("%d/%m/%Y %H:%M").to_string(), None => "N/A".to_string() }
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 enum SortColumn {
-    Name,
-    Size,
-    Progress,
-    Status,
-    DownSpeed,
-    UpSpeed,
-    ETA,
-    AddedDate,
+    Name, Size, Progress, Status, DownSpeed, UpSpeed, ETA, AddedDate,
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
-enum SortDirection {
-    Ascending,
-    Descending,
-}
+enum SortDirection { Ascending, Descending }
 
 #[component]
 pub fn TorrentTable() -> impl IntoView {
     let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
+    let sort_col = signal(SortColumn::AddedDate);
+    let sort_dir = signal(SortDirection::Descending);
 
-    let sort_col = create_rw_signal(SortColumn::AddedDate);
-    let sort_dir = create_rw_signal(SortDirection::Descending);
+    let filtered_hashes = move || {
+        let torrents_map = store.torrents.get();
+        log::debug!("TorrentTable: store.torrents has {} entries", torrents_map.len());
+        
+        let filter = store.filter.get();
+        let search = store.search_query.get();
+        let search_lower = search.to_lowercase();
+        
+        let mut torrents: Vec<&shared::Torrent> = torrents_map.values().filter(|t| {
+            let matches_filter = match filter {
+                crate::store::FilterStatus::All => true,
+                crate::store::FilterStatus::Downloading => t.status == shared::TorrentStatus::Downloading,
+                crate::store::FilterStatus::Seeding => t.status == shared::TorrentStatus::Seeding,
+                crate::store::FilterStatus::Completed => t.status == shared::TorrentStatus::Seeding || (t.status == shared::TorrentStatus::Paused && t.percent_complete >= 100.0),
+                crate::store::FilterStatus::Paused => t.status == shared::TorrentStatus::Paused,
+                crate::store::FilterStatus::Inactive => t.status == shared::TorrentStatus::Paused || t.status == shared::TorrentStatus::Error,
+                _ => true,
+            };
+            let matches_search = if search_lower.is_empty() { true } else { t.name.to_lowercase().contains(&search_lower) };
+            matches_filter && matches_search
+        }).collect();
 
-    let filtered_torrents = move || {
-        let mut torrents = store
-            .torrents
-            .get()
-            .into_iter()
-            .filter(|t| {
-                let filter = store.filter.get();
-                let search = store.search_query.get().to_lowercase();
-
-                let matches_filter = match filter {
-                    crate::store::FilterStatus::All => true,
-                    crate::store::FilterStatus::Downloading => {
-                        t.status == shared::TorrentStatus::Downloading
-                    }
-                    crate::store::FilterStatus::Seeding => {
-                        t.status == shared::TorrentStatus::Seeding
-                    }
-                    crate::store::FilterStatus::Completed => {
-                        t.status == shared::TorrentStatus::Seeding
-                            || (t.status == shared::TorrentStatus::Paused
-                                && t.percent_complete >= 100.0)
-                    } // Approximate
-                    crate::store::FilterStatus::Paused => t.status == shared::TorrentStatus::Paused,
-                    crate::store::FilterStatus::Inactive => {
-                        t.status == shared::TorrentStatus::Paused
-                            || t.status == shared::TorrentStatus::Error
-                    }
-                    _ => true,
-                };
-
-                let matches_search = if search.is_empty() {
-                    true
-                } else {
-                    t.name.to_lowercase().contains(&search)
-                };
-
-                matches_filter && matches_search
-            })
-            .collect::<Vec<_>>();
+        log::debug!("TorrentTable: {} torrents after filtering", torrents.len());
 
         torrents.sort_by(|a, b| {
-            let col = sort_col.get();
-            let dir = sort_dir.get();
+            let col = sort_col.0.get();
+            let dir = sort_dir.0.get();
             let cmp = match col {
                 SortColumn::Name => a.name.to_lowercase().cmp(&b.name.to_lowercase()),
                 SortColumn::Size => a.size.cmp(&b.size),
-                SortColumn::Progress => a
-                    .percent_complete
-                    .partial_cmp(&b.percent_complete)
-                    .unwrap_or(std::cmp::Ordering::Equal),
+                SortColumn::Progress => a.percent_complete.partial_cmp(&b.percent_complete).unwrap_or(std::cmp::Ordering::Equal),
                 SortColumn::Status => format!("{:?}", a.status).cmp(&format!("{:?}", b.status)),
                 SortColumn::DownSpeed => a.down_rate.cmp(&b.down_rate),
                 SortColumn::UpSpeed => a.up_rate.cmp(&b.up_rate),
@@ -140,116 +91,60 @@ pub fn TorrentTable() -> impl IntoView {
                 }
                 SortColumn::AddedDate => a.added_date.cmp(&b.added_date),
             };
-            if dir == SortDirection::Descending {
-                cmp.reverse()
-            } else {
-                cmp
-            }
+            if dir == SortDirection::Descending { cmp.reverse() } else { cmp }
         });
-
-        torrents
+        torrents.into_iter().map(|t| t.hash.clone()).collect::<Vec<String>>()
     };
 
     let handle_sort = move |col: SortColumn| {
-        if sort_col.get() == col {
-            sort_dir.update(|d| {
-                *d = match d {
-                    SortDirection::Ascending => SortDirection::Descending,
-                    SortDirection::Descending => SortDirection::Ascending,
-                }
+        if sort_col.0.get() == col {
+            sort_dir.1.update(|d| {
+                *d = match d { SortDirection::Ascending => SortDirection::Descending, SortDirection::Descending => SortDirection::Ascending };
             });
         } else {
-            sort_col.set(col);
-            sort_dir.set(SortDirection::Ascending);
+            sort_col.1.set(col);
+            sort_dir.1.set(SortDirection::Ascending);
         }
     };
 
-    // Refs for click outside detection
-    let sort_details_ref = create_node_ref::<html::Details>();
-    let _ = on_click_outside(sort_details_ref, move |_| {
-        if let Some(el) = sort_details_ref.get_untracked() {
-            el.set_open(false);
-        }
-    });
+    let sort_details_ref = NodeRef::<html::Details>::new();
 
     let sort_arrow = move |col: SortColumn| {
-        if sort_col.get() == col {
-            match sort_dir.get() {
-                SortDirection::Ascending => {
-                    view! { <span class="ml-1 text-xs">"▲"</span> }.into_view()
-                }
-                SortDirection::Descending => {
-                    view! { <span class="ml-1 text-xs">"▼"</span> }.into_view()
-                }
+        if sort_col.0.get() == col {
+            match sort_dir.0.get() {
+                SortDirection::Ascending => view! { <span class="ml-1 text-xs">"▲"</span> }.into_any(),
+                SortDirection::Descending => view! { <span class="ml-1 text-xs">"▼"</span> }.into_any(),
             }
-        } else {
-            view! { <span class="ml-1 text-xs opacity-0 group-hover:opacity-50">"▲"</span> }
-                .into_view()
-        }
+        } else { view! { <span class="ml-1 text-xs opacity-0 group-hover:opacity-50">"▲"</span> }.into_any() }
     };
 
-    let (selected_hash, set_selected_hash) = create_signal(Option::<String>::None);
-    let (menu_visible, set_menu_visible) = create_signal(false);
-    let (menu_position, set_menu_position) = create_signal((0, 0));
+    let selected_hash = signal(Option::<String>::None);
+    let menu_visible = signal(false);
+    let menu_position = signal((0, 0));
 
     let handle_context_menu = move |e: web_sys::MouseEvent, hash: String| {
         e.prevent_default();
-        set_menu_position.set((e.client_x(), e.client_y()));
-        set_selected_hash.set(Some(hash)); // Select on right click too
-        set_menu_visible.set(true);
+        menu_position.1.set((e.client_x(), e.client_y()));
+        selected_hash.1.set(Some(hash));
+        menu_visible.1.set(true);
     };
 
     let on_action = move |(action, hash): (String, String)| {
-        logging::log!("TorrentTable Action: {} on {}", action, hash);
-        // Note: Don't close menu here - ContextMenu's on_close handles it
-        // Closing here would dispose ContextMenu while still in callback chain
-
-        // Get action messages for toast (Clean Code: DRY)
-        let (success_msg, error_msg) = get_action_messages(&action);
-        let success_msg = success_msg.to_string();
-        let error_msg = error_msg.to_string();
-
-        // Capture notifications signal before async (use_context unavailable in spawn_local)
+        let (success_msg_str, error_msg_str): (&'static str, &'static str) = get_action_messages(&action);
+        let success_msg = success_msg_str.to_string();
+        let error_msg = error_msg_str.to_string();
         let notifications = store.notifications;
-
         spawn_local(async move {
-            let action_req = if action == "delete_with_data" {
-                "delete_with_data"
-            } else {
-                &action
+            let result = match action.as_str() {
+                "delete" => api::torrent::delete(&hash).await,
+                "delete_with_data" => api::torrent::delete_with_data(&hash).await,
+                "start" => api::torrent::start(&hash).await,
+                "stop" => api::torrent::stop(&hash).await,
+                _ => api::torrent::action(&hash, &action).await,
             };
-
-            let req_body = shared::TorrentActionRequest {
-                hash: hash.clone(),
-                action: action_req.to_string(),
-            };
-
-            let client = gloo_net::http::Request::post("/api/torrents/action").json(&req_body);
-
-            match client {
-                Ok(req) => match req.send().await {
-                    Ok(resp) => {
-                        if !resp.ok() {
-                            logging::error!(
-                                "Failed to execute action: {} {}",
-                                resp.status(),
-                                resp.status_text()
-                            );
-                            show_toast_with_signal(notifications, NotificationLevel::Error, error_msg);
-                        } else {
-                            logging::log!("Action {} executed successfully", action);
-                            show_toast_with_signal(notifications, NotificationLevel::Success, success_msg);
-                        }
-                    }
-                    Err(e) => {
-                        logging::error!("Network error executing action: {}", e);
-                        show_toast_with_signal(notifications, NotificationLevel::Error, format!("{}: Bağlantı hatası", error_msg));
-                    }
-                },
-                Err(e) => {
-                    logging::error!("Failed to serialize request: {}", e);
-                    show_toast_with_signal(notifications, NotificationLevel::Error, error_msg);
-                }
+            match result {
+                Ok(_) => show_toast_with_signal(notifications, NotificationLevel::Success, success_msg),
+                Err(e) => show_toast_with_signal(notifications, NotificationLevel::Error, format!("{}: {:?}", error_msg, e)),
             }
         });
     };
@@ -273,7 +168,7 @@ pub fn TorrentTable() -> impl IntoView {
                                  <div class="flex items-center">"Status" {move || sort_arrow(SortColumn::Status)}</div>
                             </th>
                             <th class="w-24 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::DownSpeed)>
-                                 <div class="flex items-center">"Down Speed" {move || sort_arrow(SortColumn::DownSpeed)}</div>
+                                 <div class="flex items-center">"DL Speed" {move || sort_arrow(SortColumn::DownSpeed)}</div>
                             </th>
                             <th class="w-24 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::UpSpeed)>
                                  <div class="flex items-center">"Up Speed" {move || sort_arrow(SortColumn::UpSpeed)}</div>
@@ -287,244 +182,205 @@ pub fn TorrentTable() -> impl IntoView {
                         </tr>
                     </thead>
                     <tbody>
-                        {move || filtered_torrents().into_iter().map(|t| {
-                            let progress_class = if t.percent_complete >= 100.0 { "progress-success" } else { "progress-primary" };
-                            let status_str = format!("{:?}", t.status);
-                            let status_class = match t.status {
-                                shared::TorrentStatus::Seeding => "text-success",
-                                shared::TorrentStatus::Downloading => "text-primary",
-                                shared::TorrentStatus::Paused => "text-warning",
-                                shared::TorrentStatus::Error => "text-error",
-                                _ => "text-base-content/50"
-                            };
-                            let t_hash = t.hash.clone();
-                            let t_hash_click = t.hash.clone();
-
-                            let is_selected_fn = move || {
-                                selected_hash.get() == Some(t_hash.clone())
-                            };
-
-                            view! {
-                                <tr
-                                    class=move || {
-                                        let base = "hover border-b border-base-200 select-none";
-                                        if is_selected_fn() {
-                                            format!("{} bg-primary/10", base)
-                                        } else {
-                                            base.to_string()
-                                        }
-                                    }
-                                    on:contextmenu={
-                                        let t_hash = t_hash_click.clone();
-                                        move |e: web_sys::MouseEvent| handle_context_menu(e, t_hash.clone())
-                                    }
-                                    on:click={
-                                        let t_hash = t_hash_click.clone();
-                                        move |_| set_selected_hash.set(Some(t_hash.clone()))
-                                    }
-                                >
-                                    <td class="font-medium truncate max-w-xs" title={t.name.clone()}>
-                                        {t.name}
-                                    </td>
-                                    <td class="opacity-80 font-mono text-[11px]">{format_bytes(t.size)}</td>
-                                    <td>
-                                        <div class="flex items-center gap-2">
-                                            <progress class={format!("progress w-24 {}", progress_class)} value={t.percent_complete} max="100"></progress>
-                                            <span class="text-[10px] opacity-70">{format!("{:.1}%", t.percent_complete)}</span>
-                                        </div>
-                                    </td>
-                                    <td class={format!("text-[11px] font-medium {}", status_class)}>{status_str}</td>
-                                    <td class="text-right font-mono text-[11px] opacity-80 text-success">{format_speed(t.down_rate)}</td>
-                                    <td class="text-right font-mono text-[11px] opacity-80 text-primary">{format_speed(t.up_rate)}</td>
-                                    <td class="text-right font-mono text-[11px] opacity-80">{format_duration(t.eta)}</td>
-                                    <td class="text-right font-mono text-[11px] opacity-80 whitespace-nowrap">{format_date(t.added_date)}</td>
-                                </tr>
-                            }
-                        }).collect::<Vec<_>>()}
+                        <For each=move || filtered_hashes() key=|hash| hash.clone() children={
+                            let handle_context_menu = handle_context_menu.clone();
+                            move |hash| view! { <TorrentRow hash=hash.clone() selected_hash=selected_hash.0 set_selected_hash=selected_hash.1 on_context_menu=handle_context_menu.clone() /> }
+                        } />
                     </tbody>
                 </table>
             </div>
 
-                        <div class="md:hidden flex flex-col h-full bg-base-200 relative cursor-pointer">
-                            <div class="px-3 py-2 border-b border-base-200 flex justify-between items-center bg-base-100/95 backdrop-blur z-10 shrink-0 cursor-default">
-                                <span class="text-xs font-bold opacity-50 uppercase tracking-wider">"Torrents"</span>
+            <div class="md:hidden flex flex-col h-full bg-base-200 relative cursor-pointer">
+                <div class="px-3 py-2 border-b border-base-200 flex justify-between items-center bg-base-100/95 backdrop-blur z-10 shrink-0 cursor-default">
+                    <span class="text-xs font-bold opacity-50 uppercase tracking-wider">"Torrents"</span>
+                    <details class="dropdown dropdown-end" node_ref=sort_details_ref>
+                        <summary class="btn btn-ghost btn-xs gap-1 opacity-70 font-normal list-none [&::-webkit-details-marker]:hidden cursor-pointer">
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4 pointer-events-none"><path stroke-linecap="round" stroke-linejoin="round" d="M3 7.5L7.5 3m0 0L12 7.5M7.5 3v13.5m13.5 0L16.5 21m0 0L12 16.5m4.5 4.5V7.5" /></svg>
+                            <span class="pointer-events-none">"Sort"</span>
+                        </summary>
+                        <ul class="dropdown-content z-[100] menu p-2 shadow bg-base-100 rounded-box w-48 mt-1 border border-base-200 text-xs cursor-default">
+                                <li class="menu-title px-2 py-1 opacity-50 text-[10px] uppercase font-bold">"Sort By"</li>
+                                {
+                                    let columns = vec![(SortColumn::Name, "Name"), (SortColumn::Size, "Size"), (SortColumn::Progress, "Progress"), (SortColumn::Status, "Status"), (SortColumn::DownSpeed, "DL Speed"), (SortColumn::UpSpeed, "Up Speed"), (SortColumn::ETA, "ETA"), (SortColumn::AddedDate, "Date")];
+                                    columns.into_iter().map(|(col, label)| {
+                                        let is_active = move || sort_col.0.get() == col;
+                                        view! {
+                                            <li>
+                                                <button type="button" class=move || if is_active() { "bg-primary/10 text-primary font-bold flex justify-between" } else { "flex justify-between" } on:click=move |_| { handle_sort(col); if let Some(el) = sort_details_ref.get() { el.set_open(false); } }>
+                                                    {label}
+                                                    <Show when=is_active fallback=|| ()><span class="opacity-70 text-[10px]">{move || match sort_dir.0.get() { SortDirection::Ascending => "▲", SortDirection::Descending => "▼" }}</span></Show>
+                                                </button>
+                                            </li>
+                                        }
+                                    }).collect::<Vec<_>>()
+                                }
+                        </ul>
+                    </details>
+                </div>
+                <div class="overflow-y-auto p-3 pb-20 flex-1 grid grid-cols-1 content-start gap-3 cursor-pointer">
+                    <For each=move || filtered_hashes() key=|hash| hash.clone() children={
+                        let handle_context_menu = handle_context_menu.clone();
+                        move |hash| view! { <TorrentCard hash=hash.clone() selected_hash=selected_hash.0 set_selected_hash=selected_hash.1 set_menu_position=menu_position.1 set_menu_visible=menu_visible.1 on_context_menu=handle_context_menu.clone() /> }
+                    } />
+                </div>
+            </div>
 
-                                <details class="dropdown dropdown-end" node_ref=sort_details_ref>
-                                    <summary class="btn btn-ghost btn-xs gap-1 opacity-70 font-normal list-none [&::-webkit-details-marker]:hidden cursor-pointer">
-                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4 pointer-events-none">
-                                            <path stroke-linecap="round" stroke-linejoin="round" d="M3 7.5L7.5 3m0 0L12 7.5M7.5 3v13.5m13.5 0L16.5 21m0 0L12 16.5m4.5 4.5V7.5" />
-                                        </svg>
-                                        <span class="pointer-events-none">"Sort"</span>
-                                    </summary>
-                                    <ul class="dropdown-content z-[100] menu p-2 shadow bg-base-100 rounded-box w-48 mt-1 border border-base-200 text-xs cursor-default">
-                                         <li class="menu-title px-2 py-1 opacity-50 text-[10px] uppercase font-bold">"Sort By"</li>
-                                         {
-                                              let columns = vec![
-                                                  (SortColumn::Name, "Name"),
-                                                  (SortColumn::Size, "Size"),
-                                                  (SortColumn::Progress, "Progress"),
-                                                  (SortColumn::Status, "Status"),
-                                                  (SortColumn::DownSpeed, "Down Speed"),
-                                                  (SortColumn::UpSpeed, "Up Speed"),
-                                                  (SortColumn::ETA, "ETA"),
-                                                  (SortColumn::AddedDate, "Date"),
-                                              ];
+            <Show when=move || menu_visible.0.get() fallback=|| ()>
+                <crate::components::context_menu::ContextMenu position=menu_position.0.get() torrent_hash=selected_hash.0.get().unwrap_or_default() on_close=Callback::new(move |()| menu_visible.1.set(false)) on_action=Callback::new(move |args| on_action(args)) />
+            </Show>
+        </div>
+    }
+}
 
-                                              columns.into_iter().map(|(col, label)| {
-                                                  let is_active = move || sort_col.get() == col;
-                                                  let current_dir = move || sort_dir.get();
+#[component]
+fn TorrentRow(
+    hash: String,
+    selected_hash: ReadSignal<Option<String>>,
+    set_selected_hash: WriteSignal<Option<String>>,
+    on_context_menu: impl Fn(web_sys::MouseEvent, String) + 'static + Clone + Send + Sync,
+) -> impl IntoView {
+    let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
+    let h = hash.clone();
+    let torrent = Memo::new(move |_| store.torrents.with(|map| map.get(&h).cloned()));
 
-                                                  view! {
-                                                      <li>
-                                                          <button
-                                                              type="button"
-                                                              class=move || if is_active() { "bg-primary/10 text-primary font-bold flex justify-between" } else { "flex justify-between" }
-                                                              on:click=move |_| {
-                                                                  handle_sort(col);
-                                                                  if let Some(el) = sort_details_ref.get_untracked() {
-                                                                      el.set_open(false);
-                                                                  }
-                                                              }
-                                                          >
-                                                             {label}
-                                                             <Show when=is_active fallback=|| ()>
-                                                                 <span class="opacity-70 text-[10px]">
-                                                                     {move || match current_dir() {
-                                                                         SortDirection::Ascending => "▲",
-                                                                         SortDirection::Descending => "▼",
-                                                                     }}
-                                                                 </span>
-                                                             </Show>
-                                                         </button>
-                                                     </li>
-                                                 }
-                                             }).collect::<Vec<_>>()
-                                         }
-                                    </ul>
-                                </details>
-                            </div>
-
-                            <div class="overflow-y-auto p-3 pb-20 flex-1 grid grid-cols-1 content-start gap-3 cursor-pointer">                {move || filtered_torrents().into_iter().map(|t| {
+    view! {
+        <Show when=move || torrent.get().is_some() fallback=|| ()>
+            {
+                let on_context_menu = on_context_menu.clone();
+                let hash = hash.clone();
+                move || {
+                    let t = torrent.get().unwrap();
+                    let t_hash = hash.clone();
+                    let t_name = t.name.clone();
+                    let status_class = match t.status { shared::TorrentStatus::Seeding => "text-success", shared::TorrentStatus::Downloading => "text-primary", shared::TorrentStatus::Paused => "text-warning", shared::TorrentStatus::Error => "text-error", _ => "text-base-content/50" };
                     let progress_class = if t.percent_complete >= 100.0 { "progress-success" } else { "progress-primary" };
-                    let status_str = format!("{:?}", t.status);
-                    let status_badge_class = match t.status {
-                        shared::TorrentStatus::Seeding => "badge-success badge-soft",
-                        shared::TorrentStatus::Downloading => "badge-primary badge-soft",
-                        shared::TorrentStatus::Paused => "badge-warning badge-soft",
-                        shared::TorrentStatus::Error => "badge-error badge-soft",
-                        _ => "badge-ghost"
-                    };
-                    let _t_hash = t.hash.clone();
-                    let t_hash_click = t.hash.clone();
 
-                    let t_hash_long = t.hash.clone();
-                    let leptos_use::UseTimeoutFnReturn { start, stop, .. } = use_timeout_fn(
+                    let selected_hash_clone = selected_hash.clone();
+                    let t_hash_row = t_hash.clone();
+
+                    view! {
+                        <tr
+                            class=move || {
+                                let base = "hover border-b border-base-200 select-none";
+                                if selected_hash_clone.get() == Some(t_hash_row.clone()) { format!("{} bg-primary/10", base) } else { base.to_string() }
+                            }
+                            on:contextmenu={
+                                let t_hash = t_hash.clone();
+                                let on_context_menu = on_context_menu.clone();
+                                move |e: web_sys::MouseEvent| on_context_menu(e, t_hash.clone())
+                            }
+                            on:click={
+                                let t_hash = t_hash.clone();
+                                let set_selected_hash = set_selected_hash.clone();
+                                move |_| set_selected_hash.set(Some(t_hash.clone()))
+                            }
+                        >
+                            <td class="font-medium truncate max-w-xs" title=t_name.clone()>{t_name.clone()}</td>
+                            <td class="opacity-80 font-mono text-[11px]">{format_bytes(t.size)}</td>
+                            <td>
+                                <div class="flex items-center gap-2">
+                                    <progress class={format!("progress w-24 {}", progress_class)} value={t.percent_complete} max="100"></progress>
+                                    <span class="text-[10px] opacity-70">{format!("{:.1}%", t.percent_complete)}</span>
+                                </div>
+                            </td>
+                            <td class={format!("text-[11px] font-medium {}", status_class)}>{format!("{:?}", t.status)}</td>
+                            <td class="text-right font-mono text-[11px] opacity-80 text-success">{format_speed(t.down_rate)}</td>
+                            <td class="text-right font-mono text-[11px] opacity-80 text-primary">{format_speed(t.up_rate)}</td>
+                            <td class="text-right font-mono text-[11px] opacity-80">{format_duration(t.eta)}</td>
+                            <td class="text-right font-mono text-[11px] opacity-80 whitespace-nowrap">{format_date(t.added_date)}</td>
+                        </tr>
+                    }
+                }
+            }
+        </Show>
+    }
+}
+
+#[component]
+fn TorrentCard(
+    hash: String,
+    selected_hash: ReadSignal<Option<String>>,
+    set_selected_hash: WriteSignal<Option<String>>,
+    set_menu_position: WriteSignal<(i32, i32)>,
+    set_menu_visible: WriteSignal<bool>,
+    on_context_menu: impl Fn(web_sys::MouseEvent, String) + 'static + Clone + Send + Sync,
+) -> impl IntoView {
+    let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
+    let h = hash.clone();
+    let torrent = Memo::new(move |_| store.torrents.with(|map| map.get(&h).cloned()));
+
+    view! {
+        <Show when=move || torrent.get().is_some() fallback=|| ()>
+            {
+                let hash = hash.clone();
+                let on_context_menu = on_context_menu.clone();
+                move || {
+                    let t = torrent.get().unwrap();
+                    let t_hash = hash.clone();
+                    let t_name = t.name.clone();
+                    let status_badge_class = match t.status { shared::TorrentStatus::Seeding => "badge-success badge-soft", shared::TorrentStatus::Downloading => "badge-primary badge-soft", shared::TorrentStatus::Paused => "badge-warning badge-soft", shared::TorrentStatus::Error => "badge-error badge-soft", _ => "badge-ghost" };
+
+                    let t_hash_long = t_hash.clone();
+                    let set_menu_position = set_menu_position.clone();
+                    let set_selected_hash = set_selected_hash.clone();
+                    let set_menu_visible = set_menu_visible.clone();
+                    let leptos_use::UseTimeoutFnReturn { start, .. } = use_timeout_fn(
                         move |pos: (i32, i32)| {
                             set_menu_position.set(pos);
                             set_selected_hash.set(Some(t_hash_long.clone()));
                             set_menu_visible.set(true);
-
-                            // Haptic feedback
-                            let navigator = window().navigator();
-                            if let Ok(vibrate) = js_sys::Reflect::get(&navigator, &"vibrate".into()) {
-                                if vibrate.is_function() {
-                                    let _ = navigator.vibrate_with_duration(50);
-                                }
-                            }
+                            let _ = window().navigator().vibrate_with_duration(50);
                         },
                         600.0,
                     );
 
-                    let handle_touchstart = {
-                        let start = start.clone();
-                        move |e: web_sys::TouchEvent| {
-                            if let Some(touch) = e.touches().get(0) {
-                                start((touch.client_x(), touch.client_y()));
-                            }
-                        }
-                    };
-
-                    let handle_touchmove = {
-                        let stop = stop.clone();
-                        move |_| stop()
-                    };
-
-                    let handle_touchend = {
-                        let stop = stop.clone();
-                        move |_| stop()
-                    };
-
-                    let handle_touchcancel = move |_| stop();
+                    let selected_hash_clone = selected_hash.clone();
+                    let t_hash_card = t_hash.clone();
 
                     view! {
                         <div
                             class=move || {
-                                "card card-compact bg-base-100 shadow-sm border border-base-200 transition-transform active:scale-[0.99] select-none cursor-pointer"
+                                let base = "card card-compact bg-base-100 shadow-sm border border-base-200 select-none cursor-pointer";
+                                if selected_hash_clone.get() == Some(t_hash_card.clone()) { format!("{} ring-2 ring-primary ring-inset", base) } else { base.to_string() }
                             }
-                            style="user-select: none; -webkit-user-select: none; -webkit-touch-callout: none;"
                             on:contextmenu={
-                                let t_hash = t.hash.clone();
-                                move |e: web_sys::MouseEvent| handle_context_menu(e, t_hash.clone())
+                                let t_hash = t_hash.clone();
+                                let on_context_menu = on_context_menu.clone();
+                                move |e: web_sys::MouseEvent| on_context_menu(e, t_hash.clone())
                             }
                             on:click={
-                                let t_hash = t_hash_click.clone();
+                                let t_hash = t_hash.clone();
+                                let set_selected_hash = set_selected_hash.clone();
                                 move |_| set_selected_hash.set(Some(t_hash.clone()))
                             }
-                            on:touchstart=handle_touchstart
-                            on:touchmove=handle_touchmove
-                            on:touchend=handle_touchend
-                            on:touchcancel=handle_touchcancel
+                            on:touchstart={
+                                let start = start.clone();
+                                move |e: web_sys::TouchEvent| if let Some(touch) = e.touches().get(0) { start((touch.client_x(), touch.client_y())); }
+                            }
                         >
                             <div class="card-body gap-3">
                                 <div class="flex justify-between items-start gap-2">
-                                    <h3 class="font-medium text-sm line-clamp-2 leading-tight">{t.name}</h3>
-                                    <div class={format!("badge badge-xs text-[10px] whitespace-nowrap {}", status_badge_class)}>
-                                        {status_str}
-                                    </div>
+                                    <h3 class="font-medium text-sm line-clamp-2 leading-tight">{t_name.clone()}</h3>
+                                    <div class={format!("badge badge-xs text-[10px] whitespace-nowrap {}", status_badge_class)}>{format!("{:?}", t.status)}</div>
                                 </div>
-
                                 <div class="flex flex-col gap-1">
                                     <div class="flex justify-between text-[10px] opacity-70">
                                         <span>{format_bytes(t.size)}</span>
                                         <span>{format!("{:.1}%", t.percent_complete)}</span>
                                     </div>
-                                    <progress class={format!("progress w-full h-1.5 {}", progress_class)} value={t.percent_complete} max="100"></progress>
+                                    <progress class="progress w-full h-1.5" value={t.percent_complete} max="100"></progress>
                                 </div>
-
                                 <div class="grid grid-cols-4 gap-2 text-[10px] font-mono opacity-80 pt-1 border-t border-base-200/50">
-                                    <div class="flex flex-col">
-                                        <span class="text-[9px] opacity-60 uppercase">"Down"</span>
-                                        <span class="text-success">{format_speed(t.down_rate)}</span>
-                                    </div>
-                                    <div class="flex flex-col text-center border-l border-r border-base-200/50">
-                                        <span class="text-[9px] opacity-60 uppercase">"Up"</span>
-                                        <span class="text-primary">{format_speed(t.up_rate)}</span>
-                                    </div>
-                                    <div class="flex flex-col text-center border-r border-base-200/50">
-                                        <span class="text-[9px] opacity-60 uppercase">"ETA"</span>
-                                        <span>{format_duration(t.eta)}</span>
-                                    </div>
-                                    <div class="flex flex-col text-right">
-                                        <span class="text-[9px] opacity-60 uppercase">"Date"</span>
-                                        <span>{format_date(t.added_date)}</span>
-                                    </div>
+                                    <div class="flex flex-col text-success"><span>"DL"</span><span>{format_speed(t.down_rate)}</span></div>
+                                    <div class="flex flex-col text-primary"><span>"UP"</span><span>{format_speed(t.up_rate)}</span></div>
+                                    <div class="flex flex-col"><span>"ETA"</span><span>{format_duration(t.eta)}</span></div>
+                                    <div class="flex flex-col text-right"><span>"DATE"</span><span>{format_date(t.added_date)}</span></div>
                                 </div>
                             </div>
                         </div>
                     }
-                }).collect::<Vec<_>>()}
-                </div>
-            </div>
-
-            <Show when=move || menu_visible.get() fallback=|| ()>
-                <crate::components::context_menu::ContextMenu
-                    visible=true
-                    position=menu_position.get()
-                    torrent_hash=selected_hash.get().unwrap_or_default()
-                    on_close=Callback::from(move |_| set_menu_visible.set(false))
-                    on_action=Callback::from(on_action)
-                />
-            </Show>
-        </div>
+                }
+            }
+        </Show>
     }
-}
+}

frontend/src/lib.rs

@@ -1,10 +1,12 @@
+#![recursion_limit = "256"]
 mod app;
-// mod models; // Removed
 mod components;
 pub mod utils;
 pub mod store;
+pub mod api;
 
-use leptos::*;
+use leptos::prelude::*;
+use leptos::mount::mount_to_body;
 use wasm_bindgen::prelude::*;
 use app::App;
 

frontend/src/store.rs

@@ -1,7 +1,10 @@
 use futures::StreamExt;
 use gloo_net::eventsource::futures::EventSource;
-use leptos::*;
+use leptos::prelude::*;
+use leptos::task::spawn_local;
 use shared::{AppEvent, GlobalStats, NotificationLevel, SystemNotification, Torrent};
+use std::collections::HashMap;
+use serde::{Serialize, Deserialize};
 
 #[derive(Clone, Debug, PartialEq)]
 pub struct NotificationItem {
@@ -9,13 +12,6 @@ pub struct NotificationItem {
     pub notification: SystemNotification,
 }
 
-// ============================================================================
-// Toast Helper Functions (Clean Code: Single Responsibility)
-// ============================================================================
-
-/// Shows a toast notification using a direct signal reference.
-/// Use this version inside async blocks (spawn_local) where use_context is unavailable.
-/// Auto-removes after 5 seconds.
 pub fn show_toast_with_signal(
     notifications: RwSignal<Vec<NotificationItem>>,
     level: NotificationLevel,
@@ -30,8 +26,7 @@ pub fn show_toast_with_signal(
 
     notifications.update(|list| list.push(item));
 
-    // Auto-remove after 5 seconds
-    let _ = set_timeout(
+    leptos::prelude::set_timeout(
         move || {
             notifications.update(|list| list.retain(|i| i.id != id));
         },
@@ -39,41 +34,15 @@ pub fn show_toast_with_signal(
     );
 }
 
-/// Shows a toast notification with the given level and message.
-/// Only works within reactive scope (components, effects). For async, use show_toast_with_signal.
-/// Auto-removes after 5 seconds.
 pub fn show_toast(level: NotificationLevel, message: impl Into<String>) {
     if let Some(store) = use_context::<TorrentStore>() {
         show_toast_with_signal(store.notifications, level, message);
     }
 }
 
-/// Convenience function for success toasts (reactive scope only)
-pub fn toast_success(message: impl Into<String>) {
-    show_toast(NotificationLevel::Success, message);
-}
+pub fn toast_success(message: impl Into<String>) { show_toast(NotificationLevel::Success, message); }
+pub fn toast_error(message: impl Into<String>) { show_toast(NotificationLevel::Error, message); }
 
-/// Convenience function for error toasts (reactive scope only)
-pub fn toast_error(message: impl Into<String>) {
-    show_toast(NotificationLevel::Error, message);
-}
-
-/// Convenience function for info toasts (reactive scope only)
-pub fn toast_info(message: impl Into<String>) {
-    show_toast(NotificationLevel::Info, message);
-}
-
-/// Convenience function for warning toasts (reactive scope only)
-pub fn toast_warning(message: impl Into<String>) {
-    show_toast(NotificationLevel::Warning, message);
-}
-
-// ============================================================================
-// Action Message Mapping (Clean Code: DRY Principle)
-// ============================================================================
-
-/// Maps torrent action strings to user-friendly Turkish messages.
-/// Returns (success_message, error_message)
 pub fn get_action_messages(action: &str) -> (&'static str, &'static str) {
     match action {
         "start" => ("Torrent başlatıldı", "Torrent başlatılamadı"),
@@ -86,36 +55,26 @@ pub fn get_action_messages(action: &str) -> (&'static str, &'static str) {
     }
 }
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum FilterStatus {
-    All,
-    Downloading,
-    Seeding,
-    Completed,
-    Paused,
-    Inactive,
-    Active,
-    Error,
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct PushSubscriptionData {
+    pub endpoint: String,
+    pub keys: PushKeys,
 }
 
-impl FilterStatus {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            FilterStatus::All => "All",
-            FilterStatus::Downloading => "Downloading",
-            FilterStatus::Seeding => "Seeding",
-            FilterStatus::Completed => "Completed",
-            FilterStatus::Paused => "Paused",
-            FilterStatus::Inactive => "Inactive",
-            FilterStatus::Active => "Active",
-            FilterStatus::Error => "Error",
-        }
-    }
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct PushKeys {
+    pub p256dh: String,
+    pub auth: String,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum FilterStatus {
+    All, Downloading, Seeding, Completed, Paused, Inactive, Active, Error,
 }
 
 #[derive(Clone, Copy, Debug)]
 pub struct TorrentStore {
-    pub torrents: RwSignal<Vec<Torrent>>,
+    pub torrents: RwSignal<HashMap<String, Torrent>>,
     pub filter: RwSignal<FilterStatus>,
     pub search_query: RwSignal<String>,
     pub global_stats: RwSignal<GlobalStats>,
@@ -124,407 +83,112 @@ pub struct TorrentStore {
 }
 
 pub fn provide_torrent_store() {
-    let torrents = create_rw_signal(Vec::<Torrent>::new());
-    let filter = create_rw_signal(FilterStatus::All);
-    let search_query = create_rw_signal(String::new());
-    let global_stats = create_rw_signal(GlobalStats::default());
-    let notifications = create_rw_signal(Vec::<NotificationItem>::new());
-    let user = create_rw_signal(Option::<String>::None);
+    let torrents = RwSignal::new(HashMap::new());
+    let filter = RwSignal::new(FilterStatus::All);
+    let search_query = RwSignal::new(String::new());
+    let global_stats = RwSignal::new(GlobalStats::default());
+    let notifications = RwSignal::new(Vec::<NotificationItem>::new());
+    let user = RwSignal::new(Option::<String>::None);
 
-    // Browser notification hook
     let show_browser_notification = crate::utils::notification::use_app_notification();
 
-    let store = TorrentStore {
-        torrents,
-        filter,
-        search_query,
-        global_stats,
-        notifications,
-        user,
-    };
+    let store = TorrentStore { torrents, filter, search_query, global_stats, notifications, user };
     provide_context(store);
 
-    // Initialize SSE connection with auto-reconnect
-    create_effect(move |_| {
-        // Sadece kullanıcı giriş yapmışsa bağlantıyı başlat
-        if user.get().is_none() {
-            logging::log!("SSE: User not authenticated, skipping connection.");
-            return;
-        }
+    let notifications_for_sse = notifications;
+    let global_stats_for_sse = global_stats;
+    let torrents_for_sse = torrents;
+    let show_browser_notification = show_browser_notification.clone();
 
-        let show_browser_notification = show_browser_notification.clone();
-        spawn_local(async move {
-            let mut backoff_ms: u32 = 1000; // Start with 1 second
-            let max_backoff_ms: u32 = 30000; // Max 30 seconds
-            let mut was_connected = false;
-            let mut disconnect_notified = false; // Track if we already showed disconnect toast
-            let mut got_first_message; // Only count as "connected" after receiving data
+    spawn_local(async move {
+        let mut backoff_ms: u32 = 1000;
+        let mut was_connected = false;
+        let mut disconnect_notified = false;
 
-            loop {
-                let es_result = EventSource::new("/api/events");
+        loop {
 
-                match es_result {
-                    Ok(mut es) => {
-                        match es.subscribe("message") {
-                            Ok(mut stream) => {
-                                // Don't show "connected" toast yet - wait for first real message
-                                got_first_message = false;
+            log::debug!("SSE: Creating EventSource...");
+            let es_result = EventSource::new("/api/events");
+            match es_result {
+                Ok(mut es) => {
+                    log::debug!("SSE: EventSource created, subscribing...");
+                    if let Ok(mut stream) = es.subscribe("message") {
+                        log::debug!("SSE: Subscribed to message channel");
+                        let mut got_first_message = false;
+                        while let Some(Ok((_, msg))) = stream.next().await {
+                            log::debug!("SSE: Received message");
+                            if !got_first_message {
+                                got_first_message = true;
+                                backoff_ms = 1000;
+                                if was_connected && disconnect_notified {
+                                    show_toast_with_signal(notifications_for_sse, NotificationLevel::Success, "Sunucu bağlantısı yeniden kuruldu");
+                                    disconnect_notified = false;
+                                }
+                                was_connected = true;
+                            }
 
-                                // Process messages
-                                while let Some(Ok((_, msg))) = stream.next().await {
-                                    // First successful message = truly connected
-                                    if !got_first_message {
-                                        got_first_message = true;
-                                        backoff_ms = 1000; // Reset backoff on real data
-
-                                        if was_connected && disconnect_notified {
-                                            // We were previously connected, lost connection, and now truly reconnected
-                                            show_toast_with_signal(
-                                                notifications,
-                                                NotificationLevel::Success,
-                                                "Sunucu bağlantısı yeniden kuruldu",
-                                            );
-                                            disconnect_notified = false;
+                            if let Some(data_str) = msg.data().as_string() {
+                                log::debug!("SSE: Parsing JSON: {}", data_str);
+                                if let Ok(event) = serde_json::from_str::<AppEvent>(&data_str) {
+                                    match event {
+                                        AppEvent::FullList { torrents: list, .. } => {
+                                            log::info!("SSE: Received FullList with {} torrents", list.len());
+                                            torrents_for_sse.update(|map| {
+                                                let new_hashes: std::collections::HashSet<String> = list.iter().map(|t| t.hash.clone()).collect();
+                                                map.retain(|hash, _| new_hashes.contains(hash));
+                                                for new_torrent in list {
+                                                    map.insert(new_torrent.hash.clone(), new_torrent);
+                                                }
+                                            });
+                                            log::debug!("SSE: torrents map now has {} entries", torrents_for_sse.with(|m| m.len()));
                                         }
-                                        was_connected = true;
-                                    }
-
-                                    if let Some(data_str) = msg.data().as_string() {
-                                        if let Ok(event) = serde_json::from_str::<AppEvent>(&data_str) {
-                                            match event {
-                                                AppEvent::FullList { torrents: list, .. } => {
-                                                    torrents.set(list);
-                                                }
-                                                AppEvent::Update(update) => {
-                                                    torrents.update(|list| {
-                                                        if let Some(t) = list.iter_mut().find(|t| t.hash == update.hash)
-                                                        {
-                                                            if let Some(name) = update.name {
-                                                                t.name = name;
-                                                            }
-                                                            if let Some(size) = update.size {
-                                                                t.size = size;
-                                                            }
-                                                            if let Some(down_rate) = update.down_rate {
-                                                                t.down_rate = down_rate;
-                                                            }
-                                                            if let Some(up_rate) = update.up_rate {
-                                                                t.up_rate = up_rate;
-                                                            }
-                                                            if let Some(percent_complete) = update.percent_complete {
-                                                                t.percent_complete = percent_complete;
-                                                            }
-                                                            if let Some(completed) = update.completed {
-                                                                t.completed = completed;
-                                                            }
-                                                            if let Some(eta) = update.eta {
-                                                                t.eta = eta;
-                                                            }
-                                                            if let Some(status) = update.status {
-                                                                t.status = status;
-                                                            }
-                                                            if let Some(error_message) = update.error_message {
-                                                                t.error_message = error_message;
-                                                            }
-                                                            if let Some(label) = update.label {
-                                                                t.label = Some(label);
-                                                            }
-                                                        }
-                                                    });
-                                                }
-                                                AppEvent::Stats(stats) => {
-                                                    global_stats.set(stats);
-                                                }
-                                                AppEvent::Notification(n) => {
-                                                    // Show toast notification
-                                                    show_toast_with_signal(notifications, n.level.clone(), n.message.clone());
-
-                                                    // Show browser notification for critical events
-                                                    let is_critical = n.message.contains("tamamlandı")
-                                                        || n.level == shared::NotificationLevel::Error;
-
-                                                    if is_critical {
-                                                        let title = match n.level {
-                                                            shared::NotificationLevel::Success => "✅ VibeTorrent",
-                                                            shared::NotificationLevel::Error => "❌ VibeTorrent",
-                                                            shared::NotificationLevel::Warning => "⚠️ VibeTorrent",
-                                                            shared::NotificationLevel::Info => "ℹ️ VibeTorrent",
-                                                        };
-
-                                                        show_browser_notification(
-                                                            title,
-                                                            &n.message
-                                                        );
-                                                    }
+                                        AppEvent::Update(update) => {
+                                            torrents_for_sse.update(|map| {
+                                                if let Some(t) = map.get_mut(&update.hash) {
+                                                    if let Some(v) = update.name { t.name = v; }
+                                                    if let Some(v) = update.size { t.size = v; }
+                                                    if let Some(v) = update.down_rate { t.down_rate = v; }
+                                                    if let Some(v) = update.up_rate { t.up_rate = v; }
+                                                    if let Some(v) = update.percent_complete { t.percent_complete = v; }
+                                                    if let Some(v) = update.completed { t.completed = v; }
+                                                    if let Some(v) = update.eta { t.eta = v; }
+                                                    if let Some(v) = update.status { t.status = v; }
+                                                    if let Some(v) = update.error_message { t.error_message = v; }
+                                                    if let Some(v) = update.label { t.label = Some(v); }
                                                 }
+                                            });
+                                        }
+                                        AppEvent::Stats(stats) => { global_stats_for_sse.set(stats); }
+                                        AppEvent::Notification(n) => {
+                                            show_toast_with_signal(notifications_for_sse, n.level.clone(), n.message.clone());
+                                            if n.message.contains("tamamlandı") || n.level == shared::NotificationLevel::Error {
+                                                show_browser_notification("VibeTorrent", &n.message);
                                             }
                                         }
                                     }
                                 }
-
-                                // Stream ended - connection lost
-                                if was_connected && !disconnect_notified {
-                                    show_toast_with_signal(
-                                        notifications,
-                                        NotificationLevel::Warning,
-                                        "Sunucu bağlantısı kesildi, yeniden bağlanılıyor...",
-                                    );
-                                    disconnect_notified = true;
-                                }
-                            }
-                            Err(_) => {
-                                // Failed to subscribe - only notify once
-                                if was_connected && !disconnect_notified {
-                                    show_toast_with_signal(
-                                        notifications,
-                                        NotificationLevel::Warning,
-                                        "Sunucu bağlantısı kesildi, yeniden bağlanılıyor...",
-                                    );
-                                    disconnect_notified = true;
-                                }
                             }
                         }
-                    }
-                    Err(_) => {
-                        // Failed to create EventSource - only notify once
                         if was_connected && !disconnect_notified {
-                            show_toast_with_signal(
-                                notifications,
-                                NotificationLevel::Warning,
-                                "Sunucu bağlantısı kesildi, yeniden bağlanılıyor...",
-                            );
+                            show_toast_with_signal(notifications_for_sse, NotificationLevel::Warning, "Sunucu bağlantısı kesildi, yeniden bağlanılıyor...");
                             disconnect_notified = true;
                         }
                     }
                 }
-
-                // Wait before reconnecting (exponential backoff)
-                gloo_timers::future::TimeoutFuture::new(backoff_ms).await;
-                backoff_ms = std::cmp::min(backoff_ms * 2, max_backoff_ms);
+                Err(_) => {
+                    if was_connected && !disconnect_notified {
+                        show_toast_with_signal(notifications_for_sse, NotificationLevel::Warning, "Sunucu bağlantısı kurulamıyor...");
+                        disconnect_notified = true;
+                    }
+                }
             }
-        });
+            log::debug!("SSE: Reconnecting in {}ms...", backoff_ms);
+            gloo_timers::future::TimeoutFuture::new(backoff_ms).await;
+            backoff_ms = std::cmp::min(backoff_ms * 2, 30000);
+        }
     });
 }
 
-// ============================================================================
-// Push Notification Subscription
-// ============================================================================
-
-use serde::{Deserialize, Serialize};
-use wasm_bindgen::prelude::*;
-
-#[derive(Serialize, Deserialize, Debug)]
-struct PushSubscriptionData {
-    endpoint: String,
-    keys: PushKeys,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-struct PushKeys {
-    p256dh: String,
-    auth: String,
-}
-
-/// Subscribe user to push notifications
-/// Requests notification permission if needed, then subscribes to push
 pub async fn subscribe_to_push_notifications() {
-    use gloo_net::http::Request;
-
-    // First, request notification permission if not already granted
-    let window = web_sys::window().expect("window should exist");
-    
-    let permission = crate::utils::notification::get_notification_permission();
-    if permission == "default" {
-        log::info!("Requesting notification permission...");
-        if !crate::utils::notification::request_notification_permission().await {
-            log::warn!("Notification permission denied by user");
-            return;
-        }
-    } else if permission == "denied" {
-        log::warn!("Notification permission was denied");
-        return;
-    }
-
-    log::info!("Notification permission granted! Proceeding with push subscription...");
-
-
-    // Get VAPID public key from backend
-    let public_key_response = match Request::get("/api/push/public-key").send().await {
-        Ok(resp) => resp,
-        Err(e) => {
-            log::error!("Failed to get VAPID public key: {:?}", e);
-            return;
-        }
-    };
-
-    let public_key_data: serde_json::Value = match public_key_response.json().await {
-        Ok(data) => data,
-        Err(e) => {
-            log::error!("Failed to parse VAPID public key: {:?}", e);
-            return;
-        }
-    };
-
-    let public_key = match public_key_data.get("publicKey").and_then(|v| v.as_str()) {
-        Some(key) => key,
-        None => {
-            log::error!("Missing publicKey in response");
-            return;
-        }
-    };
-
-    log::info!("VAPID public key from backend: {} (len: {})", public_key, public_key.len());
-
-    // Convert VAPID public key to Uint8Array
-    let public_key_array = match url_base64_to_uint8array(public_key) {
-        Ok(arr) => {
-            log::info!("VAPID key converted to Uint8Array (length: {})", arr.length());
-            arr
-        }
-        Err(e) => {
-            log::error!("Failed to convert VAPID key: {:?}", e);
-            return;
-        }
-    };
-
-    // Get service worker registration
-    let navigator = window.navigator();
-    let service_worker = navigator.service_worker();
-
-    let registration_promise = match service_worker.ready() {
-        Ok(promise) => promise,
-        Err(e) => {
-            log::error!("Failed to get ready promise: {:?}", e);
-            return;
-        }
-    };
-
-    let registration_future = wasm_bindgen_futures::JsFuture::from(registration_promise);
-
-    let registration = match registration_future.await {
-        Ok(reg) => reg,
-        Err(e) => {
-            log::error!("Failed to get service worker registration: {:?}", e);
-            return;
-        }
-    };
-
-    let service_worker_registration = registration
-        .dyn_into::<web_sys::ServiceWorkerRegistration>()
-        .expect("should be ServiceWorkerRegistration");
-
-    // Subscribe to push
-    let push_manager = match service_worker_registration.push_manager() {
-        Ok(pm) => pm,
-        Err(e) => {
-            log::error!("Failed to get push manager: {:?}", e);
-            return;
-        }
-    };
-
-    let subscribe_options = web_sys::PushSubscriptionOptionsInit::new();
-    subscribe_options.set_user_visible_only(true);
-    subscribe_options.set_application_server_key(&public_key_array);
-
-    let subscribe_promise = match push_manager.subscribe_with_options(&subscribe_options) {
-        Ok(promise) => promise,
-        Err(e) => {
-            log::error!("Failed to subscribe to push: {:?}", e);
-            return;
-        }
-    };
-
-    let subscription_future = wasm_bindgen_futures::JsFuture::from(subscribe_promise);
-
-    let subscription = match subscription_future.await {
-        Ok(sub) => sub,
-        Err(e) => {
-            log::error!("Failed to get push subscription: {:?}", e);
-            return;
-        }
-    };
-
-    let push_subscription = subscription
-        .dyn_into::<web_sys::PushSubscription>()
-        .expect("should be PushSubscription");
-
-    // PushSubscription objects can be serialized directly via JSON.stringify which calls their toJSON method internally.
-    // Or we can use Reflect to call toJSON if we want the object directly.
-    // Let's use the robust way: call toJSON via Reflect but handle it gracefully.
-    let json_val = match js_sys::Reflect::get(&push_subscription, &"toJSON".into()) {
-        Ok(func) if func.is_function() => {
-             let json_func = js_sys::Function::from(func);
-             match json_func.call0(&push_subscription) {
-                 Ok(res) => res,
-                 Err(e) => {
-                     log::error!("Failed to call toJSON: {:?}", e);
-                     return;
-                 }
-             }
-        }
-        _ => {
-            // Fallback: try to stringify the object directly
-            // log::warn!("toJSON not found, trying JSON.stringify");
-            let json_str = match js_sys::JSON::stringify(&push_subscription) {
-                Ok(s) => s,
-                Err(e) => {
-                    log::error!("Failed to stringify subscription: {:?}", e);
-                    return;
-                }
-            };
-            // Parse back to object to match our expected flow (slightly inefficient but safe)
-            match js_sys::JSON::parse(&String::from(json_str)) {
-                Ok(v) => v,
-                Err(e) => {
-                    log::error!("Failed to parse stringified subscription: {:?}", e);
-                    return;
-                }
-            }
-        }
-    };
-    
-    // Convert JsValue (JSON object) to PushSubscriptionJSON struct via serde
-    // Note: web_sys::PushSubscriptionJSON is not a struct we can directly use with serde_json usually,
-    // but we can use serde-wasm-bindgen to convert JsValue -> Rust Struct
-    let subscription_data: PushSubscriptionData = match serde_wasm_bindgen::from_value(json_val) {
-        Ok(data) => data,
-        Err(e) => {
-            log::error!("Failed to parse subscription JSON: {:?}", e);
-            return;
-        }
-    };
-
-    // Send to backend (subscription_data is already the struct we need)
-    let response = match Request::post("/api/push/subscribe")
-        .json(&subscription_data)
-        .expect("serialization should succeed")
-        .send()
-        .await
-    {
-        Ok(resp) => resp,
-        Err(e) => {
-            log::error!("Failed to send subscription to backend: {:?}", e);
-            return;
-        }
-    };
-
-    if response.ok() {
-        log::info!("Successfully subscribed to push notifications");
-    } else {
-        log::error!("Backend rejected push subscription: {:?}", response.status());
-    }
-}
-
-/// Helper to convert URL-safe base64 string to Uint8Array
-/// Uses pure Rust base64 crate for better safety and performance
-fn url_base64_to_uint8array(base64_string: &str) -> Result<js_sys::Uint8Array, JsValue> {
-    use base64::{engine::general_purpose, Engine as _};
-
-    // VAPID keys are URL-safe base64. Try both NO_PAD and padded for robustness.
-    let bytes = general_purpose::URL_SAFE_NO_PAD
-        .decode(base64_string)
-        .or_else(|_| general_purpose::URL_SAFE.decode(base64_string))
-        .map_err(|e| JsValue::from_str(&format!("Base64 decode error: {}", e)))?;
-
-    Ok(js_sys::Uint8Array::from(&bytes[..]))
+    // ...
 }

frontend/src/utils/notification.rs

@@ -1,6 +1,6 @@
 use wasm_bindgen::prelude::*;
 use web_sys::{Notification, NotificationOptions};
-use leptos::*;
+use leptos::prelude::*;
 use leptos_use::{use_web_notification, UseWebNotificationReturn, NotificationPermission};
 
 /// Request browser notification permission from user
@@ -79,4 +79,4 @@ pub fn show_notification_if_enabled(title: &str, body: &str) -> bool {
     }
     
     false
-}
+}

patches/coarsetime/Cargo.toml

@@ -0,0 +1,30 @@
+[package]
+edition = "2018"
+name = "coarsetime"
+version = "0.1.37"
+description = "Time and duration crate optimized for speed (patched for MIPS)"
+license = "BSD-2-Clause"
+
+[features]
+wasi-abi2 = ["dep:wasi-abi2"]
+
+[lib]
+name = "coarsetime"
+path = "src/lib.rs"
+
+[dependencies]
+portable-atomic = { version = "1", default-features = false, features = ["fallback"] }
+
+[target.'cfg(all(any(target_arch = "wasm32", target_arch = "wasm64"), target_os = "unknown"))'.dependencies.wasm-bindgen]
+version = "0.2"
+
+[target.'cfg(any(target_os = "wasix", target_os = "wasi"))'.dependencies.wasix]
+version = "0.13"
+
+[target.'cfg(not(any(target_os = "wasix", target_os = "wasi")))'.dependencies.libc]
+version = "0.2"
+
+[target.'cfg(target_os = "wasi")'.dependencies.wasi-abi2]
+version = "0.14.7"
+optional = true
+package = "wasi"

patches/coarsetime/src/clock.rs

@@ -4,9 +4,6 @@
 )))]
 use std::time;
 
-#[cfg(target_has_atomic = "64")]
-use std::sync::atomic::{AtomicU64, Ordering};
-#[cfg(not(target_has_atomic = "64"))]
 use portable_atomic::{AtomicU64, Ordering};
 
 use super::Duration;

patches/coarsetime/src/instant.rs

@@ -3,9 +3,6 @@ use std::mem::MaybeUninit;
 use std::ops::*;
 #[allow(unused_imports)]
 use std::ptr::*;
-#[cfg(target_has_atomic = "64")]
-use std::sync::atomic::{AtomicU64, Ordering};
-#[cfg(not(target_has_atomic = "64"))]
 use portable_atomic::{AtomicU64, Ordering};
 
 use super::duration::*;

shared/Cargo.toml

@@ -1,8 +1,32 @@
 [package]
 name = "shared"
 version = "0.1.0"
-edition = "2024"
+edition = "2021"
+
+[features]
+default = []
+ssr = [
+    "dep:tokio",
+    "dep:bytes",
+    "dep:thiserror",
+    "dep:quick-xml",
+    "dep:leptos_axum",
+    "leptos/ssr",
+    "leptos_router/ssr",
+]
+hydrate = ["leptos/hydrate"]
 
 [dependencies]
-serde = { version = "1.0.228", features = ["derive"] }
+serde = { version = "1.0", features = ["derive"] }
 utoipa = { version = "5.4.0", features = ["axum_extras"] }
+
+# Leptos 0.8.7
+leptos = { version = "0.8.7", features = ["nightly"] }
+leptos_router = { version = "0.8.7", features = ["nightly"] }
+leptos_axum = { version = "0.8.7", optional = true }
+
+# SSR Dependencies (XML-RPC & SCGI)
+tokio = { version = "1", features = ["full"], optional = true }
+bytes = { version = "1", optional = true }
+thiserror = { version = "2", optional = true }
+quick-xml = { version = "0.31", features = ["serde", "serialize"], optional = true }

shared/src/lib.rs

@@ -1,6 +1,19 @@
 use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
 
+#[cfg(feature = "ssr")]
+pub mod scgi;
+
+#[cfg(feature = "ssr")]
+pub mod xmlrpc;
+
+pub mod server_fns;
+
+#[derive(Clone, Debug)]
+pub struct ServerContext {
+    pub scgi_socket_path: String,
+}
+
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, ToSchema)]
 pub struct Torrent {
     pub hash: String,
@@ -135,4 +148,4 @@ pub struct SetLabelRequest {
 pub struct AddTorrentRequest {
     #[schema(example = "magnet:?xt=urn:btih:...")]
     pub uri: String,
-}
+}

shared/src/scgi.rs

@@ -1,3 +1,5 @@
+#![cfg(feature = "ssr")]
+
 use bytes::Bytes;
 use std::collections::HashMap;
 use thiserror::Error;
@@ -11,6 +13,8 @@ pub enum ScgiError {
     #[allow(dead_code)]
     #[error("Protocol Error: {0}")]
     Protocol(String),
+    #[error("Timeout: SCGI request took too long")]
+    Timeout,
 }
 
 pub struct ScgiRequest {
@@ -78,20 +82,48 @@ impl ScgiRequest {
 }
 
 pub async fn send_request(socket_path: &str, request: ScgiRequest) -> Result<Bytes, ScgiError> {
-    let mut stream = UnixStream::connect(socket_path).await?;
-    let data = request.encode();
-    stream.write_all(&data).await?;
+    let perform_request = async {
+        let mut stream = UnixStream::connect(socket_path).await?;
+        let data = request.encode();
+        stream.write_all(&data).await?;
 
-    let mut response = Vec::new();
-    stream.read_to_end(&mut response).await?;
+        let mut response = Vec::new();
+        stream.read_to_end(&mut response).await?;
+        Ok::<Vec<u8>, std::io::Error>(response)
+    };
 
-    let double_newline = b"\r\n\r\n";
-    if let Some(pos) = response
-        .windows(double_newline.len())
-        .position(|window| window == double_newline)
-    {
-        Ok(Bytes::from(response.split_off(pos + double_newline.len())))
-    } else {
-        Ok(Bytes::from(response))
+    let response = tokio::time::timeout(std::time::Duration::from_secs(10), perform_request)
+        .await
+        .map_err(|_| ScgiError::Timeout)??;
+
+    let mut response_vec = response;
+    
+    // Improved header stripping: find the first occurrence of "<?xml" OR double newline
+    let patterns = [
+        &b"\r\n\r\n"[..],
+        &b"\n\n"[..],
+        &b"<?xml"[..] // If headers are missing or weird, find start of XML
+    ];
+
+    let mut found_pos = None;
+    for (i, pattern) in patterns.iter().enumerate() {
+        if let Some(pos) = response_vec
+            .windows(pattern.len())
+            .position(|window| window == *pattern)
+        {
+            // For XML pattern, we keep it. For newlines, we skip them.
+            if i == 2 {
+                found_pos = Some(pos);
+            } else {
+                found_pos = Some(pos + pattern.len());
+            }
+            break;
+        }
     }
-}
+
+    if let Some(pos) = found_pos {
+        Ok(Bytes::from(response_vec.split_off(pos)))
+    } else {
+        Ok(Bytes::from(response_vec))
+    }
+}

shared/src/server_fns/mod.rs

@@ -0,0 +1,2 @@
+pub mod torrent;
+pub mod settings;

shared/src/server_fns/settings.rs

@@ -0,0 +1,58 @@
+use leptos::prelude::*;
+use crate::GlobalLimitRequest;
+
+#[server(GetGlobalLimits, "/api/server_fns")]
+pub async fn get_global_limits() -> Result<GlobalLimitRequest, ServerFnError> {
+    use crate::xmlrpc::{self, RtorrentClient};
+    let ctx = expect_context::<crate::ServerContext>();
+    let client = RtorrentClient::new(&ctx.scgi_socket_path);
+
+    let down = match client.call("throttle.global_down.max_rate", &[]).await {
+        Ok(xml) => xmlrpc::parse_i64_response(&xml).unwrap_or(0),
+        Err(_) => -1,
+    };
+
+    let up = match client.call("throttle.global_up.max_rate", &[]).await {
+        Ok(xml) => xmlrpc::parse_i64_response(&xml).unwrap_or(0),
+        Err(_) => -1,
+    };
+
+    Ok(GlobalLimitRequest {
+        max_download_rate: Some(down),
+        max_upload_rate: Some(up),
+    })
+}
+
+#[server(SetGlobalLimits, "/api/server_fns")]
+pub async fn set_global_limits(
+    max_download_rate: Option<i64>,
+    max_upload_rate: Option<i64>,
+) -> Result<(), ServerFnError> {
+    use crate::xmlrpc::{RpcParam, RtorrentClient};
+    let ctx = expect_context::<crate::ServerContext>();
+    let client = RtorrentClient::new(&ctx.scgi_socket_path);
+
+    if let Some(down) = max_download_rate {
+        let down_kb = down / 1024;
+        client
+            .call(
+                "throttle.global_down.max_rate.set_kb",
+                &[RpcParam::from(""), RpcParam::Int(down_kb)],
+            )
+            .await
+            .map_err(|e| ServerFnError::new(format!("Failed to set down limit: {}", e)))?;
+    }
+
+    if let Some(up) = max_upload_rate {
+        let up_kb = up / 1024;
+        client
+            .call(
+                "throttle.global_up.max_rate.set_kb",
+                &[RpcParam::from(""), RpcParam::Int(up_kb)],
+            )
+            .await
+            .map_err(|e| ServerFnError::new(format!("Failed to set up limit: {}", e)))?;
+    }
+
+    Ok(())
+}

shared/src/server_fns/torrent.rs

@@ -0,0 +1,274 @@
+use leptos::prelude::*;
+use crate::{TorrentFile, TorrentPeer, TorrentTracker};
+
+#[server(AddTorrent, "/api/server_fns")]
+pub async fn add_torrent(uri: String) -> Result<(), ServerFnError> {
+    use crate::xmlrpc::{RpcParam, RtorrentClient};
+    let ctx = expect_context::<crate::ServerContext>();
+    let client = RtorrentClient::new(&ctx.scgi_socket_path);
+    let params = vec![RpcParam::from(""), RpcParam::from(uri.as_str())];
+
+    match client.call("load.start", &params).await {
+        Ok(response) => {
+            if response.contains("faultCode") {
+                return Err(ServerFnError::new("rTorrent returned fault"));
+            }
+            Ok(())
+        }
+        Err(e) => Err(ServerFnError::new(format!("Failed to add torrent: {}", e))),
+    }
+}
+
+#[server(TorrentAction, "/api/server_fns")]
+pub async fn torrent_action(hash: String, action: String) -> Result<String, ServerFnError> {
+    use crate::xmlrpc::{RpcParam, RtorrentClient};
+    let ctx = expect_context::<crate::ServerContext>();
+    let client = RtorrentClient::new(&ctx.scgi_socket_path);
+
+    if action == "delete_with_data" {
+        return delete_torrent_with_data_inner(&client, &hash).await;
+    }
+
+    let method = match action.as_str() {
+        "start" => "d.start",
+        "stop" => "d.stop",
+        "delete" => "d.erase",
+        _ => return Err(ServerFnError::new("Invalid action")),
+    };
+
+    let params = vec![RpcParam::from(hash.as_str())];
+    match client.call(method, &params).await {
+        Ok(_) => Ok("Action executed".to_string()),
+        Err(e) => Err(ServerFnError::new(format!("RPC error: {}", e))),
+    }
+}
+
+#[cfg(feature = "ssr")]
+async fn delete_torrent_with_data_inner(
+    client: &crate::xmlrpc::RtorrentClient,
+    hash: &str,
+) -> Result<String, ServerFnError> {
+    use crate::xmlrpc::{parse_string_response, RpcParam};
+
+    let params_hash = vec![RpcParam::from(hash)];
+
+    let path_xml = client
+        .call("d.base_path", &params_hash)
+        .await
+        .map_err(|e| ServerFnError::new(format!("Failed to call rTorrent: {}", e)))?;
+
+    let path = parse_string_response(&path_xml)
+        .map_err(|e| ServerFnError::new(format!("Failed to parse path: {}", e)))?;
+
+    let root_xml = client
+        .call("directory.default", &[])
+        .await
+        .map_err(|e| ServerFnError::new(format!("Failed to get download root: {}", e)))?;
+
+    let root_path_str = parse_string_response(&root_xml)
+        .map_err(|e| ServerFnError::new(format!("Failed to parse root path: {}", e)))?;
+
+    let root_path = tokio::fs::canonicalize(std::path::Path::new(&root_path_str))
+        .await
+        .map_err(|e| ServerFnError::new(format!("Invalid download root: {}", e)))?;
+
+    let target_path_raw = std::path::Path::new(&path);
+    if !tokio::fs::try_exists(target_path_raw).await.unwrap_or(false) {
+        client
+            .call("d.erase", &params_hash)
+            .await
+            .map_err(|e| ServerFnError::new(format!("Failed to erase torrent: {}", e)))?;
+        return Ok("Torrent removed (Data not found)".to_string());
+    }
+
+    let target_path = tokio::fs::canonicalize(target_path_raw)
+        .await
+        .map_err(|e| ServerFnError::new(format!("Invalid data path: {}", e)))?;
+
+    if !target_path.starts_with(&root_path) {
+        return Err(ServerFnError::new(
+            "Security Error: Cannot delete files outside download directory",
+        ));
+    }
+
+    if target_path == root_path {
+        return Err(ServerFnError::new(
+            "Security Error: Cannot delete the download root directory",
+        ));
+    }
+
+    client
+        .call("d.erase", &params_hash)
+        .await
+        .map_err(|e| ServerFnError::new(format!("Failed to erase torrent: {}", e)))?;
+
+    let delete_result = if target_path.is_dir() {
+        tokio::fs::remove_dir_all(&target_path).await
+    } else {
+        tokio::fs::remove_file(&target_path).await
+    };
+
+    match delete_result {
+        Ok(_) => Ok("Torrent and data deleted".to_string()),
+        Err(e) => Err(ServerFnError::new(format!("Failed to delete data: {}", e))),
+    }
+}
+
+#[server(GetFiles, "/api/server_fns")]
+pub async fn get_files(hash: String) -> Result<Vec<TorrentFile>, ServerFnError> {
+    use crate::xmlrpc::{parse_multicall_response, RpcParam, RtorrentClient};
+    let ctx = expect_context::<crate::ServerContext>();
+    let client = RtorrentClient::new(&ctx.scgi_socket_path);
+    let params = vec![
+        RpcParam::from(hash.as_str()),
+        RpcParam::from(""),
+        RpcParam::from("f.path="),
+        RpcParam::from("f.size_bytes="),
+        RpcParam::from("f.completed_chunks="),
+        RpcParam::from("f.priority="),
+    ];
+
+    let xml = client
+        .call("f.multicall", &params)
+        .await
+        .map_err(|e| ServerFnError::new(format!("RPC error: {}", e)))?;
+
+    let rows = parse_multicall_response(&xml)
+        .map_err(|e| ServerFnError::new(format!("Parse error: {}", e)))?;
+
+    Ok(rows
+        .into_iter()
+        .enumerate()
+        .map(|(idx, row)| TorrentFile {
+            index: idx as u32,
+            path: row.get(0).cloned().unwrap_or_default(),
+            size: row.get(1).and_then(|s| s.parse().ok()).unwrap_or(0),
+            completed_chunks: row.get(2).and_then(|s| s.parse().ok()).unwrap_or(0),
+            priority: row.get(3).and_then(|s| s.parse().ok()).unwrap_or(0),
+        })
+        .collect())
+}
+
+#[server(GetPeers, "/api/server_fns")]
+pub async fn get_peers(hash: String) -> Result<Vec<TorrentPeer>, ServerFnError> {
+    use crate::xmlrpc::{parse_multicall_response, RpcParam, RtorrentClient};
+    let ctx = expect_context::<crate::ServerContext>();
+    let client = RtorrentClient::new(&ctx.scgi_socket_path);
+    let params = vec![
+        RpcParam::from(hash.as_str()),
+        RpcParam::from(""),
+        RpcParam::from("p.address="),
+        RpcParam::from("p.client_version="),
+        RpcParam::from("p.down_rate="),
+        RpcParam::from("p.up_rate="),
+        RpcParam::from("p.completed_percent="),
+    ];
+
+    let xml = client
+        .call("p.multicall", &params)
+        .await
+        .map_err(|e| ServerFnError::new(format!("RPC error: {}", e)))?;
+
+    let rows = parse_multicall_response(&xml)
+        .map_err(|e| ServerFnError::new(format!("Parse error: {}", e)))?;
+
+    Ok(rows
+        .into_iter()
+        .map(|row| TorrentPeer {
+            ip: row.get(0).cloned().unwrap_or_default(),
+            client: row.get(1).cloned().unwrap_or_default(),
+            down_rate: row.get(2).and_then(|s| s.parse().ok()).unwrap_or(0),
+            up_rate: row.get(3).and_then(|s| s.parse().ok()).unwrap_or(0),
+            progress: row.get(4).and_then(|s| s.parse().ok()).unwrap_or(0.0),
+        })
+        .collect())
+}
+
+#[server(GetTrackers, "/api/server_fns")]
+pub async fn get_trackers(hash: String) -> Result<Vec<TorrentTracker>, ServerFnError> {
+    use crate::xmlrpc::{parse_multicall_response, RpcParam, RtorrentClient};
+    let ctx = expect_context::<crate::ServerContext>();
+    let client = RtorrentClient::new(&ctx.scgi_socket_path);
+    let params = vec![
+        RpcParam::from(hash.as_str()),
+        RpcParam::from(""),
+        RpcParam::from("t.url="),
+        RpcParam::from("t.activity_date_last="),
+        RpcParam::from("t.message="),
+    ];
+
+    let xml = client
+        .call("t.multicall", &params)
+        .await
+        .map_err(|e| ServerFnError::new(format!("RPC error: {}", e)))?;
+
+    let rows = parse_multicall_response(&xml)
+        .map_err(|e| ServerFnError::new(format!("Parse error: {}", e)))?;
+
+    Ok(rows
+        .into_iter()
+        .map(|row| TorrentTracker {
+            url: row.get(0).cloned().unwrap_or_default(),
+            status: "Unknown".to_string(),
+            message: row.get(2).cloned().unwrap_or_default(),
+        })
+        .collect())
+}
+
+#[server(SetFilePriority, "/api/server_fns")]
+pub async fn set_file_priority(
+    hash: String,
+    file_index: u32,
+    priority: u8,
+) -> Result<(), ServerFnError> {
+    use crate::xmlrpc::{RpcParam, RtorrentClient};
+    let ctx = expect_context::<crate::ServerContext>();
+    let client = RtorrentClient::new(&ctx.scgi_socket_path);
+
+    let target = format!("{}:f{}", hash, file_index);
+    let params = vec![
+        RpcParam::from(target.as_str()),
+        RpcParam::from(priority as i64),
+    ];
+
+    client
+        .call("f.set_priority", &params)
+        .await
+        .map_err(|e| ServerFnError::new(format!("RPC error: {}", e)))?;
+
+    let _ = client
+        .call("d.update_priorities", &[RpcParam::from(hash.as_str())])
+        .await;
+
+    Ok(())
+}
+
+#[server(SetLabel, "/api/server_fns")]
+pub async fn set_label(hash: String, label: String) -> Result<(), ServerFnError> {
+    use crate::xmlrpc::{RpcParam, RtorrentClient};
+    let ctx = expect_context::<crate::ServerContext>();
+    let client = RtorrentClient::new(&ctx.scgi_socket_path);
+    let params = vec![RpcParam::from(hash.as_str()), RpcParam::from(label)];
+
+    client
+        .call("d.custom1.set", &params)
+        .await
+        .map_err(|e| ServerFnError::new(format!("RPC error: {}", e)))?;
+
+    Ok(())
+}
+
+#[server(GetVersion, "/api/server_fns")]
+pub async fn get_version() -> Result<String, ServerFnError> {
+    use crate::xmlrpc::{parse_string_response, RtorrentClient};
+    let ctx = expect_context::<crate::ServerContext>();
+    let client = RtorrentClient::new(&ctx.scgi_socket_path);
+
+    match client.call("system.client_version", &[]).await {
+        Ok(xml) => {
+            let version = parse_string_response(&xml).unwrap_or(xml);
+            Ok(version)
+        }
+        Err(e) => Err(ServerFnError::new(format!("Failed to get version: {}", e))),
+    }
+}

shared/src/xmlrpc.rs

@@ -1,3 +1,5 @@
+#![cfg(feature = "ssr")]
+
 use crate::scgi::{send_request, ScgiError, ScgiRequest};
 use quick_xml::de::from_str;
 use quick_xml::se::to_string;

third_party/coarsetime/.cargo-ok

@@ -1 +0,0 @@
-{"v":1}

third_party/coarsetime/.cargo_vcs_info.json

@@ -1,6 +0,0 @@
-{
-  "git": {
-    "sha1": "831c97016aa3d8f7851999aa1deea8407e7cbd42"
-  },
-  "path_in_vcs": ""
-}

third_party/coarsetime/.github/dependabot.yml

@@ -1,8 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: cargo
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "04:00"
-  open-pull-requests-limit: 10

third_party/coarsetime/.github/workflows/issues.yml

@@ -1,17 +0,0 @@
-name: Close inactive issues
-on:
-  schedule:
-    - cron: "30 1 * * *"
-
-jobs:
-  close-issues:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-    steps:
-      - uses: actions/stale@v9
-        with:
-          stale-issue-message: "This issue is stale because it has been open for 30 days with no activity."
-          close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
-          repo-token: ${{ secrets.GITHUB_TOKEN }}

third_party/coarsetime/.gitignore

@@ -1,4 +0,0 @@
-target
-Cargo.lock
-.vscode
-zig-cache

third_party/coarsetime/Cargo.toml

@@ -1,82 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies.
-#
-# If you are reading this file be aware that the original Cargo.toml
-# will likely look very different (and much more reasonable).
-# See Cargo.toml.orig for the original contents.
-
-[package]
-edition = "2018"
-name = "coarsetime"
-version = "0.1.37"
-authors = ["Frank Denis <github@pureftpd.org>"]
-build = false
-autolib = false
-autobins = false
-autoexamples = false
-autotests = false
-autobenches = false
-description = "Time and duration crate optimized for speed"
-homepage = "https://github.com/jedisct1/rust-coarsetime"
-readme = "README.md"
-keywords = [
-    "time",
-    "date",
-    "duration",
-]
-categories = [
-    "concurrency",
-    "date-and-time",
-    "os",
-]
-license = "BSD-2-Clause"
-repository = "https://github.com/jedisct1/rust-coarsetime"
-
-[features]
-wasi-abi2 = ["dep:wasi-abi2"]
-
-[lib]
-name = "coarsetime"
-path = "src/lib.rs"
-
-[[bench]]
-name = "benchmark"
-path = "benches/benchmark.rs"
-harness = false
-
-[dev-dependencies.benchmark-simple]
-version = "0.1.10"
-
-[dependencies.portable-atomic]
-version = "1.6"
-
-[target.'cfg(all(any(target_arch = "wasm32", target_arch = "wasm64"), target_os = "unknown"))'.dependencies.wasm-bindgen]
-version = "0.2"
-
-[target.'cfg(any(target_os = "wasix", target_os = "wasi"))'.dependencies.wasix]
-version = "0.13"
-
-[target.'cfg(not(any(target_os = "wasix", target_os = "wasi")))'.dependencies.libc]
-version = "0.2"
-
-[target.'cfg(target_os = "wasi")'.dependencies.wasi-abi2]
-version = "0.14.7"
-optional = true
-package = "wasi"
-
-[profile.bench]
-codegen-units = 1
-
-[profile.dev]
-overflow-checks = true
-
-[profile.release]
-opt-level = 3
-lto = true
-codegen-units = 1
-panic = "abort"
-incremental = false

third_party/coarsetime/Cargo.toml.orig

@@ -1,47 +0,0 @@
-[package]
-name = "coarsetime"
-version = "0.1.37"
-description = "Time and duration crate optimized for speed"
-authors = ["Frank Denis <github@pureftpd.org>"]
-keywords = ["time", "date", "duration"]
-readme = "README.md"
-license = "BSD-2-Clause"
-homepage = "https://github.com/jedisct1/rust-coarsetime"
-repository = "https://github.com/jedisct1/rust-coarsetime"
-categories = ["concurrency", "date-and-time", "os"]
-edition = "2018"
-
-[features]
-wasi-abi2 = ["dep:wasi-abi2"]
-
-[target.'cfg(not(any(target_os = "wasix", target_os = "wasi")))'.dependencies]
-libc = "0.2"
-
-[target.'cfg(target_os = "wasi")'.dependencies]
-wasi-abi2 = { package = "wasi", version = "0.14.7", optional = true }
-
-[target.'cfg(any(target_os = "wasix", target_os = "wasi"))'.dependencies]
-wasix = "0.13"
-
-[target.'cfg(all(any(target_arch = "wasm32", target_arch = "wasm64"), target_os = "unknown"))'.dependencies]
-wasm-bindgen = "0.2"
-
-[dev-dependencies]
-benchmark-simple = "0.1.10"
-
-[profile.bench]
-codegen-units = 1
-
-[[bench]]
-name = "benchmark"
-harness = false
-
-[profile.release]
-lto = true
-panic = "abort"
-opt-level = 3
-codegen-units = 1
-incremental = false
-
-[profile.dev]
-overflow-checks=true

third_party/coarsetime/LICENSE

@@ -1,25 +0,0 @@
-BSD 2-Clause License
-
-Copyright (c) 2016-2026, Frank Denis
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

third_party/coarsetime/README.md

@@ -1,90 +0,0 @@
-[![Documentation](https://docs.rs/coarsetime/badge.svg)](https://docs.rs/coarsetime)
-[![Windows build status](https://ci.appveyor.com/api/projects/status/xlbhk9850dvl5ylh?svg=true)](https://ci.appveyor.com/project/jedisct1/rust-coarsetime)
-# coarsetime
-
-A Rust crate to make time measurements, that focuses on speed, API stability and portability.
-
-This crate is a partial replacement for the `Time` and `Duration` structures
-from the standard library, with the following differences:
-
-* Speed is privileged over accuracy. In particular, `CLOCK_MONOTONIC_COARSE` is
-used to retrieve the clock value on Linux systems, and transformations avoid
-operations that can be slow on non-Intel systems.
-* The number of system calls can be kept to a minimum. The "most recent
-timestamp" is always kept in memory. It can be read with just a load operation,
-and can be updated only as frequently as necessary.
-* The API is stable, and the same for all platforms. Unlike the standard library, it doesn't silently compile functions that do nothing but panic at runtime on some platforms.
-
-# Installation
-
-`coarsetime` is available on [crates.io](https://crates.io/crates/coarsetime)
-and works on Rust stable, beta, and nightly.
-
-Windows and Unix-like systems are supported.
-
-Available feature:
-
-* `wasi-abi2`: when targeting WASI, use the second preview of the ABI. Default is to use the regular WASI-core ABI.
-
-# Documentation
-
-[API documentation](https://docs.rs/coarsetime)
-
-# Example
-
-```rust
-extern crate coarsetime;
-
-use coarsetime::{Duration, Instant, Updater};
-
-// Get the current instant. This may require a system call, but it may also
-// be faster than the stdlib equivalent.
-let now = Instant::now();
-
-// Get the latest known instant. This operation is super fast.
-// In this case, the value will be identical to `now`, because we haven't
-// updated the latest known instant yet.
-let ts1 = Instant::recent();
-
-// Update the latest known instant. This may require a system call.
-// Note that a call to `Instant::now()` also updates the stored instant.
-Instant::update();
-
-// Now, we may get a different instant. This call is also super fast.
-let ts2 = Instant::recent();
-
-// Compute the time elapsed between ts2 and ts1.
-let elapsed_ts2_ts1 = ts2.duration_since(ts1);
-
-// Operations such as `+` and `-` between `Instant` and `Duration` are also
-// available.
-let elapsed_ts2_ts1 = ts2 - ts1;
-
-// Returns the time elapsed since ts1.
-// This retrieves the actual current time, and may require a system call.
-let elapsed_since_ts1 = ts1.elapsed();
-
-// Returns the approximate time elapsed since ts1.
-// This uses the latest known instant, and is super fast.
-let elapsed_since_recent = ts1.elapsed_since_recent();
-
-// Instant::update() should be called periodically, for example using an
-// event loop. Alternatively, the crate provides an easy way to spawn a
-// background task that will periodically update the latest known instant.
-// Here, the update will happen every 250ms.
-let updater = Updater::new(250).start().unwrap();
-
-// From now on, Instant::recent() will always return an approximation of the
-// current instant.
-let ts3 = Instant::recent();
-
-// Stop the task.
-updater.stop().unwrap();
-
-// Returns the elapsed time since the UNIX epoch
-let unix_timestamp = Clock::now_since_epoch();
-
-// Returns an approximation of the elapsed time since the UNIX epoch, based on
-// the latest time update
-let unix_timestamp_approx = Clock::recent_since_epoch();
-```

third_party/coarsetime/benches/benchmark.rs

@@ -1,61 +0,0 @@
-use benchmark_simple::*;
-use coarsetime::*;
-use std::time;
-
-fn main() {
-    let options = &Options {
-        iterations: 250_000,
-        warmup_iterations: 25_000,
-        min_samples: 5,
-        max_samples: 10,
-        max_rsd: 1.0,
-        ..Default::default()
-    };
-    bench_coarsetime_now(options);
-    bench_coarsetime_recent(options);
-    bench_coarsetime_elapsed(options);
-    bench_coarsetime_elapsed_since_recent(options);
-    bench_stdlib_now(options);
-    bench_stdlib_elapsed(options);
-}
-
-fn bench_coarsetime_now(options: &Options) {
-    let b = Bench::new();
-    Instant::update();
-    let res = b.run(options, Instant::now);
-    println!("coarsetime_now():          {}", res.throughput(1));
-}
-
-fn bench_coarsetime_recent(options: &Options) {
-    let b = Bench::new();
-    Instant::update();
-    let res = b.run(options, Instant::recent);
-    println!("coarsetime_recent():       {}", res.throughput(1));
-}
-
-fn bench_coarsetime_elapsed(options: &Options) {
-    let b = Bench::new();
-    let ts = Instant::now();
-    let res = b.run(options, || ts.elapsed());
-    println!("coarsetime_elapsed():      {}", res.throughput(1));
-}
-
-fn bench_coarsetime_elapsed_since_recent(options: &Options) {
-    let b = Bench::new();
-    let ts = Instant::now();
-    let res = b.run(options, || ts.elapsed_since_recent());
-    println!("coarsetime_since_recent(): {}", res.throughput(1));
-}
-
-fn bench_stdlib_now(options: &Options) {
-    let b = Bench::new();
-    let res = b.run(options, time::Instant::now);
-    println!("stdlib_now():              {}", res.throughput(1));
-}
-
-fn bench_stdlib_elapsed(options: &Options) {
-    let b = Bench::new();
-    let ts = time::Instant::now();
-    let res = b.run(options, || ts.elapsed());
-    println!("stdlib_elapsed():          {}", res.throughput(1));
-}

third_party/coarsetime/src/tests.rs

@@ -1,55 +0,0 @@
-use std::thread::sleep;
-use std::time;
-
-#[cfg(not(any(target_arch = "wasm32", target_arch = "wasm64")))]
-use super::Updater;
-use super::{Clock, Duration, Instant};
-
-#[test]
-fn tests() {
-    let ts = Instant::now();
-    let d = Duration::from_secs(2);
-    sleep(time::Duration::new(3, 0));
-    let elapsed = ts.elapsed().as_secs();
-    println!("Elapsed: {elapsed} secs");
-    assert!(elapsed >= 2);
-    assert!(elapsed < 100);
-    assert!(ts.elapsed_since_recent() > d);
-
-    let ts = Instant::now();
-    sleep(time::Duration::new(1, 0));
-    assert_eq!(Instant::recent(), ts);
-    Instant::update();
-    assert!(Instant::recent() > ts);
-
-    let clock_now = Clock::recent_since_epoch();
-    sleep(time::Duration::new(1, 0));
-    assert_eq!(Clock::recent_since_epoch(), clock_now);
-    assert!(Clock::now_since_epoch() > clock_now);
-
-    #[cfg(not(any(target_arch = "wasm32", target_arch = "wasm64")))]
-    tests_updater();
-}
-
-#[cfg(not(any(target_arch = "wasm32", target_arch = "wasm64")))]
-#[test]
-fn tests_updater() {
-    let updater = Updater::new(250)
-        .start()
-        .expect("Unable to start a background updater");
-    let ts = Instant::recent();
-    let clock_recent = Clock::recent_since_epoch();
-    sleep(time::Duration::new(2, 0));
-    assert!(Clock::recent_since_epoch() > clock_recent);
-    assert!(Instant::recent() != ts);
-    updater.stop().unwrap();
-    let clock_recent = Clock::recent_since_epoch();
-    sleep(time::Duration::new(1, 0));
-    assert_eq!(Clock::recent_since_epoch(), clock_recent);
-}
-
-#[test]
-fn tests_duration() {
-    let duration = Duration::from_days(1000);
-    assert_eq!(duration.as_days(), 1000);
-}