jelq

public

an http based roguelike rpg about jelqing

Star0

Fork 0

Watch0

19 commits 1 branch 0 tags 0 releases1.3 MiB

Commit `7288fc269bb6`

tarball

atagen <boss@atagen.co>2026-10-10 15:15 UTC

5 files changed+56-6

jelqd: never leave the page waiting on a reply that will not come

A failed /ui/send fetch or an unreadable reply threw before anything was logged, so requests piled up in the log with no answers and no explanation. Handler panics now become a 500 problem instead of a dropped connection, and the page logs any request it could not get an answer for.

Modified file: Cargo.lock+25 additions@@ -67,6 +67,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "bitflags"
+version = "2.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06"
+
+[[package]]
 name = "block-buffer"
 version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -315,6 +321,7 @@ dependencies = [
  "sha2",
  "tokio",
  "tower",
+ "tower-http",
 ]
 
 [[package]]
@@ -636,6 +643,24 @@ dependencies = [
 ]
 
 [[package]]
+name = "tower-http"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840"
+dependencies = [
+ "bitflags",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "pin-project-lite",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
 name = "tower-layer"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"

Modified file: Cargo.toml+1

@@ -19,4 +19,5 @@ serde_json = "1"

1919 sha2 = "0.10"

2020 tokio = { version = "1", features = ["io-util", "macros", "net", "rt-multi-thread"] }

2121 tower = { version = "0.5", features = ["util"] }

22+tower-http = { version = "0.6", features = ["catch-panic"] }

2223

Modified file: src/http/middleware.rs+10 additions@@ -156,3 +156,13 @@ pub async fn chrome(request: Request, next: Next) -> Response {
         .or_insert(HeaderValue::from_static("no-store, private"));
     response
 }
+
+/// A handler panic would otherwise drop the connection with no reply at all.
+pub fn panicked(_: Box<dyn std::any::Any + Send + 'static>) -> Response {
+    Problem::new(
+        StatusCode::INTERNAL_SERVER_ERROR,
+        "server-fault",
+        "The server has had an internal event of its own. It is not discussing it.",
+    )
+    .into_response()
+}

Modified file: src/http/mod.rs+4 additions@@ -19,6 +19,8 @@ use axum::{
     routing::{MethodRouter, any},
 };
 
+use tower_http::catch_panic::CatchPanicLayer;
+
 use crate::{config::Config, game::Run};
 use ctx::Ctx;
 use resource::Resource;
@@ -68,6 +70,7 @@ pub fn router(state: Shared) -> Router {
         .route("/ui/send", any(ui::send))
         .with_state(api.clone());
     api.merge(ui)
+        .layer(CatchPanicLayer::custom(middleware::panicked))
 }
 
 fn global(resource: &'static Resource<Shared>) -> MethodRouter<Shared> {
@@ -109,5 +112,6 @@ fn api(state: Shared) -> Router {
         .route("/leaderboard", global(&meta::LEADERBOARD))
         .fallback(meta::not_found)
         .layer(axum::middleware::from_fn(middleware::chrome))
+        .layer(CatchPanicLayer::custom(middleware::panicked))
         .with_state(state)
 }

Modified file: src/ui.html+16 additions−6 deletions@@ -402,12 +402,22 @@ async function go(event) {
   log("> " + method + " " + short(path));
   for (const [name, v] of headers) log("> " + name + ": " + v);
   headers.push(["Accept-Language", $("locale").value]);
-  const response = await fetch("/ui/send", {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ method, path, headers, body }),
-  });
-  const r = await response.json();
+  let r;
+  try {
+    const response = await fetch("/ui/send", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ method, path, headers, body }),
+    });
+    r = await response.json();
+  } catch (error) {
+    log("! The server did not answer. Is jelqd still running? (" + error.message + ")\n");
+    return;
+  }
+  if (!Array.isArray(r.headers)) {
+    log("! The page could not read that reply:\n  " + JSON.stringify(r) + "\n");
+    return;
+  }
   log(describe(r) + "\n");
   absorb(r, method, path);
 }

jelq

Commit 7288fc269bb6

Commit `7288fc269bb6`