@@ -81,7 +74,6 @@ fn Navbar() -> impl IntoView {
}
}
-
#[component]
fn Idk() -> impl IntoView {
view! {
"Idk"
}
@@ -94,5 +86,3 @@ fn Status() -> impl IntoView {
}
}
-
-
diff --git a/atb-web/src/components/mod.rs b/atb-web/src/components/mod.rs
index b6cc1f6..822c729 100644
--- a/atb-web/src/components/mod.rs
+++ b/atb-web/src/components/mod.rs
@@ -1,2 +1 @@
pub mod status;
-
diff --git a/atb-web/src/components/status.rs b/atb-web/src/components/status.rs
index cb11c3e..6f2d637 100644
--- a/atb-web/src/components/status.rs
+++ b/atb-web/src/components/status.rs
@@ -1,50 +1,10 @@
+use crate::serverfns::server_status::ping_minecraft_server;
+use atb_types::McServerStatus;
use leptos::*;
-use serde_json::Value;
-
-#[cfg(feature="ssr")]
-use tokio::net::TcpStream;
-#[cfg(feature="ssr")]
-use craftping::tokio::ping;
-use serde::{Serialize, Deserialize};
-
-#[derive(Default, Debug, Serialize, Deserialize, Clone)]
-pub struct McStatus {
- pub version: String,
- pub max_players: usize,
- pub online_players: usize,
- pub sample: Vec<(String, String)>,
- pub favicon: Vec
,
-}
-
-#[server(McPing, "/api")]
-pub async fn ping_minecraft_server() -> Result {
- // todo : extract out to a variable for configurability
- let hostname = "mc.arun.gg";
- let port = 25565;
- let mut stream = TcpStream::connect((hostname, port)).await?;
-
- let pong: craftping::Response = ping(&mut stream, hostname, port).await?;
-
- let sample = match pong.sample {
- None => vec![],
- Some(s) => s.into_iter().map(|craftping::Player { name, id }| (name, id)).collect::>()
- };
-
- let favicon = pong.favicon.unwrap_or(vec![]);
-
- let res = McStatus {
- version: pong.version,
- max_players: pong.max_players,
- online_players: pong.online_players,
- sample,
- favicon,
- };
-
- Ok(res)
-}
#[component]
-fn Status(status: McStatus) -> impl IntoView {
+fn Status(status: Result) -> impl IntoView {
+ let status = status.unwrap();
let version = format!("Version: {}", status.version);
let players = move || status.sample.clone();
@@ -54,43 +14,43 @@ fn Status(status: McStatus) -> impl IntoView {
use gloo::file::{Blob, ObjectUrl};
if let Some(img) = imgref.get() {
-
let favicon = status.favicon.as_slice();
let blob = Blob::new_with_options(favicon, Some("image/png"));
let url = ObjectUrl::from(blob);
img.set_src(&url);
-
}
-
});
+ // todo: use Error Boundary to handle error
+ // https://leptos-rs.github.io/leptos/view/07_errors.html?highlight=error#error-handling
view! {
- {version}
- // 
- ![]()
- {format!("Players: {}/{}", status.online_players, status.max_players)}
- {name} }
- }
- />
+ <>
+ {version}
+ ![]()
+ {format!("Players: {}/{}", status.online_players, status.max_players)}
+ {name} }
+ }
+ />
+
}
}
#[component]
pub fn McStatusComponent() -> impl IntoView {
+ let once = create_resource(
+ // todo: add refresh button
+ move || (),
+ move |_| async move {
+ let r = ping_minecraft_server().await;
+ r
+ },
+ );
-
- let once = create_resource(move || () , move |_| async move {
- let r = ping_minecraft_server().await;
- let r = r.unwrap_or(McStatus::default());
- r
- });
-
-
- let x = move || { once.read().map(|v| view! { }) };
+ let x = move || once.read().map(|v| view! { });
view! {
"Server Status"
@@ -102,6 +62,4 @@ pub fn McStatusComponent() -> impl IntoView {