refactor(browser): centralize route numeric readers · openclaw/openclaw@24614ac

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,8 +1,3 @@`
`1`		`-import {`
`2`		`-parseStrictInteger,`
`3`		`-parseStrictNonNegativeInteger,`
`4`		`-parseStrictPositiveInteger,`
`5`		`-} from "openclaw/plugin-sdk/number-runtime";`
`6`	`1`	`import {`
`7`	`2`	`ACT_MAX_BATCH_ACTIONS,`
`8`	`3`	`ACT_MAX_CLICK_DELAY_MS,`
`@@ -18,6 +13,11 @@ import {`
`18`	`13`	`parseClickButton,`
`19`	`14`	`parseClickModifiers,`
`20`	`15`	`} from "./agent.act.shared.js";`
	`16`	`+import {`
	`17`	`+readRouteInteger,`
	`18`	`+readRouteNonNegativeInteger,`
	`19`	`+readRoutePositiveInteger,`
	`20`	`+} from "./route-numeric.js";`
`21`	`21`	`import { toBoolean, toNumber, toStringArray, toStringOrEmpty } from "./utils.js";`
`22`	`22`
`23`	`23`	`function normalizeActKind(raw: unknown): ActKind {`
`@@ -77,22 +77,14 @@ function normalizeBatchAction(value: unknown): BrowserActRequest {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`function readActionPositiveInteger(body: Record<string, unknown>, key: string): number \| undefined {`
`80`		`-const value = parseStrictPositiveInteger(body[key]);`
`81`		`-if (value === undefined && body[key] != null) {`
`82`		-throw new Error(`${key} must be a positive integer.`);
`83`		`-}`
`84`		`-return value;`
	`80`	`+return readRoutePositiveInteger(body[key], key);`
`85`	`81`	`}`
`86`	`82`
`87`	`83`	`function readActionNonNegativeInteger(`
`88`	`84`	`body: Record<string, unknown>,`
`89`	`85`	`key: string,`
`90`	`86`	`): number \| undefined {`
`91`		`-const value = parseStrictNonNegativeInteger(body[key]);`
`92`		`-if (value === undefined && body[key] != null) {`
`93`		-throw new Error(`${key} must be a non-negative integer.`);
`94`		`-}`
`95`		`-return value;`
	`87`	`+return readRouteNonNegativeInteger(body[key], key);`
`96`	`88`	`}`
`97`	`89`
`98`	`90`	`function readActionTimeoutMs(body: Record<string, unknown>): number \| undefined {`
`@@ -113,7 +105,9 @@ function readBoundedActionDurationMs(`
`113`	`105`	`}`
`114`	`106`
`115`	`107`	`function readResizeDimension(body: Record<string, unknown>, key: "width" \| "height") {`
`116`		`-const value = parseStrictInteger(body[key]);`
	`108`	`+const value = readRouteInteger(body[key], key, {`
	`109`	`+invalidMessage: "resize requires positive width and height",`
	`110`	`+});`
`117`	`111`	`if (value === undefined && Object.hasOwn(body, key)) {`
`118`	`112`	`throw new Error("resize requires positive width and height");`
`119`	`113`	`}`

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import {`
`10`	`10`	`resolveTargetIdFromQuery,`
`11`	`11`	`withPlaywrightRouteContext,`
`12`	`12`	`} from "./agent.shared.js";`
`13`		`-import { readRouteFiniteNumber } from "./route-numeric.js";`
	`13`	`+import { readOptionalRouteFiniteNumber, readRouteFiniteNumber } from "./route-numeric.js";`
`14`	`14`	`import type { BrowserRequest, BrowserResponse, BrowserRouteRegistrar } from "./types.js";`
`15`	`15`	`import { asyncBrowserRoute, jsonError, toBoolean, toStringOrEmpty } from "./utils.js";`
`16`	`16`
`@@ -104,13 +104,6 @@ function assertRange(`
`104`	`104`	`return value;`
`105`	`105`	`}`
`106`	`106`
`107`		`-function readOptionalRouteFiniteNumber(value: unknown, fieldName: string): number \| undefined {`
`108`		`-if (typeof value === "string" && value.trim() === "") {`
`109`		`-return undefined;`
`110`		`-}`
`111`		`-return readRouteFiniteNumber(value, fieldName);`
`112`		`-}`
`113`		`-`
`114`	`107`	`export function parseCookieSetOptions(cookie: Record<string, unknown>): CookieSetOptions {`
`115`	`108`	`return {`
`116`	`109`	`name: toStringOrEmpty(cookie.name),`

Original file line number	Diff line number	Diff line change
`@@ -1,24 +1,64 @@`
`1`	`1`	`import {`
`2`	`2`	`parseStrictFiniteNumber,`
	`3`	`+parseStrictInteger,`
	`4`	`+parseStrictNonNegativeInteger,`
`3`	`5`	`parseStrictPositiveInteger,`
`4`	`6`	`} from "openclaw/plugin-sdk/number-runtime";`
`5`	`7`
`6`		`-function hasInputValue(value: unknown): boolean {`
	`8`	`+function hasRouteInputValue(value: unknown): boolean {`
`7`	`9`	`return value != null;`
`8`	`10`	`}`
`9`	`11`
`10`	`12`	`export function readRouteFiniteNumber(value: unknown, fieldName: string): number \| undefined {`
`11`	`13`	`const parsed = parseStrictFiniteNumber(value);`
`12`		`-if (parsed === undefined && hasInputValue(value)) {`
	`14`	`+if (parsed === undefined && hasRouteInputValue(value)) {`
`13`	`15`	throw new Error(`${fieldName} must be a finite number.`);
`14`	`16`	`}`
`15`	`17`	`return parsed;`
`16`	`18`	`}`
`17`	`19`
`18`		`-export function readRoutePositiveInteger(value: unknown, fieldName: string): number \| undefined {`
	`20`	`+export function readOptionalRouteFiniteNumber(`
	`21`	`+value: unknown,`
	`22`	`+fieldName: string,`
	`23`	`+): number \| undefined {`
	`24`	`+if (typeof value === "string" && value.trim() === "") {`
	`25`	`+return undefined;`
	`26`	`+}`
	`27`	`+return readRouteFiniteNumber(value, fieldName);`
	`28`	`+}`
	`29`	`+`
	`30`	`+export function readRouteInteger(`
	`31`	`+value: unknown,`
	`32`	`+fieldName: string,`
	`33`	`+options?: { invalidMessage?: string },`
	`34`	`+): number \| undefined {`
	`35`	`+const parsed = parseStrictInteger(value);`
	`36`	`+if (parsed === undefined && hasRouteInputValue(value)) {`
	`37`	+throw new Error(options?.invalidMessage ?? `${fieldName} must be an integer.`);
	`38`	`+}`
	`39`	`+return parsed;`
	`40`	`+}`
	`41`	`+`
	`42`	`+export function readRoutePositiveInteger(`
	`43`	`+value: unknown,`
	`44`	`+fieldName: string,`
	`45`	`+options?: { invalidMessage?: string },`
	`46`	`+): number \| undefined {`
`19`	`47`	`const parsed = parseStrictPositiveInteger(value);`
`20`		`-if (parsed === undefined && hasInputValue(value)) {`
`21`		-throw new Error(`${fieldName} must be a positive integer.`);
	`48`	`+if (parsed === undefined && hasRouteInputValue(value)) {`
	`49`	+throw new Error(options?.invalidMessage ?? `${fieldName} must be a positive integer.`);
	`50`	`+}`
	`51`	`+return parsed;`
	`52`	`+}`
	`53`	`+`
	`54`	`+export function readRouteNonNegativeInteger(`
	`55`	`+value: unknown,`
	`56`	`+fieldName: string,`
	`57`	`+options?: { invalidMessage?: string },`
	`58`	`+): number \| undefined {`
	`59`	`+const parsed = parseStrictNonNegativeInteger(value);`
	`60`	`+if (parsed === undefined && hasRouteInputValue(value)) {`
	`61`	+throw new Error(options?.invalidMessage ?? `${fieldName} must be a non-negative integer.`);
`22`	`62`	`}`
`23`	`63`	`return parsed;`
`24`	`64`	`}`

Original file line number	Diff line number	Diff line change
`@@ -346,11 +346,17 @@ describe("browser tab routes", () => {`
`346`	`346`	`body: { action: "select", index: "1e0" },`
`347`	`347`	`profileCtx,`
`348`	`348`	`});`
	`349`	`+const nullSelectResponse = await callTabsAction({`
	`350`	`+body: { action: "select", index: null },`
	`351`	`+ profileCtx,`
	`352`	`+});`
`349`	`353`
`350`	`354`	`expect(closeResponse.statusCode).toBe(400);`
`351`	`355`	`expect(closeResponse.body).toEqual({ error: "index must be a non-negative integer" });`
`352`	`356`	`expect(selectResponse.statusCode).toBe(400);`
`353`	`357`	`expect(selectResponse.body).toEqual({ error: "index must be a non-negative integer" });`
	`358`	`+expect(nullSelectResponse.statusCode).toBe(400);`
	`359`	`+expect(nullSelectResponse.body).toEqual({ error: "index must be a non-negative integer" });`
`354`	`360`	`expect(profileCtx.closeTab).not.toHaveBeenCalled();`
`355`	`361`	`expect(profileCtx.focusTab).not.toHaveBeenCalled();`
`356`	`362`	`});`

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import { parseStrictNonNegativeInteger } from "openclaw/plugin-sdk/number-runtime";`
`2`	`1`	`import {`
`3`	`2`	`BrowserProfileUnavailableError,`
`4`	`3`	`BrowserTabNotFoundError,`
`@@ -12,6 +11,7 @@ import {`
`12`	`11`	`import type { BrowserRouteContext, ProfileContext } from "../server-context.js";`
`13`	`12`	`import { resolveTargetIdFromTabs } from "../target-id.js";`
`14`	`13`	`import { browserNavigationPolicyForProfile, resolveProfileContext } from "./agent.shared.js";`
	`14`	`+import { readRouteNonNegativeInteger } from "./route-numeric.js";`
`15`	`15`	`import type { BrowserRequest, BrowserResponse, BrowserRouteRegistrar } from "./types.js";`
`16`	`16`	`import { asyncBrowserRoute, jsonError, toStringOrEmpty } from "./utils.js";`
`17`	`17`
`@@ -122,12 +122,18 @@ function readTabIndex(`
`122`	`122`	`}`
`123`	`123`	`return undefined;`
`124`	`124`	`}`
`125`		`-const index = parseStrictNonNegativeInteger(record.index);`
`126`		`-if (index === undefined) {`
	`125`	`+if (record.index == null) {`
`127`	`126`	`jsonError(res, 400, "index must be a non-negative integer");`
`128`	`127`	`return null;`
`129`	`128`	`}`
`130`		`-return index;`
	`129`	`+try {`
	`130`	`+return readRouteNonNegativeInteger(record.index, "index", {`
	`131`	`+invalidMessage: "index must be a non-negative integer",`
	`132`	`+});`
	`133`	`+} catch (error) {`
	`134`	`+jsonError(res, 400, error instanceof Error ? error.message : String(error));`
	`135`	`+return null;`
	`136`	`+}`
`131`	`137`	`}`
`132`	`138`
`133`	`139`	`async function runTabTargetMutation(params: {`

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

推荐订阅源

Recent Commits to openclaw:main