@govtechsg/oobee 0.10.61 → 0.10.65

package/Dockerfile

@@ -2,9 +2,14 @@
 # Node version is v22
 FROM mcr.microsoft.com/playwright:v1.50.1-noble
 
-# Installation of packages for oobee and runner
-RUN apt-get update && apt-get install -y zip git
-
+# Installation of packages for oobee and runner (locked versions from build log)
+RUN apt-get update && apt-get install -y \
+    git=1:2.43.0-1ubuntu7.3 \
+    git-man=1:2.43.0-1ubuntu7.3 \
+    unzip=6.0-28ubuntu4.1 \
+    zip=3.0-13ubuntu0.2 \
+ && rm -rf /var/lib/apt/lists/*
+ 
 WORKDIR /app/oobee
 
 # Clone oobee repository

package/README.md

@@ -86,7 +86,10 @@ 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. |  |
+| OOBEE_DISABLE_BROWSER_DOWNLOAD | Experimental flag to disable file downloads on Chrome/Chromium/Edge.  Does not affect Local File scan | |
+| OOBEE_SLOWMO | Experimental flag to slow down web browser behaviour by specified duration (in miliseconds) | |
 
 #### Environment variables used internally (Do not set)
 Do not set these environment variables or behaviour might change unexpectedly.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@govtechsg/oobee",
   "main": "dist/npmIndex.js",
-  "version": "0.10.61",
+  "version": "0.10.65",
   "type": "module",
   "author": "Government Technology Agency <info@tech.gov.sg>",
   "dependencies": {
@@ -20,6 +20,7 @@
     "https": "^1.0.0",
     "inquirer": "^9.2.12",
     "jsdom": "^21.1.2",
+    "jszip": "^3.10.1",
     "lodash": "^4.17.21",
     "mime-types": "^2.1.35",
     "minimatch": "^9.0.3",
@@ -69,7 +70,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,19 +5,17 @@ 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 { setHeadlessMode, getVersion, getStoragePath, listenForCleanUp, cleanUpAndExit } from './utils.js';
 import {
   checkUrl,
   prepareData,
   getFileSitemap,
   validEmail,
   validName,
-  deleteClonedProfiles,
   getScreenToScan,
   validateDirPath,
   validateFilePath,
   validateCustomFlowLabel,
-  parseHeaders,
 } from './constants/common.js';
 import constants, { ScannerTypes } from './constants/constants.js';
 import { cliOptions, messageOptions } from './constants/cliFunctions.js';
@@ -54,20 +52,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 +75,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 +85,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 +95,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 +119,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 +131,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 +141,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 +149,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 +160,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 +197,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 +224,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 +243,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 +251,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 +270,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 +280,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 +329,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 +368,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, 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,12 +213,12 @@ const combineRun = async (details: Data, deviceToScan: string) => {
 
     default:
       consoleLogger.error(`type: ${type} not defined`);
-      process.exit(1);
+      cleanUpAndExit(1);
   }
 
   scanDetails.endTime = new Date();
   scanDetails.urlsCrawled = urlsCrawledObj;
-  await createDetailsAndLogs(randomToken);
+
   if (scanDetails.urlsCrawled) {
     if (scanDetails.urlsCrawled.scanned.length > 0) {
       await createAndUpdateResultsFolders(randomToken);
@@ -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

@@ -22,18 +22,18 @@ import constants, {
   getDefaultChromeDataDir,
   getDefaultEdgeDataDir,
   getDefaultChromiumDataDir,
-  proxy,
   // Legacy code start - Google Sheets submission
   formDataFields,
   // Legacy code end - Google Sheets submission
   ScannerTypes,
   BrowserTypes,
 } from './constants.js';
-import { consoleLogger, silentLogger } from '../logs.js';
+import { consoleLogger } 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';
+import { getProxyInfo, proxyInfoToResolution, ProxySettings } from '../proxyService.js';
 
 // validateDirPath validates a provided directory path
 // returns null if no error
@@ -304,7 +304,10 @@ const checkUrlConnectivityWithBrowser = async (
       ignoreHTTPSErrors: true,
       ...getPlaywrightLaunchOptions(browserToRun),
       ...playwrightDeviceDetailsObject,
+      ...(process.env.OOBEE_DISABLE_BROWSER_DOWNLOAD && { acceptDownloads: false }),
     });
+
+    register(browserContext);
   } catch (err) {
     printMessage([`Unable to launch browser\n${err}`], messageOptions);
     res.status = constants.urlCheckStatuses.browserError.code;
@@ -463,7 +466,7 @@ export const parseHeaders = (header?: string): Record<string, string> => {
         ],
         messageOptions,
       );
-      process.exit(1);
+      cleanUpAndExit(1);
     }
     allHeaders[headerValuePair[0]] = headerValuePair[1]; // {"header": "value", "header2": "value2", ...}
   });
@@ -483,7 +486,7 @@ export const prepareData = async (argv: Answers): Promise<Data> => {
     viewportWidth,
     maxpages,
     strategy,
-    isLocalFileScan,
+    isLocalFileScan = false,
     browserToRun,
     nameEmail,
     customFlowLabel,
@@ -508,6 +511,10 @@ export const prepareData = async (argv: Answers): Promise<Data> => {
   let username = '';
   let password = '';
 
+  if (isFilePath(url)) {
+    argv.isLocalFileScan = true;
+  }
+
   // Remove credentials from URL if not a local file scan
   url = argv.isLocalFileScan 
     ? url 
@@ -548,7 +555,7 @@ export const prepareData = async (argv: Answers): Promise<Data> => {
     viewportWidth,
   );
 
-  const { browserToRun: resolvedBrowser, clonedBrowserDataDir } = getBrowserToRun(browserToRun, true, resultFilename);
+  const { browserToRun: resolvedBrowser, clonedBrowserDataDir } = getBrowserToRun(resultFilename, browserToRun, true);
   browserToRun = resolvedBrowser;
 
   const resolvedUserDataDirectory = getClonedProfilesWithRandomToken(browserToRun, resultFilename);
@@ -558,6 +565,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 +686,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 +860,7 @@ export const getLinksFromSitemap = async (
         },
       );
 
+      register(browserContext);
       const page = await browserContext.newPage();
 
       await page.goto(url, { waitUntil: 'networkidle', timeout: 60000 });
@@ -997,14 +1010,10 @@ export const validName = (name: string) => {
  * @returns object consisting of browser to run and cloned data directory
  */
 export const getBrowserToRun = (
+  randomToken: string,
   preferredBrowser?: BrowserTypes,
   isCli = false,
-  randomToken?: string
 ): { browserToRun: BrowserTypes; clonedBrowserDataDir: string } => {
-
-  if (!randomToken) {
-    randomToken = '';
-  }
   
   const platform = os.platform();
 
@@ -1589,26 +1598,21 @@ export const submitFormViaPlaywright = async (
   userDataDirectory: string,
   finalUrl: string,
 ) => {
-  const dirName = `clone-${Date.now()}`;
-  let clonedDir = null;
-  if (proxy && browserToRun === BrowserTypes.EDGE) {
-    clonedDir = cloneEdgeProfiles(dirName);
-  } else if (proxy && browserToRun === BrowserTypes.CHROME) {
-    clonedDir = cloneChromeProfiles(dirName);
-  }
   const browserContext = await constants.launcher.launchPersistentContext(
-    clonedDir || userDataDirectory,
+    userDataDirectory,
     {
       ...getPlaywrightLaunchOptions(browserToRun),
     },
   );
 
+  register(browserContext);
+
   const page = await browserContext.newPage();
 
   try {
     await page.goto(finalUrl, {
       timeout: 30000,
-      ...(proxy && { waitUntil: 'commit' }),
+      waitUntil: 'commit',
     });
 
     try {
@@ -1620,11 +1624,6 @@ export const submitFormViaPlaywright = async (
     consoleLogger.error(error);
   } finally {
     await browserContext.close();
-    if (proxy && browserToRun === BrowserTypes.EDGE) {
-        deleteClonedEdgeProfiles(clonedDir);
-    } else if (proxy && browserToRun === BrowserTypes.CHROME) {
-        deleteClonedChromeProfiles(clonedDir);
-    }
   }
 };
 
@@ -1663,19 +1662,17 @@ export const submitForm = async (
     finalUrl += `&${formDataFields.redirectUrlField}=${scannedUrl}`;
   }
 
-  if (proxy) {
-    await submitFormViaPlaywright(browserToRun, userDataDirectory, finalUrl);
-  } else {
-    try {
-      await axios.get(finalUrl, { timeout: 2000 });
-    } catch (error) {
-      if (error.code === 'ECONNABORTED') {
-        if (browserToRun || constants.launcher === webkit) {
-          await submitFormViaPlaywright(browserToRun, userDataDirectory, finalUrl);
-        }
+
+  try {
+    await axios.get(finalUrl, { timeout: 2000 });
+  } catch (error) {
+    if (error.code === 'ECONNABORTED') {
+      if (browserToRun || constants.launcher === webkit) {
+        await submitFormViaPlaywright(browserToRun, userDataDirectory, finalUrl);
       }
     }
   }
+
 };
 // Legacy code end - Google Sheets submission
 
@@ -1706,6 +1703,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.
@@ -1724,42 +1723,61 @@ export async function initModifiedUserAgent(
   // console.log('Modified User Agent:', modifiedUA);
 }
 
+const cacheProxyInfo = getProxyInfo();
+
 /**
  * @param {string} browser browser name ("chrome" or "edge", null for chromium, the default Playwright browser)
  * @returns playwright launch options object. For more details: https://playwright.dev/docs/api/class-browsertype#browser-type-launch
  */
 export const getPlaywrightLaunchOptions = (browser?: string): LaunchOptions => {
-  let channel: string;
-  if (browser) {
-    channel = browser;
-  }
+  const channel = browser || undefined;
+
+  const resolution = proxyInfoToResolution(cacheProxyInfo);
 
-  // Set new headless mode as Chrome 132 does not support headless=old
-  // Also mute audio
+  // Start with your base args
+  const finalArgs = [...constants.launchOptionsArgs];
+
+  // Headless flags (unchanged)
   if (process.env.CRAWLEE_HEADLESS === '1') {
-    constants.launchOptionsArgs.push('--headless=new');
-    constants.launchOptionsArgs.push('--mute-audio');
+    if (!finalArgs.includes('--headless=new')) finalArgs.push('--headless=new');
+    if (!finalArgs.includes('--mute-audio')) finalArgs.push('--mute-audio');
+  }
+
+  // Map resolution to Playwright options
+  let proxyOpt: ProxySettings | undefined;
+  switch (resolution.kind) {
+    case 'manual':
+      proxyOpt = resolution.settings;
+      break;
+    case 'pac': {
+      finalArgs.push(`--proxy-pac-url=${resolution.pacUrl}`);
+      if (resolution.bypass) finalArgs.push(`--proxy-bypass-list=${resolution.bypass}`);
+      break;
+    }
+    case 'none':
+      // nothing
+      break;
   }
 
   const options: LaunchOptions = {
-    // Drop the --use-mock-keychain flag to allow MacOS devices
-    // to use the cloned cookies.
     ignoreDefaultArgs: ['--use-mock-keychain', '--headless'],
-    // necessary from Chrome 132 to use our own headless=new flag
-    args: constants.launchOptionsArgs,
+    args: finalArgs,
     headless: false,
-    ...(channel && { channel }), // Having no channel is equivalent to "chromium"
+    ...(channel && { channel }),
+    ...(proxyOpt ? { proxy: proxyOpt } : {}),
   };
 
-  // Necessary as Chrome 132 does not support headless=old
-  options.headless = false;
+  // SlowMo (unchanged)
+  if (!options.slowMo && process.env.OOBEE_SLOWMO && Number(process.env.OOBEE_SLOWMO) >= 1) {
+    options.slowMo = Number(process.env.OOBEE_SLOWMO);
+    consoleLogger.info(`Enabled browser slowMo with value: ${process.env.OOBEE_SLOWMO}ms`);
+  }
 
-  if (proxy) {
-    options.slowMo = 1000; // To ensure server-side rendered proxy page is loaded
-  } else if (browser === BrowserTypes.EDGE && os.platform() === 'win32') {
-    // edge should be in non-headless mode
+  // Edge on Windows should not be headless (unchanged)
+  if (browser === BrowserTypes.EDGE && os.platform() === 'win32') {
     options.headless = false;
   }
+
   return options;
 };