fixes: #514

andrewgazelka · Oct 31, 2024 · 15eae35 · 15eae35
1 parent a7b7a53
commit 15eae35
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/crates/hyperion-proxy/src/player.rs b/crates/hyperion-proxy/src/player.rs
@@ -67,7 +67,10 @@ pub fn initiate_player_connection(
                 )
                 .unwrap();
 
-                server_sender.send(connect).await.unwrap();
+                if let Err(e) = server_sender.send(connect).await {
+                    warn!("failed to send player connect to server: {e}");
+                    return;
+                }
 
                 let mut arena = Arena::new();
 
@@ -158,7 +161,9 @@ pub fn initiate_player_connection(
                         }),
                     ).unwrap();
 
-                    server_sender.send(disconnect).await.unwrap();
+                    if let Err(e) = server_sender.send(disconnect).await {
+                        warn!("failed to send player disconnect to server: {e}");
+                    }
                 },
                 _ = &mut packet_reader_task => {
                     info!("Player disconnected because reader task finished: {player_id:?}");
@@ -171,7 +176,9 @@ pub fn initiate_player_connection(
                             reason: PlayerDisconnectReason::LostConnection,
                         })).unwrap();
 
-                    server_sender.send(disconnect).await.unwrap();
+                    if let Err(e) = server_sender.send(disconnect).await {
+                        warn!("failed to send player disconnect to server: {e}");
+                    }
 
                     let map_ref = player_registry.pin();
                     map_ref.remove(&player_id);

diff --git a/crates/hyperion-proxy/src/server_sender.rs b/crates/hyperion-proxy/src/server_sender.rs
@@ -1,7 +1,7 @@
 use std::io::IoSlice;
 
 use rkyv::util::AlignedVec;
-use tracing::{trace_span, Instrument};
+use tracing::{trace_span, warn, Instrument};
 
 use crate::util::AsyncWriteVectoredExt;
 
@@ -48,7 +48,10 @@ pub fn launch_server_writer(mut write: tokio::net::tcp::OwnedWriteHalf) -> Serve
                         io_slices.push(msg);
                     }
 
-                    write.write_vectored_all(&mut io_slices).await.unwrap();
+                    if let Err(e) = write.write_vectored_all(&mut io_slices).await {
+                        warn!("failed to write to server: {e}");
+                        return;
+                    }
 
                     lengths.clear();
                     messages.clear();