fix(e2e): reject invalid mock fixture ports · openclaw/openclaw@317919e

Recent Commits to openclaw:main

vincentkoc · 2026-06-19 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`// Fixture HTTP server for browser CDP snapshot E2E scenarios.`
`2`	`2`	`import http from "node:http";`
`3`		`-import { readPositiveIntEnv } from "../env-limits.mjs";`
	`3`	`+import { readTcpPortEnv } from "../env-limits.mjs";`
`4`	`4`
`5`		`-const port = readPositiveIntEnv("FIXTURE_PORT");`
	`5`	`+const port = readTcpPortEnv("FIXTURE_PORT");`
`6`	`6`
`7`	`7`	const html = `<!doctype html>
`8`	`8`	`<html>`

Original file line number	Diff line number	Diff line change
`@@ -11,3 +11,13 @@ export function readPositiveIntEnv(name, fallback, env = process.env) {`
`11`	`11`	`}`
`12`	`12`	`return value;`
`13`	`13`	`}`
	`14`	`+`
	`15`	`+export function readTcpPortEnv(name, fallback, env = process.env) {`
	`16`	`+const value = readPositiveIntEnv(name, fallback, env);`
	`17`	`+if (value > 65_535) {`
	`18`	`+const raw = env[name] ?? fallback;`
	`19`	`+const text = raw == null ? "unset" : String(raw).trim();`
	`20`	+throw new Error(`invalid ${name}: ${text}`);
	`21`	`+}`
	`22`	`+return value;`
	`23`	`+}`

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// Mock server for minimal OpenAI web-search E2E scenarios.`
`2`	`2`	`import http from "node:http";`
`3`		`-import { readPositiveIntEnv } from "../env-limits.mjs";`
	`3`	`+import { readTcpPortEnv } from "../env-limits.mjs";`
`4`	`4`	`import {`
`5`	`5`	`boundedRequestLogBody,`
`6`	`6`	`isRequestBodyTooLargeError,`
`@@ -10,7 +10,7 @@ import {`
`10`	`10`	`writeSse,`
`11`	`11`	`} from "../mock-openai-http.mjs";`
`12`	`12`
`13`		`-const port = readPositiveIntEnv("MOCK_PORT");`
	`13`	`+const port = readTcpPortEnv("MOCK_PORT");`
`14`	`14`	`const requestLog = process.env.MOCK_REQUEST_LOG;`
`15`	`15`	`const successMarker = process.env.SUCCESS_MARKER;`
`16`	`16`	`const rawSchemaError = process.env.RAW_SCHEMA_ERROR;`

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`	`import crypto from "node:crypto";`
`3`	`3`	`import fs from "node:fs";`
`4`	`4`	`import http from "node:http";`
`5`		`-import { readPositiveIntEnv } from "../env-limits.mjs";`
	`5`	`+import { readPositiveIntEnv, readTcpPortEnv } from "../env-limits.mjs";`
`6`	`6`
`7`		`-const port = readPositiveIntEnv("CLICKCLACK_FIXTURE_PORT", 44181);`
	`7`	`+const port = readTcpPortEnv("CLICKCLACK_FIXTURE_PORT", 44181);`
`8`	`8`	`const requestMaxBytes = readPositiveIntEnv("CLICKCLACK_FIXTURE_REQUEST_MAX_BYTES", 4 * 1024 * 1024);`
`9`	`9`	`const token = process.env.CLICKCLACK_FIXTURE_TOKEN ?? "clickclack-release-token";`
`10`	`10`	`const statePath = process.env.CLICKCLACK_FIXTURE_STATE ?? "/tmp/openclaw-clickclack-fixture.json";`

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Mock OpenAI-compatible server for broader E2E scenarios.`
`2`	`2`	`import { createHash } from "node:crypto";`
`3`	`3`	`import http from "node:http";`
`4`		`-import { readPositiveIntEnv } from "./lib/env-limits.mjs";`
	`4`	`+import { readTcpPortEnv } from "./lib/env-limits.mjs";`
`5`	`5`	`import {`
`6`	`6`	`boundedRequestLogBody,`
`7`	`7`	`isRequestBodyTooLargeError,`
`@@ -13,8 +13,8 @@ import {`
`13`	`13`
`14`	`14`	`const port =`
`15`	`15`	`process.env.MOCK_PORT != null`
`16`		`- ? readPositiveIntEnv("MOCK_PORT")`
`17`		`- : readPositiveIntEnv("OPENCLAW_MOCK_OPENAI_PORT");`
	`16`	`+ ? readTcpPortEnv("MOCK_PORT")`
	`17`	`+ : readTcpPortEnv("OPENCLAW_MOCK_OPENAI_PORT");`
`18`	`18`	`const successMarker = process.env.SUCCESS_MARKER ?? "OPENCLAW_E2E_OK";`
`19`	`19`	`const requestLog = process.env.MOCK_REQUEST_LOG;`
`20`	`20`

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,13 @@ import { describe, expect, it } from "vitest";`
`10`	`10`
`11`	`11`	`const mockOpenAiPath = "scripts/e2e/mock-openai-server.mjs";`
`12`	`12`	`const webSearchMockPath = "scripts/e2e/lib/openai-web-search-minimal/mock-server.mjs";`
	`13`	`+const browserCdpFixturePath = "scripts/e2e/lib/browser-cdp-snapshot/fixture-server.mjs";`
`13`	`14`	`const configReloadAssertPath = "scripts/e2e/lib/config-reload/assert-log.mjs";`
	`15`	`+const clickClackFixturePath = "scripts/e2e/lib/release-user-journey/clickclack-fixture.mjs";`
`14`	`16`	`const scrubbedEnvKeys = [`
	`17`	`+"CLICKCLACK_FIXTURE_PORT",`
	`18`	`+"CLICKCLACK_FIXTURE_REQUEST_MAX_BYTES",`
	`19`	`+"FIXTURE_PORT",`
`15`	`20`	`"MOCK_PORT",`
`16`	`21`	`"MOCK_REQUEST_LOG",`
`17`	`22`	`"OPENCLAW_CONFIG_RELOAD_LOG_MAX_READ_BYTES",`
`@@ -161,13 +166,41 @@ describe("e2e mock and config helper numeric limits", () => {`
`161`	`166`	`expect(fallbackPort.stderr).toContain("invalid OPENCLAW_MOCK_OPENAI_PORT: 44080http");`
`162`	`167`	`});`
`163`	`168`
	`169`	`+it("rejects out-of-range mock OpenAI port env values", () => {`
	`170`	`+const mockPort = runScript(mockOpenAiPath, { MOCK_PORT: "65536" });`
	`171`	`+expect(mockPort.status).not.toBe(0);`
	`172`	`+expect(mockPort.stderr).toContain("invalid MOCK_PORT: 65536");`
	`173`	`+`
	`174`	`+const fallbackPort = runScript(mockOpenAiPath, {`
	`175`	`+OPENCLAW_MOCK_OPENAI_PORT: "65536",`
	`176`	`+});`
	`177`	`+expect(fallbackPort.status).not.toBe(0);`
	`178`	`+expect(fallbackPort.stderr).toContain("invalid OPENCLAW_MOCK_OPENAI_PORT: 65536");`
	`179`	`+});`
	`180`	`+`
`164`	`181`	`it("rejects loose OpenAI web-search mock port env values", () => {`
`165`	`182`	`const result = runScript(webSearchMockPath, { MOCK_PORT: "80http" });`
`166`	`183`
`167`	`184`	`expect(result.status).not.toBe(0);`
`168`	`185`	`expect(result.stderr).toContain("invalid MOCK_PORT: 80http");`
`169`	`186`	`});`
`170`	`187`
	`188`	`+it("rejects out-of-range fixture listener ports", () => {`
	`189`	`+const webSearch = runScript(webSearchMockPath, { MOCK_PORT: "65536" });`
	`190`	`+expect(webSearch.status).not.toBe(0);`
	`191`	`+expect(webSearch.stderr).toContain("invalid MOCK_PORT: 65536");`
	`192`	`+`
	`193`	`+const browserFixture = runScript(browserCdpFixturePath, { FIXTURE_PORT: "65536" });`
	`194`	`+expect(browserFixture.status).not.toBe(0);`
	`195`	`+expect(browserFixture.stderr).toContain("invalid FIXTURE_PORT: 65536");`
	`196`	`+`
	`197`	`+const clickClack = runScript(clickClackFixturePath, {`
	`198`	`+CLICKCLACK_FIXTURE_PORT: "65536",`
	`199`	`+});`
	`200`	`+expect(clickClack.status).not.toBe(0);`
	`201`	`+expect(clickClack.stderr).toContain("invalid CLICKCLACK_FIXTURE_PORT: 65536");`
	`202`	`+});`
	`203`	`+`
`171`	`204`	`it("rejects loose config-reload log timeout env values", () => {`
`172`	`205`	`const result = runScript(configReloadAssertPath, {`
`173`	`206`	`OPENCLAW_CONFIG_RELOAD_LOG_TIMEOUT_MS: "30000ms",`

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

推荐订阅源

Recent Commits to openclaw:main