ff-automationv2 2.2.34-beta.3 → 2.2.35

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, usedElementNames?: string[]): Promise<void>;
+    switchToFrame(selector: string, frames: FrameMeta[], elementName: string, elementType: string, pageDOM: string, fireflinkIndex: string, usedElementNames?: string[], skipRecording?: boolean): 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, usedElementNames) {
+    async switchToFrame(selector, frames, elementName, elementType, pageDOM, fireflinkIndex, usedElementNames, skipRecording) {
         try {
             await (0, findElementUsingFF_js_1.findElementUsingFF)({
                 driver: this.driver,
@@ -437,7 +437,8 @@ class ActionExecutor {
                 fireflinkIndex,
                 elementGetter: this.elementGetter,
                 platform: this.platform,
-                usedElementNames
+                usedElementNames,
+                skipRecording
             });
         }
         catch (error) {

package/dist/automation/actions/interaction/shadowDom/shadowDomUpload.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadFileShadowElement = uploadFileShadowElement;
+const uploadPathHelper_js_1 = require("../../../../utils/helpers/uploadPathHelper.js");
 const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 const generateJsPath_js_1 = require("../../../../utils/JsPathGenerator/generateJsPath.js");
 const logData_js_1 = require("../../../../utils/logger/logData.js");
@@ -64,12 +65,16 @@ async function uploadFileShadowElement(args) {
         if (!fileInput) {
             throw new Error(`Shadow DOM file input not found. Selector: "${args.selector}"`);
         }
-        const remoteFilePath = await args.driver.uploadFile(args.value);
+        let remoteFilePath;
         try {
+            remoteFilePath = await args.driver.uploadFile((0, uploadPathHelper_js_1.resolveUploadPath)(args.value));
             await fileInput.setValue(remoteFilePath);
         }
         catch (err) {
             logData_js_1.logger.info(`setValue failed on shadow file input, trying addValue: ${err.message}`);
+            if (!remoteFilePath) {
+                throw err;
+            }
             await fileInput.addValue(remoteFilePath);
         }
         //Dispatch change and input events so custom UI components update their state

package/dist/automation/actions/interaction/upload/uploadfile.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadFilePathUsingRobot = uploadFilePathUsingRobot;
+const uploadPathHelper_js_1 = require("../../../../utils/helpers/uploadPathHelper.js");
 const enterActionHelper_js_1 = require("../../../../utils/helpers/enterActionHelper.js");
 const logData_js_1 = require("../../../../utils/logger/logData.js");
 const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
@@ -8,11 +9,15 @@ async function uploadFilePathUsingRobot(args) {
     try {
         const { ffNumber, xpathPath } = (0, enterActionHelper_js_1.enterActionHelper)(args.pageDOM, args.fireflinkIndex);
         const fileInput = await args.driver.$(xpathPath);
-        const remoteFilePath = await args.driver.uploadFile(args.value);
+        let remoteFilePath;
         try {
+            remoteFilePath = await args.driver.uploadFile((0, uploadPathHelper_js_1.resolveUploadPath)(args.value));
             await fileInput.setValue(remoteFilePath);
         }
         catch (error) {
+            if (!remoteFilePath) {
+                throw error;
+            }
             logData_js_1.logger.info(`Error in setValue, using addValue instead: ${error.message}`);
             await fileInput.addValue(remoteFilePath);
         }

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

@@ -10,4 +10,4 @@ export declare function resolveElementSelector(doc: any, domInfo: any, fireflink
     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, usedElementNames?: 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[], skipRecording?: boolean): Promise<ShadowIframeResult>;

package/dist/core/helpers/elementSelectorResolver.js

@@ -63,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, usedElementNames) {
+async function handleShadowAndIframe(driver, stepAction, selector, fireflinkIndex, domInfo, actionHandlers, elementName, elementType, usedElementNames, skipRecording) {
     let updatedStepAction = stepAction;
     let updatedSelector = selector;
     let iframeDomHtml = null;
@@ -83,6 +83,7 @@ async function handleShadowAndIframe(driver, stepAction, selector, fireflinkInde
                 pageDOM: domInfo.dom,
                 fireflinkIndex,
                 usedElementNames,
+                skipRecording,
             });
             return {
                 stepAction: updatedStepAction,
@@ -116,6 +117,7 @@ async function handleShadowAndIframe(driver, stepAction, selector, fireflinkInde
                 pageDOM: domInfo.dom,
                 fireflinkIndex,
                 usedElementNames,
+                skipRecording,
             });
             return {
                 stepAction: updatedStepAction,

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, result.usedElementNames);
+            await executor.switchToFrame(result.selector, result.frames, result.elementName, result.elementType, result.pageDOM, result.fireflinkIndex, result.usedElementNames, result.skipRecording);
         }),
         Click: withExecutor(async (executor, result) => {
             await executor.click(result.pageDOM, result.selector, result.fireflinkIndex, result.elementName, result.elementType);

package/dist/core/main/runAutomationScript.js

@@ -110,12 +110,17 @@ class AutomationRunner {
                 if (context?.mobileSession) {
                     const mobileDriver = await context.mobileSession.getCurrentDriver().catch(() => null);
                     if (mobileDriver?.sessionId) {
-                        if (currentPlatform === "ios") {
-                            logData_js_1.logger.info("iOS session is not deleted");
+                        if (request.isCloud) {
+                            if (currentPlatform === "ios") {
+                                logData_js_1.logger.info("iOS session is not deleted");
+                            }
+                            else {
+                                await mobileDriver.deleteSession();
+                                logData_js_1.logger.info("Mobile session deleted successfully");
+                            }
                         }
                         else {
-                            await mobileDriver.deleteSession();
-                            logData_js_1.logger.info("Mobile session deleted successfully");
+                            logData_js_1.logger.info("Local mobile session kept alive.");
                         }
                     }
                 }
@@ -560,6 +565,7 @@ class AutomationRunner {
                         continue;
                     }
                     baseStepActionBeforeFallback = stepAction;
+                    let iframeSwitchRecorded = false;
                     for (let fallbackAttempt = 1; fallbackAttempt <= 2; fallbackAttempt++) {
                         let shadowIframeResult = null;
                         try {
@@ -622,7 +628,10 @@ class AutomationRunner {
                                 logData_js_1.logger.info(`Unable to resolve xpath for ${fireflinkIndex}`);
                                 throw new Error(`Unable to resolve xpath for ${fireflinkIndex}`);
                             }
-                            shadowIframeResult = await (0, elementSelectorResolver_js_1.handleShadowAndIframe)(driver, stepAction, selector, fireflinkIndex, domInfo, actionHandlers, currentElementName || result.response.elementName, stepResult.response.elementType, usedElementNames);
+                            shadowIframeResult = await (0, elementSelectorResolver_js_1.handleShadowAndIframe)(driver, stepAction, selector, fireflinkIndex, domInfo, actionHandlers, currentElementName || result.response.elementName, stepResult.response.elementType, usedElementNames, iframeSwitchRecorded);
+                            if (shadowIframeResult?.isIframe) {
+                                iframeSwitchRecorded = true;
+                            }
                             if (!shadowIframeResult.handled) {
                                 return;
                             }

package/dist/tests/test12.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tests/test12.js

@@ -1,34 +1,35 @@
 "use strict";
-// // import { verify } from "node:crypto";
-// import { AutomationRunner } from "../index.js"
-// import { Kafka, Producer } from "kafkajs";
-// import path from "path";
-// import fs from "fs";
-// const certPath = path.join(
-//     "D:", "Bitbucket", "ai-chat-backend", "Certificates", "V3keystore.jks"
-// );
-// const ssl = {
-//     ca: [fs.readFileSync(certPath, "utf-8")],
-//     rejectUnauthorized: false,
-// }
-// const runner = new AutomationRunner();
-// runner.run({
-//     // hasMoreSteps: false,
-//     userStory: [
-//         ["Launch the browser"],
-//         ["navigate to url https://www.indiamart.com"],
-//         ["wait for 20 seconds"],
-//         ["get otp from INDMRT message within 60 seconds and wait for 60 seconds"],
-//         ["Enter OTP into enter otp boxes"],
-//         ["wait for 10 seconds"],
-//         ["Close the browser"]
-//     ],
-//     scenario: false,
-//     sslConfig: ssl,
-//     scriptType: "android",
-//     broker: ["test3.fireflink.com:9092"], "scriptName": "script", "type": "Web & Mobile", "projectId": "PJT1006", "testCaseId": "SCR1806", kafkaMessageKey: 'lohit',
-//     "promptId": "a8fba64a-4d91-422c-bdfd-a7609576a63e", "generatedBy": "", "webSocketId": "", "licenseType": "C-Professional", "licenseId": "LIC2026980", "userId": "USR26860", "projectType": "Web", "serverData": "https://performance.fireflink.com", "pageDetails": { "Web": { "pageId": "PAG3e09350f-4917-4c80-8ce5-a08e97fe314e", "pageName": "ai-Page" } }, "userName": "jai", isTerminate: false, "appiumPort": 4723, "realDeviceId": "", "browserName": "Google Chrome", "token": "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJIUlpZV2NoTURZWXVQaDF3TDkxb3drS3Q1OUtuNC1sOFRJcXF3a2RBV2pjIn0.eyJleHAiOjE3ODA1NzkwNzEsImlhdCI6MTc4MDQ5MjY3MSwianRpIjoib25ydHJvOmYxYzJiNjg2LTJiZGMtNGIxOS04ZGVhLTMwMjhhNDkxZDY5NCIsImlzcyI6Imh0dHA6Ly8xNDguNzIuMTY4LjE2OjMwMTA3L3JlYWxtcy9GaXJlRmxpbmstdGVzdDEiLCJhdWQiOiJ0YXJnZXQtY2xpZW50Iiwic3ViIjoiZjo4ODkyOWIwMC03M2I4LTQ3NGYtYmJiYy1kYjJlMWEzZTA3OTg6amFpYWthc2hAeW9wbWFpbC5jb20iLCJ0eXAiOiJCZWFyZXIiLCJhenAiOiJmbGluay1zZXJ2aWNlIiwic2lkIjoiZWRiMDgwZDctNzhiYi00NzU5LTgyM2EtMTM1ZDUzYTM5NmQzIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInNjb3BlIjoicHJvZmlsZSBlbWFpbCIsImN1cnJlbnRMaWNlbnNlSWQiOiJMSUMzOTIyIiwiZW1haWxfdmVyaWZpZWQiOmZhbHNlLCJjdXJyZW50UHJpdmlsZWdlIjoiQWRtaW4iLCJmdWxsTmFtZSI6ImphaSIsImFjdGl2YXRpb25TdGF0dXMiOiJBQ1RJVkUiLCJwcml2aWxlZ2UiOiJBZG1pbiIsImxpY2Vuc2VOYW1lIjoiRmlyZUZsaW5rIC0gTElDMzkyMnciLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiJqYWkiLCJ1c2VyTmFtZSI6ImphaWFrYXNoQHlvcG1haWwuY29tIiwiYmlsbGluZ0N5Y2xlIjoiWWVhcmx5IiwiaWQiOiJVU1IyNjc1MiIsImxpY2Vuc2VJZCI6IkxJQzM5MjIiLCJlbWFpbCI6ImphaWFrYXNoQHlvcG1haWwuY29tIn0.LPBCnEKBi8Yi4Qktpd_oW46-P7s0iQ0AejZeXRMIa8aUwfwY8gNl3McIrKLBVqPL4NKYe_05aMaiepvjkolu7RWh120mX90ZdNJuMUjg0WuRaM90xNjmy1YK94mBt0mphKK04u1K4trvhvgW2hTt4rvGRq_oEvH2E_2YqYw310TuP-guqxuZqTv_IJ6HFtvMJkV9L3A579juICZfGdS53-KuZwqn7jA-73nJZBzPJyMucaPz42s36RWpDmfs7MX0-Fcv8LH7FvCjCs63GvCC-tdGoh5m0MRCiElJocWlw9jabsPHymEt5-nemnXIZIon2675wYbxVx99mHA1VBPD2w", "sessionPath": "session", "platform": "android", "platformVersion": "", "env": "test1",
-//     "serverHost": "https://sg-app.fireflink.com", "adbPath": "C:\\FireFlinkClient\\resources\\bin\\win\\android-sdk\\platform-tools\\adb.exe",
-//     topic: "test-topic",
-//     aiExecutionAction: ""
-// });
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+// import { verify } from "node:crypto";
+const index_js_1 = require("../index.js");
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const certPath = path_1.default.join("D:", "Bitbucket", "ai-chat-backend", "Certificates", "V3keystore.jks");
+const ssl = {
+    ca: [fs_1.default.readFileSync(certPath, "utf-8")],
+    rejectUnauthorized: false,
+};
+const runner = new index_js_1.AutomationRunner();
+runner.run({
+    hasMoreSteps: false,
+    userStory: [
+        ["Launch the browser"],
+        ["navigate to url https://www.indiamart.com"],
+        ["wait for 20 seconds"],
+        ["get otp from INDMRT message within 60 seconds and wait for 60 seconds"],
+        ["Enter OTP into enter otp boxes"],
+        ["wait for 10 seconds"],
+        ["Close the browser"]
+    ],
+    scenario: false,
+    sslConfig: ssl,
+    scriptType: "android",
+    broker: ["test3.fireflink.com:9092"], "scriptName": "script", "type": "Web & Mobile", "projectId": "PJT1006", "testCaseId": "SCR1806", kafkaMessageKey: 'lohit',
+    "promptId": "a8fba64a-4d91-422c-bdfd-a7609576a63e", "generatedBy": "", "webSocketId": "", "licenseType": "C-Professional", "licenseId": "LIC2026980", "userId": "USR26860", "projectType": "Web", "serverData": "https://performance.fireflink.com", "pageDetails": { "Web": { "pageId": "PAG3e09350f-4917-4c80-8ce5-a08e97fe314e", "pageName": "ai-Page" } }, "userName": "jai", isTerminate: false, "appiumPort": 4723, "realDeviceId": "", "browserName": "Google Chrome", "token": "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJIUlpZV2NoTURZWXVQaDF3TDkxb3drS3Q1OUtuNC1sOFRJcXF3a2RBV2pjIn0.eyJleHAiOjE3ODA1NzkwNzEsImlhdCI6MTc4MDQ5MjY3MSwianRpIjoib25ydHJvOmYxYzJiNjg2LTJiZGMtNGIxOS04ZGVhLTMwMjhhNDkxZDY5NCIsImlzcyI6Imh0dHA6Ly8xNDguNzIuMTY4LjE2OjMwMTA3L3JlYWxtcy9GaXJlRmxpbmstdGVzdDEiLCJhdWQiOiJ0YXJnZXQtY2xpZW50Iiwic3ViIjoiZjo4ODkyOWIwMC03M2I4LTQ3NGYtYmJiYy1kYjJlMWEzZTA3OTg6amFpYWthc2hAeW9wbWFpbC5jb20iLCJ0eXAiOiJCZWFyZXIiLCJhenAiOiJmbGluay1zZXJ2aWNlIiwic2lkIjoiZWRiMDgwZDctNzhiYi00NzU5LTgyM2EtMTM1ZDUzYTM5NmQzIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInNjb3BlIjoicHJvZmlsZSBlbWFpbCIsImN1cnJlbnRMaWNlbnNlSWQiOiJMSUMzOTIyIiwiZW1haWxfdmVyaWZpZWQiOmZhbHNlLCJjdXJyZW50UHJpdmlsZWdlIjoiQWRtaW4iLCJmdWxsTmFtZSI6ImphaSIsImFjdGl2YXRpb25TdGF0dXMiOiJBQ1RJVkUiLCJwcml2aWxlZ2UiOiJBZG1pbiIsImxpY2Vuc2VOYW1lIjoiRmlyZUZsaW5rIC0gTElDMzkyMnciLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiJqYWkiLCJ1c2VyTmFtZSI6ImphaWFrYXNoQHlvcG1haWwuY29tIiwiYmlsbGluZ0N5Y2xlIjoiWWVhcmx5IiwiaWQiOiJVU1IyNjc1MiIsImxpY2Vuc2VJZCI6IkxJQzM5MjIiLCJlbWFpbCI6ImphaWFrYXNoQHlvcG1haWwuY29tIn0.LPBCnEKBi8Yi4Qktpd_oW46-P7s0iQ0AejZeXRMIa8aUwfwY8gNl3McIrKLBVqPL4NKYe_05aMaiepvjkolu7RWh120mX90ZdNJuMUjg0WuRaM90xNjmy1YK94mBt0mphKK04u1K4trvhvgW2hTt4rvGRq_oEvH2E_2YqYw310TuP-guqxuZqTv_IJ6HFtvMJkV9L3A579juICZfGdS53-KuZwqn7jA-73nJZBzPJyMucaPz42s36RWpDmfs7MX0-Fcv8LH7FvCjCs63GvCC-tdGoh5m0MRCiElJocWlw9jabsPHymEt5-nemnXIZIon2675wYbxVx99mHA1VBPD2w", "sessionPath": "session", "platform": "android", "platformVersion": "", "env": "test1",
+    "serverHost": "https://sg-app.fireflink.com", "adbPath": "C:\\FireFlinkClient\\resources\\bin\\win\\android-sdk\\platform-tools\\adb.exe",
+    topic: "test-topic",
+    aiExecutionAction: ""
+});

package/dist/utils/helpers/uploadPathHelper.d.ts

@@ -0,0 +1 @@
+export declare const resolveUploadPath: (rawPath: string) => string;

package/dist/utils/helpers/uploadPathHelper.js

@@ -0,0 +1,19 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveUploadPath = void 0;
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+const resolveUploadPath = (rawPath) => {
+    const filePath = node_path_1.default.normalize(rawPath.trim().replace(/^["']|["']$/g, ""));
+    if (!node_fs_1.default.existsSync(filePath)) {
+        throw new Error(`Upload file not found: "${filePath}"`);
+    }
+    if (!node_fs_1.default.statSync(filePath).isFile()) {
+        throw new Error(`Upload path is not a file: "${filePath}"`);
+    }
+    return filePath;
+};
+exports.resolveUploadPath = resolveUploadPath;

package/dist/utils/iframesExtraction/findElementUsingFF.js

@@ -7,9 +7,23 @@ const elementSelectorResolver_js_1 = require("../../core/helpers/elementSelector
 const findElementUsingFF = async (args) => {
     await args.driver.switchFrame(null);
     const usedElementNames = args.usedElementNames || [];
-    for (const frameMeta of args.frames) {
+    const uniqueFrames = [];
+    for (const frame of args.frames || []) {
+        const isDuplicate = uniqueFrames.some(existing => (frame.id && existing.id === frame.id) ||
+            (frame.name && existing.name === frame.name) ||
+            (frame.title && existing.title === frame.title) ||
+            (frame.aria && existing.aria === frame.aria) ||
+            (frame.src && existing.src === frame.src));
+        if (!isDuplicate) {
+            uniqueFrames.push(frame);
+        }
+    }
+    for (const frameMeta of uniqueFrames) {
         const xpathUsed = await (0, switchToIframeByMeta_js_1.switchToIframeByMeta)(args.driver, frameMeta);
         if (xpathUsed) {
+            if (args.skipRecording) {
+                continue;
+            }
             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)({

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

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

package/package.json

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