Merge branch 'main' into fix-bugs

.github/workflows/coverage.yml

@@ -137,7 +137,9 @@ jobs:
       - name: List contents of the reports directory
         run: ls -a reports
       - name: Upload to codecov.io
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           directory: reports
           fail_ci_if_error: false
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

Cargo.toml

@@ -59,7 +59,7 @@ thiserror = "1"
 tracing = "0.1"
 viewit = "0.1.5"
 
-memberlist-core = { version = "0.2.0-alpha.1", path = "core", default-features = false }
-memberlist-net = { version = "0.2.0-alpha.1", path = "transports/net", default-features = false }
-memberlist-types = { version = "0.2.0-alpha.1", path = "types", default-features = false }
-memberlist-quic = { version = "0.2.0-alpha.1", path = "transports/quic", default-features = false }
+memberlist-core = { version = "0.2", path = "core", default-features = false }
+memberlist-net = { version = "0.2", path = "transports/net", default-features = false }
+memberlist-types = { version = "0.2", path = "types", default-features = false }
+memberlist-quic = { version = "0.2", path = "transports/quic", default-features = false }

core/src/base.rs

@@ -316,7 +316,7 @@ where
     if let Err(e) = self.transport.shutdown().await {
       tracing::error!(err=%e, "memberlist: failed to shutdown transport");
       return Err(e);
-    }
+    } 
 
     Ok(())
   }

core/src/network/packet/listener.rs

@@ -42,10 +42,10 @@ where
     let this = self.clone();
     let packet_rx = this.inner.transport.packet();
     <T::Runtime as RuntimeLite>::spawn(async move {
-      loop {
+      'outer: loop {
         futures::select! {
           _ = shutdown_rx.recv().fuse() => {
-            break;
+            break 'outer;
           }
           packet = packet_rx.recv().fuse() => {
             match packet {
@@ -59,7 +59,7 @@ where
                 }
                 // If we got an error, which means on the other side the transport has been closed,
                 // so we need to return and shutdown the packet listener
-                break;
+                break 'outer;
               },
             }
           }

core/src/state.rs

@@ -661,10 +661,7 @@ macro_rules! bail_trigger {
                 if this.inner.shutdown_tx.is_closed() {
                   break 'outer;
                 }
-                let shutdown = this.$fn(&stop_rx).await;
-                if shutdown {
-                  break 'outer;
-                }
+                this.$fn(&stop_rx).await;
               }
             }
           }

transports/net/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "memberlist-net"
-version.workspace = true
+version = "0.2.2"
 edition.workspace = true
 license.workspace = true
 repository.workspace = true

transports/net/src/lib.rs

@@ -666,7 +666,6 @@ where
 
     let mut handles = core::mem::take(&mut *self.handles.borrow_mut());
     while handles.next().await.is_some() {}
-
     Ok(())
   }
 }

transports/net/src/packet_processor.rs

@@ -356,19 +356,29 @@ where
     };
     let keys = encryptor.keys().await;
     if encrypted_message_size <= offload_size {
-      return Self::decrypt(algo, keys, packet_label.as_bytes(), &mut encrypted_message).and_then(
-        |_| Self::read_from_packet_without_compression_and_encryption(encrypted_message),
-      );
+      return Self::decrypt( 
+        algo,
+        keys,
+        packet_label.as_bytes(),
+        &mut encrypted_message,
+      )
+      .and_then(|_| Self::read_from_packet_without_compression_and_encryption(encrypted_message));
     }
 
     let (tx, rx) = futures::channel::oneshot::channel();
 
     rayon::spawn(move || {
       if tx
         .send(
-          Self::decrypt(algo, keys, packet_label.as_bytes(), &mut encrypted_message).and_then(
-            |_| Self::read_from_packet_without_compression_and_encryption(encrypted_message),
-          ),
+          Self::decrypt(
+            algo,
+            keys,
+            packet_label.as_bytes(),
+            &mut encrypted_message,
+          )
+          .and_then(|_| {
+            Self::read_from_packet_without_compression_and_encryption(encrypted_message)
+          }),
         )
         .is_err()
       {