Reduce cpu usage and fix network monitor

Author: ranfdev

Cargo.lock

@@ -31,4 +31,5 @@ rand = "0.8.5"
 ureq = "2.7.1"
 futures = "0.3.0"
 ashpd = "0.6.0"
+async-channel = "2.1.0"
 relm4-macros = { version = "0.6.2", features = [], default-features = false }

Cargo.toml

@@ -24,7 +24,6 @@ rusqlite = "0.29.0"
 rand = "0.8.5"
 reqwest = { version = "0.11.18", features = ["stream", "rustls-tls"]}
 url = "2.4.0"
-ashpd = "0.6.0"
 generational-arena = "0.2.9"
 tracing = "0.1.37"
 thiserror = "1.0.49"

ntfy-daemon/Cargo.toml

@@ -14,7 +14,7 @@ pub struct SharedEnv {
     db: message_repo::Db,
     proxy: Arc<dyn models::NotificationProxy>,
     http: reqwest::Client,
-    network: Arc<ashpd::desktop::network_monitor::NetworkMonitor<'static>>,
+    network: Arc<dyn models::NetworkMonitorProxy>,
 }
 
 #[derive(thiserror::Error, Debug)]

ntfy-daemon/src/lib.rs

@@ -1,6 +1,8 @@
 use std::collections::HashMap;
+use std::pin::Pin;
 use std::sync::OnceLock;
 
+use futures::stream::Stream;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
 
@@ -316,3 +318,7 @@ pub struct Notification {
 pub trait NotificationProxy: Sync + Send {
     fn send(&self, n: Notification) -> anyhow::Result<()>;
 }
+
+pub trait NetworkMonitorProxy: Sync + Send {
+    fn listen(&self) -> Pin<Box<dyn Stream<Item = ()>>>;
+}

ntfy-daemon/src/models.rs

@@ -5,7 +5,6 @@ use std::sync::Arc;
 use std::time::Duration;
 use std::{collections::HashMap, hash::Hash};
 
-use ashpd::desktop::network_monitor::NetworkMonitor;
 use capnp::capability::Promise;
 use capnp_rpc::{pry, rpc_twoparty_capnp, twoparty, RpcSystem};
 use futures::future::join_all;
@@ -343,7 +342,7 @@ impl SystemNotifier {
     pub fn new(
         dbpath: &str,
         notification_proxy: Arc<dyn models::NotificationProxy>,
-        network: Arc<NetworkMonitor<'static>>,
+        network: Arc<dyn models::NetworkMonitorProxy>,
     ) -> Self {
         Self {
             watching: Rc::new(RefCell::new(HashMap::new())),
@@ -457,12 +456,12 @@ pub fn start(
     socket_path: std::path::PathBuf,
     dbpath: &str,
     notification_proxy: Arc<dyn models::NotificationProxy>,
+    network_proxy: Arc<dyn models::NetworkMonitorProxy>,
 ) -> anyhow::Result<()> {
     let rt = tokio::runtime::Builder::new_current_thread()
         .enable_all()
         .build()?;
 
-    let network_monitor = rt.block_on(async move { NetworkMonitor::new().await.unwrap() });
     let listener = rt.block_on(async move {
         let _ = std::fs::remove_file(&socket_path);
         UnixListener::bind(&socket_path).unwrap()
@@ -471,8 +470,7 @@ pub fn start(
     let dbpath = dbpath.to_owned();
     let f = move || {
         let local = tokio::task::LocalSet::new();
-        let mut system_notifier =
-            SystemNotifier::new(&dbpath, notification_proxy, Arc::new(network_monitor));
+        let mut system_notifier = SystemNotifier::new(&dbpath, notification_proxy, network_proxy);
         local.spawn_local(async move {
             system_notifier.watch_subscribed().await.unwrap();
             let system_client: system_notifier::Client = capnp_rpc::new_client(system_notifier);

ntfy-daemon/src/system_client.rs

@@ -2,7 +2,6 @@ use std::ops::ControlFlow;
 use std::sync::Arc;
 use std::time::Duration;
 
-use ashpd::desktop::network_monitor::NetworkMonitor;
 use futures::prelude::*;
 use reqwest::header::HeaderValue;
 use serde::{Deserialize, Serialize};
@@ -141,21 +140,14 @@ impl TopicListener {
     }
 
     async fn reload_on_network_change(
-        monitor: Arc<NetworkMonitor<'static>>,
+        monitor: Arc<dyn models::NetworkMonitorProxy>,
         tx: mpsc::Sender<ControlFlow<()>>,
     ) -> anyhow::Result<()> {
-        let mut prev_available = false;
-
-        loop {
-            let _ = monitor.receive_changed().await?;
-            let available = monitor.is_available().await?;
-            if available && !prev_available {
-                if let Err(e) = tx.send(ControlFlow::Continue(())).await {
-                    return Err(e.into());
-                }
-            }
-            prev_available = available;
+        let mut m = monitor.listen();
+        while let Some(_) = m.next().await {
+            tx.send(ControlFlow::Continue(())).await?;
         }
+        Ok(())
     }
 
     fn send_current_status(&mut self) -> impl Future<Output = anyhow::Result<()>> {

ntfy-daemon/src/topic_listener.rs

@@ -1,8 +1,12 @@
+use std::cell::Cell;
 use std::path::Path;
 use std::path::PathBuf;
+use std::pin::Pin;
+use std::rc::Rc;
 
 use adw::subclass::prelude::*;
 use capnp_rpc::{rpc_twoparty_capnp, twoparty, RpcSystem};
+use futures::stream::Stream;
 use futures::AsyncReadExt;
 use gettextrs::gettext;
 use gio::SocketClient;
@@ -242,6 +246,11 @@ impl NotifyApplication {
         let dbpath = glib::user_data_dir().join("com.ranfdev.Notify.sqlite");
         info!(database_path = %dbpath.display());
 
+        // Here I'm sending notifications to the desktop environment and listening for network changes.
+        // This should have been inside ntfy-daemon, but using portals from another thread causes the error
+        // `Invalid client serial` and it's broken.
+        // Until https://github.com/flatpak/xdg-dbus-proxy/issues/46 is solved, I have to handle these things
+        // in the main thread. Uff.
         let (tx, rx) = glib::MainContext::channel(Default::default());
         let app = self.clone();
         rx.attach(None, move |n: models::Notification| {
@@ -268,17 +277,39 @@ impl NotifyApplication {
             glib::ControlFlow::Continue
         });
 
-        struct Proxy(glib::Sender<models::Notification>);
-        impl models::NotificationProxy for Proxy {
+        struct Proxies {
+            notification: glib::Sender<models::Notification>,
+        }
+        impl models::NotificationProxy for Proxies {
             fn send(&self, n: models::Notification) -> anyhow::Result<()> {
-                self.0.send(n)?;
+                self.notification.send(n)?;
                 Ok(())
             }
         }
+        impl models::NetworkMonitorProxy for Proxies {
+            fn listen(&self) -> Pin<Box<dyn Stream<Item = ()>>> {
+                let (tx, rx) = async_channel::bounded(1);
+                let mut prev_available = Rc::new(Cell::new(false));
+
+                gio::NetworkMonitor::default().connect_network_changed(move |_, available| {
+                    dbg!("sent", available);
+                    if available && !prev_available.get() {
+                        if let Err(e) = tx.send_blocking(()) {
+                            warn!(error = %e);
+                        }
+                    }
+                    prev_available.replace(available);
+                });
+
+                Box::pin(rx)
+            }
+        }
+        let proxies = std::sync::Arc::new(Proxies { notification: tx });
         ntfy_daemon::system_client::start(
             socket_path.to_owned(),
             dbpath.to_str().unwrap(),
-            std::sync::Arc::new(Proxy(tx)),
+            proxies.clone(),
+            proxies,
         )
         .unwrap();
         self.imp().hold_guard.set(self.hold()).unwrap();