Skip to content

Chrome DevTools for coding agents

fix: bound per-navigation network request retention (#2435)

Matt Van Hornb08c73c8d888
diff --git a/docs/tool-reference.md b/docs/tool-reference.md
index bb8bc6b7..7bf9e766 100644
--- a/docs/tool-reference.md
+++ b/docs/tool-reference.md
@@ -333,7 +333,7 @@
### `list_network_requests`
-**Description:** List all requests for the currently selected page since the last navigation.
+**Description:** Lists the most recent requests for the currently selected page since the last navigation.
**Parameters:**
diff --git a/src/McpPage.ts b/src/McpPage.ts
index 1483d7aa..967e5627 100644
--- a/src/McpPage.ts
+++ b/src/McpPage.ts
@@ -848,15 +848,19 @@ export class McpPage implements ContextPage {
*/
async setUpNetworkCollectorForTesting() {
this.networkCollector.dispose();
- this.networkCollector = new NetworkCollector(this.pptrPage, collect => {
- return {
- request: req => {
- if (req.url().includes('favicon.ico')) {
- return;
- }
- collect(req);
- },
- } as ListenerMap;
- });
+ this.networkCollector = new NetworkCollector(
+ this.pptrPage,
+ undefined,
+ collect => {
+ return {
+ request: req => {
+ if (req.url().includes('favicon.ico')) {
+ return;
+ }
+ collect(req);
+ },
+ } as ListenerMap;
+ },
+ );
}
}
diff --git a/src/PageCollector.ts b/src/PageCollector.ts
index a5b557ff..90b672f1 100644
--- a/src/PageCollector.ts
+++ b/src/PageCollector.ts
@@ -60,6 +60,7 @@ export class PageCollector<T> {
constructor(
page: Page,
listeners: (collector: (item: T) => void) => ListenerMap<PageEvents>,
+ maxResourcesPerNavigation?: number,
) {
this.pptrPage = page;
@@ -69,6 +70,15 @@ export class PageCollector<T> {
const withId = value as WithSymbolId<T>;
withId[stableIdSymbol] = idGenerator();
this.storage[0].push(withId);
+ if (
+ maxResourcesPerNavigation !== undefined &&
+ this.storage[0].length > maxResourcesPerNavigation
+ ) {
+ this.storage[0].splice(
+ 0,
+ this.storage[0].length - maxResourcesPerNavigation,
+ );
+ }
});
listenerMap['framenavigated'] = (frame: Frame) => {
@@ -283,8 +293,11 @@ class PageEventSubscriber {
}
export class NetworkCollector extends PageCollector<HTTPRequest> {
+ static readonly MAX_REQUESTS_PER_NAVIGATION = 1_000;
+
constructor(
page: Page,
+ maxRequestsPerNavigation = NetworkCollector.MAX_REQUESTS_PER_NAVIGATION,
listeners: (
collector: (item: HTTPRequest) => void,
) => ListenerMap<PageEvents> = collect => {
@@ -295,7 +308,7 @@ export class NetworkCollector extends PageCollector<HTTPRequest> {
} as ListenerMap;
},
) {
- super(page, listeners);
+ super(page, listeners, maxRequestsPerNavigation);
}
override splitAfterNavigation() {
const requests = this.storage[0];
diff --git a/src/bin/chrome-devtools-cli-options.ts b/src/bin/chrome-devtools-cli-options.ts
index 191d1fb3..010421f5 100644
--- a/src/bin/chrome-devtools-cli-options.ts
+++ b/src/bin/chrome-devtools-cli-options.ts
@@ -775,7 +775,7 @@ export const commands: Commands = {
},
list_network_requests: {
description:
- 'List all requests for the currently selected page since the last navigation.',
+ 'Lists the most recent requests for the currently selected page since the last navigation.',
category: 'Network',
args: {
pageSize: {
diff --git a/src/tools/network.ts b/src/tools/network.ts
index 6e7fb50d..7cad8038 100644
--- a/src/tools/network.ts
+++ b/src/tools/network.ts
@@ -34,7 +34,7 @@ const FILTERABLE_RESOURCE_TYPES: readonly [ResourceType, ...ResourceType[]] = [
export const listNetworkRequests = definePageTool({
name: 'list_network_requests',
- description: `List all requests for the currently selected page since the last navigation.`,
+ description: `Lists the most recent requests for the currently selected page since the last navigation.`,
annotations: {
category: ToolCategory.NETWORK,
readOnlyHint: true,
diff --git a/tests/PageCollector.test.ts b/tests/PageCollector.test.ts
index 774f188d..6beed030 100644
--- a/tests/PageCollector.test.ts
+++ b/tests/PageCollector.test.ts
@@ -126,6 +126,35 @@ describe('PageCollector', () => {
});
describe('NetworkCollector', () => {
+ it('retains only the newest requests without navigation', async () => {
+ const browser = getMockBrowser();
+ const page = (await browser.pages())[0];
+ const collector = new NetworkCollector(page);
+ const requests = Array.from(
+ {
+ length: NetworkCollector.MAX_REQUESTS_PER_NAVIGATION + 1,
+ },
+ (_, index) =>
+ getMockRequest({url: `http://example.com/request-${index + 1}`}),
+ );
+
+ for (const request of requests) {
+ page.emit('request', request);
+ }
+
+ const retainedRequests = collector.getData();
+ assert.equal(
+ retainedRequests.length,
+ NetworkCollector.MAX_REQUESTS_PER_NAVIGATION,
+ );
+ assert.deepEqual(retainedRequests, requests.slice(1));
+ assert.equal(collector.getIdForResource(retainedRequests[0]), 2);
+ assert.equal(collector.getById(2), retainedRequests[0]);
+ assert.throws(() => collector.getById(1), {
+ message: 'Request not found for selected page',
+ });
+ });
+
it('correctly picks up navigation requests to latest navigation', async () => {
const browser = getMockBrowser();
const page = (await browser.pages())[0];
@@ -244,6 +273,83 @@ describe('NetworkCollector', () => {
// Each navigation has 1 request, so total should be 3
assert.equal(collector.getData(true).length, 3);
});
+
+ it('bounds retained navigation buckets with redirects and subframes', async () => {
+ class TestNetworkCollector extends NetworkCollector {
+ get navigationSizes(): number[] {
+ return this.storage.map(requests => requests.length);
+ }
+ }
+
+ const browser = getMockBrowser();
+ const page = (await browser.pages())[0];
+ const mainFrame = page.mainFrame();
+ const collector = new TestNetworkCollector(page, 3);
+
+ const firstNavigation = getMockRequest({
+ url: 'http://example.com/first',
+ navigationRequest: true,
+ frame: mainFrame,
+ });
+ const firstResource = getMockRequest({
+ url: 'http://example.com/first-resource',
+ });
+ const subframeResource = getMockRequest({
+ url: 'http://example.com/subframe-resource',
+ });
+ page.emit('request', firstNavigation);
+ page.emit('framenavigated', mainFrame);
+ page.emit('request', firstResource);
+ page.emit('framenavigated', {} as Frame);
+ page.emit('request', subframeResource);
+
+ const redirectNavigation = getMockRequest({
+ url: 'http://example.com/redirect',
+ navigationRequest: true,
+ frame: mainFrame,
+ });
+ const redirectedNavigation = getMockRequest({
+ url: 'http://example.com/redirected',
+ navigationRequest: true,
+ frame: mainFrame,
+ });
+ const redirectedResource = getMockRequest({
+ url: 'http://example.com/redirected-resource',
+ });
+ page.emit('request', redirectNavigation);
+ page.emit('request', redirectedNavigation);
+ page.emit('framenavigated', mainFrame);
+ page.emit('request', redirectedResource);
+
+ const finalNavigation = getMockRequest({
+ url: 'http://example.com/final',
+ navigationRequest: true,
+ frame: mainFrame,
+ });
+ const finalResource1 = getMockRequest({
+ url: 'http://example.com/final-resource-1',
+ });
+ const finalResource2 = getMockRequest({
+ url: 'http://example.com/final-resource-2',
+ });
+ page.emit('request', finalNavigation);
+ page.emit('framenavigated', mainFrame);
+ page.emit('request', finalResource1);
+ page.emit('request', finalResource2);
+
+ assert.deepEqual(collector.getData(true), [
+ subframeResource,
+ redirectNavigation,
+ redirectedNavigation,
+ redirectedResource,
+ finalNavigation,
+ finalResource1,
+ finalResource2,
+ ]);
+ assert.equal(collector.getData().length, 3);
+ assert.equal(collector.getData()[0], finalNavigation);
+ assert.deepEqual(collector.navigationSizes, [3, 2, 2]);
+ });
});
describe('ConsoleCollector', () => {