ff-automationv2 2.2.28 → 2.2.30

package/dist/core/main/executionContext.js

@@ -3,19 +3,109 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExecutionContext = void 0;
 const initiateBrowserSession_js_1 = require("../../automation/browserSession/initiateBrowserSession.js");
 const initiateMobileSession_js_1 = require("../../automation/mobileSession/initiateMobileSession.js");
+const executor_js_1 = require("../../automation/actions/executor.js");
 const getListOfLocators_js_1 = require("../../fireflinkData/fireflinkLocators/getListOfLocators.js");
 const scriptGenrationData_js_1 = require("../../fireflinkData/fireflinkScript/scriptGenrationData.js");
 const defaultValues_js_1 = require("../constants/defaultValues.js");
 const browserType_js_1 = require("../../core/types/browserType.js");
 class ExecutionContext {
-    constructor(request) {
+    constructor(request, workerPool) {
         this.request = request;
+        this.workerPool = workerPool;
         this.executor = null;
-        this.session = new initiateBrowserSession_js_1.BrowserSession(browserType_js_1.browsers[request.browser.browserName], request.isCloud, request.capabilities, defaultValues_js_1.DEFAULT_PAGE_LOAD, request.cloudConfig);
-        this.locator = new getListOfLocators_js_1.ElementGetter();
+        this.extractedOtp = null;
+        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();
-        this.androidSession = new initiateMobileSession_js_1.MobileSession(request.appiumPort, request.isCloud, request.capabilities, request.cloudConfig, request.adbPath);
+        this.mobileSession = new initiateMobileSession_js_1.MobileSession(request.appiumPort, request.isCloud, request.capabilities, request.cloudConfig, request.adbPath);
         this.adbPath = request.adbPath || "";
+        this.activePlatform = request.platform.toLowerCase();
+    }
+    async initializeMobileDriver(caps) {
+        const isIOS = this.request.platform.toLowerCase() === "ios";
+        const appiumCaps = {};
+        const allowedCapabilities = [
+            "app",
+            "appPackage",
+            "appActivity",
+            "noReset",
+            "fullReset",
+            "autoGrantPermissions"
+        ];
+        let hasAppPackage = false;
+        if (Array.isArray(caps)) {
+            for (const cap of caps) {
+                if (typeof cap !== "string") {
+                    continue;
+                }
+                const [key, ...valueParts] = cap.split(":");
+                const value = valueParts.join(":");
+                if (!allowedCapabilities.includes(key)) {
+                    continue;
+                }
+                if (key === "appActivity" || !value.trim()) {
+                    continue;
+                }
+                if (key === "appPackage") {
+                    hasAppPackage = true;
+                }
+                if (value === "true") {
+                    appiumCaps[`appium:${key}`] = true;
+                }
+                else if (value === "false") {
+                    appiumCaps[`appium:${key}`] = false;
+                }
+                else {
+                    appiumCaps[`appium:${key}`] = value;
+                }
+            }
+        }
+        const capabilities = isIOS
+            ? {
+                platformName: "iOS",
+                "appium:platformVersion": this.request.platformVersion,
+                "appium:deviceName": "iphone",
+                "appium:udid": this.request.realDeviceId,
+                "appium:automationName": "XCUITest",
+                "appium:autoLaunch": false,
+                "appium:shouldUseCompactResponses": true,
+                "appium:waitForQuiescence": false,
+                "appium:wdaLaunchTimeout": 300000,
+                "appium:wdaConnectionTimeout": 300000,
+                "appium:agentPath": "/Applications/FireFlinkClient.app/Contents/Resources/flinko-client/exec/appium-webdriveragent/WebDriverAgent.xcodeproj",
+                "appium:bootstrapPath": "/Applications/FireFlinkClient.app/Contents/Resources/flinko-client/exec/appium-webdriveragent",
+                "appium:noReset": false,
+                "appium:showXcodeLog": true,
+                "appium:useNewWDA": true,
+                "appium:unicodeKeyboard": true,
+                "appium:resetKeyboard": true,
+                "appium:ignoreUnimportantViews": true,
+                "appium:disableWindowAnimation": true,
+                "appium:newCommandTimeout": 300,
+            }
+            : {
+                platformName: "Android",
+                "appium:platformVersion": this.request.platformVersion,
+                "appium:deviceName": "AndroidDevice",
+                "appium:udid": this.request.realDeviceId,
+                "appium:autoLaunch": !hasAppPackage,
+                "appium:automationName": "UiAutomator2",
+                "appium:ignoreHiddenApiPolicyError": true,
+                "appium:shouldUseCompactResponses": true,
+                "appium:ignoreUnimportantViews": false,
+                "appium:disableAndroidWatcher": true,
+                "appium:disableWindowAnimation": true,
+                "appium:uiautomator2ServerLaunchTimeout": 60000,
+                "appium:uiautomator2ServerReadTimeout": 60000,
+                "appium:waitForIdleTimeout": 0,
+                "appium:waitForIdlePollingInterval": 0,
+                "appium:waitForSelectorTimeout": 0,
+                "appium:newCommandTimeout": 600,
+                "appium:noReset": false,
+                ...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);
     }
 }
 exports.ExecutionContext = ExecutionContext;

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

@@ -1,3 +1,4 @@
+import "../../utils/sslConfig/apiCallPatch.js";
 import { IAutomationRunner } from "../interfaces/automationRunnerInterface.js";
 import { AutomationRequest } from "../../core/interfaces/executionDetails.js";
 export declare class AutomationRunner implements IAutomationRunner {
@@ -5,6 +6,7 @@ export declare class AutomationRunner implements IAutomationRunner {
     private KafkaPayload;
     static getSessionTerminationInfo(testCaseId: string): boolean;
     static updateSessionTerminationInfo(testCaseId: string): void;
+    static normalizeScriptType(scriptType?: string): string;
     private cleanup;
     run(request: AutomationRequest): Promise<void>;
 }