Update Radar scopes and improve scan_url tool

Author: andre-j3sus

apps/radar/src/index.ts

@@ -66,9 +66,11 @@ export class RadarMCP extends McpAgent<Env, State, Props> {
 	}
 }
 
-// TODO add radar:read and url_scanner:write scopes once they are available
-// Also remove URL_SCANNER_API_TOKEN env var
-const RadarScopes = { ...RequiredScopes } as const
+const RadarScopes = {
+	...RequiredScopes,
+	// TODO 'radar:read': 'Grants access to read Cloudflare Radar data.',
+	// TODO 'url_scanner:write': 'Grants write level access to URL Scanner', // Remove URL_SCANNER_API_TOKEN env var
+} as const
 
 export default {
 	fetch: async (req: Request, env: Env, ctx: ExecutionContext) => {

apps/radar/src/tools/url-scanner.ts

@@ -23,23 +23,40 @@ export function registerUrlScannerTools(agent: RadarMCP) {
 					Authorization: `Bearer ${agent.env.URL_SCANNER_API_TOKEN}`,
 				}
 
-				// TODO investigate why this does not work
-				// const scan = await (client.urlScanner.scans.create({ account_id, url: "https://www.example.com" }, { headers })).withResponse()
-
-				const res = await fetch(
-					`https://api.cloudflare.com/client/v4/accounts/${account_id}/urlscanner/v2/scan`,
+				// TODO search if there are recent scans for the URL
+				const scans = await client.urlScanner.scans.list(
 					{
-						method: 'POST',
-						headers,
-						body: JSON.stringify({ url }),
-					}
+						account_id,
+						size: 1,
+						q: `page.url:${url}`,
+					},
+					{ headers }
 				)
-				if (!res.ok) {
-					throw new Error('Failed to submit scan')
-				}
+				console.log(scans)
+
+				let scanId = scans.results.length > 0 ? scans.results[0]._id : null
+
+				if (!scanId) {
+					// Submit scan
+					// TODO investigate why this does not work
+					// const scan = await (client.urlScanner.scans.create({ account_id, url: "https://www.example.com" }, { headers })).withResponse()
 
-				const scan = CreateScanResult.parse(await res.json())
-				const scanId = scan?.uuid
+					const res = await fetch(
+						`https://api.cloudflare.com/client/v4/accounts/${account_id}/urlscanner/v2/scan`,
+						{
+							method: 'POST',
+							headers,
+							body: JSON.stringify({ url }),
+						}
+					)
+
+					if (!res.ok) {
+						throw new Error('Failed to submit scan')
+					}
+
+					const scan = CreateScanResult.parse(await res.json())
+					scanId = scan?.uuid
+				}
 
 				const r = await pollUntilReady({
 					taskFn: () => client.urlScanner.scans.get(scanId, { account_id }, { headers }),
@@ -52,7 +69,7 @@ export function registerUrlScannerTools(agent: RadarMCP) {
 						{
 							type: 'text',
 							text: JSON.stringify({
-								result: r, // TODO select what is more relevant, or add a param to allow the agent to select a set of metrics
+								result: { verdicts: r.verdicts, stats: r.stats, page: r.page }, // TODO select what is more relevant, or add a param to allow the agent to select a set of metrics
 							}),
 						},
 					],