Skip to content

chore: pass Page[] to PageCollector.init for consistency #629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
szuend merged 1 commit into from
Nov 28, 2025
Merged

chore: pass Page[] to PageCollector.init for consistency #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 23 additions & 31 deletions src/McpContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,41 +123,33 @@ export class McpContext implements Context {
this.#locatorClass = locatorClass;
this.#options = options;

this.#networkCollector = new NetworkCollector(
this.browser,
undefined,
this.#options.experimentalIncludeAllPages,
);
this.#networkCollector = new NetworkCollector(this.browser);

this.#consoleCollector = new ConsoleCollector(
this.browser,
collect => {
return {
console: event => {
collect(event);
},
pageerror: event => {
if (event instanceof Error) {
collect(event);
} else {
const error = new Error(`${event}`);
error.stack = undefined;
collect(error);
}
},
issue: event => {
this.#consoleCollector = new ConsoleCollector(this.browser, collect => {
return {
console: event => {
collect(event);
},
pageerror: event => {
if (event instanceof Error) {
collect(event);
},
} as ListenerMap;
},
this.#options.experimentalIncludeAllPages,
);
} else {
const error = new Error(`${event}`);
error.stack = undefined;
collect(error);
}
},
issue: event => {
collect(event);
},
} as ListenerMap;
});
}

async #init() {
await this.createPagesSnapshot();
await this.#networkCollector.init();
await this.#consoleCollector.init();
const pages = await this.createPagesSnapshot();
await this.#networkCollector.init(pages);
await this.#consoleCollector.init(pages);
}

dispose() {
Expand Down Expand Up @@ -663,6 +655,6 @@ export class McpContext implements Context {
},
} as ListenerMap;
});
await this.#networkCollector.init();
await this.#networkCollector.init(await this.browser.pages());
}
}
9 changes: 2 additions & 7 deletions src/PageCollector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ export class PageCollector<T> {
) => ListenerMap<PageEvents>;
#listeners = new WeakMap<Page, ListenerMap>();
#maxNavigationSaved = 3;
#includeAllPages?: boolean;

/**
* This maps a Page to a list of navigations with a sub-list
Expand All @@ -75,15 +74,12 @@ export class PageCollector<T> {
constructor(
browser: Browser,
listeners: (collector: (item: T) => void) => ListenerMap<PageEvents>,
includeAllPages?: boolean,
) {
this.#browser = browser;
this.#listenersInitializer = listeners;
this.#includeAllPages = includeAllPages;
}

async init() {
const pages = await this.#browser.pages(this.#includeAllPages);
async init(pages: Page[]) {
for (const page of pages) {
this.addPage(page);
}
Expand Down Expand Up @@ -369,9 +365,8 @@ export class NetworkCollector extends PageCollector<HTTPRequest> {
},
} as ListenerMap;
},
includeAllPages?: boolean,
) {
super(browser, listeners, includeAllPages);
super(browser, listeners);
}
override splitAfterNavigation(page: Page) {
const navigations = this.storage.get(page) ?? [];
Expand Down
26 changes: 13 additions & 13 deletions tests/PageCollector.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ describe('PageCollector', () => {
},
} as ListenerMap;
});
await collector.init();
await collector.init([page]);
page.emit('request', request);

assert.equal(collector.getData(page)[0], request);
Expand All @@ -51,7 +51,7 @@ describe('PageCollector', () => {
},
} as ListenerMap;
});
await collector.init();
await collector.init([page]);
page.emit('request', request);

assert.equal(collector.getData(page)[0], request);
Expand All @@ -71,7 +71,7 @@ describe('PageCollector', () => {
},
} as ListenerMap;
});
await collector.init();
await collector.init([page]);
page.emit('request', request);
page.emit('framenavigated', {} as Frame);

Expand All @@ -90,7 +90,7 @@ describe('PageCollector', () => {
},
} as ListenerMap;
});
await collector.init();
await collector.init([page]);
page.emit('request', request);

assert.equal(collector.getData(page)[0], request);
Expand All @@ -114,7 +114,7 @@ describe('PageCollector', () => {
},
} as ListenerMap;
});
await collector.init();
await collector.init([page]);
browser.emit('targetcreated', {
page() {
return Promise.resolve(page);
Expand Down Expand Up @@ -146,7 +146,7 @@ describe('PageCollector', () => {
},
} as ListenerMap;
});
await collector.init();
await collector.init([page]);

page.emit('request', request);

Expand Down Expand Up @@ -176,7 +176,7 @@ describe('PageCollector', () => {
},
} as ListenerMap;
});
await collector.init();
await collector.init([page]);

page.emit('request', request1);
page.emit('request', request2);
Expand All @@ -200,7 +200,7 @@ describe('NetworkCollector', () => {
});
const request2 = getMockRequest();
const collector = new NetworkCollector(browser);
await collector.init();
await collector.init([page]);
page.emit('request', request);
page.emit('request', navRequest);

Expand Down Expand Up @@ -233,7 +233,7 @@ describe('NetworkCollector', () => {
const request = getMockRequest();

const collector = new NetworkCollector(browser);
await collector.init();
await collector.init([page]);
page.emit('request', navRequest);
assert.equal(collector.getData(page)[0], navRequest);

Expand Down Expand Up @@ -269,7 +269,7 @@ describe('NetworkCollector', () => {
const request = getMockRequest();

const collector = new NetworkCollector(browser);
await collector.init();
await collector.init([page]);
page.emit('request', navRequest);
assert.equal(collector.getData(page, true).length, 1);

Expand Down Expand Up @@ -324,7 +324,7 @@ describe('ConsoleCollector', () => {
},
} as ListenerMap;
});
await collector.init();
await collector.init([page]);
cdpSession.emit('Audits.issueAdded', {issue});
sinon.assert.calledOnce(onIssuesListener);

Expand All @@ -345,7 +345,7 @@ describe('ConsoleCollector', () => {
},
} as ListenerMap;
});
await collector.init();
await collector.init([page]);

const issue2 = {
code: 'ElementAccessibilityIssue' as const,
Expand Down Expand Up @@ -377,7 +377,7 @@ describe('ConsoleCollector', () => {
},
} as ListenerMap;
});
await collector.init();
await collector.init([page]);

cdpSession.emit('Audits.issueAdded', {issue});
cdpSession.emit('Audits.issueAdded', {issue});
Expand Down