changed status packet building method

Author: Andcool-Systems

config.json

@@ -7,5 +7,5 @@
     "server_ver": "1.21.4",
     "motd": "§6mc-oauth.andcool.ru",
     "code_life_time": 300,
-    "icon": "server_icon.png"
+    "icon_path": "server_icon.png"
 }

src/config/mod.rs

@@ -16,7 +16,7 @@ pub async fn load(path: &str) -> Result<()> {
 
     let mut config: types::Config =
         serde_json::from_str(&file).expect("Couldn't parse config json");
-    match server_icon::load(&config.icon).await {
+    match server_icon::load(&config.icon_path).await {
         Ok(base64) => config.image = Some(format!("data:image/png;base64,{}", base64)),
         Err(e) => warn!("Error loading server icon: {}", e)
     }

src/config/types.rs

@@ -27,7 +27,7 @@ pub struct Config {
     pub code_life_time: u64,
 
     /// Path to the server icon
-    pub icon: String,
+    pub icon_path: String,
 
     #[serde(skip)]
     /// Base 64 encoded server icon

src/packets/status.rs

@@ -1,6 +1,7 @@
 use anyhow::Result;
 use bytes::BytesMut;
-use serde_json::{json, Value};
+use serde::Serialize;
+use serde_json::Value;
 
 use crate::byte_buf_utils::{add_size, write_utf8, write_varint};
 
@@ -11,37 +12,31 @@ impl StatusPacket {
         let mut buffer = BytesMut::new();
 
         write_varint(&mut buffer, 0x00); // Packet id
-        write_utf8(&mut buffer, &data.build().to_string())?;
+        write_utf8(&mut buffer, &serde_json::to_string(&data)?)?;
 
         Ok(add_size(&buffer))
     }
 }
 
+#[derive(Serialize)]
 pub struct StatusData {
-    pub version_name: String,
-    pub version_protocol: usize,
-    pub players_max: usize,
-    pub players_online: usize,
+    pub version: Version,
+    pub players: Players,
     pub description: Value,
-    pub favicon: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub favicon: Option<String>,
     pub enforces_secure_chat: bool,
 }
 
-impl StatusData {
-    pub fn build(&self) -> Value {
-        json!({
-            "version": {
-                "name": self.version_name,
-                "protocol": self.version_protocol
-            },
-            "players": {
-                "max": self.players_max,
-                "online": self.players_online,
-                "sample": []
-            },
-            "description": self.description,
-            "favicon": self.favicon,
-            "enforcesSecureChat": self.enforces_secure_chat
-        })
-    }
+#[derive(Serialize)]
+pub struct Players {
+    pub max: usize,
+    pub online: usize,
+    pub sample: Vec<Value>,
+}
+
+#[derive(Serialize)]
+pub struct Version {
+    pub name: String,
+    pub protocol: usize,
 }

src/responses/status.rs

@@ -3,11 +3,7 @@ use anyhow::Result;
 use serde_json::json;
 use tokio::{io::AsyncWriteExt, net::TcpStream};
 
-use crate::{
-    client_sessions::Session,
-    config::get_config,
-    packets::status::{StatusData, StatusPacket},
-};
+use crate::{client_sessions::Session, config::get_config, packets::status};
 
 pub async fn send(stream: &mut TcpStream, session: &mut Session) -> Result<()> {
     let config = get_config().await;
@@ -17,21 +13,23 @@ pub async fn send(stream: &mut TcpStream, session: &mut Session) -> Result<()> {
         config.proto_ver
     };
 
-    let icon = match &config.image {
-        Some(img) => img,
-        None => &"".to_string()
-    };
-
-    let data = StatusData {
-        version_name: config.server_ver.clone(),
-        version_protocol: proto_ver,
-        players_max: config.players_max,
-        players_online: config.players_online,
+    let data = status::StatusData {
+        version: status::Version {
+            name: config.server_ver.clone(),
+            protocol: proto_ver,
+        },
+        players: status::Players {
+            max: config.players_max,
+            online: config.players_online,
+            sample: vec![],
+        },
         description: json!({"text": config.motd.clone()}),
-        favicon: icon.to_string(),
+        favicon: config.image.clone(),
         enforces_secure_chat: false,
     };
 
-    stream.write_all(&StatusPacket::build(data)?).await?;
+    stream
+        .write_all(&status::StatusPacket::build(data)?)
+        .await?;
     Ok(())
 }