Skip to content

Commit a088363

Browse files
committed
chore: re-use puppeteer issues
1 parent e204df4 commit a088363

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

src/McpContext.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ export class McpContext implements Context {
117117
uncaughtError: event => {
118118
collect(event);
119119
},
120-
issue: event => {
120+
devtoolsAggregatedIssue: event => {
121121
collect(event);
122122
},
123123
} as ListenerMap;

src/PageCollector.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import type {
1111
CDPSession,
1212
ConsoleMessage,
1313
Protocol,
14+
Issue,
1415
} from './third_party/index.js';
1516
import {DevTools} from './third_party/index.js';
1617
import {
@@ -33,7 +34,7 @@ export class UncaughtError {
3334
}
3435

3536
interface PageEvents extends PuppeteerPageEvents {
36-
issue: DevTools.AggregatedIssue;
37+
devtoolsAggregatedIssue: DevTools.AggregatedIssue;
3738
uncaughtError: UncaughtError;
3839
}
3940

@@ -285,7 +286,7 @@ class PageEventSubscriber {
285286
async subscribe() {
286287
this.#resetIssueAggregator();
287288
this.#page.on('framenavigated', this.#onFrameNavigated);
288-
this.#session.on('Audits.issueAdded', this.#onIssueAdded);
289+
this.#page.on('issue', this.#onIssueAdded);
289290
this.#session.on('Runtime.exceptionThrown', this.#onExceptionThrown);
290291
try {
291292
await this.#session.send('Audits.enable');
@@ -298,7 +299,7 @@ class PageEventSubscriber {
298299
this.#seenKeys.clear();
299300
this.#seenIssues.clear();
300301
this.#page.off('framenavigated', this.#onFrameNavigated);
301-
this.#session.off('Audits.issueAdded', this.#onIssueAdded);
302+
this.#page.off('issue', this.#onIssueAdded);
302303
this.#session.off('Runtime.exceptionThrown', this.#onExceptionThrown);
303304
if (this.#issueAggregator) {
304305
this.#issueAggregator.removeEventListener(
@@ -318,7 +319,7 @@ class PageEventSubscriber {
318319
return;
319320
}
320321
this.#seenIssues.add(event.data);
321-
this.#page.emit('issue', event.data);
322+
this.#page.emit('devtoolsAggregatedIssue', event.data);
322323
};
323324

324325
#onExceptionThrown = (event: Protocol.Runtime.ExceptionThrownEvent) => {
@@ -339,9 +340,8 @@ class PageEventSubscriber {
339340
this.#resetIssueAggregator();
340341
};
341342

342-
#onIssueAdded = (data: Protocol.Audits.IssueAddedEvent) => {
343+
#onIssueAdded = (inspectorIssue: Issue) => {
343344
try {
344-
const inspectorIssue = data.issue;
345345
const issue = DevTools.createIssuesFromProtocolIssue(
346346
null,
347347
// @ts-expect-error Protocol types diverge.

tests/PageCollector.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ describe('ConsoleCollector', () => {
340340

341341
const collector = new ConsoleCollector(browser, collect => {
342342
return {
343-
issue: issue => {
343+
devtoolsAggregateddevtoolsAggregatedIssue: issue => {
344344
collect(issue as DevTools.AggregatedIssue);
345345
},
346346
} as ListenerMap;
@@ -361,7 +361,7 @@ describe('ConsoleCollector', () => {
361361

362362
const collector = new ConsoleCollector(browser, collect => {
363363
return {
364-
issue: issue => {
364+
devtoolsAggregatedIssue: issue => {
365365
collect(issue as DevTools.AggregatedIssue);
366366
},
367367
} as ListenerMap;
@@ -380,7 +380,7 @@ describe('ConsoleCollector', () => {
380380
} satisfies Protocol.Audits.InspectorIssue;
381381

382382
cdpSession.emit('Audits.issueAdded', {issue});
383-
cdpSession.emit('Audits.issueAdded', {issue: issue2});
383+
cdpSession.emit('Audits.issueAdded', {devtoolsAggregatedIssue: issue2});
384384
const data = collector.getData(page);
385385
assert.equal(data.length, 2);
386386
});
@@ -393,7 +393,7 @@ describe('ConsoleCollector', () => {
393393

394394
const collector = new ConsoleCollector(browser, collect => {
395395
return {
396-
issue: issue => {
396+
devtoolsAggregatedIssue: issue => {
397397
collect(issue as DevTools.AggregatedIssue);
398398
},
399399
} as ListenerMap;

0 commit comments

Comments
 (0)