refactor: use validate files on the tool level

src/ToolHandler.ts

@@ -220,6 +220,12 @@ export class ToolHandler {
 
       response.setRedactNetworkHeaders(this.serverArgs.redactNetworkHeaders);
       try {
+        if (this.tool.verifyFilesSchema) {
+          for (const key of this.tool.verifyFilesSchema) {
+            const filePath = params[key];
+            await context.validatePath(filePath as string);
+          }
+        }
         if (isPageScopedTool(this.tool)) {
           const pageId =
             typeof params.pageId === 'number' ? params.pageId : undefined;

src/tools/ToolDefinition.ts

@@ -48,6 +48,7 @@ export interface BaseToolDefinition<
   };
   schema: Schema;
   blockedByDialog: boolean;
+  verifyFilesSchema: Array<keyof Schema>;
 }
 
 export interface ToolDefinition<

src/tools/console.ts

@@ -79,6 +79,7 @@ export const listConsoleMessages = definePageTool(cliArgs => {
         ),
     },
     blockedByDialog: false,
+    verifyFilesSchema: [],
     handler: async (request, response) => {
       response.setIncludeConsoleData(true, {
         pageSize: request.params.pageSize,
@@ -105,6 +106,7 @@ export const getConsoleMessage = definePageTool({
       ),
   },
   blockedByDialog: false,
+  verifyFilesSchema: [],
   handler: async (request, response) => {
     response.attachConsoleMessage(request.params.msgid);
   },

src/tools/emulation.ts

@@ -100,6 +100,7 @@ export const emulate = definePageTool({
       ),
   },
   blockedByDialog: true,
+  verifyFilesSchema: [],
   handler: async (request, response, context) => {
     const page = request.page;
     await context.emulate(request.params, page.pptrPage);

src/tools/extensions.ts

@@ -22,9 +22,9 @@ export const installExtension = defineTool({
       .describe('Absolute path to the unpacked extension folder.'),
   },
   blockedByDialog: false,
+  verifyFilesSchema: ['path'],
   handler: async (request, response, context) => {
     const {path} = request.params;
-    await context.validatePath(path);
     const id = await context.installExtension(path);
     response.appendResponseLine(`Extension installed. Id: ${id}`);
   },
@@ -41,6 +41,7 @@ export const uninstallExtension = defineTool({
     id: zod.string().describe('ID of the extension to uninstall.'),
   },
   blockedByDialog: false,
+  verifyFilesSchema: [],
   handler: async (request, response, context) => {
     const {id} = request.params;
     await context.uninstallExtension(id);
@@ -58,6 +59,7 @@ export const listExtensions = defineTool({
   },
   schema: {},
   blockedByDialog: false,
+  verifyFilesSchema: [],
   handler: async (_request, response, _context) => {
     response.setListExtensions();
   },
@@ -74,13 +76,13 @@ export const reloadExtension = defineTool({
     id: zod.string().describe('ID of the extension to reload.'),
   },
   blockedByDialog: false,
+  verifyFilesSchema: [],
   handler: async (request, response, context) => {
     const {id} = request.params;
     const extension = await context.getExtension(id);
     if (!extension) {
       throw new Error(`Extension with ID ${id} not found.`);
     }
-    await context.validatePath(extension.path);
     await context.installExtension(extension.path);
     response.appendResponseLine('Extension reloaded.');
   },
@@ -97,6 +99,7 @@ export const triggerExtensionAction = defineTool({
     id: zod.string().describe('ID of the extension to trigger the action for.'),
   },
   blockedByDialog: false,
+  verifyFilesSchema: [],
   handler: async (request, response, context) => {
     const {id} = request.params;
     await context.triggerExtensionAction(id);

src/tools/input.ts

@@ -103,6 +103,7 @@ export const click = definePageTool({
     includeSnapshot: includeSnapshotSchema,
   },
   blockedByDialog: true,
+  verifyFilesSchema: [],
   handler: async (request, response) => {
     const uid = request.params.uid;
     const handle = await request.page.getElementByUid(uid);
@@ -154,6 +155,7 @@ export const clickAt = definePageTool({
     includeSnapshot: includeSnapshotSchema,
   },
   blockedByDialog: true,
+  verifyFilesSchema: [],
   handler: async (request, response) => {
     const page = request.page;
     const result = await page.waitForEventsAfterAction(async () => {
@@ -189,6 +191,7 @@ export const hover = definePageTool({
     includeSnapshot: includeSnapshotSchema,
   },
   blockedByDialog: true,
+  verifyFilesSchema: [],
   handler: async (request, response) => {
     const uid = request.params.uid;
     const handle = await request.page.getElementByUid(uid);
@@ -316,6 +319,7 @@ export const fill = definePageTool({
     includeSnapshot: includeSnapshotSchema,
   },
   blockedByDialog: true,
+  verifyFilesSchema: [],
   handler: async (request, response, context) => {
     const page = request.page;
     const result = await page.waitForEventsAfterAction(async () => {
@@ -346,6 +350,7 @@ export const typeText = definePageTool({
     submitKey: submitKeySchema,
   },
   blockedByDialog: true,
+  verifyFilesSchema: [],
   handler: async (request, response) => {
     const page = request.page;
     const result = await page.waitForEventsAfterAction(async () => {
@@ -376,6 +381,7 @@ export const drag = definePageTool({
     includeSnapshot: includeSnapshotSchema,
   },
   blockedByDialog: true,
+  verifyFilesSchema: [],
   handler: async (request, response) => {
     const fromHandle = await request.page.getElementByUid(
       request.params.from_uid,
@@ -423,6 +429,7 @@ export const fillForm = definePageTool({
     includeSnapshot: includeSnapshotSchema,
   },
   blockedByDialog: true,
+  verifyFilesSchema: [],
   handler: async (request, response, context) => {
     const page = request.page;
     let lastResult: WaitForEventsResult = {};
@@ -461,9 +468,9 @@ export const uploadFile = definePageTool({
     includeSnapshot: includeSnapshotSchema,
   },
   blockedByDialog: true,
-  handler: async (request, response, context) => {
+  verifyFilesSchema: ['filePath'],
+  handler: async (request, response, _context) => {
     const {uid, filePath} = request.params;
-    await context.validatePath(filePath);
     const handle = (await request.page.getElementByUid(
       uid,
     )) as ElementHandle<HTMLInputElement>;
@@ -512,6 +519,7 @@ export const pressKey = definePageTool({
     includeSnapshot: includeSnapshotSchema,
   },
   blockedByDialog: true,
+  verifyFilesSchema: [],
   handler: async (request, response) => {
     const page = request.page;
     const tokens = parseKey(request.params.key);

src/tools/lighthouse.ts

@@ -44,6 +44,7 @@ export const lighthouseAudit = definePageTool({
       .describe('Directory for reports. If omitted, uses temporary files.'),
   },
   blockedByDialog: true,
+  verifyFilesSchema: ['outputDirPath'],
   handler: async (request, response, context) => {
     const page = request.page;
     const categories = [
@@ -59,8 +60,6 @@ export const lighthouseAudit = definePageTool({
       outputDirPath,
     } = request.params;
 
-    await context.validatePath(outputDirPath);
-
     const flags: Flags = {
       onlyCategories: categories,
       output: formats,

src/tools/memory.ts

@@ -23,9 +23,9 @@ export const takeHeapSnapshot = definePageTool({
       .describe('A path to a .heapsnapshot file to save the heapsnapshot to.'),
   },
   blockedByDialog: true,
-  handler: async (request, response, context) => {
+  verifyFilesSchema: ['filePath'],
+  handler: async (request, response) => {
     const page = request.page;
-    await context.validatePath(request.params.filePath);
 
     await page.pptrPage.captureHeapSnapshot({
       path: ensureExtension(request.params.filePath, '.heapsnapshot'),
@@ -50,8 +50,8 @@ export const getHeapSnapshotSummary = defineTool({
     filePath: zod.string().describe('A path to a .heapsnapshot file to read.'),
   },
   blockedByDialog: false,
+  verifyFilesSchema: ['filePath'],
   handler: async (request, response, context) => {
-    await context.validatePath(request.params.filePath);
     const stats = await context.getHeapSnapshotStats(request.params.filePath);
     const staticData = await context.getHeapSnapshotStaticData(
       request.params.filePath,
@@ -82,8 +82,8 @@ export const getHeapSnapshotDetails = defineTool({
       .describe('The page size for pagination of aggregates.'),
   },
   blockedByDialog: false,
+  verifyFilesSchema: ['filePath'],
   handler: async (request, response, context) => {
-    await context.validatePath(request.params.filePath);
     const aggregates = await context.getHeapSnapshotAggregates(
       request.params.filePath,
     );
@@ -111,8 +111,8 @@ export const getHeapSnapshotClassNodes = defineTool({
     pageSize: zod.number().optional().describe('The page size for pagination.'),
   },
   blockedByDialog: false,
+  verifyFilesSchema: ['filePath'],
   handler: async (request, response, context) => {
-    await context.validatePath(request.params.filePath);
     const nodes = await context.getHeapSnapshotNodesById(
       request.params.filePath,
       request.params.id,
@@ -135,15 +135,14 @@ export const getHeapSnapshotRetainers = defineTool({
     conditions: ['experimentalMemory'],
   },
   blockedByDialog: false,
+  verifyFilesSchema: ['filePath'],
   schema: {
     filePath: zod.string().describe('A path to a .heapsnapshot file to read.'),
     nodeId: zod.number().describe('The node ID to get retainers for.'),
     pageIdx: zod.number().optional().describe('The page index for pagination.'),
     pageSize: zod.number().optional().describe('The page size for pagination.'),
   },
   handler: async (request, response, context) => {
-    await context.validatePath(request.params.filePath);
-
     const retainers = await context.getHeapSnapshotRetainers(
       request.params.filePath,
       request.params.nodeId,

src/tools/network.ts

@@ -71,6 +71,7 @@ export const listNetworkRequests = definePageTool({
       ),
   },
   blockedByDialog: false,
+  verifyFilesSchema: [],
   handler: async (request, response, context) => {
     const data = await request.page.getDevToolsData();
     response.attachDevToolsData(data);
@@ -115,9 +116,8 @@ export const getNetworkRequest = definePageTool({
       ),
   },
   blockedByDialog: true,
+  verifyFilesSchema: ['requestFilePath', 'responseFilePath'],
   handler: async (request, response, context) => {
-    await context.validatePath(request.params.requestFilePath);
-    await context.validatePath(request.params.responseFilePath);
     if (request.params.reqid) {
       response.attachNetworkRequest(request.params.reqid, {
         requestFilePath: request.params.requestFilePath,

src/tools/pages.ts

@@ -85,6 +85,7 @@ export const listPages = defineTool(args => {
     },
     schema: {},
     blockedByDialog: false,
+    verifyFilesSchema: [],
     handler: async (_request, response) => {
       response.setIncludePages(true);
       response.setListThirdPartyDeveloperTools();
@@ -112,6 +113,7 @@ export const selectPage = defineTool({
       .describe('Whether to focus the page and bring it to the top.'),
   },
   blockedByDialog: false,
+  verifyFilesSchema: [],
   handler: async (request, response, context) => {
     const page = context.getPageById(request.params.pageId);
     context.selectPage(page);
@@ -137,6 +139,7 @@ export const closePage = defineTool({
       .describe('The ID of the page to close. Call list_pages to list pages.'),
   },
   blockedByDialog: false,
+  verifyFilesSchema: [],
   handler: async (request, response, context) => {
     try {
       await context.closePage(request.params.pageId);
@@ -189,6 +192,7 @@ export const newPage = defineTool(args => {
       ...timeoutSchema,
     },
     blockedByDialog: false,
+    verifyFilesSchema: [],
     handler: async (request, response, context) => {
       const page = await context.newPage(
         request.params.background,
@@ -256,6 +260,7 @@ export const navigatePage = definePageTool(args => {
       ...timeoutSchema,
     },
     blockedByDialog: false,
+    verifyFilesSchema: [],
     handler: async (request, response) => {
       const page = request.page;
       const options = {
@@ -391,6 +396,7 @@ export const resizePage = definePageTool({
     height: zod.number().describe('Page height'),
   },
   blockedByDialog: false,
+  verifyFilesSchema: [],
   handler: async (request, response, _context) => {
     const page = request.page;
 
@@ -436,6 +442,7 @@ export const handleDialog = definePageTool({
       .describe('Optional prompt text to enter into the dialog.'),
   },
   blockedByDialog: false,
+  verifyFilesSchema: [],
   handler: async (request, response, _context) => {
     const page = request.page;
     const dialog = page.getDialog();
@@ -487,6 +494,7 @@ export const getTabId = definePageTool({
       ),
   },
   blockedByDialog: false,
+  verifyFilesSchema: [],
   handler: async (request, response, context) => {
     const page = context.getPageById(request.params.pageId);
     const tabId = (page.pptrPage as unknown as CdpPage)._tabId;

src/tools/performance.ts

@@ -48,8 +48,8 @@ export const startTrace = definePageTool({
     filePath: filePathSchema,
   },
   blockedByDialog: true,
+  verifyFilesSchema: ['filePath'],
   handler: async (request, response, context) => {
-    await context.validatePath(request.params.filePath);
     if (context.isRunningPerformanceTrace()) {
       response.appendResponseLine(
         'Error: a performance trace is already running. Use performance_stop_trace to stop it. Only one trace can be running at any given time.',
@@ -127,8 +127,8 @@ export const stopTrace = definePageTool({
     filePath: filePathSchema,
   },
   blockedByDialog: true,
+  verifyFilesSchema: ['filePath'],
   handler: async (request, response, context) => {
-    await context.validatePath(request.params.filePath);
     if (!context.isRunningPerformanceTrace()) {
       return;
     }
@@ -163,6 +163,7 @@ export const analyzeInsight = definePageTool({
       ),
   },
   blockedByDialog: false,
+  verifyFilesSchema: [],
   handler: async (request, response, context) => {
     const lastRecording = context.recordedTraces().at(-1);
     if (!lastRecording) {

src/tools/screencast.ts

@@ -39,8 +39,8 @@ export const startScreencast = definePageTool(args => ({
       ),
   },
   blockedByDialog: false,
+  verifyFilesSchema: ['filePath'],
   handler: async (request, response, context) => {
-    await context.validatePath(request.params.filePath);
     if (context.getScreenRecorder() !== null) {
       response.appendResponseLine(
         'Error: a screencast recording is already in progress. Use screencast_stop to stop it before starting a new one.',
@@ -103,6 +103,7 @@ export const stopScreencast = definePageTool({
   },
   schema: {},
   blockedByDialog: false,
+  verifyFilesSchema: [],
   handler: async (_request, response, context) => {
     const data = context.getScreenRecorder();
     if (!data) {

src/tools/screenshot.ts

@@ -51,8 +51,8 @@ export const screenshot = definePageTool({
       ),
   },
   blockedByDialog: true,
+  verifyFilesSchema: ['filePath'],
   handler: async (request, response, context) => {
-    await context.validatePath(request.params.filePath);
     if (request.params.uid && request.params.fullPage) {
       throw new Error('Providing both "uid" and "fullPage" is not allowed.');
     }