refactor: share e2e websocket open helper · openclaw/openclaw@1fd5a90

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
`@@ -3,9 +3,9 @@ import { setTimeout as delay } from "node:timers/promises";`
`3`	`3`	`import { WebSocket } from "ws";`
`4`	`4`	`import { PROTOCOL_VERSION } from "../../../../dist/gateway/protocol/index.js";`
`5`	`5`	`import { renderBitmapTextPngBase64 } from "../../../../test/helpers/live-image-probe.ts";`
	`6`	`+import { waitForWebSocketOpen } from "../websocket-open.mjs";`
`6`	`7`	`import { createJsonlRequestTailer } from "./jsonl-request-tail.mjs";`
`7`	`8`	`import { readPositiveIntEnv } from "./limits.mjs";`
`8`		`-import { waitForWebSocketOpen } from "./open-websocket.mjs";`
`9`	`9`
`10`	`10`	`const port = process.env.PORT;`
`11`	`11`	`const token = process.env.OPENCLAW_GATEWAY_TOKEN;`

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import { WebSocket } from "ws";`
`2`	`2`	`import { PROTOCOL_VERSION } from "../../../../dist/gateway/protocol/index.js";`
	`3`	`+import { waitForWebSocketOpen } from "../websocket-open.mjs";`
`3`	`4`	`import { readGatewayNetworkClientConnectTimeoutMs } from "./limits.mjs";`
`4`		`-import { waitForWebSocketOpen } from "./open-websocket.mjs";`
`5`	`5`
`6`	`6`	`const url = process.env.GW_URL;`
`7`	`7`	`const token = process.env.GW_TOKEN;`

File renamed without changes.

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,10 @@`
`1`	`1`	`import { spawnSync } from "node:child_process";`
`2`		`-import { EventEmitter } from "node:events";`
`3`	`2`	`import { appendFileSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";`
`4`	`3`	`import { tmpdir } from "node:os";`
`5`	`4`	`import path from "node:path";`
`6`	`5`	`import { afterEach, describe, expect, it } from "vitest";`
`7`	`6`	`import { createJsonlRequestTailer } from "../../scripts/e2e/lib/codex-media-path/jsonl-request-tail.mjs";`
`8`	`7`	`import { readPositiveIntEnv } from "../../scripts/e2e/lib/codex-media-path/limits.mjs";`
`9`		`-import { waitForWebSocketOpen } from "../../scripts/e2e/lib/codex-media-path/open-websocket.mjs";`
`10`	`8`
`11`	`9`	`const tempRoots: string[] = [];`
`12`	`10`	`const writeConfigPath = path.resolve("scripts/e2e/lib/codex-media-path/write-config.mjs");`
`@@ -36,23 +34,6 @@ function runWriteConfig(root: string, env: Record<string, string> = {}) {`
`36`	`34`	`});`
`37`	`35`	`}`
`38`	`36`
`39`		`-class FakeWebSocket extends EventEmitter {`
`40`		`-terminated = false;`
`41`		`-closed = false;`
`42`		`-`
`43`		`-terminate(): void {`
`44`		`-this.terminated = true;`
`45`		`-queueMicrotask(() => {`
`46`		`-this.emit("error", new Error("socket abort after terminate"));`
`47`		`-this.emit("close");`
`48`		`-});`
`49`		`-}`
`50`		`-`
`51`		`-close(): void {`
`52`		`-this.closed = true;`
`53`		`-}`
`54`		`-}`
`55`		`-`
`56`	`37`	`afterEach(() => {`
`57`	`38`	`for (const root of tempRoots.splice(0)) {`
`58`	`39`	`rmSync(root, { recursive: true, force: true });`
`@@ -152,33 +133,3 @@ describe("codex media path JSONL tailer", () => {`
`152`	`133`	`expect(tailer.read()).toEqual([{ method: "turn/start" }]);`
`153`	`134`	`});`
`154`	`135`	`});`
`155`		`-`
`156`		`-describe("codex media path WebSocket open guard", () => {`
`157`		`-it("terminates sockets that never open", async () => {`
`158`		`-const ws = new FakeWebSocket();`
`159`		`-const keepAlive = setTimeout(() => {}, 100);`
`160`		`-`
`161`		`-try {`
`162`		`-await expect(waitForWebSocketOpen(ws, 1)).rejects.toThrow("gateway ws open timeout");`
`163`		`-} finally {`
`164`		`-clearTimeout(keepAlive);`
`165`		`-}`
`166`		`-`
`167`		`-expect(ws.terminated).toBe(true);`
`168`		`-await new Promise((resolve) => setImmediate(resolve));`
`169`		`-expect(ws.listenerCount("open")).toBe(0);`
`170`		`-expect(ws.listenerCount("error")).toBe(0);`
`171`		`-});`
`172`		`-`
`173`		`-it("cleans listeners after successful opens", async () => {`
`174`		`-const ws = new FakeWebSocket();`
`175`		`-const opened = waitForWebSocketOpen(ws, 100);`
`176`		`-`
`177`		`-ws.emit("open");`
`178`		`-`
`179`		`-await expect(opened).resolves.toBeUndefined();`
`180`		`-expect(ws.terminated).toBe(false);`
`181`		`-expect(ws.listenerCount("open")).toBe(0);`
`182`		`-expect(ws.listenerCount("error")).toBe(0);`
`183`		`-});`
`184`		`-});`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,58 @@`
	`1`	`+import { EventEmitter } from "node:events";`
	`2`	`+import { describe, expect, it } from "vitest";`
	`3`	`+import { waitForWebSocketOpen } from "../../scripts/e2e/lib/websocket-open.mjs";`
	`4`	`+`
	`5`	`+class FakeWebSocket extends EventEmitter {`
	`6`	`+terminated = false;`
	`7`	`+`
	`8`	`+terminate(): void {`
	`9`	`+this.terminated = true;`
	`10`	`+queueMicrotask(() => {`
	`11`	`+this.emit("error", new Error("socket abort after terminate"));`
	`12`	`+this.emit("close");`
	`13`	`+});`
	`14`	`+}`
	`15`	`+}`
	`16`	`+`
	`17`	`+describe("E2E WebSocket open guard", () => {`
	`18`	`+it("consumes abort errors after open timeouts", async () => {`
	`19`	`+const ws = new FakeWebSocket();`
	`20`	`+const keepAlive = setTimeout(() => {}, 100);`
	`21`	`+`
	`22`	`+try {`
	`23`	`+await expect(waitForWebSocketOpen(ws, 1)).rejects.toThrow("ws open timeout");`
	`24`	`+} finally {`
	`25`	`+clearTimeout(keepAlive);`
	`26`	`+}`
	`27`	`+await new Promise((resolve) => setImmediate(resolve));`
	`28`	`+`
	`29`	`+expect(ws.terminated).toBe(true);`
	`30`	`+expect(ws.listenerCount("open")).toBe(0);`
	`31`	`+expect(ws.listenerCount("error")).toBe(0);`
	`32`	`+});`
	`33`	`+`
	`34`	`+it("uses caller-specific timeout messages", async () => {`
	`35`	`+const ws = new FakeWebSocket();`
	`36`	`+const keepAlive = setTimeout(() => {}, 100);`
	`37`	`+`
	`38`	`+try {`
	`39`	`+await expect(waitForWebSocketOpen(ws, 1, "gateway ws open timeout")).rejects.toThrow(`
	`40`	`+"gateway ws open timeout",`
	`41`	`+);`
	`42`	`+} finally {`
	`43`	`+clearTimeout(keepAlive);`
	`44`	`+}`
	`45`	`+});`
	`46`	`+`
	`47`	`+it("cleans listeners after successful opens", async () => {`
	`48`	`+const ws = new FakeWebSocket();`
	`49`	`+const opened = waitForWebSocketOpen(ws, 100);`
	`50`	`+`
	`51`	`+ws.emit("open");`
	`52`	`+`
	`53`	`+await expect(opened).resolves.toBeUndefined();`
	`54`	`+expect(ws.terminated).toBe(false);`
	`55`	`+expect(ws.listenerCount("open")).toBe(0);`
	`56`	`+expect(ws.listenerCount("error")).toBe(0);`
	`57`	`+});`
	`58`	`+});`

Original file line number	Diff line number	Diff line change
`@@ -1,24 +1,5 @@`
`1`		`-import { EventEmitter } from "node:events";`
`2`	`1`	`import { describe, expect, it } from "vitest";`
`3`	`2`	`import { readGatewayNetworkClientConnectTimeoutMs } from "../../scripts/e2e/lib/gateway-network/limits.mjs";`
`4`		`-import { waitForWebSocketOpen } from "../../scripts/e2e/lib/gateway-network/open-websocket.mjs";`
`5`		`-`
`6`		`-class FakeWebSocket extends EventEmitter {`
`7`		`-terminated = false;`
`8`		`-closed = false;`
`9`		`-`
`10`		`-terminate(): void {`
`11`		`-this.terminated = true;`
`12`		`-queueMicrotask(() => {`
`13`		`-this.emit("error", new Error("socket abort after terminate"));`
`14`		`-this.emit("close");`
`15`		`-});`
`16`		`-}`
`17`		`-`
`18`		`-close(): void {`
`19`		`-this.closed = true;`
`20`		`-}`
`21`		`-}`
`22`	`3`
`23`	`4`	`describe("gateway network WebSocket open guard", () => {`
`24`	`5`	`it("rejects loose client timeout env values instead of parsing prefixes", () => {`
`@@ -52,32 +33,4 @@ describe("gateway network WebSocket open guard", () => {`
`52`	`33`	`}),`
`53`	`34`	`).toBe(3000);`
`54`	`35`	`});`
`55`		`-`
`56`		`-it("consumes abort errors after open timeouts", async () => {`
`57`		`-const ws = new FakeWebSocket();`
`58`		`-const keepAlive = setTimeout(() => {}, 100);`
`59`		`-`
`60`		`-try {`
`61`		`-await expect(waitForWebSocketOpen(ws, 1)).rejects.toThrow("ws open timeout");`
`62`		`-} finally {`
`63`		`-clearTimeout(keepAlive);`
`64`		`-}`
`65`		`-await new Promise((resolve) => setImmediate(resolve));`
`66`		`-`
`67`		`-expect(ws.terminated).toBe(true);`
`68`		`-expect(ws.listenerCount("open")).toBe(0);`
`69`		`-expect(ws.listenerCount("error")).toBe(0);`
`70`		`-});`
`71`		`-`
`72`		`-it("cleans listeners after successful opens", async () => {`
`73`		`-const ws = new FakeWebSocket();`
`74`		`-const opened = waitForWebSocketOpen(ws, 100);`
`75`		`-`
`76`		`-ws.emit("open");`
`77`		`-`
`78`		`-await expect(opened).resolves.toBeUndefined();`
`79`		`-expect(ws.terminated).toBe(false);`
`80`		`-expect(ws.listenerCount("open")).toBe(0);`
`81`		`-expect(ws.listenerCount("error")).toBe(0);`
`82`		`-});`
`83`	`36`	`});`

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

推荐订阅源

Recent Commits to openclaw:main