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

推荐订阅源

Hugging Face - Blog
Hugging Face - Blog
量子位
H
Help Net Security
Microsoft Azure Blog
Microsoft Azure Blog
MongoDB | Blog
MongoDB | Blog
小众软件
小众软件
爱范儿
爱范儿
博客园 - 【当耐特】
Vercel News
Vercel News
S
SegmentFault 最新的问题
M
MIT News - Artificial intelligence
F
Fortinet All Blogs
Apple Machine Learning Research
Apple Machine Learning Research
GbyAI
GbyAI
博客园 - 叶小钗
博客园_首页
V
Visual Studio Blog
宝玉的分享
宝玉的分享
B
Blog
MyScale Blog
MyScale Blog
C
Check Point Blog
博客园 - 三生石上(FineUI控件)
L
LangChain Blog
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(browser): cap route timer delays · openclaw/openclaw@...
steipete · 2026-05-29 · via Recent Commits to openclaw:main
Original file line numberDiff line numberDiff line change

@@ -16,6 +16,7 @@ import { CDP_HTTP_REQUEST_TIMEOUT_MS, CDP_WS_HANDSHAKE_TIMEOUT_MS } from "./cdp-

1616

import { BrowserCdpEndpointBlockedError } from "./errors.js";

1717

import { resolveBrowserRateLimitMessage } from "./rate-limit-message.js";

1818

import { withAllowedHostname } from "./ssrf-policy-helpers.js";

19+

import { normalizeBrowserTimerDelayMs } from "./timer-delay.js";

1920
2021

export { isLoopbackHost };

2122

export { parseBrowserHttpUrl, redactCdpUrl };

@@ -196,7 +197,7 @@ function createCdpSender(ws: WebSocket, opts?: { commandTimeoutMs?: number }) {

196197

const pending = new Map<number, Pending>();

197198

const commandTimeoutMs =

198199

typeof opts?.commandTimeoutMs === "number" && Number.isFinite(opts.commandTimeoutMs)

199-

? Math.max(1, Math.floor(opts.commandTimeoutMs))

200+

? normalizeBrowserTimerDelayMs(opts.commandTimeoutMs)

200201

: undefined;

201202
202203

const clearPendingTimer = (p: Pending) => {

@@ -306,7 +307,7 @@ export async function fetchCdpChecked(

306307

ssrfPolicy?: SsrFPolicy,

307308

): Promise<CdpFetchResult> {

308309

const ctrl = new AbortController();

309-

const t = setTimeout(ctrl.abort.bind(ctrl), timeoutMs);

310+

const t = setTimeout(ctrl.abort.bind(ctrl), normalizeBrowserTimerDelayMs(timeoutMs));

310311

let guardedRelease: (() => Promise<void>) | undefined;

311312

let released = false;

312313

const release = async () => {

Original file line numberDiff line numberDiff line change

@@ -58,6 +58,16 @@ describe("resolveSnapshotPlan", () => {

5858

expect(plan.timeoutMs).toBe(12345);

5959

});

6060
61+

it("caps timeoutMs from the snapshot query string to Node's safe timer range", () => {

62+

const plan = resolveSnapshotPlan({

63+

profile: profile("openclaw"),

64+

query: { timeoutMs: "3000000000" },

65+

hasPlaywright: true,

66+

});

67+
68+

expect(plan.timeoutMs).toBe(2_147_483_647);

69+

});

70+
6171

it("ignores non-positive timeoutMs values", () => {

6272

expect(

6373

resolveSnapshotPlan({

Original file line numberDiff line numberDiff line change

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

1313

shouldUsePlaywrightForAriaSnapshot,

1414

shouldUsePlaywrightForScreenshot,

1515

} from "../profile-capabilities.js";

16+

import { normalizeBrowserTimerDelayMs } from "../timer-delay.js";

1617

import { toBoolean, toNumber, toStringOrEmpty } from "./utils.js";

1718
1819

type BrowserSnapshotPlan = {

@@ -79,7 +80,7 @@ export function resolveSnapshotPlan(params: {

7980

const timeoutMsRaw = toNumber(params.query.timeoutMs);

8081

const timeoutMs =

8182

timeoutMsRaw !== undefined && Number.isFinite(timeoutMsRaw) && timeoutMsRaw > 0

82-

? Math.max(1, Math.floor(timeoutMsRaw))

83+

? normalizeBrowserTimerDelayMs(timeoutMsRaw)

8384

: undefined;

8485
8586

return {

Original file line numberDiff line numberDiff line change

@@ -72,7 +72,24 @@ vi.mock("./agent.shared.js", () => ({

7272

requirePwAi: vi.fn(async () => null),

7373

resolveProfileContext: vi.fn(() => profileContext),

7474

withPlaywrightRouteContext: vi.fn(),

75-

withRouteTabContext: vi.fn(),

75+

withRouteTabContext: vi.fn(

76+

async (params: {

77+

run: (ctx: {

78+

profileCtx: typeof profileContext;

79+

tab: { targetId: string; url: string; wsUrl: string };

80+

cdpUrl: string;

81+

}) => Promise<void>;

82+

}) =>

83+

await params.run({

84+

profileCtx: profileContext,

85+

tab: {

86+

targetId: "tab-1",

87+

url: "https://example.com",

88+

wsUrl: "ws://127.0.0.1:18800/devtools/page/tab-1",

89+

},

90+

cdpUrl: "http://127.0.0.1:18800",

91+

}),

92+

),

7693

}));

7794
7895

const { registerBrowserAgentSnapshotRoutes } = await import("./agent.snapshot.js");

@@ -87,6 +104,16 @@ function getSnapshotHandler() {

87104

return handler;

88105

}

89106
107+

function getScreenshotHandler() {

108+

const { app, postHandlers } = createBrowserRouteApp();

109+

registerBrowserAgentSnapshotRoutes(app, {

110+

state: () => ({ resolved: { extraArgs: [] } }),

111+

} as never);

112+

const handler = postHandlers.get("/screenshot");

113+

expect(handler).toBeTypeOf("function");

114+

return handler;

115+

}

116+
90117

describe("browser agent snapshot timeout routing", () => {

91118

beforeEach(() => {

92119

cdpMocks.captureScreenshot.mockClear();

@@ -124,4 +151,22 @@ describe("browser agent snapshot timeout routing", () => {

124151

}),

125152

);

126153

});

154+
155+

it("caps screenshot timeoutMs before dispatching to CDP", async () => {

156+

cdpMocks.captureScreenshot.mockResolvedValueOnce(Buffer.from("png"));

157+

const handler = getScreenshotHandler();

158+

const response = createBrowserRouteResponse();

159+
160+

await handler?.(

161+

{ params: {}, query: {}, body: { type: "png", timeoutMs: 3_000_000_000 } },

162+

response.res,

163+

);

164+
165+

expect(response.statusCode).toBe(200);

166+

expect(cdpMocks.captureScreenshot).toHaveBeenCalledWith(

167+

expect.objectContaining({

168+

timeoutMs: 2_147_483_647,

169+

}),

170+

);

171+

});

127172

});

Original file line numberDiff line numberDiff line change

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

2626

normalizeBrowserScreenshot,

2727

} from "../screenshot.js";

2828

import type { BrowserRouteContext, ProfileContext } from "../server-context.js";

29+

import { normalizeBrowserTimerDelayMs } from "../timer-delay.js";

2930

import {

3031

getPwAiModule,

3132

handleRouteError,

@@ -370,7 +371,7 @@ export function registerBrowserAgentSnapshotRoutes(

370371

const timeoutMsRaw = toNumber(body.timeoutMs);

371372

const timeoutMs =

372373

timeoutMsRaw !== undefined

373-

? Math.max(1, Math.floor(timeoutMsRaw))

374+

? normalizeBrowserTimerDelayMs(timeoutMsRaw)

374375

: DEFAULT_BROWSER_SCREENSHOT_TIMEOUT_MS;

375376
376377

if (fullPage && (ref || element)) {

Original file line numberDiff line numberDiff line change

@@ -0,0 +1,14 @@

1+

import { describe, expect, it } from "vitest";

2+

import { MAX_SAFE_TIMEOUT_DELAY_MS, normalizeBrowserTimerDelayMs } from "./timer-delay.js";

3+
4+

describe("normalizeBrowserTimerDelayMs", () => {

5+

it("caps timers to Node's safe delay range", () => {

6+

expect(normalizeBrowserTimerDelayMs(3_000_000_000)).toBe(MAX_SAFE_TIMEOUT_DELAY_MS);

7+

});

8+
9+

it("preserves positive integer timers and applies the minimum", () => {

10+

expect(normalizeBrowserTimerDelayMs(1234.9)).toBe(1234);

11+

expect(normalizeBrowserTimerDelayMs(-5)).toBe(1);

12+

expect(normalizeBrowserTimerDelayMs(0, { minMs: 0 })).toBe(0);

13+

});

14+

});

Original file line numberDiff line numberDiff line change

@@ -0,0 +1,11 @@

1+

export const MAX_SAFE_TIMEOUT_DELAY_MS = 2_147_483_647;

2+
3+

export function normalizeBrowserTimerDelayMs(timeoutMs: number, opts?: { minMs?: number }): number {

4+

const rawMinMs = opts?.minMs ?? 1;

5+

const minMs = Math.min(

6+

MAX_SAFE_TIMEOUT_DELAY_MS,

7+

Math.max(0, Number.isFinite(rawMinMs) ? Math.floor(rawMinMs) : 1),

8+

);

9+

const candidateMs = Number.isFinite(timeoutMs) ? Math.floor(timeoutMs) : minMs;

10+

return Math.min(MAX_SAFE_TIMEOUT_DELAY_MS, Math.max(minMs, candidateMs));

11+

}

Original file line numberDiff line numberDiff line change

@@ -3,10 +3,9 @@ import {

33

BROWSER_REQUEST_GATEWAY_METHOD,

44

BROWSER_REQUEST_GATEWAY_SCOPES,

55

} from "../browser-gateway-contract.js";

6+

import { normalizeBrowserTimerDelayMs } from "../browser/timer-delay.js";

67

import { callGatewayFromCli, type GatewayRpcOpts } from "./core-api.js";

78
8-

const MAX_SAFE_TIMEOUT_DELAY_MS = 2_147_483_647;

9-
109

export type BrowserParentOpts = GatewayRpcOpts & {

1110

json?: boolean;

1211

browserProfile?: string;

@@ -45,20 +44,16 @@ function parsePositiveInteger(raw: string, flag: string): number {

4544

return parsed;

4645

}

4746
48-

function normalizeCliTimeoutMs(timeoutMs: number): number {

49-

return Math.min(MAX_SAFE_TIMEOUT_DELAY_MS, Math.max(1, Math.floor(timeoutMs)));

50-

}

51-
5247

export async function callBrowserRequest<T>(

5348

opts: BrowserParentOpts,

5449

params: BrowserRequestParams,

5550

extra?: { timeoutMs?: number; progress?: boolean },

5651

): Promise<T> {

5752

const resolvedTimeoutMs =

5853

typeof extra?.timeoutMs === "number" && Number.isFinite(extra.timeoutMs)

59-

? normalizeCliTimeoutMs(extra.timeoutMs)

54+

? normalizeBrowserTimerDelayMs(extra.timeoutMs)

6055

: typeof opts.timeout === "string"

61-

? normalizeCliTimeoutMs(parsePositiveInteger(opts.timeout, "--timeout"))

56+

? normalizeBrowserTimerDelayMs(parsePositiveInteger(opts.timeout, "--timeout"))

6257

: undefined;

6358

const resolvedTimeout =

6459

typeof resolvedTimeoutMs === "number" && Number.isFinite(resolvedTimeoutMs)