Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
fix: Stop owned preview process trees (#6111)
Oleg Isonen21ca56768694
diff --git a/packages/cli/package.json b/packages/cli/package.jsonindex 756c2f2ecb..613e37e6af 100644--- a/packages/cli/package.json+++ b/packages/cli/package.json@@ -56,6 +56,7 @@"detect-port": "^2.1.0","env-paths": "^3.0.0","esbuild": "^0.25.3",+ "execa": "^10.0.1","fast-deep-equal": "^3.1.3","get-port": "^7.2.0","immer": "^10.1.1",diff --git a/packages/cli/src/commands/preview.test.ts b/packages/cli/src/commands/preview.test.tsindex 7d24dad6f2..7352dd265e 100644--- a/packages/cli/src/commands/preview.test.ts+++ b/packages/cli/src/commands/preview.test.ts@@ -17,6 +17,7 @@ import { createPublishedProjectBundleFixture } from "@webstudio-is/protocol/fixtimport {ensurePreviewDependencies,buildPreparedPreview,+ createPreviewCleanupError,getNodeModulesSearchPaths,getPreviewBuildCacheKey,getPreviewProjectDir,@@ -835,3 +836,21 @@ test("documents generated app dependency setup", () => {expect(epilogueText).toContain("Do not add generated-preview dependencies");expect(epilogueText).toContain("check npm and network configuration");});++test("reports the locked preview path, owned PID, and scoped recovery", async () => {+ const error = await createPreviewCleanupError({+ previewProjectDir: "/project/.webstudio/preview",+ lockedPath: "/project/.webstudio/preview/app/routes.tsx",+ cause: Object.assign(new Error("operation not permitted"), {+ code: "EPERM",+ }),+ readOwnerFile: vi.fn(async () =>+ JSON.stringify({ supervisorPid: 120, previewPid: 121 })+ ) as never,+ });++ expect(error.message).toContain("/project/.webstudio/preview/app/routes.tsx");+ expect(error.message).toContain("Recorded owned preview PIDs: 120, 121");+ expect(error.message).toContain("taskkill.exe /pid 121 /t /f");+ expect(error.message).toContain("kill -- -121");+});diff --git a/packages/cli/src/commands/preview.ts b/packages/cli/src/commands/preview.tsindex 31608da722..4d7b3dd585 100644--- a/packages/cli/src/commands/preview.ts+++ b/packages/cli/src/commands/preview.ts@@ -29,6 +29,7 @@ import {getPreviewUrl,getNpmInvocation,previewBuildCacheMarker,+ previewProcessOwnerFile,runPreviewBuild,startPreviewServer,waitForPreviewExit,@@ -211,6 +212,46 @@ const getPreviewInstallFailureDiagnostics = (error: unknown) => {export const getPreviewProjectDir = (projectDir = cwd()) =>join(projectDir, ".webstudio", "preview");+type PreviewProcessOwner = {+ supervisorPid?: unknown;+ previewPid?: unknown;+};++export const createPreviewCleanupError = async ({+ previewProjectDir,+ lockedPath,+ cause,+ readOwnerFile = readFile,+}: {+ previewProjectDir: string;+ lockedPath: string;+ cause: unknown;+ readOwnerFile?: (path: string, encoding: "utf8") => Promise<string>;+}) => {+ const owner = await readOwnerFile(+ join(previewProjectDir, "..", previewProcessOwnerFile),+ "utf8"+ )+ .then((value) => JSON.parse(value) as PreviewProcessOwner)+ .catch(() => undefined);+ const pids = [owner?.supervisorPid, owner?.previewPid].filter(+ (value): value is number =>+ typeof value === "number" && Number.isInteger(value) && value > 0+ );+ const ownerHint =+ pids.length === 0+ ? "No owned preview PID was recorded."+ : `Recorded owned preview PIDs: ${pids.join(", ")}.`;+ const recovery =+ pids.length === 0+ ? "Stop the CLI/MCP process that started preview. On WSL/Windows, use PowerShell Get-CimInstance Win32_Process to find a command whose path is inside the locked preview directory, verify it belongs to this project, and stop only that PID."+ : `Stop preview from its owning CLI/MCP session. If that owner is gone, verify the recorded PID belongs to this project, then terminate only its tree (WSL/Windows: taskkill.exe /pid ${pids.at(-1)} /t /f; Linux/macOS: kill -- -${pids.at(-1)}).`;+ return new Error(+ `PREVIEW_CLEANUP_FAILED: Could not remove generated preview path ${lockedPath}. A preview process may still have it open. ${ownerHint} ${recovery}`,+ { cause }+ );+};+export const ensurePreviewDependencies = async (previewProjectDir: string,dependencies: Partial<PreviewDependencyOperations> = {}@@ -279,8 +320,23 @@ export const ensurePreviewDependencies = async (return;}}- await operations.rm(previewNodeModules, { recursive: true, force: true });- } catch {+ try {+ await operations.rm(previewNodeModules, { recursive: true, force: true });+ } catch (error) {+ throw await createPreviewCleanupError({+ previewProjectDir,+ lockedPath: previewNodeModules,+ cause: error,+ readOwnerFile: operations.readFile,+ });+ }+ } catch (error) {+ if (+ error instanceof Error &&+ error.message.startsWith("PREVIEW_CLEANUP_FAILED:")+ ) {+ throw error;+ }// Continue with the CLI dependency tree or an isolated install.}@@ -388,9 +444,18 @@ const preparePreviewDirectory = async (await Promise.all(entries.filter((entry) => entry !== "node_modules")- .map((entry) =>- rm(join(previewProjectDir, entry), { recursive: true, force: true })- )+ .map(async (entry) => {+ const entryPath = join(previewProjectDir, entry);+ try {+ await rm(entryPath, { recursive: true, force: true });+ } catch (error) {+ throw await createPreviewCleanupError({+ previewProjectDir,+ lockedPath: entryPath,+ cause: error,+ });+ }+ }));}await copyPreviewProjectFiles(projectDir, previewProjectDir);diff --git a/packages/cli/src/preview-process-supervisor.test.ts b/packages/cli/src/preview-process-supervisor.test.tsnew file mode 100644index 0000000000..01bc202470--- /dev/null+++ b/packages/cli/src/preview-process-supervisor.test.ts@@ -0,0 +1,144 @@+import { spawn } from "node:child_process";+import { access, mkdtemp, readFile, rm } from "node:fs/promises";+import { tmpdir } from "node:os";+import { join } from "node:path";+import { cwd } from "node:process";+import { fileURLToPath } from "node:url";+import { expect, test } from "vitest";++const sleep = (durationMs: number) =>+ new Promise<void>((resolve) => setTimeout(resolve, durationMs));++const waitFor = async (predicate: () => boolean | Promise<boolean>) => {+ const deadline = Date.now() + 5_000;+ while ((await predicate()) === false) {+ if (Date.now() > deadline) {+ throw new Error("Timed out waiting for the preview process state.");+ }+ await sleep(25);+ }+};++const isProcessRunning = (pid: number) => {+ try {+ process.kill(pid, 0);+ return true;+ } catch (error) {+ return !(+ error instanceof Error &&+ "code" in error &&+ error.code === "ESRCH"+ );+ }+};++const stopProcess = (pid: number | undefined) => {+ if (pid === undefined) {+ return;+ }+ try {+ process.kill(pid, "SIGKILL");+ } catch {+ // The process already stopped.+ }+};++const getLifecycleTestRoot = async () => {+ if (process.env.WEBSTUDIO_WSL_9P_TEST_ROOT !== undefined) {+ return process.env.WEBSTUDIO_WSL_9P_TEST_ROOT;+ }+ const isWsl = await readFile("/proc/sys/kernel/osrelease", "utf8")+ .then((value) => value.toLowerCase().includes("microsoft"))+ .catch(() => false);+ return isWsl && cwd().startsWith("/mnt/") ? cwd() : tmpdir();+};++type LifecycleCase = {+ name: string;+ stopMethod: "disconnect" | "SIGHUP" | "SIGTERM";+ resistSigterm?: boolean;+};++const lifecycleCases = (+ [+ { name: "owner disconnect", stopMethod: "disconnect" },+ { name: "owner SIGTERM", stopMethod: "SIGTERM" },+ { name: "owner SIGHUP", stopMethod: "SIGHUP" },+ {+ name: "owner disconnect with a SIGTERM-resistant descendant",+ stopMethod: "disconnect",+ resistSigterm: true,+ },+ ] satisfies LifecycleCase[]+).filter(+ ({ stopMethod }) => process.platform !== "win32" || stopMethod !== "SIGHUP"+);++test.each(lifecycleCases)(+ "stops the complete preview process tree on $name",+ async ({ stopMethod, resistSigterm = false }) => {+ const directory = await mkdtemp(+ join(await getLifecycleTestRoot(), "webstudio-preview-owner-")+ );+ const processFile = join(directory, "processes.json");+ const ownerFile = join(directory, "preview-process.json");+ const descendantScript = [+ ...(resistSigterm ? ['process.on("SIGTERM", () => {});'] : []),+ 'process.send?.("ready");',+ "setInterval(() => {}, 1000);",+ ].join("\n");+ const childScript = [+ 'const { spawn } = require("node:child_process");',+ 'const { writeFileSync } = require("node:fs");',+ `const descendant = spawn(process.execPath, ["-e", ${JSON.stringify(descendantScript)}], { stdio: ["ignore", "ignore", "ignore", "ipc"] });`,+ `descendant.once("message", () => writeFileSync(${JSON.stringify(processFile)}, JSON.stringify({ launcher: process.pid, descendant: descendant.pid })));`,+ "setInterval(() => {}, 1000);",+ ].join("\n");+ const supervisor = spawn(+ process.execPath,+ [+ "--import=tsx",+ fileURLToPath(+ new URL("./preview-process-supervisor.ts", import.meta.url)+ ),+ JSON.stringify({+ command: process.execPath,+ args: ["-e", childScript],+ cwd: directory,+ ownerFile,+ }),+ ],+ { stdio: ["ignore", "ignore", "inherit", "ipc"] }+ );+ const supervisorExit = new Promise<void>((resolve) => {+ supervisor.once("exit", () => resolve());+ });+ let ownedProcesses: { launcher: number; descendant: number } | undefined;++ try {+ await waitFor(async () => {+ ownedProcesses = await readFile(processFile, "utf8")+ .then((value) => JSON.parse(value))+ .catch(() => undefined);+ return ownedProcesses !== undefined;+ });+ await expect(readFile(ownerFile, "utf8")).resolves.toContain(+ `"previewPid":${ownedProcesses!.launcher}`+ );+ if (stopMethod === "disconnect") {+ supervisor.disconnect();+ } else {+ supervisor.kill(stopMethod);+ }+ await supervisorExit;+ await waitFor(() => isProcessRunning(ownedProcesses!.launcher) === false);+ expect(isProcessRunning(ownedProcesses!.descendant)).toBe(false);+ await expect(access(ownerFile)).rejects.toMatchObject({ code: "ENOENT" });+ } finally {+ supervisor.kill("SIGKILL");+ stopProcess(ownedProcesses?.launcher);+ stopProcess(ownedProcesses?.descendant);+ await rm(directory, { recursive: true, force: true });+ }+ }+);diff --git a/packages/cli/src/preview-process-supervisor.ts b/packages/cli/src/preview-process-supervisor.tsnew file mode 100644index 0000000000..f16849663b--- /dev/null+++ b/packages/cli/src/preview-process-supervisor.ts@@ -0,0 +1,105 @@+import { readFile, rm, writeFile } from "node:fs/promises";+import { execa } from "execa";++type PreviewProcessConfig = {+ command: string;+ args: string[];+ cwd?: string;+ ownerFile?: string;+};++const parseConfig = (): PreviewProcessConfig => {+ const value = process.argv[2];+ if (value === undefined) {+ throw new Error("Preview process supervisor configuration is missing.");+ }+ const config = JSON.parse(value) as Partial<PreviewProcessConfig>;+ if (+ typeof config.command !== "string" ||+ Array.isArray(config.args) === false ||+ config.args.some((value) => typeof value !== "string") ||+ (config.cwd !== undefined && typeof config.cwd !== "string") ||+ (config.ownerFile !== undefined && typeof config.ownerFile !== "string")+ ) {+ throw new Error("Preview process supervisor configuration is invalid.");+ }+ return config as PreviewProcessConfig;+};++const main = async () => {+ const config = parseConfig();+ const child = execa(config.command, config.args, {+ cwd: config.cwd,+ env: process.env,+ stdio: "inherit",+ killDescendants: true,+ reject: false,+ });+ const clearOwnerFile = async () => {+ if (config.ownerFile === undefined) {+ return;+ }+ const owner = await readFile(config.ownerFile, "utf8")+ .then((value) => JSON.parse(value) as { supervisorPid?: unknown })+ .catch(() => undefined);+ if (owner?.supervisorPid === process.pid) {+ await rm(config.ownerFile, { force: true }).catch(() => undefined);+ }+ };+ if (config.ownerFile !== undefined) {+ await writeFile(+ config.ownerFile,+ JSON.stringify({+ supervisorPid: process.pid,+ previewPid: child.pid,+ previewDirectory: config.cwd,+ })+ ).catch(() => undefined);+ }+ let stopping: Promise<void> | undefined;+ const stop = () => {+ stopping ??= (async () => {+ child.kill("SIGKILL");+ await child;+ await clearOwnerFile();+ })().finally(() => {+ process.exitCode = 0;+ if (process.connected) {+ process.disconnect();+ }+ });+ return stopping;+ };+ process.once("disconnect", () => void stop());+ for (const signal of ["SIGHUP", "SIGINT", "SIGTERM"] as const) {+ process.once(signal, () => void stop());+ }+ child.nodeChildProcess.once("error", (error) => {+ console.error(`Could not start the generated preview process: ${error}`);+ process.exitCode = 1;+ void clearOwnerFile().finally(() => {+ if (process.connected) {+ process.disconnect();+ }+ });+ });+ child.nodeChildProcess.once("exit", (code, signal) => {+ if (stopping !== undefined) {+ return;+ }+ if (signal !== null) {+ process.exitCode = 1;+ } else {+ process.exitCode = code ?? 0;+ }+ void clearOwnerFile().finally(() => {+ if (process.connected) {+ process.disconnect();+ }+ });+ });+};++if (process.argv[1] !== undefined) {+ await main();+}diff --git a/packages/cli/src/preview-server.test.ts b/packages/cli/src/preview-server.test.tsindex 34b2b5ec76..4110977202 100644--- a/packages/cli/src/preview-server.test.ts+++ b/packages/cli/src/preview-server.test.ts@@ -58,8 +58,6 @@ const createDependencies = (readFile: vi.fn(async () => "") as never,writeFile: vi.fn(async () => undefined) as never,sleep: vi.fn(async () => undefined),- killProcess: vi.fn(() => true),- killWindowsProcessTree: vi.fn(async () => true),parentProcess: {pid: 456,once: vi.fn(),@@ -68,6 +66,8 @@ const createDependencies = (},nodeExecPath: "/usr/bin/node",npmExecPath: undefined,+ processExecArgv: [],+ supervisorPath: "/tmp/preview-process-supervisor.js",platform: "linux",...overrides,});@@ -80,7 +80,9 @@ const createPreviewProcess = (killed: false,exitCode: null,signalCode: null,+ connected: true,once: vi.fn(),+ disconnect: vi.fn(),kill: vi.fn(() => true),...overrides,}) as ReturnType<typeof startPreviewServer>["process"];@@ -280,15 +282,27 @@ test("starts generated project production server with inherited stdio", () => {url: "http://127.0.0.1:5173/",process,});- expect(spawn).toHaveBeenCalledWith("npm", ["run", "start"], {- cwd: "/tmp/preview",- stdio: "inherit",- env: expect.objectContaining({- HOST: "127.0.0.1",- PORT: "5173",- NODE_ENV: "production",- }),- });+ expect(spawn).toHaveBeenCalledWith(+ "/usr/bin/node",+ [+ "/tmp/preview-process-supervisor.js",+ JSON.stringify({+ command: "npm",+ args: ["run", "start"],+ cwd: "/tmp/preview",+ ownerFile: "/tmp/preview-process.json",+ }),+ ],+ {+ cwd: "/tmp/preview",+ stdio: ["inherit", "inherit", "inherit", "ipc"],+ env: expect.objectContaining({+ HOST: "127.0.0.1",+ PORT: "5173",+ NODE_ENV: "production",+ }),+ }+ );});test("passes explicit external image domains to the preview optimizer", () => {@@ -306,8 +320,8 @@ test("passes explicit external image domains to the preview optimizer", () => {);expect(spawn).toHaveBeenCalledWith(- "npm",- ["run", "start"],+ "/usr/bin/node",+ ["/tmp/preview-process-supervisor.js", expect.any(String)],expect.objectContaining({env: expect.objectContaining({DOMAINS: "storage.example.com,images.example.org",@@ -340,13 +354,21 @@ test("starts generated project production server through windows npm-cli", () =>expect(spawn).toHaveBeenCalledWith("C:\\Program Files\\nodejs\\node.exe",[- "C:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js",- "run",- "start",+ "/tmp/preview-process-supervisor.js",+ JSON.stringify({+ command: "C:\\Program Files\\nodejs\\node.exe",+ args: [+ "C:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js",+ "run",+ "start",+ ],+ cwd: "C:/project/.webstudio/preview",+ ownerFile: "C:/project/.webstudio/preview-process.json",+ }),],{cwd: "C:/project/.webstudio/preview",- stdio: "inherit",+ stdio: ["inherit", "inherit", "inherit", "ipc"],env: expect.objectContaining({HOST: "127.0.0.1",PORT: "5173",@@ -384,16 +406,28 @@ test("preview controller builds once and reuses a running server", async () => {"http://127.0.0.1:5173/pricing");expect(spawn).toHaveBeenCalledTimes(2);- expect(spawn).toHaveBeenLastCalledWith("npm", ["run", "start"], {- cwd: "/tmp/preview",- detached: true,- stdio: ["ignore", "pipe", "pipe"],- env: expect.objectContaining({- HOST: "127.0.0.1",- PORT: "5173",- NODE_ENV: "production",- }),- });+ expect(spawn).toHaveBeenLastCalledWith(+ "/usr/bin/node",+ [+ "/tmp/preview-process-supervisor.js",+ JSON.stringify({+ command: "npm",+ args: ["run", "start"],+ cwd: "/tmp/preview",+ ownerFile: "/tmp/preview-process.json",+ }),+ ],+ {+ cwd: "/tmp/preview",+ detached: true,+ stdio: ["ignore", "pipe", "pipe", "ipc"],+ env: expect.objectContaining({+ HOST: "127.0.0.1",+ PORT: "5173",+ NODE_ENV: "production",+ }),+ }+ );});test("iterative preview starts without a production build", async () => {@@ -415,16 +449,24 @@ test("iterative preview starts without a production build", async () => {});expect(spawn).toHaveBeenCalledOnce();expect(spawn).toHaveBeenCalledWith(- "npm",+ "/usr/bin/node",[- "run",- "dev",- "--",- "--host",- "127.0.0.1",- "--port",- "5173",- "--strictPort",+ "/tmp/preview-process-supervisor.js",+ JSON.stringify({+ command: "npm",+ args: [+ "run",+ "dev",+ "--",+ "--host",+ "127.0.0.1",+ "--port",+ "5173",+ "--strictPort",+ ],+ cwd: "/tmp/preview",+ ownerFile: "/tmp/preview-process.json",+ }),],expect.objectContaining({env: expect.objectContaining({@@ -459,20 +501,28 @@ test("starts a managed Windows preview through npm-cli with supported spawn optiexpect(spawn).toHaveBeenCalledWith("C:\\Program Files\\nodejs\\node.exe",[- "C:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js",- "run",- "dev",- "--",- "--host",- "127.0.0.1",- "--port",- "5173",- "--strictPort",+ "/tmp/preview-process-supervisor.js",+ JSON.stringify({+ command: "C:\\Program Files\\nodejs\\node.exe",+ args: [+ "C:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js",+ "run",+ "dev",+ "--",+ "--host",+ "127.0.0.1",+ "--port",+ "5173",+ "--strictPort",+ ],+ cwd: "C:/project/.webstudio/preview",+ ownerFile: "C:/project/.webstudio/preview-process.json",+ }),],expect.objectContaining({cwd: "C:/project/.webstudio/preview",detached: false,- stdio: ["ignore", "pipe", "pipe"],+ stdio: ["ignore", "pipe", "pipe", "ipc"],}));});@@ -512,8 +562,8 @@ test("preview controller reuses a matching persisted production build", async ());expect(spawn).toHaveBeenCalledOnce();expect(spawn).toHaveBeenCalledWith(- "npm",- ["run", "start"],+ "/usr/bin/node",+ ["/tmp/preview-process-supervisor.js", expect.any(String)],expect.any(Object));expect(writeFile).not.toHaveBeenCalled();@@ -577,57 +627,17 @@ test("preview controller passes image domains to the managed server", async () =);expect(spawn).toHaveBeenLastCalledWith(- "npm",- ["run", "start"],+ "/usr/bin/node",+ ["/tmp/preview-process-supervisor.js", expect.any(String)],expect.objectContaining({env: expect.objectContaining({ DOMAINS: "images.example.com" }),}));});-test("preview controller stops the Windows preview process tree", async () => {+test("preview controller disconnects the owned preview supervisor", async () => {const process = createPreviewProcess();- const buildProcess = createPreviewProcess();let exitListener: (() => void) | undefined;- const killWindowsProcessTree = vi.fn(async () => {- exitListener?.();- return true;- });- const controller = createPreviewController(- { host: "127.0.0.1", port: 5173, cwd: "/tmp/preview" },- createDependencies({- platform: "win32",- killWindowsProcessTree,- spawn: vi- .fn()- .mockReturnValueOnce(buildProcess)- .mockReturnValueOnce(process) as never,- })- );- resolveProcessExit(buildProcess);- vi.mocked(- process.once as (event: string, callback: unknown) => unknown- ).mockImplementation((event, callback) => {- if (event === "exit" && typeof callback === "function") {- exitListener = callback as () => void;- }- return process;- });- await controller.start();-- await expect(controller.stop()).resolves.toEqual({- running: false,- });- expect(killWindowsProcessTree).toHaveBeenCalledWith(123);- expect(process.kill).not.toHaveBeenCalled();- await expect(controller.stop()).resolves.toEqual({- running: false,- });-});--test("preview controller stops the entire POSIX preview process group", async () => {- const process = createPreviewProcess();- const killProcess = vi.fn(() => true);const controller = createPreviewController({host: "127.0.0.1",@@ -637,10 +647,8 @@ test("preview controller stops the entire POSIX preview process group", async ()},createDependencies({spawn: vi.fn(() => process) as never,- killProcess,}));- let exitListener: (() => void) | undefined;vi.mocked(process.once as (event: string, callback: unknown) => unknown).mockImplementation((event, callback) => {@@ -649,21 +657,19 @@ test("preview controller stops the entire POSIX preview process group", async ()}return process;});- killProcess.mockImplementation(() => {+ vi.mocked(process.disconnect).mockImplementation(() => {exitListener?.();- return true;});await controller.start();await controller.stop();- expect(killProcess).toHaveBeenCalledWith(-123, "SIGTERM");+ expect(process.disconnect).toHaveBeenCalledOnce();expect(process.kill).not.toHaveBeenCalled();});-test("preview controller stops its process group before propagating termination", async () => {+test("preview controller disconnects its supervisor before propagating termination", async () => {const process = createPreviewProcess();- const killProcess = vi.fn(() => true);const parentProcess = {pid: 456,once: vi.fn(),@@ -679,7 +685,6 @@ test("preview controller stops its process group before propagating termination"},createDependencies({spawn: vi.fn(() => process) as never,- killProcess,parentProcess,}));@@ -696,7 +701,7 @@ test("preview controller stops its process group before propagating termination"expect(parentProcess.kill).toHaveBeenCalledWith(456, "SIGTERM");});- expect(killProcess).toHaveBeenCalledWith(-123, "SIGTERM");+ expect(process.disconnect).toHaveBeenCalledOnce();expect(controller.status().running).toBe(false);});@@ -766,13 +771,12 @@ test("preview controller can restart a running server after rebuilding", async (.mockReturnValueOnce(firstProcess).mockReturnValueOnce(secondBuildProcess).mockReturnValueOnce(secondProcess);- const killProcess = vi.fn(() => true);resolveProcessExit(firstBuildProcess);resolveProcessExit(secondBuildProcess);const controller = createPreviewController({ host: "127.0.0.1", port: 5173, cwd: "/tmp/preview" },- createDependencies({ spawn: spawn as never, killProcess })+ createDependencies({ spawn: spawn as never }));await expect(controller.start()).resolves.toEqual({@@ -789,13 +793,14 @@ test("preview controller can restart a running server after rebuilding", async (mode: "production",});- expect(killProcess).toHaveBeenCalledWith(-123, "SIGTERM");+ expect(firstProcess.disconnect).toHaveBeenCalledOnce();expect(spawn).toHaveBeenCalledTimes(4);});test("ignores a delayed exit from a previously owned preview server", async () => {let firstExit: (() => void) | undefined;const firstProcess = createPreviewProcess({+ connected: false,once: vi.fn((event: string, callback: () => void) => {if (event === "exit") {firstExit = callback;@@ -816,10 +821,7 @@ test("ignores a delayed exit from a previously owned preview server", async () =cwd: "/tmp/preview",mode: "iterative",},- createDependencies({- spawn: spawn as never,- killProcess: vi.fn(() => false),- })+ createDependencies({ spawn: spawn as never }));await controller.start();diff --git a/packages/cli/src/preview-server.ts b/packages/cli/src/preview-server.tsindex a37482d86d..d9e53c4a22 100644--- a/packages/cli/src/preview-server.ts+++ b/packages/cli/src/preview-server.ts@@ -1,11 +1,11 @@import {- execFile,spawn,type ChildProcess,type StdioOptions,} from "node:child_process";import { cp, mkdir, readFile, readdir, writeFile } from "node:fs/promises";import { basename, delimiter, dirname, join, parse, win32 } from "node:path";+import { fileURLToPath } from "node:url";import detectPort from "detect-port";import getPort from "get-port";import pathKey from "path-key";@@ -29,8 +29,6 @@ export type PreviewServerResult = {export type PreviewServerDependencies = {spawn: typeof spawn;- killProcess: (pid: number, signal: NodeJS.Signals) => boolean;- killWindowsProcessTree: (pid: number) => Promise<boolean>;parentProcess: {pid: number;once: (signal: NodeJS.Signals, handler: () => void) => unknown;@@ -46,31 +44,22 @@ export type PreviewServerDependencies = {sleep: (ms: number) => Promise<void>;nodeExecPath: string;npmExecPath?: string;+ processExecArgv: string[];+ supervisorPath: string;platform: typeof process.platform;};+const supervisorPath = fileURLToPath(+ new URL(+ import.meta.url.includes("/src/")+ ? "./preview-process-supervisor.ts"+ : "./preview-process-supervisor.js",+ import.meta.url+ )+);+export const defaultPreviewServerDependencies: PreviewServerDependencies = {spawn,- killProcess: process.kill,- killWindowsProcessTree: (pid) =>- new Promise((resolve, reject) => {- execFile(- "taskkill.exe",- ["/pid", String(pid), "/T", "/F"],- { windowsHide: true },- (error) => {- if (error === null) {- resolve(true);- return;- }- if (error.code === 128) {- resolve(false);- return;- }- reject(error);- }- );- }),parentProcess: process,fetch,cp,@@ -81,6 +70,8 @@ export const defaultPreviewServerDependencies: PreviewServerDependencies = {sleep: (ms) => new Promise((resolve) => setTimeout(resolve, ms)),nodeExecPath: process.execPath,npmExecPath: process.env.npm_execpath,+ processExecArgv: process.execArgv,+ supervisorPath,platform: process.platform,};@@ -269,13 +260,37 @@ export const startPreviewServer = (getPreviewStartArgs(options),dependencies);+ const stdio = options.stdio ?? "inherit";+ const supervisorStdio: StdioOptions = Array.isArray(stdio)+ ? [...stdio.slice(0, 3), "ipc"]+ : [stdio, stdio, stdio, "ipc"];+ const supervisorExecArgv = dependencies.supervisorPath.endsWith(".ts")+ ? dependencies.processExecArgv.filter(+ (argument) =>+ argument.startsWith("--conditions=") ||+ argument.startsWith("--import=")+ )+ : [];const previewProcess = dependencies.spawn(- invocation.command,- invocation.args,+ dependencies.nodeExecPath,+ [+ ...supervisorExecArgv,+ dependencies.supervisorPath,+ JSON.stringify({+ command: invocation.command,+ args: invocation.args,+ cwd: options.cwd,+ ...(options.cwd === undefined+ ? {}+ : {+ ownerFile: join(dirname(options.cwd), previewProcessOwnerFile),+ }),+ }),+ ],{cwd: options.cwd,...(options.detached === undefined ? {} : { detached: options.detached }),- stdio: options.stdio ?? "inherit",+ stdio: supervisorStdio,env: getPreviewEnv(options.cwd, {...processEnv(),HOST: options.host,@@ -296,25 +311,12 @@ export const startPreviewServer = (};};-const killPreviewProcess = async (- previewProcess: ChildProcess,- signal: NodeJS.Signals,- dependencies: PreviewServerDependencies-) => {- if (dependencies.platform === "win32" && previewProcess.pid !== undefined) {- return await dependencies.killWindowsProcessTree(previewProcess.pid);+const stopPreviewProcess = (previewProcess: ChildProcess) => {+ if (previewProcess.connected) {+ previewProcess.disconnect();+ return true;}- if (dependencies.platform !== "win32" && previewProcess.pid !== undefined) {- try {- return dependencies.killProcess(-previewProcess.pid, signal);- } catch (error) {- if (error instanceof Error && "code" in error && error.code === "ESRCH") {- return false;- }- throw error;- }- }- return previewProcess.kill(signal);+ return previewProcess.kill("SIGTERM");};export const waitForPreviewExit = async (process: ChildProcess) => {@@ -350,6 +352,7 @@ export const arePreviewImageDomainsEqual = (left.every((value, index) => value === right[index]));export const previewBuildCacheMarker = ".webstudio-preview-build";+export const previewProcessOwnerFile = "preview-process.json";const getPreviewProjectIdentity = async (cwd: string | undefined,@@ -575,14 +578,14 @@ export const createPreviewController = ();return;}- void killPreviewProcess(activeServer.process, "SIGTERM", dependencies)- .catch(() => undefined)- .finally(() => {- dependencies.parentProcess.kill(- dependencies.parentProcess.pid,- signal- );- });+ try {+ stopPreviewProcess(activeServer.process);+ } finally {+ dependencies.parentProcess.kill(+ dependencies.parentProcess.pid,+ signal+ );+ }};terminationHandlers.set(signal, handler);dependencies.parentProcess.once(signal, handler);@@ -658,9 +661,7 @@ export const createPreviewController = (process.once("error", reject);process.once("exit", () => resolve());});- if (- (await killPreviewProcess(process, "SIGTERM", dependencies)) === false- ) {+ if (stopPreviewProcess(process) === false) {return;}await exited;diff --git a/packages/cli/vite.config.ts b/packages/cli/vite.config.tsindex 58bb8a8c78..17d6afd114 100644--- a/packages/cli/vite.config.ts+++ b/packages/cli/vite.config.ts@@ -53,7 +53,7 @@ export default defineConfig({esmExternals: true,},lib: {- entry: ["src/cli.ts"],+ entry: ["src/cli.ts", "src/preview-process-supervisor.ts"],formats: ["es"],},rollupOptions: {diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 9d80c42aff..cd4b24d3cb 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -1303,6 +1303,9 @@ importers:esbuild:specifier: ^0.25.3version: 0.25.3+ execa:+ specifier: ^10.0.1+ version: 10.0.1fast-deep-equal:specifier: ^3.1.3version: 3.1.3@@ -8178,6 +8181,10 @@ packages:resolution: {integrity: sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==}engines: {node: '>=18.0.0'}+ resolution: {integrity: sha512-ge98qjkRK4IB7tL7Ju/6qmm5LHoH1eEMt5FNZrz3f4UIYhF28lggX20z3FaX1sgc67msLEn0N0BscOs29iuwyw==}+ engines: {node: '>=22'}+resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}engines: {node: '>=10'}@@ -11429,10 +11436,12 @@ packages:resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}+ deprecated: uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).hasBin: trueresolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}+ deprecated: uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).hasBin: true@@ -11625,6 +11634,11 @@ packages:resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}+ resolution: {integrity: sha512-XZyoF5/5hZtXitIwzrU4NKK+Wtbb9aB9CezUEw2Q0wlYK8NUYQxC1rRXgNueYLtBAJwXIb+/tFVk4dozciNJMA==}+ engines: {node: '>=22'}+ hasBin: true+resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==}engines: {node: '>= 0.4'}@@ -17495,6 +17509,21 @@ snapshots:dependencies:eventsource-parser: 3.1.0+ dependencies:+ '@sindresorhus/merge-streams': 4.0.0+ figures: 6.1.0+ get-stream: 9.0.1+ human-signals: 8.0.1+ is-plain-obj: 4.1.0+ is-stream: 4.0.1+ npm-run-path: 6.0.0+ pretty-ms: 9.3.0+ signal-exit: 4.1.0+ strip-final-newline: 4.0.0+ which-command: 0.1.0+ yoctocolors: 2.1.2+dependencies:cross-spawn: 7.0.6@@ -21650,6 +21679,8 @@ snapshots:tr46: 0.0.3webidl-conversions: 3.0.1+ [email protected]: {}+dependencies:available-typed-arrays: 1.0.7