Skip to content

Replace custom rate limit header parsing with rate-limits crate #2135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mre merged 10 commits into from
May 30, 2026
Merged

Replace custom rate limit header parsing with rate-limits crate #2135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
819be78
Replace custom rate limit header parsing with rate-limits crate
mre Apr 8, 2026
c60420d
Move retry rate limit headers test to rate_limit.rs
mre Apr 8, 2026
b32b2d3
Improve rate limit test timing accuracy and tolerance
mre Apr 8, 2026
32ea76e
Refactor rate limit test helper to simplify parameters
mre Apr 8, 2026
41bf982
Refactor rate limit tests for consistency and reliability
mre Apr 9, 2026
8f3a7d5
- Add detailed comments explaining header semantics and timing logic
mre Apr 15, 2026
68f9e94
Fix CI failures after rebase on master
mre Apr 23, 2026
f4d39ae
chore: bump rate-limits to latest parser branch commit
mre Apr 25, 2026
419ce8e
apply feedback and sync branch
mre May 30, 2026
6fe1516
Shorten and clarify rate limit test comments
mre May 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 2 additions & 44 deletions lychee-bin/tests/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ mod cli {
io::{BufRead, Write},
ops::Not,
path::Path,
time::{Duration, Instant},
time::Duration,
};
use tempfile::{NamedTempFile, tempdir};
use test_utils::{fixtures_path, mock_server, redirecting_mock_server, root_path};
use url::Url;

use uuid::Uuid;
use wiremock::{
Mock, Request, ResponseTemplate,
Mock, ResponseTemplate,
matchers::{basic_auth, method, path},
};

Expand Down Expand Up @@ -2786,48 +2786,6 @@ The config file should contain every possible key for documentation purposes."
.success();
}

#[tokio::test]
async fn test_retry_rate_limit_headers() {
const RETRY_DELAY: Duration = Duration::from_secs(1);
const TOLERANCE: Duration = Duration::from_millis(500);
let server = wiremock::MockServer::start().await;

wiremock::Mock::given(wiremock::matchers::method("GET"))
.respond_with(
ResponseTemplate::new(429)
.append_header("Retry-After", RETRY_DELAY.as_secs().to_string()),
)
.expect(1)
.up_to_n_times(1)
.mount(&server)
.await;

let start = Instant::now();
wiremock::Mock::given(wiremock::matchers::method("GET"))
.respond_with(move |_: &Request| {
let delta = Instant::now().duration_since(start);
assert!(delta > RETRY_DELAY);
assert!(delta < RETRY_DELAY + TOLERANCE);
ResponseTemplate::new(200)
})
.expect(1)
.mount(&server)
.await;

cargo_bin_cmd!()
// Direct args are not using the host pool, they are resolved earlier via Collector
.arg("-")
// Retry wait times are added on top of host-specific backoff timeout
.arg("--retry-wait-time")
.arg("0")
.write_stdin(server.uri())
.assert()
.success();

// Check that the server received the request with the header
server.verify().await;
}

#[tokio::test]
async fn test_no_header_set_on_input() {
let server = wiremock::MockServer::start().await;
Expand Down
Loading
Loading