fix(browser): centralize snapshot numeric parsing · openc...

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
`@@ -1,5 +1,6 @@`
`1`	`1`	`import { describe, expect, it } from "vitest";`
`2`	`2`	`import type { ResolvedBrowserProfile } from "../config.js";`
	`3`	`+import { DEFAULT_AI_SNAPSHOT_MAX_CHARS } from "../constants.js";`
`3`	`4`	`import { resolveSnapshotPlan } from "./agent.snapshot.plan.js";`
`4`	`5`
`5`	`6`	`function profile(driver: "existing-session" \| "openclaw"): ResolvedBrowserProfile {`
`@@ -68,6 +69,70 @@ describe("resolveSnapshotPlan", () => {`
`68`	`69`	`expect(plan.timeoutMs).toBe(2_147_483_647);`
`69`	`70`	`});`
`70`	`71`
	`72`	`+it("parses snapshot numeric query options as strict integers", () => {`
	`73`	`+const plan = resolveSnapshotPlan({`
	`74`	`+profile: profile("openclaw"),`
	`75`	`+query: {`
	`76`	`+limit: "25",`
	`77`	`+maxChars: "5000",`
	`78`	`+depth: "2",`
	`79`	`+timeoutMs: "12345",`
	`80`	`+},`
	`81`	`+hasPlaywright: true,`
	`82`	`+});`
	`83`	`+`
	`84`	`+expect(plan.limit).toBe(25);`
	`85`	`+expect(plan.resolvedMaxChars).toBe(5000);`
	`86`	`+expect(plan.depth).toBe(2);`
	`87`	`+expect(plan.timeoutMs).toBe(12345);`
	`88`	`+});`
	`89`	`+`
	`90`	`+it("accepts structured numeric snapshot query options from proxy dispatch", () => {`
	`91`	`+const plan = resolveSnapshotPlan({`
	`92`	`+profile: profile("openclaw"),`
	`93`	`+query: {`
	`94`	`+limit: 25,`
	`95`	`+maxChars: 5000,`
	`96`	`+depth: 2,`
	`97`	`+timeoutMs: 12345,`
	`98`	`+},`
	`99`	`+hasPlaywright: true,`
	`100`	`+});`
	`101`	`+`
	`102`	`+expect(plan.limit).toBe(25);`
	`103`	`+expect(plan.resolvedMaxChars).toBe(5000);`
	`104`	`+expect(plan.depth).toBe(2);`
	`105`	`+expect(plan.timeoutMs).toBe(12345);`
	`106`	`+});`
	`107`	`+`
	`108`	`+it("rejects loose snapshot numeric query tokens", () => {`
	`109`	`+const plan = resolveSnapshotPlan({`
	`110`	`+profile: profile("openclaw"),`
	`111`	`+query: {`
	`112`	`+limit: "0x10",`
	`113`	`+maxChars: "1.5",`
	`114`	`+depth: "1e0",`
	`115`	`+timeoutMs: "1000ms",`
	`116`	`+},`
	`117`	`+hasPlaywright: true,`
	`118`	`+});`
	`119`	`+`
	`120`	`+expect(plan.limit).toBeUndefined();`
	`121`	`+expect(plan.resolvedMaxChars).toBe(DEFAULT_AI_SNAPSHOT_MAX_CHARS);`
	`122`	`+expect(plan.depth).toBeUndefined();`
	`123`	`+expect(plan.timeoutMs).toBeUndefined();`
	`124`	`+});`
	`125`	`+`
	`126`	`+it("keeps maxChars zero as an explicit uncapped snapshot request", () => {`
	`127`	`+const plan = resolveSnapshotPlan({`
	`128`	`+profile: profile("openclaw"),`
	`129`	`+query: { maxChars: "0" },`
	`130`	`+hasPlaywright: true,`
	`131`	`+});`
	`132`	`+`
	`133`	`+expect(plan.resolvedMaxChars).toBeUndefined();`
	`134`	`+});`
	`135`	`+`
`71`	`136`	`it("ignores non-positive timeoutMs values", () => {`
`72`	`137`	`expect(`
`73`	`138`	`resolveSnapshotPlan({`

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`import {`
`2`		`-normalizeOptionalString,`
`3`		`-readStringValue,`
`4`		`-} from "openclaw/plugin-sdk/string-coerce-runtime";`
	`2`	`+parseStrictNonNegativeInteger,`
	`3`	`+parseStrictPositiveInteger,`
	`4`	`+} from "openclaw/plugin-sdk/number-runtime";`
	`5`	`+import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";`
`5`	`6`	`import type { ResolvedBrowserProfile } from "../config.js";`
`6`	`7`	`import {`
`7`	`8`	`DEFAULT_AI_SNAPSHOT_EFFICIENT_DEPTH,`
`@@ -14,7 +15,7 @@ import {`
`14`	`15`	`shouldUsePlaywrightForScreenshot,`
`15`	`16`	`} from "../profile-capabilities.js";`
`16`	`17`	`import { normalizeBrowserTimerDelayMs } from "../timer-delay.js";`
`17`		`-import { toBoolean, toNumber, toStringOrEmpty } from "./utils.js";`
	`18`	`+import { toBoolean, toStringOrEmpty } from "./utils.js";`
`18`	`19`
`19`	`20`	`type BrowserSnapshotPlan = {`
`20`	`21`	`format: "ai" \| "aria";`
`@@ -49,25 +50,25 @@ export function resolveSnapshotPlan(params: {`
`49`	`50`	`explicitFormat,`
`50`	`51`	`mode,`
`51`	`52`	`});`
`52`		`-const limitRaw = readStringValue(params.query.limit);`
	`53`	`+const limit = parseStrictPositiveInteger(params.query.limit);`
`53`	`54`	`const hasMaxChars = Object.hasOwn(params.query, "maxChars");`
`54`		`-const maxCharsRaw = readStringValue(params.query.maxChars);`
`55`		`-const limit = Number.isFinite(Number(limitRaw)) ? Number(limitRaw) : undefined;`
`56`		`-const maxChars =`
`57`		`-Number.isFinite(Number(maxCharsRaw)) && Number(maxCharsRaw) > 0`
`58`		`- ? Math.floor(Number(maxCharsRaw))`
`59`		`- : undefined;`
	`55`	`+const maxCharsRaw = parseStrictNonNegativeInteger(params.query.maxChars);`
	`56`	`+const maxChars = maxCharsRaw !== undefined && maxCharsRaw > 0 ? maxCharsRaw : undefined;`
`60`	`57`	`const resolvedMaxChars =`
`61`	`58`	`format === "ai"`
`62`	`59`	`? hasMaxChars`
`63`		`- ? maxChars`
	`60`	`+ ? maxCharsRaw === undefined`
	`61`	`+ ? mode === "efficient"`
	`62`	`+ ? DEFAULT_AI_SNAPSHOT_EFFICIENT_MAX_CHARS`
	`63`	`+ : DEFAULT_AI_SNAPSHOT_MAX_CHARS`
	`64`	`+ : maxChars`
`64`	`65`	`: mode === "efficient"`
`65`	`66`	`? DEFAULT_AI_SNAPSHOT_EFFICIENT_MAX_CHARS`
`66`	`67`	`: DEFAULT_AI_SNAPSHOT_MAX_CHARS`
`67`	`68`	`: undefined;`
`68`	`69`	`const interactiveRaw = toBoolean(params.query.interactive);`
`69`	`70`	`const compactRaw = toBoolean(params.query.compact);`
`70`		`-const depthRaw = toNumber(params.query.depth);`
	`71`	`+const depthRaw = parseStrictNonNegativeInteger(params.query.depth);`
`71`	`72`	`const refsModeRaw = toStringOrEmpty(params.query.refs).trim();`
`72`	`73`	`const refsMode: "aria" \| "role" \| undefined =`
`73`	`74`	`refsModeRaw === "aria" ? "aria" : refsModeRaw === "role" ? "role" : undefined;`
`@@ -77,11 +78,9 @@ export function resolveSnapshotPlan(params: {`
`77`	`78`	`depthRaw ?? (mode === "efficient" ? DEFAULT_AI_SNAPSHOT_EFFICIENT_DEPTH : undefined);`
`78`	`79`	`const selectorValue = normalizeOptionalString(toStringOrEmpty(params.query.selector));`
`79`	`80`	`const frameSelectorValue = normalizeOptionalString(toStringOrEmpty(params.query.frame));`
`80`		`-const timeoutMsRaw = toNumber(params.query.timeoutMs);`
	`81`	`+const timeoutMsRaw = parseStrictPositiveInteger(params.query.timeoutMs);`
`81`	`82`	`const timeoutMs =`
`82`		`-timeoutMsRaw !== undefined && Number.isFinite(timeoutMsRaw) && timeoutMsRaw > 0`
`83`		`- ? normalizeBrowserTimerDelayMs(timeoutMsRaw)`
`84`		`- : undefined;`
	`83`	`+timeoutMsRaw !== undefined ? normalizeBrowserTimerDelayMs(timeoutMsRaw) : undefined;`
`85`	`84`
`86`	`85`	`return {`
`87`	`86`	`format,`

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

推荐订阅源

Recent Commits to openclaw:main