automation_model 1.0.446-dev → 1.0.446

package/lib/stable_browser.js

@@ -2,34 +2,47 @@
 import { expect } from "@playwright/test";
 import dayjs from "dayjs";
 import fs from "fs";
+import { Jimp } from "jimp";
 import path from "path";
 import reg_parser from "regex-parser";
-import sharp from "sharp";
 import { findDateAlternatives, findNumberAlternatives } from "./analyze_helper.js";
 import { getDateTimeValue } from "./date_time.js";
 import drawRectangle from "./drawRect.js";
 //import { closeUnexpectedPopups } from "./popups.js";
 import { getTableCells, getTableData } from "./table_analyze.js";
-import objectPath from "object-path";
-import { decrypt } from "./utils.js";
+import { _convertToRegexQuery, _copyContext, _fixLocatorUsingParams, _fixUsingParams, _getServerUrl, extractStepExampleParameters, KEYBOARD_EVENTS, maskValue, replaceWithLocalTestData, scrollPageToLoadLazyElements, unEscapeString, _getDataFile, testForRegex, performAction, } from "./utils.js";
 import csv from "csv-parser";
 import { Readable } from "node:stream";
 import readline from "readline";
-import { getContext } from "./init_browser.js";
-const Types = {
+import { getContext, refreshBrowser } from "./init_browser.js";
+import { getTestData } from "./auto_page.js";
+import { locate_element } from "./locate_element.js";
+import { randomUUID } from "crypto";
+import { _commandError, _commandFinally, _preCommand, _validateSelectors, _screenshot, _reportToWorld, } from "./command_common.js";
+import { registerDownloadEvent, registerNetworkEvents } from "./network.js";
+import { LocatorLog } from "./locator_log.js";
+import axios from "axios";
+import { _findCellArea, findElementsInArea } from "./table_helper.js";
+import { highlightSnapshot, snapshotValidation } from "./snapshot_validation.js";
+import { loadBrunoParams } from "./bruno.js";
+export const Types = {
     CLICK: "click_element",
-    NAVIGATE: "navigate",
+    WAIT_ELEMENT: "wait_element",
+    NAVIGATE: "navigate", ///
     FILL: "fill_element",
-    EXECUTE: "execute_page_method",
-    OPEN: "open_environment",
+    EXECUTE: "execute_page_method", //
+    OPEN: "open_environment", //
     COMPLETE: "step_complete",
     ASK: "information_needed",
-    GET_PAGE_STATUS: "get_page_status",
-    CLICK_ROW_ACTION: "click_row_action",
+    GET_PAGE_STATUS: "get_page_status", ///
+    CLICK_ROW_ACTION: "click_row_action", //
     VERIFY_ELEMENT_CONTAINS_TEXT: "verify_element_contains_text",
+    VERIFY_PAGE_CONTAINS_TEXT: "verify_page_contains_text",
+    VERIFY_PAGE_CONTAINS_NO_TEXT: "verify_page_contains_no_text",
     ANALYZE_TABLE: "analyze_table",
-    SELECT: "select_combobox",
+    SELECT: "select_combobox", //
     VERIFY_PAGE_PATH: "verify_page_path",
+    VERIFY_PAGE_TITLE: "verify_page_title",
     TYPE_PRESS: "type_press",
     PRESS: "press_key",
     HOVER: "hover_element",
@@ -37,23 +50,49 @@ const Types = {
     UNCHECK: "uncheck_element",
     EXTRACT: "extract_attribute",
     CLOSE_PAGE: "close_page",
+    TABLE_OPERATION: "table_operation",
     SET_DATE_TIME: "set_date_time",
     SET_VIEWPORT: "set_viewport",
     VERIFY_VISUAL: "verify_visual",
     LOAD_DATA: "load_data",
     SET_INPUT: "set_input",
+    WAIT_FOR_TEXT_TO_DISAPPEAR: "wait_for_text_to_disappear",
+    VERIFY_ATTRIBUTE: "verify_element_attribute",
+    VERIFY_TEXT_WITH_RELATION: "verify_text_with_relation",
+    BRUNO: "bruno",
+    VERIFY_FILE_EXISTS: "verify_file_exists",
+    SET_INPUT_FILES: "set_input_files",
+    SNAPSHOT_VALIDATION: "snapshot_validation",
+    REPORT_COMMAND: "report_command",
+    STEP_COMPLETE: "step_complete",
+    SLEEP: "sleep",
 };
 export const apps = {};
+const formatElementName = (elementName) => {
+    return elementName ? JSON.stringify(elementName) : "element";
+};
 class StableBrowser {
-    constructor(browser, page, logger = null, context = null) {
+    browser;
+    page;
+    logger;
+    context;
+    world;
+    fastMode;
+    project_path = null;
+    webLogFile = null;
+    networkLogger = null;
+    configuration = null;
+    appName = "main";
+    tags = null;
+    isRecording = false;
+    initSnapshotTaken = false;
+    constructor(browser, page, logger = null, context = null, world = null, fastMode = false) {
         this.browser = browser;
         this.page = page;
         this.logger = logger;
         this.context = context;
-        this.project_path = null;
-        this.webLogFile = null;
-        this.configuration = null;
-        this.appName = "main";
+        this.world = world;
+        this.fastMode = fastMode;
         if (!this.logger) {
             this.logger = console;
         }
@@ -81,17 +120,52 @@ class StableBrowser {
         context.pageLoading = { status: false };
         context.pages = [this.page];
         const logFolder = path.join(this.project_path, "logs", "web");
-        this.webLogFile = this.getWebLogFile(logFolder);
-        this.registerEventListeners(context);
+        this.world = world;
+        if (this.configuration && this.configuration.fastMode === true) {
+            this.fastMode = true;
+        }
+        if (process.env.FAST_MODE === "true") {
+            this.fastMode = true;
+        }
+        if (process.env.FAST_MODE === "false") {
+            this.fastMode = false;
+        }
+        if (this.context) {
+            this.context.fastMode = this.fastMode;
+        }
+        this.registerEventListeners(this.context);
+        registerNetworkEvents(this.world, this, this.context, this.page);
+        registerDownloadEvent(this.page, this.world, this.context);
     }
     registerEventListeners(context) {
-        this.registerConsoleLogListener(this.page, context, this.webLogFile);
-        this.registerRequestListener();
+        this.registerConsoleLogListener(this.page, context);
+        // this.registerRequestListener(this.page, context, this.webLogFile);
+        if (!context.pageLoading) {
+            context.pageLoading = { status: false };
+        }
+        if (this.configuration && this.configuration.acceptDialog && this.page) {
+            this.page.on("dialog", (dialog) => dialog.accept());
+        }
         context.playContext.on("page", async function (page) {
+            if (this.configuration && this.configuration.closePopups === true) {
+                console.log("close unexpected popups");
+                await page.close();
+                return;
+            }
             context.pageLoading.status = true;
             this.page = page;
+            try {
+                if (this.configuration && this.configuration.acceptDialog) {
+                    await page.on("dialog", (dialog) => dialog.accept());
+                }
+            }
+            catch (error) {
+                console.error("Error on dialog accept registration", error);
+            }
             context.page = page;
             context.pages.push(page);
+            registerNetworkEvents(this.world, this, context, this.page);
+            registerDownloadEvent(this.page, this.world, context);
             page.on("close", async () => {
                 if (this.context && this.context.pages && this.context.pages.length > 1) {
                     this.context.pages.pop();
@@ -123,7 +197,7 @@ class StableBrowser {
         }
         let newContextCreated = false;
         if (!apps[appName]) {
-            let newContext = await getContext(null, false, this.logger, appName, false, this);
+            let newContext = await getContext(null, this.context.headless ? this.context.headless : false, this, this.logger, appName, false, this, -1, this.context.reportFolder);
             newContextCreated = true;
             apps[appName] = {
                 context: newContext,
@@ -132,132 +206,151 @@ class StableBrowser {
             };
         }
         const tempContext = {};
-        this._copyContext(this, tempContext);
-        this._copyContext(apps[appName], this);
+        _copyContext(this, tempContext);
+        _copyContext(apps[appName], this);
         apps[this.appName] = tempContext;
         this.appName = appName;
         if (newContextCreated) {
             this.registerEventListeners(this.context);
             await this.goto(this.context.environment.baseUrl);
-            await this.waitForPageLoad();
+            if (!this.fastMode) {
+                await this.waitForPageLoad();
+            }
         }
     }
-    _copyContext(from, to) {
-        to.browser = from.browser;
-        to.page = from.page;
-        to.context = from.context;
-    }
-    getWebLogFile(logFolder) {
-        if (!fs.existsSync(logFolder)) {
-            fs.mkdirSync(logFolder, { recursive: true });
+    async switchTab(tabTitleOrIndex) {
+        // first check if the tabNameOrIndex is a number
+        let index = parseInt(tabTitleOrIndex);
+        if (!isNaN(index)) {
+            if (index >= 0 && index < this.context.pages.length) {
+                this.page = this.context.pages[index];
+                this.context.page = this.page;
+                await this.page.bringToFront();
+                return;
+            }
         }
-        let nextIndex = 1;
-        while (fs.existsSync(path.join(logFolder, nextIndex.toString() + ".json"))) {
-            nextIndex++;
+        // if the tabNameOrIndex is a string, find the tab by name
+        for (let i = 0; i < this.context.pages.length; i++) {
+            let page = this.context.pages[i];
+            let title = await page.title();
+            if (title.includes(tabTitleOrIndex)) {
+                this.page = page;
+                this.context.page = this.page;
+                await this.page.bringToFront();
+                return;
+            }
         }
-        const fileName = nextIndex + ".json";
-        return path.join(logFolder, fileName);
+        throw new Error("Tab not found: " + tabTitleOrIndex);
     }
-    registerConsoleLogListener(page, context, logFile) {
+    registerConsoleLogListener(page, context) {
         if (!this.context.webLogger) {
             this.context.webLogger = [];
         }
         page.on("console", async (msg) => {
-            this.context.webLogger.push({
+            const obj = {
                 type: msg.type(),
                 text: msg.text(),
                 location: msg.location(),
                 time: new Date().toISOString(),
-            });
-            await fs.promises.writeFile(logFile, JSON.stringify(this.context.webLogger, null, 2));
+            };
+            this.context.webLogger.push(obj);
+            if (msg.type() === "error") {
+                this.world?.attach(JSON.stringify(obj), { mediaType: "application/json+log" });
+            }
         });
     }
-    registerRequestListener() {
-        this.page.on("request", async (data) => {
+    registerRequestListener(page, context, logFile) {
+        if (!this.context.networkLogger) {
+            this.context.networkLogger = [];
+        }
+        page.on("request", async (data) => {
+            const startTime = new Date().getTime();
             try {
-                const pageUrl = new URL(this.page.url());
+                const pageUrl = new URL(page.url());
                 const requestUrl = new URL(data.url());
                 if (pageUrl.hostname === requestUrl.hostname) {
                     const method = data.method();
-                    if (method === "POST" || method === "GET" || method === "PUT" || method === "DELETE" || method === "PATCH") {
+                    if (["POST", "GET", "PUT", "DELETE", "PATCH"].includes(method)) {
                         const token = await data.headerValue("Authorization");
                         if (token) {
-                            this.context.authtoken = token;
+                            context.authtoken = token;
                         }
                     }
                 }
+                const response = await data.response();
+                const endTime = new Date().getTime();
+                const obj = {
+                    url: data.url(),
+                    method: data.method(),
+                    postData: data.postData(),
+                    error: data.failure() ? data.failure().errorText : null,
+                    duration: endTime - startTime,
+                    startTime,
+                };
+                context.networkLogger.push(obj);
+                this.world?.attach(JSON.stringify(obj), { mediaType: "application/json+network" });
             }
             catch (error) {
-                console.error("Error in request listener", error);
+                // console.error("Error in request listener", error);
+                context.networkLogger.push({
+                    error: "not able to listen",
+                    message: error.message,
+                    stack: error.stack,
+                    time: new Date().toISOString(),
+                });
+                // await fs.promises.writeFile(logFile, JSON.stringify(context.networkLogger, null, 2));
             }
         });
     }
     // async closeUnexpectedPopups() {
     //   await closeUnexpectedPopups(this.page);
     // }
-    async goto(url) {
+    async goto(url, world = null) {
+        if (!url) {
+            throw new Error("url is null, verify that the environment file is correct");
+        }
+        url = await this._replaceWithLocalData(url, this.world);
         if (!url.startsWith("http")) {
             url = "https://" + url;
         }
-        await this.page.goto(url, {
-            timeout: 60000,
-        });
-    }
-    _validateSelectors(selectors) {
-        if (!selectors) {
-            throw new Error("selectors is null");
-        }
-        if (!selectors.locators) {
-            throw new Error("selectors.locators is null");
-        }
-        if (!Array.isArray(selectors.locators)) {
-            throw new Error("selectors.locators expected to be array");
-        }
-        if (selectors.locators.length === 0) {
-            throw new Error("selectors.locators expected to be non empty array");
-        }
-    }
-    _fixUsingParams(text, _params) {
-        if (!_params || typeof text !== "string") {
-            return text;
+        const state = {
+            value: url,
+            world: world,
+            type: Types.NAVIGATE,
+            text: `Navigate Page to: ${url}`,
+            operation: "goto",
+            log: "***** navigate page to " + url + " *****\n",
+            info: {},
+            locate: false,
+            scroll: false,
+            screenshot: false,
+            highlight: false,
+        };
+        try {
+            await _preCommand(state, this);
+            await this.page.goto(url, {
+                timeout: 60000,
+            });
+            await _screenshot(state, this);
         }
-        for (let key in _params) {
-            let regValue = key;
-            if (key.startsWith("_")) {
-                // remove the _ prefix
-                regValue = key.substring(1);
-            }
-            text = text.replaceAll(new RegExp("{" + regValue + "}", "g"), _params[key]);
+        catch (error) {
+            console.error("Error on goto", error);
+            _commandError(state, error, this);
         }
-        return text;
-    }
-    _fixLocatorUsingParams(locator, _params) {
-        // check if not null
-        if (!locator) {
-            return locator;
+        finally {
+            await _commandFinally(state, this);
         }
-        // clone the locator
-        locator = JSON.parse(JSON.stringify(locator));
-        this.scanAndManipulate(locator, _params);
-        return locator;
     }
-    _isObject(value) {
-        return value && typeof value === "object" && value.constructor === Object;
-    }
-    scanAndManipulate(currentObj, _params) {
-        for (const key in currentObj) {
-            if (typeof currentObj[key] === "string") {
-                // Perform string manipulation
-                currentObj[key] = this._fixUsingParams(currentObj[key], _params);
-            }
-            else if (this._isObject(currentObj[key])) {
-                // Recursively scan nested objects
-                this.scanAndManipulate(currentObj[key], _params);
+    async _getLocator(locator, scope, _params) {
+        locator = _fixLocatorUsingParams(locator, _params);
+        // locator = await this._replaceWithLocalData(locator);
+        for (let key in locator) {
+            if (typeof locator[key] !== "string")
+                continue;
+            if (locator[key].includes("{{") && locator[key].includes("}}")) {
+                locator[key] = await this._replaceWithLocalData(locator[key], this.world);
             }
         }
-    }
-    _getLocator(locator, scope, _params) {
-        locator = this._fixLocatorUsingParams(locator, _params);
         let locatorReturn;
         if (locator.role) {
             if (locator.role[1].nameReg) {
@@ -265,7 +358,7 @@ class StableBrowser {
                 delete locator.role[1].nameReg;
             }
             // if (locator.role[1].name) {
-            //   locator.role[1].name = this._fixUsingParams(locator.role[1].name, _params);
+            //   locator.role[1].name = _fixUsingParams(locator.role[1].name, _params);
             // }
             locatorReturn = scope.getByRole(locator.role[0], locator.role[1]);
         }
@@ -284,7 +377,7 @@ class StableBrowser {
                 locatorReturn = scope.getByRole(role, { name }, { exact: flags === "i" });
             }
         }
-        if (locator === null || locator === void 0 ? void 0 : locator.engine) {
+        if (locator?.engine) {
             if (locator.engine === "css") {
                 locatorReturn = scope.locator(locator.selector);
             }
@@ -305,192 +398,181 @@ class StableBrowser {
         return locatorReturn;
     }
     async _locateElmentByTextClimbCss(scope, text, climb, css, _params) {
-        let result = await this._locateElementByText(scope, this._fixUsingParams(text, _params), "*", false, true, _params);
+        if (css && css.locator) {
+            css = css.locator;
+        }
+        let result = await this._locateElementByText(scope, _fixUsingParams(text, _params), "*:not(script, style, head)", false, false, true, _params);
         if (result.elementCount === 0) {
             return;
         }
-        let textElementCss = "[data-blinq-id='blinq-id-" + result.randomToken + "']";
+        let textElementCss = "[data-blinq-id-" + result.randomToken + "]";
         // css climb to parent element
         const climbArray = [];
         for (let i = 0; i < climb; i++) {
             climbArray.push("..");
         }
         let climbXpath = "xpath=" + climbArray.join("/");
-        return textElementCss + " >> " + climbXpath + " >> " + css;
-    }
-    async _locateElementByText(scope, text1, tag1, regex1 = false, partial1, _params) {
-        //const stringifyText = JSON.stringify(text);
-        return await scope.evaluate(([text, tag, regex, partial]) => {
-            function isParent(parent, child) {
-                let currentNode = child.parentNode;
-                while (currentNode !== null) {
-                    if (currentNode === parent) {
-                        return true;
-                    }
-                    currentNode = currentNode.parentNode;
-                }
-                return false;
-            }
-            document.isParent = isParent;
-            function collectAllShadowDomElements(element, result = []) {
-                // Check and add the element if it has a shadow root
-                if (element.shadowRoot) {
-                    result.push(element);
-                    // Also search within the shadow root
-                    document.collectAllShadowDomElements(element.shadowRoot, result);
-                }
-                // Iterate over child nodes
-                element.childNodes.forEach((child) => {
-                    // Recursively call the function for each child node
-                    document.collectAllShadowDomElements(child, result);
-                });
-                return result;
-            }
-            document.collectAllShadowDomElements = collectAllShadowDomElements;
-            if (!tag) {
-                tag = "*";
-            }
-            let elements = Array.from(document.querySelectorAll(tag));
-            let shadowHosts = [];
-            document.collectAllShadowDomElements(document, shadowHosts);
-            for (let i = 0; i < shadowHosts.length; i++) {
-                let shadowElement = shadowHosts[i].shadowRoot;
-                if (!shadowElement) {
-                    console.log("shadowElement is null, for host " + shadowHosts[i]);
-                    continue;
-                }
-                let shadowElements = Array.from(shadowElement.querySelectorAll(tag));
-                elements = elements.concat(shadowElements);
-            }
-            let randomToken = null;
-            const foundElements = [];
-            if (regex) {
-                let regexpSearch = new RegExp(text, "im");
-                for (let i = 0; i < elements.length; i++) {
-                    const element = elements[i];
-                    if ((element.innerText && regexpSearch.test(element.innerText)) ||
-                        (element.value && regexpSearch.test(element.value))) {
-                        foundElements.push(element);
-                    }
-                }
-            }
-            else {
-                text = text.trim();
-                for (let i = 0; i < elements.length; i++) {
-                    const element = elements[i];
-                    if (partial) {
-                        if ((element.innerText && element.innerText.trim().includes(text)) ||
-                            (element.value && element.value.includes(text))) {
-                            foundElements.push(element);
-                        }
-                    }
-                    else {
-                        if ((element.innerText && element.innerText.trim() === text) ||
-                            (element.value && element.value === text)) {
-                            foundElements.push(element);
-                        }
-                    }
-                }
-            }
-            let noChildElements = [];
-            for (let i = 0; i < foundElements.length; i++) {
-                let element = foundElements[i];
-                let hasChild = false;
-                for (let j = 0; j < foundElements.length; j++) {
-                    if (i === j) {
-                        continue;
-                    }
-                    if (isParent(element, foundElements[j])) {
-                        hasChild = true;
-                        break;
-                    }
-                }
-                if (!hasChild) {
-                    noChildElements.push(element);
-                }
-            }
-            let elementCount = 0;
-            if (noChildElements.length > 0) {
-                for (let i = 0; i < noChildElements.length; i++) {
-                    if (randomToken === null) {
-                        randomToken = Math.random().toString(36).substring(7);
-                    }
-                    let element = noChildElements[i];
-                    element.setAttribute("data-blinq-id", "blinq-id-" + randomToken);
-                    elementCount++;
-                }
+        let resultCss = textElementCss + " >> " + climbXpath;
+        if (css) {
+            resultCss = resultCss + " >> " + css;
+        }
+        return resultCss;
+    }
+    async _locateElementByText(scope, text1, tag1, regex1 = false, partial1, ignoreCase = true, _params) {
+        const query = `${_convertToRegexQuery(text1, regex1, !partial1, ignoreCase)}`;
+        const locator = scope.locator(query);
+        const count = await locator.count();
+        if (!tag1) {
+            tag1 = "*";
+        }
+        const randomToken = Math.random().toString(36).substring(7);
+        let tagCount = 0;
+        for (let i = 0; i < count; i++) {
+            const element = locator.nth(i);
+            // check if the tag matches
+            if (!(await element.evaluate((el, [tag, randomToken]) => {
+                if (!tag.startsWith("*")) {
+                    if (el.tagName.toLowerCase() !== tag) {
+                        return false;
+                    }
+                }
+                if (!el.setAttribute) {
+                    el = el.parentElement;
+                }
+                // remove any attributes start with data-blinq-id
+                // for (let i = 0; i < el.attributes.length; i++) {
+                //   if (el.attributes[i].name.startsWith("data-blinq-id")) {
+                //     el.removeAttribute(el.attributes[i].name);
+                //   }
+                // }
+                el.setAttribute("data-blinq-id-" + randomToken, "");
+                return true;
+            }, [tag1, randomToken]))) {
+                continue;
             }
-            return { elementCount: elementCount, randomToken: randomToken };
-        }, [text1, tag1, regex1, partial1]);
+            tagCount++;
+        }
+        return { elementCount: tagCount, randomToken };
     }
-    async _collectLocatorInformation(selectorHierarchy, index = 0, scope, foundLocators, _params, info, visibleOnly = true) {
+    async _collectLocatorInformation(selectorHierarchy, index = 0, scope, foundLocators, _params, info, visibleOnly = true, allowDisabled = false, element_name = null, logErrors = false) {
+        if (!info) {
+            info = {};
+        }
+        if (!info.failCause) {
+            info.failCause = {};
+        }
+        if (!info.log) {
+            info.log = "";
+            info.locatorLog = new LocatorLog(selectorHierarchy);
+        }
         let locatorSearch = selectorHierarchy[index];
+        let originalLocatorSearch = "";
+        try {
+            originalLocatorSearch = _fixUsingParams(JSON.stringify(locatorSearch), _params);
+            locatorSearch = JSON.parse(originalLocatorSearch);
+        }
+        catch (e) {
+            console.error(e);
+        }
         //info.log += "searching for locator " + JSON.stringify(locatorSearch) + "\n";
         let locator = null;
         if (locatorSearch.climb && locatorSearch.climb >= 0) {
-            let locatorString = await this._locateElmentByTextClimbCss(scope, locatorSearch.text, locatorSearch.climb, locatorSearch.css, _params);
+            const replacedText = await this._replaceWithLocalData(locatorSearch.text, this.world);
+            let locatorString = await this._locateElmentByTextClimbCss(scope, replacedText, locatorSearch.climb, locatorSearch.css, _params);
             if (!locatorString) {
+                info.failCause.textNotFound = true;
+                info.failCause.lastError = `failed to locate ${formatElementName(element_name)} by text: ${locatorSearch.text}`;
                 return;
             }
-            locator = this._getLocator({ css: locatorString }, scope, _params);
+            locator = await this._getLocator({ css: locatorString }, scope, _params);
         }
         else if (locatorSearch.text) {
-            let result = await this._locateElementByText(scope, this._fixUsingParams(locatorSearch.text, _params), locatorSearch.tag, false, locatorSearch.partial === true, _params);
+            let text = _fixUsingParams(locatorSearch.text, _params);
+            let result = await this._locateElementByText(scope, text, locatorSearch.tag, false, locatorSearch.partial === true, true, _params);
             if (result.elementCount === 0) {
+                info.failCause.textNotFound = true;
+                info.failCause.lastError = `failed to locate ${formatElementName(element_name)} by text: ${text}`;
                 return;
             }
-            locatorSearch.css = "[data-blinq-id='blinq-id-" + result.randomToken + "']";
+            locatorSearch.css = "[data-blinq-id-" + result.randomToken + "]";
             if (locatorSearch.childCss) {
                 locatorSearch.css = locatorSearch.css + " " + locatorSearch.childCss;
             }
-            locator = this._getLocator(locatorSearch, scope, _params);
+            locator = await this._getLocator(locatorSearch, scope, _params);
         }
         else {
-            locator = this._getLocator(locatorSearch, scope, _params);
+            locator = await this._getLocator(locatorSearch, scope, _params);
         }
         // let cssHref = false;
         // if (locatorSearch.css && locatorSearch.css.includes("href=")) {
         //   cssHref = true;
         // }
         let count = await locator.count();
+        if (count > 0 && !info.failCause.count) {
+            info.failCause.count = count;
+        }
         //info.log += "total elements found " + count + "\n";
         //let visibleCount = 0;
         let visibleLocator = null;
-        if (locatorSearch.index && locatorSearch.index < count) {
+        if (typeof locatorSearch.index === "number" && locatorSearch.index < count) {
             foundLocators.push(locator.nth(locatorSearch.index));
+            if (info.locatorLog) {
+                info.locatorLog.setLocatorSearchStatus(originalLocatorSearch, "FOUND");
+            }
             return;
         }
+        if (info.locatorLog && count === 0 && logErrors) {
+            info.locatorLog.setLocatorSearchStatus(originalLocatorSearch, "NOT_FOUND");
+        }
         for (let j = 0; j < count; j++) {
             let visible = await locator.nth(j).isVisible();
             const enabled = await locator.nth(j).isEnabled();
             if (!visibleOnly) {
                 visible = true;
             }
-            if (visible && enabled) {
+            if (visible && (allowDisabled || enabled)) {
                 foundLocators.push(locator.nth(j));
+                if (info.locatorLog) {
+                    info.locatorLog.setLocatorSearchStatus(originalLocatorSearch, "FOUND");
+                }
             }
-            else {
+            else if (logErrors) {
+                info.failCause.visible = visible;
+                info.failCause.enabled = enabled;
                 if (!info.printMessages) {
                     info.printMessages = {};
                 }
+                if (info.locatorLog && !visible) {
+                    info.failCause.lastError = `${formatElementName(element_name)} is not visible, searching for ${originalLocatorSearch}`;
+                    info.locatorLog.setLocatorSearchStatus(originalLocatorSearch, "FOUND_NOT_VISIBLE");
+                }
+                if (info.locatorLog && !enabled) {
+                    info.failCause.lastError = `${formatElementName(element_name)} is disabled, searching for ${originalLocatorSearch}`;
+                    info.locatorLog.setLocatorSearchStatus(originalLocatorSearch, "FOUND_NOT_ENABLED");
+                }
                 if (!info.printMessages[j.toString()]) {
-                    info.log += "element " + locator + " visible " + visible + " enabled " + enabled + "\n";
+                    //info.log += "element " + locator + " visible " + visible + " enabled " + enabled + "\n";
                     info.printMessages[j.toString()] = true;
                 }
             }
         }
     }
     async closeUnexpectedPopups(info, _params) {
+        if (!info) {
+            info = {};
+            info.failCause = {};
+            info.log = "";
+        }
         if (this.configuration.popupHandlers && this.configuration.popupHandlers.length > 0) {
             if (!info) {
                 info = {};
             }
-            info.log += "scan for popup handlers" + "\n";
+            //info.log += "scan for popup handlers" + "\n";
             const handlerGroup = [];
             for (let i = 0; i < this.configuration.popupHandlers.length; i++) {
                 handlerGroup.push(this.configuration.popupHandlers[i].locator);
             }
-            const scopes = [this.page, ...this.page.frames()];
+            const scopes = this.page.frames().filter((frame) => frame.url() !== "about:blank");
             let result = null;
             let scope = null;
             for (let i = 0; i < scopes.length; i++) {
@@ -512,55 +594,108 @@ class StableBrowser {
                 }
                 if (result.foundElements.length > 0) {
                     let dialogCloseLocator = result.foundElements[0].locator;
-                    await dialogCloseLocator.click();
-                    // wait for the dialog to close
-                    await dialogCloseLocator.waitFor({ state: "hidden" });
+                    try {
+                        await scope?.evaluate(() => {
+                            window.__isClosingPopups = true;
+                        });
+                        await dialogCloseLocator.click();
+                        // wait for the dialog to close
+                        await dialogCloseLocator.waitFor({ state: "hidden" });
+                    }
+                    catch (e) {
+                    }
+                    finally {
+                        await scope?.evaluate(() => {
+                            window.__isClosingPopups = false;
+                        });
+                    }
                     return { rerun: true };
                 }
             }
         }
         return { rerun: false };
     }
-    async _locate(selectors, info, _params, timeout = 30000) {
+    async _locate(selectors, info, _params, timeout, allowDisabled = false) {
+        if (!timeout) {
+            timeout = 30000;
+        }
         for (let i = 0; i < 3; i++) {
             info.log += "attempt " + i + ": total locators " + selectors.locators.length + "\n";
             for (let j = 0; j < selectors.locators.length; j++) {
                 let selector = selectors.locators[j];
                 info.log += "searching for locator " + j + ":" + JSON.stringify(selector) + "\n";
             }
-            let element = await this._locate_internal(selectors, info, _params, timeout);
+            let element = await this._locate_internal(selectors, info, _params, timeout, allowDisabled);
             if (!element.rerun) {
-                return element;
+                const randomToken = Math.random().toString(36).substring(7);
+                await element.evaluate((el, randomToken) => {
+                    el.setAttribute("data-blinq-id-" + randomToken, "");
+                }, randomToken);
+                // if (element._frame) {
+                //   return element;
+                // }
+                const scope = element._frame ?? element.page();
+                let newElementSelector = "[data-blinq-id-" + randomToken + "]";
+                let prefixSelector = "";
+                const frameControlSelector = " >> internal:control=enter-frame";
+                const frameSelectorIndex = element._selector.lastIndexOf(frameControlSelector);
+                if (frameSelectorIndex !== -1) {
+                    // remove everything after the >> internal:control=enter-frame
+                    const frameSelector = element._selector.substring(0, frameSelectorIndex);
+                    prefixSelector = frameSelector + " >> internal:control=enter-frame >>";
+                }
+                // if (element?._frame?._selector) {
+                //   prefixSelector = element._frame._selector + " >> " + prefixSelector;
+                // }
+                const newSelector = prefixSelector + newElementSelector;
+                return scope.locator(newSelector);
             }
         }
         throw new Error("unable to locate element " + JSON.stringify(selectors));
     }
-    async _locate_internal(selectors, info, _params, timeout = 30000) {
-        let highPriorityTimeout = 5000;
-        let visibleOnlyTimeout = 6000;
-        let startTime = performance.now();
-        let locatorsCount = 0;
-        //let arrayMode = Array.isArray(selectors);
+    async _findFrameScope(selectors, timeout = 30000, info) {
+        if (!info) {
+            info = {};
+            info.failCause = {};
+            info.log = "";
+        }
+        let startTime = Date.now();
         let scope = this.page;
+        if (selectors.frame) {
+            return selectors.frame;
+        }
         if (selectors.iframe_src || selectors.frameLocators) {
-            const findFrame = (frame, framescope) => {
+            const findFrame = async (frame, framescope) => {
                 for (let i = 0; i < frame.selectors.length; i++) {
                     let frameLocator = frame.selectors[i];
                     if (frameLocator.css) {
-                        framescope = framescope.frameLocator(frameLocator.css);
-                        break;
+                        let testframescope = framescope.frameLocator(frameLocator.css);
+                        if (frameLocator.index) {
+                            testframescope = framescope.nth(frameLocator.index);
+                        }
+                        try {
+                            await testframescope.owner().evaluateHandle(() => true, null, {
+                                timeout: 5000,
+                            });
+                            framescope = testframescope;
+                            break;
+                        }
+                        catch (error) {
+                            console.error("frame not found " + frameLocator.css);
+                        }
                     }
                 }
                 if (frame.children) {
-                    return findFrame(frame.children, framescope);
+                    return await findFrame(frame.children, framescope);
                 }
                 return framescope;
             };
-            info.log += "searching for iframe " + selectors.iframe_src + "/" + selectors.frameLocators + "\n";
+            let fLocator = null;
             while (true) {
                 let frameFound = false;
                 if (selectors.nestFrmLoc) {
-                    scope = findFrame(selectors.nestFrmLoc, scope);
+                    fLocator = selectors.nestFrmLoc;
+                    scope = await findFrame(selectors.nestFrmLoc, scope);
                     frameFound = true;
                     break;
                 }
@@ -568,6 +703,7 @@ class StableBrowser {
                     for (let i = 0; i < selectors.frameLocators.length; i++) {
                         let frameLocator = selectors.frameLocators[i];
                         if (frameLocator.css) {
+                            fLocator = frameLocator.css;
                             scope = scope.frameLocator(frameLocator.css);
                             frameFound = true;
                             break;
@@ -575,20 +711,55 @@ class StableBrowser {
                     }
                 }
                 if (!frameFound && selectors.iframe_src) {
+                    fLocator = selectors.iframe_src;
                     scope = this.page.frame({ url: selectors.iframe_src });
                 }
                 if (!scope) {
-                    info.log += "unable to locate iframe " + selectors.iframe_src + "\n";
-                    if (performance.now() - startTime > timeout) {
+                    if (info && info.locatorLog) {
+                        info.locatorLog.setLocatorSearchStatus("frame-" + fLocator, "NOT_FOUND");
+                    }
+                    //info.log += "unable to locate iframe " + selectors.iframe_src + "\n";
+                    if (Date.now() - startTime > timeout) {
+                        info.failCause.iframeNotFound = true;
+                        info.failCause.lastError = `unable to locate iframe "${selectors.iframe_src}"`;
                         throw new Error("unable to locate iframe " + selectors.iframe_src);
                     }
                     await new Promise((resolve) => setTimeout(resolve, 1000));
                 }
                 else {
+                    if (info && info.locatorLog) {
+                        info.locatorLog.setLocatorSearchStatus("frame-" + fLocator, "FOUND");
+                    }
                     break;
                 }
             }
         }
+        if (!scope) {
+            scope = this.page;
+        }
+        return scope;
+    }
+    async _getDocumentBody(selectors, timeout = 30000, info) {
+        let scope = await this._findFrameScope(selectors, timeout, info);
+        return scope.evaluate(() => {
+            var bodyContent = document.body.innerHTML;
+            return bodyContent;
+        });
+    }
+    async _locate_internal(selectors, info, _params, timeout = 30000, allowDisabled = false) {
+        if (!info) {
+            info = {};
+            info.failCause = {};
+            info.log = "";
+            info.locatorLog = new LocatorLog(selectors);
+        }
+        let highPriorityTimeout = 5000;
+        let visibleOnlyTimeout = 6000;
+        let startTime = Date.now();
+        let locatorsCount = 0;
+        let lazy_scroll = false;
+        //let arrayMode = Array.isArray(selectors);
+        let scope = await this._findFrameScope(selectors, timeout, info);
         let selectorsLocators = null;
         selectorsLocators = selectors.locators;
         // group selectors by priority
@@ -624,18 +795,13 @@ class StableBrowser {
             }
             // info.log += "scanning locators in priority 1" + "\n";
             let onlyPriority3 = selectorsLocators[0].priority === 3;
-            result = await this._scanLocatorsGroup(locatorsByPriority["1"], scope, _params, info, visibleOnly);
+            result = await this._scanLocatorsGroup(locatorsByPriority["1"], scope, _params, info, visibleOnly, allowDisabled, selectors?.element_name);
             if (result.foundElements.length === 0) {
                 // info.log += "scanning locators in priority 2" + "\n";
-                result = await this._scanLocatorsGroup(locatorsByPriority["2"], scope, _params, info, visibleOnly);
+                result = await this._scanLocatorsGroup(locatorsByPriority["2"], scope, _params, info, visibleOnly, allowDisabled, selectors?.element_name);
             }
-            if (result.foundElements.length === 0 && onlyPriority3) {
-                result = await this._scanLocatorsGroup(locatorsByPriority["3"], scope, _params, info, visibleOnly);
-            }
-            else {
-                if (result.foundElements.length === 0 && !highPriorityOnly) {
-                    result = await this._scanLocatorsGroup(locatorsByPriority["3"], scope, _params, info, visibleOnly);
-                }
+            if (result.foundElements.length === 0 && (onlyPriority3 || !highPriorityOnly)) {
+                result = await this._scanLocatorsGroup(locatorsByPriority["3"], scope, _params, info, visibleOnly, allowDisabled, selectors?.element_name);
             }
             let foundElements = result.foundElements;
             if (foundElements.length === 1 && foundElements[0].unique) {
@@ -675,24 +841,43 @@ class StableBrowser {
                     return maxCountElement.locator;
                 }
             }
-            if (performance.now() - startTime > timeout) {
+            if (Date.now() - startTime > timeout) {
                 break;
             }
-            if (performance.now() - startTime > highPriorityTimeout) {
-                info.log += "high priority timeout, will try all elements" + "\n";
+            if (Date.now() - startTime > highPriorityTimeout) {
+                //info.log += "high priority timeout, will try all elements" + "\n";
                 highPriorityOnly = false;
+                if (this.configuration && this.configuration.load_all_lazy === true && !lazy_scroll) {
+                    lazy_scroll = true;
+                    await scrollPageToLoadLazyElements(this.page);
+                }
             }
-            if (performance.now() - startTime > visibleOnlyTimeout) {
-                info.log += "visible only timeout, will try all elements" + "\n";
+            if (Date.now() - startTime > visibleOnlyTimeout) {
+                //info.log += "visible only timeout, will try all elements" + "\n";
                 visibleOnly = false;
             }
             await new Promise((resolve) => setTimeout(resolve, 1000));
+            // sheck of more of half of the timeout has passed
+            if (Date.now() - startTime > timeout / 2) {
+                highPriorityOnly = false;
+                visibleOnly = false;
+            }
         }
         this.logger.debug("unable to locate unique element, total elements found " + locatorsCount);
-        info.log += "failed to locate unique element, total elements found " + locatorsCount + "\n";
+        // if (info.locatorLog) {
+        //   const lines = info.locatorLog.toString().split("\n");
+        //   for (let line of lines) {
+        //     this.logger.debug(line);
+        //   }
+        // }
+        //info.log += "failed to locate unique element, total elements found " + locatorsCount + "\n";
+        info.failCause.locatorNotFound = true;
+        if (!info?.failCause?.lastError) {
+            info.failCause.lastError = `failed to locate ${formatElementName(selectors.element_name)}, ${locatorsCount > 0 ? `${locatorsCount} matching elements found` : "no matching elements found"}`;
+        }
         throw new Error("failed to locate first element no elements found, " + info.log);
     }
-    async _scanLocatorsGroup(locatorsGroup, scope, _params, info, visibleOnly) {
+    async _scanLocatorsGroup(locatorsGroup, scope, _params, info, visibleOnly, allowDisabled = false, element_name, logErrors = false) {
         let foundElements = [];
         const result = {
             foundElements: foundElements,
@@ -700,17 +885,20 @@ class StableBrowser {
         for (let i = 0; i < locatorsGroup.length; i++) {
             let foundLocators = [];
             try {
-                await this._collectLocatorInformation(locatorsGroup, i, scope, foundLocators, _params, info, visibleOnly);
+                await this._collectLocatorInformation(locatorsGroup, i, scope, foundLocators, _params, info, visibleOnly, allowDisabled, element_name);
             }
             catch (e) {
-                this.logger.debug("unable to use locator " + JSON.stringify(locatorsGroup[i]));
-                this.logger.debug(e);
+                // this call can fail it the browser is navigating
+                // this.logger.debug("unable to use locator " + JSON.stringify(locatorsGroup[i]));
+                // this.logger.debug(e);
                 foundLocators = [];
                 try {
-                    await this._collectLocatorInformation(locatorsGroup, i, this.page, foundLocators, _params, info, visibleOnly);
+                    await this._collectLocatorInformation(locatorsGroup, i, this.page, foundLocators, _params, info, visibleOnly, allowDisabled, element_name);
                 }
                 catch (e) {
-                    this.logger.info("unable to use locator (second try) " + JSON.stringify(locatorsGroup[i]));
+                    if (logErrors) {
+                        this.logger.info("unable to use locator (second try) " + JSON.stringify(locatorsGroup[i]));
+                    }
                 }
             }
             if (foundLocators.length === 1) {
@@ -721,270 +909,350 @@ class StableBrowser {
                 });
                 result.locatorIndex = i;
             }
+            if (foundLocators.length > 1) {
+                // remove elements that consume the same space with 10 pixels tolerance
+                const boxes = [];
+                for (let j = 0; j < foundLocators.length; j++) {
+                    boxes.push({ box: await foundLocators[j].boundingBox(), locator: foundLocators[j] });
+                }
+                for (let j = 0; j < boxes.length; j++) {
+                    for (let k = 0; k < boxes.length; k++) {
+                        if (j === k) {
+                            continue;
+                        }
+                        // check if x, y, width, height are the same with 10 pixels tolerance
+                        if (Math.abs(boxes[j].box.x - boxes[k].box.x) < 10 &&
+                            Math.abs(boxes[j].box.y - boxes[k].box.y) < 10 &&
+                            Math.abs(boxes[j].box.width - boxes[k].box.width) < 10 &&
+                            Math.abs(boxes[j].box.height - boxes[k].box.height) < 10) {
+                            // as the element is not unique, will remove it
+                            boxes.splice(k, 1);
+                            k--;
+                        }
+                    }
+                }
+                if (boxes.length === 1) {
+                    result.foundElements.push({
+                        locator: boxes[0].locator.first(),
+                        box: boxes[0].box,
+                        unique: true,
+                    });
+                    result.locatorIndex = i;
+                }
+                else if (logErrors) {
+                    info.failCause.foundMultiple = true;
+                    if (info.locatorLog) {
+                        info.locatorLog.setLocatorSearchStatus(JSON.stringify(locatorsGroup[i]), "FOUND_NOT_UNIQUE");
+                    }
+                }
+            }
         }
         return result;
     }
-    async click(selectors, _params, options = {}, world = null) {
-        this._validateSelectors(selectors);
+    async simpleClick(elementDescription, _params, options = {}, world = null) {
+        const state = {
+            locate: false,
+            scroll: false,
+            highlight: false,
+            _params,
+            options,
+            world,
+            type: Types.CLICK,
+            text: "Click element",
+            operation: "simpleClick",
+            log: "***** click on " + elementDescription + " *****\n",
+        };
+        _preCommand(state, this);
         const startTime = Date.now();
-        if (options && options.context) {
-            selectors.locators[0].text = options.context;
+        let timeout = 30000;
+        if (options && options.timeout) {
+            timeout = options.timeout;
         }
-        const info = {};
-        info.log = "***** click on " + selectors.element_name + " *****\n";
-        info.operation = "click";
-        info.selectors = selectors;
-        let error = null;
-        let screenshotId = null;
-        let screenshotPath = null;
-        try {
-            let element = await this._locate(selectors, info, _params);
-            await this.scrollIfNeeded(element, info);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
+        while (true) {
             try {
-                await this._highlightElements(element);
-                await element.click();
-                await new Promise((resolve) => setTimeout(resolve, 1000));
+                const result = await locate_element(this.context, elementDescription, "click");
+                if (result?.elementNumber >= 0) {
+                    const selectors = {
+                        frame: result?.frame,
+                        locators: [
+                            {
+                                css: result?.css,
+                            },
+                        ],
+                    };
+                    await this.click(selectors, _params, options, world);
+                    return;
+                }
             }
             catch (e) {
-                // await this.closeUnexpectedPopups();
-                info.log += "click failed, will try again" + "\n";
-                element = await this._locate(selectors, info, _params);
-                await element.dispatchEvent("click");
-                await new Promise((resolve) => setTimeout(resolve, 1000));
+                if (performance.now() - startTime > timeout) {
+                    // throw e;
+                    try {
+                        await _commandError(state, "timeout looking for " + elementDescription, this);
+                    }
+                    finally {
+                        await _commandFinally(state, this);
+                    }
+                }
             }
-            await this.waitForPageLoad();
-            return info;
+            await new Promise((resolve) => setTimeout(resolve, 3000));
+        }
+    }
+    async simpleClickType(elementDescription, value, _params, options = {}, world = null) {
+        const state = {
+            locate: false,
+            scroll: false,
+            highlight: false,
+            _params,
+            options,
+            world,
+            type: Types.FILL,
+            text: "Fill element",
+            operation: "simpleClickType",
+            log: "***** click type on " + elementDescription + " *****\n",
+        };
+        _preCommand(state, this);
+        const startTime = Date.now();
+        let timeout = 30000;
+        if (options && options.timeout) {
+            timeout = options.timeout;
+        }
+        while (true) {
+            try {
+                const result = await locate_element(this.context, elementDescription, "fill", value);
+                if (result?.elementNumber >= 0) {
+                    const selectors = {
+                        frame: result?.frame,
+                        locators: [
+                            {
+                                css: result?.css,
+                            },
+                        ],
+                    };
+                    await this.clickType(selectors, value, false, _params, options, world);
+                    return;
+                }
+            }
+            catch (e) {
+                if (performance.now() - startTime > timeout) {
+                    // throw e;
+                    try {
+                        await _commandError(state, "timeout looking for " + elementDescription, this);
+                    }
+                    finally {
+                        await _commandFinally(state, this);
+                    }
+                }
+            }
+            await new Promise((resolve) => setTimeout(resolve, 3000));
+        }
+    }
+    async click(selectors, _params, options = {}, world = null) {
+        const state = {
+            selectors,
+            _params,
+            options,
+            world,
+            text: "Click element",
+            _text: "Click on " + selectors.element_name,
+            type: Types.CLICK,
+            operation: "click",
+            log: "***** click on " + selectors.element_name + " *****\n",
+        };
+        try {
+            await _preCommand(state, this);
+            await performAction("click", state.element, options, this, state, _params);
+            if (!this.fastMode) {
+                await this.waitForPageLoad();
+            }
+            return state.info;
         }
         catch (e) {
-            this.logger.error("click failed " + info.log);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            info.screenshotPath = screenshotPath;
-            Object.assign(e, { info: info });
-            error = e;
-            throw e;
+            await _commandError(state, e, this);
         }
         finally {
-            const endTime = Date.now();
-            this._reportToWorld(world, {
-                element_name: selectors.element_name,
-                type: Types.CLICK,
-                text: `Click element`,
-                screenshotId,
-                result: error
-                    ? {
-                        status: "FAILED",
-                        startTime,
-                        endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
-                    }
-                    : {
-                        status: "PASSED",
-                        startTime,
-                        endTime,
-                    },
-                info: info,
-            });
+            await _commandFinally(state, this);
+        }
+    }
+    async waitForElement(selectors, _params, options = {}, world = null) {
+        const timeout = this._getFindElementTimeout(options);
+        const state = {
+            selectors,
+            _params,
+            options,
+            world,
+            text: "Wait for element",
+            _text: "Wait for " + selectors.element_name,
+            type: Types.WAIT_ELEMENT,
+            operation: "waitForElement",
+            log: "***** wait for " + selectors.element_name + " *****\n",
+        };
+        let found = false;
+        try {
+            await _preCommand(state, this);
+            // if (state.options && state.options.context) {
+            //   state.selectors.locators[0].text = state.options.context;
+            // }
+            await state.element.waitFor({ timeout: timeout });
+            found = true;
+            // await new Promise((resolve) => setTimeout(resolve, 1000));
         }
+        catch (e) {
+            console.error("Error on waitForElement", e);
+            // await _commandError(state, e, this);
+        }
+        finally {
+            await _commandFinally(state, this);
+        }
+        return found;
     }
     async setCheck(selectors, checked = true, _params, options = {}, world = null) {
-        this._validateSelectors(selectors);
-        const startTime = Date.now();
-        const info = {};
-        info.log = "";
-        info.operation = "setCheck";
-        info.checked = checked;
-        info.selectors = selectors;
-        let error = null;
-        let screenshotId = null;
-        let screenshotPath = null;
+        const state = {
+            selectors,
+            _params,
+            options,
+            world,
+            type: checked ? Types.CHECK : Types.UNCHECK,
+            text: checked ? `Check element` : `Uncheck element`,
+            _text: checked ? `Check ${selectors.element_name}` : `Uncheck ${selectors.element_name}`,
+            operation: "setCheck",
+            log: "***** check " + selectors.element_name + " *****\n",
+        };
         try {
-            let element = await this._locate(selectors, info, _params);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
+            await _preCommand(state, this);
+            state.info.checked = checked;
+            // let element = await this._locate(selectors, info, _params);
+            // ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
             try {
-                await this._highlightElements(element);
-                await element.setChecked(checked);
+                // if (world && world.screenshot && !world.screenshotPath) {
+                // console.log(`Highlighting while running from recorder`);
+                await this._highlightElements(state.element);
+                await state.element.setChecked(checked, { timeout: 2000 });
                 await new Promise((resolve) => setTimeout(resolve, 1000));
+                // await this._unHighlightElements(element);
+                // }
+                // await new Promise((resolve) => setTimeout(resolve, 1000));
+                //  await this._unHighlightElements(element);
             }
             catch (e) {
                 if (e.message && e.message.includes("did not change its state")) {
                     this.logger.info("element did not change its state, ignoring...");
                 }
                 else {
-                    //await this.closeUnexpectedPopups();
-                    info.log += "setCheck failed, will try again" + "\n";
-                    element = await this._locate(selectors, info, _params);
-                    await element.setChecked(checked, { timeout: 5000, force: true });
                     await new Promise((resolve) => setTimeout(resolve, 1000));
+                    //await this.closeUnexpectedPopups();
+                    state.info.log += "setCheck failed, will try again" + "\n";
+                    state.element_found = false;
+                    try {
+                        state.element = await this._locate(selectors, state.info, _params, 100);
+                        state.element_found = true;
+                        // check the check state
+                    }
+                    catch (error) {
+                        // element dismissed
+                    }
+                    if (state.element_found) {
+                        const isChecked = await state.element.isChecked();
+                        if (isChecked !== checked) {
+                            // perform click
+                            await state.element.click({ timeout: 2000, force: true });
+                        }
+                        else {
+                            this.logger.info(`Element ${selectors.element_name} is already in the desired state (${checked})`);
+                        }
+                    }
                 }
             }
             await this.waitForPageLoad();
-            return info;
+            return state.info;
         }
         catch (e) {
-            this.logger.error("setCheck failed " + info.log);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            info.screenshotPath = screenshotPath;
-            Object.assign(e, { info: info });
-            error = e;
-            throw e;
+            await _commandError(state, e, this);
         }
         finally {
-            const endTime = Date.now();
-            this._reportToWorld(world, {
-                element_name: selectors.element_name,
-                type: checked ? Types.CHECK : Types.UNCHECK,
-                text: checked ? `Check element` : `Uncheck element`,
-                screenshotId,
-                result: error
-                    ? {
-                        status: "FAILED",
-                        startTime,
-                        endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
-                    }
-                    : {
-                        status: "PASSED",
-                        startTime,
-                        endTime,
-                    },
-                info: info,
-            });
+            await _commandFinally(state, this);
         }
     }
     async hover(selectors, _params, options = {}, world = null) {
-        this._validateSelectors(selectors);
-        const startTime = Date.now();
-        const info = {};
-        info.log = "";
-        info.operation = "hover";
-        info.selectors = selectors;
-        let error = null;
-        let screenshotId = null;
-        let screenshotPath = null;
+        const state = {
+            selectors,
+            _params,
+            options,
+            world,
+            type: Types.HOVER,
+            text: `Hover element`,
+            _text: `Hover on ${selectors.element_name}`,
+            operation: "hover",
+            log: "***** hover " + selectors.element_name + " *****\n",
+        };
         try {
-            let element = await this._locate(selectors, info, _params);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            try {
-                await this._highlightElements(element);
-                await element.hover();
-                await new Promise((resolve) => setTimeout(resolve, 1000));
-            }
-            catch (e) {
-                //await this.closeUnexpectedPopups();
-                info.log += "hover failed, will try again" + "\n";
-                element = await this._locate(selectors, info, _params);
-                await element.hover({ timeout: 10000 });
-                await new Promise((resolve) => setTimeout(resolve, 1000));
-            }
+            await _preCommand(state, this);
+            await performAction("hover", state.element, options, this, state, _params);
+            await _screenshot(state, this);
             await this.waitForPageLoad();
-            return info;
+            return state.info;
         }
         catch (e) {
-            this.logger.error("hover failed " + info.log);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            info.screenshotPath = screenshotPath;
-            Object.assign(e, { info: info });
-            error = e;
-            throw e;
+            await _commandError(state, e, this);
         }
         finally {
-            const endTime = Date.now();
-            this._reportToWorld(world, {
-                element_name: selectors.element_name,
-                type: Types.HOVER,
-                text: `Hover element`,
-                screenshotId,
-                result: error
-                    ? {
-                        status: "FAILED",
-                        startTime,
-                        endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
-                    }
-                    : {
-                        status: "PASSED",
-                        startTime,
-                        endTime,
-                    },
-                info: info,
-            });
+            await _commandFinally(state, this);
         }
     }
     async selectOption(selectors, values, _params = null, options = {}, world = null) {
-        this._validateSelectors(selectors);
         if (!values) {
             throw new Error("values is null");
         }
-        const startTime = Date.now();
-        let error = null;
-        let screenshotId = null;
-        let screenshotPath = null;
-        const info = {};
-        info.log = "";
-        info.operation = "selectOptions";
-        info.selectors = selectors;
+        const state = {
+            selectors,
+            _params,
+            options,
+            world,
+            value: values.toString(),
+            type: Types.SELECT,
+            text: `Select option: ${values}`,
+            _text: `Select option: ${values} on ${selectors.element_name}`,
+            operation: "selectOption",
+            log: "***** select option " + selectors.element_name + " *****\n",
+        };
         try {
-            let element = await this._locate(selectors, info, _params);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
+            await _preCommand(state, this);
             try {
-                await this._highlightElements(element);
-                await element.selectOption(values);
+                await state.element.selectOption(values);
             }
             catch (e) {
                 //await this.closeUnexpectedPopups();
-                info.log += "selectOption failed, will try force" + "\n";
-                await element.selectOption(values, { timeout: 10000, force: true });
+                state.info.log += "selectOption failed, will try force" + "\n";
+                await state.element.selectOption(values, { timeout: 10000, force: true });
             }
             await this.waitForPageLoad();
-            return info;
+            return state.info;
         }
         catch (e) {
-            this.logger.error("selectOption failed " + info.log);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            info.screenshotPath = screenshotPath;
-            Object.assign(e, { info: info });
-            this.logger.info("click failed, will try next selector");
-            error = e;
-            throw e;
+            await _commandError(state, e, this);
         }
         finally {
-            const endTime = Date.now();
-            this._reportToWorld(world, {
-                element_name: selectors.element_name,
-                type: Types.SELECT,
-                text: `Select option: ${values}`,
-                value: values.toString(),
-                screenshotId,
-                result: error
-                    ? {
-                        status: "FAILED",
-                        startTime,
-                        endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
-                    }
-                    : {
-                        status: "PASSED",
-                        startTime,
-                        endTime,
-                    },
-                info: info,
-            });
+            await _commandFinally(state, this);
         }
     }
     async type(_value, _params = null, options = {}, world = null) {
-        const startTime = Date.now();
-        let error = null;
-        let screenshotId = null;
-        let screenshotPath = null;
-        const info = {};
-        info.log = "";
-        info.operation = "type";
-        _value = this._fixUsingParams(_value, _params);
-        info.value = _value;
+        const state = {
+            value: _value,
+            _params,
+            options,
+            world,
+            locate: false,
+            scroll: false,
+            highlight: false,
+            type: Types.TYPE_PRESS,
+            text: `Type value: ${_value}`,
+            _text: `Type value: ${_value}`,
+            operation: "type",
+            log: "",
+        };
         try {
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            const valueSegment = _value.split("&&");
+            await _preCommand(state, this);
+            const valueSegment = state.value.split("&&");
             for (let i = 0; i < valueSegment.length; i++) {
                 if (i > 0) {
                     await new Promise((resolve) => setTimeout(resolve, 1000));
@@ -1004,134 +1272,77 @@ class StableBrowser {
                     await this.page.keyboard.type(value);
                 }
             }
-            return info;
+            return state.info;
         }
         catch (e) {
-            //await this.closeUnexpectedPopups();
-            this.logger.error("type failed " + info.log);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            info.screenshotPath = screenshotPath;
-            Object.assign(e, { info: info });
-            error = e;
-            throw e;
+            await _commandError(state, e, this);
         }
         finally {
-            const endTime = Date.now();
-            this._reportToWorld(world, {
-                type: Types.TYPE_PRESS,
-                screenshotId,
-                value: _value,
-                text: `type value: ${_value}`,
-                result: error
-                    ? {
-                        status: "FAILED",
-                        startTime,
-                        endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
-                    }
-                    : {
-                        status: "PASSED",
-                        startTime,
-                        endTime,
-                    },
-                info: info,
-            });
+            await _commandFinally(state, this);
         }
     }
     async setInputValue(selectors, value, _params = null, options = {}, world = null) {
-        // set input value for non fillable inputs like date, time, range, color, etc.
-        this._validateSelectors(selectors);
-        const startTime = Date.now();
-        const info = {};
-        info.log = "***** set input value " + selectors.element_name + " *****\n";
-        info.operation = "setInputValue";
-        info.selectors = selectors;
-        value = this._fixUsingParams(value, _params);
-        info.value = value;
-        let error = null;
-        let screenshotId = null;
-        let screenshotPath = null;
+        const state = {
+            selectors,
+            _params,
+            value,
+            options,
+            world,
+            type: Types.SET_INPUT,
+            text: `Set input value`,
+            operation: "setInputValue",
+            log: "***** set input value " + selectors.element_name + " *****\n",
+        };
         try {
-            value = await this._replaceWithLocalData(value, this);
-            let element = await this._locate(selectors, info, _params);
-            await this.scrollIfNeeded(element, info);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            await this._highlightElements(element);
+            await _preCommand(state, this);
+            let value = await this._replaceWithLocalData(state.value, this);
             try {
-                await element.evaluateHandle((el, value) => {
+                await state.element.evaluateHandle((el, value) => {
                     el.value = value;
                 }, value);
             }
             catch (error) {
                 this.logger.error("setInputValue failed, will try again");
-                ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-                info.screenshotPath = screenshotPath;
-                Object.assign(error, { info: info });
-                await element.evaluateHandle((el, value) => {
+                await _screenshot(state, this);
+                Object.assign(error, { info: state.info });
+                await state.element.evaluateHandle((el, value) => {
                     el.value = value;
                 });
             }
         }
         catch (e) {
-            this.logger.error("setInputValue failed " + info.log);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            info.screenshotPath = screenshotPath;
-            Object.assign(e, { info: info });
-            error = e;
-            throw e;
+            await _commandError(state, e, this);
         }
         finally {
-            const endTime = Date.now();
-            this._reportToWorld(world, {
-                element_name: selectors.element_name,
-                type: Types.SET_INPUT,
-                text: `Set input value`,
-                value: value,
-                screenshotId,
-                result: error
-                    ? {
-                        status: "FAILED",
-                        startTime,
-                        endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
-                    }
-                    : {
-                        status: "PASSED",
-                        startTime,
-                        endTime,
-                    },
-                info: info,
-            });
+            await _commandFinally(state, this);
         }
     }
     async setDateTime(selectors, value, format = null, enter = false, _params = null, options = {}, world = null) {
-        this._validateSelectors(selectors);
-        const startTime = Date.now();
-        let error = null;
-        let screenshotId = null;
-        let screenshotPath = null;
-        const info = {};
-        info.log = "";
-        info.operation = Types.SET_DATE_TIME;
-        info.selectors = selectors;
-        info.value = value;
+        const state = {
+            selectors,
+            _params,
+            value: await this._replaceWithLocalData(value, this),
+            options,
+            world,
+            type: Types.SET_DATE_TIME,
+            text: `Set date time value: ${value}`,
+            _text: `Set date time value: ${value} on ${selectors.element_name}`,
+            operation: "setDateTime",
+            log: "***** set date time value " + selectors.element_name + " *****\n",
+            throwError: false,
+        };
         try {
-            value = await this._replaceWithLocalData(value, this);
-            let element = await this._locate(selectors, info, _params);
-            //insert red border around the element
-            await this.scrollIfNeeded(element, info);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            await this._highlightElements(element);
+            await _preCommand(state, this);
             try {
-                await element.click();
+                await performAction("click", state.element, options, this, state, _params);
                 await new Promise((resolve) => setTimeout(resolve, 500));
                 if (format) {
-                    value = dayjs(value).format(format);
-                    await element.fill(value);
+                    state.value = dayjs(state.value).format(format);
+                    await state.element.fill(state.value);
                 }
                 else {
-                    const dateTimeValue = await getDateTimeValue({ value, element });
-                    await element.evaluateHandle((el, dateTimeValue) => {
+                    const dateTimeValue = await getDateTimeValue({ value: state.value, element: state.element });
+                    await state.element.evaluateHandle((el, dateTimeValue) => {
                         el.value = ""; // clear input
                         el.value = dateTimeValue;
                     }, dateTimeValue);
@@ -1144,20 +1355,19 @@ class StableBrowser {
             }
             catch (err) {
                 //await this.closeUnexpectedPopups();
-                this.logger.error("setting date time input failed " + JSON.stringify(info));
+                this.logger.error("setting date time input failed " + JSON.stringify(state.info));
                 this.logger.info("Trying again");
-                ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-                info.screenshotPath = screenshotPath;
-                Object.assign(err, { info: info });
+                await _screenshot(state, this);
+                Object.assign(err, { info: state.info });
                 await element.click();
                 await new Promise((resolve) => setTimeout(resolve, 500));
                 if (format) {
-                    value = dayjs(value).format(format);
-                    await element.fill(value);
+                    state.value = dayjs(state.value).format(format);
+                    await state.element.fill(state.value);
                 }
                 else {
-                    const dateTimeValue = await getDateTimeValue({ value, element });
-                    await element.evaluateHandle((el, dateTimeValue) => {
+                    const dateTimeValue = await getDateTimeValue({ value: state.value, element: state.element });
+                    await state.element.evaluateHandle((el, dateTimeValue) => {
                         el.value = ""; // clear input
                         el.value = dateTimeValue;
                     }, dateTimeValue);
@@ -1170,84 +1380,63 @@ class StableBrowser {
             }
         }
         catch (e) {
-            error = e;
-            throw e;
+            await _commandError(state, e, this);
         }
         finally {
-            const endTime = Date.now();
-            this._reportToWorld(world, {
-                element_name: selectors.element_name,
-                type: Types.SET_DATE_TIME,
-                screenshotId,
-                value: value,
-                text: `setDateTime input with value: ${value}`,
-                result: error
-                    ? {
-                        status: "FAILED",
-                        startTime,
-                        endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
-                    }
-                    : {
-                        status: "PASSED",
-                        startTime,
-                        endTime,
-                    },
-                info: info,
-            });
+            await _commandFinally(state, this);
         }
     }
     async clickType(selectors, _value, enter = false, _params = null, options = {}, world = null) {
-        this._validateSelectors(selectors);
-        const startTime = Date.now();
-        let error = null;
-        let screenshotId = null;
-        let screenshotPath = null;
-        const info = {};
-        info.log = "***** clickType on " + selectors.element_name + " with value " + _value + "*****\n";
-        info.operation = "clickType";
-        info.selectors = selectors;
+        _value = unEscapeString(_value);
         const newValue = await this._replaceWithLocalData(_value, world);
+        const state = {
+            selectors,
+            _params,
+            value: newValue,
+            originalValue: _value,
+            options,
+            world,
+            type: Types.FILL,
+            text: `Click type input with value: ${_value}`,
+            _text: "Fill " + selectors.element_name + " with value " + maskValue(_value),
+            operation: "clickType",
+            log: "***** clickType on " + selectors.element_name + " with value " + maskValue(_value) + "*****\n",
+        };
+        if (!options) {
+            options = {};
+        }
         if (newValue !== _value) {
             //this.logger.info(_value + "=" + newValue);
             _value = newValue;
         }
-        info.value = _value;
         try {
-            let element = await this._locate(selectors, info, _params);
-            //insert red border around the element
-            await this.scrollIfNeeded(element, info);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            await this._highlightElements(element);
-            if (options === null || options === undefined || !options.press) {
+            await _preCommand(state, this);
+            state.info.value = _value;
+            if (!options.press) {
                 try {
-                    let currentValue = await element.inputValue();
+                    let currentValue = await state.element.inputValue();
                     if (currentValue) {
-                        await element.fill("");
+                        await state.element.fill("");
                     }
                 }
                 catch (e) {
                     this.logger.info("unable to clear input value");
                 }
             }
-            if (options === null || options === undefined || options.press) {
-                try {
-                    await element.click({ timeout: 5000 });
-                }
-                catch (e) {
-                    await element.dispatchEvent("click");
-                }
+            if (options.press) {
+                options.timeout = 5000;
+                await performAction("click", state.element, options, this, state, _params);
             }
             else {
                 try {
-                    await element.focus();
+                    await state.element.focus();
                 }
                 catch (e) {
-                    await element.dispatchEvent("focus");
+                    await state.element.dispatchEvent("focus");
                 }
             }
             await new Promise((resolve) => setTimeout(resolve, 500));
-            const valueSegment = _value.split("&&");
+            const valueSegment = state.value.split("&&");
             for (let i = 0; i < valueSegment.length; i++) {
                 if (i > 0) {
                     await new Promise((resolve) => setTimeout(resolve, 1000));
@@ -1267,13 +1456,21 @@ class StableBrowser {
                     await new Promise((resolve) => setTimeout(resolve, 500));
                 }
             }
+            //if (!this.fastMode) {
+            await _screenshot(state, this);
+            //}
             if (enter === true) {
                 await new Promise((resolve) => setTimeout(resolve, 2000));
                 await this.page.keyboard.press("Enter");
                 await this.waitForPageLoad();
             }
             else if (enter === false) {
-                await element.dispatchEvent("change");
+                try {
+                    await state.element.dispatchEvent("change", null, { timeout: 5000 });
+                }
+                catch (e) {
+                    // ignore
+                }
                 //await this.page.keyboard.press("Tab");
             }
             else {
@@ -1282,111 +1479,95 @@ class StableBrowser {
                     await this.waitForPageLoad();
                 }
             }
-            return info;
+            return state.info;
         }
         catch (e) {
-            //await this.closeUnexpectedPopups();
-            this.logger.error("fill failed " + JSON.stringify(info));
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            info.screenshotPath = screenshotPath;
-            Object.assign(e, { info: info });
-            error = e;
-            throw e;
+            await _commandError(state, e, this);
         }
         finally {
-            const endTime = Date.now();
-            this._reportToWorld(world, {
-                element_name: selectors.element_name,
-                type: Types.FILL,
-                screenshotId,
-                value: _value,
-                text: `clickType input with value: ${_value}`,
-                result: error
-                    ? {
-                        status: "FAILED",
-                        startTime,
-                        endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
-                    }
-                    : {
-                        status: "PASSED",
-                        startTime,
-                        endTime,
-                    },
-                info: info,
-            });
+            await _commandFinally(state, this);
         }
     }
     async fill(selectors, value, enter = false, _params = null, options = {}, world = null) {
-        this._validateSelectors(selectors);
-        const startTime = Date.now();
-        let error = null;
-        let screenshotId = null;
-        let screenshotPath = null;
-        const info = {};
-        info.log = "***** fill on " + selectors.element_name + " with value " + value + "*****\n";
-        info.operation = "fill";
-        info.selectors = selectors;
-        info.value = value;
+        const state = {
+            selectors,
+            _params,
+            value: unEscapeString(value),
+            options,
+            world,
+            type: Types.FILL,
+            text: `Fill input with value: ${value}`,
+            operation: "fill",
+            log: "***** fill on " + selectors.element_name + " with value " + value + "*****\n",
+        };
         try {
-            let element = await this._locate(selectors, info, _params);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            await this._highlightElements(element);
-            await element.fill(value);
-            await element.dispatchEvent("change");
+            await _preCommand(state, this);
+            await state.element.fill(value);
+            await state.element.dispatchEvent("change");
             if (enter) {
                 await new Promise((resolve) => setTimeout(resolve, 2000));
                 await this.page.keyboard.press("Enter");
             }
             await this.waitForPageLoad();
-            return info;
+            return state.info;
         }
         catch (e) {
-            //await this.closeUnexpectedPopups();
-            this.logger.error("fill failed " + info.log);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            info.screenshotPath = screenshotPath;
-            Object.assign(e, { info: info });
-            error = e;
-            throw e;
+            await _commandError(state, e, this);
         }
         finally {
-            const endTime = Date.now();
-            this._reportToWorld(world, {
-                element_name: selectors.element_name,
-                type: Types.FILL,
-                screenshotId,
-                value,
-                text: `Fill input with value: ${value}`,
-                result: error
-                    ? {
-                        status: "FAILED",
-                        startTime,
-                        endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
-                    }
-                    : {
-                        status: "PASSED",
-                        startTime,
-                        endTime,
-                    },
-                info: info,
-            });
+            await _commandFinally(state, this);
+        }
+    }
+    async setInputFiles(selectors, files, _params = null, options = {}, world = null) {
+        const state = {
+            selectors,
+            _params,
+            files,
+            value: '"' + files.join('", "') + '"',
+            options,
+            world,
+            type: Types.SET_INPUT_FILES,
+            text: `Set input files`,
+            _text: `Set input files on ${selectors.element_name}`,
+            operation: "setInputFiles",
+            log: "***** set input files " + selectors.element_name + " *****\n",
+        };
+        const uploadsFolder = this.configuration.uploadsFolder ?? "data/uploads";
+        try {
+            await _preCommand(state, this);
+            for (let i = 0; i < files.length; i++) {
+                const file = files[i];
+                const filePath = path.join(uploadsFolder, file);
+                if (!fs.existsSync(filePath)) {
+                    throw new Error(`File not found: ${filePath}`);
+                }
+                state.files[i] = filePath;
+            }
+            await state.element.setInputFiles(files);
+            return state.info;
+        }
+        catch (e) {
+            await _commandError(state, e, this);
+        }
+        finally {
+            await _commandFinally(state, this);
         }
     }
     async getText(selectors, _params = null, options = {}, info = {}, world = null) {
         return await this._getText(selectors, 0, _params, options, info, world);
     }
     async _getText(selectors, climb, _params = null, options = {}, info = {}, world = null) {
-        this._validateSelectors(selectors);
+        const timeout = this._getFindElementTimeout(options);
+        _validateSelectors(selectors);
         let screenshotId = null;
         let screenshotPath = null;
         if (!info.log) {
             info.log = "";
+            info.locatorLog = new LocatorLog(selectors);
         }
         info.operation = "getText";
         info.selectors = selectors;
-        let element = await this._locate(selectors, info, _params);
+        let element = await this._locate(selectors, info, _params, timeout);
         if (climb > 0) {
             const climbArray = [];
             for (let i = 0; i < climb; i++) {
@@ -1405,6 +1586,18 @@ class StableBrowser {
         ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
         try {
             await this._highlightElements(element);
+            // if (world && world.screenshot && !world.screenshotPath) {
+            //   // console.log(`Highlighting for get text while running from recorder`);
+            //   this._highlightElements(element)
+            //     .then(async () => {
+            //       await new Promise((resolve) => setTimeout(resolve, 1000));
+            //       this._unhighlightElements(element).then(
+            //         () => {}
+            //         // console.log(`Unhighlighting vrtr in recorder is successful`)
+            //       );
+            //     })
+            //     .catch(e);
+            // }
             const elementText = await element.innerText();
             return {
                 text: elementText,
@@ -1416,188 +1609,219 @@ class StableBrowser {
         }
         catch (e) {
             //await this.closeUnexpectedPopups();
-            this.logger.info("no innerText will use textContent");
+            this.logger.info("no innerText, will use textContent");
             const elementText = await element.textContent();
             return { text: elementText, screenshotId, screenshotPath, value: value };
         }
     }
     async containsPattern(selectors, pattern, text, _params = null, options = {}, world = null) {
-        var _a;
-        this._validateSelectors(selectors);
         if (!pattern) {
             throw new Error("pattern is null");
         }
         if (!text) {
             throw new Error("text is null");
         }
+        const state = {
+            selectors,
+            _params,
+            pattern,
+            value: pattern,
+            options,
+            world,
+            locate: false,
+            scroll: false,
+            screenshot: false,
+            highlight: false,
+            type: Types.VERIFY_ELEMENT_CONTAINS_TEXT,
+            text: `Verify element contains pattern: ${pattern}`,
+            _text: "Verify element " + selectors.element_name + " contains pattern " + pattern,
+            operation: "containsPattern",
+            log: "***** verify element " + selectors.element_name + " contains pattern " + pattern + " *****\n",
+        };
         const newValue = await this._replaceWithLocalData(text, world);
         if (newValue !== text) {
             this.logger.info(text + "=" + newValue);
             text = newValue;
         }
-        const startTime = Date.now();
-        let error = null;
-        let screenshotId = null;
-        let screenshotPath = null;
-        const info = {};
-        info.log =
-            "***** verify element " + selectors.element_name + " contains pattern  " + pattern + "/" + text + " *****\n";
-        info.operation = "containsPattern";
-        info.selectors = selectors;
-        info.value = text;
-        info.pattern = pattern;
         let foundObj = null;
         try {
-            foundObj = await this._getText(selectors, 0, _params, options, info, world);
+            await _preCommand(state, this);
+            state.info.pattern = pattern;
+            foundObj = await this._getText(selectors, 0, _params, options, state.info, world);
             if (foundObj && foundObj.element) {
-                await this.scrollIfNeeded(foundObj.element, info);
+                await this.scrollIfNeeded(foundObj.element, state.info);
             }
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
+            await _screenshot(state, this);
             let escapedText = text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
             pattern = pattern.replace("{text}", escapedText);
             let regex = new RegExp(pattern, "im");
-            if (!regex.test(foundObj === null || foundObj === void 0 ? void 0 : foundObj.text) && !((_a = foundObj === null || foundObj === void 0 ? void 0 : foundObj.value) === null || _a === void 0 ? void 0 : _a.includes(text))) {
-                info.foundText = foundObj === null || foundObj === void 0 ? void 0 : foundObj.text;
+            if (!regex.test(foundObj?.text) && !foundObj?.value?.includes(text)) {
+                state.info.foundText = foundObj?.text;
                 throw new Error("element doesn't contain text " + text);
             }
-            return info;
+            return state.info;
         }
         catch (e) {
-            //await this.closeUnexpectedPopups();
-            this.logger.error("verify element contains text failed " + info.log);
-            this.logger.error("found text " + (foundObj === null || foundObj === void 0 ? void 0 : foundObj.text) + " pattern " + pattern);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            info.screenshotPath = screenshotPath;
-            Object.assign(e, { info: info });
-            error = e;
-            throw e;
+            this.logger.error("found text " + foundObj?.text + " pattern " + pattern);
+            await _commandError(state, e, this);
         }
         finally {
-            const endTime = Date.now();
-            this._reportToWorld(world, {
-                element_name: selectors.element_name,
-                type: Types.VERIFY_ELEMENT_CONTAINS_TEXT,
-                value: pattern,
-                text: `Verify element contains pattern: ${pattern}`,
-                screenshotId: foundObj === null || foundObj === void 0 ? void 0 : foundObj.screenshotId,
-                result: error
-                    ? {
-                        status: "FAILED",
-                        startTime,
-                        endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
-                    }
-                    : {
-                        status: "PASSED",
-                        startTime,
-                        endTime,
-                    },
-                info: info,
-            });
+            await _commandFinally(state, this);
         }
     }
     async containsText(selectors, text, climb, _params = null, options = {}, world = null) {
-        var _a, _b, _c;
-        this._validateSelectors(selectors);
+        const timeout = this._getFindElementTimeout(options);
+        const startTime = Date.now();
+        const state = {
+            selectors,
+            _params,
+            value: text,
+            options,
+            world,
+            locate: false,
+            scroll: false,
+            screenshot: false,
+            highlight: false,
+            type: Types.VERIFY_ELEMENT_CONTAINS_TEXT,
+            text: `Verify element contains text: ${text}`,
+            operation: "containsText",
+            log: "***** verify element " + selectors.element_name + " contains text " + text + " *****\n",
+        };
         if (!text) {
             throw new Error("text is null");
         }
-        const startTime = Date.now();
-        let error = null;
-        let screenshotId = null;
-        let screenshotPath = null;
-        const info = {};
-        info.log = "***** verify element " + selectors.element_name + " contains text " + text + " *****\n";
-        info.operation = "containsText";
-        info.selectors = selectors;
+        text = unEscapeString(text);
         const newValue = await this._replaceWithLocalData(text, world);
         if (newValue !== text) {
             this.logger.info(text + "=" + newValue);
             text = newValue;
         }
-        info.value = text;
         let foundObj = null;
         try {
-            foundObj = await this._getText(selectors, climb, _params, options, info, world);
-            if (foundObj && foundObj.element) {
-                await this.scrollIfNeeded(foundObj.element, info);
-            }
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            const dateAlternatives = findDateAlternatives(text);
-            const numberAlternatives = findNumberAlternatives(text);
-            if (dateAlternatives.date) {
-                for (let i = 0; i < dateAlternatives.dates.length; i++) {
-                    if ((foundObj === null || foundObj === void 0 ? void 0 : foundObj.text.includes(dateAlternatives.dates[i])) ||
-                        ((_a = foundObj === null || foundObj === void 0 ? void 0 : foundObj.value) === null || _a === void 0 ? void 0 : _a.includes(dateAlternatives.dates[i]))) {
-                        return info;
+            while (Date.now() - startTime < timeout) {
+                try {
+                    await _preCommand(state, this);
+                    foundObj = await this._getText(selectors, climb, _params, { timeout: 3000 }, state.info, world);
+                    if (foundObj && foundObj.element) {
+                        await this.scrollIfNeeded(foundObj.element, state.info);
+                    }
+                    await _screenshot(state, this);
+                    const dateAlternatives = findDateAlternatives(text);
+                    const numberAlternatives = findNumberAlternatives(text);
+                    if (dateAlternatives.date) {
+                        for (let i = 0; i < dateAlternatives.dates.length; i++) {
+                            if (foundObj?.text.includes(dateAlternatives.dates[i]) ||
+                                foundObj?.value?.includes(dateAlternatives.dates[i])) {
+                                return state.info;
+                            }
+                        }
                     }
-                }
-                throw new Error("element doesn't contain text " + text);
-            }
-            else if (numberAlternatives.number) {
-                for (let i = 0; i < numberAlternatives.numbers.length; i++) {
-                    if ((foundObj === null || foundObj === void 0 ? void 0 : foundObj.text.includes(numberAlternatives.numbers[i])) ||
-                        ((_b = foundObj === null || foundObj === void 0 ? void 0 : foundObj.value) === null || _b === void 0 ? void 0 : _b.includes(numberAlternatives.numbers[i]))) {
-                        return info;
+                    else if (numberAlternatives.number) {
+                        for (let i = 0; i < numberAlternatives.numbers.length; i++) {
+                            if (foundObj?.text.includes(numberAlternatives.numbers[i]) ||
+                                foundObj?.value?.includes(numberAlternatives.numbers[i])) {
+                                return state.info;
+                            }
+                        }
+                    }
+                    else if (foundObj?.text.includes(text) || foundObj?.value?.includes(text)) {
+                        return state.info;
                     }
                 }
-                throw new Error("element doesn't contain text " + text);
-            }
-            else if (!(foundObj === null || foundObj === void 0 ? void 0 : foundObj.text.includes(text)) && !((_c = foundObj === null || foundObj === void 0 ? void 0 : foundObj.value) === null || _c === void 0 ? void 0 : _c.includes(text))) {
-                info.foundText = foundObj === null || foundObj === void 0 ? void 0 : foundObj.text;
-                info.value = foundObj === null || foundObj === void 0 ? void 0 : foundObj.value;
-                throw new Error("element doesn't contain text " + text);
+                catch (e) {
+                    // Log error but continue retrying until timeout is reached
+                    this.logger.warn("Retrying containsText due to: " + e.message);
+                }
+                await new Promise((resolve) => setTimeout(resolve, 1000)); // Wait 1 second before retrying
             }
-            return info;
+            state.info.foundText = foundObj?.text;
+            state.info.value = foundObj?.value;
+            throw new Error("element doesn't contain text " + text);
         }
         catch (e) {
-            //await this.closeUnexpectedPopups();
-            this.logger.error("verify element contains text failed " + info.log);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            info.screenshotPath = screenshotPath;
-            Object.assign(e, { info: info });
-            error = e;
+            await _commandError(state, e, this);
             throw e;
         }
         finally {
-            const endTime = Date.now();
-            this._reportToWorld(world, {
-                element_name: selectors.element_name,
-                type: Types.VERIFY_ELEMENT_CONTAINS_TEXT,
-                text: `Verify element contains text: ${text}`,
-                value: text,
-                screenshotId: foundObj === null || foundObj === void 0 ? void 0 : foundObj.screenshotId,
-                result: error
-                    ? {
-                        status: "FAILED",
-                        startTime,
-                        endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
-                    }
-                    : {
-                        status: "PASSED",
-                        startTime,
-                        endTime,
-                    },
-                info: info,
-            });
+            await _commandFinally(state, this);
         }
     }
-    _getDataFile(world = null) {
-        let dataFile = null;
-        if (world && world.reportFolder) {
-            dataFile = path.join(world.reportFolder, "data.json");
+    async snapshotValidation(frameSelectors, referanceSnapshot, _params = null, options = {}, world = null) {
+        const timeout = this._getFindElementTimeout(options);
+        const startTime = Date.now();
+        const state = {
+            _params,
+            value: referanceSnapshot,
+            options,
+            world,
+            locate: false,
+            scroll: false,
+            screenshot: true,
+            highlight: false,
+            type: Types.SNAPSHOT_VALIDATION,
+            text: `verify snapshot: ${referanceSnapshot}`,
+            operation: "snapshotValidation",
+            log: "***** verify snapshot *****\n",
+        };
+        if (!referanceSnapshot) {
+            throw new Error("referanceSnapshot is null");
+        }
+        let text = null;
+        if (fs.existsSync(path.join(this.project_path, "data", "snapshots", this.context.environment.name, referanceSnapshot + ".yml"))) {
+            text = fs.readFileSync(path.join(this.project_path, "data", "snapshots", this.context.environment.name, referanceSnapshot + ".yml"), "utf8");
         }
-        else if (this.reportFolder) {
-            dataFile = path.join(this.reportFolder, "data.json");
+        else if (fs.existsSync(path.join(this.project_path, "data", "snapshots", this.context.environment.name, referanceSnapshot + ".yaml"))) {
+            text = fs.readFileSync(path.join(this.project_path, "data", "snapshots", this.context.environment.name, referanceSnapshot + ".yaml"), "utf8");
         }
-        else if (this.context && this.context.reportFolder) {
-            dataFile = path.join(this.context.reportFolder, "data.json");
+        else if (referanceSnapshot.startsWith("yaml:")) {
+            text = referanceSnapshot.substring(5);
         }
         else {
-            dataFile = "data.json";
+            throw new Error("referenceSnapshot file not found: " + referanceSnapshot);
+        }
+        state.text = text;
+        const newValue = await this._replaceWithLocalData(text, world);
+        await _preCommand(state, this);
+        let foundObj = null;
+        try {
+            let matchResult = null;
+            while (Date.now() - startTime < timeout) {
+                try {
+                    let scope = null;
+                    if (!frameSelectors) {
+                        scope = this.page;
+                    }
+                    else {
+                        scope = await this._findFrameScope(frameSelectors, timeout, state.info);
+                    }
+                    const snapshot = await scope.locator("body").ariaSnapshot({ timeout });
+                    matchResult = snapshotValidation(snapshot, newValue, referanceSnapshot);
+                    if (matchResult.errorLine !== -1) {
+                        throw new Error("Snapshot validation failed at line " + matchResult.errorLineText);
+                    }
+                    // highlight and screenshot
+                    try {
+                        await await highlightSnapshot(newValue, scope);
+                        await _screenshot(state, this);
+                    }
+                    catch (e) { }
+                    return state.info;
+                }
+                catch (e) {
+                    // Log error but continue retrying until timeout is reached
+                    //this.logger.warn("Retrying snapshot validation due to: " + e.message);
+                }
+                await new Promise((resolve) => setTimeout(resolve, 2000)); // Wait 1 second before retrying
+            }
+            throw new Error("No snapshot match " + matchResult?.errorLineText);
+        }
+        catch (e) {
+            await _commandError(state, e, this);
+            throw e;
+        }
+        finally {
+            await _commandFinally(state, this);
         }
-        return dataFile;
     }
     async waitForUserInput(message, world = null) {
         if (!message) {
@@ -1627,12 +1851,21 @@ class StableBrowser {
             return;
         }
         // if data file exists, load it
-        const dataFile = this._getDataFile(world);
+        const dataFile = _getDataFile(world, this.context, this);
         let data = this.getTestData(world);
         // merge the testData with the existing data
         Object.assign(data, testData);
         // save the data to the file
-        fs.writeFileSync(dataFile, JSON.stringify(data, null, 2));
+        fs.writeFileSync(dataFile, JSON.stringify(data, null, 2));
+    }
+    overwriteTestData(testData, world = null) {
+        if (!testData) {
+            return;
+        }
+        // if data file exists, load it
+        const dataFile = _getDataFile(world, this.context, this);
+        // save the data to the file
+        fs.writeFileSync(dataFile, JSON.stringify(testData, null, 2));
     }
     _getDataFilePath(fileName) {
         let dataFile = path.join(this.project_path, "data", fileName);
@@ -1730,7 +1963,7 @@ class StableBrowser {
         }
     }
     getTestData(world = null) {
-        const dataFile = this._getDataFile(world);
+        const dataFile = _getDataFile(world, this.context, this);
         let data = {};
         if (fs.existsSync(dataFile)) {
             data = JSON.parse(fs.readFileSync(dataFile, "utf8"));
@@ -1762,11 +1995,9 @@ class StableBrowser {
             if (!fs.existsSync(world.screenshotPath)) {
                 fs.mkdirSync(world.screenshotPath, { recursive: true });
             }
-            let nextIndex = 1;
-            while (fs.existsSync(path.join(world.screenshotPath, nextIndex + ".png"))) {
-                nextIndex++;
-            }
-            const screenshotPath = path.join(world.screenshotPath, nextIndex + ".png");
+            // to make sure the path doesn't start with -
+            const uuidStr = "id_" + randomUUID();
+            const screenshotPath = path.join(world.screenshotPath, uuidStr + ".png");
             try {
                 await this.takeScreenshot(screenshotPath);
                 // let buffer = await this.page.screenshot({ timeout: 4000 });
@@ -1776,15 +2007,15 @@ class StableBrowser {
                 //     this.logger.info("unable to save screenshot " + screenshotPath);
                 //   }
                 // });
+                result.screenshotId = uuidStr;
+                result.screenshotPath = screenshotPath;
+                if (info && info.box) {
+                    await drawRectangle(screenshotPath, info.box.x, info.box.y, info.box.width, info.box.height);
+                }
             }
             catch (e) {
                 this.logger.info("unable to take screenshot, ignored");
             }
-            result.screenshotId = nextIndex;
-            result.screenshotPath = screenshotPath;
-            if (info && info.box) {
-                await drawRectangle(screenshotPath, info.box.x, info.box.y, info.box.width, info.box.height);
-            }
         }
         else if (options && options.screenshot) {
             result.screenshotPath = options.screenshotPath;
@@ -1809,7 +2040,6 @@ class StableBrowser {
     }
     async takeScreenshot(screenshotPath) {
         const playContext = this.context.playContext;
-        const client = await playContext.newCDPSession(this.page);
         // Using CDP to capture the screenshot
         const viewportWidth = Math.max(...(await this.page.evaluate(() => [
             document.body.scrollWidth,
@@ -1819,164 +2049,433 @@ class StableBrowser {
             document.body.clientWidth,
             document.documentElement.clientWidth,
         ])));
-        const viewportHeight = Math.max(...(await this.page.evaluate(() => [
-            document.body.scrollHeight,
-            document.documentElement.scrollHeight,
-            document.body.offsetHeight,
-            document.documentElement.offsetHeight,
-            document.body.clientHeight,
-            document.documentElement.clientHeight,
-        ])));
-        const { data } = await client.send("Page.captureScreenshot", {
-            format: "png",
-            // clip: {
-            //   x: 0,
-            //   y: 0,
-            //   width: viewportWidth,
-            //   height: viewportHeight,
-            //   scale: 1,
-            // },
-        });
-        if (!screenshotPath) {
-            return data;
-        }
-        let screenshotBuffer = Buffer.from(data, "base64");
-        const sharpBuffer = sharp(screenshotBuffer);
-        const metadata = await sharpBuffer.metadata();
-        //check if you are on retina display and reduce the quality of the image
-        if (metadata.width > viewportWidth || metadata.height > viewportHeight) {
-            screenshotBuffer = await sharpBuffer
-                .resize(viewportWidth, viewportHeight, {
-                fit: sharp.fit.inside,
-                withoutEnlargement: true,
-            })
-                .toBuffer();
-        }
-        fs.writeFileSync(screenshotPath, screenshotBuffer);
-        await client.detach();
+        let screenshotBuffer = null;
+        // if (focusedElement) {
+        //   // console.log(`Focused element ${JSON.stringify(focusedElement._selector)}`)
+        //   await this._unhighlightElements(focusedElement);
+        //   await new Promise((resolve) => setTimeout(resolve, 100));
+        //   console.log(`Unhighlighted previous element`);
+        // }
+        // if (focusedElement) {
+        //   await this._highlightElements(focusedElement);
+        // }
+        if (this.context.browserName === "chromium") {
+            const client = await playContext.newCDPSession(this.page);
+            const { data } = await client.send("Page.captureScreenshot", {
+                format: "png",
+                // clip: {
+                //   x: 0,
+                //   y: 0,
+                //   width: viewportWidth,
+                //   height: viewportHeight,
+                //   scale: 1,
+                // },
+            });
+            await client.detach();
+            if (!screenshotPath) {
+                return data;
+            }
+            screenshotBuffer = Buffer.from(data, "base64");
+        }
+        else {
+            screenshotBuffer = await this.page.screenshot();
+        }
+        // if (focusedElement) {
+        //   // console.log(`Focused element ${JSON.stringify(focusedElement._selector)}`)
+        //   await this._unhighlightElements(focusedElement);
+        // }
+        let image = await Jimp.read(screenshotBuffer);
+        // Get the image dimensions
+        const { width, height } = image.bitmap;
+        const resizeRatio = viewportWidth / width;
+        // Resize the image to fit within the viewport dimensions without enlarging
+        if (width > viewportWidth) {
+            image = image.resize({ w: viewportWidth, h: height * resizeRatio }); // Resize the image while maintaining aspect ratio
+            await image.write(screenshotPath);
+        }
+        else {
+            fs.writeFileSync(screenshotPath, screenshotBuffer);
+        }
+        return screenshotBuffer;
     }
     async verifyElementExistInPage(selectors, _params = null, options = {}, world = null) {
-        this._validateSelectors(selectors);
-        const startTime = Date.now();
-        let error = null;
-        let screenshotId = null;
-        let screenshotPath = null;
+        const state = {
+            selectors,
+            _params,
+            options,
+            world,
+            type: Types.VERIFY_ELEMENT_CONTAINS_TEXT,
+            text: `Verify element exists in page`,
+            operation: "verifyElementExistInPage",
+            log: "***** verify element " + selectors.element_name + " exists in page *****\n",
+        };
         await new Promise((resolve) => setTimeout(resolve, 2000));
-        const info = {};
-        info.log = "***** verify element " + selectors.element_name + " exists in page *****\n";
-        info.operation = "verify";
-        info.selectors = selectors;
         try {
-            const element = await this._locate(selectors, info, _params);
-            if (element) {
-                await this.scrollIfNeeded(element, info);
-            }
-            await this._highlightElements(element);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            await expect(element).toHaveCount(1, { timeout: 10000 });
-            return info;
+            await _preCommand(state, this);
+            await expect(state.element).toHaveCount(1, { timeout: 10000 });
+            return state.info;
         }
         catch (e) {
-            //await this.closeUnexpectedPopups();
-            this.logger.error("verify failed " + info.log);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            info.screenshotPath = screenshotPath;
-            Object.assign(e, { info: info });
-            error = e;
-            throw e;
+            await _commandError(state, e, this);
         }
         finally {
-            const endTime = Date.now();
-            this._reportToWorld(world, {
-                element_name: selectors.element_name,
-                type: Types.VERIFY_ELEMENT_CONTAINS_TEXT,
-                text: "Verify element exists in page",
-                screenshotId,
-                result: error
-                    ? {
-                        status: "FAILED",
-                        startTime,
-                        endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
-                    }
-                    : {
-                        status: "PASSED",
-                        startTime,
-                        endTime,
-                    },
-                info: info,
-            });
+            await _commandFinally(state, this);
         }
     }
     async extractAttribute(selectors, attribute, variable, _params = null, options = {}, world = null) {
-        this._validateSelectors(selectors);
-        const startTime = Date.now();
-        let error = null;
-        let screenshotId = null;
-        let screenshotPath = null;
+        const state = {
+            selectors,
+            _params,
+            attribute,
+            variable,
+            options,
+            world,
+            type: Types.EXTRACT,
+            text: `Extract attribute from element`,
+            _text: `Extract attribute ${attribute} from ${selectors.element_name}`,
+            operation: "extractAttribute",
+            log: "***** extract attribute " + attribute + " from " + selectors.element_name + " *****\n",
+            allowDisabled: true,
+        };
         await new Promise((resolve) => setTimeout(resolve, 2000));
-        const info = {};
-        info.log = "***** extract attribute " + attribute + " from " + selectors.element_name + " *****\n";
-        info.operation = "extract";
-        info.selectors = selectors;
         try {
-            const element = await this._locate(selectors, info, _params);
-            await this._highlightElements(element);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
+            await _preCommand(state, this);
             switch (attribute) {
                 case "inner_text":
-                    info.value = await element.innerText();
+                    state.value = await state.element.innerText();
                     break;
                 case "href":
-                    info.value = await element.getAttribute("href");
+                    state.value = await state.element.getAttribute("href");
                     break;
                 case "value":
-                    info.value = await element.inputValue();
+                    state.value = await state.element.inputValue();
+                    break;
+                case "text":
+                    state.value = await state.element.textContent();
                     break;
                 default:
-                    info.value = await element.getAttribute(attribute);
+                    state.value = await state.element.getAttribute(attribute);
                     break;
             }
-            this[variable] = info.value;
-            if (world) {
-                world[variable] = info.value;
+            if (options !== null) {
+                if (options.regex && options.regex !== "") {
+                    // Construct a regex pattern from the provided string
+                    const regex = options.regex.slice(1, -1);
+                    const regexPattern = new RegExp(regex, "g");
+                    const matches = state.value.match(regexPattern);
+                    if (matches) {
+                        let newValue = "";
+                        for (const match of matches) {
+                            newValue += match;
+                        }
+                        state.value = newValue;
+                    }
+                }
+                if (options.trimSpaces && options.trimSpaces === true) {
+                    state.value = state.value.trim();
+                }
             }
-            this.setTestData({ [variable]: info.value }, world);
-            this.logger.info("set test data: " + variable + "=" + info.value);
-            return info;
+            state.info.value = state.value;
+            this.setTestData({ [variable]: state.value }, world);
+            this.logger.info("set test data: " + variable + "=" + state.value);
+            // await new Promise((resolve) => setTimeout(resolve, 500));
+            return state.info;
         }
         catch (e) {
-            //await this.closeUnexpectedPopups();
-            this.logger.error("extract failed " + info.log);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            info.screenshotPath = screenshotPath;
-            Object.assign(e, { info: info });
-            error = e;
-            throw e;
+            await _commandError(state, e, this);
         }
         finally {
-            const endTime = Date.now();
-            this._reportToWorld(world, {
-                element_name: selectors.element_name,
-                type: Types.EXTRACT_ATTRIBUTE,
-                variable: variable,
-                value: info.value,
-                text: "Extract attribute from element",
-                screenshotId,
-                result: error
-                    ? {
-                        status: "FAILED",
-                        startTime,
-                        endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
+            await _commandFinally(state, this);
+        }
+    }
+    async extractProperty(selectors, property, variable, _params = null, options = {}, world = null) {
+        const state = {
+            selectors,
+            _params,
+            property,
+            variable,
+            options,
+            world,
+            type: Types.EXTRACT_PROPERTY,
+            text: `Extract property from element`,
+            _text: `Extract property ${property} from ${selectors.element_name}`,
+            operation: "extractProperty",
+            log: "***** extract property " + property + " from " + selectors.element_name + " *****\n",
+            allowDisabled: true,
+        };
+        await new Promise((resolve) => setTimeout(resolve, 2000));
+        try {
+            await _preCommand(state, this);
+            switch (property) {
+                case "inner_text":
+                    state.value = await state.element.innerText();
+                    break;
+                case "href":
+                    state.value = await state.element.getAttribute("href");
+                    break;
+                case "value":
+                    state.value = await state.element.inputValue();
+                    break;
+                case "text":
+                    state.value = await state.element.textContent();
+                    break;
+                default:
+                    if (property.startsWith("dataset.")) {
+                        const dataAttribute = property.substring(8);
+                        state.value = String(await state.element.getAttribute(`data-${dataAttribute}`)) || "";
                     }
-                    : {
-                        status: "PASSED",
-                        startTime,
-                        endTime,
-                    },
-                info: info,
-            });
+                    else {
+                        state.value = String(await state.element.evaluate((element, prop) => element[prop], property));
+                    }
+            }
+            if (options !== null) {
+                if (options.regex && options.regex !== "") {
+                    // Construct a regex pattern from the provided string
+                    const regex = options.regex.slice(1, -1);
+                    const regexPattern = new RegExp(regex, "g");
+                    const matches = state.value.match(regexPattern);
+                    if (matches) {
+                        let newValue = "";
+                        for (const match of matches) {
+                            newValue += match;
+                        }
+                        state.value = newValue;
+                    }
+                }
+                if (options.trimSpaces && options.trimSpaces === true) {
+                    state.value = state.value.trim();
+                }
+            }
+            state.info.value = state.value;
+            this.setTestData({ [variable]: state.value }, world);
+            this.logger.info("set test data: " + variable + "=" + state.value);
+            // await new Promise((resolve) => setTimeout(resolve, 500));
+            return state.info;
+        }
+        catch (e) {
+            await _commandError(state, e, this);
+        }
+        finally {
+            await _commandFinally(state, this);
+        }
+    }
+    async verifyAttribute(selectors, attribute, value, _params = null, options = {}, world = null) {
+        const state = {
+            selectors,
+            _params,
+            attribute,
+            value,
+            options,
+            world,
+            type: Types.VERIFY_ATTRIBUTE,
+            highlight: true,
+            screenshot: true,
+            text: `Verify element attribute`,
+            _text: `Verify attribute ${attribute} from ${selectors.element_name} is ${value}`,
+            operation: "verifyAttribute",
+            log: "***** verify attribute " + attribute + " from " + selectors.element_name + " *****\n",
+            allowDisabled: true,
+        };
+        await new Promise((resolve) => setTimeout(resolve, 2000));
+        let val;
+        let expectedValue;
+        try {
+            await _preCommand(state, this);
+            expectedValue = await replaceWithLocalTestData(state.value, world);
+            state.info.expectedValue = expectedValue;
+            switch (attribute) {
+                case "innerText":
+                    val = String(await state.element.innerText());
+                    break;
+                case "text":
+                    val = String(await state.element.textContent());
+                    break;
+                case "value":
+                    val = String(await state.element.inputValue());
+                    break;
+                case "checked":
+                    val = String(await state.element.isChecked());
+                    break;
+                case "disabled":
+                    val = String(await state.element.isDisabled());
+                    break;
+                case "readOnly":
+                    const isEditable = await state.element.isEditable();
+                    val = String(!isEditable);
+                    break;
+                default:
+                    val = String(await state.element.getAttribute(attribute));
+                    break;
+            }
+            state.info.value = val;
+            let regex;
+            if (expectedValue.startsWith("/") && expectedValue.endsWith("/")) {
+                const patternBody = expectedValue.slice(1, -1);
+                const processedPattern = patternBody.replace(/\n/g, ".*");
+                regex = new RegExp(processedPattern, "gs");
+                state.info.regex = true;
+            }
+            else {
+                const escapedPattern = expectedValue.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+                regex = new RegExp(escapedPattern, "g");
+            }
+            if (attribute === "innerText") {
+                if (state.info.regex) {
+                    if (!regex.test(val)) {
+                        let errorMessage = `The ${attribute} attribute has a value of "${val}", but the expected value is "${expectedValue}"`;
+                        state.info.failCause.assertionFailed = true;
+                        state.info.failCause.lastError = errorMessage;
+                        throw new Error(errorMessage);
+                    }
+                }
+                else {
+                    const valLines = val.split("\n");
+                    const expectedLines = expectedValue.split("\n");
+                    const isPart = expectedLines.every((expectedLine) => valLines.some((valLine) => valLine === expectedLine));
+                    if (!isPart) {
+                        let errorMessage = `The ${attribute} attribute has a value of "${val}", but the expected value is "${expectedValue}"`;
+                        state.info.failCause.assertionFailed = true;
+                        state.info.failCause.lastError = errorMessage;
+                        throw new Error(errorMessage);
+                    }
+                }
+            }
+            else {
+                if (!val.match(regex)) {
+                    let errorMessage = `The ${attribute} attribute has a value of "${val}", but the expected value is "${expectedValue}"`;
+                    state.info.failCause.assertionFailed = true;
+                    state.info.failCause.lastError = errorMessage;
+                    throw new Error(errorMessage);
+                }
+            }
+            return state.info;
+        }
+        catch (e) {
+            await _commandError(state, e, this);
+        }
+        finally {
+            await _commandFinally(state, this);
+        }
+    }
+    async verifyProperty(selectors, property, value, _params = null, options = {}, world = null) {
+        const state = {
+            selectors,
+            _params,
+            property,
+            value,
+            options,
+            world,
+            type: Types.VERIFY_PROPERTY,
+            highlight: true,
+            screenshot: true,
+            text: `Verify element property`,
+            _text: `Verify property ${property} from ${selectors.element_name} is ${value}`,
+            operation: "verifyProperty",
+            log: "***** verify property " + property + " from " + selectors.element_name + " *****\n",
+            allowDisabled: true,
+        };
+        await new Promise((resolve) => setTimeout(resolve, 2000));
+        let val;
+        let expectedValue;
+        try {
+            await _preCommand(state, this);
+            expectedValue = await replaceWithLocalTestData(state.value, world);
+            state.info.expectedValue = expectedValue;
+            switch (property) {
+                case "innerText":
+                    val = String(await state.element.innerText());
+                    break;
+                case "text":
+                    val = String(await state.element.textContent());
+                    break;
+                case "value":
+                    val = String(await state.element.inputValue());
+                    break;
+                case "checked":
+                    val = String(await state.element.isChecked());
+                    break;
+                case "disabled":
+                    val = String(await state.element.isDisabled());
+                    break;
+                case "readOnly":
+                    const isEditable = await state.element.isEditable();
+                    val = String(!isEditable);
+                    break;
+                case "innerHTML":
+                    val = String(await state.element.innerHTML());
+                    break;
+                case "outerHTML":
+                    val = String(await state.element.evaluate((element) => element.outerHTML));
+                    break;
+                default:
+                    if (property.startsWith("dataset.")) {
+                        const dataAttribute = property.substring(8);
+                        val = String(await state.element.getAttribute(`data-${dataAttribute}`)) || "";
+                    }
+                    else {
+                        val = String(await state.element.evaluate((element, prop) => element[prop], property));
+                    }
+            }
+            // Helper function to remove all style="" attributes
+            const removeStyleAttributes = (htmlString) => {
+                return htmlString.replace(/\s*style\s*=\s*"[^"]*"/gi, "");
+            };
+            // Remove style attributes for innerHTML and outerHTML properties
+            if (property === "innerHTML" || property === "outerHTML") {
+                val = removeStyleAttributes(val);
+                expectedValue = removeStyleAttributes(expectedValue);
+            }
+            state.info.value = val;
+            let regex;
+            if (expectedValue.startsWith("/") && expectedValue.endsWith("/")) {
+                const patternBody = expectedValue.slice(1, -1);
+                const processedPattern = patternBody.replace(/\n/g, ".*");
+                regex = new RegExp(processedPattern, "gs");
+                state.info.regex = true;
+            }
+            else {
+                const escapedPattern = expectedValue.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+                regex = new RegExp(escapedPattern, "g");
+            }
+            if (property === "innerText") {
+                if (state.info.regex) {
+                    if (!regex.test(val)) {
+                        let errorMessage = `The ${property} property has a value of "${val}", but the expected value is "${expectedValue}"`;
+                        state.info.failCause.assertionFailed = true;
+                        state.info.failCause.lastError = errorMessage;
+                        throw new Error(errorMessage);
+                    }
+                }
+                else {
+                    // Fix: Replace escaped newlines with actual newlines before splitting
+                    const normalizedExpectedValue = expectedValue.replace(/\\n/g, "\n");
+                    const valLines = val.split("\n");
+                    const expectedLines = normalizedExpectedValue.split("\n");
+                    // Check if all expected lines are present in the actual lines
+                    const isPart = expectedLines.every((expectedLine) => valLines.some((valLine) => valLine.trim() === expectedLine.trim()));
+                    if (!isPart) {
+                        let errorMessage = `The ${property} property has a value of "${val}", but the expected value is "${expectedValue}"`;
+                        state.info.failCause.assertionFailed = true;
+                        state.info.failCause.lastError = errorMessage;
+                        throw new Error(errorMessage);
+                    }
+                }
+            }
+            else {
+                if (!val.match(regex)) {
+                    let errorMessage = `The ${property} property has a value of "${val}", but the expected value is "${expectedValue}"`;
+                    state.info.failCause.assertionFailed = true;
+                    state.info.failCause.lastError = errorMessage;
+                    throw new Error(errorMessage);
+                }
+            }
+            return state.info;
+        }
+        catch (e) {
+            await _commandError(state, e, this);
+        }
+        finally {
+            await _commandFinally(state, this);
         }
     }
     async extractEmailData(emailAddress, options, world) {
@@ -1997,7 +2496,7 @@ class StableBrowser {
         if (options && options.timeout) {
             timeout = options.timeout;
         }
-        const serviceUrl = this._getServerUrl() + "/api/mail/createLinkOrCodeFromEmail";
+        const serviceUrl = _getServerUrl() + "/api/mail/createLinkOrCodeFromEmail";
         const request = {
             method: "POST",
             url: serviceUrl,
@@ -2053,7 +2552,8 @@ class StableBrowser {
             catch (e) {
                 errorCount++;
                 if (errorCount > 3) {
-                    throw e;
+                    // throw e;
+                    await _commandError({ text: "extractEmailData", operation: "extractEmailData", emailAddress, info: {} }, e, this);
                 }
                 // ignore
             }
@@ -2067,27 +2567,32 @@ class StableBrowser {
     async _highlightElements(scope, css) {
         try {
             if (!scope) {
+                // console.log(`Scope is not defined`);
                 return;
             }
             if (!css) {
                 scope
                     .evaluate((node) => {
                     if (node && node.style) {
-                        let originalBorder = node.style.border;
-                        node.style.border = "2px solid red";
+                        let originalOutline = node.style.outline;
+                        // console.log(`Original outline was: ${originalOutline}`);
+                        // node.__previousOutline = originalOutline;
+                        node.style.outline = "2px solid red";
+                        // console.log(`New outline is: ${node.style.outline}`);
                         if (window) {
                             window.addEventListener("beforeunload", function (e) {
-                                node.style.border = originalBorder;
+                                node.style.outline = originalOutline;
                             });
                         }
                         setTimeout(function () {
-                            node.style.border = originalBorder;
+                            node.style.outline = originalOutline;
                         }, 2000);
                     }
                 })
                     .then(() => { })
                     .catch((e) => {
                     // ignore
+                    // console.error(`Could not highlight node : ${e}`);
                 });
             }
             else {
@@ -2103,17 +2608,18 @@ class StableBrowser {
                         if (!element.style) {
                             return;
                         }
-                        var originalBorder = element.style.border;
+                        let originalOutline = element.style.outline;
+                        element.__previousOutline = originalOutline;
                         // Set the new border to be red and 2px solid
-                        element.style.border = "2px solid red";
+                        element.style.outline = "2px solid red";
                         if (window) {
                             window.addEventListener("beforeunload", function (e) {
-                                element.style.border = originalBorder;
+                                element.style.outline = originalOutline;
                             });
                         }
                         // Set a timeout to revert to the original border after 2 seconds
                         setTimeout(function () {
-                            element.style.border = originalBorder;
+                            element.style.outline = originalOutline;
                         }, 2000);
                     }
                     return;
@@ -2121,6 +2627,7 @@ class StableBrowser {
                     .then(() => { })
                     .catch((e) => {
                     // ignore
+                    // console.error(`Could not highlight css: ${e}`);
                 });
             }
         }
@@ -2128,173 +2635,563 @@ class StableBrowser {
             console.debug(error);
         }
     }
+    _matcher(text) {
+        if (!text) {
+            return { matcher: "contains", queryText: "" };
+        }
+        if (text.length < 2) {
+            return { matcher: "contains", queryText: text };
+        }
+        const split = text.split(":");
+        const matcher = split[0].toLowerCase();
+        const queryText = split.slice(1).join(":").trim();
+        return { matcher, queryText };
+    }
+    _getDomain(url) {
+        if (url.length === 0 || (!url.startsWith("http://") && !url.startsWith("https://"))) {
+            return "";
+        }
+        let hostnameFragments = url.split("/")[2].split(".");
+        if (hostnameFragments.some((fragment) => fragment.includes(":"))) {
+            return hostnameFragments.join("-").split(":").join("-");
+        }
+        let n = hostnameFragments.length;
+        let fragments = [...hostnameFragments];
+        while (n > 0 && hostnameFragments[n - 1].length <= 3) {
+            hostnameFragments.pop();
+            n = hostnameFragments.length;
+        }
+        if (n == 0) {
+            if (fragments[0] === "www")
+                fragments = fragments.slice(1);
+            return fragments.length > 1 ? fragments.slice(0, fragments.length - 1).join("-") : fragments.join("-");
+        }
+        if (hostnameFragments[0] === "www")
+            hostnameFragments = hostnameFragments.slice(1);
+        return hostnameFragments.join(".");
+    }
+    /**
+     * Verify the page path matches the given path.
+     * @param {string} pathPart - The path to verify.
+     * @param {object} options - Options for verification.
+     * @param {object} world - The world context.
+     * @returns {Promise<object>} - The state info after verification.
+     */
     async verifyPagePath(pathPart, options = {}, world = null) {
-        const startTime = Date.now();
         let error = null;
         let screenshotId = null;
         let screenshotPath = null;
         await new Promise((resolve) => setTimeout(resolve, 2000));
-        const info = {};
-        info.log = "***** verify page path " + pathPart + " *****\n";
-        info.operation = "verifyPagePath";
-        const newValue = await this._replaceWithLocalData(pathPart, world);
-        if (newValue !== pathPart) {
-            this.logger.info(pathPart + "=" + newValue);
-            pathPart = newValue;
+        const info = {};
+        info.log = "***** verify page path " + pathPart + " *****\n";
+        info.operation = "verifyPagePath";
+        const newValue = await this._replaceWithLocalData(pathPart, world);
+        if (newValue !== pathPart) {
+            this.logger.info(pathPart + "=" + newValue);
+            pathPart = newValue;
+        }
+        info.pathPart = pathPart;
+        const { matcher, queryText } = this._matcher(pathPart);
+        const state = {
+            text_search: queryText,
+            options,
+            world,
+            locate: false,
+            scroll: false,
+            highlight: false,
+            type: Types.VERIFY_PAGE_PATH,
+            text: `Verify the page url is ${queryText}`,
+            _text: `Verify the page url is ${queryText}`,
+            operation: "verifyPagePath",
+            log: "***** verify page url is " + queryText + " *****\n",
+        };
+        try {
+            await _preCommand(state, this);
+            state.info.text = queryText;
+            for (let i = 0; i < 30; i++) {
+                const url = await this.page.url();
+                switch (matcher) {
+                    case "exact":
+                        if (url !== queryText) {
+                            if (i === 29) {
+                                throw new Error(`Page URL ${url} is not equal to ${queryText}`);
+                            }
+                            await new Promise((resolve) => setTimeout(resolve, 1000));
+                            continue;
+                        }
+                        break;
+                    case "contains":
+                        if (!url.includes(queryText)) {
+                            if (i === 29) {
+                                throw new Error(`Page URL ${url} doesn't contain ${queryText}`);
+                            }
+                            await new Promise((resolve) => setTimeout(resolve, 1000));
+                            continue;
+                        }
+                        break;
+                    case "starts-with":
+                        {
+                            const domain = this._getDomain(url);
+                            if (domain.length > 0 && domain !== queryText) {
+                                if (i === 29) {
+                                    throw new Error(`Page URL ${url} doesn't start with ${queryText}`);
+                                }
+                                await new Promise((resolve) => setTimeout(resolve, 1000));
+                                continue;
+                            }
+                        }
+                        break;
+                    case "ends-with":
+                        {
+                            const urlObj = new URL(url);
+                            let route = "/";
+                            if (urlObj.pathname !== "/") {
+                                route = urlObj.pathname.split("/").slice(-1)[0].trim();
+                            }
+                            else {
+                                route = "/";
+                            }
+                            if (route !== queryText) {
+                                if (i === 29) {
+                                    throw new Error(`Page URL ${url} doesn't end with ${queryText}`);
+                                }
+                                await new Promise((resolve) => setTimeout(resolve, 1000));
+                                continue;
+                            }
+                        }
+                        break;
+                    case "regex":
+                        const regex = new RegExp(queryText.slice(1, -1), "g");
+                        if (!regex.test(url)) {
+                            if (i === 29) {
+                                throw new Error(`Page URL ${url} doesn't match regex ${queryText}`);
+                            }
+                            await new Promise((resolve) => setTimeout(resolve, 1000));
+                            continue;
+                        }
+                        break;
+                    default:
+                        console.log("Unknown matching type, defaulting to contains matching");
+                        if (!url.includes(pathPart)) {
+                            if (i === 29) {
+                                throw new Error(`Page URL ${url} does not contain ${pathPart}`);
+                            }
+                            await new Promise((resolve) => setTimeout(resolve, 1000));
+                            continue;
+                        }
+                }
+                await _screenshot(state, this);
+                return state.info;
+            }
+        }
+        catch (e) {
+            state.info.failCause.lastError = e.message;
+            state.info.failCause.assertionFailed = true;
+            await _commandError(state, e, this);
+        }
+        finally {
+            await _commandFinally(state, this);
+        }
+    }
+    /**
+     * Verify the page title matches the given title.
+     * @param {string} title - The title to verify.
+     * @param {object} options - Options for verification.
+     * @param {object} world - The world context.
+     * @returns {Promise<object>} - The state info after verification.
+     */
+    async verifyPageTitle(title, options = {}, world = null) {
+        let error = null;
+        let screenshotId = null;
+        let screenshotPath = null;
+        await new Promise((resolve) => setTimeout(resolve, 2000));
+        const newValue = await this._replaceWithLocalData(title, world);
+        if (newValue !== title) {
+            this.logger.info(title + "=" + newValue);
+            title = newValue;
+        }
+        const { matcher, queryText } = this._matcher(title);
+        const state = {
+            text_search: queryText,
+            options,
+            world,
+            locate: false,
+            scroll: false,
+            highlight: false,
+            type: Types.VERIFY_PAGE_TITLE,
+            text: `Verify the page title is ${queryText}`,
+            _text: `Verify the page title is ${queryText}`,
+            operation: "verifyPageTitle",
+            log: "***** verify page title is " + queryText + " *****\n",
+        };
+        try {
+            await _preCommand(state, this);
+            state.info.text = queryText;
+            for (let i = 0; i < 30; i++) {
+                const foundTitle = await this.page.title();
+                switch (matcher) {
+                    case "exact":
+                        if (foundTitle !== queryText) {
+                            if (i === 29) {
+                                throw new Error(`Page Title ${foundTitle} is not equal to ${queryText}`);
+                            }
+                            await new Promise((resolve) => setTimeout(resolve, 1000));
+                            continue;
+                        }
+                        break;
+                    case "contains":
+                        if (!foundTitle.includes(queryText)) {
+                            if (i === 29) {
+                                throw new Error(`Page Title ${foundTitle} doesn't contain ${queryText}`);
+                            }
+                            await new Promise((resolve) => setTimeout(resolve, 1000));
+                            continue;
+                        }
+                        break;
+                    case "starts-with":
+                        if (!foundTitle.startsWith(queryText)) {
+                            if (i === 29) {
+                                throw new Error(`Page title ${foundTitle} doesn't start with ${queryText}`);
+                            }
+                            await new Promise((resolve) => setTimeout(resolve, 1000));
+                            continue;
+                        }
+                        break;
+                    case "ends-with":
+                        if (!foundTitle.endsWith(queryText)) {
+                            if (i === 29) {
+                                throw new Error(`Page Title ${foundTitle} doesn't end with ${queryText}`);
+                            }
+                            await new Promise((resolve) => setTimeout(resolve, 1000));
+                            continue;
+                        }
+                        break;
+                    case "regex":
+                        const regex = new RegExp(queryText.slice(1, -1), "g");
+                        if (!regex.test(foundTitle)) {
+                            if (i === 29) {
+                                throw new Error(`Page Title ${foundTitle} doesn't match regex ${queryText}`);
+                            }
+                            await new Promise((resolve) => setTimeout(resolve, 1000));
+                            continue;
+                        }
+                        break;
+                    default:
+                        console.log("Unknown matching type, defaulting to contains matching");
+                        if (!foundTitle.includes(title)) {
+                            if (i === 29) {
+                                throw new Error(`Page Title ${foundTitle} does not contain ${title}`);
+                            }
+                            await new Promise((resolve) => setTimeout(resolve, 1000));
+                            continue;
+                        }
+                }
+                await _screenshot(state, this);
+                return state.info;
+            }
+        }
+        catch (e) {
+            state.info.failCause.lastError = e.message;
+            state.info.failCause.assertionFailed = true;
+            await _commandError(state, e, this);
+        }
+        finally {
+            await _commandFinally(state, this);
+        }
+    }
+    async findTextInAllFrames(dateAlternatives, numberAlternatives, text, state, partial = true, ignoreCase = false) {
+        const frames = this.page.frames();
+        let results = [];
+        // let ignoreCase = false;
+        for (let i = 0; i < frames.length; i++) {
+            if (dateAlternatives.date) {
+                for (let j = 0; j < dateAlternatives.dates.length; j++) {
+                    const result = await this._locateElementByText(frames[i], dateAlternatives.dates[j], "*:not(script, style, head)", false, partial, ignoreCase, {});
+                    result.frame = frames[i];
+                    results.push(result);
+                }
+            }
+            else if (numberAlternatives.number) {
+                for (let j = 0; j < numberAlternatives.numbers.length; j++) {
+                    const result = await this._locateElementByText(frames[i], numberAlternatives.numbers[j], "*:not(script, style, head)", false, partial, ignoreCase, {});
+                    result.frame = frames[i];
+                    results.push(result);
+                }
+            }
+            else {
+                const result = await this._locateElementByText(frames[i], text, "*:not(script, style, head)", false, partial, ignoreCase, {});
+                result.frame = frames[i];
+                results.push(result);
+            }
+        }
+        state.info.results = results;
+        const resultWithElementsFound = results.filter((result) => result.elementCount > 0);
+        return resultWithElementsFound;
+    }
+    async verifyTextExistInPage(text, options = {}, world = null) {
+        text = unEscapeString(text);
+        const state = {
+            text_search: text,
+            options,
+            world,
+            locate: false,
+            scroll: false,
+            highlight: false,
+            type: Types.VERIFY_PAGE_CONTAINS_TEXT,
+            text: `Verify the text '${maskValue(text)}' exists in page`,
+            _text: `Verify the text '${text}' exists in page`,
+            operation: "verifyTextExistInPage",
+            log: "***** verify text " + text + " exists in page *****\n",
+        };
+        if (testForRegex(text)) {
+            text = text.replace(/\\"/g, '"');
+        }
+        const timeout = this._getFindElementTimeout(options);
+        await new Promise((resolve) => setTimeout(resolve, 2000));
+        const newValue = await this._replaceWithLocalData(text, world);
+        if (newValue !== text) {
+            this.logger.info(text + "=" + newValue);
+            text = newValue;
         }
-        info.pathPart = pathPart;
+        let dateAlternatives = findDateAlternatives(text);
+        let numberAlternatives = findNumberAlternatives(text);
         try {
-            for (let i = 0; i < 30; i++) {
-                const url = await this.page.url();
-                if (!url.includes(pathPart)) {
-                    if (i === 29) {
-                        throw new Error(`url ${url} doesn't contain ${pathPart}`);
+            await _preCommand(state, this);
+            state.info.text = text;
+            while (true) {
+                let resultWithElementsFound = {
+                    length: 0,
+                };
+                try {
+                    resultWithElementsFound = await this.findTextInAllFrames(dateAlternatives, numberAlternatives, text, state);
+                }
+                catch (error) {
+                    // ignore
+                }
+                if (resultWithElementsFound.length === 0) {
+                    if (Date.now() - state.startTime > timeout) {
+                        throw new Error(`Text ${text} not found in page`);
                     }
                     await new Promise((resolve) => setTimeout(resolve, 1000));
                     continue;
                 }
-                ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-                return info;
+                try {
+                    if (resultWithElementsFound[0].randomToken) {
+                        const frame = resultWithElementsFound[0].frame;
+                        const dataAttribute = `[data-blinq-id-${resultWithElementsFound[0].randomToken}]`;
+                        await this._highlightElements(frame, dataAttribute);
+                        const element = await frame.locator(dataAttribute).first();
+                        if (element) {
+                            await this.scrollIfNeeded(element, state.info);
+                            await element.dispatchEvent("bvt_verify_page_contains_text");
+                        }
+                    }
+                    await _screenshot(state, this);
+                    return state.info;
+                }
+                catch (error) {
+                    console.error(error);
+                }
             }
         }
         catch (e) {
-            //await this.closeUnexpectedPopups();
-            this.logger.error("verify page path failed " + info.log);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            info.screenshotPath = screenshotPath;
-            Object.assign(e, { info: info });
-            error = e;
-            throw e;
+            await _commandError(state, e, this);
         }
         finally {
-            const endTime = Date.now();
-            this._reportToWorld(world, {
-                type: Types.VERIFY_PAGE_PATH,
-                text: "Verify page path",
-                screenshotId,
-                result: error
-                    ? {
-                        status: "FAILED",
-                        startTime,
-                        endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
-                    }
-                    : {
-                        status: "PASSED",
-                        startTime,
-                        endTime,
-                    },
-                info: info,
-            });
+            await _commandFinally(state, this);
         }
     }
-    async verifyTextExistInPage(text, options = {}, world = null) {
-        const startTime = Date.now();
-        const timeout = this._getLoadTimeout(options);
-        let error = null;
-        let screenshotId = null;
-        let screenshotPath = null;
+    async waitForTextToDisappear(text, options = {}, world = null) {
+        text = unEscapeString(text);
+        const state = {
+            text_search: text,
+            options,
+            world,
+            locate: false,
+            scroll: false,
+            highlight: false,
+            type: Types.WAIT_FOR_TEXT_TO_DISAPPEAR,
+            text: `Verify the text '${maskValue(text)}' does not exist in page`,
+            _text: `Verify the text '${text}' does not exist in page`,
+            operation: "verifyTextNotExistInPage",
+            log: "***** verify text " + text + " does not exist in page *****\n",
+        };
+        if (testForRegex(text)) {
+            text = text.replace(/\\"/g, '"');
+        }
+        const timeout = this._getFindElementTimeout(options);
         await new Promise((resolve) => setTimeout(resolve, 2000));
-        const info = {};
-        info.log = "***** verify text " + text + " exists in page *****\n";
-        info.operation = "verifyTextExistInPage";
         const newValue = await this._replaceWithLocalData(text, world);
         if (newValue !== text) {
             this.logger.info(text + "=" + newValue);
             text = newValue;
         }
-        info.text = text;
         let dateAlternatives = findDateAlternatives(text);
         let numberAlternatives = findNumberAlternatives(text);
         try {
+            await _preCommand(state, this);
+            state.info.text = text;
+            let resultWithElementsFound = {
+                length: null, // initial cannot be 0
+            };
             while (true) {
-                const frames = this.page.frames();
-                let results = [];
-                for (let i = 0; i < frames.length; i++) {
-                    if (dateAlternatives.date) {
-                        for (let j = 0; j < dateAlternatives.dates.length; j++) {
-                            const result = await this._locateElementByText(frames[i], dateAlternatives.dates[j], "*", true, {});
-                            result.frame = frames[i];
-                            results.push(result);
-                        }
-                    }
-                    else if (numberAlternatives.number) {
-                        for (let j = 0; j < numberAlternatives.numbers.length; j++) {
-                            const result = await this._locateElementByText(frames[i], numberAlternatives.numbers[j], "*", true, {});
-                            result.frame = frames[i];
-                            results.push(result);
-                        }
-                    }
-                    else {
-                        const result = await this._locateElementByText(frames[i], text, "*", true, {});
-                        result.frame = frames[i];
-                        results.push(result);
-                    }
+                try {
+                    resultWithElementsFound = await this.findTextInAllFrames(dateAlternatives, numberAlternatives, text, state);
+                }
+                catch (error) {
+                    // ignore
                 }
-                info.results = results;
-                const resultWithElementsFound = results.filter((result) => result.elementCount > 0);
                 if (resultWithElementsFound.length === 0) {
-                    if (Date.now() - startTime > timeout) {
-                        throw new Error(`Text ${text} not found in page`);
+                    await _screenshot(state, this);
+                    return state.info;
+                }
+                if (Date.now() - state.startTime > timeout) {
+                    throw new Error(`Text ${text} found in page`);
+                }
+                await new Promise((resolve) => setTimeout(resolve, 1000));
+            }
+        }
+        catch (e) {
+            await _commandError(state, e, this);
+        }
+        finally {
+            await _commandFinally(state, this);
+        }
+    }
+    async verifyTextRelatedToText(textAnchor, climb, textToVerify, options = {}, world = null) {
+        textAnchor = unEscapeString(textAnchor);
+        textToVerify = unEscapeString(textToVerify);
+        const state = {
+            text_search: textToVerify,
+            options,
+            world,
+            locate: false,
+            scroll: false,
+            highlight: false,
+            type: Types.VERIFY_TEXT_WITH_RELATION,
+            text: `Verify text with relation to another text`,
+            _text: "Search for " + textAnchor + " climb " + climb + " and verify " + textToVerify + " found",
+            operation: "verify_text_with_relation",
+            log: "***** search for " + textAnchor + " climb " + climb + " and verify " + textToVerify + " found *****\n",
+        };
+        const timeout = this._getFindElementTimeout(options);
+        await new Promise((resolve) => setTimeout(resolve, 2000));
+        let newValue = await this._replaceWithLocalData(textAnchor, world);
+        if (newValue !== textAnchor) {
+            this.logger.info(textAnchor + "=" + newValue);
+            textAnchor = newValue;
+        }
+        newValue = await this._replaceWithLocalData(textToVerify, world);
+        if (newValue !== textToVerify) {
+            this.logger.info(textToVerify + "=" + newValue);
+            textToVerify = newValue;
+        }
+        let dateAlternatives = findDateAlternatives(textToVerify);
+        let numberAlternatives = findNumberAlternatives(textToVerify);
+        let foundAncore = false;
+        try {
+            await _preCommand(state, this);
+            state.info.text = textToVerify;
+            let resultWithElementsFound = {
+                length: 0,
+            };
+            while (true) {
+                try {
+                    resultWithElementsFound = await this.findTextInAllFrames(findDateAlternatives(textAnchor), findNumberAlternatives(textAnchor), textAnchor, state, false);
+                }
+                catch (error) {
+                    // ignore
+                }
+                if (resultWithElementsFound.length === 0) {
+                    if (Date.now() - state.startTime > timeout) {
+                        throw new Error(`Text ${foundAncore ? textToVerify : textAnchor} not found in page`);
                     }
                     await new Promise((resolve) => setTimeout(resolve, 1000));
                     continue;
                 }
-                if (resultWithElementsFound[0].randomToken) {
-                    const frame = resultWithElementsFound[0].frame;
-                    const dataAttribute = `[data-blinq-id="blinq-id-${resultWithElementsFound[0].randomToken}"]`;
-                    await this._highlightElements(frame, dataAttribute);
-                    const element = await frame.$(dataAttribute);
-                    if (element) {
-                        await this.scrollIfNeeded(element, info);
-                        await element.dispatchEvent("bvt_verify_page_contains_text");
+                try {
+                    for (let i = 0; i < resultWithElementsFound.length; i++) {
+                        foundAncore = true;
+                        const result = resultWithElementsFound[i];
+                        const token = result.randomToken;
+                        const frame = result.frame;
+                        let css = `[data-blinq-id-${token}]`;
+                        const climbArray1 = [];
+                        for (let i = 0; i < climb; i++) {
+                            climbArray1.push("..");
+                        }
+                        let climbXpath = "xpath=" + climbArray1.join("/");
+                        css = css + " >> " + climbXpath;
+                        const count = await frame.locator(css).count();
+                        for (let j = 0; j < count; j++) {
+                            const continer = await frame.locator(css).nth(j);
+                            const result = await this._locateElementByText(continer, textToVerify, "*:not(script, style, head)", false, true, true, {});
+                            if (result.elementCount > 0) {
+                                const dataAttribute = "[data-blinq-id-" + result.randomToken + "]";
+                                await this._highlightElements(frame, dataAttribute);
+                                //const cssAnchor = `[data-blinq-id="blinq-id-${token}-anchor"]`;
+                                // if (world && world.screenshot && !world.screenshotPath) {
+                                // console.log(`Highlighting for vtrt while running from recorder`);
+                                // this._highlightElements(frame, dataAttribute)
+                                // .then(async () => {
+                                // await new Promise((resolve) => setTimeout(resolve, 1000));
+                                // this._unhighlightElements(frame, dataAttribute).then(
+                                // () => {}
+                                // console.log(`Unhighlighting vrtr in recorder is successful`)
+                                // );
+                                // })
+                                // .catch(e);
+                                // }
+                                //await this._highlightElements(frame, cssAnchor);
+                                const element = await frame.locator(dataAttribute).first();
+                                // await new Promise((resolve) => setTimeout(resolve, 100));
+                                // await this._unhighlightElements(frame, dataAttribute);
+                                if (element) {
+                                    await this.scrollIfNeeded(element, state.info);
+                                    await element.dispatchEvent("bvt_verify_page_contains_text");
+                                }
+                                await _screenshot(state, this);
+                                return state.info;
+                            }
+                        }
                     }
                 }
-                ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-                return info;
+                catch (error) {
+                    console.error(error);
+                }
             }
             // await expect(element).toHaveCount(1, { timeout: 10000 });
         }
         catch (e) {
-            //await this.closeUnexpectedPopups();
-            this.logger.error("verify text exist in page failed " + info.log);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-            info.screenshotPath = screenshotPath;
-            Object.assign(e, { info: info });
-            error = e;
-            throw e;
+            await _commandError(state, e, this);
         }
         finally {
-            const endTime = Date.now();
-            this._reportToWorld(world, {
-                type: Types.VERIFY_ELEMENT_CONTAINS_TEXT,
-                text: "Verify text exists in page",
-                screenshotId,
-                result: error
-                    ? {
-                        status: "FAILED",
-                        startTime,
-                        endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
-                    }
-                    : {
-                        status: "PASSED",
-                        startTime,
-                        endTime,
-                    },
-                info: info,
-            });
+            await _commandFinally(state, this);
         }
     }
-    _getServerUrl() {
-        let serviceUrl = "https://api.blinq.io";
-        if (process.env.NODE_ENV_BLINQ === "dev") {
-            serviceUrl = "https://dev.api.blinq.io";
-        }
-        else if (process.env.NODE_ENV_BLINQ === "stage") {
-            serviceUrl = "https://stage.api.blinq.io";
+    async findRelatedTextInAllFrames(textAnchor, climb, textToVerify, params = {}, options = {}, world = null) {
+        const frames = this.page.frames();
+        let results = [];
+        let ignoreCase = false;
+        for (let i = 0; i < frames.length; i++) {
+            const result = await this._locateElementByText(frames[i], textAnchor, "*:not(script, style, head)", false, true, ignoreCase, {});
+            result.frame = frames[i];
+            const climbArray = [];
+            for (let i = 0; i < climb; i++) {
+                climbArray.push("..");
+            }
+            let climbXpath = "xpath=" + climbArray.join("/");
+            const newLocator = `[data-blinq-id-${result.randomToken}] ${climb > 0 ? ">> " + climbXpath : ""} >> internal:text=${testForRegex(textToVerify) ? textToVerify : unEscapeString(textToVerify)}`;
+            const count = await frames[i].locator(newLocator).count();
+            if (count > 0) {
+                result.elementCount = count;
+                result.locator = newLocator;
+                results.push(result);
+            }
         }
-        return serviceUrl;
+        // state.info.results = results;
+        const resultWithElementsFound = results.filter((result) => result.elementCount > 0);
+        return resultWithElementsFound;
     }
     async visualVerification(text, options = {}, world = null) {
         const startTime = Date.now();
@@ -2310,14 +3207,17 @@ class StableBrowser {
             throw new Error("TOKEN is not set");
         }
         try {
-            let serviceUrl = this._getServerUrl();
+            let serviceUrl = _getServerUrl();
             ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
             info.screenshotPath = screenshotPath;
             const screenshot = await this.takeScreenshot();
-            const request = {
-                method: "POST",
+            let request = {
+                method: "post",
+                maxBodyLength: Infinity,
                 url: `${serviceUrl}/api/runs/screenshots/validate-screenshot`,
                 headers: {
+                    "x-bvt-project-id": path.basename(this.project_path),
+                    "x-source": "aaa",
                     "Content-Type": "application/json",
                     Authorization: `Bearer ${process.env.TOKEN}`,
                 },
@@ -2326,7 +3226,7 @@ class StableBrowser {
                     screenshot: screenshot,
                 }),
             };
-            let result = await this.context.api.request(request);
+            const result = await axios.request(request);
             if (result.data.status !== true) {
                 throw new Error("Visual validation failed");
             }
@@ -2346,20 +3246,22 @@ class StableBrowser {
             info.screenshotPath = screenshotPath;
             Object.assign(e, { info: info });
             error = e;
-            throw e;
+            // throw e;
+            await _commandError({ text: "visualVerification", operation: "visualVerification", text, info }, e, this);
         }
         finally {
             const endTime = Date.now();
-            this._reportToWorld(world, {
+            _reportToWorld(world, {
                 type: Types.VERIFY_VISUAL,
                 text: "Visual verification",
+                _text: "Visual verification of " + text,
                 screenshotId,
                 result: error
                     ? {
                         status: "FAILED",
                         startTime,
                         endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
+                        message: error?.message,
                     }
                     : {
                         status: "PASSED",
@@ -2391,13 +3293,14 @@ class StableBrowser {
         this.logger.info("Table data verified");
     }
     async getTableData(selectors, _params = null, options = {}, world = null) {
-        this._validateSelectors(selectors);
+        _validateSelectors(selectors);
         const startTime = Date.now();
         let error = null;
         let screenshotId = null;
         let screenshotPath = null;
         const info = {};
         info.log = "";
+        info.locatorLog = new LocatorLog(selectors);
         info.operation = "getTableData";
         info.selectors = selectors;
         try {
@@ -2413,11 +3316,12 @@ class StableBrowser {
             info.screenshotPath = screenshotPath;
             Object.assign(e, { info: info });
             error = e;
-            throw e;
+            // throw e;
+            await _commandError({ text: "getTableData", operation: "getTableData", selectors, info }, e, this);
         }
         finally {
             const endTime = Date.now();
-            this._reportToWorld(world, {
+            _reportToWorld(world, {
                 element_name: selectors.element_name,
                 type: Types.GET_TABLE_DATA,
                 text: "Get table data",
@@ -2427,7 +3331,7 @@ class StableBrowser {
                         status: "FAILED",
                         startTime,
                         endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
+                        message: error?.message,
                     }
                     : {
                         status: "PASSED",
@@ -2439,7 +3343,7 @@ class StableBrowser {
         }
     }
     async analyzeTable(selectors, query, operator, value, _params = null, options = {}, world = null) {
-        this._validateSelectors(selectors);
+        _validateSelectors(selectors);
         if (!query) {
             throw new Error("query is null");
         }
@@ -2472,7 +3376,7 @@ class StableBrowser {
         info.operation = "analyzeTable";
         info.selectors = selectors;
         info.query = query;
-        query = this._fixUsingParams(query, _params);
+        query = _fixUsingParams(query, _params);
         info.query_fixed = query;
         info.operator = operator;
         info.value = value;
@@ -2578,11 +3482,12 @@ class StableBrowser {
             info.screenshotPath = screenshotPath;
             Object.assign(e, { info: info });
             error = e;
-            throw e;
+            // throw e;
+            await _commandError({ text: "analyzeTable", operation: "analyzeTable", selectors, query, operator, value }, e, this);
         }
         finally {
             const endTime = Date.now();
-            this._reportToWorld(world, {
+            _reportToWorld(world, {
                 element_name: selectors.element_name,
                 type: Types.ANALYZE_TABLE,
                 text: "Analyze table",
@@ -2592,7 +3497,7 @@ class StableBrowser {
                         status: "FAILED",
                         startTime,
                         endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
+                        message: error?.message,
                     }
                     : {
                         status: "PASSED",
@@ -2603,28 +3508,51 @@ class StableBrowser {
             });
         }
     }
-    async _replaceWithLocalData(value, world, _decrypt = true, totpWait = true) {
-        if (!value) {
-            return value;
-        }
-        // find all the accurance of {{(.*?)}} and replace with the value
-        let regex = /{{(.*?)}}/g;
-        let matches = value.match(regex);
-        if (matches) {
-            const testData = this.getTestData(world);
-            for (let i = 0; i < matches.length; i++) {
-                let match = matches[i];
-                let key = match.substring(2, match.length - 2);
-                let newValue = objectPath.get(testData, key, null);
-                if (newValue !== null) {
-                    value = value.replace(match, newValue);
-                }
+    /**
+     * Explicit wait/sleep function that pauses execution for a specified duration
+     * @param duration - Duration to sleep in milliseconds (default: 1000ms)
+     * @param options - Optional configuration object
+     * @param world - Optional world context
+     * @returns Promise that resolves after the specified duration
+     */
+    async sleep(duration = 1000, options = {}, world = null) {
+        const state = {
+            duration,
+            options,
+            world,
+            locate: false,
+            scroll: false,
+            screenshot: false,
+            highlight: false,
+            type: Types.SLEEP,
+            text: `Sleep for ${duration} ms`,
+            _text: `Sleep for ${duration} ms`,
+            operation: "sleep",
+            log: `***** Sleep for ${duration} ms *****\n`,
+        };
+        try {
+            await _preCommand(state, this);
+            if (duration < 0) {
+                throw new Error("Sleep duration cannot be negative");
             }
+            await new Promise((resolve) => setTimeout(resolve, duration));
+            return state.info;
+        }
+        catch (e) {
+            await _commandError(state, e, this);
+        }
+        finally {
+            await _commandFinally(state, this);
+        }
+    }
+    async _replaceWithLocalData(value, world, _decrypt = true, totpWait = true) {
+        try {
+            return await replaceWithLocalTestData(value, world, _decrypt, totpWait, this.context, this);
         }
-        if ((value.startsWith("secret:") || value.startsWith("totp:")) && _decrypt) {
-            return await decrypt(value, null, totpWait);
+        catch (error) {
+            this.logger.debug(error);
+            throw error;
         }
-        return value;
     }
     _getLoadTimeout(options) {
         let timeout = 15000;
@@ -2636,6 +3564,37 @@ class StableBrowser {
         }
         return timeout;
     }
+    _getFindElementTimeout(options) {
+        if (options && options.timeout) {
+            return options.timeout;
+        }
+        if (this.configuration.find_element_timeout) {
+            return this.configuration.find_element_timeout;
+        }
+        return 30000;
+    }
+    async saveStoreState(path = null, world = null) {
+        const storageState = await this.page.context().storageState();
+        path = await this._replaceWithLocalData(path, this.world);
+        //const testDataFile = _getDataFile(world, this.context, this);
+        if (path) {
+            // save { storageState: storageState } into the path
+            fs.writeFileSync(path, JSON.stringify({ storageState: storageState }, null, 2));
+        }
+        else {
+            await this.setTestData({ storageState: storageState }, world);
+        }
+    }
+    async restoreSaveState(path = null, world = null) {
+        path = await this._replaceWithLocalData(path, this.world);
+        await refreshBrowser(this, path, world);
+        this.registerEventListeners(this.context);
+        registerNetworkEvents(this.world, this, this.context, this.page);
+        registerDownloadEvent(this.page, this.world, this.context);
+        if (this.onRestoreSaveState) {
+            this.onRestoreSaveState(path);
+        }
+    }
     async waitForPageLoad(options = {}, world = null) {
         let timeout = this._getLoadTimeout(options);
         const promiseArray = [];
@@ -2675,7 +3634,7 @@ class StableBrowser {
             await new Promise((resolve) => setTimeout(resolve, 2000));
             ({ screenshotId, screenshotPath } = await this._screenShot(options, world));
             const endTime = Date.now();
-            this._reportToWorld(world, {
+            _reportToWorld(world, {
                 type: Types.GET_PAGE_STATUS,
                 text: "Wait for page load",
                 screenshotId,
@@ -2684,7 +3643,7 @@ class StableBrowser {
                         status: "FAILED",
                         startTime,
                         endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
+                        message: error?.message,
                     }
                     : {
                         status: "PASSED",
@@ -2695,41 +3654,123 @@ class StableBrowser {
         }
     }
     async closePage(options = {}, world = null) {
-        const startTime = Date.now();
-        let error = null;
-        let screenshotId = null;
-        let screenshotPath = null;
-        const info = {};
+        const state = {
+            options,
+            world,
+            locate: false,
+            scroll: false,
+            highlight: false,
+            type: Types.CLOSE_PAGE,
+            text: `Close page`,
+            _text: `Close the page`,
+            operation: "closePage",
+            log: "***** close page *****\n",
+            throwError: false,
+        };
         try {
+            await _preCommand(state, this);
             await this.page.close();
         }
         catch (e) {
             console.log(".");
+            await _commandError(state, e, this);
         }
         finally {
-            await new Promise((resolve) => setTimeout(resolve, 2000));
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world));
-            const endTime = Date.now();
-            this._reportToWorld(world, {
-                type: Types.CLOSE_PAGE,
-                text: "close page",
-                screenshotId,
-                result: error
-                    ? {
-                        status: "FAILED",
-                        startTime,
-                        endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
+            await _commandFinally(state, this);
+        }
+    }
+    async tableCellOperation(headerText, rowText, options, _params, world = null) {
+        let operation = null;
+        if (!options || !options.operation) {
+            throw new Error("operation is not defined");
+        }
+        operation = options.operation;
+        // validate operation is one of the supported operations
+        if (operation != "click" && operation != "hover+click") {
+            throw new Error("operation is not supported");
+        }
+        const state = {
+            options,
+            world,
+            locate: false,
+            scroll: false,
+            highlight: false,
+            type: Types.TABLE_OPERATION,
+            text: `Table operation`,
+            _text: `Table ${operation} operation`,
+            operation: operation,
+            log: "***** Table operation *****\n",
+        };
+        const timeout = this._getFindElementTimeout(options);
+        try {
+            await _preCommand(state, this);
+            const start = Date.now();
+            let cellArea = null;
+            while (true) {
+                try {
+                    cellArea = await _findCellArea(headerText, rowText, this, state);
+                    if (cellArea) {
+                        break;
                     }
-                    : {
-                        status: "PASSED",
-                        startTime,
-                        endTime,
-                    },
-                info: info,
-            });
+                }
+                catch (e) {
+                    // ignore
+                }
+                if (Date.now() - start > timeout) {
+                    throw new Error(`Cell not found in table`);
+                }
+                await new Promise((resolve) => setTimeout(resolve, 1000));
+            }
+            switch (operation) {
+                case "click":
+                    if (!options.css) {
+                        // will click in the center of the cell
+                        let xOffset = 0;
+                        let yOffset = 0;
+                        if (options.xOffset) {
+                            xOffset = options.xOffset;
+                        }
+                        if (options.yOffset) {
+                            yOffset = options.yOffset;
+                        }
+                        await this.page.mouse.click(cellArea.x + cellArea.width / 2 + xOffset, cellArea.y + cellArea.height / 2 + yOffset);
+                    }
+                    else {
+                        const results = await findElementsInArea(options.css, cellArea, this, options);
+                        if (results.length === 0) {
+                            throw new Error(`Element not found in cell area`);
+                        }
+                        state.element = results[0];
+                        await performAction("click", state.element, options, this, state, _params);
+                    }
+                    break;
+                case "hover+click":
+                    if (!options.css) {
+                        throw new Error("css is not defined");
+                    }
+                    const results = await findElementsInArea(options.css, cellArea, this, options);
+                    if (results.length === 0) {
+                        throw new Error(`Element not found in cell area`);
+                    }
+                    state.element = results[0];
+                    await performAction("hover+click", state.element, options, this, state, _params);
+                    break;
+                default:
+                    throw new Error("operation is not supported");
+            }
+        }
+        catch (e) {
+            await _commandError(state, e, this);
+        }
+        finally {
+            await _commandFinally(state, this);
         }
     }
+    saveTestDataAsGlobal(options, world) {
+        const dataFile = _getDataFile(world, this.context, this);
+        process.env.GLOBAL_TEST_DATA_FILE = dataFile;
+        this.logger.info("Save the scenario test data as global for the following scenarios.");
+    }
     async setViewportSize(width, hight, options = {}, world = null) {
         const startTime = Date.now();
         let error = null;
@@ -2747,21 +3788,23 @@ class StableBrowser {
         }
         catch (e) {
             console.log(".");
+            await _commandError({ text: "setViewportSize", operation: "setViewportSize", width, hight, info }, e, this);
         }
         finally {
             await new Promise((resolve) => setTimeout(resolve, 2000));
             ({ screenshotId, screenshotPath } = await this._screenShot(options, world));
             const endTime = Date.now();
-            this._reportToWorld(world, {
+            _reportToWorld(world, {
                 type: Types.SET_VIEWPORT,
                 text: "set viewport size to " + width + "x" + hight,
+                _text: "Set the viewport size to " + width + "x" + hight,
                 screenshotId,
                 result: error
                     ? {
                         status: "FAILED",
                         startTime,
                         endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
+                        message: error?.message,
                     }
                     : {
                         status: "PASSED",
@@ -2783,12 +3826,13 @@ class StableBrowser {
         }
         catch (e) {
             console.log(".");
+            await _commandError({ text: "reloadPage", operation: "reloadPage", info }, e, this);
         }
         finally {
             await new Promise((resolve) => setTimeout(resolve, 2000));
             ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
             const endTime = Date.now();
-            this._reportToWorld(world, {
+            _reportToWorld(world, {
                 type: Types.GET_PAGE_STATUS,
                 text: "page relaod",
                 screenshotId,
@@ -2797,7 +3841,7 @@ class StableBrowser {
                         status: "FAILED",
                         startTime,
                         endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
+                        message: error?.message,
                     }
                     : {
                         status: "PASSED",
@@ -2824,11 +3868,195 @@ class StableBrowser {
             console.log("#-#");
         }
     }
-    _reportToWorld(world, properties) {
-        if (!world || !world.attach) {
-            return;
+    async beforeScenario(world, scenario) {
+        this.beforeScenarioCalled = true;
+        if (scenario && scenario.pickle && scenario.pickle.name) {
+            this.scenarioName = scenario.pickle.name;
+        }
+        if (scenario && scenario.gherkinDocument && scenario.gherkinDocument.feature) {
+            this.featureName = scenario.gherkinDocument.feature.name;
+        }
+        if (this.context) {
+            this.context.examplesRow = extractStepExampleParameters(scenario);
+        }
+        if (this.tags === null && scenario && scenario.pickle && scenario.pickle.tags) {
+            this.tags = scenario.pickle.tags.map((tag) => tag.name);
+            // check if @global_test_data tag is present
+            if (this.tags.includes("@global_test_data")) {
+                this.saveTestDataAsGlobal({}, world);
+            }
+        }
+        // update test data based on feature/scenario
+        let envName = null;
+        if (this.context && this.context.environment) {
+            envName = this.context.environment.name;
+        }
+        if (!process.env.TEMP_RUN) {
+            await getTestData(envName, world, undefined, this.featureName, this.scenarioName, this.context);
+        }
+        await loadBrunoParams(this.context, this.context.environment.name);
+    }
+    async afterScenario(world, scenario) { }
+    async beforeStep(world, step) {
+        if (!this.beforeScenarioCalled) {
+            this.beforeScenario(world, step);
+        }
+        if (this.stepIndex === undefined) {
+            this.stepIndex = 0;
+        }
+        else {
+            this.stepIndex++;
+        }
+        if (step && step.pickleStep && step.pickleStep.text) {
+            this.stepName = step.pickleStep.text;
+            this.logger.info("step: " + this.stepName);
+        }
+        else if (step && step.text) {
+            this.stepName = step.text;
+        }
+        else {
+            this.stepName = "step " + this.stepIndex;
+        }
+        if (this.context && this.context.browserObject && this.context.browserObject.trace === true) {
+            if (this.context.browserObject.context) {
+                await this.context.browserObject.context.tracing.startChunk({ title: this.stepName });
+            }
+        }
+        if (this.initSnapshotTaken === false) {
+            this.initSnapshotTaken = true;
+            if (world && world.attach && !process.env.DISABLE_SNAPSHOT && !this.fastMode) {
+                const snapshot = await this.getAriaSnapshot();
+                if (snapshot) {
+                    await world.attach(JSON.stringify(snapshot), "application/json+snapshot-before");
+                }
+            }
+        }
+    }
+    async getAriaSnapshot() {
+        try {
+            // find the page url
+            const url = await this.page.url();
+            // extract the path from the url
+            const path = new URL(url).pathname;
+            // get the page title
+            const title = await this.page.title();
+            // go over other frams
+            const frames = this.page.frames();
+            const snapshots = [];
+            const content = [`- path: ${path}`, `- title: ${title}`];
+            const timeout = this.configuration.ariaSnapshotTimeout ? this.configuration.ariaSnapshotTimeout : 3000;
+            for (let i = 0; i < frames.length; i++) {
+                const frame = frames[i];
+                try {
+                    // Ensure frame is attached and has body
+                    const body = frame.locator("body");
+                    await body.waitFor({ timeout: 200 }); // wait explicitly
+                    const snapshot = await body.ariaSnapshot({ timeout });
+                    content.push(`- frame: ${i}`);
+                    content.push(snapshot);
+                }
+                catch (innerErr) { }
+            }
+            return content.join("\n");
+        }
+        catch (e) {
+            console.log("Error in getAriaSnapshot");
+            //console.debug(e);
+        }
+        return null;
+    }
+    /**
+     * Sends command with custom payload to report.
+     * @param commandText - Title of the command to be shown in the report.
+     * @param commandStatus - Status of the command (e.g. "PASSED", "FAILED").
+     * @param content - Content of the command to be shown in the report.
+     * @param options - Options for the command. Example: { type: "json", screenshot: true }
+     * @param world - Optional world context.
+     * @public
+     */
+    async addCommandToReport(commandText, commandStatus, content, options = {}, world = null) {
+        const state = {
+            options,
+            world,
+            locate: false,
+            scroll: false,
+            screenshot: options.screenshot ?? false,
+            highlight: options.highlight ?? false,
+            type: Types.REPORT_COMMAND,
+            text: commandText,
+            _text: commandText,
+            operation: "report_command",
+            log: "***** " + commandText + " *****\n",
+        };
+        try {
+            await _preCommand(state, this);
+            const payload = {
+                type: options.type ?? "text",
+                content: content,
+                screenshotId: null,
+            };
+            state.payload = payload;
+            if (commandStatus === "FAILED") {
+                state.throwError = true;
+                throw new Error("Command failed");
+            }
+        }
+        catch (e) {
+            await _commandError(state, e, this);
+        }
+        finally {
+            await _commandFinally(state, this);
+        }
+    }
+    async afterStep(world, step) {
+        this.stepName = null;
+        if (this.context && this.context.browserObject && this.context.browserObject.trace === true) {
+            if (this.context.browserObject.context) {
+                await this.context.browserObject.context.tracing.stopChunk({
+                    path: path.join(this.context.browserObject.traceFolder, `trace-${this.stepIndex}.zip`),
+                });
+                if (world && world.attach) {
+                    await world.attach(JSON.stringify({
+                        type: "trace",
+                        traceFilePath: `trace-${this.stepIndex}.zip`,
+                    }), "application/json+trace");
+                }
+                // console.log("trace file created", `trace-${this.stepIndex}.zip`);
+            }
+        }
+        if (this.context) {
+            this.context.examplesRow = null;
+        }
+        if (world && world.attach && !process.env.DISABLE_SNAPSHOT) {
+            const snapshot = await this.getAriaSnapshot();
+            if (snapshot) {
+                const obj = {};
+                await world.attach(JSON.stringify(snapshot), "application/json+snapshot-after");
+            }
+        }
+        if (!process.env.TEMP_RUN) {
+            const state = {
+                world,
+                locate: false,
+                scroll: false,
+                screenshot: true,
+                highlight: true,
+                type: Types.STEP_COMPLETE,
+                text: "end of scenario",
+                _text: "end of scenario",
+                operation: "step_complete",
+                log: "***** " + "end of scenario" + " *****\n",
+            };
+            try {
+                await _preCommand(state, this);
+            }
+            catch (e) {
+                await _commandError(state, e, this);
+            }
+            finally {
+                await _commandFinally(state, this);
+            }
         }
-        world.attach(JSON.stringify(properties), { mediaType: "application/json" });
     }
 }
 function createTimedPromise(promise, label) {
@@ -2836,151 +4064,5 @@ function createTimedPromise(promise, label) {
         .then((result) => ({ status: "fulfilled", label, result }))
         .catch((error) => Promise.reject({ status: "rejected", label, error }));
 }
-const KEYBOARD_EVENTS = [
-    "ALT",
-    "AltGraph",
-    "CapsLock",
-    "Control",
-    "Fn",
-    "FnLock",
-    "Hyper",
-    "Meta",
-    "NumLock",
-    "ScrollLock",
-    "Shift",
-    "Super",
-    "Symbol",
-    "SymbolLock",
-    "Enter",
-    "Tab",
-    "ArrowDown",
-    "ArrowLeft",
-    "ArrowRight",
-    "ArrowUp",
-    "End",
-    "Home",
-    "PageDown",
-    "PageUp",
-    "Backspace",
-    "Clear",
-    "Copy",
-    "CrSel",
-    "Cut",
-    "Delete",
-    "EraseEof",
-    "ExSel",
-    "Insert",
-    "Paste",
-    "Redo",
-    "Undo",
-    "Accept",
-    "Again",
-    "Attn",
-    "Cancel",
-    "ContextMenu",
-    "Escape",
-    "Execute",
-    "Find",
-    "Finish",
-    "Help",
-    "Pause",
-    "Play",
-    "Props",
-    "Select",
-    "ZoomIn",
-    "ZoomOut",
-    "BrightnessDown",
-    "BrightnessUp",
-    "Eject",
-    "LogOff",
-    "Power",
-    "PowerOff",
-    "PrintScreen",
-    "Hibernate",
-    "Standby",
-    "WakeUp",
-    "AllCandidates",
-    "Alphanumeric",
-    "CodeInput",
-    "Compose",
-    "Convert",
-    "Dead",
-    "FinalMode",
-    "GroupFirst",
-    "GroupLast",
-    "GroupNext",
-    "GroupPrevious",
-    "ModeChange",
-    "NextCandidate",
-    "NonConvert",
-    "PreviousCandidate",
-    "Process",
-    "SingleCandidate",
-    "HangulMode",
-    "HanjaMode",
-    "JunjaMode",
-    "Eisu",
-    "Hankaku",
-    "Hiragana",
-    "HiraganaKatakana",
-    "KanaMode",
-    "KanjiMode",
-    "Katakana",
-    "Romaji",
-    "Zenkaku",
-    "ZenkakuHanaku",
-    "F1",
-    "F2",
-    "F3",
-    "F4",
-    "F5",
-    "F6",
-    "F7",
-    "F8",
-    "F9",
-    "F10",
-    "F11",
-    "F12",
-    "Soft1",
-    "Soft2",
-    "Soft3",
-    "Soft4",
-    "ChannelDown",
-    "ChannelUp",
-    "Close",
-    "MailForward",
-    "MailReply",
-    "MailSend",
-    "MediaFastForward",
-    "MediaPause",
-    "MediaPlay",
-    "MediaPlayPause",
-    "MediaRecord",
-    "MediaRewind",
-    "MediaStop",
-    "MediaTrackNext",
-    "MediaTrackPrevious",
-    "AudioBalanceLeft",
-    "AudioBalanceRight",
-    "AudioBassBoostDown",
-    "AudioBassBoostToggle",
-    "AudioBassBoostUp",
-    "AudioFaderFront",
-    "AudioFaderRear",
-    "AudioSurroundModeNext",
-    "AudioTrebleDown",
-    "AudioTrebleUp",
-    "AudioVolumeDown",
-    "AudioVolumeMute",
-    "AudioVolumeUp",
-    "MicrophoneToggle",
-    "MicrophoneVolumeDown",
-    "MicrophoneVolumeMute",
-    "MicrophoneVolumeUp",
-    "TV",
-    "TV3DMode",
-    "TVAntennaCable",
-    "TVAudioDescription",
-];
 export { StableBrowser };
 //# sourceMappingURL=stable_browser.js.map