LordMZTE/mcstat
1
0
Fork 0
mirror of https://github.com/LordMZTE/mcstat.git synced 2024-04-25 10:15:31 +02:00
Code Issues Projects Releases Wiki Activity

implement proper ping

Browse source
This commit is contained in:
LordMZTE 2022-08-15 23:17:44 +02:00
parent 5700899216
commit 9968bb0068
Signed by: LordMZTE
GPG key ID: B64802DC33A64FF6
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -25,7 +25,7 @@ clap = { version = "3.2.17", features = ["derive"] }
[dependencies.async-minecraft-ping]
git = "https://github.com/LordMZTE/async-minecraft-ping.git"
tag = "v0.3.0"
tag = "v0.4.0"
[dependencies.tokio]
version = "1.20.1"

13
src/main.rs
View file

@ -3,7 +3,7 @@ use async_minecraft_ping::{ConnectionConfig, ServerDescription, StatusResponse};
use clap::Parser;
use itertools::Itertools;
use miette::{IntoDiagnostic, WrapErr};
use time::{Duration, Instant};
use time::Duration;
use tokio::time;
use mcstat::{
@ -103,18 +103,13 @@ async fn main() -> miette::Result<()> {
// create timeout for server connection
let (raw_response, ping) = time::timeout(Duration::from_millis(opt.timeout), async {
info!("Connecting to server");
let start_time = Instant::now();
let mut con = config.connect().await.into_diagnostic()?;
// we end the timer here, because at this point, we've sent ONE request to the
// server, and we don't want to send 2, since then we get double the
// ping. the connect function may have some processing which may take
// some time, but it shouldn't make an impact since this code runs at rust
// speed.
let end_time = Instant::now();
info!("Requesting status");
let status = con.status_raw().await.into_diagnostic()?;
Result::<_, miette::Error>::Ok((status, end_time - start_time))
let ping = con.ping().await.into_diagnostic()?;
Result::<_, miette::Error>::Ok((status, ping))
})
.await
.into_diagnostic()