Chrome DevTools for coding agents
fix(daemon): bound browser shutdown and avoid watchFile timeout on stop (#2887)
Alex Rudenkof3db5e72c145
diff --git a/src/BrowserManager.ts b/src/BrowserManager.tsindex 6c2889f5..e3f3b044 100644--- a/src/BrowserManager.ts+++ b/src/BrowserManager.ts@@ -445,9 +445,7 @@ export class BrowserManager {this.#browser = undefined;this.#browserMode = undefined;if (mode === 'launched') {- void candidate.close().catch(err => {- logger?.('Failed to close forgotten browser', err);- });+ void this.#closeLaunchedBrowser(candidate);} else {void candidate.disconnect().catch(err => {logger?.('Failed to disconnect forgotten browser', err);@@ -473,6 +471,27 @@ export class BrowserManager {this.#browserMode = undefined;}+ async #closeLaunchedBrowser(browser: Browser): Promise<void> {+ let timer: ReturnType<typeof setTimeout> | undefined;+ try {+ await Promise.race([+ browser.close(),+ new Promise<never>((_, reject) => {+ timer = setTimeout(+ () => reject(new Error('Timed out closing browser')),+ 5_000,+ );+ timer.unref?.();+ }),+ ]);+ } catch (err) {+ logger?.('Failed to close browser', err);+ browser.process()?.kill('SIGKILL');+ } finally {+ clearTimeout(timer);+ }+ }+async #closeBrowser(): Promise<void> {const browser = this.#browser;const mode = this.#browserMode;@@ -482,9 +501,7 @@ export class BrowserManager {return;}if (mode === 'launched') {- await browser.close().catch(err => {- logger?.('Failed to close browser', err);- });+ await this.#closeLaunchedBrowser(browser);return;}await browser.disconnect().catch(err => {diff --git a/src/daemon/client.ts b/src/daemon/client.tsindex 07596a2d..35c8bc33 100644--- a/src/daemon/client.ts+++ b/src/daemon/client.ts@@ -21,6 +21,7 @@ import type {} from './types.js';import {DAEMON_SCRIPT_PATH,+ getDaemonPid,getSocketPath,getPidFilePath,isDaemonRunning,@@ -30,54 +31,49 @@ const FILE_TIMEOUT = 10_000;const READY_CHECK_INTERVAL = 100;const READY_CHECK_COMMAND_TIMEOUT = 1_000;+function delay(ms: number) {+ return new Promise<void>(resolve => {+ setTimeout(resolve, ms);+ });+}+/*** Waits for a file to be created and populated (removed = false) or removed (removed = true).*/-function waitForFile(filePath: string, removed = false) {- return new Promise<void>((resolve, reject) => {- const check = () => {- const exists = fs.existsSync(filePath);- if (removed) {- return !exists;- }- if (!exists) {- return false;- }- try {- return fs.statSync(filePath).size > 0;- } catch {- return false;- }- };+async function waitForFile(filePath: string, removed = false) {+ const check = () => {+ const exists = fs.existsSync(filePath);+ if (removed) {+ return !exists;+ }+ if (!exists) {+ return false;+ }+ try {+ return fs.statSync(filePath).size > 0;+ } catch {+ return false;+ }+ };+ const deadline = Date.now() + FILE_TIMEOUT;+ while (Date.now() < deadline) {if (check()) {- resolve();return;}+ const timeLeft = deadline - Date.now();+ if (timeLeft > 0) {+ await delay(Math.min(READY_CHECK_INTERVAL, timeLeft));+ }+ }- const timer = setTimeout(() => {- fs.unwatchFile(filePath);- reject(- new Error(- `Timeout: file ${filePath} ${removed ? 'not removed' : 'not found'} within ${FILE_TIMEOUT}ms`,- ),- );- }, FILE_TIMEOUT);-- fs.watchFile(filePath, {interval: 500}, () => {- if (check()) {- clearTimeout(timer);- fs.unwatchFile(filePath);- resolve();- }- });- });-}+ if (check()) {+ return;+ }-function delay(ms: number) {- return new Promise<void>(resolve => {- setTimeout(resolve, ms);- });+ throw new Error(+ `Timeout: file ${filePath} ${removed ? 'not removed' : 'not found'} within ${FILE_TIMEOUT}ms`,+ );}async function waitForDaemonReady(sessionId: string) {@@ -180,6 +176,7 @@ export async function sendCommand(transport.onmessage = async (message: string) => {clearTimeout(timer);logger?.('onmessage', message);+ socket.end();resolve(JSON.parse(message));};socket.on('error', error => {@@ -203,11 +200,30 @@ export async function stopDaemon(sessionId: string) {return;}+ const pid = getDaemonPid(sessionId);const pidFilePath = getPidFilePath(sessionId);await sendCommand({method: 'stop'}, sessionId);- await waitForFile(pidFilePath, /*removed=*/ true);+ try {+ await waitForFile(pidFilePath, /*removed=*/ true);+ } catch (error) {+ if (pid) {+ try {+ process.kill(pid, 'SIGKILL');+ } catch {+ // Ignore if process already exited.+ }+ }+ try {+ fs.unlinkSync(pidFilePath);+ } catch {+ // Ignore if file already removed.+ }+ if (isDaemonRunning(sessionId)) {+ throw error;+ }+ }}export async function verifyDaemonVersion(diff --git a/src/daemon/daemon.ts b/src/daemon/daemon.tsindex 7557fa6e..9b7dc428 100644--- a/src/daemon/daemon.ts+++ b/src/daemon/daemon.ts@@ -259,7 +259,13 @@ async function startSocketServer() {});}+let isCleaningUp = false;+async function cleanup(exitCode = 0) {+ if (isCleaningUp) {+ return;+ }+ isCleaningUp = true;console.log('Cleaning up daemon...');try {@@ -268,8 +274,9 @@ async function cleanup(exitCode = 0) {logger?.('Error closing MCP server:', error);}if (server) {+ const activeServer = server;await new Promise<void>(resolve => {- server!.close(() => resolve());+ activeServer.close(() => resolve());});}if (!IS_WINDOWS) {@@ -280,8 +287,10 @@ async function cleanup(exitCode = 0) {}}logger?.(`unlinking ${pidFilePath}`);- if (fs.existsSync(pidFilePath)) {+ try {fs.unlinkSync(pidFilePath);+ } catch {+ // ignore errors}process.exit(exitCode);}