fix: centralize gateway timeout schema · openclaw/openclaw@f8d63f4

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
`@@ -17,6 +17,7 @@ import {`
`17`	`17`	`readNonNegativeIntegerParam,`
`18`	`18`	`readStringParam,`
`19`	`19`	`} from "./common.js";`
	`20`	`+import { gatewayCallOptionSchemaProperties } from "./gateway-schema.js";`
`20`	`21`	`import { callGatewayTool, readGatewayCallOptions, type GatewayCallOptions } from "./gateway.js";`
`21`	`22`	`import { resolveInternalSessionKey, resolveMainSessionAlias } from "./sessions-helpers.js";`
`22`	`23`
`@@ -294,9 +295,7 @@ const CronPatchObjectSchema = Type.Optional(`
`294`	`295`	`export const CronToolSchema = Type.Object(`
`295`	`296`	`{`
`296`	`297`	`action: stringEnum(CRON_ACTIONS),`
`297`		`-gatewayUrl: Type.Optional(Type.String()),`
`298`		`-gatewayToken: Type.Optional(Type.String()),`
`299`		`-timeoutMs: Type.Optional(Type.Number()),`
	`298`	`+ ...gatewayCallOptionSchemaProperties(),`
`300`	`299`	`includeDisabled: Type.Optional(Type.Boolean()),`
`301`	`300`	`job: CronJobObjectSchema,`
`302`	`301`	`jobId: Type.Optional(Type.String()),`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,10 @@`
	`1`	`+import { Type } from "typebox";`
	`2`	`+import { optionalPositiveIntegerSchema } from "../schema/typebox.js";`
	`3`	`+`
	`4`	`+export function gatewayCallOptionSchemaProperties() {`
	`5`	`+return {`
	`6`	`+gatewayUrl: Type.Optional(Type.String()),`
	`7`	`+gatewayToken: Type.Optional(Type.String()),`
	`8`	`+timeoutMs: optionalPositiveIntegerSchema(),`
	`9`	`+};`
	`10`	`+}`

Original file line number	Diff line number	Diff line change
`@@ -17,17 +17,14 @@ import { createSubsystemLogger } from "../../logging/subsystem.js";`
`17`	`17`	`import { collectEnabledInsecureOrDangerousFlags } from "../../security/dangerous-config-flags.js";`
`18`	`18`	`import { isRecord as isPlainObject } from "../../shared/record-coerce.js";`
`19`	`19`	`import { normalizeOptionalString, readStringValue } from "../../shared/string-coerce.js";`
`20`		`-import {`
`21`		`-optionalNonNegativeIntegerSchema,`
`22`		`-optionalPositiveIntegerSchema,`
`23`		`-stringEnum,`
`24`		`-} from "../schema/typebox.js";`
	`20`	`+import { optionalNonNegativeIntegerSchema, stringEnum } from "../schema/typebox.js";`
`25`	`21`	`import {`
`26`	`22`	`type AnyAgentTool,`
`27`	`23`	`jsonResult,`
`28`	`24`	`readNonNegativeIntegerParam,`
`29`	`25`	`readStringParam,`
`30`	`26`	`} from "./common.js";`
	`27`	`+import { gatewayCallOptionSchemaProperties } from "./gateway-schema.js";`
`31`	`28`	`import { callGatewayTool, readGatewayCallOptions } from "./gateway.js";`
`32`	`29`
`33`	`30`	`const log = createSubsystemLogger("gateway-tool");`
`@@ -350,9 +347,7 @@ const GatewayToolSchema = Type.Object({`
`350`	`347`	`reason: Type.Optional(Type.String()),`
`351`	`348`	`continuationMessage: Type.Optional(Type.String()),`
`352`	`349`	`// config.get, config.schema.lookup, config.apply, update.run`
`353`		`-gatewayUrl: Type.Optional(Type.String()),`
`354`		`-gatewayToken: Type.Optional(Type.String()),`
`355`		`-timeoutMs: optionalPositiveIntegerSchema(),`
	`350`	`+ ...gatewayCallOptionSchemaProperties(),`
`356`	`351`	`// config.schema.lookup`
`357`	`352`	`path: Type.Optional(Type.String()),`
`358`	`353`	`// config.apply, config.patch`

Original file line number	Diff line number	Diff line change
`@@ -381,6 +381,47 @@ async function executeSend(params: {`
`381`	`381`	`return lastRunMessageActionInput();`
`382`	`382`	`}`
`383`	`383`
	`384`	`+describe("message tool gateway timeout", () => {`
	`385`	`+it("advertises timeoutMs as a positive integer", () => {`
	`386`	`+const tool = createMessageTool();`
	`387`	`+expect(getToolProperties(tool).timeoutMs).toMatchObject({ type: "integer", minimum: 1 });`
	`388`	`+});`
	`389`	`+`
	`390`	`+it.each([-1, 1.5, "fast"])(`
	`391`	`+"rejects invalid timeoutMs value %s before dispatch",`
	`392`	`+async (timeoutMs) => {`
	`393`	`+mockSendResult();`
	`394`	`+const tool = createMessageTool({`
	`395`	`+runMessageAction: mocks.runMessageAction as never,`
	`396`	`+});`
	`397`	`+`
	`398`	`+await expect(`
	`399`	`+tool.execute("1", {`
	`400`	`+action: "send",`
	`401`	`+target: "telegram:123",`
	`402`	`+message: "hi",`
	`403`	`+ timeoutMs,`
	`404`	`+}),`
	`405`	`+).rejects.toThrow("timeoutMs must be a positive integer");`
	`406`	`+expect(mocks.runMessageAction).not.toHaveBeenCalled();`
	`407`	`+},`
	`408`	`+);`
	`409`	`+`
	`410`	`+it("accepts string timeoutMs values through the shared numeric reader", async () => {`
	`411`	`+mockSendResult();`
	`412`	`+`
	`413`	`+const call = await executeSend({`
	`414`	`+action: {`
	`415`	`+target: "telegram:123",`
	`416`	`+message: "hi",`
	`417`	`+timeoutMs: "5000",`
	`418`	`+},`
	`419`	`+});`
	`420`	`+`
	`421`	`+expect(call?.gateway?.timeoutMs).toBe(5000);`
	`422`	`+});`
	`423`	`+});`
	`424`	`+`
`384`	`425`	`describe("message tool secret scoping", () => {`
`385`	`426`	`it("marks message-tool-only source replies in the tool description", () => {`
`386`	`427`	`const scopedTool = createMessageTool({`

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,9 @@ import { resolveSessionAgentId } from "../agent-scope.js";`
`39`	`39`	`import { listAllChannelSupportedActions, listChannelSupportedActions } from "../channel-tools.js";`
`40`	`40`	`import { channelTargetSchema, channelTargetsSchema, stringEnum } from "../schema/typebox.js";`
`41`	`41`	`import type { AnyAgentTool } from "./common.js";`
`42`		`-import { jsonResult, readNumberParam, readStringParam } from "./common.js";`
`43`		`-import { resolveGatewayOptions } from "./gateway.js";`
	`42`	`+import { jsonResult, readStringParam } from "./common.js";`
	`43`	`+import { gatewayCallOptionSchemaProperties } from "./gateway-schema.js";`
	`44`	`+import { readGatewayCallOptions, resolveGatewayOptions } from "./gateway.js";`
`44`	`45`
`45`	`46`	`const AllMessageActions = CHANNEL_MESSAGE_ACTION_NAMES;`
`46`	`47`	`const MESSAGE_TOOL_THREAD_READ_HINT =`
`@@ -421,11 +422,7 @@ function buildModerationSchema() {`
`421`	`422`	`}`
`422`	`423`
`423`	`424`	`function buildGatewaySchema() {`
`424`		`-return {`
`425`		`-gatewayUrl: Type.Optional(Type.String()),`
`426`		`-gatewayToken: Type.Optional(Type.String()),`
`427`		`-timeoutMs: Type.Optional(Type.Number()),`
`428`		`-};`
	`425`	`+return gatewayCallOptionSchemaProperties();`
`429`	`426`	`}`
`430`	`427`
`431`	`428`	`function buildPresenceSchema() {`
`@@ -1014,11 +1011,7 @@ export function createMessageTool(options?: MessageToolOptions): AnyAgentTool {`
`1014`	`1011`	`params.accountId = accountId;`
`1015`	`1012`	`}`
`1016`	`1013`
`1017`		`-const gatewayResolved = resolveGatewayOptions({`
`1018`		`-gatewayUrl: readStringParam(params, "gatewayUrl", { trim: false }),`
`1019`		`-gatewayToken: readStringParam(params, "gatewayToken", { trim: false }),`
`1020`		`-timeoutMs: readNumberParam(params, "timeoutMs"),`
`1021`		`-});`
	`1014`	`+const gatewayResolved = resolveGatewayOptions(readGatewayCallOptions(params));`
`1022`	`1015`	`const gateway = {`
`1023`	`1016`	`url: gatewayResolved.url,`
`1024`	`1017`	`token: gatewayResolved.token,`

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ import {`
`16`	`16`	`stringEnum,`
`17`	`17`	`} from "../schema/typebox.js";`
`18`	`18`	`import { type AnyAgentTool, jsonResult, readStringParam } from "./common.js";`
	`19`	`+import { gatewayCallOptionSchemaProperties } from "./gateway-schema.js";`
`19`	`20`	`import { callGatewayTool, readGatewayCallOptions } from "./gateway.js";`
`20`	`21`	`import { executeNodeCommandAction, type NodeCommandAction } from "./nodes-tool-commands.js";`
`21`	`22`	`import { executeNodeMediaAction, MEDIA_INVOKE_ACTIONS } from "./nodes-tool-media.js";`
`@@ -82,9 +83,7 @@ async function resolveNodePairApproveScopes(`
`82`	`83`	`// Flattened schema: runtime validates per-action requirements.`
`83`	`84`	`const NodesToolSchema = Type.Object({`
`84`	`85`	`action: stringEnum(NODES_TOOL_ACTIONS),`
`85`		`-gatewayUrl: Type.Optional(Type.String()),`
`86`		`-gatewayToken: Type.Optional(Type.String()),`
`87`		`-timeoutMs: optionalPositiveIntegerSchema(),`
	`86`	`+ ...gatewayCallOptionSchemaProperties(),`
`88`	`87`	`node: Type.Optional(Type.String()),`
`89`	`88`	`requestId: Type.Optional(Type.String()),`
`90`	`89`	`// notify`

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

推荐订阅源

Recent Commits to openclaw:main