server name moved to config.toml

Author: Andcool-Systems

README.md

@@ -81,6 +81,8 @@ port = 25565
 timeout = 10
 
 [server.config]
+# Minecraft server name
+server_name = "mc-oauth-rs"
 # Protocol version (`0` for auto)
 protocol = 0
 # Minecraft version string

config.toml

@@ -9,6 +9,7 @@ port = 25566
 timeout = 20
 
 [server.config]
+server_name = "mc-oauth-rs"
 protocol = 0
 version = "1.21"
 auth_url = "https://sessionserver.mojang.com/session/minecraft/hasJoined?username={{NAME}}&serverId={{HASH}}"

src/client_sessions.rs

@@ -2,7 +2,7 @@ use aes::Aes128;
 use cfb8::Encryptor;
 use uuid::Uuid;
 
-use crate::generators::keys::generate_verify_token;
+use crate::{config::get_config, generators::keys::generate_verify_token};
 
 #[derive(Debug)]
 pub enum NextStateEnum {
@@ -24,9 +24,11 @@ pub struct Session {
 }
 
 impl Session {
-    pub fn new() -> Self {
+    pub async fn new() -> Self {
+        let config = get_config().await;
+
         Self {
-            server_id: "mc-oauth-rs".to_string(),
+            server_id: config.server.config.server_name.clone(),
             proto_ver: None,
             next_state: NextStateEnum::Unknown,
             nickname: None,

src/config/server_icon.rs

@@ -3,6 +3,5 @@ use tokio::fs;
 
 pub async fn load(file_path: &str) -> anyhow::Result<String> {
     let file_content = fs::read(file_path).await?;
-    let encoded = base64_encode_bytes(&file_content);
-    Ok(encoded)
+    Ok(base64_encode_bytes(&file_content))
 }

src/config/types.rs

@@ -48,6 +48,9 @@ pub struct Server {
 
 #[derive(Deserialize, Debug)]
 pub struct ServerConfig {
+    /// Minecraft server name
+    pub server_name: String,
+
     /// Protocol version (`0` for auto)
     pub protocol: usize,
 

src/handlers/client_handler.rs

@@ -18,7 +18,7 @@ use crate::{
 
 pub async fn handle(mut stream: TcpStream, keys: Arc<rsa::RsaPrivateKey>) -> Result<()> {
     let mut buffer = BytesMut::new();
-    let session = &mut Session::new(); // Create session for current client
+    let session = &mut Session::new().await; // Create session for current client
     let config = get_config().await;
 
     loop {
@@ -111,13 +111,11 @@ pub async fn handle(mut stream: TcpStream, keys: Arc<rsa::RsaPrivateKey>) -> Res
 }
 
 fn packet_available(buffer: &mut BytesMut) -> bool {
-    if buffer.len() == 0 {
+    if buffer.is_empty() {
         return false;
     }
-
     // Read packet length
-    match read_varint(buffer) {
-        Ok(packet_len) => buffer.len() >= packet_len,
-        Err(_) => false,
-    }
+    read_varint(buffer)
+        .map(|x| buffer.len() >= x)
+        .unwrap_or(false)
 }

src/packets/login_start.rs

@@ -3,7 +3,6 @@ use uuid::Uuid;
 
 use crate::byte_buf_utils::{read_utf8, try_get_uuid};
 
-#[allow(dead_code)]
 pub struct LoginStartPacket {
     pub name: String,
     pub uuid: Option<Uuid>,
@@ -13,7 +12,7 @@ impl LoginStartPacket {
     pub fn parse(buff: &mut BytesMut) -> anyhow::Result<Self> {
         Ok(Self {
             name: read_utf8(buff)?,
-            uuid: try_get_uuid(buff).ok()
+            uuid: try_get_uuid(buff).ok(),
         })
     }
 }