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

推荐订阅源

宝玉的分享
宝玉的分享
小众软件
小众软件
J
Java Code Geeks
I
InfoQ
奇客Solidot–传递最新科技情报
奇客Solidot–传递最新科技情报
腾讯CDC
L
LangChain Blog
博客园 - 司徒正美
量子位
Y
Y Combinator Blog
C
Check Point Blog
T
Tailwind CSS Blog
D
DataBreaches.Net
Blog — PlanetScale
Blog — PlanetScale
N
Netflix TechBlog - Medium
钛媒体:引领未来商业与生活新知
钛媒体:引领未来商业与生活新知
F
Fortinet All Blogs
云风的 BLOG
云风的 BLOG
A
About on SuperTechFans
B
Blog RSS Feed
酷 壳 – CoolShell
酷 壳 – CoolShell
大猫的无限游戏
大猫的无限游戏
V
V2EX
阮一峰的网络日志
阮一峰的网络日志

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): propagate timeout through channel capabilit...
xialonglee · 2026-06-17 · via Recent Commits to openclaw:main
Original file line numberDiff line numberDiff line change

@@ -482,6 +482,40 @@ describe("discordPlugin outbound", () => {

482482

}

483483

});

484484
485+

it("returns a timeout error when capabilities diagnostics exceed the timeout", async () => {

486+

let diagnosticSignal: AbortSignal | undefined;

487+

const fetchPermissionsSpy = vi

488+

.spyOn(sendModule, "fetchChannelPermissionsDiscord")

489+

.mockImplementation(

490+

async (_channelId, opts) =>

491+

await new Promise<never>((_, reject) => {

492+

diagnosticSignal = opts.signal;

493+

opts.signal?.addEventListener(

494+

"abort",

495+

() => reject(new Error("permission lookup aborted")),

496+

{ once: true },

497+

);

498+

}),

499+

);

500+

try {

501+

const cfg = createCfg();

502+

const diagnostics = await discordPlugin.status!.buildCapabilitiesDiagnostics!({

503+

account: resolveAccount(cfg),

504+

timeoutMs: 10,

505+

cfg,

506+

target: "channel:222",

507+

});

508+
509+

const timeoutPerms = recordField(diagnostics?.details?.permissions, "permissions");

510+

expect(String(timeoutPerms.error)).toContain("timed out");

511+

expect(diagnostics?.lines?.[0]?.tone).toBe("error");

512+

expect(objectArgAt(fetchPermissionsSpy, 0, 1).timeoutMs).toBe(10);

513+

expect(diagnosticSignal?.aborted).toBe(true);

514+

} finally {

515+

fetchPermissionsSpy.mockRestore();

516+

}

517+

});

518+
485519

it("uses direct Discord startup helpers for async startup enrichment", async () => {

486520

const runtimeProbeDiscord = vi.fn(async () => {

487521

throw new Error("runtime Discord probe should not be used");

Original file line numberDiff line numberDiff line change

@@ -70,6 +70,7 @@ import {

7070

setThreadBindingIdleTimeoutBySessionKey,

7171

setThreadBindingMaxAgeBySessionKey,

7272

} from "./monitor/thread-bindings.session-updates.js";

73+

import { withAbortTimeout } from "./monitor/timeouts.js";

7374

import { looksLikeDiscordTargetId, normalizeDiscordMessagingTarget } from "./normalize.js";

7475

import { discordOutbound } from "./outbound-adapter.js";

7576

import { resolveDiscordOutboundSessionRoute } from "./outbound-session-route.js";

@@ -529,7 +530,7 @@ export const discordPlugin: ChannelPlugin<ResolvedDiscordAccount, DiscordProbe>

529530

}

530531

return lines;

531532

},

532-

buildCapabilitiesDiagnostics: async ({ account, target }) => {

533+

buildCapabilitiesDiagnostics: async ({ account, target, timeoutMs }) => {

533534

if (!target?.trim()) {

534535

return undefined;

535536

}

@@ -578,12 +579,19 @@ export const discordPlugin: ChannelPlugin<ResolvedDiscordAccount, DiscordProbe>

578579

},

579580

};

580581

try {

581-

const perms = await (

582-

await loadDiscordSendModule()

583-

).fetchChannelPermissionsDiscord(parsedTarget.id, {

584-

cfg: statusCfg,

585-

token,

586-

accountId: account.accountId ?? undefined,

582+

const sendModule = await loadDiscordSendModule();

583+

const perms = await withAbortTimeout({

584+

timeoutMs,

585+

createTimeoutError: () =>

586+

new Error(`Capabilities diagnostic timed out after ${timeoutMs}ms`),

587+

run: async (signal) =>

588+

await sendModule.fetchChannelPermissionsDiscord(parsedTarget.id, {

589+

cfg: statusCfg,

590+

token,

591+

accountId: account.accountId ?? undefined,

592+

signal,

593+

timeoutMs,

594+

}),

587595

});

588596

const requiredPermissions = resolveRequiredDiscordChannelPermissions(perms.channelType);

589597

const missingRequired = requiredPermissions.filter(

Original file line numberDiff line numberDiff line change

@@ -63,6 +63,14 @@ describe("createDiscordRestClient", () => {

6363

expect(result.account.config.retry).toEqual({ attempts: 7 });

6464

});

6565
66+

it("applies a caller timeout to a dedicated REST client", () => {

67+

const cfg = { channels: { discord: { token: "discord-token" } } } as OpenClawConfig;

68+
69+

const result = createDiscordRestClient({ cfg, timeoutMs: 250 });

70+
71+

expect(result.rest.options.timeout).toBe(250);

72+

});

73+
6674

it("still fails closed when no explicit token is provided and config token is unresolved", () => {

6775

vi.stubEnv("DISCORD_BOT_TOKEN", "env-token");

6876

const cfg = {

Original file line numberDiff line numberDiff line change

@@ -23,6 +23,8 @@ export type DiscordClientOpts = {

2323

accountId?: string;

2424

rest?: RequestClient;

2525

retry?: RetryConfig;

26+

signal?: AbortSignal;

27+

timeoutMs?: number;

2628

verbose?: boolean;

2729

};

2830

@@ -77,15 +79,18 @@ function resolveRest(

7779

cfg: OpenClawConfig,

7880

rest?: RequestClient,

7981

proxyFetch?: typeof fetch,

82+

signal?: AbortSignal,

83+

timeoutMs?: number,

8084

) {

8185

if (rest) {

8286

return rest;

8387

}

8488

const resolvedProxyFetch = proxyFetch ?? resolveDiscordProxyFetchForAccount(account, cfg);

85-

return createDiscordRequestClient(

86-

token,

87-

resolvedProxyFetch ? { fetch: resolvedProxyFetch } : undefined,

88-

);

89+

return createDiscordRequestClient(token, {

90+

...(resolvedProxyFetch ? { fetch: resolvedProxyFetch } : {}),

91+

...(signal ? { signal } : {}),

92+

...(timeoutMs !== undefined ? { timeout: timeoutMs } : {}),

93+

});

8994

}

9095
9196

function resolveAccountWithoutToken(params: {

@@ -121,7 +126,15 @@ export function createDiscordRestClient(opts: DiscordClientOpts) {

121126

accountId: account.accountId,

122127

fallbackToken: account.token,

123128

});

124-

const rest = resolveRest(token, account, resolvedCfg, opts.rest, proxyContext.proxyFetch);

129+

const rest = resolveRest(

130+

token,

131+

account,

132+

resolvedCfg,

133+

opts.rest,

134+

proxyContext.proxyFetch,

135+

opts.signal,

136+

opts.timeoutMs,

137+

);

125138

return { token, rest, account };

126139

}

127140
Original file line numberDiff line numberDiff line change

@@ -39,6 +39,7 @@ export type RequestClientOptions = {

3939

baseUrl?: string;

4040

apiVersion?: number;

4141

userAgent?: string;

42+

signal?: AbortSignal;

4243

timeout?: number;

4344

queueRequests?: boolean;

4445

maxQueueSize?: number;

@@ -237,13 +238,16 @@ export class RequestClient {

237238

const controller = new AbortController();

238239

const timeout = setTimeout(() => controller.abort(), this.options.timeout ?? 15_000);

239240

timeout.unref?.();

241+

const signal = this.options.signal

242+

? AbortSignal.any([this.options.signal, controller.signal])

243+

: controller.signal;

240244

this.requestControllers.add(controller);

241245

try {

242246

const response = await (this.customFetch ?? fetch)(url, {

243247

method,

244248

headers,

245249

body: await normalizeFetchBody(body, headers),

246-

signal: controller.signal,

250+

signal,

247251

});

248252

const text = await response.text();

249253

const parsed = coerceResponseBody(text);

Original file line numberDiff line numberDiff line change

@@ -87,6 +87,25 @@ describe("createDiscordRequestClient", () => {

8787

expect(abortable.receivedSignal.aborted).toBe(true);

8888

});

8989
90+

it("lets a caller signal cancel active proxied fetches", async () => {

91+

const abortable = createAbortableFetchMock();

92+

const controller = new AbortController();

93+

const client = createDiscordRequestClient("Bot test-token", {

94+

fetch: abortable.fetch as never,

95+

queueRequests: false,

96+

signal: controller.signal,

97+

timeout: 5_000,

98+

});

99+
100+

const request = client.get("/channels/123/messages");

101+

await vi.waitFor(() => expect(abortable.fetch).toHaveBeenCalledTimes(1));

102+
103+

controller.abort();

104+
105+

await expectAbortError(request);

106+

expect(abortable.receivedSignal?.aborted).toBe(true);

107+

});

108+
90109

it("provides the REST client's timeout signal even without a caller signal", async () => {

91110

let receivedSignal: AbortSignal | undefined;

92111
Original file line numberDiff line numberDiff line change

@@ -388,8 +388,10 @@ export async function fetchChannelPermissionsDiscord(

388388

channelId: string,

389389

opts: DiscordReactOpts,

390390

): Promise<DiscordPermissionsSummary> {

391+

opts.signal?.throwIfAborted();

391392

const rest = resolveDiscordRest(opts);

392393

const channel = await getChannel(rest, channelId);

394+

opts.signal?.throwIfAborted();

393395

const channelType = "type" in channel ? channel.type : undefined;

394396

const guildId = "guild_id" in channel ? channel.guild_id : undefined;

395397

if (!guildId) {

@@ -403,10 +405,12 @@ export async function fetchChannelPermissionsDiscord(

403405

}

404406
405407

const botId = await fetchBotUserId(rest);

408+

opts.signal?.throwIfAborted();

406409

const [guild, member] = await Promise.all([

407410

getGuild(rest, guildId),

408411

getGuildMember(rest, guildId, botId),

409412

]);

413+

opts.signal?.throwIfAborted();

410414
411415

const permissions = resolveMemberChannelPermissionBits({

412416

guildId,

Original file line numberDiff line numberDiff line change

@@ -841,6 +841,29 @@ describe("fetchChannelPermissionsDiscord", () => {

841841

expect(res.isDm).toBe(false);

842842

});

843843
844+

it("stops permission lookup when the caller deadline aborts", async () => {

845+

const { rest, getMock } = makeDiscordRest();

846+

const controller = new AbortController();

847+

getMock.mockImplementationOnce(async () => {

848+

controller.abort();

849+

return {

850+

id: "chan1",

851+

guild_id: "guild1",

852+

permission_overwrites: [],

853+

};

854+

});

855+
856+

await expect(

857+

fetchChannelPermissionsDiscord("chan1", {

858+

rest,

859+

token: "t",

860+

cfg: DISCORD_TEST_CFG,

861+

signal: controller.signal,

862+

}),

863+

).rejects.toMatchObject({ name: "AbortError" });

864+

expect(getMock).toHaveBeenCalledTimes(1);

865+

});

866+
844867

it("treats Administrator as all permissions despite overwrites", async () => {

845868

const { rest, getMock } = makeDiscordRest();

846869

getMock

Original file line numberDiff line numberDiff line change

@@ -46,6 +46,8 @@ export type DiscordReactOpts = {

4646

rest?: RequestClient;

4747

verbose?: boolean;

4848

retry?: RetryConfig;

49+

signal?: AbortSignal;

50+

timeoutMs?: number;

4951

};

5052
5153

export type DiscordReactionRuntimeContext = DiscordRuntimeAccountContext & {