fix: validate firecrawl numeric options · openclaw/openclaw@11ef608

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
`@@ -15,7 +15,7 @@ const FirecrawlScrapeToolSchema = Type.Object(`
`15`	`15`	`description: 'Extraction mode ("markdown" or "text"). Default: markdown.',`
`16`	`16`	`}),`
`17`	`17`	`maxChars: Type.Optional(`
`18`		`-Type.Number({`
	`18`	`+Type.Integer({`
`19`	`19`	`description: "Maximum characters to return.",`
`20`	`20`	`minimum: 100,`
`21`	`21`	`}),`
`@@ -26,7 +26,7 @@ const FirecrawlScrapeToolSchema = Type.Object(`
`26`	`26`	`}),`
`27`	`27`	`),`
`28`	`28`	`maxAgeMs: Type.Optional(`
`29`		`-Type.Number({`
	`29`	`+Type.Integer({`
`30`	`30`	`description: "Maximum Firecrawl cache age in milliseconds.",`
`31`	`31`	`minimum: 0,`
`32`	`32`	`}),`
`@@ -40,7 +40,7 @@ const FirecrawlScrapeToolSchema = Type.Object(`
`40`	`40`	`}),`
`41`	`41`	`),`
`42`	`42`	`timeoutSeconds: Type.Optional(`
`43`		`-Type.Number({`
	`43`	`+Type.Integer({`
`44`	`44`	`description: "Timeout in seconds for the Firecrawl scrape request.",`
`45`	`45`	`minimum: 1,`
`46`	`46`	`}),`
`@@ -60,10 +60,10 @@ export function createFirecrawlScrapeTool(api: OpenClawPluginApi) {`
`60`	`60`	`const url = readStringParam(rawParams, "url", { required: true });`
`61`	`61`	`const extractMode =`
`62`	`62`	`readStringParam(rawParams, "extractMode") === "text" ? "text" : "markdown";`
`63`		`-const maxChars = readNumberParam(rawParams, "maxChars", { integer: true });`
`64`		`-const maxAgeMs = readNumberParam(rawParams, "maxAgeMs", { integer: true });`
	`63`	`+const maxChars = readNumberParam(rawParams, "maxChars", { positiveInteger: true });`
	`64`	`+const maxAgeMs = readNumberParam(rawParams, "maxAgeMs", { nonNegativeInteger: true });`
`65`	`65`	`const timeoutSeconds = readNumberParam(rawParams, "timeoutSeconds", {`
`66`		`-integer: true,`
	`66`	`+positiveInteger: true,`
`67`	`67`	`});`
`68`	`68`	`const proxyRaw = readStringParam(rawParams, "proxy");`
`69`	`69`	`const proxy =`

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ const FirecrawlSearchToolSchema = Type.Object(`
`12`	`12`	`{`
`13`	`13`	`query: Type.String({ description: "Search query string." }),`
`14`	`14`	`count: Type.Optional(`
`15`		`-Type.Number({`
	`15`	`+Type.Integer({`
`16`	`16`	`description: "Number of results to return (1-10).",`
`17`	`17`	`minimum: 1,`
`18`	`18`	`maximum: 10,`
`@@ -34,7 +34,7 @@ const FirecrawlSearchToolSchema = Type.Object(`
`34`	`34`	`}),`
`35`	`35`	`),`
`36`	`36`	`timeoutSeconds: Type.Optional(`
`37`		`-Type.Number({`
	`37`	`+Type.Integer({`
`38`	`38`	`description: "Timeout in seconds for the Firecrawl Search request.",`
`39`	`39`	`minimum: 1,`
`40`	`40`	`}),`
`@@ -52,9 +52,9 @@ export function createFirecrawlSearchTool(api: OpenClawPluginApi) {`
`52`	`52`	`parameters: FirecrawlSearchToolSchema,`
`53`	`53`	`execute: async (_toolCallId: string, rawParams: Record<string, unknown>) => {`
`54`	`54`	`const query = readStringParam(rawParams, "query", { required: true });`
`55`		`-const count = readNumberParam(rawParams, "count", { integer: true });`
	`55`	`+const count = readNumberParam(rawParams, "count", { positiveInteger: true });`
`56`	`56`	`const timeoutSeconds = readNumberParam(rawParams, "timeoutSeconds", {`
`57`		`-integer: true,`
	`57`	`+positiveInteger: true,`
`58`	`58`	`});`
`59`	`59`	`const sources = readStringArrayParam(rawParams, "sources");`
`60`	`60`	`const categories = readStringArrayParam(rawParams, "categories");`

Original file line number	Diff line number	Diff line change
`@@ -489,6 +489,49 @@ describe("firecrawl tools", () => {`
`489`	`489`	`});`
`490`	`490`	`});`
`491`	`491`
	`492`	`+it("drops malformed numeric Firecrawl tool options", async () => {`
	`493`	`+const searchTool = createFirecrawlSearchTool({`
	`494`	`+config: { env: "test" },`
	`495`	`+} as never);`
	`496`	`+await searchTool.execute("call-search", {`
	`497`	`+query: "web search",`
	`498`	`+count: 6.5,`
	`499`	`+timeoutSeconds: Number.POSITIVE_INFINITY,`
	`500`	`+});`
	`501`	`+`
	`502`	`+expect(runFirecrawlSearch).toHaveBeenLastCalledWith({`
	`503`	`+cfg: { env: "test" },`
	`504`	`+query: "web search",`
	`505`	`+count: undefined,`
	`506`	`+timeoutSeconds: undefined,`
	`507`	`+sources: undefined,`
	`508`	`+categories: undefined,`
	`509`	`+scrapeResults: false,`
	`510`	`+});`
	`511`	`+`
	`512`	`+const scrapeTool = createFirecrawlScrapeTool({`
	`513`	`+config: { env: "test" },`
	`514`	`+} as never);`
	`515`	`+await scrapeTool.execute("call-scrape", {`
	`516`	`+url: "https://docs.openclaw.ai",`
	`517`	`+maxChars: 1500.5,`
	`518`	`+maxAgeMs: -1,`
	`519`	`+timeoutSeconds: 22.5,`
	`520`	`+});`
	`521`	`+`
	`522`	`+expect(runFirecrawlScrape).toHaveBeenLastCalledWith({`
	`523`	`+cfg: { env: "test" },`
	`524`	`+url: "https://docs.openclaw.ai",`
	`525`	`+extractMode: "markdown",`
	`526`	`+maxChars: undefined,`
	`527`	`+onlyMainContent: undefined,`
	`528`	`+maxAgeMs: undefined,`
	`529`	`+proxy: undefined,`
	`530`	`+storeInCache: undefined,`
	`531`	`+timeoutSeconds: undefined,`
	`532`	`+});`
	`533`	`+});`
	`534`	`+`
`492`	`535`	`it("passes text mode through and ignores invalid proxy values", async () => {`
`493`	`536`	`const tool = createFirecrawlScrapeTool({`
`494`	`537`	`config: { env: "test" },`

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,22 @@ describe("readNumberParam", () => {`
`74`	`74`	`}),`
`75`	`75`	`).toBeUndefined();`
`76`	`76`	`});`
	`77`	`+`
	`78`	`+it("accepts only nonnegative safe integers when nonNegativeInteger is true", () => {`
	`79`	`+expect(readNumberParam({ cacheAge: 0 }, "cacheAge", { nonNegativeInteger: true })).toBe(0);`
	`80`	`+expect(readNumberParam({ cacheAge: "42" }, "cacheAge", { nonNegativeInteger: true })).toBe(42);`
	`81`	`+expect(`
	`82`	`+readNumberParam({ cacheAge: "42.9" }, "cacheAge", { nonNegativeInteger: true }),`
	`83`	`+).toBeUndefined();`
	`84`	`+expect(`
	`85`	`+readNumberParam({ cacheAge: -1 }, "cacheAge", { nonNegativeInteger: true }),`
	`86`	`+).toBeUndefined();`
	`87`	`+expect(`
	`88`	`+readNumberParam({ cacheAge: Number.POSITIVE_INFINITY }, "cacheAge", {`
	`89`	`+nonNegativeInteger: true,`
	`90`	`+}),`
	`91`	`+).toBeUndefined();`
	`92`	`+});`
`77`	`93`	`});`
`78`	`94`
`79`	`95`	`describe("snake_case aliases", () => {`

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,7 @@ export function readNumberParam(`
`163`	`163`	`integer?: boolean;`
`164`	`164`	`strict?: boolean;`
`165`	`165`	`positiveInteger?: boolean;`
	`166`	`+nonNegativeInteger?: boolean;`
`166`	`167`	`} = {},`
`167`	`168`	`): number \| undefined {`
`168`	`169`	`const {`
`@@ -171,6 +172,7 @@ export function readNumberParam(`
`171`	`172`	`integer = false,`
`172`	`173`	`strict = false,`
`173`	`174`	`positiveInteger = false,`
	`175`	`+ nonNegativeInteger = false,`
`174`	`176`	`} = options;`
`175`	`177`	`const raw = readParamRaw(params, key);`
`176`	`178`	`let value: number \| undefined;`
`@@ -194,6 +196,9 @@ export function readNumberParam(`
`194`	`196`	`if (positiveInteger) {`
`195`	`197`	`return Number.isSafeInteger(value) && value > 0 ? value : undefined;`
`196`	`198`	`}`
	`199`	`+if (nonNegativeInteger) {`
	`200`	`+return Number.isSafeInteger(value) && value >= 0 ? value : undefined;`
	`201`	`+}`
`197`	`202`	`return integer ? Math.trunc(value) : value;`
`198`	`203`	`}`
`199`	`204`

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

推荐订阅源

Recent Commits to openclaw:main