fix(netwatch): add last_updated to State so time jumps always notify watchers

Author: dignifiedquire

netwatch/src/interfaces.rs

@@ -188,6 +188,9 @@ pub struct State {
     ///
     /// When set, its value is the map key into `interface` and `interface_ips`.
     pub default_route_interface: Option<String>,
+
+    /// Monotonic timestamp used to force [`n0_watcher::Watchable`] notifications.
+    pub last_updated: n0_future::time::Instant,
 }
 
 impl fmt::Display for State {
@@ -251,6 +254,7 @@ impl State {
             have_v6,
             is_expensive: false,
             default_route_interface,
+            last_updated: n0_future::time::Instant::now(),
         }
     }
 
@@ -267,9 +271,20 @@ impl State {
             have_v4: true,
             is_expensive: false,
             default_route_interface: Some(ifname),
+            last_updated: n0_future::time::Instant::now(),
         }
     }
 
+    /// Compares network state ignoring `last_updated`.
+    pub fn eq_ignoring_timestamp(&self, other: &State) -> bool {
+        self.interfaces == other.interfaces
+            && self.local_addresses == other.local_addresses
+            && self.have_v6 == other.have_v6
+            && self.have_v4 == other.have_v4
+            && self.is_expensive == other.is_expensive
+            && self.default_route_interface == other.default_route_interface
+    }
+
     /// Is this a major change compared to the `old` one?.
     pub fn is_major_change(&self, old: &State) -> bool {
         if self.have_v6 != old.have_v6

netwatch/src/interfaces/wasm_browser.rs

@@ -1,6 +1,7 @@
 use std::{collections::HashMap, fmt};
 
 use js_sys::{JsString, Reflect};
+use n0_future::time::Instant;
 
 pub const BROWSER_INTERFACE: &str = "browserif";
 
@@ -73,6 +74,9 @@ pub struct State {
 
     /// The URL to the Proxy Autoconfig URL, if applicable.
     pub(crate) pac: Option<String>,
+
+    /// Monotonic timestamp used to force [`n0_watcher::Watchable`] notifications.
+    pub last_updated: Instant,
 }
 
 impl fmt::Display for State {
@@ -113,9 +117,21 @@ impl State {
             default_route_interface: Some(BROWSER_INTERFACE.to_string()),
             http_proxy: None,
             pac: None,
+            last_updated: Instant::now(),
         }
     }
 
+    /// Compares network state ignoring `last_updated`.
+    pub fn eq_ignoring_timestamp(&self, other: &State) -> bool {
+        self.interfaces == other.interfaces
+            && self.have_v6 == other.have_v6
+            && self.have_v4 == other.have_v4
+            && self.is_expensive == other.is_expensive
+            && self.default_route_interface == other.default_route_interface
+            && self.http_proxy == other.http_proxy
+            && self.pac == other.pac
+    }
+
     /// Is this a major change compared to the `old` one?.
     pub fn is_major_change(&self, old: &State) -> bool {
         // All changes are major.

netwatch/src/netmon/actor.rs

@@ -147,7 +147,7 @@ impl Actor {
         let old_state = &self.interface_state.get();
 
         // No major changes, continue on
-        if !time_jumped && old_state == &new_state {
+        if !time_jumped && old_state.eq_ignoring_timestamp(&new_state) {
             debug!("no changes detected");
             return;
         }