fix(e2e): reject loose MCP channel limits · openclaw/openclaw@07e0af4

Recent Commits to openclaw:main

vincentkoc · 2026-05-30 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,23 @@`
	`1`	`+import { readPositiveIntEnv } from "./lib/env-limits.mjs";`
	`2`	`+`
	`3`	`+export type McpChannelLimits = {`
	`4`	`+connectTimeoutMs: number;`
	`5`	`+gatewayEventRetainLimit: number;`
	`6`	`+rawMessageRetainLimit: number;`
	`7`	`+};`
	`8`	`+`
	`9`	`+export function readMcpChannelLimits(env: NodeJS.ProcessEnv = process.env): McpChannelLimits {`
	`10`	`+return {`
	`11`	`+connectTimeoutMs: readPositiveIntEnv("OPENCLAW_MCP_CHANNELS_CONNECT_TIMEOUT_MS", 60_000, env),`
	`12`	`+gatewayEventRetainLimit: readPositiveIntEnv(`
	`13`	`+"OPENCLAW_MCP_CHANNELS_GATEWAY_EVENT_RETAIN_LIMIT",`
	`14`	`+2_000,`
	`15`	`+env,`
	`16`	`+),`
	`17`	`+rawMessageRetainLimit: readPositiveIntEnv(`
	`18`	`+"OPENCLAW_MCP_CHANNELS_RAW_MESSAGE_RETAIN_LIMIT",`
	`19`	`+2_000,`
	`20`	`+env,`
	`21`	`+),`
	`22`	`+};`
	`23`	`+}`

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import { PROTOCOL_VERSION } from "../../dist/gateway/protocol/index.js";`
`13`	`13`	`import { formatErrorMessage } from "../../dist/infra/errors.js";`
`14`	`14`	`import { rawDataToString } from "../../dist/infra/ws.js";`
`15`	`15`	`import { readStringValue } from "../../dist/shared/string-coerce.js";`
	`16`	`+import { readMcpChannelLimits } from "./mcp-channel-limits.ts";`
`16`	`17`	`import { connectMcpWithTimeout } from "./mcp-connect-timeout.ts";`
`17`	`18`	`import { waitForWebSocketOpen } from "./mcp-websocket-open.ts";`
`18`	`19`
`@@ -50,30 +51,17 @@ const GATEWAY_WS_OPEN_TIMEOUT_MS = 45_000;`
`50`	`51`	`const GATEWAY_RPC_TIMEOUT_MS = 60_000;`
`51`	`52`	`const GATEWAY_REQUEST_TIMEOUT_MS = 45_000;`
`52`	`53`	`const GATEWAY_CONNECT_RETRY_WINDOW_MS = 420_000;`
`53`		`-const MCP_CONNECT_TIMEOUT_MS = readPositiveInt(`
`54`		`-process.env.OPENCLAW_MCP_CHANNELS_CONNECT_TIMEOUT_MS,`
`55`		`-60_000,`
`56`		`-);`
`57`		`-const GATEWAY_EVENT_RETAIN_LIMIT = readPositiveInt(`
`58`		`-process.env.OPENCLAW_MCP_CHANNELS_GATEWAY_EVENT_RETAIN_LIMIT,`
`59`		`-2_000,`
`60`		`-);`
`61`		`-const MCP_RAW_MESSAGE_RETAIN_LIMIT = readPositiveInt(`
`62`		`-process.env.OPENCLAW_MCP_CHANNELS_RAW_MESSAGE_RETAIN_LIMIT,`
`63`		`-2_000,`
`64`		`-);`
	`54`	`+const MCP_CHANNEL_LIMITS = readMcpChannelLimits();`
	`55`	`+const MCP_CONNECT_TIMEOUT_MS = MCP_CHANNEL_LIMITS.connectTimeoutMs;`
	`56`	`+const GATEWAY_EVENT_RETAIN_LIMIT = MCP_CHANNEL_LIMITS.gatewayEventRetainLimit;`
	`57`	`+const MCP_RAW_MESSAGE_RETAIN_LIMIT = MCP_CHANNEL_LIMITS.rawMessageRetainLimit;`
`65`	`58`
`66`	`59`	`export function assert(condition: unknown, message: string): asserts condition {`
`67`	`60`	`if (!condition) {`
`68`	`61`	`throw new Error(message);`
`69`	`62`	`}`
`70`	`63`	`}`
`71`	`64`
`72`		`-function readPositiveInt(raw: string \| undefined, fallback: number) {`
`73`		`-const parsed = Number.parseInt(raw ?? "", 10);`
`74`		`-return Number.isInteger(parsed) && parsed > 0 ? parsed : fallback;`
`75`		`-}`
`76`		`-`
`77`	`65`	`function pushBounded<T>(items: T[], item: T, limit: number): void {`
`78`	`66`	`items.push(item);`
`79`	`67`	`if (items.length > limit) {`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,39 @@`
	`1`	`+import { describe, expect, it } from "vitest";`
	`2`	`+import { readMcpChannelLimits } from "../../scripts/e2e/mcp-channel-limits.ts";`
	`3`	`+`
	`4`	`+describe("MCP channel E2E limits", () => {`
	`5`	`+it("uses documented defaults when env overrides are absent", () => {`
	`6`	`+expect(readMcpChannelLimits({})).toEqual({`
	`7`	`+connectTimeoutMs: 60_000,`
	`8`	`+gatewayEventRetainLimit: 2_000,`
	`9`	`+rawMessageRetainLimit: 2_000,`
	`10`	`+});`
	`11`	`+});`
	`12`	`+`
	`13`	`+it("accepts strict positive integer overrides", () => {`
	`14`	`+expect(`
	`15`	`+readMcpChannelLimits({`
	`16`	`+OPENCLAW_MCP_CHANNELS_CONNECT_TIMEOUT_MS: "120000",`
	`17`	`+OPENCLAW_MCP_CHANNELS_GATEWAY_EVENT_RETAIN_LIMIT: "500",`
	`18`	`+OPENCLAW_MCP_CHANNELS_RAW_MESSAGE_RETAIN_LIMIT: "25",`
	`19`	`+}),`
	`20`	`+).toEqual({`
	`21`	`+connectTimeoutMs: 120_000,`
	`22`	`+gatewayEventRetainLimit: 500,`
	`23`	`+rawMessageRetainLimit: 25,`
	`24`	`+});`
	`25`	`+});`
	`26`	`+`
	`27`	`+it("rejects loose numeric env values instead of parsing prefixes", () => {`
	`28`	`+expect(() =>`
	`29`	`+readMcpChannelLimits({`
	`30`	`+OPENCLAW_MCP_CHANNELS_CONNECT_TIMEOUT_MS: "1e3",`
	`31`	`+}),`
	`32`	`+).toThrow("invalid OPENCLAW_MCP_CHANNELS_CONNECT_TIMEOUT_MS: 1e3");`
	`33`	`+expect(() =>`
	`34`	`+readMcpChannelLimits({`
	`35`	`+OPENCLAW_MCP_CHANNELS_RAW_MESSAGE_RETAIN_LIMIT: "1000ms",`
	`36`	`+}),`
	`37`	`+).toThrow("invalid OPENCLAW_MCP_CHANNELS_RAW_MESSAGE_RETAIN_LIMIT: 1000ms");`
	`38`	`+});`
	`39`	`+});`

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

推荐订阅源

Recent Commits to openclaw:main