TypeScript
fix(server): browser setup advice names the server's T3 home (#29646)
Alex Southwelle91595ba0a1a
diff --git a/apps/server/src/htmlRender/HtmlRender.test.ts b/apps/server/src/htmlRender/HtmlRender.test.tsindex 19163276725..7d555c46a4e 100644--- a/apps/server/src/htmlRender/HtmlRender.test.ts+++ b/apps/server/src/htmlRender/HtmlRender.test.ts@@ -22,6 +22,7 @@ import * as ServerConfig from "../config.ts";import * as HtmlRender from "./HtmlRender.ts";import { HtmlRenderBrowserError } from "./headlessChrome.ts";import * as PreviewBrowser from "../preview/PreviewBrowser.ts";+import * as PreviewBrowserHost from "../preview/PreviewBrowserHost.ts";const TEST_BROWSER_ENV = "T3CODE_TEST_HEADLESS_SHELL";@@ -365,6 +366,34 @@ fs.createReadStream(null, { fd: 3 }).on("end", quit).on("data", (chunk) => {expect(Option.getOrElse(exitedBy, () => "killed by a signal")).toBe("asked to close");}).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),);++ it.live("names this server's home in the browser setup command", () =>+ Effect.gen(function* () {+ const fileSystem = yield* FileSystem.FileSystem;+ const path = yield* Path.Path;+ const directory = yield* fileSystem.makeTempDirectoryScoped({+ prefix: "t3-fake-browser-",+ });+ const executable = path.join(directory, "chrome-headless-shell");+ yield* fileSystem.writeFileString(+ executable,+ `#!${process.execPath}\nprocess.stderr.write(${JSON.stringify(PreviewBrowserHost.NO_SANDBOX_SIGNATURE)});\nprocess.exit(1);\n`,+ { mode: 0o755 },+ );++ const { error, baseDir } = yield* Effect.gen(function* () {+ const { baseDir } = yield* ServerConfig.ServerConfig;+ const htmlRender = yield* HtmlRender.HtmlRender;+ const error = yield* htmlRender.preview({ html: "<p>x</p>" }).pipe(Effect.flip);+ return { error, baseDir };+ }).pipe(+ Effect.provide(layerHtmlRender(executable)),+ Effect.provideService(HostProcess.UserId, 1000),+ );+ expect(error).toBeInstanceOf(PreviewBrowserHost.PreviewBrowserSandboxError);+ expect(error.message).toContain(`browser setup --base-dir ${baseDir}`);+ }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),+ );},);diff --git a/apps/server/src/htmlRender/HtmlRender.ts b/apps/server/src/htmlRender/HtmlRender.tsindex 44ea627ceab..d1330cc679a 100644--- a/apps/server/src/htmlRender/HtmlRender.ts+++ b/apps/server/src/htmlRender/HtmlRender.ts@@ -340,7 +340,11 @@ const make = Effect.gen(function* () {const browsers = yield* Semaphore.make(MAX_CONCURRENT_BROWSERS);// Keep Chrome sandboxed unless explicitly disabled; root must opt out to run.const noSandbox = PreviewBrowserHost.sandboxDisabled(yield* HostProcess.Environment);- const setupCommand = yield* resolveRootCliCommand(PreviewBrowserHost.SETUP_SUBCOMMAND);+ // sudo resets the environment, so the command has to name this server's home.+ const setupCommand = yield* resolveRootCliCommand(PreviewBrowserHost.SETUP_SUBCOMMAND, [+ "--base-dir",+ config.baseDir,+ ]);const launching = <A>(executable: string,diff --git a/apps/server/src/preview/ServerBrowser.ts b/apps/server/src/preview/ServerBrowser.tsindex 7444b84f906..6c147bbf9fe 100644--- a/apps/server/src/preview/ServerBrowser.ts+++ b/apps/server/src/preview/ServerBrowser.ts@@ -469,7 +469,11 @@ const make = Effect.gen(function* () {const runFork = Effect.runForkWith(yield* Effect.context<never>());const runPromise = Effect.runPromiseWith(yield* Effect.context<never>());const launchServices = yield* Effect.context<ChildProcessSpawner.ChildProcessSpawner>();- const setupCommand = yield* resolveRootCliCommand(PreviewBrowserHost.SETUP_SUBCOMMAND);+ // sudo resets the environment, so the command has to name this server's home.+ const setupCommand = yield* resolveRootCliCommand(PreviewBrowserHost.SETUP_SUBCOMMAND, [+ "--base-dir",+ config.baseDir,+ ]);const agentScope = yield* AgentScope;const launchersDir = NodePath.join(config.stateDir, "server-browser", "launchers");