fix: validate gateway rpc timeouts · openclaw/openclaw@fc8b57e

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
`@@ -129,10 +129,12 @@ describe("gateway tool restart continuation", () => {`
`129`	`129`	`properties?: {`
`130`	`130`	`delayMs?: { minimum?: number; type?: string };`
`131`	`131`	`restartDelayMs?: { minimum?: number; type?: string };`
	`132`	`+timeoutMs?: { minimum?: number; type?: string };`
`132`	`133`	`};`
`133`	`134`	`};`
`134`	`135`	`expect(parameters.properties?.delayMs).toMatchObject({ type: "integer", minimum: 0 });`
`135`	`136`	`expect(parameters.properties?.restartDelayMs).toMatchObject({ type: "integer", minimum: 0 });`
	`137`	`+expect(parameters.properties?.timeoutMs).toMatchObject({ type: "integer", minimum: 1 });`
`136`	`138`	`});`
`137`	`139`
`138`	`140`	`it("instructs agents to use continuationMessage when a restart still needs a reply", async () => {`

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,11 @@ 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 { optionalNonNegativeIntegerSchema, stringEnum } from "../schema/typebox.js";`
	`20`	`+import {`
	`21`	`+optionalNonNegativeIntegerSchema,`
	`22`	`+optionalPositiveIntegerSchema,`
	`23`	`+stringEnum,`
	`24`	`+} from "../schema/typebox.js";`
`21`	`25`	`import {`
`22`	`26`	`type AnyAgentTool,`
`23`	`27`	`jsonResult,`
`@@ -348,7 +352,7 @@ const GatewayToolSchema = Type.Object({`
`348`	`352`	`// config.get, config.schema.lookup, config.apply, update.run`
`349`	`353`	`gatewayUrl: Type.Optional(Type.String()),`
`350`	`354`	`gatewayToken: Type.Optional(Type.String()),`
`351`		`-timeoutMs: Type.Optional(Type.Number()),`
	`355`	`+timeoutMs: optionalPositiveIntegerSchema(),`
`352`	`356`	`// config.schema.lookup`
`353`	`357`	`path: Type.Optional(Type.String()),`
`354`	`358`	`// config.apply, config.patch`

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ import { afterAll, beforeEach, describe, expect, it, vi } from "vitest";`
`2`	`2`	`import type { CallGatewayScopedOptions } from "../../gateway/call.js";`
`3`	`3`	`import { createEmptyPluginRegistry } from "../../plugins/registry-empty.js";`
`4`	`4`	`import { setActivePluginRegistry } from "../../plugins/runtime.js";`
`5`		`-import { callGatewayTool, resolveGatewayOptions } from "./gateway.js";`
	`5`	`+import { callGatewayTool, readGatewayCallOptions, resolveGatewayOptions } from "./gateway.js";`
`6`	`6`
`7`	`7`	`const mocks = vi.hoisted(() => ({`
`8`	`8`	`callGateway: vi.fn(),`
`@@ -68,6 +68,24 @@ describe("gateway tool defaults", () => {`
`68`	`68`	`expect(call.scopes).toEqual(["operator.read"]);`
`69`	`69`	`});`
`70`	`70`
	`71`	`+it("rejects invalid gateway timeoutMs before RPC", async () => {`
	`72`	`+expect(() => readGatewayCallOptions({ timeoutMs: -1 })).toThrow(`
	`73`	`+"timeoutMs must be a positive integer",`
	`74`	`+);`
	`75`	`+expect(() => readGatewayCallOptions({ timeoutMs: 1.5 })).toThrow(`
	`76`	`+"timeoutMs must be a positive integer",`
	`77`	`+);`
	`78`	`+expect(mocks.callGateway).not.toHaveBeenCalled();`
	`79`	`+});`
	`80`	`+`
	`81`	`+it("accepts string gateway timeoutMs through the shared numeric reader", async () => {`
	`82`	`+mocks.callGateway.mockResolvedValueOnce({ ok: true });`
	`83`	`+`
	`84`	`+await callGatewayTool("health", readGatewayCallOptions({ timeoutMs: "5000" }), {});`
	`85`	`+`
	`86`	`+expect(capturedGatewayCall().timeoutMs).toBe(5000);`
	`87`	`+});`
	`88`	`+`
`71`	`89`	`it("uses OPENCLAW_GATEWAY_TOKEN for allowlisted local overrides", () => {`
`72`	`90`	`process.env.OPENCLAW_GATEWAY_TOKEN = "env-token";`
`73`	`91`	`const opts = resolveGatewayOptions({ gatewayUrl: "ws://127.0.0.1:18789" });`

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import {`
`13`	`13`	`normalizeLowercaseStringOrEmpty,`
`14`	`14`	`normalizeOptionalString,`
`15`	`15`	`} from "../../shared/string-coerce.js";`
`16`		`-import { readStringParam } from "./common.js";`
	`16`	`+import { readPositiveIntegerParam, readStringParam } from "./common.js";`
`17`	`17`
`18`	`18`	`export const DEFAULT_GATEWAY_URL = "ws://127.0.0.1:18789";`
`19`	`19`
`@@ -29,7 +29,7 @@ export function readGatewayCallOptions(params: Record<string, unknown>): Gateway`
`29`	`29`	`return {`
`30`	`30`	`gatewayUrl: readStringParam(params, "gatewayUrl", { trim: false }),`
`31`	`31`	`gatewayToken: readStringParam(params, "gatewayToken", { trim: false }),`
`32`		`-timeoutMs: typeof params.timeoutMs === "number" ? params.timeoutMs : undefined,`
	`32`	`+timeoutMs: readPositiveIntegerParam(params, "timeoutMs"),`
`33`	`33`	`};`
`34`	`34`	`}`
`35`	`35`

Original file line number	Diff line number	Diff line change
`@@ -178,11 +178,13 @@ describe("createNodesTool screen_record duration guardrails", () => {`
`178`	`178`	`const tool = createNodesTool();`
`179`	`179`	`const schema = tool.parameters as {`
`180`	`180`	`properties?: {`
	`181`	`+timeoutMs?: { minimum?: number; type?: string };`
`181`	`182`	`maxAgeMs?: { minimum?: number; type?: string };`
`182`	`183`	`locationTimeoutMs?: { minimum?: number; type?: string };`
`183`	`184`	`invokeTimeoutMs?: { minimum?: number; type?: string };`
`184`	`185`	`};`
`185`	`186`	`};`
	`187`	`+expect(schema.properties?.timeoutMs).toMatchObject({ type: "integer", minimum: 1 });`
`186`	`188`	`expect(schema.properties?.maxAgeMs).toMatchObject({ type: "integer", minimum: 0 });`
`187`	`189`	`expect(schema.properties?.locationTimeoutMs).toMatchObject({ type: "integer", minimum: 1 });`
`188`	`190`	`expect(schema.properties?.invokeTimeoutMs).toMatchObject({ type: "integer", minimum: 1 });`

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ const NodesToolSchema = Type.Object({`
`84`	`84`	`action: stringEnum(NODES_TOOL_ACTIONS),`
`85`	`85`	`gatewayUrl: Type.Optional(Type.String()),`
`86`	`86`	`gatewayToken: Type.Optional(Type.String()),`
`87`		`-timeoutMs: Type.Optional(Type.Number()),`
	`87`	`+timeoutMs: optionalPositiveIntegerSchema(),`
`88`	`88`	`node: Type.Optional(Type.String()),`
`89`	`89`	`requestId: Type.Optional(Type.String()),`
`90`	`90`	`// notify`

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

推荐订阅源

Recent Commits to openclaw:main