refactor: tema yönetimi leptos-use::use_local_storage ile reaktif hale getirildi

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;

frontend/Cargo.toml

@@ -52,3 +52,7 @@ web-sys = { version = "0.3", features = [
 shared = { path = "../shared" }
 tailwind_fuse = "0.3.2"
 js-sys = "0.3.85"
+base64 = "0.22.1"
+serde-wasm-bindgen = "0.6.5"
+leptos-use = "0.13"
+codee = "0.2"

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);
-                    }
-                }
-            }
         }
     });
 
@@ -275,14 +262,6 @@ pub fn StatusBar() -> impl IntoView {
                                                 on:pointerdown=move |e| {
                                                     e.stop_propagation();
                                                     set_current_theme.set(theme.to_string());
-                                                    if let Some(win) = web_sys::window() {
-                                                        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();
                                                 }
                                             >

frontend/src/components/torrent/table.rs

@@ -1,6 +1,5 @@
 use leptos::*;
-use wasm_bindgen::closure::Closure;
+use leptos_use::use_timeout_fn;
-use wasm_bindgen::JsCast;
 use crate::store::{get_action_messages, show_toast_with_signal};
 use shared::NotificationLevel;
 
@@ -423,58 +422,45 @@ 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 || {
@@ -492,7 +478,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

@@ -328,67 +328,46 @@ 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() {
-            log::error!("Notification API not available");
-            return;
-        }
     
-        // Check current permission
+    // Notification.permission is a static property, but web_sys exposes it via the Notification class instance or we check it manually.
-        let current_permission = js_sys::Reflect::get(&notification_class, &"permission".into())
+    // Actually, Notification::permission() is a static method in web_sys.
-            .ok()
+    match web_sys::Notification::permission() {
-            .and_then(|p| p.as_string())
+        web_sys::NotificationPermission::Granted => {
-            .unwrap_or_default();
-
-        if current_permission == "granted" {
             log::info!("Notification permission already granted");
-            true
+        }
-        } else if current_permission == "denied" {
+        web_sys::NotificationPermission::Denied => {
             log::warn!("Notification permission was denied");
             return;
-        } else {
+        }
-            // Permission is "default" - need to request
+        web_sys::NotificationPermission::Default => {
             log::info!("Requesting notification permission...");
-            if let Ok(request_fn) = js_sys::Reflect::get(&notification_class, &"requestPermission".into()) {
+            let permission_promise = match web_sys::Notification::request_permission() {
-                if request_fn.is_function() {
+                Ok(p) => p,
-                    let request_fn_typed = js_sys::Function::from(request_fn);
+                Err(e) => {
-                    match request_fn_typed.call0(&notification_class) {
+                    log::error!("Failed to request notification permission: {:?}", e);
-                        Ok(promise_val) => {
+                    return;
-                            let request_future = wasm_bindgen_futures::JsFuture::from(
+                }
-                                js_sys::Promise::from(promise_val)
+            };
-                            );
+            
-                            match request_future.await {
+            match wasm_bindgen_futures::JsFuture::from(permission_promise).await {
-                                Ok(result) => {
+                Ok(val) => {
-                                    let result_str = result.as_string().unwrap_or_default();
+                    let permission = val.as_string().unwrap_or_default();
-                                    log::info!("Permission request result: {}", result_str);
+                    if permission != "granted" {
-                                    result_str == "granted"
+                        log::warn!("Notification permission denied by user");
-                                }
+                        return;
-                                Err(e) => {
+                    }
-                                    log::error!("Failed to request notification permission: {:?}", e);
+                    log::info!("Notification permission granted by user");
-                                    false
+                }
-                                }
+                Err(e) => {
-                            }
+                    log::error!("Failed to await notification permission: {:?}", e);
-                        }
+                    return;
-                        Err(e) => {
-                            log::error!("Failed to call requestPermission: {:?}", e);
-                            false
-                        }
-                    }
-                } else {
-                    false
                 }
-            } else {
-                false
             }
         }
-    } else {
+        _ => {
-        log::error!("Cannot access Notification class");
+             log::warn!("Unknown notification permission status");
-        return;
+             return;
-    };
+        }
-
-    if !permission_granted {
-        log::warn!("Notification permission not granted, cannot subscribe to push");
-        return;
     }
 
     log::info!("Notification permission granted! Proceeding with push subscription...");
@@ -433,7 +412,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 +472,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 +518,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 +540,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)
 }