Skip to content

Chrome DevTools for coding agents

fix(collectors): ignore transient target errors when subscribing to service workers (#2888)

Alex Rudenko551dd6ca9d00
diff --git a/src/collectors/ServiceWorkerCollector.ts b/src/collectors/ServiceWorkerCollector.ts
index bbdd0553..99c887f9 100644
--- a/src/collectors/ServiceWorkerCollector.ts
+++ b/src/collectors/ServiceWorkerCollector.ts
@@ -101,11 +101,7 @@ export class ServiceWorkerConsoleCollector {
this.#browser.off('targetdestroyed', this.#onTargetDestroyed);
for (const subscriber of this.#serviceWorkerSubscribers.values()) {
subscriber.unsubscribe().catch(err => {
- if (
- err instanceof Error &&
- !err.message.includes('Target closed') &&
- !err.message.includes('Session closed')
- ) {
+ if (!isIgnoredTargetError(err)) {
// Swallow error as we are tearing down the system
}
});
@@ -128,36 +124,34 @@ export class ServiceWorkerConsoleCollector {
const subscriber = new ServiceWorkerSubscriber(target, item => {
this.addLog(extensionId, item);
});
+ this.#serviceWorkerSubscribers.set(target, subscriber);
try {
await subscriber.subscribe();
+ if (this.#serviceWorkerSubscribers.get(target) !== subscriber) {
+ await subscriber.unsubscribe();
+ }
} catch (err) {
- if (
- err instanceof Error &&
- !err.message.includes('Target closed') &&
- !err.message.includes('Session closed')
- ) {
+ if (this.#serviceWorkerSubscribers.get(target) === subscriber) {
+ this.#serviceWorkerSubscribers.delete(target);
+ }
+ if (!isIgnoredTargetError(err)) {
throw err;
}
}
- this.#serviceWorkerSubscribers.set(target, subscriber);
}
};
#onTargetDestroyed = async (target: Target) => {
const subscriber = this.#serviceWorkerSubscribers.get(target);
if (subscriber) {
+ this.#serviceWorkerSubscribers.delete(target);
try {
await subscriber.unsubscribe();
} catch (err) {
- if (
- err instanceof Error &&
- !err.message.includes('Target closed') &&
- !err.message.includes('Session closed')
- ) {
+ if (!isIgnoredTargetError(err)) {
throw err;
}
}
- this.#serviceWorkerSubscribers.delete(target);
}
};
@@ -225,3 +219,13 @@ function extractExtensionId(origin: string): string | null {
function isExtensionOrigin(origin: string) {
return origin.startsWith(CHROME_EXTENSION_PREFIX);
}
+
+function isIgnoredTargetError(err: unknown): boolean {
+ return (
+ err instanceof Error &&
+ (err.message.includes('Target closed') ||
+ err.message.includes('Session closed') ||
+ err.message.includes('No target with given id found') ||
+ err.message.includes('No session with given id'))
+ );
+}
diff --git a/tests/collectors/ServiceWorkerCollector.test.ts b/tests/collectors/ServiceWorkerCollector.test.ts
index 194f94f4..c7d7ea67 100644
--- a/tests/collectors/ServiceWorkerCollector.test.ts
+++ b/tests/collectors/ServiceWorkerCollector.test.ts
@@ -5,14 +5,25 @@
*/
import assert from 'node:assert';
-import {describe, it} from 'node:test';
+import {afterEach, describe, it} from 'node:test';
+
+import sinon from 'sinon';
import {UncaughtError} from '../../src/collectors/PageCollector.js';
import {ServiceWorkerConsoleCollector} from '../../src/collectors/ServiceWorkerCollector.js';
-import type {Protocol} from '../../src/third_party/index.js';
+import {McpWorker} from '../../src/McpWorker.js';
+import {TargetType, type Protocol} from '../../src/third_party/index.js';
import {stableIdSymbol} from '../../src/utils/id.js';
+import {
+ createMockPuppeteerBrowser,
+ createMockPuppeteerTarget,
+} from '../mocks.js';
describe('ServiceWorkerConsoleCollector', () => {
+ afterEach(() => {
+ sinon.restore();
+ });
+
it('limits logs to 1000 per extension', () => {
const collector = new ServiceWorkerConsoleCollector(undefined, 10);
const extensionId = 'test-extension';
@@ -72,4 +83,23 @@ describe('ServiceWorkerConsoleCollector', () => {
'find should return correct log',
);
});
+
+ it('ignores "No target with given id found" when service worker target disappears during subscribe', async () => {
+ const browser = createMockPuppeteerBrowser();
+ const target = createMockPuppeteerTarget({
+ url: 'chrome-extension://ext-id/sw.js',
+ });
+ target.type.returns(TargetType.SERVICE_WORKER);
+ target.createCDPSession.rejects(
+ new Error(
+ 'Protocol error (Target.attachToTarget): No target with given id found',
+ ),
+ );
+
+ const collector = new ServiceWorkerConsoleCollector(browser);
+ await collector.init([new McpWorker('sw-1', 'service_worker', target)]);
+ await new Promise(resolve => setTimeout(resolve, 0));
+ sinon.assert.calledOnce(target.createCDPSession);
+ collector.dispose();
+ });
});
diff --git a/tests/mocks.ts b/tests/mocks.ts
index 323ca984..b90139d4 100644
--- a/tests/mocks.ts
+++ b/tests/mocks.ts
@@ -144,6 +144,14 @@ export function createMockPuppeteerBrowser(): sinon.SinonStubbedInstance<Browser
browser.process.returns(null);
const browserListener = mockListener();
+ browser.on.callsFake((eventName, handler) => {
+ browserListener.on(eventName, handler);
+ return browser;
+ });
+ browser.off.callsFake((eventName, handler) => {
+ browserListener.off(eventName, handler);
+ return browser;
+ });
browser.once.callsFake((eventName, handler) => {
const onceHandler = (data: unknown) => {
browserListener.off(eventName, onceHandler);
diff --git a/tests/utils.ts b/tests/utils.ts
index 09be5388..dc75921b 100644
--- a/tests/utils.ts
+++ b/tests/utils.ts
@@ -212,7 +212,12 @@ export async function withMcpContext(
response.setPage(context.getSelectedMcpPage());
- await cb(response, context, parsedArgs);
+ try {
+ await cb(response, context, parsedArgs);
+ } finally {
+ context.dispose();
+ context = undefined;
+ }
}, options);
}