fix(discord): cap monitor helper timeouts · openclaw/openclaw@50378c0

Recent Commits to openclaw:main

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

File tree

extensions/discord/src/monitor

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,44 @@`
	`1`	`+import { MAX_TIMER_TIMEOUT_MS } from "openclaw/plugin-sdk/number-runtime";`
	`2`	`+import { afterEach, describe, expect, it, vi } from "vitest";`
	`3`	`+import { raceWithTimeout, withAbortTimeout } from "./timeouts.js";`
	`4`	`+`
	`5`	`+afterEach(() => {`
	`6`	`+vi.useRealTimers();`
	`7`	`+vi.restoreAllMocks();`
	`8`	`+});`
	`9`	`+`
	`10`	`+describe("discord monitor timeouts", () => {`
	`11`	`+it("caps raceWithTimeout timers before arming the watchdog", async () => {`
	`12`	`+const timeoutSpy = vi`
	`13`	`+.spyOn(globalThis, "setTimeout")`
	`14`	`+.mockReturnValue(1 as unknown as ReturnType<typeof setTimeout>);`
	`15`	`+vi.spyOn(globalThis, "clearTimeout").mockImplementation(() => undefined);`
	`16`	`+`
	`17`	`+await expect(`
	`18`	`+raceWithTimeout({`
	`19`	`+promise: Promise.resolve("ok"),`
	`20`	`+timeoutMs: Number.MAX_SAFE_INTEGER,`
	`21`	`+onTimeout: () => "timeout",`
	`22`	`+}),`
	`23`	`+).resolves.toBe("ok");`
	`24`	`+`
	`25`	`+expect(timeoutSpy).toHaveBeenCalledWith(expect.any(Function), MAX_TIMER_TIMEOUT_MS);`
	`26`	`+});`
	`27`	`+`
	`28`	`+it("caps withAbortTimeout timers before arming the watchdog", async () => {`
	`29`	`+const timeoutSpy = vi`
	`30`	`+.spyOn(globalThis, "setTimeout")`
	`31`	`+.mockReturnValue(1 as unknown as ReturnType<typeof setTimeout>);`
	`32`	`+vi.spyOn(globalThis, "clearTimeout").mockImplementation(() => undefined);`
	`33`	`+`
	`34`	`+await expect(`
	`35`	`+withAbortTimeout({`
	`36`	`+timeoutMs: Number.MAX_SAFE_INTEGER,`
	`37`	`+createTimeoutError: () => new Error("timed out"),`
	`38`	`+run: async () => "ok",`
	`39`	`+}),`
	`40`	`+).resolves.toBe("ok");`
	`41`	`+`
	`42`	`+expect(timeoutSpy).toHaveBeenCalledWith(expect.any(Function), MAX_TIMER_TIMEOUT_MS);`
	`43`	`+});`
	`44`	`+});`

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";`
	`2`	`+`
`1`	`3`	`// Compatibility constants for existing imports. Discord no longer enforces`
`2`	`4`	`// channel-owned listener or inbound run timeouts.`
`3`	`5`	`export const DISCORD_DEFAULT_LISTENER_TIMEOUT_MS = 120_000;`
`@@ -43,9 +45,10 @@ export async function raceWithTimeout<T, U>(params: {`
`43`	`45`	`timeoutMs: number;`
`44`	`46`	`onTimeout: () => U;`
`45`	`47`	`}): Promise<T \| U> {`
	`48`	`+const timeoutMs = resolveTimerTimeoutMs(params.timeoutMs, 1);`
`46`	`49`	`let timeoutTimer: ReturnType<typeof setTimeout> \| undefined;`
`47`	`50`	`const timeoutPromise = new Promise<U>((resolve) => {`
`48`		`-timeoutTimer = setTimeout(() => resolve(params.onTimeout()), Math.max(1, params.timeoutMs));`
	`51`	`+timeoutTimer = setTimeout(() => resolve(params.onTimeout()), timeoutMs);`
`49`	`52`	`timeoutTimer.unref?.();`
`50`	`53`	`});`
`51`	`54`	`try {`
`@@ -62,16 +65,14 @@ export async function withAbortTimeout<T>(params: {`
`62`	`65`	`createTimeoutError: () => Error;`
`63`	`66`	`run: (signal: AbortSignal) => Promise<T>;`
`64`	`67`	`}): Promise<T> {`
	`68`	`+const timeoutMs = resolveTimerTimeoutMs(params.timeoutMs, 1);`
`65`	`69`	`const controller = new AbortController();`
`66`	`70`	`let timeoutTimer: ReturnType<typeof setTimeout> \| undefined;`
`67`	`71`	`const timeoutPromise = new Promise<never>((_, reject) => {`
`68`		`-timeoutTimer = setTimeout(`
`69`		`-() => {`
`70`		`-controller.abort();`
`71`		`-reject(params.createTimeoutError());`
`72`		`-},`
`73`		`-Math.max(1, params.timeoutMs),`
`74`		`-);`
	`72`	`+timeoutTimer = setTimeout(() => {`
	`73`	`+controller.abort();`
	`74`	`+reject(params.createTimeoutError());`
	`75`	`+}, timeoutMs);`
`75`	`76`	`timeoutTimer.unref?.();`
`76`	`77`	`});`
`77`	`78`	`try {`

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

推荐订阅源

Recent Commits to openclaw:main

File tree