aboutsummaryrefslogtreecommitdiff
path: root/server/src/main.rs
diff options
context:
space:
mode:
Diffstat (limited to 'server/src/main.rs')
-rw-r--r--server/src/main.rs53
1 files changed, 23 insertions, 30 deletions
diff --git a/server/src/main.rs b/server/src/main.rs
index ef397c7d..c6b0d59f 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -18,7 +18,7 @@
use anyhow::{bail, Result};
use clap::Parser;
use futures_util::{SinkExt, StreamExt};
-use hurrycurry_protocol::{PacketC, PacketS, BINCODE_CONFIG, VERSION};
+use hurrycurry_protocol::{PacketC, PacketS, VERSION};
use hurrycurry_server::{
data::DATA_DIR,
server::{GameServerExt, Server},
@@ -26,15 +26,7 @@ use hurrycurry_server::{
};
use log::{debug, info, trace, warn, LevelFilter};
use std::{
- env::var,
- net::SocketAddr,
- path::PathBuf,
- process::exit,
- str::FromStr,
- sync::{
- atomic::{AtomicBool, Ordering},
- Arc,
- },
+ env::var, net::SocketAddr, path::PathBuf, process::exit, str::FromStr, sync::Arc,
time::Duration,
};
use tokio::{
@@ -227,8 +219,8 @@ async fn run(args: Args) -> anyhow::Result<()> {
},
);
- let supports_binary = Arc::new(AtomicBool::new(false));
- let supports_binary2 = supports_binary.clone();
+ // let supports_binary = Arc::new(AtomicBool::new(false));
+ // let supports_binary2 = supports_binary.clone();
spawn(async move {
for p in init {
@@ -260,15 +252,15 @@ async fn run(args: Args) -> anyhow::Result<()> {
info!("Client outbound sender dropped. closing connection");
break;
};
- let message = if supports_binary.load(Ordering::Relaxed) {
- Message::Binary(
- bincode::encode_to_vec(&packet, BINCODE_CONFIG)
- .unwrap()
- .into(),
- )
- } else {
- Message::Text(serde_json::to_string(&packet).unwrap().into())
- };
+ // let message = if supports_binary.load(Ordering::Relaxed) {
+ // Message::Binary(
+ // bincode::encode_to_vec(&packet, BINCODE_CONFIG)
+ // .unwrap()
+ // .into(),
+ // )
+ // } else {
+ let message = Message::Text(serde_json::to_string(&packet).unwrap().into());
+ // };
if let Err(e) = write.send(message).await {
warn!("WebSocket error: {e}");
break;
@@ -287,15 +279,16 @@ async fn run(args: Args) -> anyhow::Result<()> {
break;
}
},
- Message::Binary(packet) => {
- supports_binary2.store(true, Ordering::Relaxed);
- match bincode::decode_from_slice::<PacketS, _>(&packet, BINCODE_CONFIG) {
- Ok((p, _size)) => p,
- Err(e) => {
- warn!("Invalid binary packet: {e}");
- break;
- }
- }
+ Message::Binary(_packet) => {
+ // supports_binary2.store(true, Ordering::Relaxed);
+ // match bincode::decode_from_slice::<PacketS, _>(&packet, BINCODE_CONFIG) {
+ // Ok((p, _size)) => p,
+ // Err(e) => {
+ // warn!("Invalid binary packet: {e}");
+ // break;
+ // }
+ // }
+ continue;
}
Message::Close(_) => break,
_ => continue,