mirror of
https://github.com/Elysola/WebHooker.git
synced 2026-11-20 17:13:49 +00:00
fix(telegram): honor nested rate-limit delays
Telegram places retry_after inside parameters, not at the top level. Read that value and defer long waits to the delivery queue.
This commit is contained in:
1 parent
03021f7c2b
commit
b212989c05
1 file changed
+19
-1
@@ -7,8 +7,15 @@ interface TelegramResponse {
|
||||
ok?: boolean;
|
||||
description?: string;
|
||||
result?: { message_id?: number };
|
||||
parameters?: { retry_after?: number };
|
||||
}
|
||||
|
||||
/**
|
||||
* Longest rate-limit wait (seconds) slept inside one request; a longer one is
|
||||
* returned as a 429 failure so the delivery queue retries it later instead.
|
||||
*/
|
||||
const MAX_INLINE_RETRY_AFTER = 10;
|
||||
|
||||
/**
|
||||
* Longest a single API call may take. Bounded, so a message edit always ends
|
||||
* well within the update-chain lock it runs under (see `deliverUpdate`).
|
||||
@@ -37,8 +44,19 @@ async function post(
|
||||
const data = (await res.json().catch(() => null)) as TelegramResponse | null;
|
||||
|
||||
if (res.status === 429) {
|
||||
const retryAfter = (data as { retry_after?: number })?.retry_after ?? 1;
|
||||
// Telegram reports the wait in `parameters.retry_after` (seconds).
|
||||
const raw = Number(data?.parameters?.retry_after);
|
||||
const retryAfter = Number.isFinite(raw) && raw > 0 ? raw : 1;
|
||||
lastError = data?.description ?? `Rate limited (retry_after=${retryAfter})`;
|
||||
if (retryAfter > MAX_INLINE_RETRY_AFTER || attempt === 2) {
|
||||
return {
|
||||
ok: false,
|
||||
error: lastError,
|
||||
errorCode: "RATE_LIMITED",
|
||||
status: 429,
|
||||
attempts: attempt + 1,
|
||||
};
|
||||
}
|
||||
await new Promise((r) => setTimeout(r, retryAfter * 1000));
|
||||
continue;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user