refactor: replace magic indices with RtorrentField enum for type-safe parsing

Cargo.lock

@@ -310,6 +310,7 @@ dependencies = [
  "serde_json",
  "shared",
  "sqlx",
+ "strum",
  "thiserror 2.0.18",
  "time",
  "tokio",
@@ -544,7 +545,7 @@ version = "4.5.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5"
 dependencies = [
- "heck",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
  "syn 2.0.114",
@@ -566,6 +567,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 +800,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 +868,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 +1201,9 @@ dependencies = [
 name = "frontend"
 version = "0.1.0"
 dependencies = [
+ "base64 0.22.1",
  "chrono",
+ "codee",
  "console_error_panic_hook",
  "console_log",
  "futures",
@@ -1152,9 +1211,11 @@ dependencies = [
  "gloo-timers",
  "js-sys",
  "leptos",
+ "leptos-use",
  "leptos_router",
  "log",
  "serde",
+ "serde-wasm-bindgen",
  "serde_json",
  "shared",
  "tailwind_fuse",
@@ -1476,6 +1537,12 @@ dependencies = [
  "hashbrown 0.15.5",
 ]
 
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -1819,6 +1886,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 +2059,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"
@@ -3613,7 +3710,7 @@ checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b"
 dependencies = [
  "dotenvy",
  "either",
- "heck",
+ "heck 0.5.0",
  "hex",
  "once_cell",
  "proc-macro2",
@@ -3756,6 +3853,28 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
+[[package]]
+name = "strum"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.114",
+]
+
 [[package]]
 name = "subtle"
 version = "2.6.1"
@@ -3934,6 +4053,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
 dependencies = [
  "displaydoc",
+ "serde_core",
  "zerovec",
 ]
 
@@ -4298,6 +4418,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 +5193,7 @@ version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
 dependencies = [
+ "serde",
  "yoke",
  "zerofrom",
  "zerovec-derive",

backend/Cargo.toml

@@ -42,3 +42,4 @@ anyhow = "1.0.101"
 time = { version = "0.3.47", features = ["serde", "formatting", "parsing"] }
 tower_governor = "0.8.0"
 governor = "0.10.4"
+strum = { version = "0.25", features = ["derive", "strum_macros"] }

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,
+    AddTorrentRequest, GlobalLimitRequest, SetFilePriorityRequest, SetLabelRequest, TorrentActionRequest,
-    TorrentPeer, TorrentTracker,
+    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

@@ -32,6 +32,7 @@ use tower_http::{
     cors::CorsLayer,
     trace::TraceLayer,
 };
+#[cfg(feature = "swagger")]
 use utoipa::OpenApi;
 #[cfg(feature = "swagger")]
 use utoipa_swagger_ui::SwaggerUi;
@@ -124,7 +125,7 @@ struct Args {
     ),
     components(
         schemas(
-            handlers::AddTorrentRequest,
+            shared::AddTorrentRequest,
             shared::TorrentActionRequest,
             shared::Torrent,
             shared::TorrentStatus,
@@ -171,7 +172,7 @@ struct ApiDoc;
     ),
     components(
         schemas(
-            handlers::AddTorrentRequest,
+            shared::AddTorrentRequest,
             shared::TorrentActionRequest,
             shared::Torrent,
             shared::TorrentStatus,

backend/src/sse.rs

@@ -7,95 +7,80 @@ use axum::response::sse::{Event, Sse};
 use futures::stream::{self, Stream};
 use shared::{AppEvent, GlobalStats, Torrent, TorrentStatus};
 use std::convert::Infallible;
+use strum::{Display, EnumString};
 use tokio_stream::StreamExt;
 
-// Field definitions to keep query and parser in sync
+#[derive(Debug, Clone, Copy, EnumString, Display, PartialEq)]
-mod fields {
+enum RtorrentField {
-    pub const IDX_HASH: usize = 0;
+    #[strum(serialize = "d.hash=")]
-    pub const CMD_HASH: &str = "d.hash=";
+    Hash,
-
+    #[strum(serialize = "d.name=")]
-    pub const IDX_NAME: usize = 1;
+    Name,
-    pub const CMD_NAME: &str = "d.name=";
+    #[strum(serialize = "d.size_bytes=")]
-
+    Size,
-    pub const IDX_SIZE: usize = 2;
+    #[strum(serialize = "d.bytes_done=")]
-    pub const CMD_SIZE: &str = "d.size_bytes=";
+    Completed,
-
+    #[strum(serialize = "d.down.rate=")]
-    pub const IDX_COMPLETED: usize = 3;
+    DownRate,
-    pub const CMD_COMPLETED: &str = "d.bytes_done=";
+    #[strum(serialize = "d.up.rate=")]
-
+    UpRate,
-    pub const IDX_DOWN_RATE: usize = 4;
+    #[strum(serialize = "d.state=")]
-    pub const CMD_DOWN_RATE: &str = "d.down.rate=";
+    State,
-
+    #[strum(serialize = "d.complete=")]
-    pub const IDX_UP_RATE: usize = 5;
+    Complete,
-    pub const CMD_UP_RATE: &str = "d.up.rate=";
+    #[strum(serialize = "d.message=")]
-
+    Message,
-    pub const IDX_STATE: usize = 6;
+    #[strum(serialize = "d.left_bytes=")]
-    pub const CMD_STATE: &str = "d.state=";
+    LeftBytes,
-
+    #[strum(serialize = "d.creation_date=")]
-    pub const IDX_COMPLETE: usize = 7;
+    CreationDate,
-    pub const CMD_COMPLETE: &str = "d.complete=";
+    #[strum(serialize = "d.hashing=")]
-
+    Hashing,
-    pub const IDX_MESSAGE: usize = 8;
+    #[strum(serialize = "d.custom1=")]
-    pub const CMD_MESSAGE: &str = "d.message=";
+    Label,
-
-    pub const IDX_LEFT_BYTES: usize = 9;
-    pub const CMD_LEFT_BYTES: &str = "d.left_bytes=";
-
-    pub const IDX_CREATION_DATE: usize = 10;
-    pub const CMD_CREATION_DATE: &str = "d.creation_date=";
-
-    pub const IDX_HASHING: usize = 11;
-    pub const CMD_HASHING: &str = "d.hashing=";
-
-    pub const IDX_LABEL: usize = 12;
-    pub const CMD_LABEL: &str = "d.custom1=";
 }
 
-use fields::*;
+const RTORRENT_FIELDS: &[RtorrentField] = &[
-
+    RtorrentField::Hash,
-// Constants for rTorrent fields to ensure query and parser stay in sync
+    RtorrentField::Name,
-const RTORRENT_FIELDS: &[&str] = &[
+    RtorrentField::Size,
-    "",     // Ignored by multicall pattern
+    RtorrentField::Completed,
-    "main", // View
+    RtorrentField::DownRate,
-    CMD_HASH,
+    RtorrentField::UpRate,
-    CMD_NAME,
+    RtorrentField::State,
-    CMD_SIZE,
+    RtorrentField::Complete,
-    CMD_COMPLETED,
+    RtorrentField::Message,
-    CMD_DOWN_RATE,
+    RtorrentField::LeftBytes,
-    CMD_UP_RATE,
+    RtorrentField::CreationDate,
-    CMD_STATE,
+    RtorrentField::Hashing,
-    CMD_COMPLETE,
+    RtorrentField::Label,
-    CMD_MESSAGE,
-    CMD_LEFT_BYTES,
-    CMD_CREATION_DATE,
-    CMD_HASHING,
-    CMD_LABEL,
 ];
 
-fn parse_long(s: Option<&String>) -> i64 {
+fn get_field_value(row: &Vec<String>, field: RtorrentField) -> String {
-    s.map(|v| v.parse().unwrap_or(0)).unwrap_or(0)
+    let idx = RTORRENT_FIELDS.iter().position(|&f| f == field).unwrap_or(0);
+    row.get(idx).cloned().unwrap_or_default()
 }
 
-fn parse_string(s: Option<&String>) -> String {
+fn parse_long(s: &str) -> i64 {
-    s.cloned().unwrap_or_default()
+    s.parse().unwrap_or(0)
 }
 
 /// Converts a raw row of strings from rTorrent XML-RPC into a generic Torrent struct
-fn from_rtorrent_row(row: Vec<String>) -> Torrent {
+fn from_rtorrent_row(row: &Vec<String>) -> Torrent {
-    let hash = parse_string(row.get(IDX_HASH));
+    let hash = get_field_value(row, RtorrentField::Hash);
-    let name = parse_string(row.get(IDX_NAME));
+    let name = get_field_value(row, RtorrentField::Name);
-    let size = parse_long(row.get(IDX_SIZE));
+    let size = parse_long(&get_field_value(row, RtorrentField::Size));
-    let completed = parse_long(row.get(IDX_COMPLETED));
+    let completed = parse_long(&get_field_value(row, RtorrentField::Completed));
-    let down_rate = parse_long(row.get(IDX_DOWN_RATE));
+    let down_rate = parse_long(&get_field_value(row, RtorrentField::DownRate));
-    let up_rate = parse_long(row.get(IDX_UP_RATE));
+    let up_rate = parse_long(&get_field_value(row, RtorrentField::UpRate));
 
-    let state = parse_long(row.get(IDX_STATE));
+    let state = parse_long(&get_field_value(row, RtorrentField::State));
-    let is_complete = parse_long(row.get(IDX_COMPLETE));
+    let is_complete = parse_long(&get_field_value(row, RtorrentField::Complete));
-    let message = parse_string(row.get(IDX_MESSAGE));
+    let message = get_field_value(row, RtorrentField::Message);
-    let left_bytes = parse_long(row.get(IDX_LEFT_BYTES));
+    let left_bytes = parse_long(&get_field_value(row, RtorrentField::LeftBytes));
-    let added_date = parse_long(row.get(IDX_CREATION_DATE));
+    let added_date = parse_long(&get_field_value(row, RtorrentField::CreationDate));
-    let is_hashing = parse_long(row.get(IDX_HASHING));
+    let is_hashing = parse_long(&get_field_value(row, RtorrentField::Hashing));
-    let label_raw = parse_string(row.get(IDX_LABEL));
+    let label_raw = get_field_value(row, RtorrentField::Label);
 
     let label = if label_raw.is_empty() {
         None
@@ -146,7 +131,10 @@ fn from_rtorrent_row(row: Vec<String>) -> Torrent {
 }
 
 pub async fn fetch_torrents(client: &RtorrentClient) -> Result<Vec<Torrent>, XmlRpcError> {
-    let params: Vec<RpcParam> = RTORRENT_FIELDS.iter().map(|s| RpcParam::from(*s)).collect();
+    let params: Vec<RpcParam> = RTORRENT_FIELDS
+        .iter()
+        .map(|&f| RpcParam::from(f.to_string()))
+        .collect();
     let xml = client.call("d.multicall2", &params).await?;
 
     if xml.trim().is_empty() {
@@ -155,7 +143,7 @@ pub async fn fetch_torrents(client: &RtorrentClient) -> Result<Vec<Torrent>, Xml
 
     let rows = parse_multicall_response(&xml)?;
 
-    let torrents = rows.into_iter().map(from_rtorrent_row).collect();
+    let torrents = rows.iter().map(from_rtorrent_row).collect();
 
     Ok(torrents)
 }

frontend/Cargo.toml

@@ -22,33 +22,11 @@ wasm-bindgen-futures = "0.4"
 uuid = { version = "1", features = ["v4", "js"] }
 futures = "0.3"
 chrono = { version = "0.4", features = ["serde", "wasm-bindgen"] }
-web-sys = { version = "0.3", features = [
+web-sys = { version = "0.3", features = ["HtmlDivElement", "HtmlUListElement", "HtmlLiElement", "HtmlAnchorElement", "MouseEvent", "Event", "Window", "Document", "Element", "DomTokenList", "CssStyleDeclaration", "Storage", "TouchEvent", "TouchList", "Touch", "Navigator", "Notification", "NotificationOptions", "NotificationPermission", "ServiceWorkerContainer", "ServiceWorkerRegistration", "PushManager", "PushSubscription", "PushSubscriptionOptions", "PushSubscriptionOptionsInit", "HtmlDetailsElement"] }
-    "HtmlDivElement",
-    "HtmlUListElement",
-    "HtmlLiElement",
-    "HtmlAnchorElement",
-    "MouseEvent",
-    "Event",
-    "Window",
-    "Document",
-    "Element",
-    "DomTokenList",
-    "CssStyleDeclaration",
-    "Storage",
-    "TouchEvent",
-    "TouchList",
-    "Touch",
-    "Navigator",
-    "Notification",
-    "NotificationOptions",
-    "NotificationPermission",
-    "ServiceWorkerContainer",
-    "ServiceWorkerRegistration",
-    "PushManager",
-    "PushSubscription",
-    "PushSubscriptionOptions",
-    "PushSubscriptionOptionsInit"
-] }
 shared = { path = "../shared" }
 tailwind_fuse = "0.3.2"
-js-sys = "0.3.85"
+js-sys = "0.3.85"
+base64 = "0.22.1"
+serde-wasm-bindgen = "0.6.5"
+leptos-use = "0.13"
+codee = "0.2"

frontend/index.html

@@ -4,7 +4,7 @@
         <meta charset="utf-8" />
         <meta
             name="viewport"
-            content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover"
+            content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover"
         />
         <title>VibeTorrent</title>
 
@@ -81,7 +81,7 @@
         </script>
     </head>
 
-    <body>
+    <body style="cursor: pointer;">
         <div
             id="app-loading"
             style="
@@ -142,6 +142,19 @@
             body.app-loaded #app-loading {
                 display: none !important;
             }
+
+            /* iOS Safari Click Fixes */
+            body {
+                cursor: pointer;
+                -webkit-tap-highlight-color: transparent;
+            }
+
+            summary {
+                list-style: none;
+            }
+            summary::-webkit-details-marker {
+                display: none;
+            }
         </style>
 
         <script>
@@ -174,6 +187,17 @@
         
         <!-- Service Worker Registration & PWA Setup -->
         <script>
+            // Global Dropdown Closer for iOS/Mobile
+            document.addEventListener('click', function(event) {
+                const details = document.querySelectorAll('details[open]');
+                details.forEach(detail => {
+                    // Eğer tıklanan yer bu details'in içinde değilse kapat
+                    if (!detail.contains(event.target)) {
+                        detail.removeAttribute('open');
+                    }
+                });
+            }, true); // Use capture phase for better mobile support
+
             if ("serviceWorker" in navigator) {
                 window.addEventListener("load", () => {
                     navigator.serviceWorker

frontend/src/components/context_menu.rs

@@ -1,4 +1,5 @@
 use leptos::*;
+use leptos_use::on_click_outside;
 
 #[component]
 pub fn ContextMenu(
@@ -8,6 +9,10 @@ pub fn ContextMenu(
     on_close: Callback<()>,
     on_action: Callback<(String, String)>, // (Action, Hash)
 ) -> impl IntoView {
+    let container_ref = create_node_ref::<html::Div>();
+    
+    let _ = on_click_outside(container_ref, move |_| on_close.call(()));
+
     let handle_action = move |action: &str| {
         let hash = torrent_hash.clone();
         let action_str = action.to_string();
@@ -22,16 +27,8 @@ pub fn ContextMenu(
     }
 
     view! {
-        // Backdrop to catch clicks outside
-        <div 
-            class="fixed inset-0 z-[99] cursor-default" 
-            role="button"
-            tabindex="-1"
-            on:click=move |_| on_close.call(())
-            on:contextmenu=move |e| e.prevent_default()
-        ></div>
-
         <div 
+            node_ref=container_ref
             class="fixed z-[100] min-w-[200px] animate-in fade-in zoom-in-95 duration-100"
             style=format!("left: {}px; top: {}px", position.0, position.1)
             on:contextmenu=move |e| e.prevent_default()

frontend/src/components/layout/statusbar.rs

@@ -1,4 +1,6 @@
 use leptos::*;
+use leptos_use::storage::use_local_storage;
+use codee::string::FromToStringCodec;
 use shared::GlobalLimitRequest;
 
 fn format_bytes(bytes: i64) -> String {
@@ -26,34 +28,19 @@ pub fn StatusBar() -> impl IntoView {
     let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
     let stats = store.global_stats;
 
-    let initial_theme = if let Some(win) = web_sys::window() {
+    // Use leptos-use for reactive localStorage management
-        if let Some(doc) = win.document() {
+    let (current_theme, set_current_theme, _) = use_local_storage::<String, FromToStringCodec>("vibetorrent_theme");
-            doc.document_element()
-                .and_then(|el| el.get_attribute("data-theme"))
-                .unwrap_or_else(|| "dark".to_string())
-        } else {
-            "dark".to_string()
-        }
-    } else {
-        "dark".to_string()
-    };
 
-    let (current_theme, set_current_theme) = create_signal(initial_theme);
+    // Initialize with default if empty
+    if current_theme.get_untracked().is_empty() {
+        set_current_theme.set("dark".to_string());
+    }
 
+    // Automatically sync theme to document attribute
     create_effect(move |_| {
-        if let Some(win) = web_sys::window() {
+        let theme = current_theme.get().to_lowercase();
-            if let Some(storage) = win.local_storage().ok().flatten() {
+        if let Some(doc) = document().document_element() {
-                if let Ok(Some(stored_theme)) = storage.get_item("vibetorrent_theme") {
+            let _ = doc.set_attribute("data-theme", &theme);
-                    let theme = stored_theme.to_lowercase();
-                    set_current_theme.set(theme.clone());
-                    if let Some(doc) = win.document() {
-                        let _ = doc
-                            .document_element()
-                            .unwrap()
-                            .set_attribute("data-theme", &theme);
-                    }
-                }
-            }
         }
     });
 
@@ -109,45 +96,24 @@ pub fn StatusBar() -> impl IntoView {
         });
     };
 
-        // Signal-based dropdown state: 0=none, 1=download, 2=upload, 3=theme
+        // Refs for click outside detection (Handled globally via JS in index.html for better iOS support)
-        let (active_dropdown, set_active_dropdown) = create_signal(0u8);
+        let down_details_ref = create_node_ref::<html::Details>();
+        let up_details_ref = create_node_ref::<html::Details>();
+        let theme_details_ref = create_node_ref::<html::Details>();
 
-        // Toggle a specific dropdown
+        // Helper to close a details element
-        let toggle = move |id: u8| {
+        let close_details = |node_ref: NodeRef<html::Details>| {
-            let current = active_dropdown.get_untracked();
+            if let Some(el) = node_ref.get_untracked() {
-            if current == id {
+                el.set_open(false);
-                set_active_dropdown.set(0);
-            } else {
-                set_active_dropdown.set(id);
             }
         };
 
-        // Close all dropdowns
-        let close_all = move || {
-            set_active_dropdown.set(0);
-        };
-
         view! {
-            // Transparent overlay to close dropdowns when clicking outside
+            <div class="fixed bottom-0 left-0 right-0 h-8 min-h-8 bg-base-200 border-t border-base-300 flex items-center px-4 text-xs gap-4 text-base-content/70 z-[99] cursor-pointer">
-            <Show when=move || active_dropdown.get() != 0>
-                <div
-                    class="fixed inset-0 z-[98] cursor-default"
-                    on:pointerdown=move |_| close_all()
-                ></div>
-            </Show>
-
-            <div class="fixed bottom-0 left-0 right-0 h-8 min-h-8 bg-base-200 border-t border-base-300 flex items-center px-4 text-xs gap-4 text-base-content/70 z-[99]">
 
                 // --- DOWNLOAD SPEED DROPDOWN ---
-                <div class="relative">
+                <details class="dropdown dropdown-top" node_ref=down_details_ref>
-                    <div
+                    <summary class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none list-none [&::-webkit-details-marker]:hidden outline-none">
-                        class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none"
-                        title="Global Download Speed - Click to Set Limit"
-                        on:pointerdown=move |e| {
-                            e.stop_propagation();
-                            toggle(1);
-                        }
-                    >
                         <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
                             <path stroke-linecap="round" stroke-linejoin="round" d="M19.5 13.5L12 21m0 0l-7.5-7.5M12 21V3" />
                         </svg>
@@ -157,12 +123,9 @@ pub fn StatusBar() -> impl IntoView {
                                 {move || format!("(Limit: {})", format_speed(stats.get().down_limit.unwrap_or(0)))}
                             </span>
                         </Show>
-                    </div>
+                    </summary>
 
-                    <ul
+                    <ul class="dropdown-content z-[100] menu p-2 shadow bg-base-200 rounded-box w-40 mb-2 border border-base-300">
-                        class="absolute bottom-full left-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-40 mb-2 border border-base-300"
-                        style=move || if active_dropdown.get() == 1 { "display: block" } else { "display: none" }
-                    >
                         {
                             limits.clone().into_iter().map(|(val, label)| {
                                 let is_active = move || {
@@ -173,10 +136,9 @@ pub fn StatusBar() -> impl IntoView {
                                     <li>
                                         <button
                                             class=move || if is_active() { "bg-primary/10 text-primary font-bold text-xs flex justify-between" } else { "text-xs flex justify-between" }
-                                            on:pointerdown=move |e| {
+                                            on:click=move |_| {
-                                                e.stop_propagation();
                                                 set_limit("down", val);
-                                                close_all();
+                                                close_details(down_details_ref);
                                             }
                                         >
                                             {label}
@@ -189,18 +151,11 @@ pub fn StatusBar() -> impl IntoView {
                             }).collect::<Vec<_>>()
                         }
                     </ul>
-                </div>
+                </details>
 
                 // --- UPLOAD SPEED DROPDOWN ---
-                <div class="relative">
+                <details class="dropdown dropdown-top" node_ref=up_details_ref>
-                    <div
+                    <summary class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none list-none [&::-webkit-details-marker]:hidden outline-none">
-                        class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none"
-                        title="Global Upload Speed - Click to Set Limit"
-                        on:pointerdown=move |e| {
-                            e.stop_propagation();
-                            toggle(2);
-                        }
-                    >
                         <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
                             <path stroke-linecap="round" stroke-linejoin="round" d="M4.5 10.5L12 3m0 0l7.5 7.5M12 3v18" />
                         </svg>
@@ -210,12 +165,9 @@ pub fn StatusBar() -> impl IntoView {
                                 {move || format!("(Limit: {})", format_speed(stats.get().up_limit.unwrap_or(0)))}
                             </span>
                         </Show>
-                    </div>
+                    </summary>
 
-                    <ul
+                    <ul class="dropdown-content z-[100] menu p-2 shadow bg-base-200 rounded-box w-40 mb-2 border border-base-300">
-                        class="absolute bottom-full left-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-40 mb-2 border border-base-300"
-                        style=move || if active_dropdown.get() == 2 { "display: block" } else { "display: none" }
-                    >
                         {
                             limits.clone().into_iter().map(|(val, label)| {
                                 let is_active = move || {
@@ -226,10 +178,9 @@ pub fn StatusBar() -> impl IntoView {
                                     <li>
                                         <button
                                             class=move || if is_active() { "bg-primary/10 text-primary font-bold text-xs flex justify-between" } else { "text-xs flex justify-between" }
-                                            on:pointerdown=move |e| {
+                                            on:click=move |_| {
-                                                e.stop_propagation();
                                                 set_limit("up", val);
-                                                close_all();
+                                                close_details(up_details_ref);
                                             }
                                         >
                                             {label}
@@ -242,27 +193,17 @@ pub fn StatusBar() -> impl IntoView {
                             }).collect::<Vec<_>>()
                         }
                     </ul>
-                </div>
+                </details>
 
                 <div class="ml-auto flex items-center gap-4">
-                    <div class="relative">
+                    <details class="dropdown dropdown-top dropdown-end" node_ref=theme_details_ref>
-                        <div
+                        <summary class="btn btn-ghost btn-xs btn-square cursor-pointer outline-none list-none [&::-webkit-details-marker]:hidden">
-                            class="btn btn-ghost btn-xs btn-square"
-                            title="Change Theme"
-                            on:pointerdown=move |e| {
-                                e.stop_propagation();
-                                toggle(3);
-                            }
-                        >
                             <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
                                 <path stroke-linecap="round" stroke-linejoin="round" d="M9.53 16.122a3 3 0 0 0-5.78 1.128 2.25 2.25 0 0 1-2.4 2.245 4.5 4.5 0 0 0 8.4-2.245c0-.399-.078-.78-.22-1.128Zm0 0a15.998 15.998 0 0 0 3.388-1.62m-5.043-.025a15.994 15.994 0 0 1 1.622-3.395m3.42 3.42a15.995 15.995 0 0 0 4.764-4.648l3.876-5.814a1.151 1.151 0 0 0-1.597-1.597L14.146 6.32a15.996 15.996 0 0 0-4.649 4.763m3.42 3.42a6.776 6.776 0 0 0-3.42-3.42" />
                             </svg>
-                        </div>
+                        </summary>
 
-                        <ul
+                        <ul class="dropdown-content z-[100] menu p-2 shadow bg-base-200 rounded-box w-52 mb-2 border border-base-300 max-h-96 overflow-y-auto">
-                            class="absolute bottom-full right-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-52 mb-2 border border-base-300 max-h-96 overflow-y-auto"
-                            style=move || if active_dropdown.get() == 3 { "display: block" } else { "display: none" }
-                        >
                             {
                                 let themes = vec![
                                     "light", "dark", "dim", "nord", "cupcake", "dracula", "cyberpunk", "emerald", "sunset", "abyss"
@@ -272,18 +213,9 @@ pub fn StatusBar() -> impl IntoView {
                                         <li>
                                             <button
                                                 class=move || if current_theme.get() == theme { "bg-primary/10 text-primary font-bold text-xs capitalize" } else { "text-xs capitalize" }
-                                                on:pointerdown=move |e| {
+                                                on:click=move |_| {
-                                                    e.stop_propagation();
                                                     set_current_theme.set(theme.to_string());
-                                                    if let Some(win) = web_sys::window() {
+                                                    close_details(theme_details_ref);
-                                                        if let Some(doc) = win.document() {
-                                                            let _ = doc.document_element().unwrap().set_attribute("data-theme", theme);
-                                                        }
-                                                        if let Some(storage) = win.local_storage().ok().flatten() {
-                                                            let _ = storage.set_item("vibetorrent_theme", theme);
-                                                        }
-                                                    }
-                                                    close_all();
                                                 }
                                             >
                                                 {theme}
@@ -293,7 +225,7 @@ pub fn StatusBar() -> impl IntoView {
                                 }).collect::<Vec<_>>()
                             }
                         </ul>
-                    </div>
+                    </details>
                 <button
                     class="btn btn-ghost btn-xs btn-square"
                     title="Settings & Notification Permissions"

frontend/src/components/torrent/add_torrent.rs

@@ -1,7 +1,7 @@
 use leptos::*;
 use leptos::html::Dialog;
 use crate::store::{show_toast_with_signal, TorrentStore};
-use shared::NotificationLevel;
+use shared::{AddTorrentRequest, NotificationLevel};
 
 
 #[component]
@@ -36,9 +36,7 @@ pub fn AddTorrentModal(
         set_error_msg.set(None);
 
         spawn_local(async move {
-            let req_body = serde_json::json!({
+            let req_body = AddTorrentRequest { uri: uri_val };
-                "uri": uri_val
-            });
 
             match gloo_net::http::Request::post("/api/torrents/add")
                 .json(&req_body)

frontend/src/components/torrent/table.rs

@@ -1,6 +1,5 @@
 use leptos::*;
-use wasm_bindgen::closure::Closure;
+use leptos_use::{on_click_outside, use_timeout_fn};
-use wasm_bindgen::JsCast;
 use crate::store::{get_action_messages, show_toast_with_signal};
 use shared::NotificationLevel;
 
@@ -165,8 +164,13 @@ pub fn TorrentTable() -> impl IntoView {
         }
     };
 
-    // Signal-based sort dropdown for mobile
+    // Refs for click outside detection
-    let (sort_open, set_sort_open) = create_signal(false);
+    let sort_details_ref = create_node_ref::<html::Details>();
+    let _ = on_click_outside(sort_details_ref, move |_| {
+        if let Some(el) = sort_details_ref.get_untracked() {
+            el.set_open(false);
+        }
+    });
 
     let sort_arrow = move |col: SortColumn| {
         if sort_col.get() == col {
@@ -341,29 +345,18 @@ pub fn TorrentTable() -> impl IntoView {
                 </table>
             </div>
 
-                        <div class="md:hidden flex flex-col h-full bg-base-200 relative">
+                        <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">
+                            <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="relative">
+                                <details class="dropdown dropdown-end" node_ref=sort_details_ref>
-                                    <div
+                                    <summary class="btn btn-ghost btn-xs gap-1 opacity-70 font-normal list-none [&::-webkit-details-marker]:hidden cursor-pointer">
-                                        role="button"
+                                        <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">
-                                        class="btn btn-ghost btn-xs gap-1 opacity-70 font-normal"
-                                        on:pointerdown=move |e| {
-                                            e.stop_propagation();
-                                            let cur = sort_open.get_untracked();
-                                            set_sort_open.set(!cur);
-                                        }
-                                    >
-                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
                                             <path stroke-linecap="round" stroke-linejoin="round" d="M3 7.5L7.5 3m0 0L12 7.5M7.5 3v13.5m13.5 0L16.5 21m0 0L12 16.5m4.5 4.5V7.5" />
                                         </svg>
-                                        "Sort"
+                                        <span class="pointer-events-none">"Sort"</span>
-                                    </div>
+                                    </summary>
-                                    <ul
+                                    <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">
-                                        class="absolute top-full right-0 z-[100] menu p-2 shadow bg-base-100 rounded-box w-48 mt-1 border border-base-200 text-xs"
-                                        style=move || if sort_open.get() { "display: block" } else { "display: none" }
-                                    >
                                          <li class="menu-title px-2 py-1 opacity-50 text-[10px] uppercase font-bold">"Sort By"</li>
                                          {
                                               let columns = vec![
@@ -386,10 +379,11 @@ pub fn TorrentTable() -> impl IntoView {
                                                           <button
                                                               type="button"
                                                               class=move || if is_active() { "bg-primary/10 text-primary font-bold flex justify-between" } else { "flex justify-between" }
-                                                              on:pointerdown=move |e| {
+                                                              on:click=move |_| {
-                                                                  e.stop_propagation();
                                                                   handle_sort(col);
-                                                                  set_sort_open.set(false);
+                                                                  if let Some(el) = sort_details_ref.get_untracked() {
+                                                                      el.set_open(false);
+                                                                  }
                                                               }
                                                           >
                                                              {label}
@@ -407,10 +401,10 @@ pub fn TorrentTable() -> impl IntoView {
                                              }).collect::<Vec<_>>()
                                          }
                                     </ul>
-                                </div>
+                                </details>
                             </div>
 
-                            <div class="overflow-y-auto p-3 pb-20 flex-1 grid grid-cols-1 content-start gap-3">                {move || filtered_torrents().into_iter().map(|t| {
+                            <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 {
@@ -423,62 +417,49 @@ pub fn TorrentTable() -> impl IntoView {
                     let _t_hash = t.hash.clone();
                     let t_hash_click = t.hash.clone();
 
-                    let (timer_id, set_timer_id) = create_signal(Option::<i32>::None);
                     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);
+                            set_selected_hash.set(Some(t_hash_long.clone()));
+                            set_menu_visible.set(true);
 
-                    let clear_timer = move || {
+                            // Haptic feedback
-                        if let Some(id) = timer_id.get_untracked() {
+                            let navigator = window().navigator();
-                            window().clear_timeout_with_handle(id);
+                            if let Ok(vibrate) = js_sys::Reflect::get(&navigator, &"vibrate".into()) {
-                            set_timer_id.set(None);
+                                if vibrate.is_function() {
-                        }
+                                    let _ = navigator.vibrate_with_duration(50);
-                    };
+                                }
+                            }
+                        },
+                        600.0,
+                    );
 
                     let handle_touchstart = {
-                         let t_hash = t_hash_long.clone();
+                        let start = start.clone();
-                         move |e: web_sys::TouchEvent| {
+                        move |e: web_sys::TouchEvent| {
-                            clear_timer();
                             if let Some(touch) = e.touches().get(0) {
-                                let x = touch.client_x();
+                                start((touch.client_x(), touch.client_y()));
-                                let y = touch.client_y();
-                                let hash = t_hash.clone();
-
-                                let closure = Closure::wrap(Box::new(move || {
-                                    set_menu_position.set((x, y));
-                                    set_selected_hash.set(Some(hash.clone()));
-                                    set_menu_visible.set(true);
-
-                                    // Haptic feedback (iOS Safari doesn't support vibrate)
-                                    let navigator = window().navigator();
-                                    if js_sys::Reflect::has(&navigator, &wasm_bindgen::JsValue::from_str("vibrate")).unwrap_or(false) {
-                                        let _ = navigator.vibrate_with_duration(50);
-                                    }
-                                }) as Box<dyn Fn()>);
-
-                                let id = window()
-                                    .set_timeout_with_callback_and_timeout_and_arguments_0(
-                                        closure.as_ref().unchecked_ref(),
-                                        600
-                                    )
-                                    .unwrap_or(0);
-
-                                closure.forget();
-                                set_timer_id.set(Some(id));
                             }
                         }
                     };
 
-                    let handle_touchmove = move |_| {
+                    let handle_touchmove = {
-                        clear_timer();
+                        let stop = stop.clone();
+                        move |_| stop()
                     };
 
-                    let handle_touchend = move |_| {
+                    let handle_touchend = {
-                        clear_timer();
+                        let stop = stop.clone();
+                        move |_| stop()
                     };
 
+                    let handle_touchcancel = move |_| stop();
+
                     view! {
                         <div
                             class=move || {
-                                "card card-compact bg-base-100 shadow-sm border border-base-200 transition-transform active:scale-[0.99] select-none"
+                                "card card-compact bg-base-100 shadow-sm border border-base-200 transition-transform active:scale-[0.99] select-none cursor-pointer"
                             }
                             style="user-select: none; -webkit-user-select: none; -webkit-touch-callout: none;"
                             on:contextmenu={
@@ -492,7 +473,7 @@ pub fn TorrentTable() -> impl IntoView {
                             on:touchstart=handle_touchstart
                             on:touchmove=handle_touchmove
                             on:touchend=handle_touchend
-                            on:touchcancel=handle_touchend
+                            on:touchcancel=handle_touchcancel
                         >
                             <div class="card-body gap-3">
                                 <div class="flex justify-between items-start gap-2">

frontend/src/store.rs

@@ -131,6 +131,9 @@ pub fn provide_torrent_store() {
     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 +152,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
@@ -247,7 +251,7 @@ pub fn provide_torrent_store() {
                                                             shared::NotificationLevel::Info => "ℹ️ VibeTorrent",
                                                         };
 
-                                                        crate::utils::notification::show_notification_if_enabled(
+                                                        show_browser_notification(
                                                             title,
                                                             &n.message
                                                         );
@@ -328,71 +332,22 @@ pub async fn subscribe_to_push_notifications() {
 
     // First, request notification permission if not already granted
     let window = web_sys::window().expect("window should exist");
-    let permission_granted = if let Ok(notification_class) = js_sys::Reflect::get(&window, &"Notification".into()) {
+    
-        if notification_class.is_undefined() {
+    let permission = crate::utils::notification::get_notification_permission();
-            log::error!("Notification API not available");
+    if permission == "default" {
+        log::info!("Requesting notification permission...");
+        if !crate::utils::notification::request_notification_permission().await {
+            log::warn!("Notification permission denied by user");
             return;
         }
-
+    } else if permission == "denied" {
-        // Check current permission
+        log::warn!("Notification permission was denied");
-        let current_permission = js_sys::Reflect::get(&notification_class, &"permission".into())
-            .ok()
-            .and_then(|p| p.as_string())
-            .unwrap_or_default();
-
-        if current_permission == "granted" {
-            log::info!("Notification permission already granted");
-            true
-        } else if current_permission == "denied" {
-            log::warn!("Notification permission was denied");
-            return;
-        } else {
-            // Permission is "default" - need to request
-            log::info!("Requesting notification permission...");
-            if let Ok(request_fn) = js_sys::Reflect::get(&notification_class, &"requestPermission".into()) {
-                if request_fn.is_function() {
-                    let request_fn_typed = js_sys::Function::from(request_fn);
-                    match request_fn_typed.call0(&notification_class) {
-                        Ok(promise_val) => {
-                            let request_future = wasm_bindgen_futures::JsFuture::from(
-                                js_sys::Promise::from(promise_val)
-                            );
-                            match request_future.await {
-                                Ok(result) => {
-                                    let result_str = result.as_string().unwrap_or_default();
-                                    log::info!("Permission request result: {}", result_str);
-                                    result_str == "granted"
-                                }
-                                Err(e) => {
-                                    log::error!("Failed to request notification permission: {:?}", e);
-                                    false
-                                }
-                            }
-                        }
-                        Err(e) => {
-                            log::error!("Failed to call requestPermission: {:?}", e);
-                            false
-                        }
-                    }
-                } else {
-                    false
-                }
-            } else {
-                false
-            }
-        }
-    } else {
-        log::error!("Cannot access Notification class");
-        return;
-    };
-
-    if !permission_granted {
-        log::warn!("Notification permission not granted, cannot subscribe to push");
         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,
@@ -433,7 +388,6 @@ pub async fn subscribe_to_push_notifications() {
     };
 
     // Get service worker registration
-    let window = web_sys::window().expect("window should exist");
     let navigator = window.navigator();
     let service_worker = navigator.service_worker();
 
@@ -494,38 +448,45 @@ pub async fn subscribe_to_push_notifications() {
         .dyn_into::<web_sys::PushSubscription>()
         .expect("should be PushSubscription");
 
-    // Get subscription JSON using toJSON() method
+    // PushSubscription objects can be serialized directly via JSON.stringify which calls their toJSON method internally.
-    let json_result = match js_sys::Reflect::get(&push_subscription, &"toJSON".into()) {
+    // Or we can use Reflect to call toJSON if we want the object directly.
+    // Let's use the robust way: call toJSON via Reflect but handle it gracefully.
+    let json_val = match js_sys::Reflect::get(&push_subscription, &"toJSON".into()) {
         Ok(func) if func.is_function() => {
-            let json_func = js_sys::Function::from(func);
+             let json_func = js_sys::Function::from(func);
-            match json_func.call0(&push_subscription) {
+             match json_func.call0(&push_subscription) {
-                Ok(result) => result,
+                 Ok(res) => res,
+                 Err(e) => {
+                     log::error!("Failed to call toJSON: {:?}", e);
+                     return;
+                 }
+             }
+        }
+        _ => {
+            // Fallback: try to stringify the object directly
+            // log::warn!("toJSON not found, trying JSON.stringify");
+            let json_str = match js_sys::JSON::stringify(&push_subscription) {
+                Ok(s) => s,
                 Err(e) => {
-                    log::error!("Failed to call toJSON: {:?}", e);
+                    log::error!("Failed to stringify subscription: {:?}", e);
+                    return;
+                }
+            };
+            // Parse back to object to match our expected flow (slightly inefficient but safe)
+            match js_sys::JSON::parse(&String::from(json_str)) {
+                Ok(v) => v,
+                Err(e) => {
+                    log::error!("Failed to parse stringified subscription: {:?}", e);
                     return;
                 }
             }
         }
-        _ => {
-            log::error!("toJSON method not found on PushSubscription");
-            return;
-        }
     };
-
+    
-    let json_value = match js_sys::JSON::stringify(&json_result) {
+    // Convert JsValue (JSON object) to PushSubscriptionJSON struct via serde
-        Ok(val) => val,
+    // Note: web_sys::PushSubscriptionJSON is not a struct we can directly use with serde_json usually,
-        Err(e) => {
+    // but we can use serde-wasm-bindgen to convert JsValue -> Rust Struct
-            log::error!("Failed to stringify subscription: {:?}", e);
+    let subscription_data: PushSubscriptionData = match serde_wasm_bindgen::from_value(json_val) {
-            return;
-        }
-    };
-
-    let subscription_json_str = json_value.as_string().expect("should be string");
-
-    log::info!("Push subscription: {}", subscription_json_str);
-
-    // Parse and send to backend
-    let subscription_data: serde_json::Value = match serde_json::from_str(&subscription_json_str) {
         Ok(data) => data,
         Err(e) => {
             log::error!("Failed to parse subscription JSON: {:?}", e);
@@ -533,37 +494,9 @@ pub async fn subscribe_to_push_notifications() {
         }
     };
 
-    // Extract endpoint and keys
+    // Send to backend (subscription_data is already the struct we need)
-    let endpoint = subscription_data
-        .get("endpoint")
-        .and_then(|v| v.as_str())
-        .expect("endpoint should exist")
-        .to_string();
-
-    let keys_obj = subscription_data
-        .get("keys")
-        .expect("keys should exist");
-
-    let p256dh = keys_obj
-        .get("p256dh")
-        .and_then(|v| v.as_str())
-        .expect("p256dh should exist")
-        .to_string();
-
-    let auth = keys_obj
-        .get("auth")
-        .and_then(|v| v.as_str())
-        .expect("auth should exist")
-        .to_string();
-
-    let push_data = PushSubscriptionData {
-        endpoint,
-        keys: PushKeys { p256dh, auth },
-    };
-
-    // Send to backend
     let response = match Request::post("/api/push/subscribe")
-        .json(&push_data)
+        .json(&subscription_data)
         .expect("serialization should succeed")
         .send()
         .await
@@ -583,34 +516,15 @@ pub async fn subscribe_to_push_notifications() {
 }
 
 /// Helper to convert URL-safe base64 string to Uint8Array
-/// Uses JavaScript to properly decode binary data (avoids UTF-8 encoding issues)
+/// Uses pure Rust base64 crate for better safety and performance
 fn url_base64_to_uint8array(base64_string: &str) -> Result<js_sys::Uint8Array, JsValue> {
-    // Add padding
+    use base64::{engine::general_purpose, Engine as _};
-    let padding = (4 - (base64_string.len() % 4)) % 4;
-    let mut padded = base64_string.to_string();
-    padded.push_str(&"=".repeat(padding));
 
-    // Replace URL-safe characters
+    // VAPID keys are URL-safe base64. Try both NO_PAD and padded for robustness.
-    let standard_base64 = padded.replace('-', "+").replace('_', "/");
+    let bytes = general_purpose::URL_SAFE_NO_PAD
+        .decode(base64_string)
+        .or_else(|_| general_purpose::URL_SAFE.decode(base64_string))
+        .map_err(|e| JsValue::from_str(&format!("Base64 decode error: {}", e)))?;
 
-    // Decode using JavaScript to avoid UTF-8 encoding issues
+    Ok(js_sys::Uint8Array::from(&bytes[..]))
-    // Create a JavaScript function to decode the base64 and convert to Uint8Array
-    let js_code = format!(
-        r#"
-        (function() {{
-            const binaryString = atob('{}');
-            const bytes = new Uint8Array(binaryString.length);
-            for (let i = 0; i < binaryString.length; i++) {{
-                bytes[i] = binaryString.charCodeAt(i);
-            }}
-            return bytes;
-        }})()
-        "#,
-        standard_base64
-    );
-
-    let result = js_sys::eval(&js_code)?;
-    let array = result.dyn_into::<js_sys::Uint8Array>()?;
-
-    Ok(array)
 }

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");
+    if let Ok(promise) = Notification::request_permission() {
-    
+        if let Ok(result) = wasm_bindgen_futures::JsFuture::from(promise).await {
-    // Check if Notification API is available
+            return result.as_string().unwrap_or_default() == "granted";
-    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";
-                    }
-                }
-            }
         }
     }
-    
     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,68 +21,62 @@ pub fn is_notification_supported() -> bool {
 
 /// Get current notification permission status
 pub fn get_notification_permission() -> String {
-    if !is_notification_supported() {
+    match Notification::permission() {
-        return "unsupported".to_string();
+        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
+/// Hook for using browser notifications within Leptos components or effects.
-/// Returns true if notification was shown successfully
+/// This uses leptos-use for reactive permission tracking.
-pub fn show_browser_notification(title: &str, body: &str, icon: Option<&str>) -> bool {
+pub fn use_app_notification() -> impl Fn(&str, &str) + Clone {
-    // Check permission first
+    let UseWebNotificationReturn { permission, .. } = use_web_notification();
-    let permission = get_notification_permission();
+    
-    if permission != "granted" {
+    move |title: &str, body: &str| {
-        log::warn!("Notification permission not granted: {}", permission);
+        // 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_icon("/icon-192.png");
-    opts.set_badge("/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) => {
+        Ok(_) => true,
-            true
+        Err(_) => false,
-        }
-        Err(e) => {
-            log::error!("Failed to create notification: {:?}", e);
-            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
-    if let Some(storage) = storage {
+        .and_then(|s| s.get_item("vibetorrent_browser_notifications").ok().flatten())
-        let enabled = storage
+        .unwrap_or_else(|| "true".to_string());
-            .get_item("vibetorrent_browser_notifications")
-            .ok()
-            .flatten()
-            .unwrap_or("true".to_string());
         
-        if enabled == "true" {
+    if enabled == "true" {
-            return show_browser_notification(title, body, None);
+        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,
+}