ff-automationv2 2.2.30 → 2.2.32-beta.0

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

@@ -9,7 +9,7 @@ export interface IActionExecutor {
     doubleClick(pageDOM: string, selector: string, fireflinkIndex: string, elementName: string, elementType: string): Promise<void>;
     waitAndClick(pageDOM: string, selector: string, value: string, fireflinkIndex: string, elementName: string, elementType: string): Promise<void>;
     clickNTimes(pageDOM: string, selector: string, value: string, fireflinkIndex: string, elementName: string, elementType: string): Promise<void>;
-    enterInput(selector: string, value: string, fireflinkIndex: string, pageDOM: string, elementName: string, elementType: string, platform: string, stepIndex: any, filteredSteps: any): Promise<void>;
+    enterInput(selector: string, value: string, fireflinkIndex: string, pageDOM: string, elementName: string, elementType: string, platform?: string, stepIndex?: any, filteredSteps?: any, variableName?: string): Promise<void>;
     enterInputShadow(selector: string, value: string, fireflinkIndex: string, pageDOM: string, elementName: string, elementType: string, platform: string): Promise<void>;
     clickShadowElement(selector: string, fireflinkIndex: string, pageDOM: string, elementName: string, elementType: string): Promise<void>;
     enterInputUsingJS(selector: string, value: string, fireflinkIndex: string, pageDOM: string, elementName: string, elementType: string, platform: string): Promise<void>;
@@ -31,8 +31,8 @@ export interface IActionExecutor {
     verifyElementIsDisplayedInSpecifiedTime(pageDOM: string, selector: string, value: string, fireflinkIndex: string, elementName: string, elementType: string): Promise<void>;
     verifyElementIsEnabledInSpecifiedTime(pageDOM: string, selector: string, value: string, fireflinkIndex: string, elementName: string, elementType: string): Promise<void>;
     verifyElementIsSelectedInSpecifiedTime(pageDOM: string, selector: string, value: string, fireflinkIndex: string, elementName: string, elementType: string): Promise<void>;
-    verifyText(pageDOM: string, selector: string, value: string, fireflinkIndex: string, elementName: string, elementType: string, platform: string): Promise<void>;
-    verifyPartialText(pageDOM: string, selector: string, value: string, fireflinkIndex: string, elementName: string, elementType: string, platform: string): Promise<void>;
+    verifyText(pageDOM: string, selector: string, value: string, fireflinkIndex: string, elementName: string, elementType: string, platform?: string, variableName?: string): Promise<void>;
+    verifyPartialText(pageDOM: string, selector: string, value: string, fireflinkIndex: string, elementName: string, elementType: string, platform?: string, variableName?: string): Promise<void>;
     VerifyElementIsDisplayed(pageDOM: string, selector: string, fireflinkIndex: string, elementName: string, elementType: string, platform: string): Promise<void>;
     VerifyElementIsNotDisplayed(pageDOM: string, selector: string, fireflinkIndex: string, elementName: string, elementType: string, platform: string): Promise<void>;
     VerifyElementIsSelected(pageDOM: string, selector: string, fireflinkIndex: string, elementName: string, elementType: string, platform: string): Promise<void>;
@@ -291,6 +291,7 @@ export interface IActionExecutor {
     MOB_GetBatteryPercentage(): Promise<void>;
     MOB_GetLongitude(): Promise<void>;
     MOB_GetLatitude(): Promise<void>;
+    MOB_GetAltitude(): Promise<void>;
     MOB_GetCurrentDeviceDate(): Promise<void>;
     MOB_GetMinuteFromCurrentDeviceTime(): Promise<void>;
     MOB_GetCurrentAppPackage(): Promise<void>;
@@ -343,8 +344,9 @@ export interface IActionExecutor {
     mouseHover(pageDOM: string, selector: string, fireflinkIndex: string, elementName: string, elementType: string): Promise<void>;
     MouseClickOnCurrentCursorPoint(): Promise<void>;
     MouseDoubleClickAtCursorPoint(): Promise<void>;
-    getOtp(selector: string, timeFrom: string, waitTime: string, activity: string, otpExtractor?: (smsBody: string) => Promise<{
+    getOtp(selector: string, timeFrom: string, waitTime: string, activity: string, isTerminated?: () => boolean, otpExtractor?: (smsBody: string) => Promise<{
         otp: string;
         regex: string;
-    } | null>): Promise<void>;
+    } | null>, returnTypeVariableName?: string): Promise<void>;
+    setStepContext?(stepIndex?: any, currentStep?: string, stepsInputData?: any[], manualStep?: string, returnTypeVariableName?: string, variableName?: string): void;
 }

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

@@ -1,4 +1,59 @@
-import { AutomationRequest } from "../../core/interfaces/executionDetails.js";
+import { AutomationRequest } from "./executionDetails.js";
+import { platform as PlatformType } from "../types/scriptTypesType.js";
+import { StepProcessor } from "../main/stepProcessor.js";
+import { RunnerKafkaReporter } from "../helpers/runnerKafkaReporter.js";
 export interface IAutomationRunner {
     run(args: AutomationRequest): Promise<void>;
 }
+export interface DomCaptureResult {
+    domInfo: any;
+    doc: any;
+}
+export interface DomProcessResult {
+    extractedRelevantDom: any;
+    toonDom: any;
+}
+export interface ResolvedStepAction {
+    stepResult: any;
+    stepAction: string;
+}
+export interface ShadowIframeResult {
+    stepAction: string;
+    selector: string;
+    iframeDomHtml: string | null;
+    handled: boolean;
+}
+export interface VisionFallbackParams {
+    driver: any;
+    platform: PlatformType;
+    action: string;
+    step: string;
+    stepAction: string;
+    inputValue: string;
+    stepCount?: any;
+    stepIndex?: any;
+    currentStep?: string;
+    manualStep?: string;
+    stepsInputData?: any[];
+    returnTypeVariableName?: string;
+    variableName?: string;
+    fallbackAttempt: number;
+    priorAndNextSteps: string[];
+    listOfSteps: string[];
+    currentElementName?: string;
+    extractorElementName?: string;
+    stepElementType?: string;
+    iframeDomHtml: string | null;
+    domInfo: any;
+    doc: any;
+    beforeHandles: any;
+    context: any;
+    stepProcessor: StepProcessor;
+    actionHandlers: Record<string, any>;
+    reporter: RunnerKafkaReporter;
+    causeError: any;
+}
+export interface VisionFallbackResult {
+    preCapturedDomInfo: any | null;
+    retryNeeded: boolean;
+}

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

@@ -4,6 +4,8 @@ export interface IStep {
     nlpName: string;
     elementsData: any[];
     stepInputs: any[];
+    returnTypeVariableName?: string;
+    variableName?: string;
 }
 export interface IPayload {
     scriptName: string;

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

@@ -2,7 +2,9 @@ export interface IKeywordAction {
     keywords: string[];
     elementName: string;
     action: string;
+    isStepValueDependable?: boolean;
     liveLog: string;
+    step?: string;
 }
 export interface IDragDropAction {
     drag: string;
@@ -49,3 +51,6 @@ export interface IGetAction {
     inputText: string;
     elementType: string;
 }
+export interface IInputTextExtractor {
+    inputText: string;
+}

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

@@ -27,8 +27,7 @@ export interface PromptArgsMap {
         priorAndNextSteps: string[];
     };
     [PromptType.COMBINED_ACTION_EXTRACTOR_PROMPT]: {
-        stepAction: string;
-        extractedDomJson: any;
+        extractedDomJson: string;
         priorAndNextSteps: string[];
     };
     [PromptType.WAIT_ACTION_EXTRACTOR_PROMPT]: {
@@ -37,4 +36,12 @@ export interface PromptArgsMap {
         priorAndNextSteps: string[];
     };
     [PromptType.OTP_EXTRACTOR]: Record<string, never>;
+    [PromptType.FILE_VERIFY_PROMPT]: {
+        extractedDomJson: any;
+        priorAndNextSteps: string[];
+    };
+    [PromptType.INPUT_CONTEXT_PROMPT]: {
+        inputStepsContext: string[];
+        priorAndNextSteps: string[];
+    };
 }

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

@@ -10,6 +10,8 @@ export interface IScriptGenerationData {
     nlpName: string;
     elementsData: IElementData[] | [];
     stepInputs: (string | number | boolean)[];
+    returnTypeVariableName?: string;
+    variableName?: string;
 }
 export interface AppendScriptDataArgs {
     scriptDataAppender: ScriptDataAppender;
@@ -22,4 +24,6 @@ export interface AppendScriptDataArgs {
     elementType?: string;
     selector?: string;
     platform?: string;
+    returnTypeVariableName?: string;
+    variableName?: string;
 }

package/dist/core/main/actionHandlerFactory.js

@@ -52,6 +52,9 @@ function createActionHandlers(context) {
     const withExecutor = (fn) => async (result) => {
         try {
             const executor = requireExecutor();
+            if (result) {
+                executor.setStepContext(result.stepIndex, result.currentStep, result.stepsInputData || context.stepsInputData, result.manualStep, result.returnTypeVariableName, result.variableName);
+            }
             await fn(executor, result);
         }
         catch (error) {
@@ -62,6 +65,10 @@ function createActionHandlers(context) {
     return {
         open: async (result) => {
             try {
+                if (context.browserOpened) {
+                    logData_js_1.logger.info("Browser already opened, skipping...");
+                    return;
+                }
                 const keywords = result?.keywords || [];
                 const pathKeyword = keywords.find((k) => k.startsWith("path:"));
                 const profileKeyword = keywords.find((k) => k.startsWith("profile:"));
@@ -170,6 +177,7 @@ function createActionHandlers(context) {
                         }));
                     }
                 }
+                context.browserOpened = true;
             }
             catch (error) {
                 logData_js_1.logger.error("Error in createActionHandlers", error);
@@ -335,9 +343,27 @@ function createActionHandlers(context) {
                 throw error;
             }
         },
-        navigate: withExecutor(async (executor, result) => {
-            await executor.navigate(result.keywords[0]);
-        }),
+        navigate: async (result) => {
+            try {
+                if (!context.browserOpened) {
+                    logData_js_1.logger.info("Browser not initialized, auto-opening before navigate...");
+                    await context.session.open();
+                    context.executor = new executor_js_1.ActionExecutor(await context.session.getCurrentDriver(), context.scriptAppender, context.locator, context.request.platform, context.adbPath);
+                    context.browserOpened = true;
+                    context.scriptAppender.add(async () => ({
+                        nlpName: "Open Browser",
+                        elementsData: [],
+                        stepInputs: []
+                    }));
+                }
+                const executor = requireExecutor();
+                await executor.navigate(result.keywords[0]);
+            }
+            catch (error) {
+                logData_js_1.logger.error("Error in navigate handler", error);
+                throw error;
+            }
+        },
         maximize: withExecutor(async (executor) => {
             await executor.maximize();
         }),
@@ -378,7 +404,7 @@ function createActionHandlers(context) {
             await executor.clickUsingJS(result.pageDOM, result.selector, result.fireflinkIndex, result.elementName, result.elementType);
         }),
         SendKeys: withExecutor(async (executor, result) => {
-            await executor.enterInput(result.selector, result.value, result.fireflinkIndex, result.pageDOM, result.elementName, result.elementType, result.stepIndex, result.filteredSteps);
+            await executor.enterInput(result.selector, result.value, result.fireflinkIndex, result.pageDOM, result.elementName, result.elementType, result.stepIndex, result.filteredSteps, result.variableName);
         }),
         EnterDataAndPressKey: withExecutor(async (executor, result) => {
             await executor.enterInputAndPress(result.selector, result.value, result.fireflinkIndex, result.pageDOM, result.elementName, result.elementType);
@@ -450,10 +476,10 @@ function createActionHandlers(context) {
             await executor.verifyElementIsSelectedInSpecifiedTime(result.pageDOM, result.selector, result.value, result.fireflinkIndex, result.elementName, result.elementType);
         }),
         VerifyText: withExecutor(async (executor, result) => {
-            await executor.verifyText(result.pageDOM, result.selector, result.value, result.fireflinkIndex, result.elementName, result.elementType);
+            await executor.verifyText(result.pageDOM, result.selector, result.value, result.fireflinkIndex, result.elementName, result.elementType, result.variableName);
         }),
         VerifyPartialText: withExecutor(async (executor, result) => {
-            await executor.verifyPartialText(result.pageDOM, result.selector, result.value, result.fireflinkIndex, result.elementName, result.elementType);
+            await executor.verifyPartialText(result.pageDOM, result.selector, result.value, result.fireflinkIndex, result.elementName, result.elementType, result.variableName);
         }),
         VerifyElementIsDisplayed: withExecutor(async (executor, result) => {
             await executor.VerifyElementIsDisplayed(result.pageDOM, result.selector, result.fireflinkIndex, result.elementName, result.elementType);
@@ -1439,7 +1465,11 @@ function createActionHandlers(context) {
             await executor.MouseClickOnCurrentCursorPointNTimes(result.value);
         }),
         getOtp: withExecutor(async (executor, result) => {
-            await executor.getOtp(result.selector, result.timeFrom, result.waitTime, result.activity, result.otpExtractor);
+            await executor.getOtp(result.selector, result.timeFrom, result.waitTime, result.activity, result.isTerminated, result.otpExtractor, result.returnTypeVariableName);
+        }),
+        VerifyPDF: withExecutor(async (executor, result) => {
+            const expectedText = result?.value ?? "";
+            await executor.verifyPDF(expectedText);
         })
     };
 }

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

@@ -16,7 +16,8 @@ export declare class ExecutionContext {
     scriptAppender: ScriptDataAppender;
     adbPath: string;
     activePlatform: platform;
-    extractedOtp: string | null;
+    browserOpened: boolean;
+    stepsInputData: any[];
     constructor(request: AutomationRequest, workerPool: LocatorWorkerPool);
     initializeMobileDriver(caps: any): Promise<void>;
 }

package/dist/core/main/executionContext.js

@@ -13,7 +13,8 @@ class ExecutionContext {
         this.request = request;
         this.workerPool = workerPool;
         this.executor = null;
-        this.extractedOtp = null;
+        this.browserOpened = false;
+        this.stepsInputData = [];
         this.session = new initiateBrowserSession_js_1.BrowserSession(browserType_js_1.browserName[request.browserName], request.isCloud, request.capabilities, defaultValues_js_1.DEFAULT_PAGE_LOAD, request.cloudConfig);
         this.locator = new getListOfLocators_js_1.ElementGetter(workerPool);
         this.scriptAppender = new scriptGenrationData_js_1.ScriptDataAppender();
@@ -49,14 +50,15 @@ class ExecutionContext {
                 if (key === "appPackage") {
                     hasAppPackage = true;
                 }
-                if (value === "true") {
+                const normalizedValue = value.trim().toLowerCase();
+                if (normalizedValue === "true") {
                     appiumCaps[`appium:${key}`] = true;
                 }
-                else if (value === "false") {
+                else if (normalizedValue === "false") {
                     appiumCaps[`appium:${key}`] = false;
                 }
                 else {
-                    appiumCaps[`appium:${key}`] = value;
+                    appiumCaps[`appium:${key}`] = value.trim();
                 }
             }
         }
@@ -105,7 +107,7 @@ class ExecutionContext {
                 ...appiumCaps
             };
         await this.mobileSession.createDriver(capabilities);
-        this.executor = new executor_js_1.ActionExecutor(await this.mobileSession.getCurrentDriver(), this.scriptAppender, this.locator, this.request.platform, this.adbPath);
+        this.executor = new executor_js_1.ActionExecutor(await this.mobileSession.getCurrentDriver(), this.scriptAppender, this.locator, this.request.platform, this.adbPath, this.stepsInputData);
     }
 }
 exports.ExecutionContext = ExecutionContext;

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

@@ -8,5 +8,6 @@ export declare class AutomationRunner implements IAutomationRunner {
     static updateSessionTerminationInfo(testCaseId: string): void;
     static normalizeScriptType(scriptType?: string): string;
     private cleanup;
+    private saveSessionStepData;
     run(request: AutomationRequest): Promise<void>;
 }