Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"globals": "^17.0.0",
"lighthouse": "13.1.0",
"prettier": "^3.6.2",
"puppeteer": "24.40.0",
"puppeteer": "24.41.0",
"rollup": "4.60.1",
"rollup-plugin-cleanup": "^3.2.1",
"rollup-plugin-license": "^3.6.0",
Expand Down
2 changes: 1 addition & 1 deletion src/McpContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export class McpContext implements Context {
uncaughtError: event => {
collect(event);
},
issue: event => {
devtoolsAggregatedIssue: event => {
collect(event);
},
} as ListenerMap;
Expand Down
12 changes: 6 additions & 6 deletions src/PageCollector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import type {
CDPSession,
ConsoleMessage,
Protocol,
Issue,
} from './third_party/index.js';
import {DevTools} from './third_party/index.js';
import {
Expand All @@ -33,7 +34,7 @@ export class UncaughtError {
}

interface PageEvents extends PuppeteerPageEvents {
issue: DevTools.AggregatedIssue;
devtoolsAggregatedIssue: DevTools.AggregatedIssue;
uncaughtError: UncaughtError;
}

Expand Down Expand Up @@ -285,7 +286,7 @@ class PageEventSubscriber {
async subscribe() {
this.#resetIssueAggregator();
this.#page.on('framenavigated', this.#onFrameNavigated);
this.#session.on('Audits.issueAdded', this.#onIssueAdded);
this.#page.on('issue', this.#onIssueAdded);
this.#session.on('Runtime.exceptionThrown', this.#onExceptionThrown);
try {
await this.#session.send('Audits.enable');
Expand All @@ -298,7 +299,7 @@ class PageEventSubscriber {
this.#seenKeys.clear();
this.#seenIssues.clear();
this.#page.off('framenavigated', this.#onFrameNavigated);
this.#session.off('Audits.issueAdded', this.#onIssueAdded);
this.#page.off('issue', this.#onIssueAdded);
this.#session.off('Runtime.exceptionThrown', this.#onExceptionThrown);
if (this.#issueAggregator) {
this.#issueAggregator.removeEventListener(
Expand All @@ -318,7 +319,7 @@ class PageEventSubscriber {
return;
}
this.#seenIssues.add(event.data);
this.#page.emit('issue', event.data);
this.#page.emit('devtoolsAggregatedIssue', event.data);
};

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

#onIssueAdded = (data: Protocol.Audits.IssueAddedEvent) => {
#onIssueAdded = (inspectorIssue: Issue) => {
try {
const inspectorIssue = data.issue;
const issue = DevTools.createIssuesFromProtocolIssue(
null,
// @ts-expect-error Protocol types diverge.
Expand Down
45 changes: 8 additions & 37 deletions tests/PageCollector.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -329,40 +329,13 @@ describe('ConsoleCollector', () => {
sinon.restore();
});

it('emits issues on page', async () => {
const browser = getMockBrowser();
const page = (await browser.pages())[0];
// @ts-expect-error internal API.
const cdpSession = page._client();
const onIssuesListener = sinon.spy();

page.on('issue', onIssuesListener);

const collector = new ConsoleCollector(browser, collect => {
return {
issue: issue => {
collect(issue as DevTools.AggregatedIssue);
},
} as ListenerMap;
});
await collector.init([page]);
cdpSession.emit('Audits.issueAdded', {issue});
sinon.assert.calledOnce(onIssuesListener);

const issueArgument = onIssuesListener.getCall(0).args[0];
assert(issueArgument instanceof DevTools.AggregatedIssue);
});

it('collects issues', async () => {
const browser = getMockBrowser();
const page = (await browser.pages())[0];
// @ts-expect-error internal API.
const cdpSession = page._client();

const collector = new ConsoleCollector(browser, collect => {
return {
issue: issue => {
collect(issue as DevTools.AggregatedIssue);
devtoolsAggregatedIssue: issue => {
collect(issue);
},
} as ListenerMap;
});
Expand All @@ -379,29 +352,27 @@ describe('ConsoleCollector', () => {
},
} satisfies Protocol.Audits.InspectorIssue;

cdpSession.emit('Audits.issueAdded', {issue});
cdpSession.emit('Audits.issueAdded', {issue: issue2});
page.emit('issue', issue);
page.emit('issue', issue2);
const data = collector.getData(page);
assert.equal(data.length, 2);
});

it('filters duplicated issues', async () => {
const browser = getMockBrowser();
const page = (await browser.pages())[0];
// @ts-expect-error internal API.
const cdpSession = page._client();

const collector = new ConsoleCollector(browser, collect => {
return {
issue: issue => {
collect(issue as DevTools.AggregatedIssue);
devtoolsAggregatedIssue: issue => {
collect(issue);
},
} as ListenerMap;
});
await collector.init([page]);

cdpSession.emit('Audits.issueAdded', {issue});
cdpSession.emit('Audits.issueAdded', {issue});
page.emit('issue', issue);
page.emit('issue', issue);
const data = collector.getData(page);
assert.equal(data.length, 1);
const collectedIssue = data[0];
Expand Down
Loading