fix(gateway): cap handshake timer delays · openclaw/openc...

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,7 +1,11 @@`
`1`	`1`	`import { describe, expect, it } from "vitest";`
`2`	`2`	`import {`
	`3`	`+getConnectChallengeTimeoutMsFromEnv,`
	`4`	`+getPreauthHandshakeTimeoutMsFromEnv,`
`3`	`5`	`MAX_SAFE_TIMEOUT_DELAY_MS,`
`4`	`6`	`resolveFiniteTimeoutDelayMs,`
	`7`	`+resolveConnectChallengeTimeoutMs,`
	`8`	`+resolvePreauthHandshakeTimeoutMs,`
`5`	`9`	`resolveSafeTimeoutDelayMs,`
`6`	`10`	`} from "./timeouts.js";`
`7`	`11`
`@@ -35,3 +39,38 @@ describe("resolveFiniteTimeoutDelayMs", () => {`
`35`	`39`	`expect(resolveFiniteTimeoutDelayMs(-5, 10_000, { minMs: 0 })).toBe(0);`
`36`	`40`	`});`
`37`	`41`	`});`
	`42`	`+`
	`43`	`+describe("gateway client handshake timeouts", () => {`
	`44`	`+it("caps preauth handshake timeout env and config values to the safe timer range", () => {`
	`45`	`+expect(`
	`46`	`+getPreauthHandshakeTimeoutMsFromEnv({`
	`47`	`+OPENCLAW_HANDSHAKE_TIMEOUT_MS: "3000000000",`
	`48`	`+}),`
	`49`	`+).toBe(MAX_SAFE_TIMEOUT_DELAY_MS);`
	`50`	`+expect(`
	`51`	`+resolvePreauthHandshakeTimeoutMs({`
	`52`	`+env: {},`
	`53`	`+configuredTimeoutMs: 3_000_000_000,`
	`54`	`+}),`
	`55`	`+).toBe(MAX_SAFE_TIMEOUT_DELAY_MS);`
	`56`	`+});`
	`57`	`+`
	`58`	`+it("caps connect challenge timeout env and explicit values to the safe timer range", () => {`
	`59`	`+expect(`
	`60`	`+getConnectChallengeTimeoutMsFromEnv({`
	`61`	`+OPENCLAW_CONNECT_CHALLENGE_TIMEOUT_MS: "3000000000",`
	`62`	`+}),`
	`63`	`+).toBe(MAX_SAFE_TIMEOUT_DELAY_MS);`
	`64`	`+expect(`
	`65`	`+resolveConnectChallengeTimeoutMs(3_000_000_000, {`
	`66`	`+env: {},`
	`67`	`+configuredTimeoutMs: 3_000_000_000,`
	`68`	`+}),`
	`69`	`+).toBe(MAX_SAFE_TIMEOUT_DELAY_MS);`
	`70`	`+expect(`
	`71`	`+resolveConnectChallengeTimeoutMs(undefined, {`
	`72`	`+env: { OPENCLAW_CONNECT_CHALLENGE_TIMEOUT_MS: "3000000000" },`
	`73`	`+}),`
	`74`	`+).toBe(MAX_SAFE_TIMEOUT_DELAY_MS);`
	`75`	`+});`
	`76`	`+});`

Original file line number	Diff line number	Diff line change
`@@ -48,15 +48,15 @@ export function getConnectChallengeTimeoutMsFromEnv(`
`48`	`48`	`if (raw) {`
`49`	`49`	`const parsed = parseStrictPositiveInteger(raw);`
`50`	`50`	`if (parsed !== undefined) {`
`51`		`-return parsed;`
	`51`	`+return resolveSafeTimeoutDelayMs(parsed);`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`	`return undefined;`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`function normalizePositiveTimeoutMs(timeoutMs: unknown): number \| undefined {`
`58`	`58`	`return typeof timeoutMs === "number" && Number.isFinite(timeoutMs) && timeoutMs > 0`
`59`		`- ? timeoutMs`
	`59`	`+ ? resolveSafeTimeoutDelayMs(timeoutMs)`
`60`	`60`	`: undefined;`
`61`	`61`	`}`
`62`	`62`
`@@ -90,7 +90,7 @@ export function getPreauthHandshakeTimeoutMsFromEnv(env: NodeJS.ProcessEnv = pro`
`90`	`90`	`if (configuredTimeout) {`
`91`	`91`	`const parsed = parseStrictPositiveInteger(configuredTimeout);`
`92`	`92`	`if (parsed !== undefined) {`
`93`		`-return parsed;`
	`93`	`+return resolveSafeTimeoutDelayMs(parsed);`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`return DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS;`
`@@ -106,7 +106,7 @@ export function resolvePreauthHandshakeTimeoutMs(params?: {`
`106`	`106`	`if (configuredTimeout) {`
`107`	`107`	`const parsed = parseStrictPositiveInteger(configuredTimeout);`
`108`	`108`	`if (parsed !== undefined) {`
`109`		`-return parsed;`
	`109`	`+return resolveSafeTimeoutDelayMs(parsed);`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`	`const configured = normalizePositiveTimeoutMs(params?.configuredTimeoutMs);`

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import { describe, expect, test } from "vitest";`
	`2`	`+import { MAX_SAFE_TIMEOUT_DELAY_MS } from "../utils/timer-delay.js";`
`2`	`3`	`import {`
`3`	`4`	`clampConnectChallengeTimeoutMs,`
`4`	`5`	`DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS,`
`@@ -62,6 +63,20 @@ describe("gateway handshake timeouts", () => {`
`62`	`63`	`);`
`63`	`64`	`});`
`64`	`65`
	`66`	`+test("caps preauth handshake timeout env and config values to the safe timer range", () => {`
	`67`	`+expect(`
	`68`	`+getPreauthHandshakeTimeoutMsFromEnv({`
	`69`	`+OPENCLAW_HANDSHAKE_TIMEOUT_MS: "3000000000",`
	`70`	`+}),`
	`71`	`+).toBe(MAX_SAFE_TIMEOUT_DELAY_MS);`
	`72`	`+expect(`
	`73`	`+resolvePreauthHandshakeTimeoutMs({`
	`74`	`+env: {},`
	`75`	`+configuredTimeoutMs: 3_000_000_000,`
	`76`	`+}),`
	`77`	`+).toBe(MAX_SAFE_TIMEOUT_DELAY_MS);`
	`78`	`+});`
	`79`	`+`
`65`	`80`	`test("resolves preauth handshake timeout from the test-only env before config", () => {`
`66`	`81`	`expect(`
`67`	`82`	`resolvePreauthHandshakeTimeoutMs({`
`@@ -122,6 +137,25 @@ describe("gateway handshake timeouts", () => {`
`122`	`137`	`).toBeUndefined();`
`123`	`138`	`});`
`124`	`139`
	`140`	`+test("caps connect challenge timeout env and explicit values to the safe timer range", () => {`
	`141`	`+expect(`
	`142`	`+getConnectChallengeTimeoutMsFromEnv({`
	`143`	`+OPENCLAW_CONNECT_CHALLENGE_TIMEOUT_MS: "3000000000",`
	`144`	`+}),`
	`145`	`+).toBe(MAX_SAFE_TIMEOUT_DELAY_MS);`
	`146`	`+expect(`
	`147`	`+resolveConnectChallengeTimeoutMs(3_000_000_000, {`
	`148`	`+env: {},`
	`149`	`+configuredTimeoutMs: 3_000_000_000,`
	`150`	`+}),`
	`151`	`+).toBe(MAX_SAFE_TIMEOUT_DELAY_MS);`
	`152`	`+expect(`
	`153`	`+resolveConnectChallengeTimeoutMs(undefined, {`
	`154`	`+env: { OPENCLAW_CONNECT_CHALLENGE_TIMEOUT_MS: "3000000000" },`
	`155`	`+}),`
	`156`	`+).toBe(MAX_SAFE_TIMEOUT_DELAY_MS);`
	`157`	`+});`
	`158`	`+`
`125`	`159`	`test("resolveConnectChallengeTimeoutMs falls back to env override", () => {`
`126`	`160`	`const original = process.env.OPENCLAW_CONNECT_CHALLENGE_TIMEOUT_MS;`
`127`	`161`	`const originalHandshake = process.env.OPENCLAW_HANDSHAKE_TIMEOUT_MS;`

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import { parseStrictPositiveInteger } from "../infra/parse-finite-number.js";`
	`2`	`+import { resolveSafeTimeoutDelayMs } from "../utils/timer-delay.js";`
`2`	`3`
`3`	`4`	`export const DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS = 15_000;`
`4`	`5`	`export const MIN_CONNECT_CHALLENGE_TIMEOUT_MS = 250;`
`@@ -21,15 +22,15 @@ export function getConnectChallengeTimeoutMsFromEnv(`
`21`	`22`	`if (raw) {`
`22`	`23`	`const parsed = parseStrictPositiveInteger(raw);`
`23`	`24`	`if (parsed !== undefined) {`
`24`		`-return parsed;`
	`25`	`+return resolveSafeTimeoutDelayMs(parsed);`
`25`	`26`	`}`
`26`	`27`	`}`
`27`	`28`	`return undefined;`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`function normalizePositiveTimeoutMs(timeoutMs: unknown): number \| undefined {`
`31`	`32`	`return typeof timeoutMs === "number" && Number.isFinite(timeoutMs) && timeoutMs > 0`
`32`		`- ? timeoutMs`
	`33`	`+ ? resolveSafeTimeoutDelayMs(timeoutMs)`
`33`	`34`	`: undefined;`
`34`	`35`	`}`
`35`	`36`
`@@ -61,7 +62,7 @@ export function getPreauthHandshakeTimeoutMsFromEnv(env: NodeJS.ProcessEnv = pro`
`61`	`62`	`if (configuredTimeout) {`
`62`	`63`	`const parsed = parseStrictPositiveInteger(configuredTimeout);`
`63`	`64`	`if (parsed !== undefined) {`
`64`		`-return parsed;`
	`65`	`+return resolveSafeTimeoutDelayMs(parsed);`
`65`	`66`	`}`
`66`	`67`	`}`
`67`	`68`	`return DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS;`
`@@ -77,7 +78,7 @@ export function resolvePreauthHandshakeTimeoutMs(params?: {`
`77`	`78`	`if (configuredTimeout) {`
`78`	`79`	`const parsed = parseStrictPositiveInteger(configuredTimeout);`
`79`	`80`	`if (parsed !== undefined) {`
`80`		`-return parsed;`
	`81`	`+return resolveSafeTimeoutDelayMs(parsed);`
`81`	`82`	`}`
`82`	`83`	`}`
`83`	`84`	`const configured = normalizePositiveTimeoutMs(params?.configuredTimeoutMs);`

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

推荐订阅源

Recent Commits to openclaw:main