Skip to content

Commit fad4873

Browse files
committed
chore: move 'undefined' logic into formatting methods
1 parent a177137 commit fad4873

File tree

3 files changed

+11
-33
lines changed

3 files changed

+11
-33
lines changed

src/McpResponse.ts

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import type {
77
ImageContent,
88
TextContent,
99
} from '@modelcontextprotocol/sdk/types.js';
10-
import type {HTTPRequest, HTTPResponse, ResourceType} from 'puppeteer-core';
10+
import type {ResourceType} from 'puppeteer-core';
1111

1212
import {formatConsoleEvent} from './formatters/consoleFormatter.js';
1313
import {
@@ -144,12 +144,12 @@ export class McpResponse implements Response {
144144
);
145145

146146
this.#attachedNetworkRequestData.requestBody =
147-
await this.processRequestBody(request);
147+
await getFormattedRequestBody(request);
148148

149149
const response = request.response();
150150
if (response) {
151151
this.#attachedNetworkRequestData.responseBody =
152-
await this.processResponseBody(response);
152+
await getFormattedResponseBody(response);
153153
}
154154
}
155155

@@ -166,28 +166,6 @@ export class McpResponse implements Response {
166166
return this.format(toolName, context);
167167
}
168168

169-
async processResponseBody(
170-
httpResponse: HTTPResponse,
171-
): Promise<string | undefined> {
172-
const formattedResponseData = await getFormattedResponseBody(httpResponse);
173-
if (formattedResponseData.length > 0) {
174-
return formattedResponseData;
175-
}
176-
177-
return undefined;
178-
}
179-
180-
async processRequestBody(
181-
httpRequest: HTTPRequest,
182-
): Promise<string | undefined> {
183-
const formattedRequestData = await getFormattedRequestBody(httpRequest);
184-
if (formattedRequestData.length > 0) {
185-
return formattedRequestData;
186-
}
187-
188-
return undefined;
189-
}
190-
191169
format(
192170
toolName: string,
193171
context: McpContext,

src/formatters/networkFormatter.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export function getFormattedHeaderValue(
4545
export async function getFormattedResponseBody(
4646
httpResponse: HTTPResponse,
4747
sizeLimit: number = BODY_CONTEXT_SIZE_LIMIT,
48-
): Promise<string> {
48+
): Promise<string | undefined> {
4949
try {
5050
const responseBuffer = await httpResponse.buffer();
5151

@@ -62,14 +62,14 @@ export async function getFormattedResponseBody(
6262
return `<binary data>`;
6363
} catch {
6464
// buffer() call might fail with CDP exception, in this case we don't print anything in the context
65-
return '';
65+
return undefined;
6666
}
6767
}
6868

6969
export async function getFormattedRequestBody(
7070
httpRequest: HTTPRequest,
7171
sizeLimit: number = BODY_CONTEXT_SIZE_LIMIT,
72-
): Promise<string> {
72+
): Promise<string | undefined> {
7373
if (httpRequest.hasPostData()) {
7474
const data = httpRequest.postData();
7575

@@ -85,11 +85,11 @@ export async function getFormattedRequestBody(
8585
}
8686
} catch {
8787
// fetchPostData() call might fail with CDP exception, in this case we don't print anything in the context
88-
return '';
88+
return undefined;
8989
}
9090
}
9191

92-
return '';
92+
return undefined;
9393
}
9494

9595
function getSizeLimitedString(text: string, sizeLimit: number) {

tests/formatters/networkFormatter.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ describe('networkFormatter', () => {
122122

123123
const result = await getFormattedRequestBody(request, 200);
124124

125-
assert.strictEqual(result, '');
125+
assert.strictEqual(result, undefined);
126126
});
127127
it('shows request body when postData is available', async () => {
128128
const request = getMockRequest({
@@ -173,7 +173,7 @@ describe('networkFormatter', () => {
173173

174174
const result = await getFormattedRequestBody(request, 200);
175175

176-
assert.strictEqual(result, '');
176+
assert.strictEqual(result, undefined);
177177
});
178178
});
179179

@@ -232,7 +232,7 @@ describe('networkFormatter', () => {
232232

233233
const result = await getFormattedResponseBody(response, 200);
234234

235-
assert.strictEqual(result, '');
235+
assert.strictEqual(result, undefined);
236236
});
237237
});
238238
});

0 commit comments

Comments
 (0)