@govtechsg/oobee 0.10.51 → 0.10.57

package/src/crawlers/crawlSitemap.ts

@@ -1,5 +1,4 @@
-import crawlee, { LaunchContext, Request, RequestList } from 'crawlee';
-import printMessage from 'print-message';
+import crawlee, { LaunchContext, Request, RequestList, Dataset } from 'crawlee';
 import fs from 'fs';
 import {
   createCrawleeSubFolders,
@@ -8,11 +7,15 @@ import {
   isUrlPdf,
 } from './commonCrawlerFunc.js';
 
-import constants, { STATUS_CODE_METADATA, guiInfoStatusTypes, UrlsCrawled } from '../constants/constants.js';
+import constants, {
+  STATUS_CODE_METADATA,
+  guiInfoStatusTypes,
+  UrlsCrawled,
+  disallowedListOfPatterns,
+} from '../constants/constants.js';
 import {
   getLinksFromSitemap,
   getPlaywrightLaunchOptions,
-  messageOptions,
   isSkippedUrl,
   urlWithoutAuth,
   waitForPageLoaded,
@@ -24,25 +27,46 @@ import { handlePdfDownload, runPdfScan, mapPdfScanResults } from './pdfScanFunc.
 import { guiInfoLog } from '../logs.js';
 import { ViewportSettingsClass } from '../combine.js';
 
-const crawlSitemap = async (
-  sitemapUrl: string,
-  randomToken: string,
-  _host: string,
-  viewportSettings: ViewportSettingsClass,
-  maxRequestsPerCrawl: number,
-  browser: string,
-  userDataDirectory: string,
-  specifiedMaxConcurrency: number,
-  fileTypes: string,
-  blacklistedPatterns: string[],
-  includeScreenshots: boolean,
-  extraHTTPHeaders: Record<string, string>,
-  fromCrawlIntelligentSitemap = false, // optional
-  userUrlInputFromIntelligent: string = null, // optional
-  datasetFromIntelligent: crawlee.Dataset = null, // optional
-  urlsCrawledFromIntelligent: UrlsCrawled = null, // optional
-  crawledFromLocalFile = false, // optional
-) => {
+const crawlSitemap = async ({
+  sitemapUrl,
+  randomToken,
+  host,
+  viewportSettings,
+  maxRequestsPerCrawl,
+  browser,
+  userDataDirectory,
+  specifiedMaxConcurrency,
+  fileTypes,
+  blacklistedPatterns,
+  includeScreenshots,
+  extraHTTPHeaders,
+  scanDuration = 0,
+  fromCrawlIntelligentSitemap = false,
+  userUrlInputFromIntelligent = null,
+  datasetFromIntelligent = null,
+  urlsCrawledFromIntelligent = null,
+  crawledFromLocalFile = false,
+}: {
+  sitemapUrl: string;
+  randomToken: string;
+  host: string;
+  viewportSettings: ViewportSettingsClass;
+  maxRequestsPerCrawl: number;
+  browser: string;
+  userDataDirectory: string;
+  specifiedMaxConcurrency: number;
+  fileTypes: string;
+  blacklistedPatterns: string[];
+  includeScreenshots: boolean;
+  extraHTTPHeaders: Record<string, string>;
+  scanDuration?: number;
+  fromCrawlIntelligentSitemap?: boolean;
+  userUrlInputFromIntelligent?: string;
+  datasetFromIntelligent?: Dataset;
+  urlsCrawledFromIntelligent?: UrlsCrawled;
+  crawledFromLocalFile?: boolean;
+}) => {
+  const crawlStartTime = Date.now();
   let dataset: crawlee.Dataset;
   let urlsCrawled: UrlsCrawled;
 
@@ -127,14 +151,11 @@ const crawlSitemap = async (
   const { playwrightDeviceDetailsObject } = viewportSettings;
   const { maxConcurrency } = constants;
 
-  printMessage(['Fetching URLs. This might take some time...'], { border: false });
-
   finalLinks = [...finalLinks, ...linksFromSitemap];
 
   const requestList = await RequestList.open({
     sources: finalLinks,
   });
-  printMessage(['Fetch URLs completed. Beginning scan'], messageOptions);
 
   let userDataDir = '';
   if (userDataDirectory) {
@@ -165,7 +186,6 @@ const crawlSitemap = async (
     },
     requestList,
     postNavigationHooks: [
-
       async ({ page }) => {
         try {
           // Wait for a quiet period in the DOM, but with safeguards
@@ -173,36 +193,35 @@ const crawlSitemap = async (
             return new Promise(resolve => {
               let timeout;
               let mutationCount = 0;
-              const MAX_MUTATIONS     = 250;   // stop if things never quiet down
-              const OBSERVER_TIMEOUT  = 5000;  // hard cap on total wait
-      
+              const MAX_MUTATIONS = 250; // stop if things never quiet down
+              const OBSERVER_TIMEOUT = 5000; // hard cap on total wait
+
               const observer = new MutationObserver(() => {
                 clearTimeout(timeout);
-      
+
                 mutationCount++;
                 if (mutationCount > MAX_MUTATIONS) {
                   observer.disconnect();
                   resolve('Too many mutations, exiting.');
                   return;
                 }
-      
+
                 // restart quiet‑period timer
                 timeout = setTimeout(() => {
                   observer.disconnect();
                   resolve('DOM stabilized.');
                 }, 1000);
               });
-      
+
               // overall timeout in case the page never settles
               timeout = setTimeout(() => {
                 observer.disconnect();
                 resolve('Observer timeout reached.');
               }, OBSERVER_TIMEOUT);
-      
+
               const root = document.documentElement || document.body || document;
               if (!root || typeof observer.observe !== 'function') {
                 resolve('No root node to observe.');
-                return;
               }
             });
           });
@@ -214,27 +233,54 @@ const crawlSitemap = async (
           throw err; // Rethrow unknown errors
         }
       },
-      
     ],
+    preNavigationHooks: [
+      async ({ request, page }, gotoOptions) => {
+        const url = request.url.toLowerCase();
 
-    preNavigationHooks: isBasicAuth
-      ? [
-        async ({ page }) => {
+        const isNotSupportedDocument = disallowedListOfPatterns.some(pattern =>
+          url.startsWith(pattern),
+        );
+
+        if (isNotSupportedDocument) {
+          request.skipNavigation = true;
+          request.userData.isNotSupportedDocument = true;
+
+          // Log for verification (optional, but not required for correctness)
+          // console.log(`[SKIP] Not supported: ${request.url}`);
+
+          return;
+        }
+
+        // Set headers if basic auth
+        if (isBasicAuth) {
           await page.setExtraHTTPHeaders({
             Authorization: authHeader,
             ...extraHTTPHeaders,
           });
-        },
-      ]
-      : [
-        async () => {
+        } else {
           preNavigationHooks(extraHTTPHeaders);
-          // insert other code here
-        },
-      ],
+        }
+      },
+    ],
     requestHandlerTimeoutSecs: 90,
     requestHandler: async ({ page, request, response, sendRequest }) => {
-      await waitForPageLoaded(page, 10000);
+      // Log documents that are not supported
+      if (request.userData?.isNotSupportedDocument) {
+        guiInfoLog(guiInfoStatusTypes.SKIPPED, {
+          numScanned: urlsCrawled.scanned.length,
+          urlScanned: request.url,
+        });
+        urlsCrawled.userExcluded.push({
+          url: request.url,
+          pageTitle: request.url,
+          actualUrl: request.url, // because about:blank is not useful
+          metadata: STATUS_CODE_METADATA[1],
+          httpStatusCode: 0,
+        });
+
+        return;
+      }
 
       // Set basic auth header if needed
       if (isBasicAuth) {
@@ -247,39 +293,48 @@ const crawlSitemap = async (
         request.url = currentUrl.href;
       }
 
+      await waitForPageLoaded(page, 10000);
+
       const actualUrl = page.url() || request.loadedUrl || request.url;
 
-      if (urlsCrawled.scanned.length >= maxRequestsPerCrawl) {
-        crawler.autoscaledPool.abort();
+      const hasExceededDuration =
+        scanDuration > 0 && Date.now() - crawlStartTime > scanDuration * 1000;
+
+      if (urlsCrawled.scanned.length >= maxRequestsPerCrawl || hasExceededDuration) {
+        if (hasExceededDuration) {
+          console.log(`Crawl duration of ${scanDuration}s exceeded. Aborting sitemap crawl.`);
+        }
+        crawler.autoscaledPool.abort(); // stops new requests
         return;
       }
 
-      if (request.skipNavigation && actualUrl === "about:blank") {
-        if (!isScanPdfs) {
-          guiInfoLog(guiInfoStatusTypes.SKIPPED, {
-            numScanned: urlsCrawled.scanned.length,
-            urlScanned: request.url,
-          });
-          urlsCrawled.userExcluded.push({
-            url: request.url,
-            pageTitle: request.url,
-            actualUrl: request.url, // because about:blank is not useful
-            metadata: STATUS_CODE_METADATA[1],
-            httpStatusCode: 0,
-          });
-
+      if (request.skipNavigation && actualUrl === 'about:blank') {
+        if (isScanPdfs) {
+          // pushes download promise into pdfDownloads
+          const { pdfFileName, url } = handlePdfDownload(
+            randomToken,
+            pdfDownloads,
+            request,
+            sendRequest,
+            urlsCrawled,
+          );
+
+          uuidToPdfMapping[pdfFileName] = url;
           return;
         }
-        // pushes download promise into pdfDownloads
-        const { pdfFileName, url } = handlePdfDownload(
-          randomToken,
-          pdfDownloads,
-          request,
-          sendRequest,
-          urlsCrawled,
-        );
 
-        uuidToPdfMapping[pdfFileName] = url;
+        guiInfoLog(guiInfoStatusTypes.SKIPPED, {
+          numScanned: urlsCrawled.scanned.length,
+          urlScanned: request.url,
+        });
+        urlsCrawled.userExcluded.push({
+          url: request.url,
+          pageTitle: request.url,
+          actualUrl: request.url, // because about:blank is not useful
+          metadata: STATUS_CODE_METADATA[1],
+          httpStatusCode: 0,
+        });
+
         return;
       }
 
@@ -303,15 +358,11 @@ const crawlSitemap = async (
         }
 
         // This logic is different from crawlDomain, as it also checks if the pae is redirected before checking if it is excluded using exclusions.txt
-        if (
-          isRedirected &&
-          blacklistedPatterns &&
-          isSkippedUrl(actualUrl, blacklistedPatterns)
-        ) {
+        if (isRedirected && blacklistedPatterns && isSkippedUrl(actualUrl, blacklistedPatterns)) {
           urlsCrawled.userExcluded.push({
             url: request.url,
             pageTitle: request.url,
-            actualUrl: actualUrl,
+            actualUrl,
             metadata: STATUS_CODE_METADATA[0],
             httpStatusCode: 0,
           });
@@ -324,7 +375,7 @@ const crawlSitemap = async (
         }
 
         const results = await runAxeScript({ includeScreenshots, page, randomToken });
-        
+
         guiInfoLog(guiInfoStatusTypes.SCANNED, {
           numScanned: urlsCrawled.scanned.length,
           urlScanned: request.url,
@@ -333,7 +384,7 @@ const crawlSitemap = async (
         urlsCrawled.scanned.push({
           url: urlWithoutAuth(request.url),
           pageTitle: results.pageTitle,
-          actualUrl: actualUrl, // i.e. actualUrl
+          actualUrl, // i.e. actualUrl
         });
 
         urlsCrawled.scannedRedirects.push({
@@ -354,16 +405,17 @@ const crawlSitemap = async (
         if (isScanHtml) {
           // carry through the HTTP status metadata
           const status = response?.status();
-          const metadata = typeof status === 'number'
-          ? (STATUS_CODE_METADATA[status] || STATUS_CODE_METADATA[599])
-          : STATUS_CODE_METADATA[2];
+          const metadata =
+            typeof status === 'number'
+              ? STATUS_CODE_METADATA[status] || STATUS_CODE_METADATA[599]
+              : STATUS_CODE_METADATA[2];
 
-            urlsCrawled.invalid.push({
+          urlsCrawled.invalid.push({
             actualUrl,
             url: request.url,
             pageTitle: request.url,
             metadata,
-            httpStatusCode: typeof status === 'number' ? status : 0
+            httpStatusCode: typeof status === 'number' ? status : 0,
           });
         }
       }
@@ -384,21 +436,31 @@ const crawlSitemap = async (
       });
 
       const status = response?.status();
-      const metadata = typeof status === 'number'
-      ? (STATUS_CODE_METADATA[status] || STATUS_CODE_METADATA[599])
-      : STATUS_CODE_METADATA[2];
+      const metadata =
+        typeof status === 'number'
+          ? STATUS_CODE_METADATA[status] || STATUS_CODE_METADATA[599]
+          : STATUS_CODE_METADATA[2];
 
       urlsCrawled.error.push({
         url: request.url,
         pageTitle: request.url,
         actualUrl: request.url,
         metadata,
-        httpStatusCode: typeof status === 'number' ? status : 0
+        httpStatusCode: typeof status === 'number' ? status : 0,
       });
       crawlee.log.error(`Failed Request - ${request.url}: ${request.errorMessages}`);
     },
     maxRequestsPerCrawl: Infinity,
     maxConcurrency: specifiedMaxConcurrency || maxConcurrency,
+    ...(process.env.OOBEE_FAST_CRAWLER && {
+      autoscaledPoolOptions: {
+        minConcurrency: specifiedMaxConcurrency ? Math.min(specifiedMaxConcurrency, 10) : 10,
+        maxConcurrency: specifiedMaxConcurrency || maxConcurrency,
+        desiredConcurrencyRatio: 0.98, // Increase threshold for scaling up
+        scaleUpStepRatio: 0.99,        // Scale up faster
+        scaleDownStepRatio: 0.1,       // Scale down slower
+      },
+    }),
   });
 
   await crawler.run();
@@ -430,6 +492,11 @@ const crawlSitemap = async (
     guiInfoLog(guiInfoStatusTypes.COMPLETED, {});
   }
 
+  if (scanDuration > 0) {
+    const elapsed = Math.round((Date.now() - crawlStartTime) / 1000);
+    console.log(`Crawl ended after ${elapsed}s (limit: ${scanDuration}s).`);
+  }
+
   return urlsCrawled;
 };
 

package/src/index.ts

@@ -50,6 +50,7 @@ export type Answers = {
   zip: string;
   ruleset: RuleFlags[];
   generateJsonFiles: boolean;
+  scanDuration?: number;
 };
 
 export type Data = {
@@ -80,6 +81,7 @@ export type Data = {
   zip?: string;
   ruleset: RuleFlags[];
   generateJsonFiles: boolean;
+  scanDuration: number;
 };
 
 const userData = getUserDataTxt();

package/src/logs.ts

@@ -23,8 +23,10 @@ const logFormat = printf(({ timestamp, level, message }) => {
 // All logs in combined.txt, error in errors.txt
 
 const consoleLogger = createLogger({
+  silent: !(process.env.RUNNING_FROM_PH_GUI || process.env.OOBEE_VERBOSE),
   format: combine(timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), logFormat),
-  transports: [new transports.Console()],
+  transports:
+    process.env.RUNNING_FROM_PH_GUI || process.env.OOBEE_VERBOSE ? [new transports.Console()] : [],
 });
 
 // No display in consoles, this will mostly be used within the interactive script to avoid disrupting the flow
@@ -33,7 +35,7 @@ const consoleLogger = createLogger({
 const silentLogger = createLogger({
   format: combine(timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), logFormat),
   transports: [
-    process.env.OOBEE_VERBOSE
+    process.env.OOBEE_VERBOSE || process.env.RUNNING_FROM_PH_GUI
       ? new transports.Console({ handleExceptions: true })
       : new transports.File({ filename: 'errors.txt', level: 'warn', handleExceptions: true }),
   ].filter(Boolean),

package/src/mergeAxeResults.ts

@@ -78,6 +78,7 @@ type AllIssues = {
     htmlETL: any;
     rules: string[];
   };
+  siteName: string;
   startTime: Date;
   endTime: Date;
   urlScanned: string;
@@ -130,7 +131,6 @@ const extractFileNames = async (directory: string): Promise<string[]> => {
     .then(allFiles => allFiles.filter(file => path.extname(file).toLowerCase() === '.json'))
     .catch(readdirError => {
       consoleLogger.info('An error has occurred when retrieving files, please try again.');
-      silentLogger.error(`(extractFileNames) - ${readdirError}`);
       throw readdirError;
     });
 };
@@ -140,7 +140,6 @@ const parseContentToJson = async rPath =>
     .then(content => JSON.parse(content))
     .catch(parseError => {
       consoleLogger.info('An error has occurred when parsing the content, please try again.');
-      silentLogger.error(`(parseContentToJson) - ${parseError}`);
     });
 
 const writeCsv = async (allIssues, storagePath) => {
@@ -684,7 +683,7 @@ async function compressJsonFileStreaming(inputPath: string, outputPath: string)
   // Pipe the streams:
   //   read -> gzip -> base64 -> write
   await pipeline(readStream, gzip, base64Encode, writeStream);
-  console.log(`File successfully compressed and saved to ${outputPath}`);
+  consoleLogger.info(`File successfully compressed and saved to ${outputPath}`);
 }
 
 const writeJsonFileAndCompressedJsonFile = async (
@@ -1559,7 +1558,7 @@ const sendWcagBreakdownToSentry = async (
     const wcagCriteriaBreakdown: Record<string, any> = {};
 
     // Tag app version
-    tags['version'] = appVersion;
+    tags.version = appVersion;
 
     // Get dynamic WCAG criteria map once
     const wcagCriteriaMap = await getWcagCriteriaMap();
@@ -1638,7 +1637,7 @@ const sendWcagBreakdownToSentry = async (
       tags['WCAG-MustFix-Occurrences'] = String(allIssues.items.mustFix.totalItems);
       tags['WCAG-GoodToFix-Occurrences'] = String(allIssues.items.goodToFix.totalItems);
       tags['WCAG-NeedsReview-Occurrences'] = String(allIssues.items.needsReview.totalItems);
-      
+
       // Add number of pages scanned tag
       tags['Pages-Scanned-Count'] = String(allIssues.totalPagesScanned);
     } else if (pagesScannedCount > 0) {
@@ -1667,7 +1666,7 @@ const sendWcagBreakdownToSentry = async (
         ...(userData && userData.userId ? { id: userData.userId } : {}),
       },
       extra: {
-        additionalScanMetadata: ruleIdJson != null ? JSON.stringify(ruleIdJson)  : "{}",
+        additionalScanMetadata: ruleIdJson != null ? JSON.stringify(ruleIdJson) : '{}',
         wcagBreakdown: wcagCriteriaBreakdown,
         reportCounts: allIssues
           ? {
@@ -1766,6 +1765,7 @@ const generateArtifacts = async (
       htmlETL: oobeeAiHtmlETL,
       rules: oobeeAiRules,
     },
+    siteName: (pagesScanned[0]?.pageTitle ?? '').replace(/^\d+\s*:\s*/, '').trim(),
     startTime: scanDetails.startTime ? scanDetails.startTime : new Date(),
     endTime: scanDetails.endTime ? scanDetails.endTime : new Date(),
     urlScanned,
@@ -1845,7 +1845,6 @@ const generateArtifacts = async (
     }),
   ).catch(flattenIssuesError => {
     consoleLogger.info('An error has occurred when flattening the issues, please try again.');
-    silentLogger.error(flattenIssuesError.stack);
   });
 
   flattenAndSortResults(allIssues, isCustomFlow);
@@ -1853,6 +1852,10 @@ const generateArtifacts = async (
   printMessage([
     'Scan Summary',
     '',
+    `Site Name: ${allIssues.siteName}`,
+    `URL: ${allIssues.urlScanned}`,
+    `Pages Scanned: ${allIssues.totalPagesScanned}`,
+    '',
     `Must Fix: ${allIssues.items.mustFix.rules.length} ${Object.keys(allIssues.items.mustFix.rules).length === 1 ? 'issue' : 'issues'} / ${allIssues.items.mustFix.totalItems} ${allIssues.items.mustFix.totalItems === 1 ? 'occurrence' : 'occurrences'}`,
     `Good to Fix: ${allIssues.items.goodToFix.rules.length} ${Object.keys(allIssues.items.goodToFix.rules).length === 1 ? 'issue' : 'issues'} / ${allIssues.items.goodToFix.totalItems} ${allIssues.items.goodToFix.totalItems === 1 ? 'occurrence' : 'occurrences'}`,
     `Manual Review Required: ${allIssues.items.needsReview.rules.length} ${Object.keys(allIssues.items.needsReview.rules).length === 1 ? 'issue' : 'issues'} / ${allIssues.items.needsReview.totalItems} ${allIssues.items.needsReview.totalItems === 1 ? 'occurrence' : 'occurrences'}`,
@@ -1882,8 +1885,13 @@ const generateArtifacts = async (
     allIssues.advancedScanOptionsSummaryItems.disableOobee,
   );
 
-  // console.log(allIssues.progressPercentage);
-  // console.log(allIssues.issuesPercentage);
+  consoleLogger.info(`Site Name: ${allIssues.siteName}`);
+  consoleLogger.info(`URL: ${allIssues.urlScanned}`);
+  consoleLogger.info(`Pages Scanned: ${allIssues.totalPagesScanned}`);
+  consoleLogger.info(`Start Time: ${allIssues.startTime}`);
+  consoleLogger.info(`End Time: ${allIssues.endTime}`);
+  const elapsedSeconds = (new Date(allIssues.endTime).getTime() - new Date(allIssues.startTime).getTime()) / 1000;
+  consoleLogger.info(`Elapsed Time: ${elapsedSeconds}s`);
 
   const getAxeImpactCount = (allIssues: AllIssues) => {
     const impactCount = {
@@ -2044,6 +2052,9 @@ const generateArtifacts = async (
     console.error('Error sending WCAG data to Sentry:', error);
   }
 
+  if (process.env.RUNNING_FROM_PH_GUI || process.env.OOBEE_VERBOSE)
+    console.log('Report generated successfully');
+
   return ruleIdJson;
 };
 

package/src/npmIndex.ts

@@ -219,7 +219,7 @@ export const init = async ({
         try {
           await page.locator(elem).click();
         } catch (e) {
-          silentLogger.info(e);
+          // do nothing if element is not found or not clickable
         }
       });
 

package/src/screenshotFunc/htmlScreenshotFunc.ts

@@ -2,7 +2,7 @@
 import { createHash } from 'crypto';
 import fs from 'fs';
 import path from 'path';
-import { consoleLogger } from '../logs.js';
+// import { silentLogger } from '../logs.js';
 import { Result } from 'axe-core';
 import { Page } from 'playwright';
 import { NodeResultWithScreenshot, ResultWithScreenshot } from '../crawlers/commonCrawlerFunc.js';
@@ -21,9 +21,11 @@ export const takeScreenshotForHTMLElements = async (
 
   for (const violation of violations) {
     if (screenshotCount >= maxScreenshots) {
-      consoleLogger.warn(
+      /*
+      silentLogger.warn(
         `Skipping screenshots for ${violation.id} as maxScreenshots (${maxScreenshots}) exceeded. You can increase it by specifying a higher value when calling takeScreenshotForHTMLElements.`,
       );
+      */
       newViolations.push(violation);
       continue;
     }
@@ -32,7 +34,7 @@ export const takeScreenshotForHTMLElements = async (
 
     // Check if rule ID is 'oobee-grading-text-contents' and skip screenshot logic
     if (rule === 'oobee-grading-text-contents') {
-      // consoleLogger.info('Skipping screenshot for rule oobee-grading-text-contents');
+      // silentLogger.info('Skipping screenshot for rule oobee-grading-text-contents');
       newViolations.push(violation); // Make sure it gets added
       continue;
     }
@@ -57,13 +59,13 @@ export const takeScreenshotForHTMLElements = async (
               nodeWithScreenshotPath.screenshotPath = screenshotPath;
               screenshotCount++;
             } else {
-              consoleLogger.info(`Element at ${currLocator} is not visible`);
+              // silentLogger.info(`Element at ${currLocator} is not visible`);
             }
 
             break; // Stop looping after finding the first visible locator
           }
         } catch (e) {
-          consoleLogger.info(`Unable to take element screenshot at ${selector}`);
+          // silentLogger.info(`Unable to take element screenshot at ${selector}`);
         }
       }
       newViolationNodes.push(nodeWithScreenshotPath);

package/src/screenshotFunc/pdfScreenshotFunc.ts

@@ -12,7 +12,7 @@ import { Canvas, createCanvas, SKRSContext2D } from '@napi-rs/canvas';
 import assert from 'assert';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { silentLogger } from '../logs.js';
+import { consoleLogger, silentLogger } from '../logs.js';
 import { TransformedRuleObject } from '../crawlers/pdfScanFunc.js';
 import { IBboxLocation, StructureTree, ViewportSize } from '../types/types.js';
 
@@ -213,7 +213,7 @@ const annotateAndSave = (origCanvas: Canvas, screenshotPath: string, viewport: V
     try {
       fs.writeFileSync(indexedScreenshotPath, croppedImage);
     } catch (e) {
-      silentLogger.error('Error in writing screenshot:', e);
+      consoleLogger.error('Error in writing screenshot:', e);
     }
 
     canvasFactory.destroy({ canvas: croppedCanvas, context: croppedCtx });

package/src/static/ejs/partials/components/wcagCompliance.ejs

@@ -29,7 +29,7 @@
               <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
                 data-bs-target="#wcagLinksAccordionContent" aria-expanded="false"
                 aria-controls="wcagLinksAccordionContent">
-                20 (A & AA) and 5 (AAA) WCAG Success Criteria
+                20 (A & AA) and 6 (AAA) WCAG Success Criteria
               </button>
             </div>
             <div id="wcagLinksAccordionContent" class="accordion-collapse collapse"

package/src/static/ejs/partials/scripts/ruleOffcanvas.ejs

@@ -22,6 +22,7 @@ category summary is clicked %>
         // wcag1410: 'https://www.w3.org/TR/WCAG22/#reflow',
         wcag1412: 'https://www.w3.org/TR/WCAG22/#text-spacing',
         wcag211: 'https://www.w3.org/TR/WCAG22/#keyboard',
+        wcag213: 'https://www.w3.org/WAI/WCAG22/Understanding/keyboard-no-exception.html', // AAA
         wcag221: 'https://www.w3.org/TR/WCAG22/#timing-adjustable',
         wcag222: 'https://www.w3.org/TR/WCAG22/#pause-stop-hide',
         wcag224: 'https://www.w3.org/TR/WCAG22/#interruptions', // AAA

package/src/static/ejs/partials/styles/styles.ejs

@@ -668,6 +668,17 @@
   #pagesScannedModal .not-scanned-url {
     word-wrap: break-word;
   }
+  #pagesScannedModal .metadata-text {
+    word-wrap: break-word;
+    font-size: 0.875rem;
+    color: var(--coral-red-100);
+  }
+  #pagesScannedModal .metadata-inline {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    height: 16px;
+  }
   #pagesScannedModal p {
     overflow: hidden;
     white-space: nowrap;