Return mailbox GET without long-polling

bc1cindy · bc1cindy · commit 94aa2aa9f3ed · 2026-06-17T21:26:40.000-03:00
diff --git a/payjoin-mailroom/src/db/files.rs b/payjoin-mailroom/src/db/files.rs
@@ -246,6 +246,7 @@ impl DbTrait for FilesDb {
         Ok(guard.read(id).await?)
     }
 
+    // Unused by GET after the non-blocking switch; v2 waitmap removal is a follow-up.
     async fn wait_for_v2_payload(
         &self,
         id: &ShortId,
diff --git a/payjoin-mailroom/src/directory.rs b/payjoin-mailroom/src/directory.rs
@@ -288,8 +288,16 @@ impl<D: Db> Service<D> {
     async fn get_mailbox(&self, id: &str) -> Result<Response<Body>, HandlerError> {
         trace!("get_mailbox");
         let id = ShortId::from_str(id)?;
-        let timeout_response = Response::builder().status(StatusCode::ACCEPTED).body(empty())?;
-        handle_peek(self.db.wait_for_v2_payload(&id).await, timeout_response)
+        let empty_response = Response::builder().status(StatusCode::ACCEPTED).body(empty())?;
+        match self.db.peek_v2_payload(&id).await {
+            Ok(Some(payload)) => Ok(Response::new(full((*payload).clone()))),
+            Ok(None) => Ok(empty_response),
+            Err(DbError::Operational(err)) => {
+                error!("Storage error: {err}");
+                Err(HandlerError::InternalServerError(anyhow::Error::msg("Internal server error")))
+            }
+            Err(_) => Ok(empty_response),
+        }
     }
 
     /// Screen a V1 PSBT body against the address blocklist.
@@ -878,6 +886,25 @@ mod tests {
         }
     }
 
+    #[tokio::test(start_paused = true)]
+    async fn get_mailbox_returns_immediately_when_empty() {
+        let svc = test_service(None).await;
+        let id = valid_short_id_path();
+        let start = tokio::time::Instant::now();
+        let res = svc.get_mailbox(&id).await.expect("get_mailbox");
+        assert_eq!(res.status(), StatusCode::ACCEPTED);
+        assert_eq!(start.elapsed(), Duration::ZERO, "GET must not block");
+    }
+
+    #[tokio::test]
+    async fn get_mailbox_returns_payload_when_present() {
+        let svc = test_service(None).await;
+        let id = valid_short_id_path();
+        svc.post_mailbox(&id, Body::from(b"hi".to_vec())).await.expect("post");
+        let res = svc.get_mailbox(&id).await.expect("get_mailbox");
+        assert_eq!(res.status(), StatusCode::OK);
+    }
+
     #[tokio::test]
     async fn post_mailbox_records_short_id_cardinality() {
         use opentelemetry_sdk::metrics::{

Original file line number	Diff line number	Diff line change
`@@ -246,6 +246,7 @@ impl DbTrait for FilesDb {`
`246`	`246`	`Ok(guard.read(id).await?)`
`247`	`247`	`}`
`248`	`248`
	`249`	`+ // Unused by GET after the non-blocking switch; v2 waitmap removal is a follow-up.`
`249`	`250`	`async fn wait_for_v2_payload(`
`250`	`251`	`&self,`
`251`	`252`	`id: &ShortId,`