ff-automationv2 2.2.34-beta.2 → 2.2.34-beta.3

package/dist/automation/actions/executor.d.ts

@@ -19,7 +19,7 @@ export declare class ActionExecutor implements IActionExecutor {
     navigate(url: string): Promise<void>;
     goBack(): Promise<void>;
     refresh(): Promise<void>;
-    switchToFrame(selector: string, frames: FrameMeta[], elementName: string, elementType: string, pageDOM: string, fireflinkIndex: string): Promise<void>;
+    switchToFrame(selector: string, frames: FrameMeta[], elementName: string, elementType: string, pageDOM: string, fireflinkIndex: string, usedElementNames?: string[]): Promise<void>;
     wait(time: string): Promise<void>;
     click(pageDOM: string, selector: string, fireflinkIndex: string, elementName: string, elementType: string): Promise<void>;
     clickUsingJS(pageDOM: string, selector: string, fireflinkIndex: string, elementName: string, elementType: string): Promise<void>;

package/dist/automation/actions/executor.js

@@ -424,7 +424,7 @@ class ActionExecutor {
             throw error;
         }
     }
-    async switchToFrame(selector, frames, elementName, elementType, pageDOM, fireflinkIndex) {
+    async switchToFrame(selector, frames, elementName, elementType, pageDOM, fireflinkIndex, usedElementNames) {
         try {
             await (0, findElementUsingFF_js_1.findElementUsingFF)({
                 driver: this.driver,
@@ -436,7 +436,8 @@ class ActionExecutor {
                 pageDOM,
                 fireflinkIndex,
                 elementGetter: this.elementGetter,
-                platform: this.platform
+                platform: this.platform,
+                usedElementNames
             });
         }
         catch (error) {

package/dist/core/helpers/elementSelectorResolver.d.ts

@@ -1,11 +1,13 @@
 import { platform as PlatformType } from "../types/scriptTypesType.js";
 import { ShadowIframeResult } from "../interfaces/automationRunnerInterface.js";
-export { ShadowIframeResult };
-export declare function generateUniqueName(currentName: string | undefined, usedNames: string[]): string | undefined;
+import { FrameMeta } from "../../utils/iframesExtraction/iframeInterface.js";
+import { findCrossOriginIframeForElement } from "../../utils/crossOrigin/crossOriginHelper.js";
+export { ShadowIframeResult, FrameMeta, findCrossOriginIframeForElement };
+export declare function generateUniqueName(currentName: string | undefined, usedNames: string[], suffix?: string): string | undefined;
 export declare function normalizeSvgSelector(selector: string): string;
 export declare function resolveElementSelector(doc: any, domInfo: any, fireflinkIndex: string, platform: PlatformType, driver: any, fallbackAttempt: number, driverContext?: any): Promise<{
     selector: string;
     doc: any;
     domInfo: any;
 }>;
-export declare function handleShadowAndIframe(driver: any, stepAction: string, selector: string, fireflinkIndex: string, domInfo: any, actionHandlers: Record<string, any>, elementName: string, elementType: string): Promise<ShadowIframeResult>;
+export declare function handleShadowAndIframe(driver: any, stepAction: string, selector: string, fireflinkIndex: string, domInfo: any, actionHandlers: Record<string, any>, elementName: string, elementType: string, usedElementNames?: string[]): Promise<ShadowIframeResult>;

package/dist/core/helpers/elementSelectorResolver.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.findCrossOriginIframeForElement = void 0;
 exports.generateUniqueName = generateUniqueName;
 exports.normalizeSvgSelector = normalizeSvgSelector;
 exports.resolveElementSelector = resolveElementSelector;
@@ -9,11 +10,13 @@ const jsForAttributeInjection_js_1 = require("../../utils/DomExtraction/jsForAtt
 const jsFindElement_js_1 = require("../../utils/javascript/jsFindElement.js");
 const runnerDomPipeline_js_1 = require("./runnerDomPipeline.js");
 const logData_js_1 = require("../../utils/logger/logData.js");
-function generateUniqueName(currentName, usedNames) {
+const crossOriginHelper_js_1 = require("../../utils/crossOrigin/crossOriginHelper.js");
+Object.defineProperty(exports, "findCrossOriginIframeForElement", { enumerable: true, get: function () { return crossOriginHelper_js_1.findCrossOriginIframeForElement; } });
+function generateUniqueName(currentName, usedNames, suffix) {
     if (!currentName) {
         return currentName;
     }
-    const baseName = currentName;
+    const baseName = suffix ? `${currentName}${suffix}` : currentName;
     let newName = baseName;
     let count = 0;
     while (usedNames.includes(newName)) {
@@ -60,7 +63,7 @@ async function resolveElementSelector(doc, domInfo, fireflinkIndex, platform, dr
     selector = selector.replace(/\/div\[0\]\/div\[0\]/g, "/div[1]").replace(/\/div\[0\]/g, "/div[1]");
     return { selector, doc: updatedDoc, domInfo: updatedDomInfo };
 }
-async function handleShadowAndIframe(driver, stepAction, selector, fireflinkIndex, domInfo, actionHandlers, elementName, elementType) {
+async function handleShadowAndIframe(driver, stepAction, selector, fireflinkIndex, domInfo, actionHandlers, elementName, elementType, usedElementNames) {
     let updatedStepAction = stepAction;
     let updatedSelector = selector;
     let iframeDomHtml = null;
@@ -68,36 +71,66 @@ async function handleShadowAndIframe(driver, stepAction, selector, fireflinkInde
         updatedStepAction = updatedStepAction + "_shadow";
         logData_js_1.logger.info(updatedStepAction);
     }
-    else if (updatedSelector.includes("iframe")) {
-        const defaultHandler = actionHandlers["switchToDefaultContent"];
-        await defaultHandler({ driver });
-        const result_if = await driver.executeAsyncScript(jsFindElement_js_1.Find_element_by_ff_js_script, [fireflinkIndex]);
-        if (!result_if?.success) {
-            logData_js_1.logger.info("Not found");
+    else {
+        const crossOriginInfo = (0, crossOriginHelper_js_1.findCrossOriginIframeForElement)(domInfo?.dom, fireflinkIndex);
+        if (crossOriginInfo && crossOriginInfo.frameMeta) {
+            const frameHandler = actionHandlers["switchToFrame"];
+            await frameHandler({
+                selector: updatedSelector,
+                frames: [crossOriginInfo.frameMeta],
+                elementName,
+                elementType,
+                pageDOM: domInfo.dom,
+                fireflinkIndex,
+                usedElementNames,
+            });
+            return {
+                stepAction: updatedStepAction,
+                selector: updatedSelector,
+                iframeDomHtml: crossOriginInfo.iframeDom || null,
+                handled: true,
+                isIframe: true,
+            };
+        }
+        else if (updatedSelector.includes("iframe")) {
+            const result_if = await driver.executeAsyncScript(jsFindElement_js_1.Find_element_by_ff_js_script, [fireflinkIndex]);
+            if (!result_if?.success) {
+                logData_js_1.logger.info("Not found");
+                return {
+                    stepAction: updatedStepAction,
+                    selector: updatedSelector,
+                    iframeDomHtml: null,
+                    handled: false,
+                    isIframe: false,
+                };
+            }
+            const { xpath_if, frames, iframe_dom_html } = result_if;
+            updatedSelector = xpath_if;
+            iframeDomHtml = iframe_dom_html;
+            const frameHandler = actionHandlers["switchToFrame"];
+            await frameHandler({
+                selector: updatedSelector,
+                frames: frames,
+                elementName,
+                elementType,
+                pageDOM: domInfo.dom,
+                fireflinkIndex,
+                usedElementNames,
+            });
             return {
                 stepAction: updatedStepAction,
                 selector: updatedSelector,
-                iframeDomHtml: null,
-                handled: false,
+                iframeDomHtml,
+                handled: true,
+                isIframe: true,
             };
         }
-        const { xpath_if, frames, iframe_dom_html } = result_if;
-        updatedSelector = xpath_if;
-        iframeDomHtml = iframe_dom_html;
-        const frameHandler = actionHandlers["switchToFrame"];
-        await frameHandler({
-            selector: updatedSelector,
-            frames: frames,
-            elementName,
-            elementType,
-            pageDOM: domInfo.dom,
-            fireflinkIndex,
-        });
     }
     return {
         stepAction: updatedStepAction,
         selector: updatedSelector,
         iframeDomHtml,
         handled: true,
+        isIframe: false,
     };
 }

package/dist/core/interfaces/automationRunnerInterface.d.ts

@@ -22,6 +22,7 @@ export interface ShadowIframeResult {
     selector: string;
     iframeDomHtml: string | null;
     handled: boolean;
+    isIframe?: boolean;
 }
 export interface VisionFallbackParams {
     driver: any;

package/dist/core/main/actionHandlerFactory.js

@@ -389,7 +389,7 @@ function createActionHandlers(context) {
             await executor.wait(result.value);
         }),
         switchToFrame: withExecutor(async (executor, result) => {
-            await executor.switchToFrame(result.selector, result.frames, result.elementName, result.elementType, result.pageDOM, result.fireflinkIndex);
+            await executor.switchToFrame(result.selector, result.frames, result.elementName, result.elementType, result.pageDOM, result.fireflinkIndex, result.usedElementNames);
         }),
         Click: withExecutor(async (executor, result) => {
             await executor.click(result.pageDOM, result.selector, result.fireflinkIndex, result.elementName, result.elementType);

package/dist/core/main/runAutomationScript.js

@@ -561,6 +561,7 @@ class AutomationRunner {
                     }
                     baseStepActionBeforeFallback = stepAction;
                     for (let fallbackAttempt = 1; fallbackAttempt <= 2; fallbackAttempt++) {
+                        let shadowIframeResult = null;
                         try {
                             let iframeDomHtml = null;
                             if (fallbackAttempt > 1) {
@@ -606,7 +607,7 @@ class AutomationRunner {
                                     elementType1: stepResult.response.drag_element_type,
                                     elementType2: stepResult.response.drop_element_type,
                                 });
-                                continue;
+                                break;
                             }
                             fireflinkIndex = stepResult.response.attributeValue;
                             if (fireflinkIndex === "Fire-Flink-0") {
@@ -621,7 +622,7 @@ class AutomationRunner {
                                 logData_js_1.logger.info(`Unable to resolve xpath for ${fireflinkIndex}`);
                                 throw new Error(`Unable to resolve xpath for ${fireflinkIndex}`);
                             }
-                            const shadowIframeResult = await (0, elementSelectorResolver_js_1.handleShadowAndIframe)(driver, stepAction, selector, fireflinkIndex, domInfo, actionHandlers, currentElementName || result.response.elementName, stepResult.response.elementType);
+                            shadowIframeResult = await (0, elementSelectorResolver_js_1.handleShadowAndIframe)(driver, stepAction, selector, fireflinkIndex, domInfo, actionHandlers, currentElementName || result.response.elementName, stepResult.response.elementType, usedElementNames);
                             if (!shadowIframeResult.handled) {
                                 return;
                             }
@@ -649,6 +650,12 @@ class AutomationRunner {
                                 returnTypeVariableName: currentReturnTypeVariableName,
                                 ...(currentVariableName ? { variableName: currentVariableName } : {}),
                             });
+                            if (shadowIframeResult?.isIframe) {
+                                const defaultHandler = actionHandlers["switchToDefaultContent"];
+                                if (defaultHandler) {
+                                    await defaultHandler({ driver });
+                                }
+                            }
                             preCapturedDomInfo = await (0, runnerPostActionHelper_js_1.handlePostActionWeb)(currentPlatform, driver, action, beforeHandles, context.scriptAppender, stepCount);
                             if (fallbackAttempt === 2) {
                                 if (driverContext) {
@@ -659,6 +666,14 @@ class AutomationRunner {
                             break;
                         }
                         catch (error) {
+                            if (shadowIframeResult?.isIframe && driver) {
+                                try {
+                                    await driver.switchFrame(null);
+                                }
+                                catch {
+                                    /* ignore */
+                                }
+                            }
                             const visionResult = await (0, visionFallbackHandler_js_1.executeVisionFallback)({
                                 driver,
                                 platform: currentPlatform,

package/dist/utils/DomExtraction/jsForAttributeInjection.d.ts

@@ -1,7 +1,13 @@
+import { CrossOriginIframeInfo, RawDomInjectionResult, ICombineDomResult, InjectIframeFunction } from "../crossOrigin/crossOriginInterface.js";
+import { markCrossOriginElements, combineDom, processCrossOriginIframes } from "../crossOrigin/crossOriginHelper.js";
+export { CrossOriginIframeInfo, RawDomInjectionResult, ICombineDomResult, InjectIframeFunction, markCrossOriginElements, combineDom, processCrossOriginIframes };
 export interface AnnotatedDOMResult {
     dom: string;
 }
 export declare function getAnnotatedDOM(browser: WebdriverIO.Browser): Promise<AnnotatedDOMResult>;
-export declare function getReactAnnotatedDOM(browser: WebdriverIO.Browser): Promise<AnnotatedDOMResult>;
-export declare function getAngularAnnotatedDOM(browser: WebdriverIO.Browser): Promise<AnnotatedDOMResult>;
+export declare function injectReact(browser: WebdriverIO.Browser, startIndex?: number): Promise<RawDomInjectionResult>;
+export declare function getReactAnnotatedDOM(browser: WebdriverIO.Browser, startIndex?: number): Promise<AnnotatedDOMResult>;
+export declare const INJECT_AND_SERIALIZE_DOM_JS = "\nreturn (function (startIndex) {\n  let nodeIndex = typeof startIndex === \"number\" ? startIndex : 0;\nfunction getCoverageStatus(el) {\n    if (!el || !el.getBoundingClientRect) return \"unknown\";\n    const s = getComputedStyle(el);\n    if (s.pointerEvents === \"none\") return \"false\";\n    const rect = el.getBoundingClientRect();\n    if (rect.width === 0 || rect.height === 0) return \"false\";\n    // Off-screen element \u2014 check if something is blocking the viewport\n    const isOffScreen =\n        rect.bottom < 0 ||\n        rect.right < 0 ||\n        rect.top > window.innerHeight ||\n        rect.left > window.innerWidth;\n    if (isOffScreen) {\n        const centerEl = document.elementFromPoint(\n            window.innerWidth / 2,\n            window.innerHeight / 2\n        );\n        if (centerEl && centerEl !== document.body && centerEl !== document.documentElement) {\n            // Something is at center of viewport \u2014 check if el and centerEl\n            // share the same scrollable container\n            const elScrollParent = getScrollParent(el);\n            const centerScrollParent = getScrollParent(centerEl);\n            if (elScrollParent !== centerScrollParent) return \"true\";\n        }\n        return \"false\";\n    }\n    // On-screen element \u2014 use elementFromPoint\n    const testPoints = [\n        [rect.left + 5, rect.top + 5],\n        [rect.right - 5, rect.top + 5],\n        [rect.left + 5, rect.bottom - 5],\n        [rect.right - 5, rect.bottom - 5],\n        [rect.left + rect.width / 2, rect.top + rect.height / 2]\n    ];\n    for (const [x, y] of testPoints) {\n        if (x < 0 || y < 0 || x > window.innerWidth || y > window.innerHeight) continue;\n        const topEl = document.elementFromPoint(x, y);\n        if (!topEl) continue;\n        if (topEl === el || el.contains(topEl)) continue;\n        if (topEl.contains(el)) continue; // topEl is ancestor, not a cover\n        return \"true\";\n    }\n    return \"false\";\n}\nfunction getScrollParent(node) {\n    if (!node || node === document.body) return document.body;\n    const s = getComputedStyle(node);\n    if (\n        s.overflow === \"auto\" || s.overflow === \"scroll\" ||\n        s.overflowY === \"auto\" || s.overflowY === \"scroll\"\n    ) return node;\n    return getScrollParent(node.parentElement);\n}\nfunction isUsable(node) {\n    const s = getComputedStyle(node);\n    if (s.display === \"none\" || s.visibility === \"hidden\" || s.opacity === \"0\") return false;\n    const rect = node.getBoundingClientRect();\n    if (rect.width === 0 || rect.height === 0) return false;\n    return true;\n}\n\nfunction isSelectRelated(node) {\n    return (\n        node.matches?.(\"select, option\") ||\n        node.closest?.(\"select, [role='listbox'], [role='combobox']\")\n    );\n}\n  function annotate(node) {\n    const s = getComputedStyle(node);\n    node.setAttribute(\"element-visibility\", s.visibility || \"\");\n    node.setAttribute(\"element-pointer-events\", s.pointerEvents || \"\");\n    node.setAttribute(\"element-zindex\", s.zIndex || \"\");\n     if (isSelectRelated(node)) {\n        node.setAttribute(\"element-covered\", \"false\");\n        return;\n    }\n\n    if (!isUsable(node)) {\n        node.setAttribute(\"element-covered\", \"true\");\n        return;\n    }\n     try {\n        node.setAttribute(\"element-covered\", getCoverageStatus(node));\n        \n    } catch {\n        node.setAttribute(\"element-covered\", \"unknown\");\n    }\n  }\n  function getXPath(node) {\n    if (!node || node.nodeType !== 1) return \"\";\n    let segments = [];\n    let current = node;\n    while (current && current.nodeType === 1) {\n        const parent = current.parentNode;\n        if (parent instanceof ShadowRoot) {\n            const host = parent.host;\n            const siblings = Array.from(parent.children).filter(n => n.tagName === current.tagName);\n            const index = siblings.indexOf(current) + 1;\n            segments.unshift(\"shadow/\" + current.tagName.toLowerCase() + \"[\" + index + \"]\");\n            current = host;\n            continue;\n        }\n        let index = 1;\n        if (parent && parent.children) {\n            const siblings = Array.from(parent.children).filter(n => n.tagName === current.tagName);\n            index = siblings.indexOf(current) + 1;\n        }\n        segments.unshift(current.tagName.toLowerCase() + \"[\" + index + \"]\");\n        if (!parent || parent.nodeType !== 1) break;\n        current = parent;\n    }\n    let path = \"/\" + segments.join(\"/\");\n    if (node.ownerDocument !== document) {\n        const frameEl = node.ownerDocument.defaultView && node.ownerDocument.defaultView.frameElement;\n        if (frameEl) {\n            let framePath = frameEl.getAttribute(\"ff-xpath\");\n            if (!framePath) framePath = getXPath(frameEl);\n            path = framePath + path;\n        }\n    }\n    path = path.replace(//div[0]/div[0]/g, \"/div[1]\").replace(//div[0]/g, \"/div[1]\");\n    return path;\n  }\n  function walk(root) {\n     const walker = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT, null, false);\n    let node = walker.currentNode;\n    while (node) {\n        if (node.nodeType === 1 \n            && typeof node.setAttribute === 'function'\n            && ![\"META\", \"STYLE\", \"SCRIPT\"].includes(node.tagName)) {\n            node.setAttribute(\"ff-inspect\", \"Fire-Flink-\" + nodeIndex++);\n            node.setAttribute(\"ff-xpath\", getXPath(node));\n            annotate(node);\n        }\n        if (node.shadowRoot) walk(node.shadowRoot);\n        if (node.tagName === \"IFRAME\") {\n            try {\n                const doc = node.contentDocument;\n                if (doc && doc.documentElement) {\n                    walk(doc.documentElement);\n                } else {\n                    node.setAttribute(\"ff-cross-origin\", \"true\");\n                }\n            } catch {\n                node.setAttribute(\"ff-cross-origin\", \"true\");\n            }\n        }\n        node = walker.nextNode();\n    }\n  }\nfunction cleanup(root) {\n    const walker = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT, null, false);\n    let node = walker.currentNode;\n    while (node) {\n     if (node.nodeType === 1 && typeof node.removeAttribute === 'function') {\n        node.removeAttribute(\"ff-inspect\");\n        node.removeAttribute(\"ff-xpath\");\n        node.removeAttribute(\"element-visibility\");\n        node.removeAttribute(\"element-pointer-events\");\n        node.removeAttribute(\"element-zindex\");\n        node.removeAttribute(\"element-covered\");\n        node.removeAttribute(\"ff-cross-origin\");\n}\n        if (node.shadowRoot) cleanup(node.shadowRoot);\n        node = walker.nextNode();\n    }\n}\ncleanup(document.documentElement);\n// Force browser to settle DOM after cleanup\nvoid document.documentElement.offsetHeight;\nwalk(document.documentElement);\n  function serializeNode(node) {\n    if (node.nodeType === Node.TEXT_NODE) return node.textContent;\n    if (node.nodeType !== Node.ELEMENT_NODE) return \"\";\n    const tag = node.tagName.toLowerCase();\n    let html = \"<\" + tag;\n    for (const attr of node.attributes) {\n        if (attr.name === \"srcdoc\") continue;\n        html += \" \" + attr.name + \"=\"\" + attr.value.replace(/\"/g, \"&quot;\") + \"\"\";\n    }\n    html += \">\";\n    if (node.shadowRoot) {\n        html += \"<!--#shadow-root-->\";\n        node.shadowRoot.childNodes.forEach(child => { html += serializeNode(child); });\n        html += \"<!--#/shadow-root-->\";\n    }\n    if (tag === \"iframe\" && node.getAttribute(\"ff-cross-origin\") !== \"true\") {\n        try {\n            const doc = node.contentDocument;\n            if (doc) html += serializeNode(doc.documentElement);\n        } catch {}\n    }\n    node.childNodes.forEach(child => { html += serializeNode(child); });\n    html += \"</\" + tag + \">\";\n    return html;\n  }\n\n  const crossOriginIframes =\n      Array.from(\n          document.querySelectorAll(\"iframe\")\n      )\n      .filter(\n          iframe =>\n              iframe.getAttribute(\n                  \"ff-cross-origin\"\n              ) === \"true\"\n      )\n      .map(iframe => ({\n          xpath:\n              iframe.getAttribute(\n                  \"ff-xpath\"\n              ),\n\n          src:\n              iframe.getAttribute(\"src\"),\n\n          title:\n              iframe.getAttribute(\"title\"),\n\n          name:\n              iframe.getAttribute(\"name\")\n      }));\n\n  return {\n      dom: \"<!DOCTYPE html>\n\" + serializeNode(document.documentElement),\n      crossOriginIframes: crossOriginIframes,\n      nextNodeIndex: nodeIndex\n  };\n})(arguments[0]);\n";
+export declare function injectAngular(browser: WebdriverIO.Browser, startIndex?: number): Promise<RawDomInjectionResult>;
+export declare function getAngularAnnotatedDOM(browser: WebdriverIO.Browser, startIndex?: number): Promise<AnnotatedDOMResult>;
 export declare function getAnnotatedDOMForMobile(driver: WebdriverIO.Browser, existingDom?: string): Promise<AnnotatedDOMResult>;

package/dist/utils/DomExtraction/jsForAttributeInjection.js

@@ -1,12 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.INJECT_AND_SERIALIZE_DOM_JS = exports.processCrossOriginIframes = exports.combineDom = exports.markCrossOriginElements = void 0;
 exports.getAnnotatedDOM = getAnnotatedDOM;
+exports.injectReact = injectReact;
 exports.getReactAnnotatedDOM = getReactAnnotatedDOM;
+exports.injectAngular = injectAngular;
 exports.getAngularAnnotatedDOM = getAngularAnnotatedDOM;
 exports.getAnnotatedDOMForMobile = getAnnotatedDOMForMobile;
 const xmldom_1 = require("@xmldom/xmldom");
-const logData_js_1 = require("../../utils/logger/logData.js");
 const frameWorkDetector_js_1 = require("../frameWorkDetector/frameWorkDetector.js");
+const crossOriginHelper_js_1 = require("../crossOrigin/crossOriginHelper.js");
+Object.defineProperty(exports, "markCrossOriginElements", { enumerable: true, get: function () { return crossOriginHelper_js_1.markCrossOriginElements; } });
+Object.defineProperty(exports, "combineDom", { enumerable: true, get: function () { return crossOriginHelper_js_1.combineDom; } });
+Object.defineProperty(exports, "processCrossOriginIframes", { enumerable: true, get: function () { return crossOriginHelper_js_1.processCrossOriginIframes; } });
 async function getAnnotatedDOM(browser) {
     const isAngular = await frameWorkDetector_js_1.frameWorkDetector.isAngular(browser);
     if (isAngular) {
@@ -14,10 +20,12 @@ async function getAnnotatedDOM(browser) {
     }
     return getReactAnnotatedDOM(browser);
 }
-async function getReactAnnotatedDOM(browser) {
-    return await browser.execute(() => {
-        let nodeIndex = 0;
-        // const xpaths: Record<string, string> = {};
+// ==========================================================
+// REACT INJECTION
+// ==========================================================
+async function injectReact(browser, startIndex = 0) {
+    return await browser.execute((startIndexArg) => {
+        let nodeIndex = typeof startIndexArg === "number" ? startIndexArg : 0;
         // ==========================================================
         // COVERAGE CHECK
         // ==========================================================
@@ -153,7 +161,6 @@ async function getReactAnnotatedDOM(browser) {
                     const xpath = getXPath(node);
                     node.setAttribute("ff-inspect", fireId);
                     node.setAttribute("ff-xpath", xpath);
-                    // xpaths[fireId] = xpath;
                     annotate(node);
                 }
                 if (node.shadowRoot) {
@@ -163,9 +170,12 @@ async function getReactAnnotatedDOM(browser) {
                     try {
                         const doc = node
                             .contentDocument;
-                        if (doc?.documentElement) {
+                        if (doc && doc.documentElement) {
                             walk(doc.documentElement);
                         }
+                        else {
+                            node.setAttribute("ff-cross-origin", "true");
+                        }
                     }
                     catch {
                         node.setAttribute("ff-cross-origin", "true");
@@ -216,8 +226,8 @@ async function getReactAnnotatedDOM(browser) {
                         html += serializeNode(doc.documentElement);
                     }
                 }
-                catch (error) {
-                    logData_js_1.logger.error("Attribute injection failed", error);
+                catch {
+                    // inaccessible iframe
                 }
             }
             const voidElements = new Set([
@@ -247,16 +257,33 @@ async function getReactAnnotatedDOM(browser) {
             html += "</" + tag + ">";
             return html;
         }
+        const crossOriginIframes = Array.from(document.querySelectorAll("iframe"))
+            .filter(iframe => iframe.getAttribute("ff-cross-origin") === "true")
+            .map(iframe => ({
+            xpath: iframe.getAttribute("ff-xpath"),
+            src: iframe.getAttribute("src"),
+            title: iframe.getAttribute("title"),
+            name: iframe.getAttribute("name")
+        }));
         return {
             dom: "<!DOCTYPE html>\n" +
-                serializeNode(document.documentElement)
-            // selectors: xpaths
+                serializeNode(document.documentElement),
+            crossOriginIframes: crossOriginIframes,
+            nextNodeIndex: nodeIndex
         };
-    });
+    }, startIndex);
+}
+async function getReactAnnotatedDOM(browser, startIndex = 0) {
+    const parentResult = await injectReact(browser, startIndex);
+    const dom = await (0, crossOriginHelper_js_1.processCrossOriginIframes)(browser, parentResult, injectReact);
+    return { dom };
 }
-const INJECT_AND_SERIALIZE_DOM_JS = `
-return (function () {
-  let nodeIndex = 0;
+// ==========================================================
+// ANGULAR INJECTION
+// ==========================================================
+exports.INJECT_AND_SERIALIZE_DOM_JS = `
+return (function (startIndex) {
+  let nodeIndex = typeof startIndex === "number" ? startIndex : 0;
 function getCoverageStatus(el) {
     if (!el || !el.getBoundingClientRect) return "unknown";
     const s = getComputedStyle(el);
@@ -395,7 +422,11 @@ function isSelectRelated(node) {
         if (node.tagName === "IFRAME") {
             try {
                 const doc = node.contentDocument;
-                if (doc && doc.documentElement) walk(doc.documentElement);
+                if (doc && doc.documentElement) {
+                    walk(doc.documentElement);
+                } else {
+                    node.setAttribute("ff-cross-origin", "true");
+                }
             } catch {
                 node.setAttribute("ff-cross-origin", "true");
             }
@@ -404,7 +435,6 @@ function isSelectRelated(node) {
     }
   }
 function cleanup(root) {
-    const startNode = (root.nodeType === 1) ? root : null;
     const walker = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT, null, false);
     let node = walker.currentNode;
     while (node) {
@@ -432,7 +462,7 @@ walk(document.documentElement);
     let html = "<" + tag;
     for (const attr of node.attributes) {
         if (attr.name === "srcdoc") continue;
-        html += " " + attr.name + "=\\"" + attr.value.replace(/"/g, "&quot;") + "\\"";
+        html += " " + attr.name + "=\"" + attr.value.replace(/"/g, "&quot;") + "\"";
     }
     html += ">";
     if (node.shadowRoot) {
@@ -450,14 +480,49 @@ walk(document.documentElement);
     html += "</" + tag + ">";
     return html;
   }
-  return "<!DOCTYPE html>\\n" + serializeNode(document.documentElement);
-})();
+
+  const crossOriginIframes =
+      Array.from(
+          document.querySelectorAll("iframe")
+      )
+      .filter(
+          iframe =>
+              iframe.getAttribute(
+                  "ff-cross-origin"
+              ) === "true"
+      )
+      .map(iframe => ({
+          xpath:
+              iframe.getAttribute(
+                  "ff-xpath"
+              ),
+
+          src:
+              iframe.getAttribute("src"),
+
+          title:
+              iframe.getAttribute("title"),
+
+          name:
+              iframe.getAttribute("name")
+      }));
+
+  return {
+      dom: "<!DOCTYPE html>\n" + serializeNode(document.documentElement),
+      crossOriginIframes: crossOriginIframes,
+      nextNodeIndex: nodeIndex
+  };
+})(arguments[0]);
 `;
-async function getAngularAnnotatedDOM(browser) {
-    const fn = new Function(INJECT_AND_SERIALIZE_DOM_JS);
-    const result = await browser.execute(fn);
+async function injectAngular(browser, startIndex = 0) {
+    const fn = new Function("startIndex", exports.INJECT_AND_SERIALIZE_DOM_JS);
+    return await browser.execute(fn, startIndex);
+}
+async function getAngularAnnotatedDOM(browser, startIndex = 0) {
+    const parentResult = await injectAngular(browser, startIndex);
+    const dom = await (0, crossOriginHelper_js_1.processCrossOriginIframes)(browser, parentResult, injectAngular);
     return {
-        dom: result
+        dom
     };
 }
 async function getAnnotatedDOMForMobile(driver, existingDom) {

package/dist/utils/crossOrigin/crossOriginHelper.d.ts

@@ -0,0 +1,5 @@
+import { RawDomInjectionResult, ICombineDomResult, InjectIframeFunction, ICrossOriginElementInfo } from "./crossOriginInterface.js";
+export declare function markCrossOriginElements(iframeDom: string): string;
+export declare function combineDom(result: ICombineDomResult): string;
+export declare function processCrossOriginIframes(browser: WebdriverIO.Browser, parentResult: RawDomInjectionResult, injectIframeFn: InjectIframeFunction): Promise<string>;
+export declare function findCrossOriginIframeForElement(pageDom: string, fireflinkIndex: string): ICrossOriginElementInfo | null;

package/dist/utils/crossOrigin/crossOriginHelper.js

@@ -0,0 +1,195 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.markCrossOriginElements = markCrossOriginElements;
+exports.combineDom = combineDom;
+exports.processCrossOriginIframes = processCrossOriginIframes;
+exports.findCrossOriginIframeForElement = findCrossOriginIframeForElement;
+const logData_js_1 = require("../logger/logData.js");
+function markCrossOriginElements(iframeDom) {
+    return iframeDom.replace(/<([a-zA-Z][^<>]*)>/g, (match, p1) => {
+        if (p1.startsWith("!") || p1.startsWith("?")) {
+            return match;
+        }
+        if (!match.includes("ff-cross-origin=")) {
+            return match.slice(0, -1) + ' ff-cross-origin="true">';
+        }
+        return match;
+    });
+}
+function combineDom(result) {
+    const parentDom = result.parent.dom;
+    let combinedDom = parentDom;
+    for (const iframeInfo of result.crossOriginIframes) {
+        let iframeDom = iframeInfo.result?.dom;
+        if (!iframeDom) {
+            continue;
+        }
+        iframeDom = markCrossOriginElements(iframeDom);
+        const xpath = iframeInfo.xpath;
+        if (!xpath) {
+            continue;
+        }
+        const marker = `ff-xpath="${xpath}"`;
+        const index = combinedDom.indexOf(marker);
+        if (index === -1) {
+            continue;
+        }
+        const iframeStart = combinedDom.lastIndexOf("<iframe", index);
+        if (iframeStart === -1) {
+            continue;
+        }
+        const iframeEnd = combinedDom.indexOf(">", index);
+        if (iframeEnd === -1) {
+            continue;
+        }
+        const insertPosition = iframeEnd + 1;
+        combinedDom =
+            combinedDom.slice(0, insertPosition) +
+                "\n<!-- CROSS-ORIGIN IFRAME DOM START -->\n" +
+                iframeDom +
+                "\n<!-- CROSS-ORIGIN IFRAME DOM END -->\n" +
+                combinedDom.slice(insertPosition);
+    }
+    return combinedDom;
+}
+async function processCrossOriginIframes(browser, parentResult, injectIframeFn) {
+    if (!parentResult || !parentResult.dom) {
+        return parentResult?.dom || "";
+    }
+    const crossOriginIframes = parentResult.crossOriginIframes || [];
+    if (!crossOriginIframes.length) {
+        return parentResult.dom;
+    }
+    let nextIndex = parentResult.nextNodeIndex || 0;
+    const iframeResults = [];
+    for (const iframeInfo of crossOriginIframes) {
+        const title = iframeInfo.title;
+        const src = iframeInfo.src;
+        const xpath = iframeInfo.xpath;
+        const name = iframeInfo.name;
+        try {
+            await browser.switchFrame(null);
+            let iframeElement = null;
+            if (title) {
+                try {
+                    const el = await browser.$(`//iframe[@title='${title}']`);
+                    if (await el.isExisting())
+                        iframeElement = el;
+                }
+                catch {
+                    /* ignore */
+                }
+            }
+            if (!iframeElement && src) {
+                try {
+                    const el = await browser.$(`//iframe[contains(@src,'${src}')]`);
+                    if (await el.isExisting())
+                        iframeElement = el;
+                }
+                catch {
+                    /* ignore */
+                }
+            }
+            if (!iframeElement && name) {
+                try {
+                    const el = await browser.$(`//iframe[@name='${name}']`);
+                    if (await el.isExisting())
+                        iframeElement = el;
+                }
+                catch {
+                    /* ignore */
+                }
+            }
+            if (!iframeElement && xpath) {
+                try {
+                    const el = await browser.$(xpath);
+                    if (await el.isExisting())
+                        iframeElement = el;
+                }
+                catch {
+                    /* ignore */
+                }
+            }
+            if (!iframeElement) {
+                throw new Error(`Unable to locate cross-origin iframe with title=${title}, src=${src}`);
+            }
+            await browser.switchFrame(iframeElement);
+            const iframeResult = await injectIframeFn(browser, nextIndex);
+            if (iframeResult && typeof iframeResult.nextNodeIndex === "number") {
+                nextIndex = iframeResult.nextNodeIndex;
+            }
+            iframeResults.push({
+                title,
+                src,
+                name,
+                xpath,
+                result: iframeResult
+            });
+        }
+        catch (e) {
+            iframeResults.push({
+                title,
+                src,
+                name,
+                xpath,
+                error: e.message || String(e)
+            });
+            logData_js_1.logger.error(`Failed iframe: ${title || src || xpath} | ${e.message || String(e)}`);
+        }
+        finally {
+            try {
+                await browser.switchFrame(null);
+            }
+            catch {
+                /* ignore */
+            }
+        }
+    }
+    return combineDom({
+        parent: parentResult,
+        crossOriginIframes: iframeResults
+    });
+}
+function findCrossOriginIframeForElement(pageDom, fireflinkIndex) {
+    if (!pageDom || !fireflinkIndex)
+        return null;
+    const escaped = fireflinkIndex.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const marker = new RegExp(`<[^>]+\\bff-inspect\\s*=\\s*["']${escaped}["'][^>]*>`, "i");
+    const match = marker.exec(pageDom);
+    if (!match)
+        return null;
+    const tag = match[0];
+    const isCrossOrigin = /ff-cross-origin\s*=\s*["']true["']/i.test(tag);
+    if (!isCrossOrigin)
+        return null;
+    const elemIndex = match.index;
+    const iframeStart = pageDom.lastIndexOf("<iframe", elemIndex);
+    if (iframeStart === -1)
+        return null;
+    const iframeTagEnd = pageDom.indexOf(">", iframeStart);
+    if (iframeTagEnd === -1 || iframeTagEnd > elemIndex)
+        return null;
+    const iframeTag = pageDom.substring(iframeStart, iframeTagEnd + 1);
+    const getAttr = (name) => {
+        const attrMatch = new RegExp(`\\b${name}\\s*=\\s*["']([^"']*)["']`, "i").exec(iframeTag);
+        return attrMatch ? attrMatch[1] : undefined;
+    };
+    const frameMeta = {
+        id: getAttr("id"),
+        name: getAttr("name"),
+        title: getAttr("title"),
+        aria: getAttr("aria-label"),
+        src: getAttr("src"),
+    };
+    const blockStart = pageDom.indexOf("<!-- CROSS-ORIGIN IFRAME DOM START -->", iframeTagEnd);
+    const blockEnd = pageDom.indexOf("<!-- CROSS-ORIGIN IFRAME DOM END -->", blockStart);
+    let iframeDom;
+    if (blockStart !== -1 && blockEnd !== -1 && elemIndex > blockStart && elemIndex < blockEnd) {
+        iframeDom = pageDom.substring(blockStart + "<!-- CROSS-ORIGIN IFRAME DOM START -->".length, blockEnd).trim();
+    }
+    return {
+        isCrossOrigin: true,
+        frameMeta,
+        iframeDom,
+    };
+}

package/dist/utils/crossOrigin/crossOriginInterface.d.ts

@@ -0,0 +1,43 @@
+import { FrameMeta } from "../iframesExtraction/iframeInterface.js";
+export interface CrossOriginIframeInfo {
+    xpath?: string | null;
+    src?: string | null;
+    title?: string | null;
+    name?: string | null;
+    result?: RawDomInjectionResult;
+    error?: string;
+}
+export interface RawDomInjectionResult {
+    dom: string;
+    crossOriginIframes: CrossOriginIframeInfo[];
+    nextNodeIndex: number;
+}
+export interface ICombineDomResult {
+    parent: {
+        dom: string;
+        [key: string]: any;
+    };
+    crossOriginIframes: Array<{
+        xpath?: string | null;
+        result?: {
+            dom?: string;
+        };
+        [key: string]: any;
+    }>;
+}
+export type InjectIframeFunction = (browser: WebdriverIO.Browser, startIndex: number) => Promise<RawDomInjectionResult>;
+export interface ICrossOriginElementInfo {
+    isCrossOrigin: boolean;
+    frameMeta?: FrameMeta;
+    iframeDom?: string;
+}
+export type MarkCrossOriginElementsFn = (iframeDom: string) => string;
+export type CombineDomFn = (result: ICombineDomResult) => string;
+export type ProcessCrossOriginIframesFn = (browser: WebdriverIO.Browser, parentResult: RawDomInjectionResult, injectIframeFn: InjectIframeFunction) => Promise<string>;
+export type FindCrossOriginIframeForElementFn = (pageDom: string, fireflinkIndex: string) => ICrossOriginElementInfo | null;
+export interface ICrossOriginHelper {
+    markCrossOriginElements: MarkCrossOriginElementsFn;
+    combineDom: CombineDomFn;
+    processCrossOriginIframes: ProcessCrossOriginIframesFn;
+    findCrossOriginIframeForElement: FindCrossOriginIframeForElementFn;
+}

package/dist/utils/crossOrigin/crossOriginInterface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/utils/helpers/domSanitizer.js

@@ -4,6 +4,8 @@ exports.sanitizeWebDom = void 0;
 const sanitizeWebDom = (domString) => {
     return (domString || "")
         .replace(/<noscript[\s\S]*?<\/noscript>/gi, "")
-        .replace(/<noscript[^>]*>/gi, "");
+        .replace(/<noscript[^>]*>/gi, "")
+        .replace(/<iframe\b/gi, "<ff-iframe")
+        .replace(/<\/iframe>/gi, "</ff-iframe>");
 };
 exports.sanitizeWebDom = sanitizeWebDom;

package/dist/utils/iframesExtraction/findElementUsingFF.js

@@ -3,24 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findElementUsingFF = void 0;
 const appendScriptData_js_1 = require("../../fireflinkData/fireflinkScript/appendScriptData.js");
 const switchToIframeByMeta_js_1 = require("./switchToIframeByMeta.js");
+const elementSelectorResolver_js_1 = require("../../core/helpers/elementSelectorResolver.js");
 const findElementUsingFF = async (args) => {
     await args.driver.switchFrame(null);
-    const usedElementNames = [];
+    const usedElementNames = args.usedElementNames || [];
     for (const frameMeta of args.frames) {
         const xpathUsed = await (0, switchToIframeByMeta_js_1.switchToIframeByMeta)(args.driver, frameMeta);
         if (xpathUsed) {
-            let finalElementName = args.elementName;
-            if (finalElementName) {
-                const baseName = finalElementName;
-                let newName = baseName;
-                let count = 0;
-                while (usedElementNames.includes(newName)) {
-                    count++;
-                    newName = `${baseName}_${count}`;
-                }
-                finalElementName = newName;
-                usedElementNames.push(finalElementName);
-            }
+            const baseName = args.elementName ? args.elementName.trim().replace(/\s+/g, "-") : args.elementName;
+            const finalElementName = ((0, elementSelectorResolver_js_1.generateUniqueName)(baseName, usedElementNames, "-iframe") || baseName)?.replace(/\s+/g, "-");
             (0, appendScriptData_js_1.appendScriptData)({
                 scriptDataAppender: args.scriptDataAppender,
                 nlpName: "SwitchToFrameByFrameElement",

package/dist/utils/iframesExtraction/iframeInterface.d.ts

@@ -18,4 +18,5 @@ export interface IFindElementUsingFF {
     pageDOM: string;
     fireflinkIndex: string;
     elementGetter: ElementGetter;
+    usedElementNames?: string[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ff-automationv2",
-  "version": "2.2.34-beta.2",
+  "version": "2.2.34-beta.3",
   "private": false,
   "type": "commonjs",
   "description": "This lib is used to automate the manual testcase",