feat(iroh): add initial scaffolding for WebRTC support

iroh/src/disco.rs

@@ -24,13 +24,14 @@ use std::{
 };
 
 use data_encoding::HEXLOWER;
-use iroh_base::{PublicKey, RelayUrl};
+use iroh_base::{NodeId, PublicKey, RelayUrl};
 use nested_enum_utils::common_fields;
 use serde::{Deserialize, Serialize};
 use snafu::{Snafu, ensure};
 use url::Url;
 
 use crate::magicsock::transports;
+use crate::magicsock::transports::Addr;
 
 // TODO: custom magicn
 /// The 6 byte header of all discovery messages.
@@ -143,6 +144,8 @@ pub enum SendAddr {
     Udp(SocketAddr),
     /// Relay Url.
     Relay(RelayUrl),
+    /// Node Id
+    NodeId(NodeId)
 }
 
 impl SendAddr {
@@ -165,6 +168,7 @@ impl From<transports::Addr> for SendAddr {
         match addr {
             transports::Addr::Ip(addr) => SendAddr::Udp(addr),
             transports::Addr::Relay(url, _) => SendAddr::Relay(url),
+            Addr::WebRtc(relay_url, dest_id, channel_id) => SendAddr::
         }
     }
 }

iroh/src/magicsock.rs

@@ -657,6 +657,12 @@ impl MagicSock {
                                 .recv_data_relay
                                 .inc_by(datagram.len() as _);
                         }
+                        transports::Addr::WebRtc(..) => {
+                            self.metrics
+                                .magicsock
+                                .recv_data_webrtc
+                                .inc_by(datagram.len() as _);
+                        }
                     }
 
                     quic_datagram_count += 1;
@@ -719,6 +725,11 @@ impl MagicSock {
                         let quic_mapped_addr = self.node_map.receive_relay(src_url, *src_node);
                         quinn_meta.addr = quic_mapped_addr.private_socket_addr();
                     }
+                    transports::Addr::WebRtc(relay_url, node_id, channel_id) => {
+
+                    todo!("implemnet webrtc processing")
+
+                    }
                 }
             } else {
                 // If all datagrams in this buf are DISCO, set len to zero to make

iroh/src/magicsock/transports.rs

@@ -6,7 +6,7 @@ use std::{
     task::{Context, Poll},
 };
 
-use crate::magicsock::transports::webrtc::WebRtcTransport;
+use crate::magicsock::transports::webrtc::{WebRtcSender, WebRtcTransport};
 use iroh_base::{NodeId, RelayUrl};
 use n0_watcher::Watcher;
 use relay::{RelayNetworkChangeSender, RelaySender};
@@ -235,13 +235,15 @@ impl Transports {
         #[cfg(not(wasm_browser))]
         let ip = self.ip.iter().map(|t| t.create_sender()).collect();
         let relay = self.relay.iter().map(|t| t.create_sender()).collect();
+        let webrtc = self.web_rtc.iter().map(|t| t.create_sender()).collect();
         let max_transmit_segments = self.max_transmit_segments();
 
         UdpSender {
             #[cfg(not(wasm_browser))]
             ip,
             msock,
             relay,
+            webrtc,
             max_transmit_segments,
         }
     }
@@ -317,8 +319,12 @@ pub(crate) struct Transmit<'a> {
 pub(crate) enum Addr {
     Ip(SocketAddr),
     Relay(RelayUrl, NodeId),
+    WebRtc(RelayUrl, NodeId, ChannelId),
 }
 
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct ChannelId(Option<u16>);
+
 impl Default for Addr {
     fn default() -> Self {
         Self::Ip(SocketAddr::V6(SocketAddrV6::new(
@@ -352,6 +358,7 @@ impl Addr {
         match self {
             Self::Ip(ip) => Some(ip),
             Self::Relay(..) => None,
+            Self::WebRtc(relay_url, node_id, channel_id) => None,
         }
     }
 }
@@ -362,6 +369,7 @@ pub(crate) struct UdpSender {
     #[cfg(not(wasm_browser))]
     ip: Vec<IpSender>,
     relay: Vec<RelaySender>,
+    webrtc: Vec<WebRtcSender>,
     max_transmit_segments: usize,
 }
 
@@ -409,6 +417,19 @@ impl UdpSender {
                     }
                 }
             }
+            Addr::WebRtc(relay_url, node_id, channel_id) => {
+
+                for sender in &self.webrtc {
+                    match sender.send(*node_id,transmit, channel_id).await{
+                        Ok(()) => {
+                            return Ok(());
+                        }
+                        Err(err) => {
+                            warn!("webrtc failed to send: {:?}", err);
+                        }
+                    }
+                }
+            }
         }
         if any_match {
             Err(io::Error::other("all available transports failed"))
@@ -452,6 +473,17 @@ impl UdpSender {
                     }
                 }
             }
+            Addr::WebRtc(relay_url, node_id, channel_id) => {
+
+                for sender in &mut self.webrtc {
+                    match sender.poll_send(cx, *node_id, transmit, channel_id){
+                        Poll::Ready(res) => { return  Poll::Ready(res) },
+                        Poll::Pending => {}
+                    }
+                }
+
+            }
+
         }
         Poll::Pending
     }
@@ -493,6 +525,18 @@ impl UdpSender {
                     }
                 }
             }
+            Addr::WebRtc(relay_url, node_id, channel_id) => {
+                for transport in &self.webrtc {
+
+                    match transport.try_send(*node_id, transmit, channel_id) {
+                        Ok(()) => return Ok(()),
+                        Err(_err) => {
+                            continue;
+                        }
+                    }
+
+                }
+            }
         }
         Err(io::Error::new(
             io::ErrorKind::WouldBlock,