automation_model 1.0.455-dev → 1.0.455-stage

package/lib/stable_browser.js

@@ -10,12 +10,14 @@ 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 { maskValue, replaceWithLocalTestData } from "./utils.js";
 import csv from "csv-parser";
 import { Readable } from "node:stream";
 import readline from "readline";
 import { getContext } from "./init_browser.js";
+import { locate_element } from "./locate_element.js";
+import { _commandError, _commandFinally, _preCommand, _validateSelectors, _screenshot } from "./command_common.js";
+import { registerDownloadEvent, registerNetworkEvents } from "./network.js";
 const Types = {
     CLICK: "click_element",
     NAVIGATE: "navigate",
@@ -42,20 +44,26 @@ const Types = {
     VERIFY_VISUAL: "verify_visual",
     LOAD_DATA: "load_data",
     SET_INPUT: "set_input",
+    WAIT_FOR_TEXT_TO_DISAPPEAR: "wait_for_text_to_disappear",
 };
 export const apps = {};
 class StableBrowser {
+    browser;
+    page;
+    logger;
+    context;
+    world;
+    project_path = null;
+    webLogFile = null;
+    networkLogger = null;
+    configuration = null;
+    appName = "main";
     constructor(browser, page, logger = null, context = null, world = null) {
         this.browser = browser;
         this.page = page;
         this.logger = logger;
         this.context = context;
         this.world = world;
-        this.project_path = null;
-        this.webLogFile = null;
-        this.networkLogger = null;
-        this.configuration = null;
-        this.appName = "main";
         if (!this.logger) {
             this.logger = console;
         }
@@ -80,11 +88,13 @@ class StableBrowser {
         catch (e) {
             this.logger.error("unable to read ai_config.json");
         }
-        context.pageLoading = { status: false };
-        context.pages = [this.page];
         const logFolder = path.join(this.project_path, "logs", "web");
         this.world = world;
+        context.pages = [this.page];
+        context.pageLoading = { status: false };
         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);
@@ -93,10 +103,17 @@ class StableBrowser {
             context.pageLoading = { status: false };
         }
         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;
             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();
@@ -126,9 +143,9 @@ class StableBrowser {
         if (this.appName === appName) {
             return;
         }
-        let newContextCreated = false;
+        let navigate = false;
         if (!apps[appName]) {
-            let newContext = await getContext(null, this.context.headless ? this.context.headless : false, this, 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,
@@ -141,8 +158,7 @@ class StableBrowser {
         this._copyContext(apps[appName], this);
         apps[this.appName] = tempContext;
         this.appName = appName;
-        if (newContextCreated) {
-            this.registerEventListeners(this.context);
+        if (navigate) {
             await this.goto(this.context.environment.baseUrl);
             await this.waitForPageLoad();
         }
@@ -168,7 +184,6 @@ class StableBrowser {
             this.context.webLogger = [];
         }
         page.on("console", async (msg) => {
-            var _a;
             const obj = {
                 type: msg.type(),
                 text: msg.text(),
@@ -176,7 +191,9 @@ class StableBrowser {
                 time: new Date().toISOString(),
             };
             this.context.webLogger.push(obj);
-            (_a = this.world) === null || _a === void 0 ? void 0 : _a.attach(JSON.stringify(obj), { mediaType: "application/json+log" });
+            if (msg.type() === "error") {
+                this.world?.attach(JSON.stringify(obj), { mediaType: "application/json+log" });
+            }
         });
     }
     registerRequestListener(page, context, logFile) {
@@ -184,7 +201,6 @@ class StableBrowser {
             this.context.networkLogger = [];
         }
         page.on("request", async (data) => {
-            var _a;
             const startTime = new Date().getTime();
             try {
                 const pageUrl = new URL(page.url());
@@ -209,7 +225,7 @@ class StableBrowser {
                     startTime,
                 };
                 context.networkLogger.push(obj);
-                (_a = this.world) === null || _a === void 0 ? void 0 : _a.attach(JSON.stringify(obj), { mediaType: "application/json+network" });
+                this.world?.attach(JSON.stringify(obj), { mediaType: "application/json+network" });
             }
             catch (error) {
                 console.error("Error in request listener", error);
@@ -234,20 +250,6 @@ class StableBrowser {
             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;
@@ -315,7 +317,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);
             }
@@ -336,7 +338,10 @@ 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, this._fixUsingParams(text, _params), "*:not(script, style, head)", false, false, _params);
         if (result.elementCount === 0) {
             return;
         }
@@ -351,7 +356,7 @@ class StableBrowser {
     }
     async _locateElementByText(scope, text1, tag1, regex1 = false, partial1, _params) {
         //const stringifyText = JSON.stringify(text);
-        return await scope.evaluate(([text, tag, regex, partial]) => {
+        return await scope.locator(":root").evaluate((_node, [text, tag, regex, partial]) => {
             function isParent(parent, child) {
                 let currentNode = child.parentNode;
                 while (currentNode !== null) {
@@ -363,6 +368,15 @@ class StableBrowser {
                 return false;
             }
             document.isParent = isParent;
+            function getRegex(str) {
+                const match = str.match(/^\/(.*?)\/([gimuy]*)$/);
+                if (!match) {
+                    return null;
+                }
+                let [_, pattern, flags] = match;
+                return new RegExp(pattern, flags);
+            }
+            document.getRegex = getRegex;
             function collectAllShadowDomElements(element, result = []) {
                 // Check and add the element if it has a shadow root
                 if (element.shadowRoot) {
@@ -379,7 +393,11 @@ class StableBrowser {
             }
             document.collectAllShadowDomElements = collectAllShadowDomElements;
             if (!tag) {
-                tag = "*";
+                tag = "*:not(script, style, head)";
+            }
+            let regexpSearch = document.getRegex(text);
+            if (regexpSearch) {
+                regex = true;
             }
             let elements = Array.from(document.querySelectorAll(tag));
             let shadowHosts = [];
@@ -396,7 +414,9 @@ class StableBrowser {
             let randomToken = null;
             const foundElements = [];
             if (regex) {
-                let regexpSearch = new RegExp(text, "im");
+                if (!regexpSearch) {
+                    regexpSearch = new RegExp(text, "im");
+                }
                 for (let i = 0; i < elements.length; i++) {
                     const element = elements[i];
                     if ((element.innerText && regexpSearch.test(element.innerText)) ||
@@ -410,8 +430,8 @@ class StableBrowser {
                 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))) {
+                        if ((element.innerText && element.innerText.toLowerCase().trim().includes(text.toLowerCase())) ||
+                            (element.value && element.value.toLowerCase().includes(text.toLowerCase()))) {
                             foundElements.push(element);
                         }
                     }
@@ -455,19 +475,39 @@ class StableBrowser {
         }, [text1, tag1, regex1, partial1]);
     }
     async _collectLocatorInformation(selectorHierarchy, index = 0, scope, foundLocators, _params, info, visibleOnly = true) {
+        if (!info) {
+            info = {};
+        }
+        if (!info.failCause) {
+            info.failCause = {};
+        }
+        if (!info.log) {
+            info.log = "";
+        }
         let locatorSearch = selectorHierarchy[index];
+        try {
+            locatorSearch = JSON.parse(this._fixUsingParams(JSON.stringify(locatorSearch), _params));
+        }
+        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);
             if (!locatorString) {
+                info.failCause.textNotFound = true;
+                info.failCause.lastError = "failed to locate element by text: " + locatorSearch.text;
                 return;
             }
             locator = 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 = this._fixUsingParams(locatorSearch.text, _params);
+            let result = await this._locateElementByText(scope, text, locatorSearch.tag, false, locatorSearch.partial === true, _params);
             if (result.elementCount === 0) {
+                info.failCause.textNotFound = true;
+                info.failCause.lastError = "failed to locate element by text: " + text;
                 return;
             }
             locatorSearch.css = "[data-blinq-id='blinq-id-" + result.randomToken + "']";
@@ -484,6 +524,9 @@ class StableBrowser {
         //   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;
@@ -501,6 +544,8 @@ class StableBrowser {
                 foundLocators.push(locator.nth(j));
             }
             else {
+                info.failCause.visible = visible;
+                info.failCause.enabled = enabled;
                 if (!info.printMessages) {
                     info.printMessages = {};
                 }
@@ -512,6 +557,11 @@ class StableBrowser {
         }
     }
     async closeUnexpectedPopups(info, _params) {
+        if (!info) {
+            info = {};
+            info.failCause = {};
+            info.log = "";
+        }
         if (this.configuration.popupHandlers && this.configuration.popupHandlers.length > 0) {
             if (!info) {
                 info = {};
@@ -552,7 +602,10 @@ class StableBrowser {
         }
         return { rerun: false };
     }
-    async _locate(selectors, info, _params, timeout = 30000) {
+    async _locate(selectors, info, _params, timeout) {
+        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++) {
@@ -566,35 +619,46 @@ class StableBrowser {
         }
         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 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);
+                        let testframescope = framescope.frameLocator(frameLocator.css);
                         if (frameLocator.index) {
-                            framescope = framescope.nth(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);
                         }
-                        break;
                     }
                 }
                 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";
             while (true) {
                 let frameFound = false;
                 if (selectors.nestFrmLoc) {
-                    scope = findFrame(selectors.nestFrmLoc, scope);
+                    scope = await findFrame(selectors.nestFrmLoc, scope);
                     frameFound = true;
                     break;
                 }
@@ -614,6 +678,8 @@ class StableBrowser {
                 if (!scope) {
                     info.log += "unable to locate iframe " + selectors.iframe_src + "\n";
                     if (performance.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));
@@ -623,6 +689,30 @@ class StableBrowser {
                 }
             }
         }
+        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) {
+        if (!info) {
+            info = {};
+            info.failCause = {};
+            info.log = "";
+        }
+        let highPriorityTimeout = 5000;
+        let visibleOnlyTimeout = 6000;
+        let startTime = performance.now();
+        let locatorsCount = 0;
+        //let arrayMode = Array.isArray(selectors);
+        let scope = await this._findFrameScope(selectors, timeout, info);
         let selectorsLocators = null;
         selectorsLocators = selectors.locators;
         // group selectors by priority
@@ -724,6 +814,8 @@ class StableBrowser {
         }
         this.logger.debug("unable to locate unique element, total elements found " + locatorsCount);
         info.log += "failed to locate unique element, total elements found " + locatorsCount + "\n";
+        info.failCause.locatorNotFound = true;
+        info.failCause.lastError = "failed to locate unique element";
         throw new Error("failed to locate first element no elements found, " + info.log);
     }
     async _scanLocatorsGroup(locatorsGroup, scope, _params, info, visibleOnly) {
@@ -755,89 +847,129 @@ class StableBrowser {
                 });
                 result.locatorIndex = i;
             }
+            if (foundLocators.length > 1) {
+                info.failCause.foundMultiple = true;
+            }
         }
         return result;
     }
-    async click(selectors, _params, options = {}, world = null) {
-        this._validateSelectors(selectors);
+    async simpleClick(elementDescription, _params, options = {}, world = null) {
         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;
+        while (true) {
+            try {
+                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) {
+                if (performance.now() - startTime > timeout) {
+                    // throw e;
+                    await _commandError({ text: "simpleClick", operation: "simpleClick", elementDescription, info: {} }, e, this);
+                }
+            }
+            await new Promise((resolve) => setTimeout(resolve, 3000));
+        }
+    }
+    async simpleClickType(elementDescription, value, _params, options = {}, world = null) {
+        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;
+                    await _commandError({ text: "simpleClickType", operation: "simpleClickType", value, elementDescription, info: {} }, e, this);
+                }
+            }
+            await new Promise((resolve) => setTimeout(resolve, 3000));
+        }
+    }
+    async click(selectors, _params, options = {}, world = null) {
+        const state = {
+            selectors,
+            _params,
+            options,
+            world,
+            text: "Click element",
+            type: Types.CLICK,
+            operation: "click",
+            log: "***** click on " + selectors.element_name + " *****\n",
+        };
         try {
-            let element = await this._locate(selectors, info, _params);
-            await this.scrollIfNeeded(element, info);
-            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
+            await _preCommand(state, this);
+            if (state.options && state.options.context) {
+                state.selectors.locators[0].text = state.options.context;
+            }
             try {
-                await this._highlightElements(element);
-                await element.click();
+                await state.element.click();
                 await new Promise((resolve) => setTimeout(resolve, 1000));
             }
             catch (e) {
                 // await this.closeUnexpectedPopups();
-                info.log += "click failed, will try again" + "\n";
-                element = await this._locate(selectors, info, _params);
-                await element.dispatchEvent("click");
+                state.element = await this._locate(selectors, state.info, _params);
+                await state.element.dispatchEvent("click");
                 await new Promise((resolve) => setTimeout(resolve, 1000));
             }
             await this.waitForPageLoad();
-            return info;
+            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,
-            });
+            _commandFinally(state, this);
         }
     }
     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`,
+            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);
+                // await this._highlightElements(element);
+                await state.element.setChecked(checked);
                 await new Promise((resolve) => setTimeout(resolve, 1000));
             }
             catch (e) {
@@ -846,179 +978,108 @@ class StableBrowser {
                 }
                 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 });
+                    state.info.log += "setCheck failed, will try again" + "\n";
+                    state.element = await this._locate(selectors, state.info, _params);
+                    await state.element.setChecked(checked, { timeout: 5000, force: true });
                     await new Promise((resolve) => setTimeout(resolve, 1000));
                 }
             }
             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,
-            });
+            _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`,
+            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));
+            await _preCommand(state, this);
             try {
-                await this._highlightElements(element);
-                await element.hover();
+                await state.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 });
+                state.info.log += "hover failed, will try again" + "\n";
+                state.element = await this._locate(selectors, state.info, _params);
+                await state.element.hover({ timeout: 10000 });
                 await new Promise((resolve) => setTimeout(resolve, 1000));
             }
             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,
-            });
+            _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}`,
+            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,
-            });
+            _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}`,
+            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));
@@ -1038,134 +1099,76 @@ 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,
-            });
+            _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,
-            });
+            _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}`,
+            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 state.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);
@@ -1178,20 +1181,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);
@@ -1204,61 +1206,39 @@ 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,
-            });
+            _commandFinally(state, this);
         }
     }
     async clickType(selectors, _value, enter = false, _params = null, options = {}, world = null) {
         _value = unEscapeString(_value);
-        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;
         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}`,
+            operation: "clickType",
+            log: "***** clickType on " + selectors.element_name + " with value " + maskValue(_value) + "*****\n",
+        };
         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);
+            await _preCommand(state, this);
+            state.info.value = _value;
             if (options === null || options === undefined || !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) {
@@ -1267,22 +1247,22 @@ class StableBrowser {
             }
             if (options === null || options === undefined || options.press) {
                 try {
-                    await element.click({ timeout: 5000 });
+                    await state.element.click({ timeout: 5000 });
                 }
                 catch (e) {
-                    await element.dispatchEvent("click");
+                    await state.element.dispatchEvent("click");
                 }
             }
             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));
@@ -1302,13 +1282,14 @@ class StableBrowser {
                     await new Promise((resolve) => setTimeout(resolve, 500));
                 }
             }
+            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");
+                await state.element.dispatchEvent("change");
                 //await this.page.keyboard.press("Tab");
             }
             else {
@@ -1317,104 +1298,50 @@ 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,
-            });
+            _commandFinally(state, this);
         }
     }
     async fill(selectors, value, enter = false, _params = null, options = {}, world = null) {
-        this._validateSelectors(selectors);
-        value = unEscapeString(value);
-        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;
-        }
-        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;
-        }
-        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 this.page.keyboard.press("Enter");
+            }
+            await this.waitForPageLoad();
+            return state.info;
+        }
+        catch (e) {
+            await _commandError(state, e, this);
+        }
+        finally {
+            _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);
+        _validateSelectors(selectors);
         let screenshotId = null;
         let screenshotPath = null;
         if (!info.log) {
@@ -1458,166 +1385,124 @@ class StableBrowser {
         }
     }
     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}`,
+            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,
-            });
+            _commandFinally(state, this);
         }
     }
     async containsText(selectors, text, climb, _params = null, options = {}, world = null) {
-        var _a, _b, _c;
-        this._validateSelectors(selectors);
-        text = unEscapeString(text);
+        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);
+            await _preCommand(state, this);
+            foundObj = await this._getText(selectors, climb, _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);
             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;
+                    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;
+                    if (foundObj?.text.includes(numberAlternatives.numbers[i]) ||
+                        foundObj?.value?.includes(numberAlternatives.numbers[i])) {
+                        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;
+            else if (!foundObj?.text.includes(text) && !foundObj?.value?.includes(text)) {
+                state.info.foundText = foundObj?.text;
+                state.info.value = foundObj?.value;
                 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);
-            ({ 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 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,
-            });
+            _commandFinally(state, this);
         }
     }
     _getDataFile(world = null) {
@@ -1846,7 +1731,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,
@@ -1856,163 +1740,105 @@ 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 = null;
+        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();
         }
-        let screenshotBuffer = Buffer.from(data, "base64");
         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 || height > viewportHeight) {
-            image = image.resize({ w: viewportWidth, h: viewportHeight }); // Resize the image while maintaining aspect ratio
+        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);
         }
-        await client.detach();
     }
     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,
-            });
+            _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`,
+            operation: "extractAttribute",
+            log: "***** extract attribute " + attribute + " from " + selectors.element_name + " *****\n",
+        };
         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;
                 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;
-            }
-            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);
+            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,
-                    }
-                    : {
-                        status: "PASSED",
-                        startTime,
-                        endTime,
-                    },
-                info: info,
-            });
+            _commandFinally(state, this);
         }
     }
     async extractEmailData(emailAddress, options, world) {
@@ -2089,7 +1915,8 @@ class StableBrowser {
             catch (e) {
                 errorCount++;
                 if (errorCount > 3) {
-                    throw e;
+                    // throw e;
+                    await _commandError({ text: "extractEmailData", operation: "extractEmailData", emailAddress, info: {} }, e, this);
                 }
                 // ignore
             }
@@ -2200,7 +2027,8 @@ class StableBrowser {
             info.screenshotPath = screenshotPath;
             Object.assign(e, { info: info });
             error = e;
-            throw e;
+            // throw e;
+            await _commandError({ text: "verifyPagePath", operation: "verifyPagePath", pathPart, info }, e, this);
         }
         finally {
             const endTime = Date.now();
@@ -2213,7 +2041,7 @@ class StableBrowser {
                         status: "FAILED",
                         startTime,
                         endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
+                        message: error?.message,
                     }
                     : {
                         status: "PASSED",
@@ -2226,52 +2054,58 @@ class StableBrowser {
     }
     async verifyTextExistInPage(text, options = {}, world = null) {
         text = unEscapeString(text);
-        const startTime = Date.now();
+        const state = {
+            text_search: text,
+            options,
+            world,
+            locate: false,
+            scroll: false,
+            highlight: false,
+            type: Types.VERIFY_ELEMENT_CONTAINS_TEXT,
+            text: `Verify text exists in page`,
+            operation: "verifyTextExistInPage",
+            log: "***** verify text " + text + " exists in page *****\n",
+        };
         const timeout = this._getLoadTimeout(options);
-        let error = null;
-        let screenshotId = null;
-        let screenshotPath = null;
         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;
             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, {});
+                            const result = await this._locateElementByText(frames[i], dateAlternatives.dates[j], "*:not(script, style, head)", true, 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, {});
+                            const result = await this._locateElementByText(frames[i], numberAlternatives.numbers[j], "*:not(script, style, head)", true, true, {});
                             result.frame = frames[i];
                             results.push(result);
                         }
                     }
                     else {
-                        const result = await this._locateElementByText(frames[i], text, "*", true, {});
+                        const result = await this._locateElementByText(frames[i], text, "*:not(script, style, head)", true, true, {});
                         result.frame = frames[i];
                         results.push(result);
                     }
                 }
-                info.results = results;
+                state.info.results = results;
                 const resultWithElementsFound = results.filter((result) => result.elementCount > 0);
                 if (resultWithElementsFound.length === 0) {
-                    if (Date.now() - startTime > timeout) {
+                    if (Date.now() - state.startTime > timeout) {
                         throw new Error(`Text ${text} not found in page`);
                     }
                     await new Promise((resolve) => setTimeout(resolve, 1000));
@@ -2283,44 +2117,89 @@ class StableBrowser {
                     await this._highlightElements(frame, dataAttribute);
                     const element = await frame.$(dataAttribute);
                     if (element) {
-                        await this.scrollIfNeeded(element, info);
+                        await this.scrollIfNeeded(element, state.info);
                         await element.dispatchEvent("bvt_verify_page_contains_text");
                     }
                 }
-                ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
-                return info;
+                await _screenshot(state, this);
+                return state.info;
             }
             // 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,
+            _commandFinally(state, this);
+        }
+    }
+    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 text does not exist in page`,
+            operation: "verifyTextNotExistInPage",
+            log: "***** verify text " + text + " does not exist in page *****\n",
+        };
+        const timeout = this._getLoadTimeout(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;
+        }
+        let dateAlternatives = findDateAlternatives(text);
+        let numberAlternatives = findNumberAlternatives(text);
+        try {
+            await _preCommand(state, this);
+            state.info.text = text;
+            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], "*:not(script, style, head)", true, true, {});
+                            result.frame = frames[i];
+                            results.push(result);
+                        }
                     }
-                    : {
-                        status: "PASSED",
-                        startTime,
-                        endTime,
-                    },
-                info: info,
-            });
+                    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)", true, true, {});
+                            result.frame = frames[i];
+                            results.push(result);
+                        }
+                    }
+                    else {
+                        const result = await this._locateElementByText(frames[i], text, "*:not(script, style, head)", true, true, {});
+                        result.frame = frames[i];
+                        results.push(result);
+                    }
+                }
+                state.info.results = results;
+                const resultWithElementsFound = results.filter((result) => result.elementCount > 0);
+                if (resultWithElementsFound.length === 0) {
+                    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 {
+            _commandFinally(state, this);
         }
     }
     _getServerUrl() {
@@ -2383,7 +2262,8 @@ 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();
@@ -2396,7 +2276,7 @@ class StableBrowser {
                         status: "FAILED",
                         startTime,
                         endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
+                        message: error?.message,
                     }
                     : {
                         status: "PASSED",
@@ -2428,7 +2308,7 @@ 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;
@@ -2450,7 +2330,8 @@ 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();
@@ -2464,7 +2345,7 @@ class StableBrowser {
                         status: "FAILED",
                         startTime,
                         endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
+                        message: error?.message,
                     }
                     : {
                         status: "PASSED",
@@ -2476,7 +2357,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");
         }
@@ -2615,7 +2496,8 @@ 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();
@@ -2629,7 +2511,7 @@ class StableBrowser {
                         status: "FAILED",
                         startTime,
                         endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
+                        message: error?.message,
                     }
                     : {
                         status: "PASSED",
@@ -2641,27 +2523,7 @@ 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);
-                }
-            }
-        }
-        if ((value.startsWith("secret:") || value.startsWith("totp:")) && _decrypt) {
-            return await decrypt(value, null, totpWait);
-        }
-        return value;
+        return await replaceWithLocalTestData(value, world, _decrypt, totpWait, this.context, this);
     }
     _getLoadTimeout(options) {
         let timeout = 15000;
@@ -2721,7 +2583,7 @@ class StableBrowser {
                         status: "FAILED",
                         startTime,
                         endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
+                        message: error?.message,
                     }
                     : {
                         status: "PASSED",
@@ -2732,39 +2594,28 @@ 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`,
+            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,
-                    }
-                    : {
-                        status: "PASSED",
-                        startTime,
-                        endTime,
-                    },
-                info: info,
-            });
+            _commandFinally(state, this);
         }
     }
     async setViewportSize(width, hight, options = {}, world = null) {
@@ -2784,6 +2635,7 @@ 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));
@@ -2798,7 +2650,7 @@ class StableBrowser {
                         status: "FAILED",
                         startTime,
                         endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
+                        message: error?.message,
                     }
                     : {
                         status: "PASSED",
@@ -2820,6 +2672,7 @@ class StableBrowser {
         }
         catch (e) {
             console.log(".");
+            await _commandError({ text: "reloadPage", operation: "reloadPage", info }, e, this);
         }
         finally {
             await new Promise((resolve) => setTimeout(resolve, 2000));
@@ -2834,7 +2687,7 @@ class StableBrowser {
                         status: "FAILED",
                         startTime,
                         endTime,
-                        message: error === null || error === void 0 ? void 0 : error.message,
+                        message: error?.message,
                     }
                     : {
                         status: "PASSED",
@@ -2867,6 +2720,31 @@ class StableBrowser {
         }
         world.attach(JSON.stringify(properties), { mediaType: "application/json" });
     }
+    async beforeStep(world, step) {
+        this.stepName = step.pickleStep.text;
+        this.logger.info("step: " + this.stepName);
+        if (this.stepIndex === undefined) {
+            this.stepIndex = 0;
+        }
+        else {
+            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 });
+            }
+        }
+    }
+    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`),
+                });
+            }
+        }
+    }
 }
 function createTimedPromise(promise, label) {
     return promise