jelq

public

an http based roguelike rpg about jelqing

Star0

Fork 0

Watch0

92 commits 1 branch 0 tags 0 releases1.3 MiB

Commit `27256acf2780`

tarball

atagen <boss@atagen.co>2026-10-14 13:44 UTC

3 files changed+80-36

game: report each combo technique in plain WebDAV rather than nested JSON

responsedescription carried the whole problem document, repeating the status and title already in D:status. The detail now stands alone, the problem type goes in D:error, and any other fields become elements under the game's own namespace.

Modified file: src/game/dispatch.rs+71 additions−35 deletions@@ -142,32 +142,13 @@ impl Run {
         }
 
         let mut xml = String::from(
-            "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<D:multistatus xmlns:D=\"DAV:\">\n",
+            "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<D:multistatus xmlns:D=\"DAV:\" xmlns:J=\"https://jelq.dev/\">\n",
         );
         for (training, report) in reports {
-            let _ = write!(
-                xml,
-                "  <D:response>\n    <D:href>{}?technique={}</D:href>\n    <D:status>HTTP/1.1 {} {}</D:status>\n",
-                self.path(""),
-                training.name(),
-                report.status.as_u16(),
-                crate::problem::reason(report.status),
+            report.write(
+                &mut xml,
+                &format!("{}?technique={}", self.path(""), training.name()),
             );
-            if let Some(location) = report.location {
-                let _ = writeln!(
-                    xml,
-                    "    <D:location><D:href>{}</D:href></D:location>",
-                    escape(&location)
-                );
-            }
-            if let Some(text) = report.text {
-                let _ = writeln!(
-                    xml,
-                    "    <D:responsedescription>{}</D:responsedescription>",
-                    escape(&text)
-                );
-            }
-            xml.push_str("  </D:response>\n");
         }
         xml.push_str(
             "  <D:responsedescription>Each technique has been reported separately.</D:responsedescription>\n</D:multistatus>\n",
@@ -183,24 +164,79 @@ impl Run {
 /// What one technique of a combo would have answered on its own.
 struct Report {
     status: StatusCode,
+    error: Option<&'static str>,
+    detail: Option<String>,
+    fields: Vec<(String, String)>,
     location: Option<String>,
-    text: Option<String>,
 }
 
 impl Report {
     fn of(result: Result<Outcome, Problem>) -> Self {
-        match result {
-            Ok(outcome) => Self {
-                status: outcome.status(),
-                location: outcome.header_value(&header::LOCATION).map(str::to_owned),
-                text: outcome.body().map(Value::to_string),
-            },
-            Err(problem) => Self {
-                status: problem.status(),
-                location: None,
-                text: Some(Value::Object(problem.document()).to_string()),
-            },
+        let (status, error, location, body) = match result {
+            Ok(outcome) => (
+                outcome.status(),
+                None,
+                outcome.header_value(&header::LOCATION).map(str::to_owned),
+                outcome.body().and_then(Value::as_object).cloned(),
+            ),
+            Err(problem) => {
+                let mut document = problem.document();
+                for repeated in ["type", "title", "status"] {
+                    document.remove(repeated);
+                }
+                (problem.status(), Some(problem.slug()), None, Some(document))
+            }
+        };
+        let mut body = body.unwrap_or_default();
+        let detail = body
+            .remove("detail")
+            .and_then(|detail| detail.as_str().map(str::to_owned));
+        let fields = body
+            .into_iter()
+            .map(|(key, value)| match value {
+                Value::String(text) => (key, text),
+                other => (key, other.to_string()),
+            })
+            .collect();
+        Self {
+            status,
+            error,
+            detail,
+            fields,
+            location,
+        }
+    }
+
+    /// In RFC 4918's order, with anything the game adds after it under its own namespace.
+    fn write(&self, xml: &mut String, href: &str) {
+        let _ = write!(
+            xml,
+            "  <D:response>\n    <D:href>{}</D:href>\n    <D:status>HTTP/1.1 {} {}</D:status>\n",
+            escape(href),
+            self.status.as_u16(),
+            crate::problem::reason(self.status),
+        );
+        if let Some(error) = self.error {
+            let _ = writeln!(xml, "    <D:error><J:{error}/></D:error>");
+        }
+        if let Some(detail) = &self.detail {
+            let _ = writeln!(
+                xml,
+                "    <D:responsedescription>{}</D:responsedescription>",
+                escape(detail)
+            );
+        }
+        if let Some(location) = &self.location {
+            let _ = writeln!(
+                xml,
+                "    <D:location><D:href>{}</D:href></D:location>",
+                escape(location)
+            );
+        }
+        for (key, value) in &self.fields {
+            let _ = writeln!(xml, "    <J:{key}>{}</J:{key}>", escape(value));
         }
+        xml.push_str("  </D:response>\n");
     }
 }
 

Modified file: src/problem.rs+4 additions@@ -29,6 +29,10 @@ impl Problem {
         }))
     }
 
+    pub fn slug(&self) -> &'static str {
+        self.0.slug
+    }
+
     pub fn status(&self) -> StatusCode {
         self.0.status
     }

Modified file: src/tests/body.rs+5 additions−1 deletions@@ -411,9 +411,13 @@ async fn a_combo_tells_each_technique_in_full() {
                 continue;
             }
             assert!(
-                report.contains("<D:responsedescription>{\"") && report.contains("\"detail\""),
+                report.contains("<D:responsedescription>") && !report.contains("{\""),
                 "{report}"
             );
+            let failed = ["HTTP/1.1 4", "HTTP/1.1 5"]
+                .iter()
+                .any(|s| report.contains(s));
+            assert_eq!(failed, report.contains("<D:error><J:"), "{report}");
             told += 1;
         }
     }

jelq

Commit 27256acf2780

Commit `27256acf2780`