Skip to content

Commit 481bebb

Browse files
Fizzngthuydiemclaude
committed
fix(identity): keep the rate-limit flag when the deadline expires
Co-authored-by: Diem Nguyen <[email protected]> Co-Authored-By: Claude Opus 5.5 <[email protected]> Signed-off-by: Fizz <6be7be23ec5bba868f3e1db5ec86013d76bd1a293dce5b435a192158fec13641@buzz.block.builderlab.xyz>
1 parent 80c9bba commit 481bebb

1 file changed

Lines changed: 39 additions & 4 deletions

File tree

‎src-tauri/src/federated_identity/protocol.rs‎

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,15 @@ pub(crate) async fn json<T: DeserializeOwned>(
171171
Err("network-unavailable".into())
172172
})
173173
.await
174-
.map_err(|_| {
175-
Failure::from(
174+
.unwrap_or_else(|_| {
175+
Err(Failure::from(
176176
if terminal_headers.load(std::sync::atomic::Ordering::Relaxed) {
177177
"adapter-refused"
178178
} else {
179179
"network-timeout"
180180
},
181-
)
182-
})?
181+
))
182+
})
183183
.map_err(|failure| Failure {
184184
rate_limited: rate_limited.load(std::sync::atomic::Ordering::Relaxed),
185185
..failure
@@ -256,4 +256,39 @@ mod tests {
256256
"successful body transport failures should recover"
257257
);
258258
}
259+
260+
#[tokio::test]
261+
async fn a_retry_after_past_the_deadline_keeps_the_rate_limit() {
262+
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
263+
let url = format!("http://{}/", listener.local_addr().unwrap());
264+
let (answered, waiting) = tokio::sync::oneshot::channel();
265+
let server = tokio::spawn(async move {
266+
let (mut socket, _) = listener.accept().await.unwrap();
267+
let mut request = Vec::new();
268+
while !request.ends_with(b"\r\n\r\n") {
269+
let mut byte = [0];
270+
socket.read_exact(&mut byte).await.unwrap();
271+
request.push(byte[0]);
272+
}
273+
socket
274+
.write_all(b"HTTP/1.1 429 Test\r\nRetry-After: 60\r\nContent-Length: 0\r\nConnection: close\r\n\r\n")
275+
.await
276+
.unwrap();
277+
// The client closes only after classifying the 429.
278+
let _ = socket.read_to_end(&mut Vec::new()).await;
279+
answered.send(()).unwrap();
280+
});
281+
let client = client().unwrap();
282+
let advance = async {
283+
waiting.await.unwrap();
284+
tokio::time::pause();
285+
tokio::time::advance(DEADLINE + Duration::from_secs(1)).await;
286+
};
287+
let (result, ()) = tokio::join!(json::<serde_json::Value>(|| client.get(&url)), advance);
288+
tokio::time::resume();
289+
server.await.unwrap();
290+
let failure = result.unwrap_err();
291+
assert_eq!(failure.code, "network-timeout");
292+
assert!(failure.rate_limited);
293+
}
259294
}

0 commit comments

Comments
 (0)