Write HTML. Render video. Built for agents.
JavaScript aiai-agentsanimationclaude-codeffmpegframeworkgsaphtmlhtml-to-videomcpmotion-graphicspuppeteerrenderingtypescriptvideo-editor
test(cli): the capture network tests stop flaking on CI (#6024)
Miguel Ángelcfdddd8a90d1
diff --git a/packages/cli/src/capture/fixtures/capture-fixture-certificate.pem b/packages/cli/src/capture/fixtures/capture-fixture-certificate.pemnew file mode 100644index 0000000000..7c67ef7d8b--- /dev/null+++ b/packages/cli/src/capture/fixtures/capture-fixture-certificate.pem@@ -0,0 +1,20 @@+-----BEGIN CERTIFICATE-----+MIIDVDCCAjygAwIBAgIUDioF2H4Bafsk/bUE0j/foJiauV0wDQYJKoZIhvcNAQEL+BQAwJTEjMCEGA1UEAwwaYXNzZXRzLmNhcHR1cmUtZml4dHVyZS5jb20wIBcNMjYx+MDIxMTIyMDE2WhgPMjEyNjA5MjcxMjIwMTZaMCUxIzAhBgNVBAMMGmFzc2V0cy5j+YXB0dXJlLWZpeHR1cmUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC+AQEAkLsrtFZHoDBdF+mUIBSNQmFyZsC0NE6SrGrqWJDL/2xK6OmXZapMWPCggjYI+awm9AiTChIWYmGjGYLYSqlLCuBgmViRGwDoB9XpP6jhhHRAyor6z0lskHVDqf4OI+/gDpZYhiNcusSkXz8/uh492eBoO/RfFERv1rx+b1shx0b9S6wRDaD+W2OzGIHQQp+EwN84wOtc9d0gRSD+X5QHAV785eeX42lR8hgu8tq8zQSt3iivgsg/EvpLvwvgvP0+vX/cdEpfDtwGSzF/ELrvnHGhBlBemh81KkFmMZ6bNXHgMOkRdrEaC+Buii81Si56+Kzqkh5l7oZqgISf49mySCgwPbQIDAQABo3oweDAdBgNVHQ4EFgQU6JGqZ9HkLtYG+A9cDhbMdlUhndP4wHwYDVR0jBBgwFoAU6JGqZ9HkLtYGA9cDhbMdlUhndP4wDwYD+VR0TAQH/BAUwAwEB/zAlBgNVHREEHjAcghphc3NldHMuY2FwdHVyZS1maXh0dXJl+LmNvbTANBgkqhkiG9w0BAQsFAAOCAQEADGlVVOdB3k1ttErEGMNExXxitBl14dp/+rWknedjIoD4G87ohAeXLOhbbwDv7J29bCoeJDknf0tH2LzlAWgwTSevnxgEuai+c+GuaP9tu1uaIROMa/eFzgP3ekm2OW4ggc10f4cjWTiQ+JFZqCuAkandguvhGwJmGo+T4pdodmWvdbbz0ECPCaS4HeG6UD1pNtE8/uenW0rpNNK8KE9o8TaXBHcFhuoWs6i+WfggFumbJCr2L1K7LgJ345tbVHK5ATu5T56K40Zc30F3swLv8+6rbxPJRZvDTs2k+lBmPcQDXktxvlDwpLWB/y9BRlQFtO0MCIxRKGz6054u4kqS43XR+kw==+-----END CERTIFICATE-----diff --git a/packages/cli/src/capture/fixtures/capture-fixture-key.pem b/packages/cli/src/capture/fixtures/capture-fixture-key.pemnew file mode 100644index 0000000000..29dd552049--- /dev/null+++ b/packages/cli/src/capture/fixtures/capture-fixture-key.pem@@ -0,0 +1,28 @@+-----BEGIN PRIVATE KEY-----+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCQuyu0VkegMF0X+6ZQgFI1CYXJmwLQ0TpKsaupYkMv/bEro6ZdlqkxY8KCCNghrCb0CJMKEhZiYaMZg+thKqUsK4GCZWJEbAOgH1ek/qOGEdEDKivrPSWyQdUOp/g4j+AOlliGI1y6xKRfPz++6Hj3Z4Gg79F8URG/WvH5vWyHHRv1LrBENoP5bY7MYgdBCkTA3zjA61z13SBFIP5+flAcBXvzl55fjaVHyGC7y2rzNBK3eKK+CyD8S+ku/C+C8/S9f9x0Sl8O3AZLMX8Q+uu+ccaEGUF6aHzUqQWYxnps1ceAw6RF2sRoL4G6KLzVKLnorOqSHmXuhmqAhJ/j2+bJIKDA9tAgMBAAECggEAEwQ0yt4nTRntsW2kY86vfNBW+r9JLjJAvVzS684ir63n+7dB7bwVAQNNlE5bL5lyCNBzmXgk7spLZte1WaIC1SwEJUHo1vZ4hkcJ/a5P61pnB+PXb3I6WMCjoOhbCfuFggUpHn7Y+UVLH6Ss1+SPVehRacdDEuOnGjzsE++ScZ+XN0+eioTopbiht9ThVkjeTqYdjB4qjo5aZ8junkn8MIeSjiSj3YLNYU5JuBr3jkm/ZEB+zMrf1Y25ifqik+d+FjmiujeYESfP2SD0zH2kSMg6S10G/yNu62GmyVXr5SdujBcU+ZilclRZidUCPbRnljY5UOK7KmaLol5+jZdDbF0UbNQKBgQDEn9ygNbjNQK+Wvo6t+Xuk07OMeasWNU4768SkGG+FHgxAp9ZmSVYedTuSQsV7fZvZOAaFM+E85vZvjOjsh+INy2Anbze1Dx++xmFLXCmDaPkHXlcukaF3njPu0y7Az9XVCR9xaRYuof3vVQyJwv+E9AWLru0VtvUioFzFvIp09vV2wKBgQC8b6xWurxpFv4kAgK0B6PoY0QPW0Zqd64b+A/dkKjyNQs8yxTRrE8ZgitobMl93MfKE2BnlmkhI02ONOhAzndWxDCvi8ohI3349+XCbs6EUVsbBs1xuGo8/rgbraviG8dcffR4qEbNINCX9hOymgV4vM1og9ETQpAyBS+356H9X3GVwKBgERsNQRzbWnPtsrIaTIfsxu9y5NMKI7zou/keBguH4kZLMjNNLHd+naG6UIOhlZg8Zj3jB1SXnEpFlzfNjcILg4K6/NXh9dsfhbZIQrAC9AmlhcFg6Ykw+3jOcNELiLesFTAJfb7UMLNkGZ2vDQ8aGKIVvodYx27HsuPtp4r93gCq9AoGAKgfW+rvmz8NTaFvoD1Fgn7TvHAI3hZPoQ8aGu2r65BuEyCicGjCO7CemuwIY52QJhD9SL+4jTJjsTn3aZn2ruH4JfQaiyizW5cYB9f51PfpPkfWweX8i4zwFoNbaEfMUQsMtdo+RCVprNLDgNKLdGJSonvvo39k3Qj/ery6RaUySr0CgYEAwDN930UWX2kxWsBZ0ba2+4tD9kmUfM4ePhcOWm70XwwS+JGhDP9Q4PRRqIr+zEhH3KyZbkz7LZWdAE9sRR7LK+HA4KEBvRmaL3oPdqWuPgBdPKWL2J+yTv2otqYgSNrbVq+uK0LHTD10YMQkNsJNKe+3LxT+F6ZKfINCS+AQ/VNIX4=+-----END PRIVATE KEY-----diff --git a/packages/cli/src/capture/publicNetwork.integration.test.ts b/packages/cli/src/capture/publicNetwork.integration.test.tsindex 909ea89fc4..e11f3ffd06 100644--- a/packages/cli/src/capture/publicNetwork.integration.test.ts+++ b/packages/cli/src/capture/publicNetwork.integration.test.ts@@ -1,5 +1,4 @@-import { execFileSync } from "node:child_process";-import { mkdtemp, readFile, rm } from "node:fs/promises";+import { readFile } from "node:fs/promises";import {createServer,type IncomingMessage,@@ -8,8 +7,6 @@ import {} from "node:http";import { createServer as createHttpsServer, type RequestOptions as HttpsOptions } from "node:https";import { createServer as createTcpServer, type Socket } from "node:net";-import { tmpdir } from "node:os";-import { join } from "node:path";import type { TLSSocket } from "node:tls";import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";@@ -77,7 +74,6 @@ type RequestReceipt = {const receipts: RequestReceipt[] = [];const sockets = new Set<Socket>();const streams = new Set<ServerResponse>();-let fixtureDirectory: string;let httpPort: number;let httpsPort: number;let malformedPort: number;@@ -140,32 +136,14 @@ async function waitForStreamClose() {describe("publicRequest controlled socket integration", () => {beforeAll(async () => {- fixtureDirectory = await mkdtemp(join(tmpdir(), "capture-public-network-"));- const key = join(fixtureDirectory, "key.pem");- const certificate = join(fixtureDirectory, "certificate.pem");- execFileSync(- "openssl",- [- "req",- "-x509",- "-newkey",- "rsa:2048",- "-nodes",- "-keyout",- key,- "-out",- certificate,- "-days",- "1",- "-subj",- "/CN=assets.capture-fixture.com",- "-addext",- "subjectAltName=DNS:assets.capture-fixture.com",- ],- { stdio: "pipe" },- );- transport.certificate = await readFile(certificate, "utf8");- httpsServer.setSecureContext({ key: await readFile(key), cert: transport.certificate });+ // A committed self-signed pair (valid to 2126), so this 30 s hook starts no openssl child.+ const fixture = (name: string) =>+ new URL(`./fixtures/capture-fixture-${name}`, import.meta.url);+ transport.certificate = await readFile(fixture("certificate.pem"), "utf8");+ httpsServer.setSecureContext({+ key: await readFile(fixture("key.pem")),+ cert: transport.certificate,+ });httpsServer.on("tlsClientError", () => {});for (const server of servers) {server.on("connection", (socket) => {@@ -199,7 +177,6 @@ describe("publicRequest controlled socket integration", () => {}),),);- await rm(fixtureDirectory, { recursive: true, force: true });});it("pins the checked address without a second DNS lookup and preserves HTTP Host/path", async () => {diff --git a/packages/cli/src/capture/publicNetwork.test.ts b/packages/cli/src/capture/publicNetwork.test.tsindex b6464e2dde..720f66b8b4 100644--- a/packages/cli/src/capture/publicNetwork.test.ts+++ b/packages/cli/src/capture/publicNetwork.test.ts@@ -14,13 +14,23 @@ vi.mock("node:dns", () => ({}));vi.mock("node:http", () => ({ request: mocks.request }));vi.mock("node:https", () => ({ request: mocks.request }));-import { isPublicIPv4, publicRequest, resolvePublicAddress } from "./publicNetwork.js";+import {+ isPublicIPv4,+ publicRequest,+ resolvePublicAddress,+ systemLookupInKillableChild,+} from "./publicNetwork.js";++/** A lookup child that has not exited; the exit hook kills every one still live. */+function liveChild() {+ return Object.assign(new EventEmitter(), { kill: vi.fn() });+}/** The system lookup child prints `stdout`, or fails with `stderr`. */function systemLookupPrints(stdout: string, stderr = "") {mocks.execFile.mockImplementation((_file, _args, _options, callback) => {callback(stdout ? null : new Error("Command failed"), stdout, stderr);- return new EventEmitter();+ return liveChild();});}@@ -94,7 +104,7 @@ describe("public address policy", () => {vi.useFakeTimers();try {mocks.resolve4.mockRejectedValue(new Error("queryA ENOTFOUND"));- mocks.execFile.mockImplementation(() => new EventEmitter());+ mocks.execFile.mockImplementation(() => liveChild());const first = resolvePublicAddress("slow.example.org").catch((error: Error) => error.message);await vi.advanceTimersByTimeAsync(9_000);const second = resolvePublicAddress("slow.example.org").catch(@@ -216,3 +226,16 @@ describe("transport lifecycle", () => {expect(incoming.destroyed).toBe(true);});});++describe("system lookup children", () => {+ it("kills every lookup still live when the process exits", () => {+ const child = liveChild();+ mocks.execFile.mockImplementation(() => child);+ void systemLookupInKillableChild("live.example.org", 60_000).catch(() => {});+ const exitHooks = process.listeners("exit").filter((hook) => hook.name === "killLiveLookups");+ expect(exitHooks).toHaveLength(1);+ // Earlier tests' children are still live too, so this also fails if any fake lacks kill().+ for (const hook of exitHooks) hook(0);+ expect(child.kill).toHaveBeenCalledWith("SIGKILL");+ });+});