Add cancellation pattern to peer connection workflow (#327) (#360)

Co-authored-by: vinny-pereira <142326456+vinny-pereira@users.noreply.github.com>
vinteumorg · Jan 29, 2025 · 07d48d5 · 07d48d5
1 parent d23924b
commit 07d48d5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/crates/floresta-wire/src/p2p_wire/node.rs b/crates/floresta-wire/src/p2p_wire/node.rs
@@ -917,9 +917,13 @@ where
         stream.set_nodelay(true)?;
         let (reader, writer) = tokio::io::split(stream);
 
+        let (cancellation_sender, cancellation_receiver) = tokio::sync::oneshot::channel();
         let (actor_receiver, actor) = create_tcp_stream_actor(reader);
         tokio::spawn(async move {
-            let _ = actor.run().await;
+            tokio::select! {
+                _ = cancellation_receiver => {}
+                _ = actor.run() => {}
+            }
         });
 
         // Use create_peer function instead of manually creating the peer
@@ -934,6 +938,7 @@ where
             actor_receiver,
             writer,
             user_agent,
+            cancellation_sender,
         )
         .await;
 
@@ -968,9 +973,14 @@ where
         let proxy = TcpStream::connect(proxy).await?;
         let stream = Socks5StreamBuilder::connect(proxy, addr, address.get_port()).await?;
         let (reader, writer) = tokio::io::split(stream);
+
+        let (cancellation_sender, cancellation_receiver) = tokio::sync::oneshot::channel();
         let (actor_receiver, actor) = create_tcp_stream_actor(reader);
         tokio::spawn(async move {
-            let _ = actor.run().await;
+            tokio::select! {
+                _ = cancellation_receiver => {}
+                _ = actor.run() => {}
+            }
         });
 
         Peer::<WriteHalf>::create_peer(
@@ -984,6 +994,7 @@ where
             actor_receiver,
             writer,
             user_agent,
+            cancellation_sender,
         )
         .await;
         Ok(())

diff --git a/crates/floresta-wire/src/p2p_wire/peer.rs b/crates/floresta-wire/src/p2p_wire/peer.rs
@@ -170,6 +170,7 @@ pub struct Peer<T: AsyncWrite + Unpin> {
     actor_receiver: UnboundedReceiver<ReaderMessage>, // Add the receiver for messages from TcpStreamActor
     writer: T,
     our_user_agent: String,
+    cancellation_sender: tokio::sync::oneshot::Sender<()>,
 }
 
 #[derive(Debug, Error)]
@@ -243,6 +244,13 @@ impl<T: AsyncWrite + Unpin> Peer<T> {
             );
         }
 
+        if let Err(cancellation_err) = self.cancellation_sender.send(()) {
+            debug!(
+                "Failed to propagate cancellation signal for Peer {}: {cancellation_err:?}",
+                self.id
+            );
+        }
+
         if let Err(err) = err {
             debug!("Peer {} connection loop closed: {err:?}", self.id);
         }
@@ -602,6 +610,7 @@ impl<T: AsyncWrite + Unpin> Peer<T> {
         actor_receiver: UnboundedReceiver<ReaderMessage>,
         writer: WriteHalf<TcpStream>,
         our_user_agent: String,
+        cancellation_sender: tokio::sync::oneshot::Sender<()>,
     ) {
         let peer = Peer {
             address_id,
@@ -626,6 +635,7 @@ impl<T: AsyncWrite + Unpin> Peer<T> {
             actor_receiver, // Add the receiver for messages from TcpStreamActor
             writer,
             our_user_agent,
+            cancellation_sender,
         };
 
         spawn(peer.read_loop());