惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

P
Proofpoint News Feed
博客园_首页
WordPress大学
WordPress大学
大猫的无限游戏
大猫的无限游戏
有赞技术团队
有赞技术团队
阮一峰的网络日志
阮一峰的网络日志
Hugging Face - Blog
Hugging Face - Blog
博客园 - 【当耐特】
酷 壳 – CoolShell
酷 壳 – CoolShell
Y
Y Combinator Blog
Vercel News
Vercel News
The GitHub Blog
The GitHub Blog
T
The Blog of Author Tim Ferriss
云风的 BLOG
云风的 BLOG
博客园 - 司徒正美
Engineering at Meta
Engineering at Meta
钛媒体:引领未来商业与生活新知
钛媒体:引领未来商业与生活新知
J
Java Code Geeks
Stack Overflow Blog
Stack Overflow Blog
N
Netflix TechBlog - Medium
Martin Fowler
Martin Fowler
宝玉的分享
宝玉的分享
G
Google Developers Blog
Last Week in AI
Last Week in AI

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix(discord): cool down Cloudflare 429 responses · opencl...
steipete · 2026-04-30 · via Recent Commits to openclaw:main

@@ -4,14 +4,16 @@ import {

44

retryAsync,

55

type RetryConfig,

66

} from "openclaw/plugin-sdk/retry-runtime";

7+

import { isDiscordHtmlResponseBody, summarizeDiscordResponseBody } from "./error-body.js";

7889

const DISCORD_API_BASE = "https://discord.com/api/v10";

910

const DISCORD_API_RETRY_DEFAULTS = {

1011

attempts: 3,

1112

minDelayMs: 500,

12-

maxDelayMs: 30_000,

13+

maxDelayMs: 5 * 60_000,

1314

jitter: 0.1,

1415

};

16+

const DISCORD_API_429_FALLBACK_RETRY_AFTER_SECONDS = 60;

15171618

type DiscordApiErrorPayload = {

1719

message?: string;

@@ -50,7 +52,14 @@ function parseRetryAfterSeconds(text: string, response: Response): number | unde

5052

return undefined;

5153

}

5254

const parsed = Number(header);

53-

return Number.isFinite(parsed) ? parsed : undefined;

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);

5463

}

55645665

function formatRetryAfterSeconds(value: number | undefined): string | undefined {

@@ -61,15 +70,25 @@ function formatRetryAfterSeconds(value: number | undefined): string | undefined

6170

return `${rounded}s`;

6271

}

637264-

function formatDiscordApiErrorText(text: string): string | undefined {

73+

function formatDiscordApiErrorText(text: string, response: Response): string | undefined {

6574

const trimmed = text.trim();

6675

if (!trimmed) {

6776

return undefined;

6877

}

6978

const payload = parseDiscordApiErrorPayload(trimmed);

7079

if (!payload) {

7180

const looksJson = trimmed.startsWith("{") && trimmed.endsWith("}");

72-

return looksJson ? "unknown error" : trimmed;

81+

if (looksJson) {

82+

return "unknown error";

83+

}

84+

const summary = summarizeDiscordResponseBody(trimmed);

85+

if (isDiscordHtmlResponseBody(trimmed, response.headers.get("content-type"))) {

86+

if (!summary) {

87+

return response.status === 429 ? "rate limited by Discord upstream" : undefined;

88+

}

89+

return response.status === 429 ? `rate limited by Discord upstream: ${summary}` : summary;

90+

}

91+

return summary;

7392

}

7493

const message =

7594

typeof payload.message === "string" && payload.message.trim()

@@ -92,6 +111,16 @@ export class DiscordApiError extends Error {

92111

}

93112

}

94113114+

function getDiscordApiRetryAfterMs(

115+

err: unknown,

116+

retryConfig: Required<RetryConfig>,

117+

): number | undefined {

118+

if (!(err instanceof DiscordApiError) || typeof err.retryAfter !== "number") {

119+

return undefined;

120+

}

121+

return Math.min(Math.max(0, err.retryAfter * 1000), retryConfig.maxDelayMs);

122+

}

123+95124

export type DiscordFetchOptions = {

96125

retry?: RetryConfig;

97126

label?: string;

@@ -116,9 +145,12 @@ export async function fetchDiscord<T>(

116145

});

117146

if (!res.ok) {

118147

const text = await res.text().catch(() => "");

119-

const detail = formatDiscordApiErrorText(text);

148+

const detail = formatDiscordApiErrorText(text, res);

120149

const suffix = detail ? `: ${detail}` : "";

121-

const retryAfter = res.status === 429 ? parseRetryAfterSeconds(text, res) : undefined;

150+

const retryAfter =

151+

res.status === 429

152+

? (parseRetryAfterSeconds(text, res) ?? DISCORD_API_429_FALLBACK_RETRY_AFTER_SECONDS)

153+

: undefined;

122154

throw new DiscordApiError(

123155

`Discord API ${path} failed (${res.status})${suffix}`,

124156

res.status,

@@ -131,10 +163,7 @@ export async function fetchDiscord<T>(

131163

...retryConfig,

132164

label: options?.label ?? path,

133165

shouldRetry: (err) => err instanceof DiscordApiError && err.status === 429,

134-

retryAfterMs: (err) =>

135-

err instanceof DiscordApiError && typeof err.retryAfter === "number"

136-

? err.retryAfter * 1000

137-

: undefined,

166+

retryAfterMs: (err) => getDiscordApiRetryAfterMs(err, retryConfig),

138167

},

139168

);

140169

}