Merge pull request #966 from openmina/fix/p2p/webrtc/failed_connections_cleanup

Fix: WebRTC failed connections leaking

Author: binier

node/src/action_kind.rs

@@ -339,6 +339,7 @@ pub enum ActionKind {
     P2pConnectionOutgoingEffectfulInit,
     P2pConnectionOutgoingEffectfulOfferSend,
     P2pConnectionOutgoingEffectfulRandomInit,
+    P2pDisconnectionFailedCleanup,
     P2pDisconnectionFinish,
     P2pDisconnectionInit,
     P2pDisconnectionPeerClosed,
@@ -704,7 +705,7 @@ pub enum ActionKind {
 }
 
 impl ActionKind {
-    pub const COUNT: u16 = 594;
+    pub const COUNT: u16 = 595;
 }
 
 impl std::fmt::Display for ActionKind {
@@ -1213,6 +1214,7 @@ impl ActionKindGet for P2pDisconnectionAction {
         match self {
             Self::Init { .. } => ActionKind::P2pDisconnectionInit,
             Self::PeerClosed { .. } => ActionKind::P2pDisconnectionPeerClosed,
+            Self::FailedCleanup { .. } => ActionKind::P2pDisconnectionFailedCleanup,
             Self::Finish { .. } => ActionKind::P2pDisconnectionFinish,
         }
     }

p2p/src/connection/incoming/p2p_connection_incoming_reducer.rs

@@ -363,6 +363,7 @@ impl P2pConnectionIncomingState {
                         dispatcher.push_callback(callback.clone(), (rpc_id, str_error));
                     }
                 }
+                dispatcher.push(P2pDisconnectionAction::FailedCleanup { peer_id });
 
                 Ok(())
             }

p2p/src/connection/outgoing/p2p_connection_outgoing_reducer.rs

@@ -9,6 +9,7 @@ use crate::{
         outgoing_effectful::P2pConnectionOutgoingEffectfulAction, P2pConnectionErrorResponse,
         P2pConnectionState,
     },
+    disconnection::P2pDisconnectionAction,
     webrtc::Host,
     P2pNetworkKadRequestAction, P2pNetworkSchedulerAction, P2pPeerAction, P2pPeerState,
     P2pPeerStatus, P2pState,
@@ -535,6 +536,8 @@ impl P2pConnectionOutgoingState {
                         dispatcher.push_callback(callback.clone(), (rpc_id, error));
                     }
                 }
+                dispatcher.push(P2pDisconnectionAction::FailedCleanup { peer_id });
+
                 Ok(())
             }
             P2pConnectionOutgoingAction::Success { peer_id } => {

p2p/src/disconnection/p2p_disconnection_actions.rs

@@ -18,6 +18,8 @@ pub enum P2pDisconnectionAction {
     /// Peer disconnection.
     #[action_event(fields(display(peer_id)), level = info)]
     PeerClosed { peer_id: PeerId },
+    #[action_event(fields(display(peer_id)), level = info)]
+    FailedCleanup { peer_id: PeerId },
     /// Finish disconnecting from a peer.
     #[action_event(fields(display(peer_id)), level = debug)]
     Finish { peer_id: PeerId },
@@ -31,8 +33,13 @@ impl redux::EnablingCondition<P2pState> for P2pDisconnectionAction {
             | P2pDisconnectionAction::Finish { peer_id } => {
                 state.peers.get(peer_id).map_or(false, |peer| {
                     !matches!(peer.status, P2pPeerStatus::Disconnected { .. })
+                        && !peer.status.is_error()
                 })
             }
+            P2pDisconnectionAction::FailedCleanup { peer_id } => state
+                .peers
+                .get(peer_id)
+                .map_or(false, |peer| !peer.is_libp2p() && peer.status.is_error()),
         }
     }
 }

p2p/src/disconnection/p2p_disconnection_reducer.rs

@@ -60,6 +60,11 @@ impl P2pDisconnectedState {
                 dispatcher.push(P2pDisconnectionEffectfulAction::Init { peer_id });
                 Ok(())
             }
+            P2pDisconnectionAction::FailedCleanup { peer_id } => {
+                let dispatcher = state_context.into_dispatcher();
+                dispatcher.push(P2pDisconnectionEffectfulAction::Init { peer_id });
+                Ok(())
+            }
             P2pDisconnectionAction::Finish { peer_id } => {
                 let Some(peer) = p2p_state.peers.get_mut(&peer_id) else {
                     bug_condition!("Invalid state for: `P2pDisconnectionAction::Finish`");

p2p/src/disconnection_effectful/p2p_disconnection_effectful_actions.rs

@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 use crate::{P2pPeerStatus, P2pState, PeerId};
 
 #[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)]
-#[action_event(fields(display(peer_id), display(reason)), level = debug)]
+#[action_event(fields(display(peer_id)), level = debug)]
 pub enum P2pDisconnectionEffectfulAction {
     /// Initialize disconnection.
     Init { peer_id: PeerId },