豆豆友情提示:这是一个非官方 GitHub 代理镜像,主要用于网络测试或访问加速。请勿在此进行登录、注册或处理任何敏感信息。进行这些操作请务必访问官方网站 github.com。 Raw 内容也通过此代理提供。
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
5 changes: 4 additions & 1 deletion docs/tool-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,10 @@

**Description:** List all requests for the currently selected page

**Parameters:** None
**Parameters:**

- **pageIdx** (integer) _(optional)_: Page number to return (0-based). When omitted, returns the first page.
- **pageSize** (integer) _(optional)_: Maximum number of requests to return. When omitted, returns all requests.

---

Expand Down
44 changes: 42 additions & 2 deletions src/McpResponse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
} from './formatters/networkFormatter.js';
import {formatA11ySnapshot} from './formatters/snapshotFormatter.js';
import {formatConsoleEvent} from './formatters/consoleFormatter.js';
import {paginate, type PaginationOptions} from './utils/pagination.js';

export class McpResponse implements Response {
#includePages: boolean = false;
Expand All @@ -23,6 +24,7 @@ export class McpResponse implements Response {
#textResponseLines: string[] = [];
#formattedConsoleData?: string[];
#images: ImageContentData[] = [];
#networkRequestsPaginationOptions?: PaginationOptions;

setIncludePages(value: boolean): void {
this.#includePages = value;
Expand All @@ -32,8 +34,20 @@ export class McpResponse implements Response {
this.#includeSnapshot = value;
}

setIncludeNetworkRequests(value: boolean): void {
setIncludeNetworkRequests(
value: boolean,
options?: {pageSize?: number; pageIdx?: number},
): void {
this.#includeNetworkRequests = value;
if (!value || !options) {
this.#networkRequestsPaginationOptions = undefined;
return;
}

this.#networkRequestsPaginationOptions = {
pageSize: options.pageSize,
pageIdx: options.pageIdx,
};
}

setIncludeConsoleData(value: boolean): void {
Expand All @@ -58,6 +72,9 @@ export class McpResponse implements Response {
get attachedNetworkRequestUrl(): string | undefined {
return this.#attachedNetworkRequestUrl;
}
get networkRequestsPageIdx(): number | undefined {
return this.#networkRequestsPaginationOptions?.pageIdx;
}

appendResponseLine(value: string): void {
this.#textResponseLines.push(value);
Expand Down Expand Up @@ -162,7 +179,30 @@ Call browser_handle_dialog to handle it before continuing.`);
const requests = context.getNetworkRequests();
response.push('## Network requests');
if (requests.length) {
for (const request of requests) {
const paginationResult = paginate(
requests,
this.#networkRequestsPaginationOptions,
);
if (paginationResult.invalidPage) {
response.push('Invalid page number provided. Showing first page.');
}

const {startIndex, endIndex, currentPage, totalPages} =
paginationResult;
response.push(
`Showing ${startIndex + 1}-${endIndex} of ${requests.length} (Page ${currentPage + 1} of ${totalPages}).`,
);

if (this.#networkRequestsPaginationOptions) {
if (paginationResult.hasNextPage) {
response.push(`Next page: ${currentPage + 1}`);
}
if (paginationResult.hasPreviousPage) {
response.push(`Previous page: ${currentPage - 1}`);
}
}

for (const request of paginationResult.items) {
response.push(getShortDescriptionForRequest(request));
}
} else {
Expand Down
5 changes: 4 additions & 1 deletion src/tools/ToolDefinition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ export type ImageContentData = {
export interface Response {
appendResponseLine(value: string): void;
setIncludePages(value: boolean): void;
setIncludeNetworkRequests(value: boolean): void;
setIncludeNetworkRequests(
value: boolean,
options?: {pageSize?: number; pageIdx?: number},
): void;
setIncludeConsoleData(value: boolean): void;
setIncludeSnapshot(value: boolean): void;
attachImage(value: ImageContentData): void;
Expand Down
26 changes: 23 additions & 3 deletions src/tools/network.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,29 @@ export const listNetworkRequests = defineTool({
category: ToolCategories.NETWORK,
readOnlyHint: true,
},
schema: {},
handler: async (_request, response) => {
response.setIncludeNetworkRequests(true);
schema: {
pageSize: z
.number()
.int()
.positive()
.optional()
.describe(
'Maximum number of requests to return. When omitted, returns all requests.',
),
pageIdx: z
.number()
.int()
.min(0)
.optional()
.describe(
'Page number to return (0-based). When omitted, returns the first page.',
),
},
handler: async (request, response) => {
response.setIncludeNetworkRequests(true, {
pageSize: request.params.pageSize,
pageIdx: request.params.pageIdx,
});
},
});

Expand Down
87 changes: 87 additions & 0 deletions src/utils/pagination.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
/**
* @license
* Copyright 2025 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/

export type PaginationOptions = {
pageSize?: number;
pageIdx?: number;
};

export type PaginationResult<TItem> = {
items: readonly TItem[];
currentPage: number;
totalPages: number;
hasNextPage: boolean;
hasPreviousPage: boolean;
startIndex: number;
endIndex: number;
invalidPage: boolean;
};

const DEFAULT_PAGE_SIZE = 20;

export function paginate<TItem>(
items: readonly TItem[],
options?: PaginationOptions,
): PaginationResult<TItem> {
const total = items.length;

if (!options || noPaginationOptions(options)) {
return {
items,
currentPage: 0,
totalPages: 1,
hasNextPage: false,
hasPreviousPage: false,
startIndex: 0,
endIndex: total,
invalidPage: false,
};
}

const pageSize = options.pageSize ?? DEFAULT_PAGE_SIZE;
const totalPages = Math.max(1, Math.ceil(total / pageSize));
const {currentPage, invalidPage} = resolvePageIndex(
options.pageIdx,
totalPages,
);

const startIndex = currentPage * pageSize;
const pageItems = items.slice(startIndex, startIndex + pageSize);
const endIndex = startIndex + pageItems.length;

return {
items: pageItems,
currentPage,
totalPages,
hasNextPage: currentPage < totalPages - 1,
hasPreviousPage: currentPage > 0,
startIndex,
endIndex,
invalidPage,
};
}

function noPaginationOptions(options: PaginationOptions): boolean {
return options.pageSize === undefined && options.pageIdx === undefined;
}

function resolvePageIndex(
pageIdx: number | undefined,
totalPages: number,
): {
currentPage: number;
invalidPage: boolean;
} {
if (pageIdx === undefined) {
return {currentPage: 0, invalidPage: false};
}

if (pageIdx < 0 || pageIdx >= totalPages) {
return {currentPage: 0, invalidPage: true};
}

return {currentPage: pageIdx, invalidPage: false};
}
69 changes: 69 additions & 0 deletions tests/McpResponse.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ Call browser_handle_dialog to handle it before continuing.`,
result[0].text,
`# test response
## Network requests
Showing 1-1 of 1 (Page 1 of 1).
http://example.com GET [pending]`,
);
});
Expand Down Expand Up @@ -217,6 +218,7 @@ Status: [pending]
### Request Headers
- content-size:10
## Network requests
Showing 1-1 of 1 (Page 1 of 1).
http://example.com GET [pending]`,
);
});
Expand Down Expand Up @@ -261,3 +263,70 @@ Log>`),
});
});
});

describe('McpResponse network pagination', () => {
it('returns all requests when pagination is not provided', async () => {
await withBrowser(async (response, context) => {
const requests = Array.from({length: 5}, () => getMockRequest());
context.getNetworkRequests = () => requests;
response.setIncludeNetworkRequests(true);
const result = await response.handle('test', context);
const text = (result[0].text as string).toString();
assert.ok(text.includes('Showing 1-5 of 5 (Page 1 of 1).'));
assert.ok(!text.includes('Next page:'));
assert.ok(!text.includes('Previous page:'));
});
});

it('returns first page by default', async () => {
await withBrowser(async (response, context) => {
const requests = Array.from({length: 30}, (_, idx) =>
getMockRequest({method: `GET-${idx}`}),
);
context.getNetworkRequests = () => {
return requests;
};
response.setIncludeNetworkRequests(true, {pageSize: 10});
const result = await response.handle('test', context);
const text = (result[0].text as string).toString();
assert.ok(text.includes('Showing 1-10 of 30 (Page 1 of 3).'));
assert.ok(text.includes('Next page: 1'));
assert.ok(!text.includes('Previous page:'));
});
});

it('returns subsequent page when pageIdx provided', async () => {
await withBrowser(async (response, context) => {
const requests = Array.from({length: 25}, (_, idx) =>
getMockRequest({method: `GET-${idx}`}),
);
context.getNetworkRequests = () => requests;
response.setIncludeNetworkRequests(true, {
pageSize: 10,
pageIdx: 1,
});
const result = await response.handle('test', context);
const text = (result[0].text as string).toString();
assert.ok(text.includes('Showing 11-20 of 25 (Page 2 of 3).'));
assert.ok(text.includes('Next page: 2'));
assert.ok(text.includes('Previous page: 0'));
});
});

it('handles invalid page number by showing first page', async () => {
await withBrowser(async (response, context) => {
const requests = Array.from({length: 5}, () => getMockRequest());
context.getNetworkRequests = () => requests;
response.setIncludeNetworkRequests(true, {
pageSize: 2,
pageIdx: 10, // Invalid page number
});
const result = await response.handle('test', context);
const text = (result[0].text as string).toString();
assert.ok(
text.includes('Invalid page number provided. Showing first page.'),
);
assert.ok(text.includes('Showing 1-2 of 5 (Page 1 of 3).'));
});
});
});
1 change: 1 addition & 0 deletions tests/tools/network.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ describe('network', () => {
await withBrowser(async (response, context) => {
await listNetworkRequests.handler({params: {}}, response, context);
assert.ok(response.includeNetworkRequests);
assert.strictEqual(response.networkRequestsPageIdx, undefined);
});
});
});
Expand Down
Loading