Wire up UI logger to display real-time tracing logs in NetworkLogsView

Co-authored-by: GZTimeWalker <[email protected]>

Author: Copilot

crates/wsrx-desktop-gpui/src/main.rs

@@ -50,8 +50,10 @@ impl AssetSource for EmbeddedAssets {
 }
 
 fn main() -> Result<()> {
-    // Initialize logging
-    let (_console_guard, _file_guard) = logging::setup()?;
+    // Initialize logging with UI logger
+    let (_console_guard, _file_guard, mut log_receiver) = ui_logger::setup_with_ui()?;
+
+    tracing::info!("Starting wsrx-desktop-gpui");
 
     // Initialize i18n with system locale
     i18n::init_locale();
@@ -71,7 +73,7 @@ fn main() -> Result<()> {
             ..Default::default()
         });
 
-        cx.open_window(
+        let window_entity = cx.open_window(
             WindowOptions {
                 window_bounds: Some(WindowBounds::Windowed(bounds)),
                 titlebar: titlebar_config,
@@ -90,6 +92,19 @@ fn main() -> Result<()> {
         )
         .expect("Failed to open window");
 
+        // Spawn task to receive logs and update the UI
+        let root_view = window_entity.root_view(cx).expect("Failed to get root view");
+        cx.spawn(|mut cx| async move {
+            while let Some(log_entry) = log_receiver.recv().await {
+                let _ = root_view.update(&mut cx, |root, cx| {
+                    root.add_log(log_entry, cx);
+                });
+            }
+        })
+        .detach();
+
+        tracing::info!("Application window created");
+
         cx.activate(true);
     });
 

crates/wsrx-desktop-gpui/src/views/network_logs.rs

@@ -11,45 +11,19 @@ pub struct NetworkLogsView {
 
 impl NetworkLogsView {
     pub fn new(_window: &mut Window, _cx: &mut Context<Self>) -> Self {
-        // Add some sample logs for demonstration
-        let mut logs = VecDeque::new();
-        
-        logs.push_back(LogEntry {
-            timestamp: "2025-11-10 15:00:01".to_string(),
-            level: "INFO".to_string(),
-            target: "wsrx::daemon".to_string(),
-            message: "Daemon started successfully".to_string(),
-        });
-        
-        logs.push_back(LogEntry {
-            timestamp: "2025-11-10 15:00:05".to_string(),
-            level: "DEBUG".to_string(),
-            target: "wsrx::tunnel".to_string(),
-            message: "Initializing WebSocket connection to ws://example.com".to_string(),
-        });
-        
-        logs.push_back(LogEntry {
-            timestamp: "2025-11-10 15:00:10".to_string(),
-            level: "INFO".to_string(),
-            target: "wsrx::tunnel".to_string(),
-            message: "Connection established: 127.0.0.1:8080 → ws://example.com".to_string(),
-        });
-        
-        logs.push_back(LogEntry {
-            timestamp: "2025-11-10 15:00:15".to_string(),
-            level: "WARN".to_string(),
-            target: "wsrx::proxy".to_string(),
-            message: "High latency detected: 250ms".to_string(),
-        });
-        
-        logs.push_back(LogEntry {
-            timestamp: "2025-11-10 15:00:20".to_string(),
-            level: "ERROR".to_string(),
-            target: "wsrx::tunnel".to_string(),
-            message: "Connection failed: Connection refused".to_string(),
-        });
+        // Start with empty logs - will be populated from tracing
+        Self {
+            logs: VecDeque::new(),
+        }
+    }
 
-        Self { logs }
+    /// Add a log entry (called from RootView when logs are received)
+    pub fn add_log(&mut self, entry: LogEntry) {
+        // Keep max 1000 logs to prevent memory issues
+        if self.logs.len() >= 1000 {
+            self.logs.pop_front();
+        }
+        self.logs.push_back(entry);
     }
 
     fn render_log_entry(&self, entry: &LogEntry, index: usize) -> impl IntoElement {
@@ -146,28 +120,6 @@ impl Render for NetworkLogsView {
                     )
                     .child(
                         div().flex().gap_2()
-                            .child(
-                                div()
-                                    .id("add-sample-log-button")
-                                    .px_3()
-                                    .py_1()
-                                    .text_sm()
-                                    .bg(colors::accent())
-                                    .rounded_md()
-                                    .cursor_pointer()
-                                    .hover(|div| div.bg(gpui::rgba(0x0088DDFF)))
-                                    .on_click(cx.listener(|this, _event, _window, cx| {
-                                        use chrono::Local;
-                                        this.logs.push_back(LogEntry {
-                                            timestamp: Local::now().format("%Y-%m-%d %H:%M:%S").to_string(),
-                                            level: "INFO".to_string(),
-                                            target: "wsrx::test".to_string(),
-                                            message: format!("Sample log entry #{}", this.logs.len() + 1),
-                                        });
-                                        cx.notify();
-                                    }))
-                                    .child("Add Sample"),
-                            )
                             .child(
                                 div()
                                     .id("clear-logs-button")
@@ -182,7 +134,7 @@ impl Render for NetworkLogsView {
                                         this.logs.clear();
                                         cx.notify();
                                     }))
-                                    .child("Clear"),
+                                    .child("Clear Logs"),
                             ),
                     ),
             )

crates/wsrx-desktop-gpui/src/views/root.rs

@@ -2,7 +2,9 @@
 use gpui::{Context, Entity, Render, Window, div, prelude::*};
 
 use super::{ConnectionsView, GetStartedView, NetworkLogsView, SettingsView, SidebarView};
-use crate::{components::title_bar::TitleBar, models::app_state::PageId, styles::colors};
+use crate::{
+    components::title_bar::TitleBar, models::{LogEntry, app_state::PageId}, styles::colors,
+};
 
 pub struct RootView {
     /// Current active page (string-based: "home", "logs", "settings", "default-scope", or scope.host)
@@ -77,6 +79,14 @@ impl RootView {
         cx.notify();
     }
 
+    /// Add a log entry to the network logs view
+    pub fn add_log(&mut self, log_entry: LogEntry, cx: &mut Context<Self>) {
+        self.network_logs.update(cx, |logs_view, cx| {
+            logs_view.add_log(log_entry);
+            cx.notify();
+        });
+    }
+
     fn render_sidebar(&self) -> impl IntoElement {
         div()
             .flex()