🚧 Prepare the new WG error enum

Cargo.toml

@@ -32,6 +32,7 @@ lz4_flex = { version = "0.11.1", default-features = false, features = ["std", "s
 maud = { version = "0.25.0", features = ["axum"] }
 moka = { version = "0.11.2", default-features = false, features = ["future", "atomic64"] }
 mongodb = { version = "2.6.0", features = ["tracing", "bson-uuid-1", "bson-chrono-0_4"] }
+monostate = "0.1.6"
 phf = { version = "0.11.2", features = ["macros"] }
 quick-xml = { version = "0.29.0", features = ["serialize"] }
 rayon = "1.7.0"

src/prelude.rs

@@ -1,4 +1,4 @@
-pub use anyhow::{anyhow, ensure, Context, Error};
+pub use anyhow::{anyhow, bail, ensure, Context, Error};
 pub use chrono::{TimeZone, Utc};
 pub use tracing::{debug, error, info, instrument, trace, warn};
 

src/wg.rs

@@ -32,6 +32,19 @@ pub enum WgResponse<D> {
     Err { error: WgError },
 }
 
+#[derive(Deserialize, Debug, thiserror::Error)]
+#[serde(untagged)]
+pub enum NewWgError {
+    #[error("invalid token")]
+    InvalidToken {
+        code: monostate::MustBe!(407),
+        message: monostate::MustBe!("INVALID_ACCESS_TOKEN"),
+    },
+
+    #[error("Wargaming.net API error `{code}/{message}`")]
+    Other { code: u16, message: String },
+}
+
 impl Wg {
     pub fn new(application_id: &str) -> Result<Self> {
         let client = ClientBuilder::new()
@@ -165,4 +178,26 @@ mod tests {
         )?;
         Ok(())
     }
+
+    #[test]
+    fn parse_invalid_token_error_ok() -> Result {
+        // language=json
+        let error: NewWgError =
+            serde_json::from_str(r#"{"code": 407, "message": "INVALID_ACCESS_TOKEN"}"#)?;
+        match error {
+            NewWgError::InvalidToken { .. } => Ok(()),
+            _ => bail!(error),
+        }
+    }
+
+    #[test]
+    fn parse_other_error_ok() -> Result {
+        // language=json
+        let error: NewWgError =
+            serde_json::from_str(r#"{"code": 418, "message": "I_AM_A_TEAPOT"}"#)?;
+        match error {
+            NewWgError::Other { code: 418, .. } => Ok(()),
+            _ => bail!(error),
+        }
+    }
 }