fix: parse discord api retry headers strictly · openclaw/...

Recent Commits to openclaw:main

steipete · 2026-05-29 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,32 @@ describe("fetchDiscord", () => {`
`100`	`100`	`expect(message).not.toContain("<html");`
`101`	`101`	`});`
`102`	`102`
	`103`	`+it.each([`
	`104`	`+["hex", "0x10"],`
	`105`	`+["fractional", "1.5"],`
	`106`	+["overflow", `1${"0".repeat(309)}`],
	`107`	`+])("rejects invalid Retry-After header values: %s", async (_label, header) => {`
	`108`	`+const fetcher = withFetchPreconnect(`
	`109`	`+async () =>`
	`110`	`+new Response("<html><title>Error 1015</title><body>rate limited</body></html>", {`
	`111`	`+status: 429,`
	`112`	`+headers: { "content-type": "text/html", "retry-after": header },`
	`113`	`+}),`
	`114`	`+);`
	`115`	`+`
	`116`	`+let error: unknown;`
	`117`	`+try {`
	`118`	`+await fetchDiscord("/oauth2/applications/@me", "test", fetcher, {`
	`119`	`+retry: { attempts: 1 },`
	`120`	`+});`
	`121`	`+} catch (err) {`
	`122`	`+error = err;`
	`123`	`+}`
	`124`	`+`
	`125`	`+expect(error).toBeInstanceOf(DiscordApiError);`
	`126`	`+expect((error as DiscordApiError).retryAfter).toBe(60);`
	`127`	`+});`
	`128`	`+`
`103`	`129`	`it("retries rate limits before succeeding", async () => {`
`104`	`130`	`let calls = 0;`
`105`	`131`	`const fetcher = withFetchPreconnect(async () => {`

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import {`
`5`	`5`	`type RetryConfig,`
`6`	`6`	`} from "openclaw/plugin-sdk/retry-runtime";`
`7`	`7`	`import { isDiscordHtmlResponseBody, summarizeDiscordResponseBody } from "./error-body.js";`
	`8`	`+import { parseRetryAfterHeaderSeconds } from "./retry-after.js";`
`8`	`9`
`9`	`10`	`const DISCORD_API_BASE = "https://discord.com/api/v10";`
`10`	`11`	`const DISCORD_API_RETRY_DEFAULTS = {`
`@@ -51,15 +52,7 @@ function parseRetryAfterSeconds(text: string, response: Response): number \| unde`
`51`	`52`	`if (!header) {`
`52`	`53`	`return undefined;`
`53`	`54`	`}`
`54`		`-const parsed = Number(header);`
`55`		`-if (Number.isFinite(parsed) && parsed >= 0) {`
`56`		`-return parsed;`
`57`		`-}`
`58`		`-const retryAt = Date.parse(header);`
`59`		`-if (!Number.isFinite(retryAt)) {`
`60`		`-return undefined;`
`61`		`-}`
`62`		`-return Math.max(0, (retryAt - Date.now()) / 1000);`
	`55`	`+return parseRetryAfterHeaderSeconds(header);`
`63`	`56`	`}`
`64`	`57`
`65`	`58`	`function formatRetryAfterSeconds(value: number \| undefined): string \| undefined {`

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+import { parseDiscordRetryAfterBodySeconds, parseRetryAfterHeaderSeconds } from "../retry-after.js";`
	`2`	`+`
`1`	`3`	`export function readDiscordCode(body: unknown): number \| undefined {`
`2`	`4`	`const value =`
`3`	`5`	`body && typeof body === "object" && "code" in body`
`@@ -12,9 +14,6 @@ export function readDiscordCode(body: unknown): number \| undefined {`
`12`	`14`	`return undefined;`
`13`	`15`	`}`
`14`	`16`
`15`		`-const RETRY_AFTER_HEADER_DELAY_RE = /^\d+$/;`
`16`		`-const RETRY_AFTER_BODY_SECONDS_RE = /^(?:\d+\.?\d*\|\.\d+)$/;`
`17`		`-`
`18`	`17`	`export function readDiscordMessage(body: unknown, fallback: string): string {`
`19`	`18`	`const value =`
`20`	`19`	`body && typeof body === "object" && "message" in body`
`@@ -23,36 +22,14 @@ export function readDiscordMessage(body: unknown, fallback: string): string {`
`23`	`22`	`return typeof value === "string" && value.trim() ? value : fallback;`
`24`	`23`	`}`
`25`	`24`
`26`		`-function readRetryAfterHeader(value: string \| null, now = Date.now()): number \| undefined {`
`27`		`-if (!value) {`
`28`		`-return undefined;`
`29`		`-}`
`30`		`-const trimmed = value.trim();`
`31`		`-if (RETRY_AFTER_HEADER_DELAY_RE.test(trimmed)) {`
`32`		`-return Number(trimmed);`
`33`		`-}`
`34`		`-const retryAt = Date.parse(trimmed);`
`35`		`-return Number.isFinite(retryAt) ? (retryAt - now) / 1000 : undefined;`
`36`		`-}`
`37`		`-`
`38`		`-function coerceRetryAfterSeconds(value: unknown): number \| undefined {`
`39`		`-const seconds =`
`40`		`-typeof value === "number"`
`41`		`- ? value`
`42`		`- : typeof value === "string" && RETRY_AFTER_BODY_SECONDS_RE.test(value.trim())`
`43`		`- ? Number(value.trim())`
`44`		`- : undefined;`
`45`		`-return Number.isFinite(seconds) && seconds >= 0 ? Math.max(0, seconds) : undefined;`
`46`		`-}`
`47`		`-`
`48`	`25`	`export function readRetryAfter(body: unknown, response: Response, fallbackSeconds = 0): number {`
`49`	`26`	`const bodyValue =`
`50`	`27`	`body && typeof body === "object" && "retry_after" in body`
`51`	`28`	`? (body as { retry_after?: unknown }).retry_after`
`52`	`29`	`: undefined;`
`53`	`30`	`return (`
`54`		`-coerceRetryAfterSeconds(bodyValue) ??`
`55`		`-coerceRetryAfterSeconds(readRetryAfterHeader(response.headers.get("Retry-After"))) ??`
	`31`	`+parseDiscordRetryAfterBodySeconds(bodyValue) ??`
	`32`	`+parseRetryAfterHeaderSeconds(response.headers.get("Retry-After")) ??`
`56`	`33`	`fallbackSeconds`
`57`	`34`	`);`
`58`	`35`	`}`

Original file line number	Diff line number	Diff line change
`@@ -532,13 +532,17 @@ describe("RequestClient", () => {`
`532`	`532`	`await expectRateLimitError(client.get("/channels/c1/messages"), { retryAfter: 7 });`
`533`	`533`	`});`
`534`	`534`
`535`		`-it("rejects non-decimal Retry-After numeric strings", async () => {`
	`535`	`+it.each([`
	`536`	`+["hex", "0x10"],`
	`537`	`+["fractional", "1.5"],`
	`538`	+["overflow", `1${"0".repeat(309)}`],
	`539`	`+])("rejects invalid Retry-After numeric strings: %s", async (_label, header) => {`
`536`	`540`	`const client = new RequestClient("test-token", {`
`537`	`541`	`queueRequests: false,`
`538`	`542`	`fetch: async () =>`
`539`	`543`	`new Response(JSON.stringify({ message: "Slow down", retry_after: "1e3", global: false }), {`
`540`	`544`	`status: 429,`
`541`		`-headers: { "Retry-After": "0x10" },`
	`545`	`+headers: { "Retry-After": header },`
`542`	`546`	`}),`
`543`	`547`	`});`
`544`	`548`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,33 @@`
	`1`	`+const RETRY_AFTER_HEADER_DELAY_RE = /^\d+$/;`
	`2`	`+const RETRY_AFTER_BODY_SECONDS_RE = /^(?:\d+\.?\d*\|\.\d+)$/;`
	`3`	`+const RETRY_AFTER_HTTP_DATE_RE =`
	`4`	`+/^(?:Mon\|Tue\|Wed\|Thu\|Fri\|Sat\|Sun), \d{2} (?:Jan\|Feb\|Mar\|Apr\|May\|Jun\|Jul\|Aug\|Sep\|Oct\|Nov\|Dec) \d{4} \d{2}:\d{2}:\d{2} GMT$/;`
	`5`	`+`
	`6`	`+export function parseRetryAfterHeaderSeconds(`
	`7`	`+value: string \| null \| undefined,`
	`8`	`+now = Date.now(),`
	`9`	`+): number \| undefined {`
	`10`	`+if (!value) {`
	`11`	`+return undefined;`
	`12`	`+}`
	`13`	`+const trimmed = value.trim();`
	`14`	`+if (RETRY_AFTER_HEADER_DELAY_RE.test(trimmed)) {`
	`15`	`+const delaySeconds = Number(trimmed);`
	`16`	`+return Number.isFinite(delaySeconds) ? delaySeconds : undefined;`
	`17`	`+}`
	`18`	`+if (!RETRY_AFTER_HTTP_DATE_RE.test(trimmed)) {`
	`19`	`+return undefined;`
	`20`	`+}`
	`21`	`+const retryAt = Date.parse(trimmed);`
	`22`	`+return Number.isFinite(retryAt) ? Math.max(0, (retryAt - now) / 1000) : undefined;`
	`23`	`+}`
	`24`	`+`
	`25`	`+export function parseDiscordRetryAfterBodySeconds(value: unknown): number \| undefined {`
	`26`	`+const seconds =`
	`27`	`+typeof value === "number"`
	`28`	`+ ? value`
	`29`	`+ : typeof value === "string" && RETRY_AFTER_BODY_SECONDS_RE.test(value.trim())`
	`30`	`+ ? Number(value.trim())`
	`31`	`+ : undefined;`
	`32`	`+return seconds !== undefined && Number.isFinite(seconds) && seconds >= 0 ? seconds : undefined;`
	`33`	`+}`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main