ff-automationv2 2.2.28 → 2.2.29

package/dist/automation/actions/interaction/click/doubleClick.js

@@ -1,27 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.doubleClick = doubleClick;
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function doubleClick(args) {
+    const nlpName = args.platform === "ios" ? "IOS_DoubleTap" : "MOB_DoubleTap";
     switch (args.platform) {
         case "android":
+        case "ios":
             try {
                 const element = await args.driver.$(args.selector);
                 await element.doubleClick();
-                args.scriptDataAppender.add(async () => {
-                    return {
-                        nlpName: 'MOB_DoubleTap',
-                        stepInputs: [],
-                        elementsData: [{
-                                name: args.elementName,
-                                type: args.elementType,
-                                locators: [{ "name": "xpath", "value": args.selector }],
-                                platform: args.platform
-                            }]
-                    };
+                (0, appendScriptData_js_1.appendScriptData)({
+                    scriptDataAppender: args.scriptDataAppender,
+                    nlpName: nlpName,
+                    stepInputs: [],
+                    pageDOM: args.pageDOM,
+                    elementGetter: args.elementGetter,
+                    ffNumber: args.fireflinkIndex,
+                    elementName: args.elementName,
+                    elementType: args.elementType,
+                    selector: args.selector,
+                    platform: args.platform
                 });
             }
             catch (error) {
-                args.scriptDataAppender.setErrorNLP("MOB_DoubleTap");
+                args.scriptDataAppender.setErrorNLP(nlpName);
                 throw new Error(`DoubleClick action failed :`, { cause: error });
             }
             break;
@@ -29,20 +32,24 @@ async function doubleClick(args) {
         default:
             try {
                 const element = await args.driver.$(args.selector);
-                await element.scrollIntoView({ block: 'center', inline: 'center' });
+                await args.driver.execute((el) => {
+                    el.scrollIntoView({
+                        block: "center",
+                        inline: "center"
+                    });
+                }, element);
                 await element.doubleClick();
-                args.scriptDataAppender.add(async () => {
-                    const ffElement = await args.elementGetter.getFireFlinkElement(args.pageDOM, `[ff-inspect="${args.fireflinkIndex}"]`);
-                    return {
-                        nlpName: 'DoubleClick',
-                        stepInputs: [],
-                        elementsData: [{
-                                name: args.elementName,
-                                type: args.elementType,
-                                locators: ffElement.locators,
-                                platform: args.platform
-                            }]
-                    };
+                (0, appendScriptData_js_1.appendScriptData)({
+                    scriptDataAppender: args.scriptDataAppender,
+                    nlpName: 'DoubleClick',
+                    stepInputs: [],
+                    pageDOM: args.pageDOM,
+                    elementGetter: args.elementGetter,
+                    ffNumber: args.fireflinkIndex,
+                    elementName: args.elementName,
+                    elementType: args.elementType,
+                    selector: args.selector,
+                    platform: args.platform
                 });
             }
             catch (error) {

package/dist/automation/actions/interaction/click/rightClick.js

@@ -1,23 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rightClick = rightClick;
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function rightClick(args) {
     try {
         const element = await args.driver.$(args.selector);
-        await element.scrollIntoView({ block: 'center', inline: 'center' });
+        await args.driver.execute((el) => {
+            el.scrollIntoView({
+                block: "center",
+                inline: "center"
+            });
+        }, element);
         await element.click({ button: 2 });
-        args.scriptDataAppender.add(async () => {
-            const ffElement = await args.elementGetter.getFireFlinkElement(args.pageDOM, `[ff-inspect="${args.fireflinkIndex}"]`);
-            return {
-                nlpName: 'RightClick',
-                stepInputs: [],
-                elementsData: [{
-                        name: args.elementName,
-                        type: args.elementType,
-                        locators: ffElement.locators,
-                        platform: args.platform
-                    }]
-            };
+        (0, appendScriptData_js_1.appendScriptData)({
+            scriptDataAppender: args.scriptDataAppender,
+            nlpName: 'RightClick',
+            stepInputs: [],
+            pageDOM: args.pageDOM,
+            elementGetter: args.elementGetter,
+            ffNumber: args.fireflinkIndex,
+            elementName: args.elementName,
+            elementType: args.elementType,
+            selector: args.selector,
+            platform: args.platform
         });
     }
     catch (error) {

package/dist/automation/actions/interaction/click/tapOnSpecifiedLocation.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TapOnSpecifiedLocation = void 0;
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 const TapOnSpecifiedLocation = async (args) => {
+    const nlpName = args.platform === "ios" ? "IOS_TapOnSpecifiedLocation" : "MOB_TapOnSpecifiedLocation";
     try {
         const coords = args.value.split(",");
         const x = parseInt(coords[0]);
@@ -19,14 +21,14 @@ const TapOnSpecifiedLocation = async (args) => {
             }
         ]);
         await args.driver.releaseActions();
-        args.scriptDataAppender.add(async () => ({
-            nlpName: "MOB_TapOnSpecifiedLocation",
+        (0, appendScriptData_js_1.appendScriptData)({
+            scriptDataAppender: args.scriptDataAppender,
+            nlpName: nlpName,
             stepInputs: [x, y],
-            elementsData: []
-        }));
+        });
     }
     catch (error) {
-        args.scriptDataAppender.setErrorNLP("MOB_TapOnSpecifiedLocation");
+        args.scriptDataAppender.setErrorNLP(nlpName);
         throw new Error("MOB_TapOnSpecifiedLocation action failed", { cause: error });
     }
 };

package/dist/automation/actions/interaction/click/waitAndClick.js

@@ -2,43 +2,46 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.waitAndClick = waitAndClick;
 const logData_js_1 = require("../../../../utils/logger/logData.js");
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function waitAndClick(args) {
+    const nlpName = args.platform === "ios" ? "IOS_WaitAndClick" : "MOB_WaitAndClick";
     switch (args.platform) {
         case "android":
+        case "ios":
             try {
                 const element = await args.driver.$(args.selector);
-                let waitTime;
+                let waitTime = 10;
                 if (args.value != "") {
                     waitTime = parseInt(args.value);
                     await element.waitForDisplayed({ timeout: waitTime });
                 }
                 else {
-                    await element.waitForDisplayed({ timeout: 10000 });
+                    await element.waitForDisplayed({ timeout: waitTime * 100 });
                 }
                 logData_js_1.logger.info(`Element became visible. Clicking selector: ${args.selector}`);
                 await element.click();
-                args.scriptDataAppender.add(async () => {
-                    return {
-                        nlpName: 'MOB_WaitAndClick',
-                        stepInputs: [waitTime ? waitTime : 10],
-                        elementsData: [{
-                                name: args.elementName,
-                                type: args.elementType,
-                                locators: [{ "name": "xpath", "value": args.selector }],
-                                platform: args.platform
-                            }]
-                    };
+                (0, appendScriptData_js_1.appendScriptData)({
+                    scriptDataAppender: args.scriptDataAppender,
+                    nlpName: nlpName,
+                    stepInputs: [waitTime ? waitTime : 10],
+                    pageDOM: args.pageDOM,
+                    elementGetter: args.elementGetter,
+                    ffNumber: args.fireflinkIndex,
+                    elementName: args.elementName,
+                    elementType: args.elementType,
+                    selector: args.selector,
+                    platform: args.platform
                 });
             }
             catch (error) {
-                args.scriptDataAppender.setErrorNLP("MOB_WaitAndClick");
+                args.scriptDataAppender.setErrorNLP(nlpName);
                 throw new Error(`WaitAndClick action failed`, { cause: error });
             }
             break;
         case "web":
         default:
             try {
-                let waitTime;
+                let waitTime = 10;
                 const element = await args.driver.$(args.selector);
                 if (args.value != "") {
                     waitTime = parseInt(args.value);
@@ -49,18 +52,17 @@ async function waitAndClick(args) {
                 }
                 logData_js_1.logger.info(`Element became visible. Clicking selector: ${args.selector}`);
                 await element.click();
-                args.scriptDataAppender.add(async () => {
-                    const ffElement = await args.elementGetter.getFireFlinkElement(args.pageDOM, `[ff-inspect="${args.fireflinkIndex}"]`);
-                    return {
-                        nlpName: 'WaitAndClick',
-                        stepInputs: [waitTime ? waitTime : 10],
-                        elementsData: [{
-                                name: args.elementName,
-                                type: args.elementType,
-                                locators: ffElement.locators,
-                                platform: args.platform
-                            }]
-                    };
+                (0, appendScriptData_js_1.appendScriptData)({
+                    scriptDataAppender: args.scriptDataAppender,
+                    nlpName: "WaitAndClick",
+                    stepInputs: [waitTime ? waitTime : 10],
+                    pageDOM: args.pageDOM,
+                    elementGetter: args.elementGetter,
+                    ffNumber: args.fireflinkIndex,
+                    elementName: args.elementName,
+                    elementType: args.elementType,
+                    selector: args.selector,
+                    platform: args.platform
                 });
             }
             catch (error) {

package/dist/automation/actions/interaction/dragAndDrop/dragAndDrop.js

@@ -15,13 +15,13 @@ async function dragAndDropToElement(args) {
                     {
                         name: args.elementName1,
                         type: args.elementType1,
-                        locators: ffElement1.locators,
+                        locators: ffElement1?.locators ? ffElement1.locators : [{ name: "xpath", value: args.selector1 }],
                         platform: args.platform
                     },
                     {
                         name: args.elementName2,
                         type: args.elementType2,
-                        locators: ffElement2.locators,
+                        locators: ffElement2?.locators ? ffElement2.locators : [{ name: "xpath", value: args.selector2 }],
                         platform: args.platform
                     }
                 ],

package/dist/automation/actions/interaction/elementLessAction/MobCheckIfAppIsClosed.js

@@ -1,23 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MOB_CheckIfAppIsClosed = MOB_CheckIfAppIsClosed;
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function MOB_CheckIfAppIsClosed(args) {
+    const nlpName = args.platform === "ios" ? "IOS_CheckIfAppIsClosed" : "MOB_CheckIfAppIsClosed";
     try {
-        const state = await args.driver.queryAppState(await args.driver.getCurrentPackage());
+        let state;
+        if (args.platform === "ios") {
+            state = await args.driver.queryAppState(args.driver.capabilities["appium:bundleId"]);
+        }
+        else {
+            state = await args.driver.queryAppState(await args.driver.getCurrentPackage());
+        }
         const isClosed = state !== 4;
         if (!isClosed) {
             throw new Error("App is not closed");
         }
-        args.scriptDataAppender.add(async () => {
-            return {
-                nlpName: 'MOB_CheckIfAppIsClosed',
-                stepInputs: [],
-                elementsData: []
-            };
+        (0, appendScriptData_js_1.appendScriptData)({
+            scriptDataAppender: args.scriptDataAppender,
+            nlpName: nlpName
         });
     }
     catch (error) {
-        args.scriptDataAppender.setErrorNLP("MOB_CheckIfAppIsClosed");
-        throw new Error(`enter action failed:`, { cause: error });
+        args.scriptDataAppender.setErrorNLP(nlpName);
+        throw new Error(`App is not closed:`, { cause: error });
     }
 }

package/dist/automation/actions/interaction/elementLessAction/MobRunAppInBackgroundInterface.js

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MOB_RunAppInBackground = MOB_RunAppInBackground;
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function MOB_RunAppInBackground(args) {
+    const nlpName = args.platform === "ios" ? "IOS_RunAppInBackground" : "MOB_RunAppInBackground";
     try {
         await args.driver.execute('mobile: backgroundApp', {
-            seconds: Number(args.value)
+            seconds: Number(args.value || "5")
         });
-        args.scriptDataAppender.add(async () => {
-            return {
-                nlpName: 'MOB_RunAppInBackground',
-                stepInputs: [args.value],
-                elementsData: []
-            };
+        (0, appendScriptData_js_1.appendScriptData)({
+            scriptDataAppender: args.scriptDataAppender,
+            nlpName: nlpName,
+            stepInputs: [args.value]
         });
     }
     catch (error) {
-        args.scriptDataAppender.setErrorNLP("MOB_RunAppInBackground");
-        throw new Error("MOB_RunAppInBackground failed", { cause: error });
+        args.scriptDataAppender.setErrorNLP(nlpName);
+        throw new Error("RunAppInBackground action failed", { cause: error });
     }
 }

package/dist/automation/actions/interaction/elementlessActions/activateAppUsingAppPackage.d.ts

@@ -1,5 +1,2 @@
 import { MOB_ActivateAppUsingAppPackageInterface } from "../../interface/elementlessInterface.js";
-/**
- * Reuses InstallAPK logic as per user's Python implementation
- */
 export declare function ActivateAppUsingAppPackage(args: MOB_ActivateAppUsingAppPackageInterface): Promise<void>;

package/dist/automation/actions/interaction/elementlessActions/activateAppUsingAppPackage.js

@@ -1,20 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActivateAppUsingAppPackage = ActivateAppUsingAppPackage;
-/**
- * Reuses InstallAPK logic as per user's Python implementation
- */
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function ActivateAppUsingAppPackage(args) {
+    const nlpName = args.platform === "ios" ? "IOS_ActivateAppUsingBundleID" : "MOB_ActivateAppUsingAppPackage";
     try {
         await args.driver.activateApp(args.value);
-        args.scriptDataAppender.add(async () => ({
-            nlpName: 'MOB_ActivateAppUsingAppPackage',
+        (0, appendScriptData_js_1.appendScriptData)({
+            scriptDataAppender: args.scriptDataAppender,
+            nlpName: nlpName,
             stepInputs: [args.value],
-            elementsData: []
-        }));
+        });
     }
     catch (error) {
-        args.scriptDataAppender.setErrorNLP("MOB_ActivateAppUsingAppPackage");
-        throw new Error("MOB_ActivateAppUsingAppPackage action failed", { cause: error });
+        args.scriptDataAppender.setErrorNLP(nlpName);
+        throw new Error("ActivateAppUsingAppPackage action failed", { cause: error });
     }
 }

package/dist/automation/actions/interaction/elementlessActions/installAPK.js

@@ -5,42 +5,83 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InstallAPK = InstallAPK;
 const logData_js_1 = require("../../../../utils/logger/logData.js");
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 async function InstallAPK(args) {
-    try {
-        const apkPath = args.value.trim();
-        logData_js_1.logger.info(`Installing APK: ${apkPath}`);
-        let installed = false;
-        // 1. Direct install if it looks like a path
-        if (apkPath.toLowerCase().endsWith(".apk") || apkPath.includes("/") || apkPath.includes("\\")) {
-            await args.driver.execute("mobile: installApp", {
-                appPath: apkPath
-            });
-            installed = true;
-        }
-        // 2. Search for APK in current directory
-        if (!installed) {
-            const files = fs_1.default.readdirSync(process.cwd());
-            const apkFile = files.find(f => f.toLowerCase().includes(apkPath.toLowerCase()) && f.toLowerCase().endsWith(".apk"));
-            if (apkFile) {
-                const apkPath = path_1.default.resolve(process.cwd(), apkFile);
-                logData_js_1.logger.info(`Found APK for installation: ${apkPath}`);
-                await args.driver.installApp(apkPath);
-                installed = true;
+    switch (args.platform) {
+        case "android":
+            try {
+                const apkPath = args.value.trim();
+                logData_js_1.logger.info(`Installing APK: ${apkPath}`);
+                let installed = false;
+                // 1. Direct install if it looks like a path
+                if (apkPath.toLowerCase().endsWith(".apk") || apkPath.includes("/") || apkPath.includes("\\")) {
+                    await args.driver.execute("mobile: installApp", {
+                        appPath: apkPath
+                    });
+                    installed = true;
+                }
+                if (!installed) {
+                    const files = fs_1.default.readdirSync(process.cwd());
+                    const apkFile = files.find(f => f.toLowerCase().includes(apkPath.toLowerCase()) && f.toLowerCase().endsWith(".apk"));
+                    if (apkFile) {
+                        const apkPath = path_1.default.resolve(process.cwd(), apkFile);
+                        logData_js_1.logger.info(`Found APK for installation: ${apkPath}`);
+                        await args.driver.installApp(apkPath);
+                        installed = true;
+                    }
+                }
+                if (!installed) {
+                    throw new Error(`Could not find or install APK: ${apkPath}`);
+                }
+                (0, appendScriptData_js_1.appendScriptData)({
+                    scriptDataAppender: args.scriptDataAppender,
+                    nlpName: 'MOB_InstallAPK',
+                    stepInputs: [args.value],
+                });
             }
-        }
-        if (!installed) {
-            throw new Error(`Could not find or install APK: ${apkPath}`);
-        }
-        args.scriptDataAppender.add(async () => ({
-            nlpName: 'MOB_InstallAPK',
-            stepInputs: [args.value],
-            elementsData: []
-        }));
-    }
-    catch (error) {
-        args.scriptDataAppender.setErrorNLP("MOB_InstallAPK");
-        throw new Error("MOB_InstallAPK action failed", { cause: error });
+            catch (error) {
+                args.scriptDataAppender.setErrorNLP("MOB_InstallAPK");
+                throw new Error("MOB_InstallAPK action failed", { cause: error });
+            }
+            break;
+        case "ios":
+        default:
+            try {
+                const ipaPath = args.value.trim();
+                logData_js_1.logger.info(`Installing IPA: ${ipaPath}`);
+                let installed = false;
+                if (ipaPath.toLowerCase().endsWith(".ipa") ||
+                    ipaPath.includes("/") ||
+                    ipaPath.includes("\\")) {
+                    await args.driver.installApp(ipaPath);
+                    installed = true;
+                }
+                if (!installed) {
+                    const files = fs_1.default.readdirSync(process.cwd());
+                    const ipaFile = files.find((f) => f.toLowerCase().includes(ipaPath.toLowerCase()) &&
+                        f.toLowerCase().endsWith(".ipa"));
+                    if (ipaFile) {
+                        const resolvedPath = path_1.default.resolve(process.cwd(), ipaFile);
+                        logData_js_1.logger.info(`Found IPA for installation: ${resolvedPath}`);
+                        await args.driver.installApp(resolvedPath);
+                        installed = true;
+                    }
+                }
+                if (!installed) {
+                    throw new Error(`Could not find or install IPA: ${ipaPath}`);
+                }
+                (0, appendScriptData_js_1.appendScriptData)({
+                    scriptDataAppender: args.scriptDataAppender,
+                    nlpName: 'IOS_InstallIPA',
+                    stepInputs: [args.value],
+                });
+            }
+            catch (error) {
+                args.scriptDataAppender.setErrorNLP("IOS_InstallIPA");
+                throw new Error("IOS_InstallIPA action failed", { cause: error });
+            }
+            break;
     }
 }

package/dist/automation/actions/interaction/elementlessActions/isAppInstalled.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IsAppInstalled = IsAppInstalled;
 const logData_js_1 = require("../../../../utils/logger/logData.js");
 const child_process_1 = require("child_process");
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function IsAppInstalled(args) {
+    const nlpName = args.platform === "ios" ? "IOS_IsAppInstalled" : "MOB_IsAppInstalled";
     try {
         const target = args.value.trim();
         logData_js_1.logger.info(`Checking if app is installed: ${target}`);
@@ -12,7 +14,7 @@ async function IsAppInstalled(args) {
             isInstalled = await args.driver.isAppInstalled(target);
         }
         catch (e) {
-            throw new Error("MOB_IsAppInstalled action failed", { cause: e });
+            throw new Error("IsAppInstalled action failed", { cause: e });
         }
         if (!isInstalled) {
             const udid = args.driver.capabilities["appium:udid"] || args.driver.capabilities.udid;
@@ -25,14 +27,14 @@ async function IsAppInstalled(args) {
         if (!isInstalled) {
             throw new Error(`Could not find or install APK: ${target}`);
         }
-        args.scriptDataAppender.add(async () => ({
-            nlpName: 'MOB_IsAppInstalled',
-            stepInputs: [args.value, isInstalled],
-            elementsData: []
-        }));
+        (0, appendScriptData_js_1.appendScriptData)({
+            scriptDataAppender: args.scriptDataAppender,
+            nlpName: nlpName,
+            stepInputs: [args.value],
+        });
     }
     catch (error) {
-        args.scriptDataAppender.setErrorNLP("MOB_IsAppInstalled");
-        throw new Error("MOB_IsAppInstalled action failed", { cause: error });
+        args.scriptDataAppender.setErrorNLP(nlpName);
+        throw new Error("IsAppInstalled action failed", { cause: error });
     }
 }