add "index"

Author: 0x7d8

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "api"
-version = "3.2.4"
+version = "3.3.0"
 edition = "2024"
 
 [dependencies]
@@ -16,7 +16,7 @@ utoipa = { version = "5.3.1", features = ["axum_extras", "preserve_order", "chro
 utoipa-axum = "0.2.0"
 chrono = { version = "0.4.40", features = ["serde"] }
 indexmap = { version = "2.7.1", features = ["serde"] }
-tower-http = { version = "0.6.2", features = ["catch-panic", "trace", "cors"] }
+tower-http = { version = "0.6.2", features = ["catch-panic", "trace", "cors", "normalize-path"] }
 sentry = { version = "0.36.0", default-features = false, features = ["rustls", "reqwest", "backtrace", "contexts", "debug-images", "panic"] }
 tracing = "0.1.41"
 reqwest = { version = "0.12.12", default-features = false, features = ["json", "rustls-tls"] }
@@ -30,3 +30,4 @@ image = "0.25.5"
 tower-cookies = "0.11.0"
 rust-s3 = { version = "0.35.1", default-features = false, features = ["tokio-rustls-tls"] }
 futures-util = "0.3.31"
+tower = "0.5.2"

Cargo.toml

@@ -8,6 +8,7 @@ mod routes;
 mod s3;
 
 use axum::{
+    ServiceExt,
     body::Body,
     extract::{Path, Request},
     http::{HeaderMap, StatusCode},
@@ -21,8 +22,12 @@ use routes::{ApiError, GetState};
 use sentry_tower::SentryHttpLayer;
 use sha1::Digest;
 use std::{net::IpAddr, sync::Arc, time::Instant};
+use tower::Layer;
 use tower_cookies::CookieManagerLayer;
-use tower_http::{catch_panic::CatchPanicLayer, cors::CorsLayer, trace::TraceLayer};
+use tower_http::{
+    catch_panic::CatchPanicLayer, cors::CorsLayer, normalize_path::NormalizePathLayer,
+    trace::TraceLayer,
+};
 use utoipa::openapi::security::{ApiKey, ApiKeyValue, SecurityScheme};
 use utoipa_axum::router::OpenApiRouter;
 
@@ -192,7 +197,7 @@ async fn main() {
 
     let app =
         OpenApiRouter::new()
-            .nest("/api", routes::router(&state))
+            .merge(routes::router(&state))
             .route(
                 "/",
                 get(|| async move {
@@ -203,7 +208,7 @@ async fn main() {
                     (
                         StatusCode::OK,
                         headers,
-                        include_str!("../static/index.html"),
+                        include_str!("../static/api.html"),
                     )
                 }),
             )
@@ -347,7 +352,12 @@ async fn main() {
 
     let router = router.route("/openapi.json", get(|| async move { axum::Json(openapi) }));
 
-    axum::serve(listener, router.into_make_service())
-        .await
-        .unwrap();
+    axum::serve(
+        listener,
+        ServiceExt::<Request>::into_make_service(
+            NormalizePathLayer::trim_trailing_slash().layer(router),
+        ),
+    )
+    .await
+    .unwrap();
 }

src/main.rs

@@ -172,6 +172,17 @@ impl BaseModel for Build {
 }
 
 impl Build {
+    pub fn installation_size(&self) -> u64 {
+        self.installation
+            .iter()
+            .flat_map(|step| step.iter())
+            .filter_map(|step| match step {
+                InstallationStep::Download(step) => Some(step.size),
+                _ => None,
+            })
+            .sum()
+    }
+
     pub async fn by_v1_identifier(
         database: &crate::database::Database,
         cache: &crate::cache::Cache,

src/models/build.rs

@@ -201,6 +201,10 @@ impl ServerType {
 
         result
     }
+
+    pub fn infos(&self) -> &ServerTypeInfo {
+        TYPE_INFOS.get(self).unwrap()
+    }
 }
 
 static TYPE_INFOS: LazyLock<IndexMap<ServerType, ServerTypeInfo>> = LazyLock::new(|| {

src/models/type.rs

@@ -74,7 +74,6 @@ impl RequestLogger {
         };
 
         let mut ratelimit: Option<RateLimitData> = None;
-
         if organization.is_none() || !organization.as_ref().unwrap().verified {
             let ratelimit_key = format!("mcjars_api::ratelimit::{}", ip);
 
@@ -103,6 +102,7 @@ impl RequestLogger {
             .map(|q| q.contains("tracking=none"))
             .unwrap_or(false)
             || ACCEPTED_METHODS.iter().all(|m| *m != request.method)
+            || !request.uri.path().starts_with("/api")
             || request.uri.path().starts_with("/api/github")
         {
             return Ok((None, ratelimit));

src/requests.rs

@@ -0,0 +1,18 @@
+use super::{ApiError, GetState, State};
+use utoipa_axum::router::OpenApiRouter;
+
+mod github;
+mod organization;
+mod user;
+mod v1;
+mod v2;
+
+pub fn router(state: &State) -> OpenApiRouter<State> {
+    OpenApiRouter::new()
+        .nest("/v1", v1::router(state))
+        .nest("/v2", v2::router(state))
+        .nest("/organization", organization::router(state))
+        .nest("/github", github::router(state))
+        .nest("/user", user::router(state))
+        .with_state(state.clone())
+}

src/routes/github.rs src/routes/api/github.rssrc/routes/github.rs renamed to src/routes/api/github.rs

@@ -6,7 +6,7 @@ mod types;
 mod get {
     use crate::{
         models::r#type::ServerType,
-        routes::{GetState, organization::GetOrganization},
+        routes::{GetState, api::organization::GetOrganization},
     };
     use serde::{Deserialize, Serialize};
     use sqlx::Row;