Run multiple futures at once.

vldr · Oct 4, 2023 · a7ab3ac · a7ab3ac
1 parent b23bea6
commit a7ab3ac
Showing 1 changed file with 20 additions and 16 deletions.
diff --git a/src/relay.rs b/src/relay.rs
@@ -1,6 +1,6 @@
-use futures_util::{stream::SplitSink, SinkExt, StreamExt};
+use futures_util::{future::join_all, stream::SplitSink, SinkExt, StreamExt};
 use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, sync::Arc};
+use std::{collections::HashMap, sync::Arc, vec};
 use tokio::{net::TcpStream, sync::Mutex, sync::RwLock};
 use tokio_tungstenite::{tungstenite::protocol::Message, WebSocketStream};
 use tungstenite::{
@@ -138,7 +138,7 @@ impl Server {
                     Err(error) => {
                         println!("Failed to read message: {}", error);
                         break;
-                    },
+                    }
                 }
             }
 
@@ -255,17 +255,18 @@ impl Client {
 
         drop(server);
 
+        self.room_id = Some(room_id);
+
+        let mut futures = vec![];
         for sender in &senders {
             if Arc::ptr_eq(sender, &self.sender) {
-                self.send_packet(&sender, ResponsePacket::Join { size })
-                    .await;
+                futures.push(self.send_packet(sender, ResponsePacket::Join { size }));
             } else {
-                self.send_packet(&sender, ResponsePacket::Join { size: None })
-                    .await;
+                futures.push(self.send_packet(sender, ResponsePacket::Join { size: None }));
             }
         }
 
-        self.room_id = Some(room_id);
+        join_all(futures).await;
     }
 
     async fn handle_leave_room(&mut self, server: &RwLock<Server>) {
@@ -295,10 +296,12 @@ impl Client {
 
         drop(server);
 
+        let mut futures = vec![];
         for sender in &senders {
-            self.send_packet(&sender, ResponsePacket::Leave { index })
-                .await;
+            futures.push(self.send_packet(sender, ResponsePacket::Leave { index }));
         }
+
+        join_all(futures).await;
     }
 
     async fn handle_message(&mut self, server: &RwLock<Server>, message: Message) {
@@ -311,11 +314,11 @@ impl Client {
                 return
             };
 
-            return match packet {
+            match packet {
                 RequestPacket::Create { size } => self.handle_create_room(server, size).await,
                 RequestPacket::Join { id } => self.handle_join_room(server, id).await,
                 RequestPacket::Leave => self.handle_leave_room(server).await,
-            };
+            }
         } else if message.is_binary() {
             let server = server.read().await;
 
@@ -346,21 +349,22 @@ impl Client {
 
                 drop(server);
 
-                return self
-                    .send(&sender, Message::Binary(data))
-                    .await;
+                return self.send(&sender, Message::Binary(data)).await;
             } else if destination == usize::from(u8::MAX) {
                 let senders = room.senders.clone();
 
                 drop(server);
 
+                let mut futures = vec![];
                 for sender in &senders {
                     if Arc::ptr_eq(sender, &self.sender) {
                         continue;
                     }
 
-                    self.send(&sender, Message::Binary(data.clone())).await;
+                    futures.push(self.send(sender, Message::Binary(data.clone())));
                 }
+
+                join_all(futures).await;
             }
         }
     }