Watch net status change.

Berrysoft · Apr 27, 2023 · dd9c096 · dd9c096
1 parent 95e9188
commit dd9c096
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 12 deletions.
diff --git a/tunet-cui/src/event.rs b/tunet-cui/src/event.rs
@@ -39,6 +39,7 @@ impl Event {
     }
 
     pub fn start(&self) {
+        self.spawn_watch_status();
         self.spawn_timer();
         self.spawn_online();
         self.spawn_details();
@@ -79,6 +80,10 @@ impl Event {
         });
     }
 
+    fn spawn_watch_status(&self) {
+        self.model.queue(Action::WatchStatus);
+    }
+
     fn spawn_timer(&self) {
         self.model.queue(Action::Timer);
     }

diff --git a/tunet-gui/src/main.rs b/tunet-gui/src/main.rs
@@ -152,6 +152,7 @@ async fn main() -> Result<()> {
         if let Ok(cred) = settings_reader.read_with_password() {
             model.queue(Action::Credential(Arc::new(cred)));
         }
+        model.queue(Action::WatchStatus);
         model.queue(Action::Timer);
 
         home_model.set_status(model.status.to_string().into());
@@ -335,11 +336,10 @@ fn update(
         UpdateMsg::Status => {
             model.queue(Action::State(None));
 
-            let status = model.status.clone();
+            let status = model.status.to_string();
             weak_app
                 .upgrade_in_event_loop(move |app| {
-                    app.global::<HomeModel>()
-                        .set_status(status.to_string().into());
+                    app.global::<HomeModel>().set_status(status.into());
                 })
                 .unwrap();
         }

diff --git a/tunet-model/src/lib.rs b/tunet-model/src/lib.rs
@@ -1,7 +1,7 @@
 #![forbid(unsafe_code)]
 
 use drop_guard::guard;
-use futures_util::{pin_mut, TryStreamExt};
+use futures_util::{pin_mut, StreamExt, TryStreamExt};
 use itertools::Itertools;
 use mac_address::*;
 use netstatus::*;
@@ -123,7 +123,7 @@ impl Model {
                         let http = self.http.clone();
                         let status = self.status.clone();
                         tokio::spawn(async move {
-                            let state = suggest::suggest_with_status(&http, status).await;
+                            let state = suggest::suggest_with_status(&http, &status).await;
                             tx.send(Action::State(Some(state))).await.ok()
                         });
                     }
@@ -133,6 +133,16 @@ impl Model {
                     }
                 };
             }
+            Action::WatchStatus => {
+                self.spawn_watch_status();
+            }
+            Action::Status => {
+                let status = NetStatus::current();
+                if status != self.status {
+                    self.status = status;
+                    self.update(UpdateMsg::Status);
+                }
+            }
             Action::Timer => {
                 self.spawn_timer();
             }
@@ -154,11 +164,6 @@ impl Model {
                 self.spawn_logout();
             }
             Action::Flux => {
-                let status = NetStatus::current();
-                if status != self.status {
-                    self.status = status;
-                    self.update(UpdateMsg::Status);
-                }
                 self.spawn_flux();
             }
             Action::LoginDone(s) | Action::LogoutDone(s) => {
@@ -224,6 +229,17 @@ impl Model {
         }
     }
 
+    fn spawn_watch_status(&self) {
+        let tx = self.tx.clone();
+        tokio::spawn(async move {
+            let mut events = NetStatus::watch();
+            while let Some(()) = events.next().await {
+                tx.send(Action::Status).await?;
+            }
+            Ok::<_, anyhow::Error>(())
+        });
+    }
+
     fn spawn_timer(&self) {
         let tx = self.tx.clone();
         tokio::spawn(async move {
@@ -363,6 +379,8 @@ pub enum Action {
     Credential(Arc<NetCredential>),
     UpdateCredential(String, String),
     State(Option<NetState>),
+    WatchStatus,
+    Status,
     Timer,
     Tick,
     Login,

diff --git a/tunet-suggest/src/ssid_map.rs b/tunet-suggest/src/ssid_map.rs
@@ -16,10 +16,10 @@ static SUGGEST_SSID_MAP: Lazy<BTreeMap<&'static str, NetState>> = Lazy::new(|| {
 });
 
 pub async fn suggest(client: &HttpClient) -> NetState {
-    suggest_with_status(client, NetStatus::current()).await
+    suggest_with_status(client, &NetStatus::current()).await
 }
 
-pub async fn suggest_with_status(client: &HttpClient, s: NetStatus) -> NetState {
+pub async fn suggest_with_status(client: &HttpClient, s: &NetStatus) -> NetState {
     let state = match s {
         NetStatus::Unknown => None,
         NetStatus::Wwan => Some(NetState::Unknown),