Include Accept-Encoding header value in error message (ordinals#2835)

src/subcommand/server.rs

@@ -1044,9 +1044,10 @@ impl Server {
       if accept_encoding.is_acceptable(&content_encoding) {
         headers.insert(header::CONTENT_ENCODING, content_encoding);
       } else {
-        return Err(ServerError::NotAcceptable(
-          content_encoding.to_str().unwrap_or_default().to_string(),
-        ));
+        return Err(ServerError::NotAcceptable {
+          accept_encoding,
+          content_encoding,
+        });
       }
     }
 

src/subcommand/server/accept_encoding.rs

@@ -1,7 +1,7 @@
 use {super::*, axum::extract::FromRef};
 
-#[derive(Default)]
-pub(crate) struct AcceptEncoding(Option<String>);
+#[derive(Default, Debug)]
+pub(crate) struct AcceptEncoding(pub(crate) Option<String>);
 
 #[async_trait::async_trait]
 impl<S> axum::extract::FromRequestParts<S> for AcceptEncoding

src/subcommand/server/error.rs

@@ -1,10 +1,13 @@
-use super::*;
+use {super::*, std::fmt::Write};
 
 #[derive(Debug)]
 pub(super) enum ServerError {
   BadRequest(String),
   Internal(Error),
-  NotAcceptable(String),
+  NotAcceptable {
+    accept_encoding: AcceptEncoding,
+    content_encoding: HeaderValue,
+  },
   NotFound(String),
 }
 
@@ -24,11 +27,23 @@ impl IntoResponse for ServerError {
         )
           .into_response()
       }
-      Self::NotAcceptable(content_type) => (
-        StatusCode::NOT_ACCEPTABLE,
-        format!("inscription content type `{content_type}` is not acceptable"),
-      )
-        .into_response(),
+      Self::NotAcceptable {
+        accept_encoding,
+        content_encoding,
+      } => {
+        let mut message = format!(
+          "inscription content encoding `{}` is not acceptable.",
+          String::from_utf8_lossy(content_encoding.as_bytes())
+        );
+
+        if let Some(accept_encoding) = accept_encoding.0 {
+          write!(message, " `Accept-Encoding` header: {accept_encoding}").unwrap();
+        } else {
+          write!(message, " `Accept-Encoding` header not present").unwrap();
+        };
+
+        (StatusCode::NOT_ACCEPTABLE, message).into_response()
+      }
       Self::NotFound(message) => (
         StatusCode::NOT_FOUND,
         [(header::CACHE_CONTROL, HeaderValue::from_static("no-store"))],

tests/wallet/inscribe.rs

@@ -1282,7 +1282,7 @@ fn inscribe_can_compress() {
   assert_eq!(response.status(), StatusCode::NOT_ACCEPTABLE);
   assert_regex_match!(
     response.text().unwrap(),
-    "inscription content type `br` is not acceptable"
+    "inscription content encoding `br` is not acceptable. `Accept-Encoding` header not present"
   );
 
   let client = reqwest::blocking::Client::builder()