Template 404 page to account for public_address

If the service is not hosted at the root of a domain, the links to the
graphql and graphiql endpoints cannot be absolute.

Author: tpoliaw

Cargo.lock

@@ -19,6 +19,7 @@ clap = { version = "4.5.48", features = ["derive"] }
 uuid = { version = "1.18.1", features = ["serde"] }
 tracing = "0.1.41"
 tracing-subscriber = "0.3.20"
+askama = "0.14.0"
 
 [dev-dependencies]
 http-body-util = "0.1.3"

Cargo.toml

@@ -17,6 +17,7 @@ COPY ./Cargo.lock ./Cargo.lock
 RUN cargo build --release --target x86_64-unknown-linux-musl
 
 COPY ./static ./static
+COPY ./templates ./templates
 COPY ./src ./src
 
 RUN touch src/main.rs && cargo build --release --target x86_64-unknown-linux-musl

Dockerfile

@@ -1,3 +1,4 @@
+use askama::Template;
 use async_graphql::{EmptyMutation, EmptySubscription, Schema};
 use axum::http::StatusCode;
 use axum::response::{Html, IntoResponse};
@@ -56,7 +57,7 @@ async fn serve(config: GlazedConfig) -> Result<(), Box<dyn std::error::Error>> {
         .clone()
         .unwrap_or_else(|| Url::parse(&format!("http://{}", config.bind_address)).unwrap());
     let schema = Schema::build(TiledQuery, EmptyMutation, EmptySubscription)
-        .data(RootAddress(public_address))
+        .data(RootAddress(public_address.clone()))
         .data(client.clone())
         .finish();
 
@@ -75,7 +76,11 @@ async fn serve(config: GlazedConfig) -> Result<(), Box<dyn std::error::Error>> {
         .with_state(client)
         .fallback((
             StatusCode::NOT_FOUND,
-            Html(include_str!("../static/404.html")),
+            Html(
+                NotFound::from_public_address(public_address.clone())
+                    .render()
+                    .expect("Rendering to a string shouldn't fail"),
+            ),
         ))
         .layer(Extension(schema));
 
@@ -87,6 +92,22 @@ async fn serve(config: GlazedConfig) -> Result<(), Box<dyn std::error::Error>> {
         .await?)
 }
 
+#[derive(Template)]
+#[template(path = "404.html")]
+struct NotFound {
+    graphql_address: Url,
+    graphiql_address: Url,
+}
+
+impl NotFound {
+    fn from_public_address(add: Url) -> Self {
+        Self {
+            graphql_address: add.join("graphql").unwrap(),
+            graphiql_address: add.join("graphiql").unwrap(),
+        }
+    }
+}
+
 async fn graphql_get_warning() -> impl IntoResponse {
     (
         StatusCode::METHOD_NOT_ALLOWED,

src/main.rs

@@ -7,9 +7,9 @@
         <h1>GraphQL interface to Tiled</h1>
         <p>
             Service is available at
-            <a href="/graphql">/graphql</a>.
+            <a href="{{ graphql_address }}">/graphql</a>.
             Playground is available for testing at
-            <a href="/graphiql">/graphiql</a>
+            <a href="{{ graphiql_address }}">/graphiql</a>
         </p>
     </body>
 </html>