chore: fix pr comment

Author: JustasMonkev

README.md

@@ -296,9 +296,8 @@ If you run into any issues, checkout our [troubleshooting guide](./docs/troubles
   - [`new_page`](docs/tool-reference.md#new_page)
   - [`select_page`](docs/tool-reference.md#select_page)
   - [`wait_for`](docs/tool-reference.md#wait_for)
-- **Emulation** (3 tools)
+- **Emulation** (2 tools)
   - [`emulate`](docs/tool-reference.md#emulate)
-  - [`emulate_geolocation`](docs/tool-reference.md#emulate_geolocation)
   - [`resize_page`](docs/tool-reference.md#resize_page)
 - **Performance** (3 tools)
   - [`performance_analyze_insight`](docs/tool-reference.md#performance_analyze_insight)

docs/tool-reference.md

@@ -18,9 +18,8 @@
   - [`new_page`](#new_page)
   - [`select_page`](#select_page)
   - [`wait_for`](#wait_for)
-- **[Emulation](#emulation)** (3 tools)
+- **[Emulation](#emulation)** (2 tools)
   - [`emulate`](#emulate)
-  - [`emulate_geolocation`](#emulate_geolocation)
   - [`resize_page`](#resize_page)
 - **[Performance](#performance)** (3 tools)
   - [`performance_analyze_insight`](#performance_analyze_insight)
@@ -196,22 +195,14 @@
 
 **Parameters:**
 
+- **clearGeolocation** (boolean) _(optional)_: Set to true to clear the geolocation override.
 - **cpuThrottlingRate** (number) _(optional)_: Represents the CPU slowdown factor. Set the rate to 1 to disable throttling. If omitted, throttling remains unchanged.
+- **latitude** (number) _(optional)_: Latitude between -90 and 90 for geolocation emulation. Must be provided together with longitude.
+- **longitude** (number) _(optional)_: Longitude between -180 and 180 for geolocation emulation. Must be provided together with latitude.
 - **networkConditions** (enum: "No emulation", "Offline", "Slow 3G", "Fast 3G", "Slow 4G", "Fast 4G") _(optional)_: Throttle network. Set to "No emulation" to disable. If omitted, conditions remain unchanged.
 
 ---
 
-### `emulate_geolocation`
-
-**Description:** Emulates geolocation on the selected page. Useful for testing location-based features.
-
-**Parameters:**
-
-- **latitude** (number) _(optional)_: Latitude between -90 and 90. Omit latitude and longitude to clear the override.
-- **longitude** (number) _(optional)_: Longitude between -180 and 180. Omit latitude and longitude to clear the override.
-
----
-
 ### `resize_page`
 
 **Description:** Resizes the selected page's window so that the page has specified dimension

src/tools/emulation.ts

@@ -37,31 +37,50 @@ export const emulate = defineTool({
       .describe(
         'Represents the CPU slowdown factor. Set the rate to 1 to disable throttling. If omitted, throttling remains unchanged.',
       ),
+    latitude: zod
+      .number()
+      .min(-90)
+      .max(90)
+      .optional()
+      .describe(
+        'Latitude between -90 and 90 for geolocation emulation. Must be provided together with longitude.',
+      ),
+    longitude: zod
+      .number()
+      .min(-180)
+      .max(180)
+      .optional()
+      .describe(
+        'Longitude between -180 and 180 for geolocation emulation. Must be provided together with latitude.',
+      ),
+    clearGeolocation: zod
+      .boolean()
+      .optional()
+      .describe('Set to true to clear the geolocation override.'),
   },
   handler: async (request, _response, context) => {
     const page = context.getSelectedPage();
-    const networkConditions = request.params.networkConditions;
-    const cpuThrottlingRate = request.params.cpuThrottlingRate;
+    const {
+      networkConditions,
+      cpuThrottlingRate,
+      latitude,
+      longitude,
+      clearGeolocation,
+    } = request.params;
 
     if (networkConditions) {
       if (networkConditions === 'No emulation') {
         await page.emulateNetworkConditions(null);
         context.setNetworkConditions(null);
-        return;
-      }
-
-      if (networkConditions === 'Offline') {
+      } else if (networkConditions === 'Offline') {
         await page.emulateNetworkConditions({
           offline: true,
           download: 0,
           upload: 0,
           latency: 0,
         });
         context.setNetworkConditions('Offline');
-        return;
-      }
-
-      if (networkConditions in PredefinedNetworkConditions) {
+      } else if (networkConditions in PredefinedNetworkConditions) {
         const networkCondition =
           PredefinedNetworkConditions[
             networkConditions as keyof typeof PredefinedNetworkConditions
@@ -75,59 +94,19 @@ export const emulate = defineTool({
       await page.emulateCPUThrottling(cpuThrottlingRate);
       context.setCpuThrottlingRate(cpuThrottlingRate);
     }
-  },
-});
 
-export const emulateGeolocation = defineTool({
-  name: 'emulate_geolocation',
-  description: `Emulates geolocation on the selected page. Useful for testing location-based features.`,
-  annotations: {
-    category: ToolCategory.EMULATION,
-    readOnlyHint: false,
-  },
-  schema: {
-    latitude: zod
-      .number()
-      .min(-90)
-      .max(90)
-      .optional()
-      .describe(
-        'Latitude between -90 and 90. Omit latitude and longitude to clear the override.',
-      ),
-    longitude: zod
-      .number()
-      .min(-180)
-      .max(180)
-      .optional()
-      .describe(
-        'Longitude between -180 and 180. Omit latitude and longitude to clear the override.',
-      ),
-  },
-  handler: async (request, _response, context) => {
-    const page = context.getSelectedPage();
-    const {latitude, longitude} = request.params;
-
-    if (latitude === undefined && longitude === undefined) {
-      // Clear geolocation override
-      await page.setGeolocation({
-        latitude: 0,
-        longitude: 0,
-      });
+    if (clearGeolocation) {
+      await page.setGeolocation({latitude: 0, longitude: 0});
       context.setGeolocation(null);
-    } else if (latitude !== undefined && longitude !== undefined) {
-      // Set geolocation override
-      await page.setGeolocation({
-        latitude,
-        longitude,
-      });
-      context.setGeolocation({
-        latitude,
-        longitude,
-      });
-    } else {
-      throw new Error(
-        'Both latitude and longitude must be provided, or both must be omitted to clear the override.',
-      );
+    } else if (latitude !== undefined || longitude !== undefined) {
+      if (latitude !== undefined && longitude !== undefined) {
+        await page.setGeolocation({latitude, longitude});
+        context.setGeolocation({latitude, longitude});
+      } else {
+        throw new Error(
+          'Both latitude and longitude must be provided together for geolocation emulation.',
+        );
+      }
     }
   },
 });

tests/tools/emulation.test.ts

@@ -7,7 +7,7 @@
 import assert from 'node:assert';
 import {describe, it} from 'node:test';
 
-import {emulate, emulateGeolocation} from '../../src/tools/emulation.js';
+import {emulate} from '../../src/tools/emulation.js';
 import {withMcpContext} from '../utils.js';
 
 describe('emulation', () => {
@@ -156,7 +156,7 @@ describe('emulation', () => {
   describe('geolocation', () => {
     it('emulates geolocation with latitude and longitude', async () => {
       await withMcpContext(async (response, context) => {
-        await emulateGeolocation.handler(
+        await emulate.handler(
           {
             params: {
               latitude: 48.137154,
@@ -173,10 +173,10 @@ describe('emulation', () => {
       });
     });
 
-    it('clears geolocation override when both params are omitted', async () => {
+    it('clears geolocation override when clearGeolocation is true', async () => {
       await withMcpContext(async (response, context) => {
         // First set a geolocation
-        await emulateGeolocation.handler(
+        await emulate.handler(
           {
             params: {
               latitude: 48.137154,
@@ -189,10 +189,12 @@ describe('emulation', () => {
 
         assert.notStrictEqual(context.getGeolocation(), null);
 
-        // Then clear it by omitting both params
-        await emulateGeolocation.handler(
+        // Then clear it using clearGeolocation
+        await emulate.handler(
           {
-            params: {},
+            params: {
+              clearGeolocation: true,
+            },
           },
           response,
           context,
@@ -206,7 +208,7 @@ describe('emulation', () => {
       await withMcpContext(async (response, context) => {
         await assert.rejects(
           async () => {
-            await emulateGeolocation.handler(
+            await emulate.handler(
               {
                 params: {
                   latitude: 48.137154,
@@ -218,15 +220,15 @@ describe('emulation', () => {
           },
           {
             message:
-              'Both latitude and longitude must be provided, or both must be omitted to clear the override.',
+              'Both latitude and longitude must be provided together for geolocation emulation.',
           },
         );
       });
     });
 
     it('reports correctly for the currently selected page', async () => {
       await withMcpContext(async (response, context) => {
-        await emulateGeolocation.handler(
+        await emulate.handler(
           {
             params: {
               latitude: 48.137154,