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

backend/src/main.rs

@@ -45,6 +45,7 @@ pub struct AppState {
     pub db: db::Db,
     #[cfg(feature = "push-notifications")]
     pub push_store: push::PushSubscriptionStore,
+    pub notify_poll: Arc<tokio::sync::Notify>,
 }
 
 async fn auth_middleware(
@@ -336,6 +337,8 @@ async fn main() {
     #[cfg(not(feature = "push-notifications"))]
     let push_store = ();
 
+    let notify_poll = Arc::new(tokio::sync::Notify::new());
+
     let app_state = AppState {
         tx: tx.clone(),
         event_bus: event_bus.clone(),
@@ -343,6 +346,7 @@ async fn main() {
         db: db.clone(),
         #[cfg(feature = "push-notifications")]
         push_store,
+        notify_poll: notify_poll.clone(),
     };
 
     // Spawn background task to poll rTorrent
@@ -351,6 +355,7 @@ async fn main() {
     let socket_path = args.socket.clone(); // Clone for background task
     #[cfg(feature = "push-notifications")]
     let push_store_clone = app_state.push_store.clone();
+    let notify_poll_clone = notify_poll.clone();
 
     tokio::spawn(async move {
         let client = xmlrpc::RtorrentClient::new(&socket_path);
@@ -438,8 +443,13 @@ async fn main() {
 
                     previous_torrents = new_torrents;
 
-                    // Success case: sleep for the determined interval
-                    tokio::time::sleep(loop_interval).await;
+                    // Success case: wait for the determined interval OR a wakeup notification
+                    tokio::select! {
+                        _ = tokio::time::sleep(loop_interval) => {},
+                        _ = notify_poll_clone.notified() => {
+                            tracing::debug!("Background loop awakened by new client connection");
+                        }
+                    }
                 }
                 Err(e) => {
                     tracing::error!("Error fetching torrents in background: {}", e);

backend/src/scgi.rs

@@ -11,6 +11,8 @@ pub enum ScgiError {
     #[allow(dead_code)]
     #[error("Protocol Error: {0}")]
     Protocol(String),
+    #[error("Timeout: SCGI request took too long")]
+    Timeout,
 }
 
 pub struct ScgiRequest {
@@ -78,20 +80,30 @@ impl ScgiRequest {
 }
 
 pub async fn send_request(socket_path: &str, request: ScgiRequest) -> Result<Bytes, ScgiError> {
+    let perform_request = async {
         let mut stream = UnixStream::connect(socket_path).await?;
         let data = request.encode();
         stream.write_all(&data).await?;
 
         let mut response = Vec::new();
         stream.read_to_end(&mut response).await?;
+        Ok::<Vec<u8>, std::io::Error>(response)
+    };
+
+    let response = tokio::time::timeout(std::time::Duration::from_secs(10), perform_request)
+        .await
+        .map_err(|_| ScgiError::Timeout)??;
 
     let double_newline = b"\r\n\r\n";
-    if let Some(pos) = response
+    let mut response_vec = response;
+    if let Some(pos) = response_vec
         .windows(double_newline.len())
         .position(|window| window == double_newline)
     {
-        Ok(Bytes::from(response.split_off(pos + double_newline.len())))
+        Ok(Bytes::from(
+            response_vec.split_off(pos + double_newline.len()),
+        ))
     } else {
-        Ok(Bytes::from(response))
+        Ok(Bytes::from(response_vec))
     }
 }

backend/src/sse.rs

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

frontend/src/components/torrent/table.rs

@@ -81,12 +81,11 @@ pub fn TorrentTable() -> impl IntoView {
     let sort_col = create_rw_signal(SortColumn::AddedDate);
     let sort_dir = create_rw_signal(SortDirection::Descending);
 
-    let filtered_torrents = move || {
-        // Convert HashMap values to Vec for filtering and sorting
-        let torrents: Vec<shared::Torrent> = store.torrents.with(|map| map.values().cloned().collect());
-
-        let mut torrents = torrents
-            .into_iter()
+    // Get sorted and filtered hashes only
+    let filtered_hashes = move || {
+        store.torrents.with(|map| {
+            let mut torrents: Vec<&shared::Torrent> = map
+                .values()
                 .filter(|t| {
                     let filter = store.filter.get();
                     let search = store.search_query.get().to_lowercase();
@@ -103,8 +102,10 @@ pub fn TorrentTable() -> impl IntoView {
                             t.status == shared::TorrentStatus::Seeding
                                 || (t.status == shared::TorrentStatus::Paused
                                     && t.percent_complete >= 100.0)
-                    } // Approximate
-                    crate::store::FilterStatus::Paused => t.status == shared::TorrentStatus::Paused,
+                        }
+                        crate::store::FilterStatus::Paused => {
+                            t.status == shared::TorrentStatus::Paused
+                        }
                         crate::store::FilterStatus::Inactive => {
                             t.status == shared::TorrentStatus::Paused
                                 || t.status == shared::TorrentStatus::Error
@@ -120,7 +121,7 @@ pub fn TorrentTable() -> impl IntoView {
 
                     matches_filter && matches_search
                 })
-            .collect::<Vec<_>>();
+                .collect();
 
             torrents.sort_by(|a, b| {
                 let col = sort_col.get();
@@ -149,7 +150,8 @@ pub fn TorrentTable() -> impl IntoView {
                 }
             });
 
-        torrents
+            torrents.into_iter().map(|t| t.hash.clone()).collect::<Vec<String>>()
+        })
     };
 
     let handle_sort = move |col: SortColumn| {
@@ -254,7 +256,7 @@ pub fn TorrentTable() -> impl IntoView {
                                  <div class="flex items-center">"Status" {move || sort_arrow(SortColumn::Status)}</div>
                             </th>
                             <th class="w-24 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::DownSpeed)>
-                                 <div class="flex items-center">"Down Speed" {move || sort_arrow(SortColumn::DownSpeed)}</div>
+                                 <div class="flex items-center">"DL Speed" {move || sort_arrow(SortColumn::DownSpeed)}</div>
                             </th>
                             <th class="w-24 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::UpSpeed)>
                                  <div class="flex items-center">"Up Speed" {move || sort_arrow(SortColumn::UpSpeed)}</div>
@@ -268,60 +270,23 @@ pub fn TorrentTable() -> impl IntoView {
                         </tr>
                     </thead>
                     <tbody>
-                        {move || filtered_torrents().into_iter().map(|t| {
-                            let progress_class = if t.percent_complete >= 100.0 { "progress-success" } else { "progress-primary" };
-                            let status_str = format!("{:?}", t.status);
-                            let status_class = match t.status {
-                                shared::TorrentStatus::Seeding => "text-success",
-                                shared::TorrentStatus::Downloading => "text-primary",
-                                shared::TorrentStatus::Paused => "text-warning",
-                                shared::TorrentStatus::Error => "text-error",
-                                _ => "text-base-content/50"
-                            };
-                            let t_hash = t.hash.clone();
-                            let t_hash_click = t.hash.clone();
-
-                            let is_selected_fn = move || {
-                                selected_hash.get() == Some(t_hash.clone())
-                            };
-
+                        <For
+                            each=move || filtered_hashes()
+                            key=|hash| hash.clone()
+                            children={
+                                let handle_context_menu = handle_context_menu.clone();
+                                move |hash| {
                                     view! {
-                                <tr
-                                    class=move || {
-                                        let base = "hover border-b border-base-200 select-none";
-                                        if is_selected_fn() {
-                                            format!("{} bg-primary/10", base)
-                                        } else {
-                                            base.to_string()
+                                        <TorrentRow
+                                            hash=hash.clone()
+                                            selected_hash=selected_hash
+                                            set_selected_hash=set_selected_hash
+                                            on_context_menu=handle_context_menu.clone()
+                                        />
                                     }
                                 }
-                                    on:contextmenu={
-                                        let t_hash = t_hash_click.clone();
-                                        move |e: web_sys::MouseEvent| handle_context_menu(e, t_hash.clone())
                             }
-                                    on:click={
-                                        let t_hash = t_hash_click.clone();
-                                        move |_| set_selected_hash.set(Some(t_hash.clone()))
-                                    }
-                                >
-                                    <td class="font-medium truncate max-w-xs" title={t.name.clone()}>
-                                        {t.name}
-                                    </td>
-                                    <td class="opacity-80 font-mono text-[11px]">{format_bytes(t.size)}</td>
-                                    <td>
-                                        <div class="flex items-center gap-2">
-                                            <progress class={format!("progress w-24 {}", progress_class)} value={t.percent_complete} max="100"></progress>
-                                            <span class="text-[10px] opacity-70">{format!("{:.1}%", t.percent_complete)}</span>
-                                        </div>
-                                    </td>
-                                    <td class={format!("text-[11px] font-medium {}", status_class)}>{status_str}</td>
-                                    <td class="text-right font-mono text-[11px] opacity-80 text-success">{format_speed(t.down_rate)}</td>
-                                    <td class="text-right font-mono text-[11px] opacity-80 text-primary">{format_speed(t.up_rate)}</td>
-                                    <td class="text-right font-mono text-[11px] opacity-80">{format_duration(t.eta)}</td>
-                                    <td class="text-right font-mono text-[11px] opacity-80 whitespace-nowrap">{format_date(t.added_date)}</td>
-                                </tr>
-                            }
-                        }).collect::<Vec<_>>()}
+                        />
                     </tbody>
                 </table>
             </div>
@@ -345,7 +310,7 @@ pub fn TorrentTable() -> impl IntoView {
                                         (SortColumn::Size, "Size"),
                                         (SortColumn::Progress, "Progress"),
                                         (SortColumn::Status, "Status"),
-                                                  (SortColumn::DownSpeed, "Down Speed"),
+                                        (SortColumn::DownSpeed, "DL Speed"),
                                         (SortColumn::UpSpeed, "Up Speed"),
                                         (SortColumn::ETA, "ETA"),
                                         (SortColumn::AddedDate, "Date"),
@@ -385,7 +350,151 @@ pub fn TorrentTable() -> impl IntoView {
                     </details>
                 </div>
 
-                            <div class="overflow-y-auto p-3 pb-20 flex-1 grid grid-cols-1 content-start gap-3 cursor-pointer">                {move || filtered_torrents().into_iter().map(|t| {
+                <div class="overflow-y-auto p-3 pb-20 flex-1 grid grid-cols-1 content-start gap-3 cursor-pointer">
+                    <For
+                        each=move || filtered_hashes()
+                        key=|hash| hash.clone()
+                        children={
+                            let handle_context_menu = handle_context_menu.clone();
+                            move |hash| {
+                                view! {
+                                    <TorrentCard
+                                        hash=hash.clone()
+                                        selected_hash=selected_hash
+                                        set_selected_hash=set_selected_hash
+                                        set_menu_position=set_menu_position
+                                        set_menu_visible=set_menu_visible
+                                        on_context_menu=handle_context_menu.clone()
+                                    />
+                                }
+                            }
+                        }
+                    />
+                </div>
+            </div>
+
+            <Show when=move || menu_visible.get() fallback=|| ()>
+                <crate::components::context_menu::ContextMenu
+                    visible=true
+                    position=menu_position.get()
+                    torrent_hash=selected_hash.get().unwrap_or_default()
+                    on_close=Callback::from(move |_| set_menu_visible.set(false))
+                    on_action=Callback::from(on_action)
+                />
+            </Show>
+        </div>
+    }
+}
+
+#[component]
+fn TorrentRow(
+    hash: String,
+    selected_hash: ReadSignal<Option<String>>,
+    set_selected_hash: WriteSignal<Option<String>>,
+    on_context_menu: impl Fn(web_sys::MouseEvent, String) + 'static + Clone,
+) -> impl IntoView {
+    let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
+
+    let h = hash.clone();
+    // Memoized access to the specific torrent data.
+    // This only re-renders the row if this specific torrent actually changes.
+    let torrent = create_memo(move |_| {
+        store.torrents.with(|map| map.get(&h).cloned())
+    });
+
+    view! {
+        <Show when=move || torrent.get().is_some() fallback=|| ()>
+            {
+                let on_context_menu = on_context_menu.clone();
+                let hash = hash.clone();
+
+                move || {
+                    let t = torrent.get().unwrap();
+                    let t_hash = hash.clone();
+                    let t_hash_class = t_hash.clone();
+                    let on_context_menu = on_context_menu.clone();
+
+                    let progress_class = if t.percent_complete >= 100.0 { "progress-success" } else { "progress-primary" };
+                    let status_str = format!("{:?}", t.status);
+                    let status_class = match t.status {
+                        shared::TorrentStatus::Seeding => "text-success",
+                        shared::TorrentStatus::Downloading => "text-primary",
+                        shared::TorrentStatus::Paused => "text-warning",
+                        shared::TorrentStatus::Error => "text-error",
+                        _ => "text-base-content/50"
+                    };
+
+                    view! {
+                        <tr
+                            class=move || {
+                                let base = "hover border-b border-base-200 select-none";
+                                if selected_hash.get() == Some(t_hash_class.clone()) {
+                                    format!("{} bg-primary/10", base)
+                                } else {
+                                    base.to_string()
+                                }
+                            }
+                            on:contextmenu={
+                                let t_hash = t_hash.clone();
+                                let on_context_menu = on_context_menu.clone();
+                                move |e: web_sys::MouseEvent| on_context_menu(e, t_hash.clone())
+                            }
+                            on:click={
+                                let t_hash = t_hash.clone();
+                                move |_| set_selected_hash.set(Some(t_hash.clone()))
+                            }
+                        >
+                            <td class="font-medium truncate max-w-xs" title={t.name.clone()}>
+                                {t.name}
+                            </td>
+                            <td class="opacity-80 font-mono text-[11px]">{format_bytes(t.size)}</td>
+                            <td>
+                                <div class="flex items-center gap-2">
+                                    <progress class={format!("progress w-24 {}", progress_class)} value={t.percent_complete} max="100"></progress>
+                                    <span class="text-[10px] opacity-70">{format!("{:.1}%", t.percent_complete)}</span>
+                                </div>
+                            </td>
+                            <td class={format!("text-[11px] font-medium {}", status_class)}>{status_str}</td>
+                            <td class="text-right font-mono text-[11px] opacity-80 text-success">{format_speed(t.down_rate)}</td>
+                            <td class="text-right font-mono text-[11px] opacity-80 text-primary">{format_speed(t.up_rate)}</td>
+                            <td class="text-right font-mono text-[11px] opacity-80">{format_duration(t.eta)}</td>
+                            <td class="text-right font-mono text-[11px] opacity-80 whitespace-nowrap">{format_date(t.added_date)}</td>
+                        </tr>
+                    }
+                }
+            }
+        </Show>
+    }
+}
+
+#[component]
+fn TorrentCard(
+    hash: String,
+    selected_hash: ReadSignal<Option<String>>,
+    set_selected_hash: WriteSignal<Option<String>>,
+    set_menu_position: WriteSignal<(i32, i32)>,
+    set_menu_visible: WriteSignal<bool>,
+    on_context_menu: impl Fn(web_sys::MouseEvent, String) + 'static + Clone,
+) -> impl IntoView {
+    let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
+
+    let h = hash.clone();
+    let torrent = create_memo(move |_| {
+        store.torrents.with(|map| map.get(&h).cloned())
+    });
+
+    view! {
+        <Show when=move || torrent.get().is_some() fallback=|| ()>
+            {
+                let hash = hash.clone();
+                let on_context_menu = on_context_menu.clone();
+
+                move || {
+                    let t = torrent.get().unwrap();
+                    let t_hash = hash.clone();
+                    let t_hash_class = t_hash.clone();
+                    let on_context_menu = on_context_menu.clone();
+
                     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 {
@@ -395,10 +504,8 @@ pub fn TorrentTable() -> impl IntoView {
                         shared::TorrentStatus::Error => "badge-error badge-soft",
                         _ => "badge-ghost"
                     };
-                    let _t_hash = t.hash.clone();
-                    let t_hash_click = t.hash.clone();
 
-                    let t_hash_long = t.hash.clone();
+                    let t_hash_long = t_hash.clone();
                     let leptos_use::UseTimeoutFnReturn { start, stop, .. } = use_timeout_fn(
                         move |pos: (i32, i32)| {
                             set_menu_position.set(pos);
@@ -440,15 +547,21 @@ pub fn TorrentTable() -> impl IntoView {
                     view! {
                         <div
                             class=move || {
-                                "card card-compact bg-base-100 shadow-sm border border-base-200 transition-transform active:scale-[0.99] select-none cursor-pointer"
+                                let base = "card card-compact bg-base-100 shadow-sm border border-base-200 transition-transform active:scale-[0.99] select-none cursor-pointer";
+                                if selected_hash.get() == Some(t_hash_class.clone()) {
+                                    format!("{} ring-2 ring-primary ring-inset", base)
+                                } else {
+                                    base.to_string()
+                                }
                             }
                             style="user-select: none; -webkit-user-select: none; -webkit-touch-callout: none;"
                             on:contextmenu={
-                                let t_hash = t.hash.clone();
-                                move |e: web_sys::MouseEvent| handle_context_menu(e, t_hash.clone())
+                                let t_hash = t_hash.clone();
+                                let on_context_menu = on_context_menu.clone();
+                                move |e: web_sys::MouseEvent| on_context_menu(e, t_hash.clone())
                             }
                             on:click={
-                                let t_hash = t_hash_click.clone();
+                                let t_hash = t_hash.clone();
                                 move |_| set_selected_hash.set(Some(t_hash.clone()))
                             }
                             on:touchstart=handle_touchstart
@@ -493,19 +606,8 @@ pub fn TorrentTable() -> impl IntoView {
                             </div>
                         </div>
                     }
-                }).collect::<Vec<_>>()}
-                </div>
-            </div>
-
-            <Show when=move || menu_visible.get() fallback=|| ()>
-                <crate::components::context_menu::ContextMenu
-                    visible=true
-                    position=menu_position.get()
-                    torrent_hash=selected_hash.get().unwrap_or_default()
-                    on_close=Callback::from(move |_| set_menu_visible.set(false))
-                    on_action=Callback::from(on_action)
-                />
+                }
+            }
         </Show>
-        </div>
     }
 }

frontend/src/store.rs

@@ -195,11 +195,26 @@ pub fn provide_torrent_store() {
                                         if let Ok(event) = serde_json::from_str::<AppEvent>(&data_str) {
                                             match event {
                                                 AppEvent::FullList { torrents: list, .. } => {
-                                                    let map: HashMap<String, Torrent> = list
-                                                        .into_iter()
-                                                        .map(|t| (t.hash.clone(), t))
-                                                        .collect();
-                                                    torrents.set(map);
+                                                    torrents.update(|map| {
+                                                        // 1. Create a set of new hashes for quick lookup
+                                                        let new_hashes: std::collections::HashSet<String> = list.iter().map(|t| t.hash.clone()).collect();
+                                                        
+                                                        // 2. Remove torrents that are no longer in the list
+                                                        map.retain(|hash, _| new_hashes.contains(hash));
+                                                        
+                                                        // 3. Update or Insert torrents from the new list
+                                                        for new_torrent in list {
+                                                            if let Some(existing) = map.get_mut(&new_torrent.hash) {
+                                                                // Only update if changed (Torrent derives PartialEq)
+                                                                if existing != &new_torrent {
+                                                                    *existing = new_torrent;
+                                                                }
+                                                            } else {
+                                                                // New torrent, insert it
+                                                                map.insert(new_torrent.hash.clone(), new_torrent);
+                                                            }
+                                                        }
+                                                    });
                                                 }
                                                 AppEvent::Update(update) => {
                                                     torrents.update(|map| {