move to network

Author: Lightning00Blade

docs/tool-reference.md

@@ -269,7 +269,7 @@
 
 **Parameters:**
 
-- **includePreviousNavigations** (boolean) _(optional)_: Number of previous navigations to include. Current navigation is always included.
+- **includePreviousNavigations** (boolean) _(optional)_: Whether to include request from previous navigations.
 - **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.
 - **resourceTypes** (array) _(optional)_: Filter requests to only return requests of the specified resource types. When omitted or empty, returns all requests.

src/tools/network.ts

@@ -66,9 +66,7 @@ export const listNetworkRequests = defineTool({
       .boolean()
       .default(false)
       .optional()
-      .describe(
-        'Number of previous navigations to include. Current navigation is always included.',
-      ),
+      .describe('Whether to include request from previous navigations.'),
   },
   handler: async (request, response) => {
     response.setIncludeNetworkRequests(true, {

tests/tools/network.test.js.snapshot

@@ -1,15 +1,34 @@
+exports[`network > network_get_request > should get request from previous navigations 1`] = `
+# get_request response
+## Request http://localhost:<port>/one
+Status:  [success - 200]
+### Request Headers
+- accept-language:en-US,en;q=0.9
+- upgrade-insecure-requests:1
+- user-agent:Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome/141.0.0.0 Safari/537.36
+- sec-ch-ua:"Chromium";v="141", "Not?A_Brand";v="8"
+- sec-ch-ua-mobile:?0
+- sec-ch-ua-platform:"Linux"
+### Response Headers
+- connection:keep-alive
+- content-length:239
+- content-type:text/html; charset=utf-8
+- date:<long date>
+- keep-alive:timeout=5
+`;
+
 exports[`network > network_list_requests > list requests form current navigations only 1`] = `
 # list_request response
 ## Network requests
 Showing 1-1 of 1 (Page 1 of 1).
-reqid=3 GET data:text/html,<div>Hello 3</div> [success - 200]
+reqid=4 GET http://localhost:<port>/three [success - 200]
 `;
 
 exports[`network > network_list_requests > list requests from previous navigations 1`] = `
 # list_request response
 ## Network requests
 Showing 1-3 of 3 (Page 1 of 1).
-reqid=1 GET data:text/html,<div>Hello 1</div> [success - 200]
-reqid=2 GET data:text/html,<div>Hello 2</div> [success - 200]
-reqid=3 GET data:text/html,<div>Hello 3</div> [success - 200]
+reqid=1 GET http://localhost:<port>/one [success - 200]
+reqid=2 GET http://localhost:<port>/two [success - 200]
+reqid=3 GET http://localhost:<port>/three [success - 200]
 `;

tests/tools/network.test.ts

@@ -10,9 +10,11 @@ import {
   getNetworkRequest,
   listNetworkRequests,
 } from '../../src/tools/network.js';
-import {withBrowser} from '../utils.js';
+import {serverHooks} from '../server.js';
+import {html, withBrowser, stabilizeResponseOutput} from '../utils.js';
 
 describe('network', () => {
+  const server = serverHooks();
   describe('network_list_requests', () => {
     it('list requests', async () => {
       await withBrowser(async (response, context) => {
@@ -23,11 +25,15 @@ describe('network', () => {
     });
 
     it('list requests form current navigations only', async t => {
+      server.addHtmlRoute('/one', html`<main>First</main>`);
+      server.addHtmlRoute('/two', html`<main>Second</main>`);
+      server.addHtmlRoute('/three', html`<main>Third</main>`);
+
       await withBrowser(async (response, context) => {
-        const page = await context.getSelectedPage();
-        await page.goto('data:text/html,<div>Hello 1</div>');
-        await page.goto('data:text/html,<div>Hello 2</div>');
-        await page.goto('data:text/html,<div>Hello 3</div>');
+        const page = context.getSelectedPage();
+        await page.goto(server.getRoute('/one'));
+        await page.goto(server.getRoute('/two'));
+        await page.goto(server.getRoute('/three'));
         await listNetworkRequests.handler(
           {
             params: {},
@@ -36,16 +42,20 @@ describe('network', () => {
           context,
         );
         const responseData = await response.handle('list_request', context);
-        t.assert.snapshot?.(responseData[0].text);
+        t.assert.snapshot?.(stabilizeResponseOutput(responseData[0].text));
       });
     });
 
     it('list requests from previous navigations', async t => {
+      server.addHtmlRoute('/one', html`<main>First</main>`);
+      server.addHtmlRoute('/two', html`<main>Second</main>`);
+      server.addHtmlRoute('/three', html`<main>Third</main>`);
+
       await withBrowser(async (response, context) => {
-        const page = await context.getSelectedPage();
-        await page.goto('data:text/html,<div>Hello 1</div>');
-        await page.goto('data:text/html,<div>Hello 2</div>');
-        await page.goto('data:text/html,<div>Hello 3</div>');
+        const page = context.getSelectedPage();
+        await page.goto(server.getRoute('/one'));
+        await page.goto(server.getRoute('/two'));
+        await page.goto(server.getRoute('/three'));
         await listNetworkRequests.handler(
           {
             params: {
@@ -56,14 +66,14 @@ describe('network', () => {
           context,
         );
         const responseData = await response.handle('list_request', context);
-        t.assert.snapshot?.(responseData[0].text);
+        t.assert.snapshot?.(stabilizeResponseOutput(responseData[0].text));
       });
     });
   });
   describe('network_get_request', () => {
     it('attaches request', async () => {
       await withBrowser(async (response, context) => {
-        const page = await context.getSelectedPage();
+        const page = context.getSelectedPage();
         await page.goto('data:text/html,<div>Hello MCP</div>');
         await getNetworkRequest.handler(
           {params: {reqid: 1}},
@@ -76,7 +86,7 @@ describe('network', () => {
     });
     it('should not add the request list', async () => {
       await withBrowser(async (response, context) => {
-        const page = await context.getSelectedPage();
+        const page = context.getSelectedPage();
         await page.goto('data:text/html,<div>Hello MCP</div>');
         await getNetworkRequest.handler(
           {params: {reqid: 1}},
@@ -86,5 +96,29 @@ describe('network', () => {
         assert(!response.includeNetworkRequests);
       });
     });
+    it.only('should get request from previous navigations', async t => {
+      server.addHtmlRoute('/one', html`<main>First</main>`);
+      server.addHtmlRoute('/two', html`<main>Second</main>`);
+      server.addHtmlRoute('/three', html`<main>Third</main>`);
+
+      await withBrowser(async (response, context) => {
+        const page = context.getSelectedPage();
+        await page.goto(server.getRoute('/one'));
+        await page.goto(server.getRoute('/two'));
+        await page.goto(server.getRoute('/three'));
+        await getNetworkRequest.handler(
+          {
+            params: {
+              reqid: 1,
+            },
+          },
+          response,
+          context,
+        );
+        const responseData = await response.handle('get_request', context);
+
+        t.assert.snapshot?.(stabilizeResponseOutput(responseData[0].text));
+      });
+    });
   });
 });

tests/tools/snapshot.test.ts

@@ -21,7 +21,7 @@ describe('snapshot', () => {
   describe('browser_wait_for', () => {
     it('should work', async () => {
       await withBrowser(async (response, context) => {
-        const page = await context.getSelectedPage();
+        const page = context.getSelectedPage();
 
         await page.setContent(
           html`<main><span>Hello</span><span> </span><div>World</div></main>`,
@@ -98,7 +98,7 @@ describe('snapshot', () => {
 
     it('should work with iframe content', async () => {
       await withBrowser(async (response, context) => {
-        const page = await context.getSelectedPage();
+        const page = context.getSelectedPage();
 
         await page.setContent(
           html`<h1>Top level</h1>

tests/utils.ts

@@ -130,3 +130,15 @@ export function html(
   </body>
 </html>`;
 }
+
+export function stabilizeResponseOutput(text: unknown) {
+  if (typeof text !== 'string') {
+    throw new Error('Input must be string');
+  }
+  let output = text;
+  const dateRegEx = /.{3}, \d{2} .{3} \d{4} \d{2}:\d{2}:\d{2} [A-Z]{3}/g;
+  const localhostRegEx = /http:\/\/localhost:\d{5}\//g;
+  output = output.replaceAll(dateRegEx, '<long date>');
+  output = output.replaceAll(localhostRegEx, 'http://localhost:<port>/');
+  return output;
+}