@govtechsg/oobee 0.10.61 → 0.10.62

package/README.md

@@ -86,6 +86,7 @@ verapdf --version
 | OOBEE_VERBOSE | When set to `true`, log output goes to console | `false` |
 | OOBEE_FAST_CRAWLER| When set to `true`, increases scan concurrency at a rapid rate.  Experimental, may cause system stability issues on low-powered devices. | `false`|
 | OOBEE_VALIDATE_URL| When set to `true`, validates if URLs are valid and exits. | `false` |
+| OOBEE_LOGS_PATH | When set, logs are written to this path. |  |
 | WARN_LEVEL | Only used in tests. |  |
 
 #### Environment variables used internally (Do not set)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@govtechsg/oobee",
   "main": "dist/npmIndex.js",
-  "version": "0.10.61",
+  "version": "0.10.62",
   "type": "module",
   "author": "Government Technology Agency <info@tech.gov.sg>",
   "dependencies": {
@@ -69,7 +69,8 @@
     "ansi-regex": "^5.0.1",
     "tough-cookie": "^5.0.0-rc.2",
     "micromatch": "github:micromatch/micromatch.git#4.0.8",
-    "brace-expansion": "^1.1.12"
+    "brace-expansion": "^1.1.12",
+    "tmp": "0.2.4"
   },
   "optionalDependencies": {
     "@napi-rs/canvas-darwin-arm64": "^0.1.53",

package/src/cli.ts

@@ -5,14 +5,13 @@ import printMessage from 'print-message';
 import { devices } from 'playwright';
 import { fileURLToPath } from 'url';
 import path from 'path';
-import { cleanUp, setHeadlessMode, getVersion, getStoragePath } from './utils.js';
+import { cleanUp, setHeadlessMode, getVersion, getStoragePath, listenForCleanUp, cleanUpAndExit } from './utils.js';
 import {
   checkUrl,
   prepareData,
   getFileSitemap,
   validEmail,
   validName,
-  deleteClonedProfiles,
   getScreenToScan,
   validateDirPath,
   validateFilePath,
@@ -54,20 +53,20 @@ Usage: npm run cli -- -c <crawler> -d <device> -w <viewport> -u <url> OPTIONS`,
         [`Invalid device. Please provide an existing device to start the scan.`],
         messageOptions,
       );
-      process.exit(1);
+      cleanUpAndExit(1);
     }
     return option;
   })
   .coerce('w', option => {
     if (!option || Number.isNaN(option)) {
       printMessage([`Invalid viewport width. Please provide a number. `], messageOptions);
-      process.exit(1);
+      cleanUpAndExit(1);
     } else if (option < 320 || option > 1080) {
       printMessage(
         ['Invalid viewport width! Please provide a viewport width between 320-1080 pixels.'],
         messageOptions,
       );
-      process.exit(1);
+      cleanUpAndExit(1);
     }
     return option;
   })
@@ -77,7 +76,7 @@ Usage: npm run cli -- -c <crawler> -d <device> -w <viewport> -u <url> OPTIONS`,
         [`Invalid maximum number of pages. Please provide a positive integer.`],
         messageOptions,
       );
-      process.exit(1);
+      cleanUpAndExit(1);
     }
     return option;
   })
@@ -87,7 +86,7 @@ Usage: npm run cli -- -c <crawler> -d <device> -w <viewport> -u <url> OPTIONS`,
         [`Invalid number for max concurrency. Please provide a positive integer.`],
         messageOptions,
       );
-      process.exit(1);
+      cleanUpAndExit(1);
     }
     return option;
   })
@@ -97,23 +96,23 @@ Usage: npm run cli -- -c <crawler> -d <device> -w <viewport> -u <url> OPTIONS`,
         [`Invalid format. Please provide your name and email address separated by ":"`],
         messageOptions,
       );
-      process.exit(1);
+      cleanUpAndExit(1);
     }
     const [name, email] = nameEmail.split(':');
     if (name === '' || name === undefined || name === null) {
       printMessage([`Please provide your name.`], messageOptions);
-      process.exit(1);
+      cleanUpAndExit(1);
     }
     if (!validName(name)) {
       printMessage([`Invalid name. Please provide a valid name.`], messageOptions);
-      process.exit(1);
+      cleanUpAndExit(1);
     }
     if (!validEmail(email)) {
       printMessage(
         [`Invalid email address. Please provide a valid email address.`],
         messageOptions,
       );
-      process.exit(1);
+      cleanUpAndExit(1);
     }
     return nameEmail;
   })
@@ -121,7 +120,7 @@ Usage: npm run cli -- -c <crawler> -d <device> -w <viewport> -u <url> OPTIONS`,
     const validationErrors = validateDirPath(option);
     if (validationErrors) {
       printMessage([`Invalid exportDirectory directory path. ${validationErrors}`], messageOptions);
-      process.exit(1);
+      cleanUpAndExit(1);
     }
     return option;
   })
@@ -133,7 +132,7 @@ Usage: npm run cli -- -c <crawler> -d <device> -w <viewport> -u <url> OPTIONS`,
       return validateFilePath(option, dirname);
     } catch (err) {
       printMessage([`Invalid blacklistedPatternsFilename file path. ${err}`], messageOptions);
-      process.exit(1);
+      cleanUpAndExit(1);
     }
   })
   .coerce('i', option => {
@@ -143,7 +142,7 @@ Usage: npm run cli -- -c <crawler> -d <device> -w <viewport> -u <url> OPTIONS`,
         [`Invalid value for fileTypes. Please provide valid keywords: ${choices.join(', ')}.`],
         messageOptions,
       );
-      process.exit(1);
+      cleanUpAndExit(1);
     }
     return option;
   })
@@ -151,7 +150,7 @@ Usage: npm run cli -- -c <crawler> -d <device> -w <viewport> -u <url> OPTIONS`,
     const { isValid, errorMessage } = validateCustomFlowLabel(option);
     if (!isValid) {
       printMessage([errorMessage], messageOptions);
-      process.exit(1);
+      cleanUpAndExit(1);
     }
     return option;
   })
@@ -162,7 +161,7 @@ Usage: npm run cli -- -c <crawler> -d <device> -w <viewport> -u <url> OPTIONS`,
         [`Invalid value for additional. Please provide valid keywords: ${choices.join(', ')}.`],
         messageOptions,
       );
-      process.exit(1);
+      cleanUpAndExit(1);
     }
     return option;
   })
@@ -199,7 +198,7 @@ Usage: npm run cli -- -c <crawler> -d <device> -w <viewport> -u <url> OPTIONS`,
         ['Invalid scan duration. Please provide a positive number of seconds.'],
         messageOptions,
       );
-      process.exit(1);
+      cleanUpAndExit(1);
     }
     return duration;
   })
@@ -226,7 +225,8 @@ const scanInit = async (argvs: Answers): Promise<string> => {
 
   const data = await prepareData(updatedArgvs);
 
-  constants.userDataDirectory = data.userDataDirectory;
+  // Executes cleanUp script if error encountered
+  listenForCleanUp(data.randomToken);
 
   const res = await checkUrl(
     data.type,
@@ -244,7 +244,7 @@ const scanInit = async (argvs: Answers): Promise<string> => {
       data.url = res.url;
       if (process.env.OOBEE_VALIDATE_URL) {
         console.log('Url is valid');
-        process.exit(0);
+        cleanUpAndExit(0, data.randomToken);
       }
 
       break;
@@ -252,17 +252,17 @@ const scanInit = async (argvs: Answers): Promise<string> => {
     case statuses.unauthorised.code: {
       printMessage([statuses.unauthorised.message], messageOptions);
       consoleLogger.info(statuses.unauthorised.message);
-      process.exit(res.status);
+      cleanUpAndExit(res.status);
     }
     case statuses.cannotBeResolved.code: {
       printMessage([statuses.cannotBeResolved.message], messageOptions);
       consoleLogger.info(statuses.cannotBeResolved.message);
-      process.exit(res.status);
+      cleanUpAndExit(res.status);
     }
     case statuses.systemError.code: {
       printMessage([statuses.systemError.message], messageOptions);
       consoleLogger.info(statuses.systemError.message);
-      process.exit(res.status);
+      cleanUpAndExit(res.status);
     }
     case statuses.invalidUrl.code: {
       if (
@@ -271,7 +271,7 @@ const scanInit = async (argvs: Answers): Promise<string> => {
       ) {
         printMessage([statuses.invalidUrl.message], messageOptions);
         consoleLogger.info(statuses.invalidUrl.message);
-        process.exit(res.status);
+        cleanUpAndExit(res.status);
       }
 
       const finalFilePath = getFileSitemap(updatedArgvs.url);
@@ -281,40 +281,38 @@ const scanInit = async (argvs: Answers): Promise<string> => {
 
         if (process.env.OOBEE_VALIDATE_URL) {
           console.log('Url is valid');
-          process.exit(0);
+          cleanUpAndExit(0);
         }
       } else if (updatedArgvs.scanner === ScannerTypes.LOCALFILE) {
         printMessage([statuses.notALocalFile.message], messageOptions);
         consoleLogger.info(statuses.notALocalFile.message);
-        process.exit(statuses.notALocalFile.code);
+        cleanUpAndExit(statuses.notALocalFile.code);
       } else if (updatedArgvs.scanner !== ScannerTypes.SITEMAP) {
         printMessage([statuses.notASitemap.message], messageOptions);
         consoleLogger.info(statuses.notASitemap.message);
-        process.exit(statuses.notASitemap.code);
+        cleanUpAndExit(statuses.notASitemap.code);
       }
       break;
     }
     case statuses.notASitemap.code: {
       printMessage([statuses.notASitemap.message], messageOptions);
       consoleLogger.info(statuses.notASitemap.message);
-      process.exit(res.status);
+      cleanUpAndExit(res.status);
     }
     case statuses.notALocalFile.code: {
       printMessage([statuses.notALocalFile.message], messageOptions);
       consoleLogger.info(statuses.notALocalFile.message);
-      process.exit(res.status);
+      cleanUpAndExit(res.status);
     }
     case statuses.browserError.code: {
       printMessage([statuses.browserError.message], messageOptions);
       consoleLogger.info(statuses.browserError.message);
-      process.exit(res.status);
+      cleanUpAndExit(res.status);
     }
     default:
       break;
   }
 
-  deleteClonedProfiles(data.browser, data.randomToken);
-
   if (process.env.OOBEE_VERBOSE) {
     const randomTokenMessage = {
       type: 'randomToken',
@@ -332,14 +330,10 @@ const scanInit = async (argvs: Answers): Promise<string> => {
   );
 
   printMessage([`Oobee version: ${appVersion}`, 'Starting scan...'], messageOptions);
-
+  consoleLogger.info(`Oobee version: ${appVersion}`); 
+  
   await combineRun(data, screenToScan);
 
-  deleteClonedProfiles(data.browser, data.randomToken);
-
-  // Delete dataset and request queues
-  cleanUp(data.randomToken);
-
   return getStoragePath(data.randomToken);
 };
 
@@ -375,6 +369,6 @@ const optionsAnswer: Answers = {
 };
 
 await scanInit(optionsAnswer);
-process.exit(0);
+cleanUpAndExit(0);
 
 export default options;

package/src/combine.ts

@@ -5,7 +5,7 @@ import crawlDomain from './crawlers/crawlDomain.js';
 import crawlLocalFile from './crawlers/crawlLocalFile.js';
 import crawlIntelligentSitemap from './crawlers/crawlIntelligentSitemap.js';
 import generateArtifacts from './mergeAxeResults.js';
-import { getHost, createAndUpdateResultsFolders, createDetailsAndLogs, cleanUp } from './utils.js';
+import { getHost, createAndUpdateResultsFolders, createDetailsAndLogs, cleanUp, cleanUpAndExit } from './utils.js';
 import { ScannerTypes, UrlsCrawled } from './constants/constants.js';
 import { getBlackListedPatterns, submitForm } from './constants/common.js';
 import { consoleLogger, silentLogger } from './logs.js';
@@ -80,7 +80,7 @@ const combineRun = async (details: Data, deviceToScan: string) => {
     blacklistedPatterns = getBlackListedPatterns(blacklistedPatternsFilename);
   } catch (error) {
     consoleLogger.error(error);
-    process.exit(1);
+    cleanUpAndExit(1);
   }
 
   // remove basic-auth credentials from URL
@@ -213,7 +213,7 @@ const combineRun = async (details: Data, deviceToScan: string) => {
 
     default:
       consoleLogger.error(`type: ${type} not defined`);
-      process.exit(1);
+      cleanUpAndExit(1);
   }
 
   scanDetails.endTime = new Date();
@@ -261,15 +261,13 @@ const combineRun = async (details: Data, deviceToScan: string) => {
 
       // No page were scanned because the URL loaded does not meet the crawler requirements
       printMessage([`No pages were scanned.`], alertMessageOptions);
-      cleanUp(randomToken);
-      process.exit(1);
+      cleanUpAndExit(1, randomToken, true);
     }
   } else {
 
     // No page were scanned because the URL loaded does not meet the crawler requirements
     printMessage([`No pages were scanned.`], alertMessageOptions);
-    cleanUp(randomToken);
-    process.exit(1);
+    cleanUpAndExit(1, randomToken, true);
   }
 };
 

package/src/constants/cliFunctions.ts

@@ -1,6 +1,7 @@
 import { Options } from 'yargs';
 import printMessage from 'print-message';
 import { BrowserTypes, RuleFlags, ScannerTypes } from './constants.js';
+import { cleanUpAndExit } from '../utils.js';
 
 export const messageOptions = {
   border: false,
@@ -53,7 +54,7 @@ export const cliOptions: { [key: string]: Options } = {
             ],
             messageOptions,
           );
-          process.exit(1);
+          cleanUpAndExit(1);
           return null;
       }
     },
@@ -158,7 +159,7 @@ export const cliOptions: { [key: string]: Options } = {
             ],
             messageOptions,
           );
-          process.exit(1);
+          cleanUpAndExit(1);
           return null;
       }
     },
@@ -282,7 +283,7 @@ export const cliOptions: { [key: string]: Options } = {
           ],
           messageOptions,
         );
-        process.exit(1);
+        cleanUpAndExit(1);
       }
       if (userChoices.length > 1 && userChoices.includes('default')) {
         printMessage(
@@ -291,7 +292,7 @@ export const cliOptions: { [key: string]: Options } = {
           ],
           messageOptions,
         );
-        process.exit(1);
+        cleanUpAndExit(1);
       }
       return userChoices;
     },

package/src/constants/common.ts

@@ -31,7 +31,7 @@ import constants, {
 } from './constants.js';
 import { consoleLogger, silentLogger } from '../logs.js';
 import { isUrlPdf } from '../crawlers/commonCrawlerFunc.js';
-import { randomThreeDigitNumberString } from '../utils.js';
+import { cleanUpAndExit, randomThreeDigitNumberString, register } from '../utils.js';
 import { Answers, Data } from '../index.js';
 import { DeviceDescriptor } from '../types/types.js';
 
@@ -305,6 +305,8 @@ const checkUrlConnectivityWithBrowser = async (
       ...getPlaywrightLaunchOptions(browserToRun),
       ...playwrightDeviceDetailsObject,
     });
+
+    register(browserContext);
   } catch (err) {
     printMessage([`Unable to launch browser\n${err}`], messageOptions);
     res.status = constants.urlCheckStatuses.browserError.code;
@@ -463,7 +465,7 @@ export const parseHeaders = (header?: string): Record<string, string> => {
         ],
         messageOptions,
       );
-      process.exit(1);
+      cleanUpAndExit(1);
     }
     allHeaders[headerValuePair[0]] = headerValuePair[1]; // {"header": "value", "header2": "value2", ...}
   });
@@ -558,6 +560,9 @@ export const prepareData = async (argv: Answers): Promise<Data> => {
     await getUrlsFromRobotsTxt(url, browserToRun, resolvedUserDataDirectory, extraHTTPHeaders);
   }
 
+  constants.userDataDirectory = resolvedUserDataDirectory;
+  constants.randomToken = resultFilename;
+
   return {
     type: scanner,
     url: url,
@@ -676,6 +681,8 @@ const getRobotsTxtViaPlaywright = async (robotsUrl: string, browser: string, use
     ...(extraHTTPHeaders && { extraHTTPHeaders }),
   });
 
+  register(browserContext);
+
   const page = await browserContext.newPage();
 
   await page.goto(robotsUrl, { waitUntil: 'networkidle', timeout: 30000 });
@@ -848,6 +855,7 @@ export const getLinksFromSitemap = async (
         },
       );
 
+      register(browserContext);
       const page = await browserContext.newPage();
 
       await page.goto(url, { waitUntil: 'networkidle', timeout: 60000 });
@@ -1603,6 +1611,8 @@ export const submitFormViaPlaywright = async (
     },
   );
 
+  register(browserContext);
+
   const page = await browserContext.newPage();
 
   try {
@@ -1706,6 +1716,8 @@ export async function initModifiedUserAgent(
   : '';
 
   const browserContext = await constants.launcher.launchPersistentContext(effectiveUserDataDirectory, launchOptions);
+  register(browserContext);
+  
   const page = await browserContext.newPage();
 
   // Retrieve the default user agent.

package/src/constants/constants.ts

@@ -5,10 +5,11 @@ import { globSync } from 'glob';
 import which from 'which';
 import os from 'os';
 import { spawnSync, execSync } from 'child_process';
-import { chromium } from 'playwright';
+import { Browser, BrowserContext, chromium } from 'playwright';
 import * as Sentry from '@sentry/node';
 import { consoleLogger, silentLogger } from '../logs.js';
 import { PageInfo } from '../mergeAxeResults.js';
+import { PlaywrightCrawler } from 'crawlee';
 
 const filename = fileURLToPath(import.meta.url);
 const dirname = path.dirname(filename);
@@ -136,7 +137,7 @@ export const getDefaultChromiumDataDir = () => {
     }
     return null;
   } catch (error) {
-    silentLogger.error(`Error in getDefaultChromiumDataDir(): ${error}`);
+    consoleLogger.error(`Error in getDefaultChromiumDataDir(): ${error}`);
   }
 };
 
@@ -227,45 +228,68 @@ if (fs.existsSync('/.dockerenv')) {
   launchOptionsArgs = ['--disable-gpu', '--no-sandbox', '--disable-dev-shm-usage'];
 }
 
-export const getProxy = (): { type: string; url: string } | null => {
-  if (os.platform() === 'win32') {
-    let internetSettings: string[];
-    try {
-      internetSettings = execSync(
-        'Get-ItemProperty -Path "Registry::HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"',
-        { shell: 'powershell.exe' },
-      )
-        .toString()
-        .split('\n');
-    } catch (e) {
-      console.log(e.toString());
-      silentLogger.error(e.toString());
+type ProxyInfo = { type: 'autoConfig' | 'manualProxy'; url: string } | null;
+
+function queryRegKey(key: string): Record<string, string> {
+  try {
+    const out = execSync(`reg query "${key}"`, { encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'] });
+    const values: Record<string, string> = {};
+    for (const line of out.split(/\r?\n/)) {
+      const parts = line.trim().split(/\s{2,}/);
+      if (parts.length >= 3) {
+        const [name, _type, ...rest] = parts;
+        values[name] = rest.join(' ');
+      }
     }
+    return values;
+  } catch {
+    return {};
+  }
+}
 
-    const getSettingValue = (settingName: string) =>
-      internetSettings
-        .find(s => s.startsWith(settingName))
-        // split only once at with ':' as the delimiter
-        ?.split(/:(.*)/s)[1]
-        ?.trim();
+function parseDwordFlag(v: unknown): number {
+  if (v == null) return 0;
+  const s = String(v).trim();
+  // Handles "1", "0", "0x1", "0x0"
+  if (/^0x[0-9a-f]+$/i.test(s)) return parseInt(s, 16);
+  if (/^\d+$/.test(s)) return parseInt(s, 10);
+  return 0;
+}
 
-    if (getSettingValue('AutoConfigURL')) {
-      return { type: 'autoConfig', url: getSettingValue('AutoConfigURL') };
-    }
-    if (getSettingValue('ProxyEnable') === '1') {
-      return { type: 'manualProxy', url: getSettingValue('ProxyServer') };
-    }
-    return null;
+function normalizePacUrl(u: string): string {
+  const s = u.trim();
+  // If it lacks a scheme, assume http:// (Chrome requires a full URL)
+  return /^(https?|file):/i.test(s) ? s : `http://${s}`;
+}
+
+export const getProxy = (): ProxyInfo => {
+  if (os.platform() !== 'win32') return null;
+
+  const values = queryRegKey('HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings');
+  const pacUrlRaw = (values['AutoConfigURL'] || '').trim();
+  const proxyEnableRaw = (values['ProxyEnable'] || '').trim();
+  const proxyServerRaw = (values['ProxyServer'] || '').trim();
+
+  // 1) PAC beats manual proxy if present
+  if (pacUrlRaw) {
+    return { type: 'autoConfig', url: normalizePacUrl(pacUrlRaw) };
+  }
+
+  // 2) Manual proxy only if enabled
+  const enabled = parseDwordFlag(proxyEnableRaw) === 1;
+  if (enabled && proxyServerRaw) {
+    return { type: 'manualProxy', url: proxyServerRaw };
   }
-  // develop for mac
+
   return null;
 };
 
+// Usage
 export const proxy = getProxy();
 
-if (proxy && proxy.type === 'autoConfig') {
+if (proxy?.type === 'autoConfig') {
   launchOptionsArgs.push(`--proxy-pac-url=${proxy.url}`);
-} else if (proxy && proxy.type === 'manualProxy') {
+} else if (proxy?.type === 'manualProxy') {
   launchOptionsArgs.push(`--proxy-server=${proxy.url}`);
 }
 
@@ -405,6 +429,7 @@ const urlCheckStatuses = {
   },
   axiosTimeout: { code: 18, message: 'Axios timeout exceeded. Falling back on browser checks.' },
   notALocalFile: { code: 19, message: 'Provided filepath is not a local html or sitemap file.' },
+  terminationRequested: { code: 15, message: 'Termination requested.' }
 };
 
 /* eslint-disable no-unused-vars */
@@ -467,6 +492,13 @@ export default {
   wcagLinks,
   robotsTxtUrls: null,
   userDataDirectory: null, // This will be set later in the code
+  randomToken: null, // This will be set later in the code
+  // Track all active Crawlee / Playwright resources for cleanup
+  resources: {
+      crawlers: new Set<PlaywrightCrawler>(),
+      browserContexts: new Set<BrowserContext>(),
+      browsers: new Set<Browser>(),
+    },
 };
 
 export const rootPath = dirname;

package/src/constants/questions.ts

@@ -105,8 +105,6 @@ const startScanQuestions = [
         playwrightDeviceDetailsObject,
         parseHeaders(answers.header),
       );
-
-      deleteClonedProfiles(browserToRun, resultFilename);
       
       switch (res.status) {
         case statuses.success.code:

package/src/crawlers/commonCrawlerFunc.ts

@@ -318,9 +318,9 @@ export const runAxeScript = async ({
   page.on('console', msg => {
     const type = msg.type();
     if (type === 'error') {
-      silentLogger.log({ level: 'error', message: msg.text() });
+      consoleLogger.log({ level: 'error', message: msg.text() });
     } else {
-      silentLogger.log({ level: 'info', message: msg.text() });
+      consoleLogger.log({ level: 'info', message: msg.text() });
     }
   });
   */

package/src/crawlers/crawlDomain.ts

@@ -29,7 +29,7 @@ import {
   getUrlsFromRobotsTxt,
   waitForPageLoaded,
 } from '../constants/common.js';
-import { areLinksEqual, isFollowStrategy } from '../utils.js';
+import { areLinksEqual, isFollowStrategy, register } from '../utils.js';
 import {
   handlePdfDownload,
   runPdfScan,
@@ -339,7 +339,7 @@ const crawlDomain = async ({
 
   let isAbortingScanNow = false;
 
-  const crawler = new crawlee.PlaywrightCrawler({
+  const crawler = register(new crawlee.PlaywrightCrawler({
     launchContext: {
       launcher: constants.launcher,
       launchOptions: getPlaywrightLaunchOptions(browser),
@@ -723,7 +723,7 @@ const crawlDomain = async ({
         scaleDownStepRatio: 0.1,       // Scale down slower
       },
     }),
-  });
+  }));
 
   await crawler.run();
 

package/src/crawlers/crawlIntelligentSitemap.ts

@@ -8,6 +8,7 @@ import crawlSitemap from './crawlSitemap.js';
 import { EnqueueStrategy } from 'crawlee';
 import { ViewportSettingsClass } from '../combine.js';
 import { getPlaywrightLaunchOptions } from '../constants/common.js';
+import { register } from '../utils.js';
 
 const crawlIntelligentSitemap = async (
   url: string,
@@ -58,6 +59,7 @@ const crawlIntelligentSitemap = async (
         ...getPlaywrightLaunchOptions(browser),
         ...(extraHTTPHeaders && { extraHTTPHeaders }),
     });
+    register(context);
 
     const page = await context.newPage();
 

package/src/crawlers/crawlLocalFile.ts

@@ -17,6 +17,7 @@ import {
 import { runPdfScan, mapPdfScanResults, doPdfScreenshots } from './pdfScanFunc.js';
 import { guiInfoLog } from '../logs.js';
 import crawlSitemap from './crawlSitemap.js';
+import { register } from '../utils.js';
 
 export const crawlLocalFile = async ({
   url,
@@ -161,6 +162,8 @@ export const crawlLocalFile = async ({
       ...playwrightDeviceDetailsObject,
     });
 
+    register(browserContext);
+
     const timeoutId = scanDuration > 0
     ? setTimeout(() => {
         console.log(`Crawl duration of ${scanDuration}s exceeded. Aborting local file scan.`);

package/src/crawlers/crawlSitemap.ts

@@ -20,7 +20,7 @@ import {
   waitForPageLoaded,
   isFilePath,
 } from '../constants/common.js';
-import { areLinksEqual, isWhitelistedContentType, isFollowStrategy } from '../utils.js';
+import { areLinksEqual, isWhitelistedContentType, register } from '../utils.js';
 import { handlePdfDownload, runPdfScan, mapPdfScanResults } from './pdfScanFunc.js';
 import { guiInfoLog } from '../logs.js';
 import { ViewportSettingsClass } from '../combine.js';
@@ -106,7 +106,7 @@ const crawlSitemap = async ({
     sources: linksFromSitemap,
   });
 
-  const crawler = new crawlee.PlaywrightCrawler({
+  const crawler = register(new crawlee.PlaywrightCrawler({
     launchContext: {
       launcher: constants.launcher,
       launchOptions: getPlaywrightLaunchOptions(browser),
@@ -395,7 +395,7 @@ const crawlSitemap = async ({
         scaleDownStepRatio: 0.1,       // Scale down slower
       },
     }),
-  });
+  }));
 
   await crawler.run();
 

package/src/crawlers/custom/utils.ts

@@ -78,7 +78,7 @@ export const screenshotFullPage = async (page, screenshotsDir: string, screensho
     });
 
     consoleLogger.info(`Screenshot page at: ${page.url()}`);
-    silentLogger.info(`Screenshot page at: ${page.url()}`);
+    consoleLogger.info(`Screenshot page at: ${page.url()}`);
 
     await page.screenshot({
       timeout: 5000,
@@ -469,7 +469,7 @@ export const initNewPage = async (page, pageClosePromises, processPageParams, pa
       consoleLogger.info(`Overlay state: ${existingOverlay}`);
     } catch {
       consoleLogger.info('Error in adding overlay menu to page');
-      silentLogger.info('Error in adding overlay menu to page');
+      consoleLogger.info('Error in adding overlay menu to page');
     }
   });
 

package/src/crawlers/pdfScanFunc.ts

@@ -15,6 +15,7 @@ import constants, {
   STATUS_CODE_METADATA,
   UrlsCrawled,
 } from '../constants/constants.js';
+import { cleanUpAndExit } from '../utils.js';
 
 const require = createRequire(import.meta.url);
 
@@ -233,7 +234,7 @@ const getVeraExecutable = () => {
     const veraPdfExeNotFoundError =
       'Could not find veraPDF executable.  Please ensure veraPDF is installed at current directory.';
     consoleLogger.error(veraPdfExeNotFoundError);
-    silentLogger.error(veraPdfExeNotFoundError);
+    consoleLogger.error(veraPdfExeNotFoundError);
   }
   return veraPdfExe;
 };
@@ -355,7 +356,7 @@ export const runPdfScan = async (randomToken: string) => {
     'profiles/veraPDF-validation-profiles-rel-1.26/PDF_UA/WCAG-2-2.xml',
   )}"`;
   if (!veraPdfExe || !veraPdfProfile) {
-    process.exit(1);
+    cleanUpAndExit(1);
   }
 
   const intermediateFolder = randomToken; // NOTE: assumes this folder is already created for crawlee

package/src/crawlers/runCustom.ts

@@ -1,7 +1,7 @@
 /* eslint-env browser */
 import { chromium } from 'playwright';
 import { createCrawleeSubFolders } from './commonCrawlerFunc.js';
-import { cleanUp } from '../utils.js';
+import { cleanUpAndExit, register} from '../utils.js';
 import constants, {
   getIntermediateScreenshotsPath,
   guiInfoStatusTypes,
@@ -48,7 +48,6 @@ const runCustom = async (
   includeScreenshots: boolean,
 ) => {
   // checks and delete datasets path if it already exists
-  cleanUp(randomToken);
   process.env.CRAWLEE_STORAGE_DIR = randomToken;
 
   const urlsCrawled: UrlsCrawled = { ...constants.urlsCrawledObj };
@@ -83,6 +82,8 @@ const runCustom = async (
       ...viewportSettings.playwrightDeviceDetailsObject,
     });
 
+    register(context);
+
     // Detection of new page
     context.on('page', async newPage => {
       await initNewPage(newPage, pageClosePromises, processPageParams, pagesDict);
@@ -107,7 +108,7 @@ const runCustom = async (
     await allPagesClosedPromise(pageClosePromises);
   } catch (error) {
     log(`PLAYWRIGHT EXECUTION ERROR ${error}`);
-    process.exit(1);
+    cleanUpAndExit(1, randomToken, true);
   }
 
   guiInfoLog(guiInfoStatusTypes.COMPLETED, {});

package/src/index.ts

@@ -7,6 +7,8 @@ import {
   cleanUp,
   getUserDataTxt,
   writeToUserDataTxt,
+  listenForCleanUp,
+  cleanUpAndExit,
 } from './utils.js';
 import {
   prepareData,
@@ -106,19 +108,19 @@ const runScan = async (answers: Answers) => {
   answers.metadata = '{}';
 
   const data: Data = await prepareData(answers);
+  
+  // Executes cleanUp script if error encountered
+  listenForCleanUp(data.randomToken);
+  
   data.userDataDirectory = getClonedProfilesWithRandomToken(data.browser, data.randomToken);
 
   printMessage(['Scanning website...'], messageOptions);
 
   await combineRun(data, screenToScan);
 
-  // Delete cloned directory
-  deleteClonedProfiles(data.browser, data.randomToken);
-
   // Delete dataset and request queues
-  cleanUp(data.randomToken);
+  cleanUpAndExit(0, data.randomToken);
 
-  process.exit(0);
 };
 
 if (userData) {

package/src/logs.ts

@@ -2,6 +2,8 @@
 /* eslint-disable no-shadow */
 import { createLogger, format, transports } from 'winston';
 import { guiInfoStatusTypes } from './constants/constants.js';
+import path from 'path';
+import { randomUUID } from 'crypto';
 
 const { combine, timestamp, printf } = format;
 
@@ -20,12 +22,32 @@ const logFormat = printf(({ timestamp, level, message }) => {
 // transport: storage device for logs
 // Enabled for console and storing into files; Files are overwritten each time
 // All logs in combined.txt, error in errors.txt
+const uuid = randomUUID();
+let basePath: string;
+
+if (process.env.OOBEE_LOGS_PATH) {
+  basePath = process.env.OOBEE_LOGS_PATH;
+} else if (process.platform === 'win32') {
+  basePath = path.join(process.env.APPDATA, 'Oobee');
+} else if (process.platform === 'darwin') {
+  basePath = path.join(process.env.HOME, 'Library', 'Application Support', 'Oobee');
+} else {
+  basePath = path.join(process.cwd());
+}
+
+export const errorsTxtPath = path.join(basePath, `${uuid}.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:
-    process.env.RUNNING_FROM_PH_GUI || process.env.OOBEE_VERBOSE ? [new transports.Console()] : [],
+  transports: [
+    new transports.Console({ level: 'info' }),
+    new transports.File({
+      filename: errorsTxtPath,
+      level: 'info',
+      handleExceptions: true,
+    }),
+  ],
 });
 
 // No display in consoles, this will mostly be used within the interactive script to avoid disrupting the flow
@@ -34,9 +56,10 @@ const consoleLogger = createLogger({
 const silentLogger = createLogger({
   format: combine(timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), logFormat),
   transports: [
-    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 }),
+    new transports.File({ 
+      filename: errorsTxtPath,
+      level: 'warn', 
+      handleExceptions: true }),
   ].filter(Boolean),
 });
 
@@ -46,16 +69,17 @@ export const guiInfoLog = (status: string, data: { numScanned?: number; urlScann
     switch (status) {
       case guiInfoStatusTypes.COMPLETED:
         console.log('Scan completed');
+        silentLogger.info('Scan completed');
         break;
       case guiInfoStatusTypes.SCANNED:
       case guiInfoStatusTypes.SKIPPED:
       case guiInfoStatusTypes.ERROR:
       case guiInfoStatusTypes.DUPLICATE:
-        console.log(
-          `crawling::${data.numScanned || 0}::${status}::${
+        const msg = `crawling::${data.numScanned || 0}::${status}::${
             data.urlScanned || 'no url provided'
-          }`,
-        );
+          }`;
+        console.log(msg);
+        silentLogger.info(msg);
         break;
       default:
         console.log(`Status provided to gui info log not recognized: ${status}`);
@@ -64,4 +88,6 @@ export const guiInfoLog = (status: string, data: { numScanned?: number; urlScann
   }
 };
 
+consoleLogger.info(`Logger writing to: ${errorsTxtPath}`);
+
 export { logFormat, consoleLogger, silentLogger };

package/src/mergeAxeResults.ts

@@ -29,6 +29,7 @@ import {
   getWcagCriteriaMap,
   categorizeWcagCriteria,
   getUserDataTxt,
+  register
 } from './utils.js';
 import { consoleLogger, silentLogger } from './logs.js';
 import itemTypeDescription from './constants/itemTypeDescription.js';
@@ -975,6 +976,8 @@ const writeSummaryPdf = async (storagePath: string, pagesScanned: number, filena
         ...getPlaywrightLaunchOptions(browser),
       });
 
+  register(context);
+
   const page = await context.newPage();
 
   const data = fs.readFileSync(htmlFilePath, { encoding: 'utf-8' });
@@ -1710,9 +1713,9 @@ const generateArtifacts = async (
   zip: string = undefined, // optional
   generateJsonFiles = false,
 ) => {
-  const intermediateDatasetsPath = `${getStoragePath(randomToken)}/crawlee`;
-  const oobeeAppVersion = getVersion();
   const storagePath = getStoragePath(randomToken);
+  const intermediateDatasetsPath = `${storagePath}/crawlee`;
+  const oobeeAppVersion = getVersion();
 
   const formatAboutStartTime = (dateString: string) => {
     const utcStartTimeDate = new Date(dateString);
@@ -1985,12 +1988,10 @@ const generateArtifacts = async (
   // Should consider refactor constants.userDataDirectory to be a parameter in future
   await retryFunction(() => writeSummaryPdf(storagePath, pagesScanned.length, 'summary', browserChannel, constants.userDataDirectory), 1);
 
-  const foldersToRemove = ['crawlee', 'logs'];
-  for (const folder of foldersToRemove) {
-    const folderPath = path.join(storagePath, folder);
-    if (await fs.pathExists(folderPath)) {
-      await fs.remove(folderPath);
-    }
+  try {
+    fs.rmSync(path.join(storagePath, 'crawlee'), { recursive: true, force: true });
+  } catch (error) {
+    consoleLogger.warn(`Unable to force remove crawlee folder: ${error.message}`);
   }
 
   // Take option if set

package/src/screenshotFunc/htmlScreenshotFunc.ts

@@ -22,7 +22,7 @@ export const takeScreenshotForHTMLElements = async (
   for (const violation of violations) {
     if (screenshotCount >= maxScreenshots) {
       /*
-      silentLogger.warn(
+      consoleLogger.warn(
         `Skipping screenshots for ${violation.id} as maxScreenshots (${maxScreenshots}) exceeded. You can increase it by specifying a higher value when calling takeScreenshotForHTMLElements.`,
       );
       */
@@ -34,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') {
-      // silentLogger.info('Skipping screenshot for rule oobee-grading-text-contents');
+      // consoleLogger.info('Skipping screenshot for rule oobee-grading-text-contents');
       newViolations.push(violation); // Make sure it gets added
       continue;
     }
@@ -59,13 +59,13 @@ export const takeScreenshotForHTMLElements = async (
               nodeWithScreenshotPath.screenshotPath = screenshotPath;
               screenshotCount++;
             } else {
-              // silentLogger.info(`Element at ${currLocator} is not visible`);
+              // consoleLogger.info(`Element at ${currLocator} is not visible`);
             }
 
             break; // Stop looping after finding the first visible locator
           }
         } catch (e) {
-          // silentLogger.info(`Unable to take element screenshot at ${selector}`);
+          // consoleLogger.info(`Unable to take element screenshot at ${selector}`);
         }
       }
       newViolationNodes.push(nodeWithScreenshotPath);

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

@@ -12,17 +12,14 @@
   // extract tagname and attribute name from html tag
   // e.g. ["input", "type", "value", "role"] from <input type="text" value="..." role="..." />
   const getHtmlTagAndAttributes = (htmlString) => {
-    const regex = /<(\w+)(\s+(\w+)(\s*=\s*"[^"]*")?)*\s*\/?>/;
-    const match = htmlString.match(regex); // check if structure of html tag is valid
-
-    if (match) {
-      const tagName = match[1];
-      const attributes = match[0]
-        .match(/\w+\s*=\s*"[^"]*"/g) // extract attributes e.g. ['type="text"', 'value="..."']
-        .map((attr) => attr.match(/(\w+)\s*=/)[1]); // get the name e.g. "type" from each
-      return [tagName, ...attributes];
-    }
-    return [];
+    const tagMatch = htmlString.match(/^<\s*(\w+)/); // Get tag name
+    if (!tagMatch) return [];
+
+    const tagName = tagMatch[1];
+    const attrMatches = [...htmlString.matchAll(/(\w[\w-]*)\s*=\s*"[^"]*"/g)];
+    const attributes = attrMatches.map(match => match[1]);
+
+    return [tagName, ...attributes];
   };
 
   const rulesUsingRoles = [

package/src/utils.ts

@@ -9,9 +9,10 @@ import constants, {
   destinationPath,
   getIntermediateScreenshotsPath,
 } from './constants/constants.js';
-import { consoleLogger, silentLogger } from './logs.js';
+import { consoleLogger, errorsTxtPath, silentLogger } from './logs.js';
 import { getAxeConfiguration } from './crawlers/custom/getAxeConfiguration.js';
 import { constant } from 'lodash';
+import { errors } from 'playwright';
 
 export const getVersion = () => {
   const loadJSON = (filePath: string): { version: string } =>
@@ -84,7 +85,7 @@ export const getStoragePath = (randomToken: string): string => {
 
 export const createDetailsAndLogs = async (randomToken: string): Promise<void> => {
   const storagePath = getStoragePath(randomToken);
-  const logPath = `${getStoragePath(randomToken)}/logs`;
+  const logPath = `${storagePath}}/logs`;
   try {
     await fs.ensureDir(storagePath);
 
@@ -230,11 +231,257 @@ export const createScreenshotsFolder = (randomToken: string): void => {
   }
 };
 
-export const cleanUp = (randomToken: string): void => {
-  fs.removeSync(randomToken);
-  fs.removeSync(path.join(process.env.APPDATA || '/tmp', randomToken));
-  fs.removeSync(path.join(getStoragePath(randomToken),'crawlee'));
-  fs.removeSync(path.join(getStoragePath(randomToken),'logs'));
+
+let __shuttingDown = false;
+let __stopAllLock: Promise<void> | null = null;
+
+/**
+ * Register a resource so it can be stopped later.
+ * Supports Crawlee crawlers, Playwright BrowserContexts, and Browsers.
+ */
+export function register(resource: any) {
+  const name = resource?.constructor?.name;
+
+  if (name?.endsWith('Crawler')) {
+    constants.resources.crawlers.add(resource);
+  } else if (name === 'BrowserContext') {
+    constants.resources.browserContexts.add(resource);
+  } else if (name === 'Browser') {
+    constants.resources.browsers.add(resource);
+  }
+
+  return resource;
+}
+
+/**
+ * Stops or tears down all tracked resources.
+ * @param mode "graceful" (finish in-flight), "abort" (drop in-flight), or "teardown" (close immediately)
+ * @param timeoutMs Max time to wait before forcing shutdown
+ */
+export async function stopAll({ mode = 'graceful', timeoutMs = 10_000 } = {}) {
+  if (__stopAllLock) return __stopAllLock; // prevent overlap
+  __stopAllLock = (async () => {
+    const timeout = (ms: number) => new Promise(res => setTimeout(res, ms));
+    consoleLogger.info(`Stop browsers starting, mode=${mode}, timeoutMs=${timeoutMs}`);
+
+    // --- Crawlers ---
+    for (const c of [...constants.resources.crawlers]) {
+      try {
+        const pool = (c as any).autoscaledPool;
+        if (pool && typeof pool.isRunning !== 'undefined' && !pool.isRunning) {
+          consoleLogger.info('Skipping crawler (already stopped)');
+          continue;
+        }
+
+        consoleLogger.info(`Closing crawler (${mode})...`);
+        if (mode === 'graceful') {
+          if (typeof c.stop === 'function') {
+            await Promise.race([c.stop(), timeout(timeoutMs)]);
+          }
+        } else if (mode === 'abort') {
+          pool?.abort?.();
+        } else {
+          if (typeof c.teardown === 'function') {
+            await Promise.race([c.teardown(), timeout(timeoutMs)]);
+          }
+        }
+        consoleLogger.info(`Crawler closed (${mode})`);
+      } catch (err) {
+        consoleLogger.warn(`Error stopping crawler: ${(err as Error).message}`);
+      } finally {
+        constants.resources.crawlers.delete(c);
+      }
+    }
+
+    // --- BrowserContexts ---
+    for (const ctx of [...constants.resources.browserContexts]) {
+      // compute once so we can also use in finally
+      const pagesArr = typeof ctx.pages === 'function' ? ctx.pages() : [];
+      const hasOpenPages = Array.isArray(pagesArr) && pagesArr.length > 0;
+
+      try {
+        const browser = typeof ctx.browser === 'function' ? ctx.browser() : null;
+        if (browser && (browser as any).isClosed?.()) {
+          consoleLogger.info('Skipping BrowserContext (browser already closed)');
+          continue;
+        }
+
+        // ➜ Graceful: don't kill contexts that are still doing work
+        if (mode === 'graceful' && hasOpenPages) {
+          consoleLogger.info(`Skipping BrowserContext in graceful (has ${pagesArr.length} open page(s))`);
+          continue; // leave it for the teardown pass
+        }
+
+        // (Optional speed-up) close pages first if any
+        if (hasOpenPages) {
+          consoleLogger.info(`Closing ${pagesArr.length} page(s) before context close...`);
+          for (const p of pagesArr) {
+            try { await Promise.race([p.close(), timeout(1500)]); } catch {}
+          }
+        }
+
+        consoleLogger.info('Closing BrowserContext...');
+        if (typeof ctx.close === 'function') {
+          await Promise.race([ctx.close(), timeout(timeoutMs)]);
+        }
+        consoleLogger.info('BrowserContext closed');
+
+        // also close its browser (persistent contexts)
+        const b = browser;
+        if (b && !(b as any).isClosed?.()) {
+          consoleLogger.info('Closing Browser (from context.browser())...');
+          if (typeof b.close === 'function') {
+            await Promise.race([b.close(), timeout(timeoutMs)]);
+          }
+          consoleLogger.info('Browser closed (from context.browser())');
+        }
+      } catch (err) {
+        consoleLogger.warn(`Error closing BrowserContext: ${(err as Error).message}`);
+      } finally {
+        // only delete from the set if we actually closed it (or tried to)
+        if (!(mode === 'graceful' && hasOpenPages)) {
+          constants.resources.browserContexts.delete(ctx);
+        }
+      }
+    }
+
+    // --- Browsers ---
+    for (const b of [...constants.resources.browsers]) {
+      try {
+        if ((b as any).isClosed?.()) {
+          consoleLogger.info('Skipping Browser (already closed)');
+          continue;
+        }
+
+        consoleLogger.info('Closing Browser...');
+        if (typeof b.close === 'function') {
+          await Promise.race([b.close(), timeout(timeoutMs)]);
+        }
+        consoleLogger.info('Browser closed');
+      } catch (err) {
+        consoleLogger.warn(`Error closing Browser: ${(err as Error).message}`);
+      } finally {
+        constants.resources.browsers.delete(b);
+      }
+    }
+
+    consoleLogger.info(`Stop browsers finished for mode=${mode}`);
+  })();
+
+  try {
+    await __stopAllLock;
+  } finally {
+    __stopAllLock = null;
+  }
+}
+
+export const cleanUp = async (randomToken?: string, isError: boolean = false): Promise<void> => {
+
+  if (isError) {
+    await stopAll({ mode: 'graceful', timeoutMs: 8000 });
+    await stopAll({ mode: 'teardown', timeoutMs: 4000 });
+  }
+  
+  if (randomToken === undefined && constants.randomToken) {
+    randomToken = constants.randomToken;
+  }
+
+  if (constants.userDataDirectory) try {
+    fs.rmSync(constants.userDataDirectory, { recursive: true, force: true });
+  } catch (error) {
+    consoleLogger.warn(`Unable to force remove userDataDirectory: ${error.message}`);
+  }
+
+  if (randomToken !== undefined) {
+    const storagePath = getStoragePath(randomToken);
+
+    try {
+      fs.rmSync(path.join(storagePath, 'crawlee'), { recursive: true, force: true });
+    } catch (error) {
+      consoleLogger.warn(`Unable to force remove crawlee folder: ${error.message}`);
+    }
+
+    let deleteErrorLogFile = true;
+
+    if (isError) {
+      let logsPath = storagePath;
+
+      if (process.env.OOBEE_LOGS_PATH) {
+        logsPath = process.env.OOBEE_LOGS_PATH;
+      }
+
+      if (fs.existsSync(errorsTxtPath)) {
+        try {
+          const logFilePath = path.join(logsPath, `logs-${randomToken}.txt`);
+          fs.copyFileSync(errorsTxtPath, logFilePath);
+          console.log(`An error occured. Log file is located at: ${logFilePath}`);
+
+        } catch (copyError) {
+          consoleLogger.error(`Error copying errors file during cleanup: ${copyError.message}`);
+          console.log(`An error occured. Log file is located at: ${errorsTxtPath}`);
+          deleteErrorLogFile = false; // Do not delete the log file if copy failed
+        }
+    
+        if (deleteErrorLogFile && fs.existsSync(errorsTxtPath)) {
+          try {
+            fs.unlinkSync(errorsTxtPath);
+          } catch (error) {
+            consoleLogger.warn(`Unable to delete log file ${errorsTxtPath}: ${error.message}`);
+          }
+        }
+
+      }
+
+    } 
+    
+    if (fs.existsSync(storagePath) && fs.readdirSync(storagePath).length === 0) {
+      try {
+        fs.rmdirSync(storagePath);
+        consoleLogger.info(`Deleted empty storage path: ${storagePath}`);
+    
+      } catch (error) {
+        consoleLogger.warn(`Error deleting empty storage path ${storagePath}: ${error.message}`);
+      }
+    }
+
+    consoleLogger.info(`Clean up completed for: ${randomToken}`);
+  } 
+
+};
+
+export const cleanUpAndExit = async (
+  exitCode: number,
+  randomToken?: string,
+  isError: boolean = false,
+): Promise<void> => {
+  if (__shuttingDown) {
+    consoleLogger.info('Cleanup already in progress; ignoring duplicate exit request.');
+    return;
+  }
+  __shuttingDown = true;
+
+  try {
+    await cleanUp(randomToken, isError);   // runs stopAll inside cleanUp
+  } catch (e: any) {
+    consoleLogger.warn(`Cleanup error: ${e?.message || e}`);
+  }
+
+  consoleLogger.info(`Exiting with code: ${exitCode}`);
+  process.exit(exitCode); // explicit exit after cleanup completes
+};
+
+export const listenForCleanUp = (randomToken: string): void => {
+  consoleLogger.info(`PID: ${process.pid}`);
+
+  process.on('SIGINT', async () => {   // ← keep handler installed
+    consoleLogger.info('SIGINT received. Cleaning up and exiting.');
+    await cleanUpAndExit(130, randomToken, true);
+  });
+
+  process.on('SIGTERM', async () => {  // ← keep handler installed
+    consoleLogger.info('SIGTERM received. Cleaning up and exiting.');
+    await cleanUpAndExit(143, randomToken, true);
+  });
 };
 
 export const getWcagPassPercentage = (
@@ -757,8 +1004,8 @@ export const zipResults = (zipName: string, resultsPath: string): void => {
 
   if (os.platform() === 'win32') {
     execSync(
-      `Get-ChildItem -Path "*.*" -Recurse | Compress-Archive -DestinationPath "${zipFilePath}"`,
-      { shell: 'powershell.exe', cwd: resultsPath },
+      `tar.exe -a -c -f "${zipFilePath}" *`,
+      { cwd: resultsPath },
     );
   } else {
     // Get zip command in Mac and Linux