refactor: select next incoming message or ping message due

examples/arsnova-client-tui.rs

@@ -51,7 +51,7 @@ pub struct Cli {
     url: String,
 }
 
-#[tokio::main(worker_threads = 3)]
+#[tokio::main(worker_threads = 2)]
 async fn main() -> Result<(), ()> {
     let cli = Cli::parse();
 

src/client.rs

@@ -28,8 +28,8 @@ use futures_util::{SinkExt, StreamExt};
 use reqwest::{IntoUrl, StatusCode};
 use serde::Deserialize;
 use serde_json::json;
+use tokio::select;
 use tokio::sync::mpsc::{Receiver, Sender};
-use tokio::{join, select};
 use tokio_tungstenite::connect_async;
 use tokio_tungstenite::tungstenite::Message;
 use url::Url;
@@ -493,7 +493,7 @@ impl Client<LoggedIn> {
             .await
             .map_err(|_| ConnectionError)?;
 
-        let (mut write, read) = socket.split();
+        let (mut write, mut read) = socket.split();
 
         if write
             .send(Message::Text(
@@ -508,12 +508,11 @@ impl Client<LoggedIn> {
                 ))
                 .await
             {
-                Ok(_) => {}
+                Ok(_) => loop {
-                Err(_) => return Err(ConnectionError),
+                    select! {
-            }
+                        Some(next) = read.next() => {
-
+                            match &next {
-            let jh1 = read.for_each(|msg| async {
+                                Ok(msg) => {
-                if let Ok(msg) = msg {
                                     if msg.is_text() && msg.clone().into_text().unwrap().starts_with("MESSAGE") {
                                         if let Ok(msg) = WsFeedbackMessage::parse(msg.to_text().unwrap()) {
                                             if msg.body.body_type == "FeedbackChanged" {
@@ -528,17 +527,16 @@ impl Client<LoggedIn> {
                                         }
                                     }
                                 }
-            });
+                                Err(_) => break
-
+                            }
-            let jh2 = tokio::spawn(async move {
+                        }
-                loop {
+                        _ = tokio::time::sleep(Duration::from_secs(15)) => {
-                    tokio::time::sleep(Duration::from_secs(15)).await;
                             let _ = write.send(Message::Text("\n".to_string())).await;
                         }
-            });
+                    }
-
+                },
-            let _ = join!(jh1, jh2);
+                Err(_) => return Err(ConnectionError),
-            return Ok(());
+            }
         }
 
         Err(ConnectionError)