ff-automationv2 2.2.25 → 2.2.26

package/dist/ai/llmcalls/llmAction.js

@@ -19,7 +19,7 @@ class llmAction {
             baseURL: baseURL,
         });
         this.visionClient = new openai_1.default({
-            apiKey: (0, decodeApiKey_js_1.decodeApiKey)(this.visionApiKey),
+            apiKey: (0, decodeApiKey_js_1.decodeApiKey)(this.visionApiKey ?? apiKey),
         });
     }
     async getLLMResponse(platform, type, args, userInput) {
@@ -92,7 +92,7 @@ class llmAction {
                 return response;
             }
             catch (error) {
-                logData_js_1.logger.error(`Vision LLM Error Attempt ${attempt}:`, error);
+                logData_js_1.logger.error(`Vision LLM Error Attempt ${attempt}:`);
                 const structuredError = this.handleKnownErrors(error);
                 if (structuredError)
                     return structuredError;

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

@@ -7,7 +7,8 @@ export declare class ActionExecutor implements IActionExecutor {
     private scriptDataAppender;
     private elementGetter;
     private platform;
-    constructor(driver: WebdriverIO.Browser, scriptDataAppender: ScriptDataAppender, elementGetter: ElementGetter, platform: string);
+    private adbPath;
+    constructor(driver: WebdriverIO.Browser, scriptDataAppender: ScriptDataAppender, elementGetter: ElementGetter, platform: string, adbPath: string);
     navigate(url: string): Promise<void>;
     goBack(): Promise<void>;
     refresh(): Promise<void>;

package/dist/automation/actions/executor.js

@@ -354,11 +354,12 @@ const mobPressBackSpaceKey_js_1 = require("./interaction/press/mobPressBackSpace
 const mobPressSpaceKey_js_1 = require("./interaction/press/mobPressSpaceKey.js");
 const MOB_FindElement_js_1 = require("./interaction/find/MOB_FindElement.js");
 class ActionExecutor {
-    constructor(driver, scriptDataAppender, elementGetter, platform) {
+    constructor(driver, scriptDataAppender, elementGetter, platform, adbPath) {
         this.driver = driver;
         this.scriptDataAppender = scriptDataAppender;
         this.elementGetter = elementGetter;
         this.platform = platform;
+        this.adbPath = adbPath;
     }
     async navigate(url) {
         try {
@@ -550,6 +551,7 @@ class ActionExecutor {
                 driver: this.driver,
                 selector: selector,
                 value,
+                adbPath: this.adbPath,
                 scriptDataAppender: this.scriptDataAppender,
                 elementGetter: this.elementGetter,
                 fireflinkIndex,
@@ -4487,6 +4489,7 @@ class ActionExecutor {
         try {
             await (0, AirplaneModeSwitchOff_js_1.AirplaneModeSwitchOff)({
                 driver: this.driver,
+                adbPath: this.adbPath,
                 scriptDataAppender: this.scriptDataAppender,
                 platform: this.platform
             });
@@ -4500,6 +4503,7 @@ class ActionExecutor {
         try {
             await (0, AirplaneModeSwitchOn_js_1.AirplaneModeSwitchOn)({
                 driver: this.driver,
+                adbPath: this.adbPath,
                 scriptDataAppender: this.scriptDataAppender,
                 platform: this.platform
             });
@@ -4617,6 +4621,7 @@ class ActionExecutor {
         try {
             await (0, RestartCurrentDevice_js_1.RestartCurrentDevice)({
                 driver: this.driver,
+                adbPath: this.adbPath,
                 scriptDataAppender: this.scriptDataAppender,
                 platform: this.platform
             });
@@ -4656,6 +4661,7 @@ class ActionExecutor {
         try {
             await (0, SetEmulatorPowerStateOff_js_1.SetEmulatorPowerStateOff)({
                 driver: this.driver,
+                adbPath: this.adbPath,
                 scriptDataAppender: this.scriptDataAppender,
                 platform: this.platform
             });
@@ -4669,6 +4675,7 @@ class ActionExecutor {
         try {
             await (0, SetEmulatorPowerStateOn_js_1.SetEmulatorPowerStateOn)({
                 driver: this.driver,
+                adbPath: this.adbPath,
                 scriptDataAppender: this.scriptDataAppender,
                 platform: this.platform
             });
@@ -4708,6 +4715,7 @@ class ActionExecutor {
         try {
             await (0, pressHomeKey_js_1.PressHomeKey)({
                 driver: this.driver,
+                adbPath: this.adbPath,
                 scriptDataAppender: this.scriptDataAppender,
                 platform: this.platform
             });
@@ -4750,6 +4758,7 @@ class ActionExecutor {
             await (0, isAppInstalled_js_1.IsAppInstalled)({
                 driver: this.driver,
                 value,
+                adbPath: this.adbPath,
                 scriptDataAppender: this.scriptDataAppender,
                 platform: this.platform
             });
@@ -4778,6 +4787,7 @@ class ActionExecutor {
             await (0, uninstallAPK_js_1.UninstallAPK)({
                 driver: this.driver,
                 value,
+                adbPath: this.adbPath,
                 scriptDataAppender: this.scriptDataAppender,
                 platform: this.platform
             });
@@ -4820,6 +4830,7 @@ class ActionExecutor {
             await (0, openAppWithApkFilePath_js_1.OpenAppWithApkFilePath)({
                 driver: this.driver,
                 value,
+                adbPath: this.adbPath,
                 scriptDataAppender: this.scriptDataAppender,
                 platform: this.platform
             });

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

@@ -16,7 +16,7 @@ async function IsAppInstalled(args) {
         }
         if (!isInstalled) {
             const udid = args.driver.capabilities["appium:udid"] || args.driver.capabilities.udid;
-            const cmdPrefix = udid ? `adb -s ${udid} shell` : `adb shell`;
+            const cmdPrefix = udid ? `${args.adbPath} -s ${udid} shell` : `${args.adbPath} shell`;
             const result = (0, child_process_1.execSync)(`${cmdPrefix} pm list packages`).toString().toLowerCase();
             if (result.includes(target.toLowerCase())) {
                 isInstalled = true;

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

@@ -8,7 +8,7 @@ const logData_js_1 = require("../../../../utils/logger/logData.js");
 const fs_1 = __importDefault(require("fs"));
 const child_process_1 = require("child_process");
 const path_1 = __importDefault(require("path"));
-function getLatestInstalledPackage(apkPath) {
+function getLatestInstalledPackage(apkPath, adbPath) {
     // ✅ Step 1: Extract APK name
     const apkName = path_1.default.basename(apkPath, ".apk").toLowerCase();
     // Example:
@@ -16,7 +16,7 @@ function getLatestInstalledPackage(apkPath) {
     // Normalize name (remove special chars)
     const normalizedApkName = apkName.replace(/[^a-z0-9]/g, "");
     // ✅ Step 2: Get installed packages (3rd party only)
-    const output = (0, child_process_1.execSync)(`adb shell pm list packages -3`, {
+    const output = (0, child_process_1.execSync)(`${adbPath} shell pm list packages -3`, {
         maxBuffer: 1024 * 1024 * 5
     }).toString();
     const packages = output
@@ -80,7 +80,7 @@ async function OpenAppWithApkFilePath(args) {
             throw new Error(`Could not find or install APK: ${apkPath}`);
         }
         // ✅ Step 5: Launch app
-        const appPackage = await getLatestInstalledPackage(apkPath);
+        const appPackage = await getLatestInstalledPackage(apkPath, args.adbPath);
         logData_js_1.logger.info(`Launching app: ${appPackage}`);
         await args.driver.activateApp(appPackage);
         // ✅ Script logging

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

@@ -19,7 +19,7 @@ async function UninstallAPK(args) {
         }
         if (!uninstalled) {
             const udid = args.driver.capabilities["appium:udid"] || args.driver.capabilities.udid;
-            const cmdPrefix = udid ? `adb -s ${udid} shell` : `adb shell`;
+            const cmdPrefix = udid ? `${args.adbPath} -s ${udid} shell` : `${args.adbPath} shell`;
             const packagesResult = (0, child_process_1.execSync)(`${cmdPrefix} pm list packages`).toString().toLowerCase();
             for (const line of packagesResult.split(/\r?\n/)) {
                 if (line.includes(target.toLowerCase())) {

package/dist/automation/actions/interaction/enterActions/enterInput.js

@@ -45,7 +45,7 @@ async function enterInput(args) {
                 const text = await element.getAttribute("text");
                 if (text !== args.value) {
                     const { execSync } = await Promise.resolve().then(() => __importStar(require("child_process")));
-                    execSync(`adb shell input text ${args.value}`);
+                    execSync(`${args.adbPath} shell input text ${args.value}`);
                 }
                 args.scriptDataAppender.add(async () => {
                     return {

package/dist/automation/actions/interaction/inputlessActions/AirplaneModeSwitchOff.js

@@ -7,8 +7,8 @@ async function AirplaneModeSwitchOff(args) {
     try {
         const udid = args.driver.capabilities["appium:udid"] || args.driver.capabilities.udid;
         const cmdPrefix = udid
-            ? `adb -s ${udid} shell`
-            : `adb shell`;
+            ? `${args.adbPath} -s ${udid} shell`
+            : `${args.adbPath} shell`;
         logData_js_1.logger.info("Attempting ADB fallback for AIRPLANE MODE OFF...");
         // Android 10+
         (0, child_process_1.execSync)(`${cmdPrefix} cmd connectivity airplane-mode disable`);

package/dist/automation/actions/interaction/inputlessActions/AirplaneModeSwitchOn.js

@@ -8,8 +8,8 @@ async function AirplaneModeSwitchOn(args) {
         // ADB fallback
         const udid = args.driver.capabilities["appium:udid"] || args.driver.capabilities.udid;
         const cmdPrefix = udid
-            ? `adb -s ${udid} shell`
-            : `adb shell`;
+            ? `${args.adbPath} -s ${udid} shell`
+            : `${args.adbPath} shell`;
         logData_js_1.logger.info("Attempting ADB fallback for AIRPLANE MODE ON...");
         // Android 10+
         (0, child_process_1.execSync)(`${cmdPrefix} cmd connectivity airplane-mode enable`);

package/dist/automation/actions/interaction/inputlessActions/RestartCurrentDevice.js

@@ -8,7 +8,7 @@ async function RestartCurrentDevice(args) {
         const udid = args.driver.capabilities["appium:udid"] || args.driver.capabilities.udid;
         logData_js_1.logger.info(`Attempting ADB reboot on ${udid || 'default device'}...`);
         try {
-            (0, child_process_1.execSync)(`adb -s ${udid} reboot`);
+            (0, child_process_1.execSync)(`${args.adbPath} -s ${udid} reboot`);
         }
         catch (e) {
             logData_js_1.logger.info("ADB reboot is going", e);

package/dist/automation/actions/interaction/inputlessActions/SetEmulatorPowerStateOff.js

@@ -13,7 +13,7 @@ async function SetEmulatorPowerStateOff(args) {
         catch (error) {
             logData_js_1.logger.info("mobile: setPowerState failed, attempting ADB fallback for real device...", error);
             const udid = args.driver.capabilities["appium:udid"] || args.driver.capabilities.udid;
-            const cmdPrefix = udid ? `adb -s ${udid} shell` : `adb shell`;
+            const cmdPrefix = udid ? `${args.adbPath} -s ${udid} shell` : `${args.adbPath} shell`;
             // KEYCODE_SLEEP = 223
             (0, child_process_1.execSync)(`${cmdPrefix} input keyevent 223`);
         }

package/dist/automation/actions/interaction/inputlessActions/SetEmulatorPowerStateOn.js

@@ -13,7 +13,7 @@ async function SetEmulatorPowerStateOn(args) {
         catch (error) {
             logData_js_1.logger.info("mobile: setPowerState failed, attempting ADB fallback for real device...", error);
             const udid = args.driver.capabilities["appium:udid"] || args.driver.capabilities.udid;
-            const cmdPrefix = udid ? `adb -s ${udid} shell` : `adb shell`;
+            const cmdPrefix = udid ? `${args.adbPath} -s ${udid} shell` : `${args.adbPath} shell`;
             // KEYCODE_WAKEUP = 224
             (0, child_process_1.execSync)(`${cmdPrefix} input keyevent 224`);
         }

package/dist/automation/actions/interaction/press/pressHomeKey.js

@@ -7,7 +7,7 @@ async function PressHomeKey(args) {
     try {
         logData_js_1.logger.info("Pressing HOME key...");
         const udid = args.driver.capabilities["appium:udid"] || args.driver.capabilities.udid;
-        const cmdPrefix = udid ? `adb -s ${udid} shell` : `adb shell`;
+        const cmdPrefix = udid ? `${args.adbPath} -s ${udid} shell` : `${args.adbPath} shell`;
         // Android HOME keyevent is 3
         (0, child_process_1.execSync)(`${cmdPrefix} input keyevent 3`);
         args.scriptDataAppender.add(async () => ({

package/dist/automation/actions/interface/InputlessActionnterface.d.ts

@@ -18,6 +18,7 @@ export interface MOB_SetEmulatorPowerStateOffInterface {
     driver: WebdriverIO.Browser;
     scriptDataAppender: ScriptDataAppender;
     platform: string;
+    adbPath?: string;
 }
 export interface MOB_OpenChromeBrowserInterface {
     driver: WebdriverIO.Browser;
@@ -38,11 +39,13 @@ export interface MOB_SetEmulatorPowerStateOnInterface {
     driver: WebdriverIO.Browser;
     scriptDataAppender: ScriptDataAppender;
     platform: string;
+    adbPath?: string;
 }
 export interface MOB_AirplaneModeSwitchOnInterface {
     driver: WebdriverIO.Browser;
     scriptDataAppender: ScriptDataAppender;
     platform: string;
+    adbPath?: string;
 }
 export interface MOB_LockDeviceInterface {
     driver: WebdriverIO.Browser;
@@ -78,11 +81,13 @@ export interface MOB_RestartCurrentDeviceInterface {
     driver: WebdriverIO.Browser;
     scriptDataAppender: ScriptDataAppender;
     platform: string;
+    adbPath?: string;
 }
 export interface MOB_AirplaneModeSwitchOffInterface {
     driver: WebdriverIO.Browser;
     scriptDataAppender: ScriptDataAppender;
     platform: string;
+    adbPath?: string;
 }
 export interface BreakInterface {
     driver: WebdriverIO.Browser;

package/dist/automation/actions/interface/elementlessInterface.d.ts

@@ -16,6 +16,7 @@ export interface MOB_IsAppInstalledInterface {
     scriptDataAppender: ScriptDataAppender;
     platform: string;
     value: string;
+    adbPath?: string;
 }
 export interface MOB_ReceiveMessageOnEmulatorInterface {
     driver: WebdriverIO.Browser;
@@ -28,6 +29,7 @@ export interface MOB_UninstallAPKInterface {
     scriptDataAppender: ScriptDataAppender;
     platform: string;
     value: string;
+    adbPath?: string;
 }
 export interface MOB_InstallAPKInterface {
     driver: WebdriverIO.Browser;
@@ -46,6 +48,7 @@ export interface MOB_OpenAppWithApkFilePathInterface {
     scriptDataAppender: ScriptDataAppender;
     platform: string;
     value: string;
+    adbPath?: string;
 }
 export interface MOB_ActivateAppUsingAppPackageInterface {
     driver: WebdriverIO.Browser;

package/dist/automation/actions/interface/interactionActionInterface.d.ts

@@ -4,6 +4,7 @@ export interface EnterInputInterface {
     driver: WebdriverIO.Browser;
     selector: string;
     value: string;
+    adbPath?: string;
     scriptDataAppender: ScriptDataAppender;
     elementGetter: ElementGetter;
     fireflinkIndex: string;

package/dist/automation/actions/interface/pressActionInterface.d.ts

@@ -23,6 +23,7 @@ export interface PressEnterKeyInterface {
 }
 export interface MOB_PressHomeKeyInterface {
     driver: WebdriverIO.Browser;
+    adbPath?: string;
     scriptDataAppender: ScriptDataAppender;
     platform: string;
 }

package/dist/automation/mobileSession/initiateMobileSession.js

@@ -43,6 +43,7 @@ class MobileSession {
             throw new Error("Appium server is not running or unreachable.", { cause: error });
         }
         try {
+            logData_js_1.logger.info(this.adbPath);
             await (0, child_process_1.execSync)(`${this.adbPath} -s ${arg.capabilities["appium:udid"]} shell pm clear ${appPackage}`).toString();
             await (0, child_process_1.execSync)(`${this.adbPath} -s ${arg.capabilities["appium:udid"]} shell am start -n ${appPackage}/${appActivity}`).toString();
         }
@@ -56,9 +57,10 @@ class MobileSession {
             }
             throw new Error(`ADB execution failed: ${output}`, { cause: error });
         }
+        const startTime = Date.now();
         this.driver = this.isCloud
             ? await this.cloudSessionInstances.initialize() : await this.openApp({ capabilities: arg.capabilities });
-        logData_js_1.logger.info(`Application launched`);
+        logData_js_1.logger.info(`Application started ',total time taken: ${Date.now() - startTime} ms`);
     }
     async close() {
         if (this.driver) {

package/dist/core/main/actionHandlerFactory.js

@@ -24,7 +24,7 @@ function createActionHandlers(context) {
         open: async () => {
             try {
                 await context.session.open();
-                context.executor = new executor_js_1.ActionExecutor(await context.session.getCurrentDriver(), context.scriptAppender, context.locator, context.request.platform);
+                context.executor = new executor_js_1.ActionExecutor(await context.session.getCurrentDriver(), context.scriptAppender, context.locator, context.request.platform, context.adbPath);
                 context.scriptAppender.add(async () => ({
                     nlpName: "OpenBrowser",
                     elementsData: [],
@@ -58,7 +58,7 @@ function createActionHandlers(context) {
                     },
                     keywords: result.keywords
                 });
-                context.executor = new executor_js_1.ActionExecutor(await context.androidSession.getCurrentDriver(), context.scriptAppender, context.locator, context.request.platform);
+                context.executor = new executor_js_1.ActionExecutor(await context.androidSession.getCurrentDriver(), context.scriptAppender, context.locator, context.request.platform, context.request.adbPath || "");
                 context.scriptAppender.add(async () => ({
                     nlpName: "Open Android App",
                     elementsData: [],

package/dist/core/main/executionContext.d.ts

@@ -11,5 +11,6 @@ export declare class ExecutionContext {
     executor: ActionExecutor | null;
     locator: ElementGetter;
     scriptAppender: ScriptDataAppender;
+    adbPath: string;
     constructor(request: AutomationRequest);
 }

package/dist/core/main/executionContext.js

@@ -15,6 +15,7 @@ class ExecutionContext {
         this.locator = new getListOfLocators_js_1.ElementGetter();
         this.scriptAppender = new scriptGenrationData_js_1.ScriptDataAppender();
         this.androidSession = new initiateMobileSession_js_1.MobileSession(request.appiumPort, request.isCloud, request.capabilities, request.cloudConfig, request.adbPath);
+        this.adbPath = request.adbPath || "";
     }
 }
 exports.ExecutionContext = ExecutionContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ff-automationv2",
-  "version": "2.2.25",
+  "version": "2.2.26",
   "private": false,
   "type": "commonjs",
   "description": "This lib is used to automate the manual testcase",