Template 404 page to account for public_address

Dockerfile

@@ -12,15 +12,16 @@ RUN rustup target add x86_64-unknown-linux-musl && \
 # This downloads and builds the dependencies early allowing built dependencies
 # to be cached.
 RUN mkdir src && echo 'fn main() {}' > src/main.rs
-COPY Cargo.toml Cargo.lock ./  
+COPY Cargo.toml Cargo.lock ./
 
-RUN --mount=type=cache,target=/usr/local/cargo/registry cargo build --release --target x86_64-unknown-linux-musl 
+RUN --mount=type=cache,target=/usr/local/cargo/registry cargo build --release --target x86_64-unknown-linux-musl
 
-COPY static ./static
-COPY src ./src
+COPY ./static ./static
+COPY ./src ./src
+COPY ./templates ./templates
 
 RUN --mount=type=cache,target=/usr/local/cargo/registry <<EOF
-    set -e 
+    set -e
     # update timestamps to force a new build
     touch src/main.rs
     cargo build --release --locked --target x86_64-unknown-linux-musl

src/main.rs

@@ -56,7 +56,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();
 
@@ -73,10 +73,7 @@ async fn serve(config: GlazedConfig) -> Result<(), Box<dyn std::error::Error>> {
         )
         .route("/asset/{run}/{stream}/{det}/{id}", get(download_handler))
         .with_state(client)
-        .fallback((
-            StatusCode::NOT_FOUND,
-            Html(include_str!("../static/404.html")),
-        ))
+        .fallback((StatusCode::NOT_FOUND, not_found_page(&public_address)))
         .layer(Extension(schema));
 
     let listener = tokio::net::TcpListener::bind(config.bind_address).await?;
@@ -87,6 +84,16 @@ async fn serve(config: GlazedConfig) -> Result<(), Box<dyn std::error::Error>> {
         .await?)
 }
 
+fn not_found_page(public_address: &Url) -> Html<String> {
+    let graphql = public_address.join("graphql").unwrap();
+    let graphiql = public_address.join("graphiql").unwrap();
+    Html(format!(
+        include_str!("../templates/404.html"),
+        graphql_address = graphql,
+        graphiql_address = graphiql
+    ))
+}
+
 async fn graphql_get_warning() -> impl IntoResponse {
     (
         StatusCode::METHOD_NOT_ALLOWED,

static/404.html → templates/404.html

@@ -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>