Revert "Unify server pinging implementations between app and backend (#5510)" (#5558)

apps/labrinth/src/models/exp/minecraft.rs

@@ -423,11 +423,11 @@ pub struct JavaServerPingData {
     /// Reported version protocol number of the server.
     pub version_protocol: i32,
     /// Description/MOTD of the server as shown in the server list.
-    pub description: Option<serde_json::Value>,
+    pub description: String,
     /// Number of players online at the time.
-    pub players_online: Option<i32>,
+    pub players_online: i32,
     /// Maximum number of players allowed on the server.
-    pub players_max: Option<i32>,
+    pub players_max: i32,
 }
 
 component::relations! {

apps/labrinth/src/queue/server_ping.rs

@@ -6,6 +6,7 @@ use crate::models::exp;
 use crate::models::ids::ProjectId;
 use crate::models::projects::ProjectStatus;
 use crate::{database::PgPool, util::error::Context};
+use async_minecraft_ping::ServerDescription;
 use chrono::{TimeDelta, Utc};
 use clickhouse::{Client, Row};
 use serde::Serialize;
@@ -106,16 +107,11 @@ impl ServerPingQueue {
                     project_id: project_id.0,
                     address: ping.address.clone(),
                     latency_ms: data.map(|d| d.latency.as_millis() as u32),
-                    description: data.and_then(|d| {
-                        d.description.as_ref().map(|d| {
-                            serde_json::to_string(&d)
-                                .expect("serialization should not fail")
-                        })
-                    }),
+                    description: data.map(|d| d.description.clone()),
                     version_name: data.map(|d| d.version_name.clone()),
                     version_protocol: data.map(|d| d.version_protocol),
-                    players_online: data.and_then(|d| d.players_online),
-                    players_max: data.and_then(|d| d.players_max),
+                    players_online: data.map(|d| d.players_online),
+                    players_max: data.map(|d| d.players_max),
                 };
 
                 ch.write(&row)
@@ -260,27 +256,45 @@ pub async fn ping_server(
         .map(|duration| duration.min(default_duration))
         .unwrap_or(default_duration);
 
-    let conn = async_minecraft_ping::ConnectionConfig::build(address)
-        .with_srv_lookup()
-        .with_timeout(timeout)
-        .connect()
-        .await
-        .wrap_err("failed to connect to server")?;
+    let (address, port) = match address.rsplit_once(':') {
+        Some((addr, port)) => {
+            let port = port.parse::<u16>().wrap_err("invalid port number")?;
+            (addr, port)
+        }
+        None => (address, 25565),
+    };
 
-    let status = conn
-        .status()
-        .await
-        .wrap_err("failed to get server status")?
-        .status;
+    let task = async move {
+        let conn = async_minecraft_ping::ConnectionConfig::build(address)
+            .with_port(port)
+            .with_srv_lookup()
+            .connect()
+            .await
+            .wrap_err("failed to connect to server")?;
 
-    eyre::Ok(exp::minecraft::JavaServerPingData {
-        latency: start.elapsed(),
-        version_name: status.version.name,
-        version_protocol: status.version.protocol,
-        description: status.description,
-        players_online: status.players.online,
-        players_max: status.players.max,
-    })
+        let status = conn
+            .status()
+            .await
+            .wrap_err("failed to get server status")?
+            .status;
+
+        eyre::Ok(exp::minecraft::JavaServerPingData {
+            latency: start.elapsed(),
+            version_name: status.version.name,
+            version_protocol: status.version.protocol,
+            description: match status.description {
+                ServerDescription::Plain(text)
+                | ServerDescription::Object { text } => text,
+            },
+            players_online: status.players.online,
+            players_max: status.players.max,
+        })
+    };
+
+    tokio::time::timeout(timeout, task)
+        .await
+        .map_err(eyre::Error::new)
+        .flatten()
 }
 
 #[derive(Debug, Row, Serialize, Clone)]