@google-psat/analysis-utils 0.14.1 → 1.0.0-1

package/dist/browserManagement/index.js

@@ -1,4 +1,3 @@
-"use strict";
 /*
  * Copyright 2023 Google LLC
  *
@@ -14,32 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BrowserManagement = void 0;
 /**
  * External dependencies.
  */
-const puppeteer_1 = __importDefault(require("puppeteer"));
-const simple_cookie_1 = require("simple-cookie");
-const common_1 = require("@google-psat/common");
-const parseNetworkDataToCookieData_1 = require("./parseNetworkDataToCookieData");
-const collateCookieData_1 = __importDefault(require("./collateCookieData"));
-const constants_1 = require("../constants");
-class BrowserManagement {
+import puppeteer from 'puppeteer';
+import { parse } from 'simple-cookie';
+import { resolveWithTimeout, delay, RESPONSE_EVENT, REQUEST_EVENT, } from '@google-psat/common';
+import { parseNetworkDataToCookieData } from './parseNetworkDataToCookieData';
+import collateCookieData from './collateCookieData';
+import { CMP_SELECTORS, CMP_TEXT_SELECTORS } from '../constants';
+export class BrowserManagement {
+    viewportConfig;
+    browser;
+    isHeadless;
+    pageWaitTime;
+    pages;
+    erroredOutUrls;
+    pageFrames;
+    pageResponses;
+    pageRequests;
+    shouldLogDebug;
+    spinnies;
+    isSiteMap;
+    indent = 0;
+    selectors;
     constructor(viewportConfig, isHeadless, pageWaitTime, shouldLogDebug, indent, isSiteMap, spinnies, selectors) {
-        this.indent = 0;
         this.viewportConfig = viewportConfig;
         this.browser = null;
         this.isHeadless = isHeadless;
@@ -50,7 +48,6 @@ class BrowserManagement {
         this.pageResponses = {};
         this.pageRequests = {};
         this.shouldLogDebug = shouldLogDebug;
-        this.pageResourcesMaps = {};
         this.spinnies = spinnies;
         this.indent = indent;
         this.erroredOutUrls = {};
@@ -68,169 +65,155 @@ class BrowserManagement {
             });
         }
     }
-    initializeBrowser(enable3pCookiePhaseout) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const args = [];
-            if (enable3pCookiePhaseout) {
-                args.push('--test-third-party-cookie-phaseout');
-                args.push('--enable-features="FirstPartySets,StorageAccessAPI,StorageAccessAPIForOriginExtension,PageInfoCookiesSubpage,PrivacySandboxFirstPartySetsUI,TpcdMetadataGrants,TpcdSupportSettings,TpcdHeuristicsGrants:TpcdReadHeuristicsGrants/true/TpcdWritePopupCurrentInteractionHeuristicsGrants/30d/TpcdBackfillPopupHeuristicsGrants/30d/TpcdPopupHeuristicEnableForIframeInitiator/all/TpcdWriteRedirectHeuristicGrants/15m/TpcdRedirectHeuristicRequireABAFlow/true/TpcdRedirectHeuristicRequireCurrentInteraction/true"');
-            }
-            this.browser = yield puppeteer_1.default.launch({
-                devtools: true,
-                headless: this.isHeadless,
-                args,
-            });
-            this.debugLog('Browser initialized');
-        });
-    }
-    clickOnButtonUsingCMPSelectors(page) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let clickedOnButton = false;
-            yield Promise.all(constants_1.CMP_SELECTORS.map((selector) => __awaiter(this, void 0, void 0, function* () {
-                const buttonToClick = yield page.$(selector);
-                if (buttonToClick) {
-                    yield buttonToClick.click();
-                    clickedOnButton = true;
-                }
-            })));
-            return clickedOnButton;
+    async initializeBrowser(enable3pCookiePhaseout) {
+        const args = [];
+        if (enable3pCookiePhaseout) {
+            args.push('--test-third-party-cookie-phaseout');
+            args.push('--enable-features="FirstPartySets,StorageAccessAPI,StorageAccessAPIForOriginExtension,PageInfoCookiesSubpage,PrivacySandboxFirstPartySetsUI,TpcdMetadataGrants,TpcdSupportSettings,TpcdHeuristicsGrants:TpcdReadHeuristicsGrants/true/TpcdWritePopupCurrentInteractionHeuristicsGrants/30d/TpcdBackfillPopupHeuristicsGrants/30d/TpcdPopupHeuristicEnableForIframeInitiator/all/TpcdWriteRedirectHeuristicGrants/15m/TpcdRedirectHeuristicRequireABAFlow/true/TpcdRedirectHeuristicRequireCurrentInteraction/true"');
+        }
+        this.browser = await puppeteer.launch({
+            devtools: true,
+            headless: this.isHeadless,
+            args,
         });
+        this.debugLog('Browser initialized');
     }
-    clickOnGDPRUsingTextSelectors(page, textSelectors) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (textSelectors.length === 0) {
-                return false;
+    async clickOnButtonUsingCMPSelectors(page) {
+        let clickedOnButton = false;
+        await Promise.all(CMP_SELECTORS.map(async (selector) => {
+            const buttonToClick = await page.$(selector);
+            if (buttonToClick) {
+                await buttonToClick.click();
+                clickedOnButton = true;
             }
-            const result = yield page.evaluate((args) => {
-                var _a, _b, _c;
-                const bannerNodes = (_c = (_b = Array.from((((_a = document.querySelector('body')) === null || _a === void 0 ? void 0 : _a.childNodes) || []))) === null || _b === void 0 ? void 0 : _b.filter((node) => node && (node === null || node === void 0 ? void 0 : node.tagName) === 'DIV')) === null || _c === void 0 ? void 0 : _c.filter((node) => {
-                    if (!node || !(node === null || node === void 0 ? void 0 : node.textContent)) {
+        }));
+        return clickedOnButton;
+    }
+    async clickOnGDPRUsingTextSelectors(page, textSelectors) {
+        if (textSelectors.length === 0) {
+            return false;
+        }
+        const result = await page.evaluate((args) => {
+            const bannerNodes = Array.from((document.querySelector('body')?.childNodes || []))
+                ?.filter((node) => node && node?.tagName === 'DIV')
+                ?.filter((node) => {
+                if (!node || !node?.textContent) {
+                    return false;
+                }
+                const regex = /\b(consent|policy|cookie policy|privacy policy|personalize|preferences|cookies)\b/;
+                return regex.test(node.textContent.toLowerCase());
+            });
+            return bannerNodes?.some((node) => {
+                const buttonNodes = Array.from(node?.getElementsByTagName('button'));
+                return buttonNodes?.some((cnode) => {
+                    if (!cnode?.textContent) {
                         return false;
                     }
-                    const regex = /\b(consent|policy|cookie policy|privacy policy|personalize|preferences|cookies)\b/;
-                    return regex.test(node.textContent.toLowerCase());
-                });
-                return bannerNodes === null || bannerNodes === void 0 ? void 0 : bannerNodes.some((node) => {
-                    const buttonNodes = Array.from(node === null || node === void 0 ? void 0 : node.getElementsByTagName('button'));
-                    return buttonNodes === null || buttonNodes === void 0 ? void 0 : buttonNodes.some((cnode) => {
-                        if (!(cnode === null || cnode === void 0 ? void 0 : cnode.textContent)) {
-                            return false;
+                    return args.some((text) => {
+                        if (cnode?.textContent?.toLowerCase().includes(text)) {
+                            cnode?.click();
+                            return true;
                         }
-                        return args.some((text) => {
-                            var _a;
-                            if ((_a = cnode === null || cnode === void 0 ? void 0 : cnode.textContent) === null || _a === void 0 ? void 0 : _a.toLowerCase().includes(text)) {
-                                cnode === null || cnode === void 0 ? void 0 : cnode.click();
-                                return true;
-                            }
-                            return false;
-                        });
+                        return false;
                     });
                 });
-            }, textSelectors);
-            return result;
-        });
+            });
+        }, textSelectors);
+        return result;
     }
-    clickOnAcceptBanner(url) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            try {
-                const page = this.pages[url];
-                if (!page) {
-                    throw new Error('No page with the provided id was found');
-                }
-                const didSelectorsFromUserWork = yield this.useSelectorsToSelectGDPRBanner(page);
-                if (didSelectorsFromUserWork) {
-                    this.debugLog('GDPR banner found and accepted');
-                    yield (0, common_1.delay)(this.pageWaitTime / 2);
-                    return;
-                }
-                // Click using CSS selectors.
-                const clickedUsingCMPCSSSelectors = yield this.clickOnButtonUsingCMPSelectors(page);
-                if (clickedUsingCMPCSSSelectors) {
-                    this.debugLog('GDPR banner found and accepted');
-                    yield (0, common_1.delay)(this.pageWaitTime / 2);
-                    return;
-                }
-                const buttonClicked = yield this.clickOnGDPRUsingTextSelectors(page, constants_1.CMP_TEXT_SELECTORS);
-                if (buttonClicked) {
-                    this.debugLog('GDPR banner found and accepted');
-                    yield (0, common_1.delay)(this.pageWaitTime / 2);
-                    return;
-                }
-                this.debugLog('GDPR banner could not be found');
-                yield (0, common_1.delay)(this.pageWaitTime / 2);
+    async clickOnAcceptBanner(url) {
+        try {
+            const page = this.pages[url];
+            if (!page) {
+                throw new Error('No page with the provided id was found');
+            }
+            const didSelectorsFromUserWork = await this.useSelectorsToSelectGDPRBanner(page);
+            if (didSelectorsFromUserWork) {
+                this.debugLog('GDPR banner found and accepted');
+                await delay(this.pageWaitTime / 2);
                 return;
             }
-            catch (error) {
-                if (error instanceof Error) {
-                    this.pushErrors(url, {
-                        errorMessage: error.message,
-                        stackTrace: (_a = error === null || error === void 0 ? void 0 : error.stack) !== null && _a !== void 0 ? _a : '',
-                        errorName: error === null || error === void 0 ? void 0 : error.name,
-                    });
-                }
+            // Click using CSS selectors.
+            const clickedUsingCMPCSSSelectors = await this.clickOnButtonUsingCMPSelectors(page);
+            if (clickedUsingCMPCSSSelectors) {
+                this.debugLog('GDPR banner found and accepted');
+                await delay(this.pageWaitTime / 2);
+                return;
             }
-        });
+            const buttonClicked = await this.clickOnGDPRUsingTextSelectors(page, CMP_TEXT_SELECTORS);
+            if (buttonClicked) {
+                this.debugLog('GDPR banner found and accepted');
+                await delay(this.pageWaitTime / 2);
+                return;
+            }
+            this.debugLog('GDPR banner could not be found');
+            await delay(this.pageWaitTime / 2);
+            return;
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                this.pushErrors(url, {
+                    errorMessage: error.message,
+                    stackTrace: error?.stack ?? '',
+                    errorName: error?.name,
+                });
+            }
+        }
     }
-    useSelectorsToSelectGDPRBanner(page) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            let clickedOnButton = false;
-            if (!this.selectors) {
-                return false;
+    async useSelectorsToSelectGDPRBanner(page) {
+        let clickedOnButton = false;
+        if (!this.selectors) {
+            return false;
+        }
+        await Promise.all(this.selectors?.cssSelectors.map(async (selector) => {
+            const buttonToClick = await page.$(selector);
+            if (buttonToClick) {
+                clickedOnButton = true;
+                this.debugLog('GDPR banner found and accepted');
+                await buttonToClick.click();
             }
-            yield Promise.all((_a = this.selectors) === null || _a === void 0 ? void 0 : _a.cssSelectors.map((selector) => __awaiter(this, void 0, void 0, function* () {
-                const buttonToClick = yield page.$(selector);
-                if (buttonToClick) {
-                    clickedOnButton = true;
-                    this.debugLog('GDPR banner found and accepted');
-                    yield buttonToClick.click();
-                }
-            })));
-            if (clickedOnButton) {
-                return clickedOnButton;
+        }));
+        if (clickedOnButton) {
+            return clickedOnButton;
+        }
+        clickedOnButton = await page.evaluate((xPaths) => {
+            const rootElement = document.querySelector('html');
+            if (!rootElement) {
+                return false;
             }
-            clickedOnButton = yield page.evaluate((xPaths) => {
-                const rootElement = document.querySelector('html');
-                if (!rootElement) {
+            return xPaths.some((xPath) => {
+                const _acceptButton = document
+                    .evaluate(xPath, rootElement)
+                    .iterateNext();
+                if (!_acceptButton) {
                     return false;
                 }
-                return xPaths.some((xPath) => {
-                    const _acceptButton = document
-                        .evaluate(xPath, rootElement)
-                        .iterateNext();
-                    if (!_acceptButton) {
-                        return false;
-                    }
-                    if (_acceptButton instanceof HTMLElement) {
-                        _acceptButton === null || _acceptButton === void 0 ? void 0 : _acceptButton.click();
-                        return true;
-                    }
-                    return false;
-                });
-            }, (_b = this.selectors) === null || _b === void 0 ? void 0 : _b.xPath);
-            if (clickedOnButton) {
-                return clickedOnButton;
-            }
-            clickedOnButton = yield this.clickOnGDPRUsingTextSelectors(page, (_c = this.selectors) === null || _c === void 0 ? void 0 : _c.textSelectors);
+                if (_acceptButton instanceof HTMLElement) {
+                    _acceptButton?.click();
+                    return true;
+                }
+                return false;
+            });
+        }, this.selectors?.xPath);
+        if (clickedOnButton) {
             return clickedOnButton;
-        });
+        }
+        clickedOnButton = await this.clickOnGDPRUsingTextSelectors(page, this.selectors?.textSelectors);
+        return clickedOnButton;
     }
-    openPage() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.browser) {
-                throw new Error('Browser not initialized');
-            }
-            const sitePage = yield this.browser.newPage();
-            yield sitePage.setUserAgent('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36');
-            sitePage.setViewport({
-                width: 1440,
-                height: 790,
-                deviceScaleFactor: 1,
-            });
-            this.debugLog('Page opened');
-            return sitePage;
+    async openPage() {
+        if (!this.browser) {
+            throw new Error('Browser not initialized');
+        }
+        const sitePage = await this.browser.newPage();
+        await sitePage.setUserAgent('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36');
+        sitePage.setViewport({
+            width: 1440,
+            height: 790,
+            deviceScaleFactor: 1,
         });
+        this.debugLog('Page opened');
+        return sitePage;
     }
     pushErrors(url, objectToPushed) {
         if (!this.erroredOutUrls[url]) {
@@ -238,86 +221,61 @@ class BrowserManagement {
         }
         this.erroredOutUrls[url].push(objectToPushed);
     }
-    navigateToPage(url) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const page = this.pages[url];
-            if (!page) {
-                throw new Error('No page with the provided ID was found');
-            }
-            this.debugLog(`Starting navigation to URL: ${url}`);
-            try {
-                const response = yield page.goto(url, {
-                    timeout: 10000,
+    async navigateToPage(url) {
+        const page = this.pages[url];
+        if (!page) {
+            throw new Error('No page with the provided ID was found');
+        }
+        this.debugLog(`Starting navigation to URL: ${url}`);
+        try {
+            const response = await page.goto(url, {
+                timeout: 10000,
+            });
+            const SUCCESS_RESPONSE = 200;
+            if (response && response.status() !== SUCCESS_RESPONSE) {
+                this.pushErrors(url, {
+                    errorMessage: `Invalid server response: ${response.status()}`,
+                    errorCode: `${response.status()}`,
+                    errorName: `INVALID_SERVER_RESPONSE`,
                 });
-                const SUCCESS_RESPONSE = 200;
-                if (response && response.status() !== SUCCESS_RESPONSE) {
-                    this.pushErrors(url, {
-                        errorMessage: `Invalid server response: ${response.status()}`,
-                        errorCode: `${response.status()}`,
-                        errorName: `INVALID_SERVER_RESPONSE`,
-                    });
-                    this.debugLog(`Warning: Server error found in URL: ${url}`, true);
-                    if (!this.isSiteMap) {
-                        throw new Error(`Invalid server response: ${response.status()}`);
-                    }
-                }
-                this.debugLog(`Navigation completed to URL: ${url}`);
-            }
-            catch (error) {
-                if (error instanceof Error) {
-                    this.pushErrors(url, {
-                        errorMessage: error.message,
-                        stackTrace: (_a = error === null || error === void 0 ? void 0 : error.stack) !== null && _a !== void 0 ? _a : '',
-                        errorName: error === null || error === void 0 ? void 0 : error.name,
-                    });
-                    if ((error === null || error === void 0 ? void 0 : error.name) === 'TimeoutError' || (error === null || error === void 0 ? void 0 : error.name) === 'i') {
-                        this.debugLog(`Navigation did not finish on URL ${url} in 10 seconds moving on to scrolling`);
-                    }
-                    throw error;
+                this.debugLog(`Warning: Server error found in URL: ${url}`, true);
+                if (!this.isSiteMap) {
+                    throw new Error(`Invalid server response: ${response.status()}`);
                 }
             }
-        });
-    }
-    pageScroll(url) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const page = this.pages[url];
-            if (!page) {
-                throw new Error('No page with the provided ID was found');
-            }
-            try {
-                yield page.evaluate(() => {
-                    window.scrollBy(0, 10000);
+            this.debugLog(`Navigation completed to URL: ${url}`);
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                this.pushErrors(url, {
+                    errorMessage: error.message,
+                    stackTrace: error?.stack ?? '',
+                    errorName: error?.name,
                 });
+                if (error?.name === 'TimeoutError' || error?.name === 'i') {
+                    this.debugLog(`Navigation did not finish on URL ${url} in 10 seconds moving on to scrolling`);
+                }
+                throw error;
             }
-            catch (error) {
-                this.debugLog('Scrolled to the end of page');
-                //ignore
-            }
-            this.debugLog(`Scrolling on URL: ${url}`);
-        });
+        }
     }
-    responseEventListener(pageId, response) {
-        var _a, _b, _c, _d;
-        if (((_b = (_a = response === null || response === void 0 ? void 0 : response.headers()) === null || _a === void 0 ? void 0 : _a['content-type']) === null || _b === void 0 ? void 0 : _b.includes('javascript')) ||
-            ((_d = (_c = response === null || response === void 0 ? void 0 : response.headers()) === null || _c === void 0 ? void 0 : _c['content-type']) === null || _d === void 0 ? void 0 : _d.includes('html'))) {
-            response
-                .text()
-                .then((content) => {
-                var _a, _b;
-                this.pageResourcesMaps[pageId][response.url()] = {
-                    origin: response.url(),
-                    type: ((_b = (_a = response === null || response === void 0 ? void 0 : response.headers()) === null || _a === void 0 ? void 0 : _a['content-type']) === null || _b === void 0 ? void 0 : _b.includes('javascript'))
-                        ? 'Script'
-                        : 'Document',
-                    content,
-                };
-            })
-                .catch(() => undefined);
+    async pageScroll(url) {
+        const page = this.pages[url];
+        if (!page) {
+            throw new Error('No page with the provided ID was found');
         }
+        try {
+            await page.evaluate(() => {
+                window.scrollBy(0, 10000);
+            });
+        }
+        catch (error) {
+            this.debugLog('Scrolled to the end of page');
+            //ignore
+        }
+        this.debugLog(`Scrolling on URL: ${url}`);
     }
     responseReceivedListener(pageId, { requestId, frameId, response }) {
-        var _a, _b;
         if (!this.pageResponses[pageId][requestId]) {
             this.pageResponses[pageId][requestId] = {
                 frameId,
@@ -326,7 +284,7 @@ class BrowserManagement {
             };
         }
         else {
-            const parsedCookies = (_a = this.pageResponses[pageId][requestId]) === null || _a === void 0 ? void 0 : _a.cookies.map((cookie) => {
+            const parsedCookies = this.pageResponses[pageId][requestId]?.cookies.map((cookie) => {
                 if (!cookie.url) {
                     cookie.url = response.url;
                 }
@@ -338,9 +296,8 @@ class BrowserManagement {
                 }
                 return cookie;
             });
-            (_b = this.pageResponses[pageId][requestId]) === null || _b === void 0 ? void 0 : _b.cookies.forEach((cookie) => {
-                var _a;
-                (_a = cookie.networkEvents) === null || _a === void 0 ? void 0 : _a.responseEvents.map((event) => {
+            this.pageResponses[pageId][requestId]?.cookies.forEach((cookie) => {
+                cookie.networkEvents?.responseEvents.map((event) => {
                     if (event.requestId === requestId) {
                         event.url = response.url;
                     }
@@ -355,40 +312,37 @@ class BrowserManagement {
         }
     }
     responseReceivedExtraInfoListener(pageId, { headers, cookiePartitionKey, blockedCookies, requestId, exemptedCookies, }) {
-        var _a, _b, _c, _d;
-        const headersToBeParsed = (_a = headers['set-cookie']) !== null && _a !== void 0 ? _a : headers['Set-Cookie'];
+        const headersToBeParsed = headers['set-cookie'] ?? headers['Set-Cookie'];
         if (!headersToBeParsed) {
             return;
         }
         const cookies = headersToBeParsed
             .split('\n')
             .map((headerLine) => {
-            var _a, _b;
-            const parsedCookie = (0, simple_cookie_1.parse)(headerLine);
-            const url = (_a = this.pageResponses[pageId][requestId]) === null || _a === void 0 ? void 0 : _a.url;
+            const parsedCookie = parse(headerLine);
+            const url = this.pageResponses[pageId][requestId]?.url;
             if (!parsedCookie.domain && url) {
                 parsedCookie.domain = new URL(url).hostname;
             }
             if (parsedCookie.domain && parsedCookie.domain[0] !== '.') {
                 parsedCookie.domain = '.' + parsedCookie.domain;
             }
-            const exemptedEntry = exemptedCookies === null || exemptedCookies === void 0 ? void 0 : exemptedCookies.find(({ cookie }) => {
-                return (cookie === null || cookie === void 0 ? void 0 : cookie.name) === parsedCookie.name;
+            const exemptedEntry = exemptedCookies?.find(({ cookie }) => {
+                return cookie?.name === parsedCookie.name;
             });
             const blockedEntry = blockedCookies.find((c) => {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
                 if (c.cookie) {
-                    return (((_b = (_a = c.cookie) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.trim()) === ((_c = parsedCookie.name) === null || _c === void 0 ? void 0 : _c.trim()) &&
-                        ((_d = c.cookie.domain) === null || _d === void 0 ? void 0 : _d.trim()) === ((_e = parsedCookie.domain) === null || _e === void 0 ? void 0 : _e.trim()) &&
-                        ((_f = c.cookie.path) === null || _f === void 0 ? void 0 : _f.trim()) === ((_g = parsedCookie.path) === null || _g === void 0 ? void 0 : _g.trim()));
+                    return (c.cookie?.name?.trim() === parsedCookie.name?.trim() &&
+                        c.cookie.domain?.trim() === parsedCookie.domain?.trim() &&
+                        c.cookie.path?.trim() === parsedCookie.path?.trim());
                 }
                 else {
-                    const temporaryParsedCookie = (0, simple_cookie_1.parse)(c.cookieLine);
-                    return (((_h = temporaryParsedCookie.name) === null || _h === void 0 ? void 0 : _h.trim()) ===
-                        ((_j = parsedCookie.name) === null || _j === void 0 ? void 0 : _j.trim()) &&
-                        ((_k = temporaryParsedCookie.domain) === null || _k === void 0 ? void 0 : _k.trim()) ===
-                            ((_l = parsedCookie.domain) === null || _l === void 0 ? void 0 : _l.trim()) &&
-                        ((_m = temporaryParsedCookie.path) === null || _m === void 0 ? void 0 : _m.trim()) === ((_o = parsedCookie.path) === null || _o === void 0 ? void 0 : _o.trim()));
+                    const temporaryParsedCookie = parse(c.cookieLine);
+                    return (temporaryParsedCookie.name?.trim() ===
+                        parsedCookie.name?.trim() &&
+                        temporaryParsedCookie.domain?.trim() ===
+                            parsedCookie.domain?.trim() &&
+                        temporaryParsedCookie.path?.trim() === parsedCookie.path?.trim());
                 }
             });
             const singleCookie = {
@@ -397,7 +351,7 @@ class BrowserManagement {
                     domain: parsedCookie.domain,
                     path: parsedCookie.path || '/',
                     value: parsedCookie.value,
-                    samesite: ((_b = parsedCookie.samesite) === null || _b === void 0 ? void 0 : _b.toLowerCase()) || 'lax',
+                    samesite: parsedCookie.samesite?.toLowerCase() || 'lax',
                     expires: parsedCookie.expires || 'Session',
                     httponly: parsedCookie.httponly || false,
                     secure: parsedCookie.secure || false,
@@ -406,7 +360,7 @@ class BrowserManagement {
                 networkEvents: {
                     responseEvents: [
                         {
-                            type: common_1.RESPONSE_EVENT.CDP_RESPONSE_RECEIVED_EXTRA_INFO,
+                            type: RESPONSE_EVENT.CDP_RESPONSE_RECEIVED_EXTRA_INFO,
                             requestId,
                             url,
                             blocked: Boolean(blockedEntry),
@@ -416,42 +370,45 @@ class BrowserManagement {
                     requestEvents: [],
                 },
                 isBlocked: Boolean(blockedEntry),
-                blockedReasons: blockedEntry === null || blockedEntry === void 0 ? void 0 : blockedEntry.blockedReasons,
-                exemptionReason: exemptedEntry === null || exemptedEntry === void 0 ? void 0 : exemptedEntry.exemptionReason,
+                blockedReasons: blockedEntry?.blockedReasons,
+                exemptionReason: exemptedEntry?.exemptionReason,
                 url,
                 headerType: 'response',
             };
             if (headerLine.includes('Partitioned')) {
                 singleCookie.parsedCookie.partitionKey =
-                    cookiePartitionKey === null || cookiePartitionKey === void 0 ? void 0 : cookiePartitionKey.topLevelSite;
+                    cookiePartitionKey?.topLevelSite;
             }
             return singleCookie;
         });
-        const prevCookies = ((_b = this.pageResponses[pageId][requestId]) === null || _b === void 0 ? void 0 : _b.cookies) || [];
+        const prevCookies = this.pageResponses[pageId][requestId]?.cookies || [];
         const mergedCookies = [...prevCookies, ...(cookies || [])];
         this.pageResponses[pageId][requestId] = {
-            frameId: ((_c = this.pageResponses[pageId][requestId]) === null || _c === void 0 ? void 0 : _c.frameId) || '',
-            url: ((_d = this.pageResponses[pageId][requestId]) === null || _d === void 0 ? void 0 : _d.url) || '',
+            frameId: this.pageResponses[pageId][requestId]?.frameId || '',
+            url: this.pageResponses[pageId][requestId]?.url || '',
             // @ts-ignore TODO: fix expires type mismatch
             cookies: mergedCookies,
         };
     }
     requestWillBeSentListener(pageId, { requestId, request, frameId }) {
-        this.pageRequests[pageId][requestId] = Object.assign(Object.assign({}, (this.pageRequests[pageId][requestId] || {})), { frameId, url: request.url });
+        this.pageRequests[pageId][requestId] = {
+            ...(this.pageRequests[pageId][requestId] || {}),
+            frameId,
+            url: request.url,
+        };
     }
     requestWillBeSentExtraInfoListener(pageId, { associatedCookies, requestId, }) {
         if (!associatedCookies || associatedCookies.length === 0) {
             return;
         }
         const cookies = associatedCookies.map((associatedCookie) => {
-            var _a, _b, _c, _d, _e, _f;
             const singleCookie = {
                 parsedCookie: {
                     name: associatedCookie.cookie.name,
                     domain: associatedCookie.cookie.domain,
                     path: associatedCookie.cookie.path || '/',
                     value: associatedCookie.cookie.value,
-                    samesite: ((_a = associatedCookie.cookie.sameSite) === null || _a === void 0 ? void 0 : _a.toLowerCase()) || 'lax',
+                    samesite: associatedCookie.cookie.sameSite?.toLowerCase() || 'lax',
                     expires: associatedCookie.cookie.expires || 'Session',
                     httponly: associatedCookie.cookie.httpOnly || false,
                     secure: associatedCookie.cookie.secure || false,
@@ -460,9 +417,9 @@ class BrowserManagement {
                 networkEvents: {
                     requestEvents: [
                         {
-                            type: common_1.REQUEST_EVENT.CDP_REQUEST_WILL_BE_SENT_EXTRA_INFO,
+                            type: REQUEST_EVENT.CDP_REQUEST_WILL_BE_SENT_EXTRA_INFO,
                             requestId,
-                            url: ((_b = this.pageRequests[pageId][requestId]) === null || _b === void 0 ? void 0 : _b.url) || '',
+                            url: this.pageRequests[pageId][requestId]?.url || '',
                             blocked: associatedCookie.blockedReasons.length > 0,
                             timeStamp: Date.now(),
                         },
@@ -471,17 +428,20 @@ class BrowserManagement {
                 },
                 isBlocked: associatedCookie.blockedReasons.length > 0,
                 blockedReasons: associatedCookie.blockedReasons,
-                exemptionReason: associatedCookie === null || associatedCookie === void 0 ? void 0 : associatedCookie.exemptionReason,
-                url: ((_c = this.pageRequests[pageId][requestId]) === null || _c === void 0 ? void 0 : _c.url) || '',
+                exemptionReason: associatedCookie?.exemptionReason,
+                url: this.pageRequests[pageId][requestId]?.url || '',
                 headerType: 'request',
             };
-            if ((_d = associatedCookie.cookie) === null || _d === void 0 ? void 0 : _d.partitionKey) {
+            if (associatedCookie.cookie?.partitionKey) {
                 singleCookie.parsedCookie.partitionKey =
-                    (_f = (_e = associatedCookie.cookie) === null || _e === void 0 ? void 0 : _e.partitionKey) === null || _f === void 0 ? void 0 : _f.topLevelSite;
+                    associatedCookie.cookie?.partitionKey?.topLevelSite;
             }
             return singleCookie;
         });
-        this.pageRequests[pageId][requestId] = Object.assign(Object.assign({}, (this.pageRequests[pageId][requestId] || {})), { cookies });
+        this.pageRequests[pageId][requestId] = {
+            ...(this.pageRequests[pageId][requestId] || {}),
+            cookies,
+        };
     }
     pageFrameAttachedListener(pageId, { frameId, parentFrameId }) {
         if (!this.pageFrames[pageId]) {
@@ -489,245 +449,172 @@ class BrowserManagement {
         }
         this.pageFrames[pageId][frameId] = parentFrameId;
     }
-    getMainframeIds() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const pageTargetIds = {};
-            // This gets targets for all pages.
-            const cdpSession = yield Object.values(this.pages)[0].createCDPSession();
-            const res = yield cdpSession.send('Target.getTargets');
-            for (const [_url, page] of Object.entries(this.pages)) {
-                const constructedUrl = page.url();
-                const mainFrameTargetId = (_a = res.targetInfos.find(({ url, type }) => constructedUrl === url && type === 'page')) === null || _a === void 0 ? void 0 : _a.targetId;
-                pageTargetIds[_url] = mainFrameTargetId || '';
-            }
-            return pageTargetIds;
-        });
+    async getMainframeIds() {
+        const pageTargetIds = {};
+        // This gets targets for all pages.
+        const cdpSession = await Object.values(this.pages)[0].createCDPSession();
+        const res = await cdpSession.send('Target.getTargets');
+        for (const [_url, page] of Object.entries(this.pages)) {
+            const constructedUrl = page.url();
+            const mainFrameTargetId = res.targetInfos.find(({ url, type }) => constructedUrl === url && type === 'page')?.targetId;
+            pageTargetIds[_url] = mainFrameTargetId || '';
+        }
+        return pageTargetIds;
     }
-    attachListenersToPage(pageId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const page = this.pages[pageId];
-            if (!page) {
-                throw new Error(`No page with the provided ID was found:${pageId}`);
-            }
-            this.debugLog('Attaching network event listeners to the page');
-            const cdpSession = yield page.createCDPSession();
-            yield cdpSession.send('Target.setAutoAttach', {
-                // If this is set to true, debugger will be attached to every new target that is added to the current target.
-                autoAttach: true,
-                waitForDebuggerOnStart: false,
-                //Enables "flat" access to the session via specifying sessionId attribute in the commands.
-                // If this is set to true the debugger is also attached to the child targets of that the target it has been attached to.
-                flatten: true,
-            });
-            yield cdpSession.send('Network.enable');
-            yield cdpSession.send('Page.enable');
-            this.pageRequests[pageId] = {};
-            this.pageResponses[pageId] = {};
-            this.pageResourcesMaps[pageId] = {};
-            page.on('response', (ev) => this.responseEventListener(pageId, ev));
-            cdpSession.on('Network.responseReceived', (ev) => this.responseReceivedListener(pageId, ev));
-            cdpSession.on('Network.responseReceivedExtraInfo', (ev) => this.responseReceivedExtraInfoListener(pageId, ev));
-            cdpSession.on('Network.requestWillBeSent', (ev) => this.requestWillBeSentListener(pageId, ev));
-            cdpSession.on('Network.requestWillBeSentExtraInfo', (ev) => this.requestWillBeSentExtraInfoListener(pageId, ev));
-            cdpSession.on('Page.frameAttached', (ev) => this.pageFrameAttachedListener(pageId, ev));
-            this.debugLog('Finished attaching network event listeners');
+    async attachListenersToPage(pageId) {
+        const page = this.pages[pageId];
+        if (!page) {
+            throw new Error(`No page with the provided ID was found:${pageId}`);
+        }
+        this.debugLog('Attaching network event listeners to the page');
+        const cdpSession = await page.createCDPSession();
+        await cdpSession.send('Target.setAutoAttach', {
+            // If this is set to true, debugger will be attached to every new target that is added to the current target.
+            autoAttach: true,
+            waitForDebuggerOnStart: false,
+            //Enables "flat" access to the session via specifying sessionId attribute in the commands.
+            // If this is set to true the debugger is also attached to the child targets of that the target it has been attached to.
+            flatten: true,
         });
+        await cdpSession.send('Network.enable');
+        await cdpSession.send('Page.enable');
+        this.pageRequests[pageId] = {};
+        this.pageResponses[pageId] = {};
+        cdpSession.on('Network.responseReceived', (ev) => this.responseReceivedListener(pageId, ev));
+        cdpSession.on('Network.responseReceivedExtraInfo', (ev) => this.responseReceivedExtraInfoListener(pageId, ev));
+        cdpSession.on('Network.requestWillBeSent', (ev) => this.requestWillBeSentListener(pageId, ev));
+        cdpSession.on('Network.requestWillBeSentExtraInfo', (ev) => this.requestWillBeSentExtraInfoListener(pageId, ev));
+        cdpSession.on('Page.frameAttached', (ev) => this.pageFrameAttachedListener(pageId, ev));
+        this.debugLog('Finished attaching network event listeners');
     }
-    getJSCookies(page) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const frames = page.frames();
-            const cookies = {};
-            yield Promise.all(frames.map((frame) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    if (!frame.url().includes('http')) {
-                        return;
-                    }
-                    const _JSCookies = yield (0, common_1.resolveWithTimeout)(frame.evaluate(() => {
-                        // @ts-ignore
-                        return cookieStore === null || cookieStore === void 0 ? void 0 : cookieStore.getAll();
-                    }), [], 200);
-                    const frameCookies = {};
-                    _JSCookies.forEach((cookie) => {
-                        var _a;
-                        if (!cookie.domain) {
-                            cookie.domain = new URL(frame.url()).hostname;
-                        }
-                        if (cookie.domain[0] !== '.') {
-                            cookie.domain = '.' + cookie.domain;
-                        }
-                        const key = cookie.name + ':' + cookie.domain + ':' + cookie.path;
-                        frameCookies[key] = {
-                            parsedCookie: Object.assign(Object.assign({}, cookie), { partitionKey: '', httponly: false, samesite: ((_a = cookie.sameSite) === null || _a === void 0 ? void 0 : _a.toLowerCase()) || 'lax' }),
-                        };
-                    });
-                    const frameUrl = new URL(frame.url()).origin;
-                    cookies[frameUrl] = { frameCookies };
-                }
-                catch (error) {
-                    //Fail silently
+    async getJSCookies(page) {
+        const frames = page.frames();
+        const cookies = {};
+        await Promise.all(frames.map(async (frame) => {
+            try {
+                if (!frame.url().includes('http')) {
+                    return;
                 }
-            })));
-            return cookies;
-        });
+                const _JSCookies = await resolveWithTimeout(frame.evaluate(() => {
+                    // @ts-ignore
+                    return cookieStore?.getAll();
+                }), [], 200);
+                const frameCookies = {};
+                _JSCookies.forEach((cookie) => {
+                    if (!cookie.domain) {
+                        cookie.domain = new URL(frame.url()).hostname;
+                    }
+                    if (cookie.domain[0] !== '.') {
+                        cookie.domain = '.' + cookie.domain;
+                    }
+                    const key = cookie.name + ':' + cookie.domain + ':' + cookie.path;
+                    frameCookies[key] = {
+                        parsedCookie: {
+                            ...cookie,
+                            partitionKey: '',
+                            httponly: false,
+                            samesite: cookie.sameSite?.toLowerCase() || 'lax',
+                        },
+                    };
+                });
+                const frameUrl = new URL(frame.url()).origin;
+                cookies[frameUrl] = { frameCookies };
+            }
+            catch (error) {
+                //Fail silently
+            }
+        }));
+        return cookies;
     }
+    // @todo Remove after ensuring that it is not used anywhere except library detection feature.
     getResources(urls) {
         const allFetchedResources = {};
         urls.forEach((url) => {
-            var _a;
-            const page = this.pages[url];
-            const resources = this.pageResourcesMaps[url];
-            if (!page || !resources) {
-                allFetchedResources[url] = [];
-                return;
-            }
-            const mainFrameUrl = new URL(page.url()).origin;
-            allFetchedResources[mainFrameUrl] = Array.from((_a = Object.values(resources)) !== null && _a !== void 0 ? _a : []);
+            allFetchedResources[url] = [];
+            return;
         });
         return allFetchedResources;
     }
-    insertAndRunDOMQueryFunctions(url, Libraries) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            try {
-                const page = this.pages[url];
-                if (!page) {
-                    throw new Error('No page with the provided ID was found');
-                }
-                const domQueryMatches = {};
-                yield Promise.all(Libraries.map((_a) => __awaiter(this, [_a], void 0, function* ({ domQueryFunction, name }) {
-                    if (domQueryFunction && name) {
-                        yield page.addScriptTag({
-                            content: `window.${name.replaceAll('-', '')} = ${domQueryFunction}`,
-                        });
-                        const queryResult = yield page.evaluate((library) => {
-                            //@ts-ignore
-                            const functionDOMQuery = window[`${library}`];
-                            if (!functionDOMQuery) {
-                                return [];
-                            }
-                            return functionDOMQuery();
-                        }, name.replaceAll('-', ''));
-                        domQueryMatches[name] = {
-                            domQuerymatches: queryResult,
-                        };
-                    }
-                })));
-                const mainFrameUrl = new URL(page.url()).origin;
-                return { [mainFrameUrl]: domQueryMatches };
-            }
-            catch (error) {
-                if (error instanceof Error) {
-                    this.pushErrors(url, {
-                        errorMessage: error.message,
-                        stackTrace: (_a = error === null || error === void 0 ? void 0 : error.stack) !== null && _a !== void 0 ? _a : '',
-                        errorName: error === null || error === void 0 ? void 0 : error.name,
-                    });
-                    throw error;
-                }
-                return {};
+    async analyzeCookies(userProvidedUrls, shouldSkipAcceptBanner) {
+        // Open tabs and attach network listeners
+        await Promise.all(userProvidedUrls.map(async (url) => {
+            const sitePage = await this.openPage();
+            this.pages[url] = sitePage;
+            await this.attachListenersToPage(url);
+        }));
+        // Navigate to URLs
+        // eslint-disable-next-line no-useless-catch -- Because we are rethrowing the same error no need to create a new Error instance
+        try {
+            await Promise.all(userProvidedUrls.map(async (url) => {
+                await this.navigateToPage(url);
+            }));
+        }
+        catch (error) {
+            if (!this.isSiteMap) {
+                throw error;
             }
-        });
-    }
-    analyzeCookies(userProvidedUrls, shouldSkipAcceptBanner, Libraries) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let consolidatedDOMQueryMatches = {};
-            // Open tabs and attach network listeners
-            yield Promise.all(userProvidedUrls.map((url) => __awaiter(this, void 0, void 0, function* () {
-                const sitePage = yield this.openPage();
-                this.pages[url] = sitePage;
-                yield this.attachListenersToPage(url);
-            })));
-            // Navigate to URLs
-            // eslint-disable-next-line no-useless-catch -- Because we are rethrowing the same error no need to create a new Error instance
+        }
+        // Delay for page to load resources
+        await delay(this.pageWaitTime / 2);
+        // Accept Banners
+        if (!shouldSkipAcceptBanner) {
+            // delay
             try {
-                yield Promise.all(userProvidedUrls.map((url) => __awaiter(this, void 0, void 0, function* () {
-                    yield this.navigateToPage(url);
-                })));
+                await Promise.all(userProvidedUrls.map(async (url) => {
+                    await this.clickOnAcceptBanner(url);
+                }));
             }
             catch (error) {
                 if (!this.isSiteMap) {
                     throw error;
                 }
             }
-            // Delay for page to load resources
-            yield (0, common_1.delay)(this.pageWaitTime / 2);
-            // Accept Banners
-            if (!shouldSkipAcceptBanner) {
-                // delay
-                try {
-                    yield Promise.all(userProvidedUrls.map((url) => __awaiter(this, void 0, void 0, function* () {
-                        yield this.clickOnAcceptBanner(url);
-                    })));
-                }
-                catch (error) {
-                    if (!this.isSiteMap) {
-                        throw error;
-                    }
-                }
-            }
-            // Scroll to bottom of the page
-            yield Promise.all(userProvidedUrls.map((url) => __awaiter(this, void 0, void 0, function* () {
-                yield this.pageScroll(url);
-            })));
-            try {
-                yield Promise.all(userProvidedUrls.map((url) => __awaiter(this, void 0, void 0, function* () {
-                    const newMatches = yield this.insertAndRunDOMQueryFunctions(url, Libraries);
-                    consolidatedDOMQueryMatches = Object.assign(Object.assign({}, consolidatedDOMQueryMatches), newMatches);
-                })));
+        }
+        // Scroll to bottom of the page
+        await Promise.all(userProvidedUrls.map(async (url) => {
+            await this.pageScroll(url);
+        }));
+        // Delay for page to load more resources
+        await delay(this.pageWaitTime / 2);
+        const mainFrameUrlIdMap = await this.getMainframeIds();
+        Object.entries(mainFrameUrlIdMap).forEach(([_url, id]) => {
+            if (!this.pageFrames[_url]) {
+                this.pageFrames[_url] = {
+                    [id]: '0',
+                };
             }
-            catch (error) {
-                if (!this.isSiteMap) {
-                    throw error;
-                }
+            else {
+                this.pageFrames[_url][id] = '0';
             }
-            // Delay for page to load more resources
-            yield (0, common_1.delay)(this.pageWaitTime / 2);
-            const mainFrameUrlIdMap = yield this.getMainframeIds();
-            Object.entries(mainFrameUrlIdMap).forEach(([_url, id]) => {
-                if (!this.pageFrames[_url]) {
-                    this.pageFrames[_url] = {
-                        [id]: '0',
-                    };
-                }
-                else {
-                    this.pageFrames[_url][id] = '0';
-                }
-            });
-            const result = yield Promise.all(userProvidedUrls.map((userProvidedUrl) => __awaiter(this, void 0, void 0, function* () {
-                const _responses = this.pageResponses[userProvidedUrl];
-                const _requests = this.pageRequests[userProvidedUrl];
-                const _page = this.pages[userProvidedUrl];
-                const _pageFrames = this.pageFrames[userProvidedUrl];
-                if (!_responses || !_requests || !_page) {
-                    return {
-                        url: userProvidedUrl,
-                        cookieData: {},
-                    };
-                }
-                const cookieDataFromNetwork = yield (0, parseNetworkDataToCookieData_1.parseNetworkDataToCookieData)(_responses, _requests, _page, _pageFrames);
-                const cookieDataFromJS = yield this.getJSCookies(_page);
-                const mainFrameUrl = new URL(_page.url()).origin;
-                const collatedCookieData = (0, collateCookieData_1.default)(cookieDataFromNetwork, cookieDataFromJS);
+        });
+        const result = await Promise.all(userProvidedUrls.map(async (userProvidedUrl) => {
+            const _responses = this.pageResponses[userProvidedUrl];
+            const _requests = this.pageRequests[userProvidedUrl];
+            const _page = this.pages[userProvidedUrl];
+            const _pageFrames = this.pageFrames[userProvidedUrl];
+            if (!_responses || !_requests || !_page) {
                 return {
-                    // Page may redirect. page.url() gives the redirected URL
-                    url: mainFrameUrl,
-                    cookieData: collatedCookieData,
+                    url: userProvidedUrl,
+                    cookieData: {},
                 };
-            })));
+            }
+            const cookieDataFromNetwork = await parseNetworkDataToCookieData(_responses, _requests, _page, _pageFrames);
+            const cookieDataFromJS = await this.getJSCookies(_page);
+            const mainFrameUrl = new URL(_page.url()).origin;
+            const collatedCookieData = collateCookieData(cookieDataFromNetwork, cookieDataFromJS);
             return {
-                result,
-                consolidatedDOMQueryMatches,
-                erroredOutUrls: this.erroredOutUrls,
+                // Page may redirect. page.url() gives the redirected URL
+                url: mainFrameUrl,
+                cookieData: collatedCookieData,
             };
-        });
+        }));
+        return {
+            result,
+            erroredOutUrls: this.erroredOutUrls,
+        };
     }
-    deinitialize() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            yield ((_a = this.browser) === null || _a === void 0 ? void 0 : _a.close());
-        });
+    async deinitialize() {
+        await this.browser?.close();
     }
 }
-exports.BrowserManagement = BrowserManagement;
 //# sourceMappingURL=index.js.map