Skip to content

Write HTML. Render video. Built for agents.

fix(cli): first render on Windows no longer fails while a new browser or ffmpeg is scanned (#5625)

Miguel Ángel03a9fab9a7b1
diff --git a/packages/cli/src/browser/ffmpeg.ts b/packages/cli/src/browser/ffmpeg.ts
index 3ed7594684..ab5cd194f6 100644
--- a/packages/cli/src/browser/ffmpeg.ts
+++ b/packages/cli/src/browser/ffmpeg.ts
@@ -35,7 +35,7 @@ export function detectH264EncoderMode(ffmpegPath: string, gpuRequested: boolean)
const encoders = execFileSync(ffmpegPath, ["-hide_banner", "-encoders"], {
encoding: "utf-8",
stdio: ["ignore", "pipe", "pipe"],
- timeout: 5000,
+ timeout: FIRST_LAUNCH_TIMEOUT_MS,
windowsHide: true,
});
return resolveH264EncoderMode(encoders, gpuRequested);
@@ -48,7 +48,7 @@ export async function detectH264EncoderModeForRender(
): Promise<H264EncoderMode> {
const result = await runCancellableProcess(ffmpegPath, ["-hide_banner", "-encoders"], {
signal,
- timeoutMs: 5000,
+ timeoutMs: FIRST_LAUNCH_TIMEOUT_MS,
});
return resolveH264EncoderMode(result.stdout, gpuRequested);
}
@@ -64,6 +64,7 @@ export function findFFprobe(): string | undefined {
return findFfBinary("ffprobe", { configuredMustExist: true });
}
+export const FIRST_LAUNCH_TIMEOUT_MS = 60_000;
const FFMPEG_DOWNLOAD_URL = "https://ffmpeg.org/download.html";
/**
diff --git a/packages/cli/src/browser/preflight.test.ts b/packages/cli/src/browser/preflight.test.ts
index 976ad50504..6c63a30de4 100644
--- a/packages/cli/src/browser/preflight.test.ts
+++ b/packages/cli/src/browser/preflight.test.ts
@@ -60,7 +60,7 @@ describe("runEnvironmentChecks", () => {
expect(runProcess).toHaveBeenCalledWith(
process.execPath,
["-version"],
- expect.objectContaining({ timeoutMs: 5000 }),
+ expect.objectContaining({ timeoutMs: 60_000 }),
);
});
@@ -258,7 +258,7 @@ describe("runEnvironmentChecks", () => {
process.execPath,
["--version"],
expect.objectContaining({
- timeoutMs: 5000,
+ timeoutMs: 60_000,
maxBufferBytes: 64 * 1024,
}),
);
diff --git a/packages/cli/src/browser/preflight.ts b/packages/cli/src/browser/preflight.ts
index f51104e5ef..543f14cf57 100644
--- a/packages/cli/src/browser/preflight.ts
+++ b/packages/cli/src/browser/preflight.ts
@@ -3,7 +3,12 @@ import { platform } from "node:os";
import { findFfBinary } from "@hyperframes/parsers/ff-binaries";
import { ensureBrowser, findBrowser, type BrowserResult } from "./manager.js";
import { describeBrowserInstall, type BrowserInstallFacts } from "./installFacts.js";
-import { FFMPEG_PATH_ENV, FFPROBE_PATH_ENV, getFFmpegInstallHint } from "./ffmpeg.js";
+import {
+ FFMPEG_PATH_ENV,
+ FFPROBE_PATH_ENV,
+ FIRST_LAUNCH_TIMEOUT_MS,
+ getFFmpegInstallHint,
+} from "./ffmpeg.js";
import {
chromeDepsInstallCommand,
detectLinuxDistro,
@@ -78,7 +83,7 @@ async function readToolVersion(
const output = (
await runCancellableProcess(binaryPath, ["-version"], {
signal,
- timeoutMs: 5000,
+ timeoutMs: FIRST_LAUNCH_TIMEOUT_MS,
})
).stdout;
const raw = output.split("\n")[0] ?? "";
@@ -260,7 +265,7 @@ async function chromeLaunchOutcome(
try {
const { stdout } = await runCancellableProcess(executablePath, ["--version"], {
signal,
- timeoutMs: 5000,
+ timeoutMs: FIRST_LAUNCH_TIMEOUT_MS,
maxBufferBytes: 64 * 1024,
});
return { ...found, versionMajor: extractMajorVersion(stdout) };
diff --git a/packages/cli/src/utils/cancellableProcess.killFailure.test.ts b/packages/cli/src/utils/cancellableProcess.killFailure.test.ts
new file mode 100644
index 0000000000..b62aaa0305
--- /dev/null
+++ b/packages/cli/src/utils/cancellableProcess.killFailure.test.ts
@@ -0,0 +1,20 @@
+import { describe, expect, it, vi } from "vitest";
+
+vi.mock("./processTree.js", () => ({
+ terminateProcessTree: () => Promise.reject(new Error("taskkill exited with status 128")),
+}));
+
+const { runCancellableProcess } = await import("./cancellableProcess.js");
+
+describe("runCancellableProcess when the tree kill fails", () => {
+ it("still rejects with the timeout, not the kill failure", async () => {
+ const run = runCancellableProcess(process.execPath, ["-e", "setTimeout(() => {}, 400)"], {
+ timeoutMs: 50,
+ });
+
+ await expect(run).rejects.toMatchObject({
+ message: "Process timed out after 50 ms",
+ code: "ETIMEDOUT",
+ });
+ });
+});
diff --git a/packages/cli/src/utils/cancellableProcess.ts b/packages/cli/src/utils/cancellableProcess.ts
index 6a0557b3f6..6916e15d28 100644
--- a/packages/cli/src/utils/cancellableProcess.ts
+++ b/packages/cli/src/utils/cancellableProcess.ts
@@ -90,13 +90,7 @@ export function runCancellableProcess(
};
const finishReject = async (error: unknown): Promise<void> => {
if (settled) return;
- if (terminationTask) {
- try {
- terminationSignal = await terminationTask;
- } catch (terminationError) {
- error = terminationError;
- }
- }
+ if (terminationTask) terminationSignal = await terminationTask.catch(() => terminationSignal);
if (settled) return;
settled = true;
cleanup();
@@ -130,14 +124,7 @@ export function runCancellableProcess(
// fallow-ignore-next-line complexity
child.once("close", async (status, closeSignal) => {
if (settled) return;
- if (terminationTask) {
- try {
- terminationSignal = await terminationTask;
- } catch (error) {
- await finishReject(error);
- return;
- }
- }
+ if (terminationTask) terminationSignal = await terminationTask.catch(() => terminationSignal);
if (settled) return;
settled = true;
cleanup();