Skip to content

fix(github-plugin): retry secondary rate limits, not only primary ones #466

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

Open
deanrie wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(github-plugin): retry secondary rate limits, not only primary ones #466

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 20 additions & 5 deletions apps/cursor/src/lib/github-plugin/parse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,19 +154,34 @@ export async function fetchWithRateLimit(

if (res.status !== 429 && res.status !== 403) return res;

// Distinguish "rate-limited" 403 from "forbidden" 403 by checking the
// X-RateLimit-Remaining header. A real auth/permission 403 has remaining > 0.
const retryAfterHeader = res.headers.get("retry-after");
const retryAfter = Number(retryAfterHeader ?? "");
const remaining = Number(res.headers.get("x-ratelimit-remaining") ?? "");
if (res.status === 403 && Number.isFinite(remaining) && remaining > 0) {

// Distinguish "rate-limited" 403 from "forbidden" 403. A primary-limit 403
// has remaining === 0; a secondary-limit 403 (too many concurrent requests,
// too many points per minute) carries a retry-after header while remaining
// can still be > 0. Only a 403 with budget left and no retry-after is a real
// auth/permission answer.
if (
res.status === 403 &&
retryAfterHeader === null &&
Number.isFinite(remaining) &&
remaining > 0
) {
return res;
}

const retryAfter = Number(res.headers.get("retry-after") ?? "");
const reset = Number(res.headers.get("x-ratelimit-reset") ?? "0") * 1000;
// GitHub's documented order: honour retry-after; else, if remaining is 0,
// wait for the reset; else (secondary limit without a retry-after) wait a
// minute before retrying.
let waitMs =
Number.isFinite(retryAfter) && retryAfter > 0
? retryAfter * 1000
: Math.max(reset - Date.now(), 1000);
: remaining === 0
? Math.max(reset - Date.now(), 1000)
: 60_000;
waitMs = Math.min(waitMs, maxWaitMs - totalWait);

if (waitMs <= 0 || attempt === maxAttempts) return res;
Expand Down