Skip to content

Write HTML. Render video. Built for agents.

fix(cli): the GPU probe uses the pipe too, so a sandboxed check doesn't wait 120 s (#5622)

Miguel Ángel6c89decb0ddb
diff --git a/packages/cli/src/browser/launch.noListen.test.ts b/packages/cli/src/browser/launch.noListen.test.ts
new file mode 100644
index 0000000000..dc39773e29
--- /dev/null
+++ b/packages/cli/src/browser/launch.noListen.test.ts
@@ -0,0 +1,38 @@
+import { EventEmitter } from "node:events";
+import type { LaunchOptions, PuppeteerNode } from "puppeteer-core";
+import { describe, expect, it, vi } from "vitest";
+
+const probe = vi.hoisted(() => ({ options: [] as LaunchOptions[] }));
+
+vi.mock("./gpuPolicy.js", async (actual) => ({
+ ...(await actual<typeof import("./gpuPolicy.js")>()),
+ resolveCaptureBrowserGpuMode: async (
+ _mode: string,
+ _path: string | undefined,
+ hooks: { launch: (puppeteer: PuppeteerNode, options: LaunchOptions) => Promise<unknown> },
+ ) => {
+ const puppeteer = {
+ launch: async (options: LaunchOptions) => {
+ probe.options.push(options);
+ return { process: () => new EventEmitter() };
+ },
+ } as unknown as PuppeteerNode;
+ await hooks.launch(puppeteer, { headless: true, args: ["--headless"] });
+ return "software";
+ },
+}));
+
+import { resolveManagedGpuMode } from "./launch.js";
+
+describe("the GPU probe where nothing may listen", () => {
+ it("talks to its Chrome over a pipe in one process, and keeps the usual launch otherwise", async () => {
+ await resolveManagedGpuMode("auto", "/chrome", { noListen: true });
+ await resolveManagedGpuMode("auto", "/chrome");
+ expect(probe.options[0]).toMatchObject({
+ pipe: true,
+ args: ["--headless", "--single-process"],
+ });
+ expect(probe.options[1]!.pipe).toBeUndefined();
+ expect(probe.options[1]!.args).toEqual(["--headless"]);
+ });
+});
diff --git a/packages/cli/src/browser/launch.ts b/packages/cli/src/browser/launch.ts
index f6e5b993d4..e513eef1d8 100644
--- a/packages/cli/src/browser/launch.ts
+++ b/packages/cli/src/browser/launch.ts
@@ -42,13 +42,23 @@ function ownSignals(): void {
export async function resolveManagedGpuMode(
requestedMode: BrowserGpuMode,
chromePath?: string,
- context: { signal?: AbortSignal; onBrowser?: (browser: Browser) => void } = {},
+ context: {
+ signal?: AbortSignal;
+ onBrowser?: (browser: Browser) => void;
+ noListen?: boolean;
+ } = {},
): Promise<ResolvedBrowserGpuMode> {
ownSignals();
return resolveCaptureBrowserGpuMode(requestedMode, chromePath, {
launch: async (puppeteer, options) => {
context.signal?.throwIfAborted();
- const browser = await launchManagedBrowser(puppeteer, { ...options, signal: context.signal });
+ const browser = await launchManagedBrowser(puppeteer, {
+ ...options,
+ ...(context.noListen
+ ? { pipe: true, args: [...(options.args ?? []), "--single-process"] }
+ : {}),
+ signal: context.signal,
+ });
try {
context.onBrowser?.(browser);
} catch (error) {
diff --git a/packages/cli/src/capture/captureCompositionFrame.ts b/packages/cli/src/capture/captureCompositionFrame.ts
index a15ab88eea..95e9ded62d 100644
--- a/packages/cli/src/capture/captureCompositionFrame.ts
+++ b/packages/cli/src/capture/captureCompositionFrame.ts
@@ -211,6 +211,7 @@ export async function openSettledCompositionPage(
const resolvedGpuMode = await resolveManagedGpuMode(requestedGpuMode, executablePath, {
signal: options.signal,
onBrowser: options.onBrowser,
+ noListen: answer !== undefined,
});
options.signal?.throwIfAborted();
const webGpu = resolveLocalWebGpu(resolvedGpuMode, requiresWebGpu);