Skip to content

fix: use async response status for network request list and detail views #18

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

Open
AlanJie wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: use async response status for network request list and detail views #18

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
18 changes: 10 additions & 8 deletions src/McpResponse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ import {
getFormattedResponseBody,
getFormattedRequestBody,
getShortDescriptionForRequest,
getShortDescriptionForRequestAsync,
getStatusFromRequest,
getStatusFromRequestAsync,
} from './formatters/networkFormatter.js';
import {
formatWebSocketConnectionShort,
Expand Down Expand Up @@ -344,7 +346,7 @@ export class McpResponse implements Response {
});
}

format(
async format(
toolName: string,
context: McpContext,
data: {
Expand All @@ -355,7 +357,7 @@ export class McpResponse implements Response {
consoleData: ConsoleMessageData | undefined;
consoleListData: ConsoleMessageData[] | undefined;
},
): Array<TextContent | ImageContent> {
): Promise<Array<TextContent | ImageContent>> {
const response = [`# ${toolName} response`];
for (const line of this.#textResponseLines) {
response.push(line);
Expand Down Expand Up @@ -397,7 +399,7 @@ export class McpResponse implements Response {
}
}

response.push(...this.#formatNetworkRequestData(context, data.bodies));
response.push(...await this.#formatNetworkRequestData(context, data.bodies));
response.push(...this.#formatConsoleData(data.consoleData));

if (this.#networkRequestsOptions?.include) {
Expand Down Expand Up @@ -437,7 +439,7 @@ export class McpResponse implements Response {
response.push(...data.info);
for (const request of data.items) {
response.push(
getShortDescriptionForRequest(
await getShortDescriptionForRequestAsync(
request,
context.getNetworkRequestStableId(request),
context.getNetworkRequestStableId(request) ===
Expand Down Expand Up @@ -565,13 +567,13 @@ export class McpResponse implements Response {
return response;
}

#formatNetworkRequestData(
async #formatNetworkRequestData(
context: McpContext,
data: {
requestBody?: string;
responseBody?: string;
},
): string[] {
): Promise<string[]> {
const response: string[] = [];
const id = this.#attachedNetworkRequestId;
if (!id) {
Expand All @@ -580,7 +582,7 @@ export class McpResponse implements Response {

const httpRequest = context.getNetworkRequestById(id);
response.push(`## Request ${httpRequest.url()}`);
response.push(`Status: ${getStatusFromRequest(httpRequest)}`);
response.push(`Status: ${await getStatusFromRequestAsync(httpRequest)}`);
response.push(`### Request Headers`);
for (const line of getFormattedHeaderValue(httpRequest.headers())) {
response.push(line);
Expand Down Expand Up @@ -617,7 +619,7 @@ export class McpResponse implements Response {
let indent = 0;
for (const request of redirectChain.reverse()) {
response.push(
`${' '.repeat(indent)}${getShortDescriptionForRequest(request, context.getNetworkRequestStableId(request))}`,
`${' '.repeat(indent)}${await getShortDescriptionForRequestAsync(request, context.getNetworkRequestStableId(request))}`,
);
indent++;
}
Expand Down
9 changes: 9 additions & 0 deletions src/formatters/networkFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@ export function getShortDescriptionForRequest(
return `reqid=${id} [${request.resourceType()}] ${request.method()} ${request.url()} ${getStatusFromRequest(request)}${selectedInDevToolsUI ? ` [selected in the DevTools Network panel]` : ''}`;
}

export async function getShortDescriptionForRequestAsync(
request: HTTPRequest,
id: number,
selectedInDevToolsUI = false,
): Promise<string> {
const status = await getStatusFromRequestAsync(request);
return `reqid=${id} [${request.resourceType()}] ${request.method()} ${request.url()} ${status}${selectedInDevToolsUI ? ` [selected in the DevTools Network panel]` : ''}`;
}

export function getStatusFromRequest(request: HTTPRequest): string {
// In Playwright, request.response() is async, but we cache the failure info
const failure = request.failure();
Expand Down