From dd2f685401cd580b5b7fd96fc2679dac5176b5d5 Mon Sep 17 00:00:00 2001 From: Nikolay Vitkov Date: Tue, 14 Oct 2025 12:54:22 +0200 Subject: [PATCH 1/2] refactor: use different format for reqid --- src/formatters/networkFormatter.ts | 2 +- tests/McpResponse.test.ts | 34 +++++++++++------------ tests/formatters/networkFormatter.test.ts | 12 ++++---- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/formatters/networkFormatter.ts b/src/formatters/networkFormatter.ts index 43be8ae69..80ca697b8 100644 --- a/src/formatters/networkFormatter.ts +++ b/src/formatters/networkFormatter.ts @@ -15,7 +15,7 @@ export function getShortDescriptionForRequest( id: number, ): string { // TODO truncate the URL - return `reqid ${id} - ${request.url()} ${request.method()} ${getStatusFromRequest(request)}`; + return `reqid=${id} ${request.url()} ${request.method()} ${getStatusFromRequest(request)}`; } export function getStatusFromRequest(request: HTTPRequest): string { diff --git a/tests/McpResponse.test.ts b/tests/McpResponse.test.ts index 266495f8c..53e2e81f2 100644 --- a/tests/McpResponse.test.ts +++ b/tests/McpResponse.test.ts @@ -210,8 +210,8 @@ Call handle_dialog to handle it before continuing.`, `# test response ## Network requests Showing 1-2 of 2 (Page 1 of 1). -reqid 1 - http://example.com GET [pending] -reqid 2 - http://example.com GET [pending]`, +reqid=1 http://example.com GET [pending] +reqid=2 http://example.com GET [pending]`, ); }); }); @@ -267,7 +267,7 @@ ${JSON.stringify({request: 'body'})} ${JSON.stringify({response: 'body'})} ## Network requests Showing 1-1 of 1 (Page 1 of 1). -reqid 1 - http://example.com POST [success - 200]`, +reqid=1 http://example.com POST [success - 200]`, ); }); }); @@ -290,7 +290,7 @@ Status: [pending] - content-size:10 ## Network requests Showing 1-1 of 1 (Page 1 of 1). -reqid 1 - http://example.com GET [pending]`, +reqid=1 http://example.com GET [pending]`, ); }); }); @@ -355,8 +355,8 @@ describe('McpResponse network request filtering', () => { `# test response ## Network requests Showing 1-2 of 2 (Page 1 of 1). -reqid 1 - http://example.com GET [pending] -reqid 1 - http://example.com GET [pending]`, +reqid=1 http://example.com GET [pending] +reqid=1 http://example.com GET [pending]`, ); }); }); @@ -379,7 +379,7 @@ reqid 1 - http://example.com GET [pending]`, `# test response ## Network requests Showing 1-1 of 1 (Page 1 of 1). -reqid 1 - http://example.com GET [pending]`, +reqid=1 http://example.com GET [pending]`, ); }); }); @@ -424,11 +424,11 @@ No requests found.`, `# test response ## Network requests Showing 1-5 of 5 (Page 1 of 1). -reqid 1 - http://example.com GET [pending] -reqid 1 - http://example.com GET [pending] -reqid 1 - http://example.com GET [pending] -reqid 1 - http://example.com GET [pending] -reqid 1 - http://example.com GET [pending]`, +reqid=1 http://example.com GET [pending] +reqid=1 http://example.com GET [pending] +reqid=1 http://example.com GET [pending] +reqid=1 http://example.com GET [pending] +reqid=1 http://example.com GET [pending]`, ); }); }); @@ -453,11 +453,11 @@ reqid 1 - http://example.com GET [pending]`, `# test response ## Network requests Showing 1-5 of 5 (Page 1 of 1). -reqid 1 - http://example.com GET [pending] -reqid 1 - http://example.com GET [pending] -reqid 1 - http://example.com GET [pending] -reqid 1 - http://example.com GET [pending] -reqid 1 - http://example.com GET [pending]`, +reqid=1 http://example.com GET [pending] +reqid=1 http://example.com GET [pending] +reqid=1 http://example.com GET [pending] +reqid=1 http://example.com GET [pending] +reqid=1 http://example.com GET [pending]`, ); }); }); diff --git a/tests/formatters/networkFormatter.test.ts b/tests/formatters/networkFormatter.test.ts index 7f2fddc4f..2e79866d3 100644 --- a/tests/formatters/networkFormatter.test.ts +++ b/tests/formatters/networkFormatter.test.ts @@ -23,20 +23,20 @@ describe('networkFormatter', () => { const request = getMockRequest(); const result = getShortDescriptionForRequest(request, 1); - assert.equal(result, 'reqid 1 - http://example.com GET [pending]'); + assert.equal(result, 'reqid=1 http://example.com GET [pending]'); }); it('shows correct method', async () => { const request = getMockRequest({method: 'POST'}); const result = getShortDescriptionForRequest(request, 1); - assert.equal(result, 'reqid 1 - http://example.com POST [pending]'); + assert.equal(result, 'reqid=1 http://example.com POST [pending]'); }); it('shows correct status for request with response code in 200', async () => { const response = getMockResponse(); const request = getMockRequest({response}); const result = getShortDescriptionForRequest(request, 1); - assert.equal(result, 'reqid 1 - http://example.com GET [success - 200]'); + assert.equal(result, 'reqid=1 http://example.com GET [success - 200]'); }); it('shows correct status for request with response code in 100', async () => { const response = getMockResponse({ @@ -45,7 +45,7 @@ describe('networkFormatter', () => { const request = getMockRequest({response}); const result = getShortDescriptionForRequest(request, 1); - assert.equal(result, 'reqid 1 - http://example.com GET [failed - 199]'); + assert.equal(result, 'reqid=1 http://example.com GET [failed - 199]'); }); it('shows correct status for request with response code above 200', async () => { const response = getMockResponse({ @@ -54,7 +54,7 @@ describe('networkFormatter', () => { const request = getMockRequest({response}); const result = getShortDescriptionForRequest(request, 1); - assert.equal(result, 'reqid 1 - http://example.com GET [failed - 300]'); + assert.equal(result, 'reqid=1 http://example.com GET [failed - 300]'); }); it('shows correct status for request that failed', async () => { const request = getMockRequest({ @@ -68,7 +68,7 @@ describe('networkFormatter', () => { assert.equal( result, - 'reqid 1 - http://example.com GET [failed - Error in Network]', + 'reqid=1 http://example.com GET [failed - Error in Network]', ); }); }); From 02c13c5282488a06d2f0329aa89ea20f6d33ad0d Mon Sep 17 00:00:00 2001 From: Nikolay Vitkov Date: Tue, 14 Oct 2025 14:19:34 +0200 Subject: [PATCH 2/2] move around --- src/formatters/networkFormatter.ts | 2 +- tests/McpResponse.test.ts | 34 +++++++++++------------ tests/formatters/networkFormatter.test.ts | 12 ++++---- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/formatters/networkFormatter.ts b/src/formatters/networkFormatter.ts index 80ca697b8..572797339 100644 --- a/src/formatters/networkFormatter.ts +++ b/src/formatters/networkFormatter.ts @@ -15,7 +15,7 @@ export function getShortDescriptionForRequest( id: number, ): string { // TODO truncate the URL - return `reqid=${id} ${request.url()} ${request.method()} ${getStatusFromRequest(request)}`; + return `reqid=${id} ${request.method()} ${request.url()} ${getStatusFromRequest(request)}`; } export function getStatusFromRequest(request: HTTPRequest): string { diff --git a/tests/McpResponse.test.ts b/tests/McpResponse.test.ts index 53e2e81f2..b293cc069 100644 --- a/tests/McpResponse.test.ts +++ b/tests/McpResponse.test.ts @@ -210,8 +210,8 @@ Call handle_dialog to handle it before continuing.`, `# test response ## Network requests Showing 1-2 of 2 (Page 1 of 1). -reqid=1 http://example.com GET [pending] -reqid=2 http://example.com GET [pending]`, +reqid=1 GET http://example.com [pending] +reqid=2 GET http://example.com [pending]`, ); }); }); @@ -267,7 +267,7 @@ ${JSON.stringify({request: 'body'})} ${JSON.stringify({response: 'body'})} ## Network requests Showing 1-1 of 1 (Page 1 of 1). -reqid=1 http://example.com POST [success - 200]`, +reqid=1 POST http://example.com [success - 200]`, ); }); }); @@ -290,7 +290,7 @@ Status: [pending] - content-size:10 ## Network requests Showing 1-1 of 1 (Page 1 of 1). -reqid=1 http://example.com GET [pending]`, +reqid=1 GET http://example.com [pending]`, ); }); }); @@ -355,8 +355,8 @@ describe('McpResponse network request filtering', () => { `# test response ## Network requests Showing 1-2 of 2 (Page 1 of 1). -reqid=1 http://example.com GET [pending] -reqid=1 http://example.com GET [pending]`, +reqid=1 GET http://example.com [pending] +reqid=1 GET http://example.com [pending]`, ); }); }); @@ -379,7 +379,7 @@ reqid=1 http://example.com GET [pending]`, `# test response ## Network requests Showing 1-1 of 1 (Page 1 of 1). -reqid=1 http://example.com GET [pending]`, +reqid=1 GET http://example.com [pending]`, ); }); }); @@ -424,11 +424,11 @@ No requests found.`, `# test response ## Network requests Showing 1-5 of 5 (Page 1 of 1). -reqid=1 http://example.com GET [pending] -reqid=1 http://example.com GET [pending] -reqid=1 http://example.com GET [pending] -reqid=1 http://example.com GET [pending] -reqid=1 http://example.com GET [pending]`, +reqid=1 GET http://example.com [pending] +reqid=1 GET http://example.com [pending] +reqid=1 GET http://example.com [pending] +reqid=1 GET http://example.com [pending] +reqid=1 GET http://example.com [pending]`, ); }); }); @@ -453,11 +453,11 @@ reqid=1 http://example.com GET [pending]`, `# test response ## Network requests Showing 1-5 of 5 (Page 1 of 1). -reqid=1 http://example.com GET [pending] -reqid=1 http://example.com GET [pending] -reqid=1 http://example.com GET [pending] -reqid=1 http://example.com GET [pending] -reqid=1 http://example.com GET [pending]`, +reqid=1 GET http://example.com [pending] +reqid=1 GET http://example.com [pending] +reqid=1 GET http://example.com [pending] +reqid=1 GET http://example.com [pending] +reqid=1 GET http://example.com [pending]`, ); }); }); diff --git a/tests/formatters/networkFormatter.test.ts b/tests/formatters/networkFormatter.test.ts index 2e79866d3..e9608f507 100644 --- a/tests/formatters/networkFormatter.test.ts +++ b/tests/formatters/networkFormatter.test.ts @@ -23,20 +23,20 @@ describe('networkFormatter', () => { const request = getMockRequest(); const result = getShortDescriptionForRequest(request, 1); - assert.equal(result, 'reqid=1 http://example.com GET [pending]'); + assert.equal(result, 'reqid=1 GET http://example.com [pending]'); }); it('shows correct method', async () => { const request = getMockRequest({method: 'POST'}); const result = getShortDescriptionForRequest(request, 1); - assert.equal(result, 'reqid=1 http://example.com POST [pending]'); + assert.equal(result, 'reqid=1 POST http://example.com [pending]'); }); it('shows correct status for request with response code in 200', async () => { const response = getMockResponse(); const request = getMockRequest({response}); const result = getShortDescriptionForRequest(request, 1); - assert.equal(result, 'reqid=1 http://example.com GET [success - 200]'); + assert.equal(result, 'reqid=1 GET http://example.com [success - 200]'); }); it('shows correct status for request with response code in 100', async () => { const response = getMockResponse({ @@ -45,7 +45,7 @@ describe('networkFormatter', () => { const request = getMockRequest({response}); const result = getShortDescriptionForRequest(request, 1); - assert.equal(result, 'reqid=1 http://example.com GET [failed - 199]'); + assert.equal(result, 'reqid=1 GET http://example.com [failed - 199]'); }); it('shows correct status for request with response code above 200', async () => { const response = getMockResponse({ @@ -54,7 +54,7 @@ describe('networkFormatter', () => { const request = getMockRequest({response}); const result = getShortDescriptionForRequest(request, 1); - assert.equal(result, 'reqid=1 http://example.com GET [failed - 300]'); + assert.equal(result, 'reqid=1 GET http://example.com [failed - 300]'); }); it('shows correct status for request that failed', async () => { const request = getMockRequest({ @@ -68,7 +68,7 @@ describe('networkFormatter', () => { assert.equal( result, - 'reqid=1 http://example.com GET [failed - Error in Network]', + 'reqid=1 GET http://example.com [failed - Error in Network]', ); }); });