fix: menülerin dışarıya tıklayınca kapanmama sorunu giderildi (stop_propagation kaldırıldı ve click event'ine geçildi)

.gitea/workflows/build-mips.yml

@@ -26,33 +26,22 @@ jobs:
       run: |
         cd frontend
         npm install
-        # Run Tailwind manually first
         npx @tailwindcss/cli -i input.css -o public/tailwind.css
+        # Trunk'ın optimizasyonunu kapalı (0) tutuyoruz çünkü Cargo.toml'daki opt-level='z' zaten o işi yapıyor.
         trunk build --release
 
-        # Manuel WASM Optimizasyonu
-        WASM_FILE=$(ls dist/*.wasm | head -n 1)
-        BEFORE=$(du -h "$WASM_FILE" | cut -f1)
-        echo "Before optimization: $BEFORE"
-        
-        wasm-opt --all-features -Oz "$WASM_FILE" -o "$WASM_FILE"
-        
-        AFTER=$(du -h "$WASM_FILE" | cut -f1)
-        echo "After optimization: $AFTER"
-        echo "Optimization complete!"
-
     - name: Build Backend (MIPS)
       env:
-        # -s: Sembolleri siler, -w: DWARF debug bilgilerini siler (Binary boyutunu devasa düşürür)
+        # -s ve -w ile binary içindeki gereksiz tüm yükleri siliyoruz.
         RUSTFLAGS: "-C target-feature=+crt-static -C link-self-contained=no -C link-arg=-msoft-float -C link-arg=-s -C link-arg=-w"
         CFLAGS_mips_unknown_linux_musl: "-msoft-float"
       run: |
-        # Kök dizinden derleyerek workspace profil ayarlarının (LTO, z, strip) uygulanmasını sağlıyoruz
+        # Sadece gerekli özellikleri derliyoruz (Boyut tasarrufu için swagger kapalı)
-        cargo zigbuild -p backend --target mips-unknown-linux-musl --release -Z build-std=std,panic_abort
+        cargo zigbuild -p backend --target mips-unknown-linux-musl --release -Z build-std=std,panic_abort --no-default-features --features push-notifications
-        file target/mips-unknown-linux-musl/release/backend
 
-    - name: Rename Binary
+    - name: Create Release Assets
-      run: mv target/mips-unknown-linux-musl/release/backend target/mips-unknown-linux-musl/release/vibetorrent-mips
+      run: |
+        mv target/mips-unknown-linux-musl/release/backend target/mips-unknown-linux-musl/release/vibetorrent-mips
 
     - name: Generate Release Tag
       id: tag
@@ -66,8 +55,10 @@ jobs:
         REPO="admin/vibetorrent"
         API_URL="${{ gitea.server_url }}/api/v1"
 
-        # Create release
+        RELEASE_RESPONSE=$(curl -s -X POST "${API_URL}/repos/${REPO}/releases" \
-        RELEASE_RESPONSE=$(curl -s -X POST "${API_URL}/repos/${REPO}/releases"           -H "Authorization: token ${RELEASE_TOKEN}"           -H "Content-Type: application/json"           -d "{
+          -H "Authorization: token ${RELEASE_TOKEN}" \
+          -H "Content-Type: application/json" \
+          -d "{
             \"tag_name\": \"${TAG}\",
             \"name\": \"Release ${TAG}\",
             \"body\": \"Automated build from commit ${{ gitea.sha }}\",
@@ -76,15 +67,9 @@ jobs:
           }")
 
         RELEASE_ID=$(echo "$RELEASE_RESPONSE" | jq -r '.id')
-        echo "Release ID: $RELEASE_ID"
+        if [ "$RELEASE_ID" = "null" ] || [ -z "$RELEASE_ID" ]; then exit 1; fi
 
-        if [ "$RELEASE_ID" = "null" ] || [ -z "$RELEASE_ID" ]; then
+        curl -s -X POST "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=vibetorrent-mips" \
-          echo "Failed to create release:"
+          -H "Authorization: token ${RELEASE_TOKEN}" \
-          echo "$RELEASE_RESPONSE"
+          -H "Content-Type: application/octet-stream" \
-          exit 1
+          --data-binary @target/mips-unknown-linux-musl/release/vibetorrent-mips
-        fi
-
-        # Upload binary as release asset
-        curl -s -X POST "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=vibetorrent-mips"           -H "Authorization: token ${RELEASE_TOKEN}"           -H "Content-Type: application/octet-stream"           --data-binary @target/mips-unknown-linux-musl/release/vibetorrent-mips
-
-        echo "Release ${TAG} created with binary attached."

Cargo.toml

@@ -2,14 +2,19 @@
 members = ["backend", "frontend", "shared"]
 resolver = "2"
 
-# Optimize for size (aggressive)
 [profile.release]
+# En küçük binary boyutu
 opt-level = "z"
-lto = "fat" # Full LTO (En iyisi)
+# En derin kod temizliği (dead code elimination)
+lto = "fat"
+# En iyi optimizasyon için tek birim derleme
 codegen-units = 1
+# Hata izleme kodlarını atarak yer kazan
 panic = "abort"
-strip = "symbols" # Sembolleri temizle
+# Sembolleri ve hata ayıklama bilgilerini kesin sil
-incremental = false # Incremental build'i kapat (Boyut için daha iyi)
+strip = true
+# Artık (incremental) build'i kapat ki optimizasyon tam olsun
+incremental = false
 
 [patch.crates-io]
 coarsetime = { path = "third_party/coarsetime" }

backend/Cargo.toml

@@ -4,8 +4,9 @@ version = "0.1.0"
 edition = "2021"
 
 [features]
-default = ["push-notifications"]
+default = ["push-notifications", "swagger"]
 push-notifications = ["web-push", "openssl"]
+swagger = ["utoipa-swagger-ui"]
 
 [dependencies]
 axum = { version = "0.8", features = ["macros", "ws"] }
@@ -29,7 +30,7 @@ shared = { path = "../shared" }
 thiserror = "2.0.18"
 dotenvy = "0.15.7"
 utoipa = { version = "5.4.0", features = ["axum_extras"] }
-utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
+utoipa-swagger-ui = { version = "9.0.2", features = ["axum"], optional = true }
 web-push = { version = "0.10", default-features = false, features = ["hyper-client"], optional = true }
 base64 = "0.22"
 openssl = { version = "0.10", features = ["vendored"], optional = true }

backend/src/main.rs

@@ -32,7 +32,9 @@ use tower_http::{
     cors::CorsLayer,
     trace::TraceLayer,
 };
+#[cfg(feature = "swagger")]
 use utoipa::OpenApi;
+#[cfg(feature = "swagger")]
 use utoipa_swagger_ui::SwaggerUi;
 
 #[derive(Clone)]
@@ -98,6 +100,7 @@ struct Args {
     reset_password: Option<String>,
 }
 
+#[cfg(feature = "swagger")]
 #[cfg(feature = "push-notifications")]
 #[derive(OpenApi)]
 #[openapi(
@@ -146,6 +149,7 @@ struct Args {
 )]
 struct ApiDoc;
 
+#[cfg(feature = "swagger")]
 #[cfg(not(feature = "push-notifications"))]
 #[derive(OpenApi)]
 #[openapi(
@@ -462,9 +466,13 @@ async fn main() {
         }
     });
 
-    let app = Router::new()
+    let app = Router::new();
-        .merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()))
+
-        // Setup & Auth Routes
+    #[cfg(feature = "swagger")]
+    let app = app.merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()));
+
+    // Setup & Auth Routes
+    let app = app
         .route("/api/setup/status", get(handlers::setup::get_setup_status_handler))
         .route("/api/setup", post(handlers::setup::setup_handler))
         .route(

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/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,7 @@
 use leptos::*;
+use leptos_use::on_click_outside;
+use leptos_use::storage::use_local_storage;
+use codee::string::FromToStringCodec;
 use shared::GlobalLimitRequest;
 
 fn format_bytes(bytes: i64) -> String {
@@ -26,34 +29,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);
-                    }
-                }
-            }
         }
     });
 
@@ -127,26 +115,24 @@ pub fn StatusBar() -> impl IntoView {
             set_active_dropdown.set(0);
         };
 
-        view! {
+        // Refs for click outside detection
-            // Transparent overlay to close dropdowns when clicking outside
+        let down_ref = create_node_ref::<html::Div>();
-            <Show when=move || active_dropdown.get() != 0>
+        let up_ref = create_node_ref::<html::Div>();
-                <div
+        let theme_ref = create_node_ref::<html::Div>();
-                    class="fixed inset-0 z-[98] cursor-default"
-                    on:pointerdown=move |_| close_all()
-                ></div>
-            </Show>
 
+        let _ = on_click_outside(down_ref, move |_| if active_dropdown.get_untracked() == 1 { close_all() });
+        let _ = on_click_outside(up_ref, move |_| if active_dropdown.get_untracked() == 2 { close_all() });
+        let _ = on_click_outside(theme_ref, move |_| if active_dropdown.get_untracked() == 3 { close_all() });
+
+        view! {
             <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">
+                <div class="relative" node_ref=down_ref>
                     <div
                         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| {
+                        on:click=move |_| toggle(1)
-                            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" />
@@ -173,8 +159,7 @@ 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();
                                             }
@@ -192,14 +177,11 @@ pub fn StatusBar() -> impl IntoView {
                 </div>
 
                 // --- UPLOAD SPEED DROPDOWN ---
-                <div class="relative">
+                <div class="relative" node_ref=up_ref>
                     <div
                         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| {
+                        on:click=move |_| toggle(2)
-                            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" />
@@ -226,8 +208,7 @@ 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();
                                             }
@@ -245,14 +226,11 @@ pub fn StatusBar() -> impl IntoView {
                 </div>
 
                 <div class="ml-auto flex items-center gap-4">
-                    <div class="relative">
+                    <div class="relative" node_ref=theme_ref>
                         <div
                             class="btn btn-ghost btn-xs btn-square"
                             title="Change Theme"
-                            on:pointerdown=move |e| {
+                            on:click=move |_| toggle(3)
-                                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" />
@@ -272,17 +250,8 @@ 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() {
-                                                        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::{on_click_outside, use_timeout_fn};
-use wasm_bindgen::JsCast;
 use crate::store::{get_action_messages, show_toast_with_signal};
 use shared::NotificationLevel;
 
@@ -167,6 +166,8 @@ pub fn TorrentTable() -> impl IntoView {
 
     // Signal-based sort dropdown for mobile
     let (sort_open, set_sort_open) = create_signal(false);
+    let sort_menu_ref = create_node_ref::<html::Div>();
+    let _ = on_click_outside(sort_menu_ref, move |_| set_sort_open.set(false));
 
     let sort_arrow = move |col: SortColumn| {
         if sort_col.get() == col {
@@ -345,12 +346,11 @@ pub fn TorrentTable() -> impl IntoView {
                             <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">
                                 <span class="text-xs font-bold opacity-50 uppercase tracking-wider">"Torrents"</span>
 
-                                <div class="relative">
+                                <div class="relative" node_ref=sort_menu_ref>
                                     <div
                                         role="button"
                                         class="btn btn-ghost btn-xs gap-1 opacity-70 font-normal"
-                                        on:pointerdown=move |e| {
+                                        on:click=move |_| {
-                                            e.stop_propagation();
                                             let cur = sort_open.get_untracked();
                                             set_sort_open.set(!cur);
                                         }
@@ -386,8 +386,7 @@ 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);
                                                               }
@@ -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)
 }