Open-source AI browser agent for Chrome and Firefox (monorepo) ðŸ§
JavaScript ai-agentai-agentsai-toolsbrowser-aibrowser-automationbrowser-extensionchrome-aichrome-devtoolschrome-extensionchrome-extensionsfirefox-addonfirefox-addonsfirefox-extensionfirefox-extensionsgemmagemma4minimaxoffline-aioffline-llmqwen
Include debugger attachment in dialog handling startup cancellation
Emre Sokullu8c61a0a099a9
diff --git a/src/chrome/src/cdp/cdp-client.js b/src/chrome/src/cdp/cdp-client.jsindex 7d5a54ca1..67b126893 100644--- a/src/chrome/src/cdp/cdp-client.js+++ b/src/chrome/src/cdp/cdp-client.js@@ -286,8 +286,21 @@ export class CDPClient {};this.dialogRuns.set(tabId, owner);signal?.addEventListener('abort', owner.onAbort, { once: true });+ let timer;+ const interrupted = new Promise((_, reject) => {+ owner.cancelStartup = () => {+ const error = new Error('Stopped during browser dialog setup');+ error.name = 'AbortError';+ reject(error);+ };+ timer = setTimeout(() => {+ const error = new Error('Browser dialog setup timed out. Dismiss any existing browser dialog and try again.');+ error.code = 'dialog_startup_timeout';+ reject(error);+ }, timeoutMs);+ });try {- await this.attach(tabId);+ await Promise.race([this.attach(tabId), interrupted]);if (this.dialogRuns.get(tabId) !== owner) return;// Resolve an already-observed dialog before Page.enable, which itself// can wait for the paused renderer when Dev retained the connection.@@ -296,28 +309,13 @@ export class CDPClient {}// Page.enable can wait indefinitely behind a pre-existing dialog. Stop// must release the run even when Chrome never answers this command.- let timer;- const interrupted = new Promise((_, reject) => {- owner.cancelStartup = () => {- const error = new Error('Stopped during browser dialog setup');- error.name = 'AbortError';- reject(error);- };- timer = setTimeout(() => {- const error = new Error('Browser dialog setup timed out. Dismiss any existing browser dialog and try again.');- error.code = 'dialog_startup_timeout';- reject(error);- }, timeoutMs);- });- try {- await Promise.race([this.sendCommand(tabId, 'Page.enable'), interrupted]);- } finally {- clearTimeout(timer);- delete owner.cancelStartup;- }+ await Promise.race([this.sendCommand(tabId, 'Page.enable'), interrupted]);} catch (error) {if (this.dialogRuns.get(tabId) === owner) this.stopDialogHandling(tabId);throw error;+ } finally {+ clearTimeout(timer);+ delete owner.cancelStartup;}}diff --git a/test/browser-dialogs.mjs b/test/browser-dialogs.mjsindex e39c37932..64c380080 100644--- a/test/browser-dialogs.mjs+++ b/test/browser-dialogs.mjs@@ -95,26 +95,30 @@ test('cached dialog is answered before renderer-dependent Page.enable', async ()await client.startDialogHandling(7);});-for (const action of ['abort', 'stop', 'timeout']) {- test(`${action} releases blocked Page.enable startup`, async () => {- const { client } = harness();- const controller = new AbortController();- let entered;- const ready = new Promise(resolve => { entered = resolve; });- let finish;- client.sendCommand = () => { entered(); return new Promise(resolve => { finish = resolve; }); };- const startup = client.startDialogHandling(7, { signal: controller.signal, timeoutMs: 20 });- const rejected = assert.rejects(startup, error => action === 'timeout'- ? error.code === 'dialog_startup_timeout' : error.name === 'AbortError');- await ready;- if (action === 'abort') controller.abort();- if (action === 'stop') client.stopDialogHandling(7);- await rejected;- assert.equal(client.dialogRuns.has(7), false);- finish();- await tick();- assert.equal(client.dialogRuns.has(7), false);- });+for (const target of ['attach', 'Page.enable']) {+ for (const action of ['abort', 'stop', 'timeout']) {+ test(`${action} releases blocked ${target} startup`, async () => {+ const { client } = harness();+ const controller = new AbortController();+ let entered;+ const ready = new Promise(resolve => { entered = resolve; });+ let finish;+ const block = () => { entered(); return new Promise(resolve => { finish = resolve; }); };+ if (target === 'attach') client.attach = block;+ else client.sendCommand = block;+ const startup = client.startDialogHandling(7, { signal: controller.signal, timeoutMs: 20 });+ const rejected = assert.rejects(startup, error => action === 'timeout'+ ? error.code === 'dialog_startup_timeout' : error.name === 'AbortError');+ await ready;+ if (action === 'abort') controller.abort();+ if (action === 'stop') client.stopDialogHandling(7);+ await rejected;+ assert.equal(client.dialogRuns.has(7), false);+ finish();+ await tick();+ assert.equal(client.dialogRuns.has(7), false);+ });+ }}test('failed workflow setup releases its debugger but preserves a Dev owner', async () => {