From ab954a0b463f2d3d4e474811350c2f6e39d09b84 Mon Sep 17 00:00:00 2001
From: Tipragot <contact@tipragot.fr>
Date: Sun, 11 Feb 2024 12:24:29 +0100
Subject: [PATCH 1/2] Simplify the relay server code

---
 crates/bevnet-relay/Cargo.toml                | 30 ++++---------------
 .../src/{bin/server.rs => main.rs}            |  3 +-
 2 files changed, 7 insertions(+), 26 deletions(-)
 rename crates/bevnet-relay/src/{bin/server.rs => main.rs} (98%)

diff --git a/crates/bevnet-relay/Cargo.toml b/crates/bevnet-relay/Cargo.toml
index da48be0..b46ea69 100644
--- a/crates/bevnet-relay/Cargo.toml
+++ b/crates/bevnet-relay/Cargo.toml
@@ -12,27 +12,9 @@ categories = ["network-programming", "game-development"]
 workspace = true
 
 [dependencies]
-tokio = { version = "1.36.0", features = [
-    "macros",
-    "rt-multi-thread",
-], optional = true }
-axum = { version = "0.7.4", features = ["ws"], optional = true }
-lazy_static = { version = "1.4.0", optional = true }
-futures = { version = "0.3.30", optional = true }
-dashmap = { version = "5.5.3", optional = true }
-rand = { version = "0.8.5", optional = true }
-
-[features]
-default = []
-server = [
-    "dep:tokio",
-    "dep:axum",
-    "dep:lazy_static",
-    "dep:futures",
-    "dep:dashmap",
-    "dep:rand",
-]
-
-[[bin]]
-name = "server"
-required-features = ["server"]
+tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread"] }
+axum = { version = "0.7.4", features = ["ws"] }
+lazy_static = "1.4.0"
+futures = "0.3.30"
+dashmap = "5.5.3"
+rand = "0.8.5"
diff --git a/crates/bevnet-relay/src/bin/server.rs b/crates/bevnet-relay/src/main.rs
similarity index 98%
rename from crates/bevnet-relay/src/bin/server.rs
rename to crates/bevnet-relay/src/main.rs
index 6bddbd1..0c51c83 100644
--- a/crates/bevnet-relay/src/bin/server.rs
+++ b/crates/bevnet-relay/src/main.rs
@@ -10,7 +10,6 @@ use lazy_static::lazy_static;
 use rand::Rng;
 use tokio::sync::mpsc::{channel, Receiver, Sender};
 use tokio::task::JoinHandle;
-use uuid::Uuid;
 
 lazy_static! {
     static ref CLIENTS: DashMap<u32, Sender<Vec<u8>>> = DashMap::new();
@@ -19,7 +18,7 @@ lazy_static! {
 #[tokio::main]
 async fn main() {
     let app = Router::new().route(
-        "/relay",
+        "/",
         get(|ws: WebSocketUpgrade| async { ws.on_upgrade(handle) }),
     );
     let listener = tokio::net::TcpListener::bind("0.0.0.0:80")
-- 
2.43.4


From 6fed0db9c8888b2b257d823e049fc38ea3c97926 Mon Sep 17 00:00:00 2001
From: Tipragot <contact@tipragot.fr>
Date: Sun, 11 Feb 2024 12:30:13 +0100
Subject: [PATCH 2/2] Rename the crate

---
 Cargo.lock                                    | 24 +++++++++----------
 .../{bevnet-relay => relay-server}/Cargo.toml |  2 +-
 .../src/main.rs                               |  0
 3 files changed, 13 insertions(+), 13 deletions(-)
 rename crates/{bevnet-relay => relay-server}/Cargo.toml (95%)
 rename crates/{bevnet-relay => relay-server}/src/main.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 27cbc39..9e70aac 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -475,18 +475,6 @@ dependencies = [
  "local-ip-address",
 ]
 
-[[package]]
-name = "bevnet-relay"
-version = "0.2.0"
-dependencies = [
- "axum",
- "dashmap",
- "futures",
- "lazy_static",
- "rand",
- "tokio",
-]
-
 [[package]]
 name = "bevy"
 version = "0.12.1"
@@ -3617,6 +3605,18 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
+[[package]]
+name = "relay-server"
+version = "0.2.0"
+dependencies = [
+ "axum",
+ "dashmap",
+ "futures",
+ "lazy_static",
+ "rand",
+ "tokio",
+]
+
 [[package]]
 name = "renderdoc-sys"
 version = "1.0.0"
diff --git a/crates/bevnet-relay/Cargo.toml b/crates/relay-server/Cargo.toml
similarity index 95%
rename from crates/bevnet-relay/Cargo.toml
rename to crates/relay-server/Cargo.toml
index b46ea69..23c0189 100644
--- a/crates/bevnet-relay/Cargo.toml
+++ b/crates/relay-server/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bevnet-relay"
+name = "relay-server"
 version = "0.2.0"
 edition = "2021"
 license = "GPL-3.0-or-later"
diff --git a/crates/bevnet-relay/src/main.rs b/crates/relay-server/src/main.rs
similarity index 100%
rename from crates/bevnet-relay/src/main.rs
rename to crates/relay-server/src/main.rs
-- 
2.43.4