feat: v0.2.5

bruty_client/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bruty_client"
 authors = ["skifli"]
-version = "0.2.4"
+version = "0.2.5"
 edition = "2021"
 
 [dependencies]

bruty_client/src/main.rs

@@ -276,7 +276,7 @@ async fn create_connection(remote_url: &str, id: i16, secret: String) {
     .await;
 }
 
-#[tokio::main]
+#[tokio::main(flavor = "multi_thread")]
 async fn main() {
     let args: Args = Args::parse();
     let remote_url = "wss://bruty.shuttleapp.rs/ivocord";
@@ -293,7 +293,10 @@ async fn main() {
 
     log::info!("Bruty Client v{} by {}.", VERSION, AUTHOR);
 
-    let server_status_client = reqwest::Client::new();
+    let server_status_client = reqwest::Client::builder()
+        .timeout(std::time::Duration::from_millis(100))
+        .build()
+        .unwrap();
 
     loop {
         let req = server_status_client

bruty_client/src/payload_handlers.rs

@@ -95,12 +95,11 @@ pub async fn test_request_data(
 
         let id_generator = IdGenerator::new(test_request_data.id.clone());
 
-        let futures = futures::stream::FuturesUnordered::new();
-
-        for id in id_generator {
+        let bodies = futures::stream::FuturesUnordered::from_iter(
+            id_generator.map(|id| {
             let client = &reqwest_client_clone;
 
-            futures.push(async move {
+            async move {
                 let id_vec = id.clone();
                 let id_str = id.iter().collect::<String>();
 
@@ -157,19 +156,20 @@ pub async fn test_request_data(
                         }
                     }
                 }
-            });
-        }
-
-        let positives: Vec<_> = futures.filter_map(|result| async {
-            if let Some(video) = result {
-                match video.event {
-                    bruty_share::types::VideoEvent::Success | bruty_share::types::VideoEvent::NotEmbeddable => Some(video),
-                }
-            } else {
-                None
             }
-        }).collect().await;        
-
+        }));
+
+        let positives = bodies
+            .filter_map(|video_option| async {
+            match video_option {
+                Some(video) => match video.event {
+                    bruty_share::types::VideoEvent::NotEmbeddable | bruty_share::types::VideoEvent::Success => Some(video),
+                },
+                None => None,
+            }
+            })
+            .collect::<Vec<bruty_share::types::Video>>()
+            .await;
 
         let elapsed_time = start_time.elapsed().as_secs_f64();
 

bruty_server/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bruty_server"
 authors = ["skifli"]
-version = "0.2.4"
+version = "0.2.5"
 edition = "2021"
 
 [dependencies]

bruty_server/src/server_threads.rs

@@ -154,6 +154,9 @@ pub async fn results_progress_handler(
                         "Can't update current ID to {}, awaiting {:?}",
                         cant_update.iter().collect::<String>(),
                         awaiting_results
+                            .iter()
+                            .map(|x| x.iter().collect::<String>())
+                            .collect::<Vec<String>>()
                     );
                 }
             }