fix: receive() no longer blocks infinitely (#330)

johanhelsing · Sep 19, 2023 · 6db5f5a · 6db5f5a
1 parent a93041a
commit 6db5f5a
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/matchbox_socket/src/webrtc_socket/socket.rs b/matchbox_socket/src/webrtc_socket/socket.rs
@@ -340,10 +340,11 @@ impl WebRtcChannel {
     ///
     /// Messages are removed from the socket when called.
     pub fn receive(&mut self) -> Vec<(PeerId, Packet)> {
-        std::iter::repeat_with(|| self.rx.try_next())
-            .map_while(Result::ok)
-            .flatten()
-            .collect()
+        let mut messages = vec![];
+        while let Ok(Some(x)) = self.rx.try_next() {
+            messages.push(x);
+        }
+        messages
     }
 
     /// Send a packet to the given peer.