Depend on n0-watcher version 0.6.0 (#3652)

Bumps the `n0-watcher` dependency to the released version.

Depends on `net-tools` also bumping the n0-watcher version:
- [x] n0-computer/net-tools#64

<!-- Remove any that are not relevant. -->
- [x] Self-review.

Author: matheus23

Cargo.lock

@@ -43,8 +43,6 @@ unused-async = "warn"
 
 
 [patch.crates-io]
-n0-watcher = { git = "https://github.com/n0-computer/n0-watcher", branch = "feat-get-ref" }
-
 iroh-quinn = { git = "https://github.com/n0-computer/quinn", branch = "main-iroh" }
 iroh-quinn-proto = { git = "https://github.com/n0-computer/quinn", branch = "main-iroh" }
 iroh-quinn-udp = { git = "https://github.com/n0-computer/quinn", branch = "main-iroh" }

Cargo.toml

@@ -33,7 +33,7 @@ iroh-base = { version = "0.95.1", default-features = false, features = ["key", "
 iroh-relay = { version = "0.95", path = "../iroh-relay", default-features = false }
 n0-future = "0.3.0"
 n0-error = "0.1.0"
-n0-watcher = "0.5"
+n0-watcher = "0.6"
 netwatch = { version = "0.12" }
 pin-project = "1"
 pkarr = { version = "5", default-features = false, features = ["relays"] }

iroh/Cargo.toml

@@ -491,7 +491,7 @@ impl MagicSock {
 
     #[cfg_attr(windows, allow(dead_code))]
     fn normalized_local_addr(&self) -> io::Result<SocketAddr> {
-        let addrs = self.local_addrs_watch.get_ref();
+        let addrs = self.local_addrs_watch.peek();
 
         let mut ipv4_addr = None;
         for addr in addrs {

iroh/src/magicsock.rs

@@ -1183,10 +1183,10 @@ impl ConnectionState {
 pub(crate) struct PathsWatcher(
     Box<
         n0_watcher::Map<
-            (
+            n0_watcher::Tuple<
                 n0_watcher::Direct<PathAddrList>,
                 n0_watcher::Direct<Option<transports::Addr>>,
-            ),
+            >,
             PathInfoList,
         >,
     >,
@@ -1195,8 +1195,12 @@ pub(crate) struct PathsWatcher(
 impl n0_watcher::Watcher for PathsWatcher {
     type Value = PathInfoList;
 
-    fn get(&mut self) -> Self::Value {
-        self.0.get()
+    fn update(&mut self) -> bool {
+        self.0.update()
+    }
+
+    fn peek(&self) -> &Self::Value {
+        self.0.peek()
     }
 
     fn is_connected(&self) -> bool {
@@ -1206,7 +1210,7 @@ impl n0_watcher::Watcher for PathsWatcher {
     fn poll_updated(
         &mut self,
         cx: &mut std::task::Context<'_>,
-    ) -> Poll<Result<Self::Value, n0_watcher::Disconnected>> {
+    ) -> Poll<Result<(), n0_watcher::Disconnected>> {
         self.0.poll_updated(cx)
     }
 }

iroh/src/magicsock/endpoint_map/endpoint_state.rs

@@ -40,13 +40,13 @@ pub(crate) struct Transports {
 
 #[cfg(not(wasm_browser))]
 pub(crate) type LocalAddrsWatch = n0_watcher::Map<
-    (
+    n0_watcher::Tuple<
         n0_watcher::Join<SocketAddr, n0_watcher::Direct<SocketAddr>>,
         n0_watcher::Join<
             Option<(RelayUrl, EndpointId)>,
             n0_watcher::Map<n0_watcher::Direct<Option<RelayUrl>>, Option<(RelayUrl, EndpointId)>>,
         >,
-    ),
+    >,
     Vec<Addr>,
 >;
 
@@ -155,7 +155,7 @@ impl Transports {
         let ips = n0_watcher::Join::new(self.ip.iter().map(|t| t.local_addr_watch()));
         let relays = n0_watcher::Join::new(self.relay.iter().map(|t| t.local_addr_watch()));
 
-        (ips, relays).map(|(ips, relays)| {
+        ips.or(relays).map(|(ips, relays)| {
             ips.into_iter()
                 .map(Addr::from)
                 .chain(