Initial metrics support

Author: TymanWasTaken

Cargo.lock

@@ -10,9 +10,10 @@ actix-web = { version = "4.11.0", features = ["http2"] }
 anyhow = "1.0.98"
 base16ct = { version = "0.2.0", features = ["std"] }
 clap = { version = "4.5.41", features = ["derive", "env"] }
+documented = "0.9.2"
 env_logger = "0.11.8"
 moka = { version = "0.12.10", features = ["future"] }
-# prometheus-client = "0.23.1"
+prometheus-client = "0.23.1"
 quick-xml = { version = "0.38.0", features = ["serde", "serialize"] }
 reqwest = { version = "0.12.22", default-features = false, features = ["charset", "http2", "system-proxy", "json", "rustls-tls"] }
 semver = "1.0.26"

Cargo.toml

@@ -10,7 +10,7 @@ use sha2::{Digest as _, Sha256};
 
 use super::{ApiData, CacheKey, CacheValue};
 
-pub async fn etag_middleware(
+pub async fn middleware(
 	service_request: ServiceRequest,
 	next: Next<impl MessageBody>
 ) -> Result<ServiceResponse<EitherBody<impl MessageBody>>, actix_web::Error> {

src/api/v1/middleware.rs src/api/v1/caching.rssrc/api/v1/middleware.rs renamed to src/api/v1/caching.rs

@@ -1,11 +1,12 @@
-use std::fmt::Display;
+use std::fmt::{Display, Write};
 
 use actix_web::{
 	HttpResponse,
 	Responder,
 	get,
 	web::{self, ServiceConfig}
 };
+use prometheus_client::encoding::{EncodeLabelSet, EncodeLabelValue};
 use serde::{Deserialize, Serialize};
 use tokio::task::JoinSet;
 
@@ -43,6 +44,15 @@ pub enum ModLoader {
 	Fabric
 }
 
+impl EncodeLabelValue for ModLoader {
+	fn encode(
+		&self,
+		encoder: &mut prometheus_client::encoding::LabelValueEncoder
+	) -> Result<(), std::fmt::Error> {
+		encoder.write_str(&self.to_string())
+	}
+}
+
 impl Display for ModLoader {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		f.write_str(match self {
@@ -52,22 +62,22 @@ impl Display for ModLoader {
 	}
 }
 
-#[derive(Serialize, Deserialize, Debug, Hash, PartialEq, Eq, Clone)]
+#[derive(Serialize, Deserialize, Debug, Hash, PartialEq, Eq, Clone, EncodeLabelSet)]
 pub struct OneConfigVersionInfo {
 	/// The minecraft version to fetch artifacts for
-	version: String,
+	pub version: String,
 	/// The mod loader to fetch artifacts for
-	loader: ModLoader
+	pub loader: ModLoader
 }
 
 #[derive(Serialize, Deserialize, Debug, Hash, PartialEq, Eq, Clone)]
 pub struct ArtifactQuery<V = ()> {
 	/// Whether or not to use snapshots instead of official releases
 	#[serde(default)]
-	snapshots: bool,
+	pub snapshots: bool,
 	/// Extra version information
 	#[serde(flatten)]
-	version_info: V
+	pub version_info: V
 }
 
 #[get("/oneconfig")]

src/api/v1/artifacts.rs src/api/v1/endpoints/artifacts.rssrc/api/v1/artifacts.rs renamed to src/api/v1/endpoints/artifacts.rs

@@ -0,0 +1 @@
+pub mod artifacts;