report errors to client

1 files changed, 14 insertions, 2 deletions

diff --git a/server/src/main.rs b/server/src/main.rs
index 96c268e5..5c718fb0 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -5,7 +5,7 @@ use std::{sync::Arc, time::Duration};
 use tokio::{
     net::TcpListener,
     spawn,
-    sync::{broadcast, RwLock},
+    sync::{broadcast, mpsc::channel, RwLock},
     time::sleep,
 };
 use tokio_tungstenite::tungstenite::Message;
@@ -55,6 +55,7 @@ async fn main() -> Result<()> {
         let (mut write, mut read) = sock.split();
         let game = game.clone();
         let mut rx = rx.resubscribe();
+        let (error_tx, mut error_rx) = channel::<PacketC>(8);
         info!("{addr} connected via ws");
         let init = game.write().await.prime_client(id);
         spawn(async move {
@@ -69,7 +70,13 @@ async fn main() -> Result<()> {
                     return;
                 }
             }
-            while let Ok(packet) = rx.recv().await {
+            loop {
+                let Some(packet) = tokio::select!(
+                   p = rx.recv() => p.ok(),
+                   p = error_rx.recv() => p,
+                ) else {
+                    break;
+                };
                 if let Err(e) = write
                     .send(tokio_tungstenite::tungstenite::Message::Text(
                         serde_json::to_string(&packet).unwrap(),
@@ -92,6 +99,11 @@ async fn main() -> Result<()> {
                         debug!("<- {id:?} {packet:?}");
                         if let Err(e) = game.write().await.packet_in(id, packet) {
                             warn!("client error: {e}");
+                            let _ = error_tx
+                                .send(PacketC::Error {
+                                    message: format!("{e}"),
+                                })
+                                .await;
                         }
                     }
                     Message::Close(_) => break,