Merge pull request #425 from JakeStanger/fix/tray

Tray rewrite

Author: JakeStanger

Cargo.lock

@@ -125,7 +125,7 @@ mpris = { version = "2.0.1", optional = true }
 sysinfo = { version = "0.29.11", optional = true }
 
 # tray
-system-tray = { version = "0.1.4", optional = true }
+system-tray = { version = "0.1.5", optional = true }
 
 # upower
 upower_dbus = { version = "0.3.2", optional = true }

Cargo.toml

@@ -25,7 +25,7 @@ impl TrayEventReceiver {
         let id = format!("ironbar-{}", Ironbar::unique_id());
 
         let (tx, rx) = mpsc::channel(16);
-        let (b_tx, b_rx) = broadcast::channel(16);
+        let (b_tx, b_rx) = broadcast::channel(64);
 
         let tray = StatusNotifierWatcher::new(rx).await?;
         let mut host = Box::pin(tray.create_notifier_host(&id)).await?;
@@ -48,7 +48,7 @@ impl TrayEventReceiver {
                             item,
                             menu,
                         } => {
-                            debug!("Adding item with address '{address}'");
+                            debug!("Adding/updating item with address '{address}'");
                             tray.insert(address, (item, menu));
                         }
                         NotifierItemMessage::Remove { address } => {

src/clients/system_tray.rs

@@ -62,8 +62,17 @@ macro_rules! glib_recv {
         glib::spawn_future_local(async move {
             // re-delcare in case ie `context.subscribe()` is passed directly
             let mut rx = $rx;
-            while let Ok($val) = rx.recv().await {
-                $expr
+            loop {
+                match rx.recv().await {
+                    Ok($val) => $expr,
+                    Err(tokio::sync::broadcast::error::RecvError::Lagged(count)) => {
+                        tracing::warn!("Channel lagged behind by {count}, this may result in unexpected or broken behaviour");
+                    }
+                    Err(err) => {
+                        tracing::error!("{err:?}");
+                        break;
+                    }
+                }
             }
         });
     }};