perf: implement smart merge logic for FullList to preserve reactive references

- Create frontend/src/api/mod.rs with centralized HTTP client and error handling
- Implement api::auth module (login, logout, check_auth, get_user)
- Implement api::torrent module (add, action, delete, start, stop, set_label, set_priority)
- Implement api::setup module (get_status, setup)
- Implement api::settings module (set_global_limits)
- Implement api::push module (get_public_key, subscribe)
- Update all components to use api service layer instead of direct gloo_net calls
- Add thiserror dependency for error handling

Cargo.lock

@@ -566,6 +566,15 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "codee"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d3ad3122b0001c7f140cf4d605ef9a9e2c24d96ab0b4fb4347b76de2425f445"
+dependencies = [
+ "thiserror 1.0.69",
+]
+
 [[package]]
 name = "collection_literals"
 version = "1.0.3"
@@ -790,6 +799,41 @@ version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b10589d1a5e400d61f9f38f12f884cfd080ff345de8f17efda36fe0e4a02aa8"
 
+[[package]]
+name = "darling"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.114",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.114",
+]
+
 [[package]]
 name = "dashmap"
 version = "5.5.3"
@@ -823,6 +867,18 @@ version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
 
+[[package]]
+name = "default-struct-builder"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0df63c21a4383f94bd5388564829423f35c316aed85dc4f8427aded372c7c0d"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.114",
+]
+
 [[package]]
 name = "der"
 version = "0.4.5"
@@ -1144,7 +1200,9 @@ dependencies = [
 name = "frontend"
 version = "0.1.0"
 dependencies = [
+ "base64 0.22.1",
  "chrono",
+ "codee",
  "console_error_panic_hook",
  "console_log",
  "futures",
@@ -1152,12 +1210,15 @@ dependencies = [
  "gloo-timers",
  "js-sys",
  "leptos",
+ "leptos-use",
  "leptos_router",
  "log",
  "serde",
+ "serde-wasm-bindgen",
  "serde_json",
  "shared",
  "tailwind_fuse",
+ "thiserror 2.0.18",
  "uuid",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -1819,6 +1880,12 @@ dependencies = [
  "zerovec",
 ]
 
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
 [[package]]
 name = "idna"
 version = "1.1.0"
@@ -1986,6 +2053,30 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "leptos-use"
+version = "0.13.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "789bf9f4337e6ebd8f1b407e3f762fdc538d48dc145f9d1dce2338014b38f4dd"
+dependencies = [
+ "cfg-if",
+ "chrono",
+ "codee",
+ "cookie",
+ "default-struct-builder",
+ "futures-util",
+ "gloo-timers",
+ "js-sys",
+ "lazy_static",
+ "leptos",
+ "paste",
+ "thiserror 1.0.69",
+ "unic-langid",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "leptos_config"
 version = "0.6.15"
@@ -3934,6 +4025,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
 dependencies = [
  "displaydoc",
+ "serde_core",
  "zerovec",
 ]
 
@@ -4298,6 +4390,24 @@ version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 
+[[package]]
+name = "unic-langid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28ba52c9b05311f4f6e62d5d9d46f094bd6e84cb8df7b3ef952748d752a7d05"
+dependencies = [
+ "unic-langid-impl",
+]
+
+[[package]]
+name = "unic-langid-impl"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce1bf08044d4b7a94028c93786f8566047edc11110595914de93362559bc658"
+dependencies = [
+ "tinystr",
+]
+
 [[package]]
 name = "unicase"
 version = "2.9.0"
@@ -5055,6 +5165,7 @@ version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
 dependencies = [
+ "serde",
  "yoke",
  "zerofrom",
  "zerovec-derive",

backend/src/handlers/mod.rs

@@ -11,12 +11,10 @@ use axum::{
     BoxError,
 };
 use rust_embed::RustEmbed;
-use serde::Deserialize;
 use shared::{
-    GlobalLimitRequest, SetFilePriorityRequest, SetLabelRequest, TorrentActionRequest, TorrentFile,
-    TorrentPeer, TorrentTracker,
+    AddTorrentRequest, GlobalLimitRequest, SetFilePriorityRequest, SetLabelRequest, TorrentActionRequest,
+    TorrentFile,     TorrentPeer, TorrentTracker,
 };
-use utoipa::ToSchema;
 
 pub mod auth;
 pub mod setup;
@@ -25,13 +23,6 @@ pub mod setup;
 #[folder = "../frontend/dist"]
 pub struct Asset;
 
-#[derive(Deserialize, ToSchema)]
-pub struct AddTorrentRequest {
-    /// Magnet link or Torrent file URL
-    #[schema(example = "magnet:?xt=urn:btih:...")]
-    uri: String,
-}
-
 pub async fn static_handler(uri: Uri) -> impl IntoResponse {
     let mut path = uri.path().trim_start_matches('/').to_string();
 

backend/src/main.rs

@@ -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(
@@ -125,7 +126,7 @@ struct Args {
     ),
     components(
         schemas(
-            handlers::AddTorrentRequest,
+            shared::AddTorrentRequest,
             shared::TorrentActionRequest,
             shared::Torrent,
             shared::TorrentStatus,
@@ -172,7 +173,7 @@ struct ApiDoc;
     ),
     components(
         schemas(
-            handlers::AddTorrentRequest,
+            shared::AddTorrentRequest,
             shared::TorrentActionRequest,
             shared::Torrent,
             shared::TorrentStatus,
@@ -336,6 +337,8 @@ async fn main() {
     #[cfg(not(feature = "push-notifications"))]
     let push_store = ();
 
+    let notify_poll = Arc::new(tokio::sync::Notify::new());
+
     let app_state = AppState {
         tx: tx.clone(),
         event_bus: event_bus.clone(),
@@ -343,6 +346,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 +355,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 +364,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 +442,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 +470,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;
         }
     });
 

backend/src/scgi.rs

@@ -11,6 +11,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 +80,30 @@ 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 response = tokio::time::timeout(std::time::Duration::from_secs(10), perform_request)
+        .await
+        .map_err(|_| ScgiError::Timeout)??;
 
     let double_newline = b"\r\n\r\n";
-    if let Some(pos) = response
+    let mut response_vec = response;
+    if let Some(pos) = response_vec
         .windows(double_newline.len())
         .position(|window| window == double_newline)
     {
-        Ok(Bytes::from(response.split_off(pos + double_newline.len())))
+        Ok(Bytes::from(
+            response_vec.split_off(pos + double_newline.len()),
+        ))
     } else {
-        Ok(Bytes::from(response))
+        Ok(Bytes::from(response_vec))
     }
 }

backend/src/sse.rs

@@ -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

@@ -30,3 +30,4 @@ base64 = "0.22.1"
 serde-wasm-bindgen = "0.6.5"
 leptos-use = "0.13"
 codee = "0.2"
+thiserror = "2.0"

frontend/src/api/mod.rs

@@ -0,0 +1,243 @@
+use gloo_net::http::Request;
+use shared::{AddTorrentRequest, TorrentActionRequest};
+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,
+}
+
+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> {
+        Request::post(&format!("{}/settings/global-limits", base_url()))
+            .json(req)
+            .map_err(|_| ApiError::Network)?
+            .send()
+            .await
+            .map_err(|_| ApiError::Network)?;
+        Ok(())
+    }
+}
+
+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> {
+        let req = AddTorrentRequest {
+            uri: uri.to_string(),
+        };
+        Request::post(&format!("{}/torrents/add", base_url()))
+            .json(&req)
+            .map_err(|_| ApiError::Network)?
+            .send()
+            .await
+            .map_err(|_| ApiError::Network)?;
+        Ok(())
+    }
+
+    pub async fn action(hash: &str, action: &str) -> Result<(), ApiError> {
+        let req = TorrentActionRequest {
+            hash: hash.to_string(),
+            action: action.to_string(),
+        };
+        Request::post(&format!("{}/torrents/action", base_url()))
+            .json(&req)
+            .map_err(|_| ApiError::Network)?
+            .send()
+            .await
+            .map_err(|_| ApiError::Network)?;
+        Ok(())
+    }
+
+    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> {
+        use shared::SetLabelRequest;
+        let req = SetLabelRequest {
+            hash: hash.to_string(),
+            label: label.to_string(),
+        };
+        Request::post(&format!("{}/torrents/set_label", base_url()))
+            .json(&req)
+            .map_err(|_| ApiError::Network)?
+            .send()
+            .await
+            .map_err(|_| ApiError::Network)?;
+        Ok(())
+    }
+
+    pub async fn set_priority(hash: &str, file_index: u32, priority: u8) -> Result<(), ApiError> {
+        use shared::SetFilePriorityRequest;
+        let req = SetFilePriorityRequest {
+            hash: hash.to_string(),
+            file_index,
+            priority,
+        };
+        Request::post(&format!("{}/torrents/set_priority", base_url()))
+            .json(&req)
+            .map_err(|_| ApiError::Network)?
+            .send()
+            .await
+            .map_err(|_| ApiError::Network)?;
+        Ok(())
+    }
+}

frontend/src/app.rs

@@ -3,100 +3,80 @@ use crate::components::toast::ToastContainer;
 use crate::components::torrent::table::TorrentTable;
 use crate::components::auth::login::Login;
 use crate::components::auth::setup::Setup;
+use crate::api;
 use leptos::*;
 use leptos_router::*;
-use serde::Deserialize;
-
-#[derive(Deserialize)]
-struct SetupStatus {
-    completed: bool,
-}
-
-#[derive(Deserialize)]
-struct UserResponse {
-    username: String,
-}
 
 #[component]
 pub fn App() -> impl IntoView {
     crate::store::provide_torrent_store();
 
-    // Auth State
     let (is_loading, set_is_loading) = create_signal(true);
     let (is_authenticated, set_is_authenticated) = create_signal(false);
 
-    // Check Auth & Setup Status on load
     create_effect(move |_| {
         spawn_local(async move {
             logging::log!("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 {
+                        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!("Network error checking setup status: {}", e),
+                Err(e) => logging::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) => {
+                    logging::log!("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(store) = use_context::<crate::store::TorrentStore>() {
+                            store.user.set(Some(user_info.username));
                         }
+                    }
+
+                    set_is_authenticated.set(true);
+
+                    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());
+                    }
+                }
+                Ok(false) => {
+                    logging::log!("Not authenticated");
+
+                    let pathname = window().location().pathname().unwrap_or_default();
+                    if pathname != "/login" && pathname != "/setup" {
+                        let navigate = use_navigate();
+                        navigate("/login", Default::default());
+                    }
+                }
+                Err(e) => {
+                    logging::error!("Auth check failed: {:?}", e);
+                    let navigate = use_navigate();
+                    navigate("/login", Default::default());
+                }
+            }
+
             set_is_loading.set(false);
         });
     });
-    // Initialize push notifications (Only if authenticated)
+
     create_effect(move |_| {
         if is_authenticated.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() {

frontend/src/components/auth/login.rs

@@ -1,12 +1,5 @@
 use leptos::*;
-use serde::Serialize;
-
-#[derive(Serialize)]
-struct LoginRequest {
-    username: String,
-    password: String,
-    remember_me: bool,
-}
+use crate::api;
 
 #[component]
 pub fn Login() -> impl IntoView {
@@ -23,35 +16,31 @@ pub fn Login() -> impl IntoView {
 
         logging::log!("Attempting login for user: {}", username.get());
 
+        let username = username.get();
+        let password = password.get();
+        let remember_me = remember_me.get();
+
         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(&username, &password, remember_me).await {
+                Ok(_) => {
+                    logging::log!("Login successful, redirecting...");
+                    let _ = window().location().set_href("/");
                 }
                 Err(e) => {
-                    logging::error!("Network error: {}", e);
-                    set_error.set(Some("Bağlantı hatası".to_string()));
+                    logging::error!("Login failed: {:?}", e);
+                    let msg = match e {
+                        crate::api::ApiError::RateLimited => {
+                            "Çok fazla başarısız deneme yaptınız. Lütfen bir süre bekleyip tekrar deneyin.".to_string()
+                        }
+                        crate::api::ApiError::Unauthorized | crate::api::ApiError::LoginFailed => {
+                            "Kullanıcı adı veya şifre hatalı".to_string()
+                        }
+                        crate::api::ApiError::Network => {
+                            "Bağlantı hatası".to_string()
+                        }
+                        _ => "Bir hata oluştu".to_string()
+                    };
+                    set_error.set(Some(msg));
                 }
             }
             set_loading.set(false);

frontend/src/components/auth/setup.rs

@@ -1,11 +1,5 @@
 use leptos::*;
-use serde::Serialize;
-
-#[derive(Serialize)]
-struct SetupRequest {
-    username: String,
-    password: String,
-}
+use crate::api;
 
 #[component]
 pub fn Setup() -> impl IntoView {
@@ -35,29 +29,18 @@ pub fn Setup() -> impl IntoView {
             return;
         }
 
+        let username = username.get();
+        let password = pass;
+
         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(&username, &password).await {
+                Ok(_) => {
+                    logging::log!("Setup completed successfully, redirecting...");
+                    let _ = window().location().set_href("/");
                 }
-                Err(_) => {
-                    set_error.set(Some("Bağlantı hatası".to_string()));
+                Err(e) => {
+                    logging::error!("Setup failed: {:?}", e);
+                    set_error.set(Some("Kurulum başarısız oldu".to_string()));
                 }
             }
             set_loading.set(false);

frontend/src/components/layout/sidebar.rs

@@ -1,56 +1,52 @@
 use leptos::wasm_bindgen::JsCast;
 use leptos::*;
+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,12 +72,8 @@ 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().location().set_href("/login");
             }
         });
     };

frontend/src/components/layout/statusbar.rs

@@ -1,8 +1,8 @@
 use leptos::*;
-use leptos_use::on_click_outside;
 use leptos_use::storage::use_local_storage;
 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"];
@@ -61,38 +61,23 @@ pub fn StatusBar() -> impl IntoView {
         let limit_type = limit_type.to_string();
         logging::log!("Setting {} limit to {}", limit_type, val);
 
+        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),
+            }
+        };
+
         spawn_local(async move {
-            let req_body = if limit_type == "down" {
-                GlobalLimitRequest {
-                    max_download_rate: Some(val),
-                    max_upload_rate: None,
-                }
+            if let Err(e) = api::settings::set_global_limits(&req).await {
+                logging::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),
+                logging::log!("Limit set successfully");
             }
         });
     };

frontend/src/components/torrent/add_torrent.rs

@@ -1,6 +1,7 @@
 use leptos::*;
 use leptos::html::Dialog;
 use crate::store::{show_toast_with_signal, TorrentStore};
+use crate::api;
 use shared::NotificationLevel;
 
 
@@ -17,7 +18,6 @@ pub fn AddTorrentModal(
     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 |_| {
         if let Some(dialog) = dialog_ref.get() {
             let _ = dialog.show_modal();
@@ -35,46 +35,22 @@ pub fn AddTorrentModal(
         set_loading.set(true);
         set_error_msg.set(None);
 
+        let uri_val = uri_val;
         spawn_local(async move {
-            let req_body = serde_json::json!({
-                "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(_) => {
+                    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(());
                 }
                 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)));
+                    logging::error!("Failed to add torrent: {:?}", e);
+                    show_toast_with_signal(notifications, NotificationLevel::Error, "Torrent eklenemedi");
+                    set_error_msg.set(Some(format!("Error: {:?}", e)));
                     set_loading.set(false);
                 }
             }

frontend/src/components/torrent/table.rs

@@ -1,6 +1,7 @@
 use leptos::*;
 use leptos_use::{on_click_outside, 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 {
@@ -80,74 +81,77 @@ pub fn TorrentTable() -> impl IntoView {
     let sort_col = create_rw_signal(SortColumn::AddedDate);
     let sort_dir = create_rw_signal(SortDirection::Descending);
 
-    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();
+    // Get sorted and filtered hashes only
+    let filtered_hashes = move || {
+        store.torrents.with(|map| {
+            let mut torrents: Vec<&shared::Torrent> = map
+                .values()
+                .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
+                    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.is_empty() {
+                        true
+                    } else {
+                        t.name.to_lowercase().contains(&search)
+                    };
+
+                    matches_filter && matches_search
+                })
+                .collect();
+
+            torrents.sort_by(|a, b| {
+                let col = sort_col.get();
+                let dir = sort_dir.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::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),
+                    SortColumn::ETA => {
+                        let a_eta = if a.eta <= 0 { i64::MAX } else { a.eta };
+                        let b_eta = if b.eta <= 0 { i64::MAX } else { b.eta };
+                        a_eta.cmp(&b_eta)
                     }
-                    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,
+                    SortColumn::AddedDate => a.added_date.cmp(&b.added_date),
                 };
-
-                let matches_search = if search.is_empty() {
-                    true
+                if dir == SortDirection::Descending {
+                    cmp.reverse()
                 } else {
-                    t.name.to_lowercase().contains(&search)
-                };
-
-                matches_filter && matches_search
-            })
-            .collect::<Vec<_>>();
-
-        torrents.sort_by(|a, b| {
-            let col = sort_col.get();
-            let dir = sort_dir.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::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),
-                SortColumn::ETA => {
-                    let a_eta = if a.eta <= 0 { i64::MAX } else { a.eta };
-                    let b_eta = if b.eta <= 0 { i64::MAX } else { b.eta };
-                    a_eta.cmp(&b_eta)
+                    cmp
                 }
-                SortColumn::AddedDate => a.added_date.cmp(&b.added_date),
-            };
-            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| {
@@ -201,54 +205,33 @@ pub fn TorrentTable() -> impl IntoView {
 
     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 notifications = store.notifications;
 
+        let hash = hash.clone();
+        let action = action.clone();
+
         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));
-                    }
-                },
+            match result {
+                Ok(_) => {
+                    logging::log!("Action {} executed successfully", action);
+                    show_toast_with_signal(notifications, NotificationLevel::Success, success_msg);
+                }
                 Err(e) => {
-                    logging::error!("Failed to serialize request: {}", e);
-                    show_toast_with_signal(notifications, NotificationLevel::Error, error_msg);
+                    logging::error!("Action failed: {:?}", e);
+                    show_toast_with_signal(notifications, NotificationLevel::Error, format!("{}: {:?}", error_msg, e));
                 }
             }
         });
@@ -273,7 +256,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,124 +270,231 @@ 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()
-                                        }
+                        <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
+                                            set_selected_hash=set_selected_hash
+                                            on_context_menu=handle_context_menu.clone()
+                                        />
                                     }
-                                    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<_>>()}
+                        />
                     </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, "Down Speed"),
-                                                  (SortColumn::UpSpeed, "Up Speed"),
-                                                  (SortColumn::ETA, "ETA"),
-                                                  (SortColumn::AddedDate, "Date"),
-                                              ];
+                    <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.get() == col;
-                                                  let current_dir = move || sort_dir.get();
+                                    columns.into_iter().map(|(col, label)| {
+                                        let is_active = move || sort_col.get() == col;
+                                        let current_dir = move || sort_dir.get();
 
-                                                  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>
+                                        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">
+                    <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
+                                        set_selected_hash=set_selected_hash
+                                        set_menu_position=set_menu_position
+                                        set_menu_visible=set_menu_visible
+                                        on_context_menu=handle_context_menu.clone()
+                                    />
+                                }
+                            }
+                        }
+                    />
+                </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>
+    }
+}
+
+#[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,
+) -> impl IntoView {
+    let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
+
+    let h = hash.clone();
+    // Memoized access to the specific torrent data.
+    // This only re-renders the row if this specific torrent actually changes.
+    let torrent = create_memo(move |_| {
+        store.torrents.with(|map| map.get(&h).cloned())
+    });
+
+    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_hash_class = t_hash.clone();
+                    let on_context_menu = on_context_menu.clone();
+
+                    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"
+                    };
+
+                    view! {
+                        <tr
+                            class=move || {
+                                let base = "hover border-b border-base-200 select-none";
+                                if selected_hash.get() == Some(t_hash_class.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();
+                                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>
+                    }
+                }
+            }
+        </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,
+) -> impl IntoView {
+    let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
+
+    let h = hash.clone();
+    let torrent = create_memo(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_hash_class = t_hash.clone();
+                    let on_context_menu = on_context_menu.clone();
 
-                            <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| {
                     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 {
@@ -414,10 +504,8 @@ pub fn TorrentTable() -> impl IntoView {
                         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 t_hash_long = t_hash.clone();
                     let leptos_use::UseTimeoutFnReturn { start, stop, .. } = use_timeout_fn(
                         move |pos: (i32, i32)| {
                             set_menu_position.set(pos);
@@ -459,15 +547,21 @@ pub fn TorrentTable() -> impl IntoView {
                     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 transition-transform active:scale-[0.99] select-none cursor-pointer";
+                                if selected_hash.get() == Some(t_hash_class.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();
                                 move |_| set_selected_hash.set(Some(t_hash.clone()))
                             }
                             on:touchstart=handle_touchstart
@@ -512,19 +606,8 @@ pub fn TorrentTable() -> impl IntoView {
                             </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,8 +1,8 @@
 mod app;
-// mod models; // Removed
 mod components;
 pub mod utils;
 pub mod store;
+pub mod api;
 
 use leptos::*;
 use wasm_bindgen::prelude::*;

frontend/src/store.rs

@@ -113,9 +113,11 @@ impl FilterStatus {
     }
 }
 
+use std::collections::HashMap;
+
 #[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,13 +126,16 @@ pub struct TorrentStore {
 }
 
 pub fn provide_torrent_store() {
-    let torrents = create_rw_signal(Vec::<Torrent>::new());
+    let torrents = create_rw_signal(HashMap::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);
 
+    // Browser notification hook
+    let show_browser_notification = crate::utils::notification::use_app_notification();
+
     let store = TorrentStore {
         torrents,
         filter,
@@ -149,6 +154,7 @@ pub fn provide_torrent_store() {
             return;
         }
 
+        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
@@ -189,12 +195,30 @@ pub fn provide_torrent_store() {
                                         if let Ok(event) = serde_json::from_str::<AppEvent>(&data_str) {
                                             match event {
                                                 AppEvent::FullList { torrents: list, .. } => {
-                                                    torrents.set(list);
+                                                    torrents.update(|map| {
+                                                        // 1. Create a set of new hashes for quick lookup
+                                                        let new_hashes: std::collections::HashSet<String> = list.iter().map(|t| t.hash.clone()).collect();
+                                                        
+                                                        // 2. Remove torrents that are no longer in the list
+                                                        map.retain(|hash, _| new_hashes.contains(hash));
+                                                        
+                                                        // 3. Update or Insert torrents from the new list
+                                                        for new_torrent in list {
+                                                            if let Some(existing) = map.get_mut(&new_torrent.hash) {
+                                                                // Only update if changed (Torrent derives PartialEq)
+                                                                if existing != &new_torrent {
+                                                                    *existing = new_torrent;
+                                                                }
+                                                            } else {
+                                                                // New torrent, insert it
+                                                                map.insert(new_torrent.hash.clone(), new_torrent);
+                                                            }
+                                                        }
+                                                    });
                                                 }
                                                 AppEvent::Update(update) => {
-                                                    torrents.update(|list| {
-                                                        if let Some(t) = list.iter_mut().find(|t| t.hash == update.hash)
-                                                        {
+                                                    torrents.update(|map| {
+                                                        if let Some(t) = map.get_mut(&update.hash) {
                                                             if let Some(name) = update.name {
                                                                 t.name = name;
                                                             }
@@ -247,7 +271,7 @@ pub fn provide_torrent_store() {
                                                             shared::NotificationLevel::Info => "ℹ️ VibeTorrent",
                                                         };
 
-                                                        crate::utils::notification::show_notification_if_enabled(
+                                                        show_browser_notification(
                                                             title,
                                                             &n.message
                                                         );
@@ -310,97 +334,52 @@ use serde::{Deserialize, Serialize};
 use wasm_bindgen::prelude::*;
 
 #[derive(Serialize, Deserialize, Debug)]
-struct PushSubscriptionData {
-    endpoint: String,
-    keys: PushKeys,
+pub struct PushSubscriptionData {
+    pub endpoint: String,
+    pub keys: PushKeys,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
-struct PushKeys {
-    p256dh: String,
-    auth: String,
+pub struct PushKeys {
+    pub p256dh: String,
+    pub 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;
+    use crate::api;
 
     // First, request notification permission if not already granted
     let window = web_sys::window().expect("window should exist");
     
-    // Notification.permission is a static property, but web_sys exposes it via the Notification class instance or we check it manually.
-    // Actually, Notification::permission() is a static method in web_sys.
-    match web_sys::Notification::permission() {
-        web_sys::NotificationPermission::Granted => {
-            log::info!("Notification permission already granted");
-        }
-        web_sys::NotificationPermission::Denied => {
-            log::warn!("Notification permission was denied");
+    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;
         }
-        web_sys::NotificationPermission::Default => {
-            log::info!("Requesting notification permission...");
-            let permission_promise = match web_sys::Notification::request_permission() {
-                Ok(p) => p,
-                Err(e) => {
-                    log::error!("Failed to request notification permission: {:?}", e);
-                    return;
-                }
-            };
-            
-            match wasm_bindgen_futures::JsFuture::from(permission_promise).await {
-                Ok(val) => {
-                    let permission = val.as_string().unwrap_or_default();
-                    if permission != "granted" {
-                        log::warn!("Notification permission denied by user");
-                        return;
-                    }
-                    log::info!("Notification permission granted by user");
-                }
-                Err(e) => {
-                    log::error!("Failed to await notification permission: {:?}", e);
-                    return;
-                }
-            }
-        }
-        _ => {
-             log::warn!("Unknown notification permission status");
-             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,
+    let public_key = match api::push::get_public_key().await {
+        Ok(key) => key,
         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) {
+    let public_key_array = match url_base64_to_uint8array(&public_key) {
         Ok(arr) => {
             log::info!("VAPID key converted to Uint8Array (length: {})", arr.length());
             arr
@@ -519,23 +498,8 @@ pub async fn subscribe_to_push_notifications() {
     };
 
     // 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());
+    if let Err(e) = api::push::subscribe(&subscription_data).await {
+        log::error!("Failed to send subscription to backend: {:?}", e);
     }
 }
 

frontend/src/utils/notification.rs

@@ -1,37 +1,19 @@
 use wasm_bindgen::prelude::*;
 use web_sys::{Notification, NotificationOptions};
+use leptos::*;
+use leptos_use::{use_web_notification, UseWebNotificationReturn, NotificationPermission};
 
 /// Request browser notification permission from user
 pub async fn request_notification_permission() -> bool {
-    let window = web_sys::window().expect("no global window");
-    
-    // Check if Notification API is available
-    if js_sys::Reflect::has(&window, &JsValue::from_str("Notification")).unwrap_or(false) {
-        let notification = js_sys::Reflect::get(&window, &JsValue::from_str("Notification"))
-            .expect("Notification should exist");
-        
-        // Request permission
-        let promise = js_sys::Reflect::get(&notification, &JsValue::from_str("requestPermission"))
-            .expect("requestPermission should exist");
-        
-        if let Ok(function) = promise.dyn_into::<js_sys::Function>() {
-            if let Ok(promise) = function.call0(&notification) {
-                if let Ok(promise) = promise.dyn_into::<js_sys::Promise>() {
-                    let result = wasm_bindgen_futures::JsFuture::from(promise).await;
-                    
-                    if let Ok(permission) = result {
-                        let permission_str = permission.as_string().unwrap_or_default();
-                        return permission_str == "granted";
-                    }
-                }
-            }
+    if let Ok(promise) = Notification::request_permission() {
+        if let Ok(result) = wasm_bindgen_futures::JsFuture::from(promise).await {
+            return result.as_string().unwrap_or_default() == "granted";
         }
     }
-    
     false
 }
 
-/// Check if browser notifications are supported and permitted
+/// Check if browser notifications are supported
 pub fn is_notification_supported() -> bool {
     let window = web_sys::window().expect("no global window");
     js_sys::Reflect::has(&window, &JsValue::from_str("Notification")).unwrap_or(false)
@@ -39,67 +21,61 @@ pub fn is_notification_supported() -> bool {
 
 /// Get current notification permission status
 pub fn get_notification_permission() -> String {
-    if !is_notification_supported() {
-        return "unsupported".to_string();
+    match Notification::permission() {
+        web_sys::NotificationPermission::Granted => "granted".to_string(),
+        web_sys::NotificationPermission::Denied => "denied".to_string(),
+        web_sys::NotificationPermission::Default => "default".to_string(),
+        _ => "default".to_string(),
     }
-    
-    let window = web_sys::window().expect("no global window");
-    let notification = js_sys::Reflect::get(&window, &JsValue::from_str("Notification"))
-        .expect("Notification should exist");
-    
-    let permission = js_sys::Reflect::get(&notification, &JsValue::from_str("permission"))
-        .unwrap_or(JsValue::from_str("default"));
-    
-    permission.as_string().unwrap_or("default".to_string())
 }
 
-/// Show a browser notification
-/// Returns true if notification was shown successfully
-pub fn show_browser_notification(title: &str, body: &str, icon: Option<&str>) -> bool {
-    // Check permission first
-    let permission = get_notification_permission();
-    if permission != "granted" {
-        log::warn!("Notification permission not granted: {}", permission);
+/// Hook for using browser notifications within Leptos components or effects.
+/// This uses leptos-use for reactive permission tracking.
+pub fn use_app_notification() -> impl Fn(&str, &str) + Clone {
+    let UseWebNotificationReturn { permission, .. } = use_web_notification();
+    
+    move |title: &str, body: &str| {
+        // Check user preference from localStorage
+        let window = web_sys::window().expect("no global window");
+        let storage = window.local_storage().ok().flatten();
+        let enabled = storage
+            .and_then(|s| s.get_item("vibetorrent_browser_notifications").ok().flatten())
+            .unwrap_or_else(|| "true".to_string());
+
+        // Use the reactive permission signal from leptos-use
+        if enabled == "true" && permission.get() == NotificationPermission::Granted {
+            show_browser_notification(title, body);
+        }
+    }
+}
+
+/// Show a browser notification (non-reactive version)
+pub fn show_browser_notification(title: &str, body: &str) -> bool {
+    if get_notification_permission() != "granted" {
         return false;
     }
     
-    // Create notification options
     let opts = NotificationOptions::new();
     opts.set_body(body);
-    opts.set_icon(icon.unwrap_or("/icon-192.png"));
-    opts.set_badge("/icon-192.png");
+    opts.set_icon("/icon-192.png");
     opts.set_tag("vibetorrent");
-    opts.set_require_interaction(false);
-    opts.set_silent(Some(false));
     
-    // Create and show notification
     match Notification::new_with_options(title, &opts) {
-        Ok(_notification) => {
-            true
-        }
-        Err(e) => {
-            log::error!("Failed to create notification: {:?}", e);
-            false
-        }
+        Ok(_) => true,
+        Err(_) => false,
     }
 }
 
-/// Show notification only if enabled in settings and permission granted
+/// Legacy helper for showing notification if enabled in settings
 pub fn show_notification_if_enabled(title: &str, body: &str) -> bool {
-    // Check localStorage for user preference
     let window = web_sys::window().expect("no global window");
     let storage = window.local_storage().ok().flatten();
+    let enabled = storage
+        .and_then(|s| s.get_item("vibetorrent_browser_notifications").ok().flatten())
+        .unwrap_or_else(|| "true".to_string());
         
-    if let Some(storage) = storage {
-        let enabled = storage
-            .get_item("vibetorrent_browser_notifications")
-            .ok()
-            .flatten()
-            .unwrap_or("true".to_string());
-        
-        if enabled == "true" {
-            return show_browser_notification(title, body, None);
-        }
+    if enabled == "true" {
+        return show_browser_notification(title, body);
     }
     
     false

shared/src/lib.rs

@@ -130,3 +130,9 @@ pub struct SetLabelRequest {
     pub hash: String,
     pub label: String,
 }
+
+#[derive(Debug, Serialize, Deserialize, Clone, ToSchema)]
+pub struct AddTorrentRequest {
+    #[schema(example = "magnet:?xt=urn:btih:...")]
+    pub uri: String,
+}