fix(p2p/webrtc): bug in discovery enabling condition and enable discovery for webnode

Author: binier

node/web/src/lib.rs

@@ -24,7 +24,7 @@ fn main() {
     thread::main_thread_init();
     wasm_bindgen_futures::spawn_local(async {
         console_error_panic_hook::set_once();
-        tracing::initialize(tracing::Level::INFO);
+        tracing::initialize(tracing::Level::DEBUG);
 
         init_rayon().await.unwrap();
     });
@@ -70,7 +70,6 @@ async fn setup_node(
     }
 
     node_builder
-        .p2p_no_discovery()
         .p2p_custom_task_spawner(P2pTaskRemoteSpawner {})
         .unwrap();
     node_builder.gather_stats();

p2p/src/channels/signaling/discovery/p2p_channels_signaling_discovery_actions.rs

@@ -126,27 +126,24 @@ impl redux::EnablingCondition<P2pState> for P2pChannelsSignalingDiscoveryAction
                 })
             }
             P2pChannelsSignalingDiscoveryAction::RequestSend { peer_id } => {
-                !state.already_has_max_peers()
-                    && state.get_ready_peer(peer_id).map_or(false, |p| {
-                        match &p.channels.signaling.discovery {
-                            P2pChannelsSignalingDiscoveryState::Ready { local, .. } => {
-                                match local {
-                                    SignalingDiscoveryState::WaitingForRequest { .. } => true,
-                                    SignalingDiscoveryState::DiscoveredRejected {
-                                        time, ..
-                                    }
-                                    | SignalingDiscoveryState::Answered { time, .. } => {
-                                        // Allow one discovery request per minute.
-                                        // TODO(binier): make configurable
-                                        now.checked_sub(*time)
-                                            .map_or(false, |dur| dur.as_secs() >= 60)
-                                    }
-                                    _ => false,
+                state.get_ready_peer(peer_id).map_or(false, |p| {
+                    match &p.channels.signaling.discovery {
+                        P2pChannelsSignalingDiscoveryState::Ready { local, .. } => {
+                            match local {
+                                SignalingDiscoveryState::WaitingForRequest { .. } => true,
+                                SignalingDiscoveryState::DiscoveredRejected { time, .. }
+                                | SignalingDiscoveryState::Answered { time, .. } => {
+                                    // Allow one discovery request per minute.
+                                    // TODO(binier): make configurable
+                                    now.checked_sub(*time)
+                                        .map_or(false, |dur| dur.as_secs() >= 60)
                                 }
+                                _ => false,
                             }
-                            _ => false,
                         }
-                    })
+                        _ => false,
+                    }
+                })
             }
             P2pChannelsSignalingDiscoveryAction::DiscoveryRequestReceived { peer_id, .. } => state
                 .get_ready_peer(peer_id)
@@ -218,14 +215,17 @@ impl redux::EnablingCondition<P2pState> for P2pChannelsSignalingDiscoveryAction
                 }),
             // TODO(binier): constrain interval between these requests
             // to handle malicious peers.
-            P2pChannelsSignalingDiscoveryAction::DiscoveryRequestSend { peer_id, .. } => state
-                .get_ready_peer(peer_id)
-                .map_or(false, |p| match &p.channels.signaling.discovery {
-                    P2pChannelsSignalingDiscoveryState::Ready { remote, .. } => {
-                        matches!(remote, SignalingDiscoveryState::Requested { .. })
-                    }
-                    _ => false,
-                }),
+            P2pChannelsSignalingDiscoveryAction::DiscoveryRequestSend { peer_id, .. } => {
+                !state.already_has_min_peers()
+                    && state.get_ready_peer(peer_id).map_or(false, |p| {
+                        match &p.channels.signaling.discovery {
+                            P2pChannelsSignalingDiscoveryState::Ready { remote, .. } => {
+                                matches!(remote, SignalingDiscoveryState::Requested { .. })
+                            }
+                            _ => false,
+                        }
+                    })
+            }
             P2pChannelsSignalingDiscoveryAction::DiscoveredReceived { peer_id, .. } => state
                 .get_ready_peer(peer_id)
                 .map_or(false, |p| match &p.channels.signaling.discovery {