fix: validate tool timeout integers · openclaw/openclaw@6...

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,6 +1,7 @@`
`1`	`1`	`import { describe, expect, it } from "vitest";`
`2`	`2`	`import {`
`3`	`3`	`createActionGate,`
	`4`	`+readPositiveIntegerParam,`
`4`	`5`	`readNumberParam,`
`5`	`6`	`readReactionParams,`
`6`	`7`	`readStringOrNumberParam,`
`@@ -90,6 +91,18 @@ describe("readNumberParam", () => {`
`90`	`91`	`}),`
`91`	`92`	`).toBeUndefined();`
`92`	`93`	`});`
	`94`	`+`
	`95`	`+it("throws for invalid present positive integer params", () => {`
	`96`	`+expect(readPositiveIntegerParam({ timeoutMs: "42" }, "timeoutMs")).toBe(42);`
	`97`	`+expect(() => readPositiveIntegerParam({ timeoutMs: "42.5" }, "timeoutMs")).toThrow(`
	`98`	`+"timeoutMs must be a positive integer",`
	`99`	`+);`
	`100`	`+expect(() =>`
	`101`	`+readPositiveIntegerParam({ timeoutMs: 0 }, "timeoutMs", {`
	`102`	`+message: "timeoutMs must be a positive integer in milliseconds.",`
	`103`	`+}),`
	`104`	`+).toThrow("timeoutMs must be a positive integer in milliseconds.");`
	`105`	`+});`
`93`	`106`	`});`
`94`	`107`
`95`	`108`	`describe("snake_case aliases", () => {`

Original file line number	Diff line number	Diff line change
`@@ -206,6 +206,23 @@ export function readNumberParam(`
`206`	`206`	`return integer ? Math.trunc(value) : value;`
`207`	`207`	`}`
`208`	`208`
	`209`	`+export function readPositiveIntegerParam(`
	`210`	`+params: Record<string, unknown>,`
	`211`	`+key: string,`
	`212`	`+options: {`
	`213`	`+message?: string;`
	`214`	`+} = {},`
	`215`	`+): number \| undefined {`
	`216`	`+const value = readNumberParam(params, key, {`
	`217`	`+positiveInteger: true,`
	`218`	`+strict: true,`
	`219`	`+});`
	`220`	`+if (value === undefined && readParamRaw(params, key) !== undefined) {`
	`221`	+throw new ToolInputError(options.message ?? `${key} must be a positive integer`);
	`222`	`+}`
	`223`	`+return value;`
	`224`	`+}`
	`225`	`+`
`209`	`226`	`export function readStringArrayParam(`
`210`	`227`	`params: Record<string, unknown>,`
`211`	`228`	`key: string,`

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ const ImageGenerateToolSchema = Type.Object({`
`200`	`200`	`}),`
`201`	`201`	`),`
`202`	`202`	`timeoutMs: Type.Optional(`
`203`		`-Type.Number({`
	`203`	`+Type.Integer({`
`204`	`204`	`description: "Provider timeout ms (300000 tends to be a safe amount).",`
`205`	`205`	`minimum: 1,`
`206`	`206`	`}),`

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,12 @@ import type { AgentModelConfig } from "../../config/types.agents-shared.js";`
`2`	`2`	`import type { OpenClawConfig } from "../../config/types.openclaw.js";`
`3`	`3`	`import type { SsrFPolicy } from "../../infra/net/ssrf.js";`
`4`	`4`	`import type { Model } from "../../llm/types.js";`
`5`		`-import { resolveChannelInboundAttachmentRootsForChannel } from "../../media/channel-inbound-roots.js";`
`6`		`-import { normalizeInboundPathRoots } from "../../media/inbound-path-policy.js";`
`7`	`5`	`import {`
`8`	`6`	`findCapabilityProviderById,`
`9`	`7`	`resolveCapabilityModelRefForProviders,`
`10`	`8`	`} from "../../media-generation/capability-model-ref.js";`
	`9`	`+import { resolveChannelInboundAttachmentRootsForChannel } from "../../media/channel-inbound-roots.js";`
	`10`	`+import { normalizeInboundPathRoots } from "../../media/inbound-path-policy.js";`
`11`	`11`	`import { getDefaultLocalRoots } from "../../media/local-media-access.js";`
`12`	`12`	`import { readSnakeCaseParamRaw } from "../../param-key.js";`
`13`	`13`	`import { loadCapabilityManifestSnapshot } from "../../plugins/capability-provider-runtime.js";`
`@@ -22,7 +22,7 @@ import { normalizeModelRef } from "../model-selection.js";`
`22`	`22`	`import { normalizeProviderId } from "../provider-id.js";`
`23`	`23`	`import {`
`24`	`24`	`ToolInputError,`
`25`		`-readNumberParam,`
	`25`	`+readPositiveIntegerParam,`
`26`	`26`	`readStringArrayParam,`
`27`	`27`	`readStringParam,`
`28`	`28`	`} from "./common.js";`
`@@ -99,17 +99,9 @@ export function applyMusicGenerationModelConfigDefaults(`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`export function readGenerationTimeoutMs(args: Record<string, unknown>): number \| undefined {`
`102`		`-const timeoutMs = readNumberParam(args, "timeoutMs", {`
`103`		`-integer: true,`
`104`		`-strict: true,`
	`102`	`+return readPositiveIntegerParam(args, "timeoutMs", {`
	`103`	`+message: "timeoutMs must be a positive integer in milliseconds.",`
`105`	`104`	`});`
`106`		`-if (timeoutMs === undefined) {`
`107`		`-return undefined;`
`108`		`-}`
`109`		`-if (timeoutMs <= 0) {`
`110`		`-throw new ToolInputError("timeoutMs must be a positive integer in milliseconds.");`
`111`		`-}`
`112`		`-return timeoutMs;`
`113`	`105`	`}`
`114`	`106`
`115`	`107`	`export function resolveRemoteMediaSsrfPolicy(`

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,22 @@ describe("createTtsTool", () => {`
`92`	`92`	`expect(requireRecord(result.details, "TTS result details").timeoutMs).toBe(12_345);`
`93`	`93`	`});`
`94`	`94`
	`95`	`+it("rejects fractional timeout before calling speech generation", async () => {`
	`96`	`+textToSpeechSpy.mockResolvedValue({`
	`97`	`+success: true,`
	`98`	`+audioPath: "/tmp/reply.opus",`
	`99`	`+provider: "test",`
	`100`	`+voiceCompatible: true,`
	`101`	`+});`
	`102`	`+`
	`103`	`+const tool = createTtsTool();`
	`104`	`+`
	`105`	`+await expect(tool.execute("call-1", { text: "hello", timeoutMs: 12_345.5 })).rejects.toThrow(`
	`106`	`+"timeoutMs must be a positive integer in milliseconds.",`
	`107`	`+);`
	`108`	`+expect(textToSpeechSpy).not.toHaveBeenCalled();`
	`109`	`+});`
	`110`	`+`
`95`	`111`	`it("passes the active agent id to speech generation", async () => {`
`96`	`112`	`textToSpeechSpy.mockResolvedValue({`
`97`	`113`	`success: true,`

Original file line number	Diff line number	Diff line change
`@@ -4,31 +4,23 @@ import type { OpenClawConfig } from "../../config/types.openclaw.js";`
`4`	`4`	`import { textToSpeech } from "../../tts/tts.js";`
`5`	`5`	`import type { GatewayMessageChannel } from "../../utils/message-channel.js";`
`6`	`6`	`import type { AnyAgentTool } from "./common.js";`
`7`		`-import { ToolInputError, readNumberParam, readStringParam } from "./common.js";`
	`7`	`+import { readPositiveIntegerParam, readStringParam } from "./common.js";`
`8`	`8`
`9`	`9`	`const TtsToolSchema = Type.Object({`
`10`	`10`	`text: Type.String({ description: "Text to speak." }),`
`11`	`11`	`channel: Type.Optional(Type.String({ description: "Channel id; output-format hint." })),`
`12`	`12`	`timeoutMs: Type.Optional(`
`13`		`-Type.Number({`
	`13`	`+Type.Integer({`
`14`	`14`	`description: "Provider timeout ms.",`
`15`	`15`	`minimum: 1,`
`16`	`16`	`}),`
`17`	`17`	`),`
`18`	`18`	`});`
`19`	`19`
`20`	`20`	`function readTtsTimeoutMs(args: Record<string, unknown>): number \| undefined {`
`21`		`-const timeoutMs = readNumberParam(args, "timeoutMs", {`
`22`		`-integer: true,`
`23`		`-strict: true,`
	`21`	`+return readPositiveIntegerParam(args, "timeoutMs", {`
	`22`	`+message: "timeoutMs must be a positive integer in milliseconds.",`
`24`	`23`	`});`
`25`		`-if (timeoutMs === undefined) {`
`26`		`-return undefined;`
`27`		`-}`
`28`		`-if (timeoutMs <= 0) {`
`29`		`-throw new ToolInputError("timeoutMs must be a positive integer in milliseconds.");`
`30`		`-}`
`31`		`-return timeoutMs;`
`32`	`24`	`}`
`33`	`25`
`34`	`26`	`/**`

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ const VideoGenerateToolProperties = {`
`203`	`203`	`}),`
`204`	`204`	`),`
`205`	`205`	`timeoutMs: Type.Optional(`
`206`		`-Type.Number({`
	`206`	`+Type.Integer({`
`207`	`207`	`description: "Provider timeout ms.",`
`208`	`208`	`minimum: 1,`
`209`	`209`	`}),`

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

推荐订阅源

Recent Commits to openclaw:main