diff --git a/src/api/figura/websocket/handler.rs b/src/api/figura/websocket/handler.rs index 80424aa..d7c5a4e 100644 --- a/src/api/figura/websocket/handler.rs +++ b/src/api/figura/websocket/handler.rs @@ -15,6 +15,7 @@ pub async fn initial( ws.on_upgrade(|socket| handle_socket(socket, state)) } +#[instrument(skip_all)] async fn handle_socket(mut ws: WebSocket, state: AppState) { // Trying authenticate & get user data or dropping connection match authenticate(&mut ws, &state).await { @@ -64,7 +65,7 @@ async fn handle_socket(mut ws: WebSocket, state: AppState) { if let Err(kind) = ws.send(Message::Close(None)).await { tracing::trace!("[WebSocket] Closing fault: {}", kind) } } -#[instrument(skip_all, fields(nickname = %session.user.nickname))] +#[instrument(skip_all, parent = None, fields(nickname = %session.user.nickname))] async fn main_worker(session: &mut WSSession, ws: &mut WebSocket, state: &AppState) -> anyhow::Result<()> { tracing::debug!("WebSocket control for {} is transferred to the main worker", session.user.nickname); loop { diff --git a/src/api/figura/websocket/types/c2s.rs b/src/api/figura/websocket/types/c2s.rs index 00276d3..bc30eb1 100644 --- a/src/api/figura/websocket/types/c2s.rs +++ b/src/api/figura/websocket/types/c2s.rs @@ -92,10 +92,10 @@ impl From for Vec { impl C2SMessage { pub fn name(&self) -> &'static str { match self { - C2SMessage::Token(_) => "C2S;TOKEN", - C2SMessage::Ping(_, _, _) => "C2S;PING", - C2SMessage::Sub(_) => "C2S;SUB", - C2SMessage::Unsub(_) => "C2S;UNSUB", + C2SMessage::Token(_) => "c2s>token", + C2SMessage::Ping(_, _, _) => "c2s>ping", + C2SMessage::Sub(_) => "c2s>sub", + C2SMessage::Unsub(_) => "c2s>unsub", } } } diff --git a/src/api/figura/websocket/types/s2c.rs b/src/api/figura/websocket/types/s2c.rs index 9896a00..d8d0129 100644 --- a/src/api/figura/websocket/types/s2c.rs +++ b/src/api/figura/websocket/types/s2c.rs @@ -88,12 +88,12 @@ impl From for Vec { impl S2CMessage { pub fn name(&self) -> &'static str { match self { - S2CMessage::Auth => "S2C;AUTH", - S2CMessage::Ping(_, _, _, _) => "S2C;PING", - S2CMessage::Event(_) => "S2C;EVENT", - S2CMessage::Toast(_, _, _) => "S2C;TOAST", - S2CMessage::Chat(_) => "S2C;CHAT", - S2CMessage::Notice(_) => "S2C;NOTICE", + S2CMessage::Auth => "s2c>auth", + S2CMessage::Ping(_, _, _, _) => "s2c>ping", + S2CMessage::Event(_) => "s2c>event", + S2CMessage::Toast(_, _, _) => "s2c>toast", + S2CMessage::Chat(_) => "s2c>chat", + S2CMessage::Notice(_) => "s2c>notice", } } } diff --git a/src/consts.rs b/src/consts.rs index 04ec1a1..01d5481 100644 --- a/src/consts.rs +++ b/src/consts.rs @@ -15,7 +15,7 @@ pub const TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10); // Figura update checker pub const FIGURA_RELEASES_URL: &str = "https://api.github.com/repos/figuramc/figura/releases"; -pub const FIGURA_DEFAULT_VERSION: &str = "0.1.5"; +pub const FIGURA_DEFAULT_VERSION: &str = "0.1.4"; // Figura Assets pub const FIGURA_ASSETS_ZIP_URL: &str = "https://github.com/FiguraMC/Assets/archive/refs/heads/main.zip"; diff --git a/src/main.rs b/src/main.rs index e254790..e120835 100644 --- a/src/main.rs +++ b/src/main.rs @@ -105,13 +105,6 @@ async fn main() -> Result<()> { }, } - // Creating avatars folder - let path = PathBuf::from(&*AVATARS_VAR); - if !path.exists() { - fs::create_dir_all(path).await.expect("Can't create avatars folder!"); - tracing::info!("Created avatars directory"); - } - // 4. Starting an app() that starts to serve. If app() returns true, the sculptor will be restarted. TODO: for future loop { if !app().await? { @@ -123,6 +116,15 @@ async fn main() -> Result<()> { } async fn app() -> Result { + // Preparing for launch + { + let path = PathBuf::from(&*AVATARS_VAR); + if !path.exists() { + fs::create_dir_all(path).await.expect("Can't create avatars folder!"); + tracing::info!("Created avatars directory"); + } + } + // Config let config = Config::parse(CONFIG_VAR.clone().into()); let listen = config.listen.clone(); @@ -196,8 +198,6 @@ async fn app() -> Result { .nest("/api", api) .route("/api/", get(check_auth)) .route("/ws", get(ws)) - .merge(metrics::metrics_router(config.metrics_enabled)) - .with_state(state) .layer(TraceLayer::new_for_http() // .on_request(|request: &axum::http::Request<_>, _span: &tracing::Span| { // // only for developing purposes @@ -209,6 +209,8 @@ async fn app() -> Result { .on_request(()) ) .layer(axum::middleware::from_fn(track_metrics)) + .merge(metrics::metrics_router(config.metrics_enabled)) + .with_state(state) .route("/health", get(|| async { "ok" })); let listener = tokio::net::TcpListener::bind(listen).await?; diff --git a/src/metrics.rs b/src/metrics.rs index 9ab0eaa..5e8f493 100644 --- a/src/metrics.rs +++ b/src/metrics.rs @@ -22,7 +22,7 @@ async fn metrics(State(state): State) -> String { let mut metric = prometheus::proto::Metric::default(); metric.set_gauge(prometheus::proto::Gauge::default()); metric.mut_gauge().set_value(state.session.len() as f64); - create_mf("sculptor_players_count".to_string(), "Number of players".to_string(), MetricType::GAUGE, metric) + create_mf("players_count".to_string(), "Number of players".to_string(), MetricType::GAUGE, metric) }; metric_families.push(players); @@ -43,10 +43,8 @@ fn create_mf(name: String, help: String, field_type: MetricType, metric: Metric) } pub async fn track_metrics(req: Request, next: Next) -> Result, StatusCode> { - let method = req.method().to_string(); - let route = http_route(&req).to_string(); - let start = Instant::now(); + let uri = req.uri().path().to_string(); // Call the next middleware or handler let response = next.run(req).await; @@ -54,28 +52,20 @@ pub async fn track_metrics(req: Request, next: Next) -> Result(req: &Request) -> &str { - req.extensions() - .get::() - .map_or_else(|| "", |mp| mp.as_str()) -} +pub static PINGS_ERROR: LazyLock = LazyLock::new(|| { + register_int_counter!("pings_error", "Number of ping decoding errors").unwrap() +}); pub static REQUESTS: LazyLock = LazyLock::new(|| { - register_histogram_vec!("sculptor_requests_count", "Number of requests", &["method", "uri", "code"], vec![0.025, 0.250, 0.500]).unwrap() + register_histogram_vec!("requests_count", "Number of requests", &["uri", "code"], vec![0.025, 0.250, 0.500]).unwrap() }); pub static PINGS: LazyLock = LazyLock::new(|| { - register_histogram_vec!("sculptor_pings_count", "Number of pings", &["type"], vec![0.000001, 0.00001, 0.0001]).unwrap() -}); - -pub static PINGS_ERROR: LazyLock = LazyLock::new(|| { - register_int_counter!("sculptor_pings_error", "Number of ping decoding errors").unwrap() + register_histogram_vec!("pings_count", "Number of pings", &["type"], vec![0.000003, 0.00002, 0.0002]).unwrap() }); \ No newline at end of file