MrSphay/Modrinth-plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* Improve ping impl to bring parity to app lib impl

* Fix issue with new impl

* fix labrinth compile

* wip: why do servers not provide server info..

* Fix ping impl overriding port

* fix theseus_gui

* remove unneeded recursion lmit
This commit is contained in:
aecsocket
2026-03-13 16:21:09 +00:00
committed by GitHub
parent 991b4d8c13
commit d14360aba5
13 changed files with 246 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/labrinth/src/models/exp/minecraft.rs
View File

@@ -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: String,
pub description: Option<serde_json::Value>,
/// Number of players online at the time.
pub players_online: i32,
pub players_online: Option<i32>,
/// Maximum number of players allowed on the server.
pub players_max: i32,
pub players_max: Option<i32>,
}
component::relations! {

70
apps/labrinth/src/queue/server_ping.rs
View File

@@ -6,7 +6,6 @@ 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;
@@ -107,11 +106,16 @@ impl ServerPingQueue {
project_id: project_id.0,
address: ping.address.clone(),
latency_ms: data.map(|d| d.latency.as_millis() as u32),
description: data.map(|d| d.description.clone()),
description: data.and_then(|d| {
d.description.as_ref().map(|d| {
serde_json::to_string(&d)
.expect("serialization should not fail")
})
}),
version_name: data.map(|d| d.version_name.clone()),
version_protocol: data.map(|d| d.version_protocol),
players_online: data.map(|d| d.players_online),
players_max: data.map(|d| d.players_max),
players_online: data.and_then(|d| d.players_online),
players_max: data.and_then(|d| d.players_max),
};
ch.write(&row)
@@ -256,45 +260,27 @@ pub async fn ping_server(
.map(|duration| duration.min(default_duration))
.unwrap_or(default_duration);
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 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")?;
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)
let conn = async_minecraft_ping::ConnectionConfig::build(address)
.with_srv_lookup()
.with_timeout(timeout)
.connect()
.await
.map_err(eyre::Error::new)
.flatten()
.wrap_err("failed to connect to server")?;
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: status.description,
players_online: status.players.online,
players_max: status.players.max,
})
}
#[derive(Debug, Row, Serialize, Clone)]