ff-automationv2 2.2.29 → 2.2.31

package/dist/automation/mobileSession/initiateMobileSession.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MobileSession = void 0;
 const webdriverio_1 = require("webdriverio");
 const child_process_1 = require("child_process");
-const logData_js_1 = require("../../utils/logger/logData.js");
 const initiateCloudSession_js_1 = require("../cloudSession/initiateCloudSession.js");
 class MobileSession {
     constructor(appiumPort, isCloud, capabilities, CloudConfig, adbPath) {
         this.driver = null;
         this.currentAppPackage = "";
+        this.deviceId = "";
         this.appiumPort = appiumPort;
         this.isCloud = isCloud;
         this.cloudSessionInstances = new initiateCloudSession_js_1.CloudSession(capabilities, CloudConfig);
@@ -30,14 +30,12 @@ class MobileSession {
             throw new Error(`${platform} App failed to open`, { cause: error });
         }
     }
-    async open(arg) {
+    async createDriver(capabilities) {
         if (this.isCloud) {
             this.driver = await this.cloudSessionInstances.initialize();
             return;
         }
-        const appPackage = arg.keywords[0];
-        const appActivity = arg.keywords?.[1];
-        this.currentAppPackage = appPackage;
+        this.deviceId = capabilities["appium:udid"];
         try {
             const response = await fetch(`http://127.0.0.1:${this.appiumPort}/wd/hub/status`);
             if (response.status !== 200) {
@@ -47,26 +45,89 @@ class MobileSession {
         catch (error) {
             throw new Error("Appium server is not running or unreachable.", { cause: error });
         }
+        this.driver = await this.openApp({ capabilities });
+    }
+    async launchApp(appPackage, appActivity) {
+        const driver = await this.getCurrentDriver();
+        this.currentAppPackage = appPackage || await driver.getCurrentPackage();
+        if (this.isCloud || driver.isIOS) {
+            await driver.activateApp(appPackage);
+            return;
+        }
         try {
-            if (arg.capabilities.platformName === "Android") {
-                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();
+            // let output: string = execSync(
+            //     `${this.adbPath} -s ${this.deviceId} shell pm clear ${appPackage} 2>&1`
+            // ).toString();
+            if (appActivity) {
+                const output = (0, child_process_1.execSync)(`${this.adbPath} -s ${this.deviceId} shell am start -n ${appPackage}/${appActivity} 2>&1`).toString();
+                if (output.toLowerCase().includes("device") && output.toLowerCase().includes("not found")) {
+                    throw new Error(`Device '${this.deviceId}' not found or offline.`);
+                }
+                if (output.includes("Error type 3") || output.includes("does not exist") || output.includes("Failed")) {
+                    throw new Error(`App not found or invalid activity: ${appPackage}/${appActivity} is not installed on the device`);
+                }
+            }
+            else {
+                if (appPackage) {
+                    await driver.activateApp(this.currentAppPackage);
+                }
             }
         }
         catch (error) {
-            const output = error.stderr?.toString() || error.message || "";
-            if (output.toLowerCase().includes("device") && output.toLowerCase().includes("not found")) {
-                throw new Error(`Device '${arg.capabilities["appium:udid"]}' not found or offline.`, { cause: error });
-            }
-            if (output.includes("Error type 3") || output.includes("does not exist") || output.includes("Failed")) {
-                throw new Error(`App not found or invalid activity: ${appPackage}/${appActivity} is not installed on the device`, { cause: error });
-            }
-            throw new Error(`ADB execution failed: ${output}`, { cause: error });
+            throw new Error(`App launch failed: ${error.message}`, { cause: error });
         }
-        const startTime = Date.now();
-        this.driver = await this.openApp({ capabilities: arg.capabilities });
-        logData_js_1.logger.info(`Application launched in ${Date.now() - startTime} ms`);
     }
+    // async open(arg: { capabilities: IMobileCapabilities, keywords: string[] }): Promise<void> {
+    //     if (this.isCloud) {
+    //         this.driver = await this.cloudSessionInstances.initialize();
+    //         return;
+    //     }
+    //     const appPackage = arg.keywords[0];
+    //     const appActivity = arg.keywords?.[1];
+    //     this.currentAppPackage = appPackage;
+    //     try {
+    //         const response = await fetch(`http://127.0.0.1:${this.appiumPort}/wd/hub/status`);
+    //         if (response.status !== 200) {
+    //             throw new Error("Appium server is not running.");
+    //         }
+    //     } catch (error: any) {
+    //         throw new Error(
+    //             "Appium server is not running or unreachable.",
+    //             { cause: error }
+    //         );
+    //     }
+    //     try {
+    //         if (arg.capabilities.platformName === "Android") {
+    //             await execSync(
+    //                 `${this.adbPath} -s ${arg.capabilities["appium:udid"]} shell pm clear ${appPackage}`
+    //             ).toString();
+    //             await execSync(
+    //                 `${this.adbPath} -s ${arg.capabilities["appium:udid"]} shell am start -n ${appPackage}/${appActivity}`
+    //             ).toString();
+    //         }
+    //     } catch (error: any) {
+    //         const output = error.stderr?.toString() || error.message || "";
+    //         if (output.toLowerCase().includes("device") && output.toLowerCase().includes("not found")) {
+    //             throw new Error(
+    //                 `Device '${arg.capabilities["appium:udid"]}' not found or offline.`,
+    //                 { cause: error }
+    //             );
+    //         }
+    //         if (output.includes("Error type 3") || output.includes("does not exist") || output.includes("Failed")) {
+    //             throw new Error(
+    //                 `App not found or invalid activity: ${appPackage}/${appActivity} is not installed on the device`,
+    //                 { cause: error }
+    //             );
+    //         }
+    //         throw new Error(
+    //             `ADB execution failed: ${output}`,
+    //             { cause: error }
+    //         );
+    //     }
+    //     const startTime = Date.now();
+    //     this.driver = await this.openApp({ capabilities: arg.capabilities });
+    //     logger.info(`Application launched in ${Date.now() - startTime} ms`);
+    // }
     async close() {
         if (this.driver) {
             if (this.isCloud) {
@@ -80,6 +141,9 @@ class MobileSession {
                 // this.driver = null;
             }
         }
+        else {
+            throw new Error("Driver is not initialized");
+        }
     }
     async getCurrentDriver() {
         if (!this.driver) {

package/dist/core/constants/allAction.js

@@ -23,5 +23,9 @@ exports.allKeywordAction = [
     "cleartext",
     "tap",
     "combined",
-    "mouseAction"
+    "mouseAction",
+    "switchToAndroid",
+    "switchToWeb",
+    "getOtp",
+    "enterOtp"
 ];

package/dist/core/constants/supportedActions.js

@@ -10,7 +10,9 @@ exports.INPUTLESS_ACTIONS = [
     "maximize",
     "minimize",
     "close",
-    "closeApp"
+    "closeApp",
+    "switchToAndroid",
+    "switchToWeb"
 ];
 exports.SKIPPED_ACTIONS = [
     "VerifyIfBrowserWindowIsClosed",
@@ -222,5 +224,6 @@ exports.ELEMENTLESS_ACTION = [
     "MOB_GetAltitude",
     "MouseClickOnCurrentCursorPoint",
     "MouseDoubleClickAtCursorPoint",
-    "MouseClickOnCurrentCursorPointNTimes"
+    "MouseClickOnCurrentCursorPointNTimes",
+    "getOtp"
 ];

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

@@ -343,4 +343,8 @@ 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<{
+        otp: string;
+        regex: string;
+    } | null>): Promise<void>;
 }

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

@@ -1,4 +0,0 @@
-import { BrowserName } from "../../core/types/browserType";
-export interface BrowserConfig {
-    browserName: BrowserName;
-}

package/dist/core/interfaces/browserConfigurationInterface.js

@@ -1,2 +1 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,11 +1,12 @@
-import { BrowserConfig } from "./browserConfigurationInterface.js";
+import { BrowserName } from "../../core/types/browserType";
 import { CloudConfig } from "./cloudConfigInterface.js";
 import { platform } from "../types/scriptTypesType.js";
 export interface AutomationRequest {
     sessionPath: string;
+    kafkaMessageKey: string;
     userStory: string[][];
     scriptName: string;
-    version: string;
+    scenario: boolean;
     type: string;
     scriptType: string;
     projectId: string;
@@ -21,7 +22,7 @@ export interface AutomationRequest {
     env: string;
     userName: string;
     serverHost: string;
-    browser: BrowserConfig;
+    browserName: BrowserName;
     platform: platform;
     token: string;
     appiumPort: number;
@@ -35,4 +36,6 @@ export interface AutomationRequest {
     cloudConfig?: CloudConfig;
     serverData?: any;
     adbPath?: string;
+    topic: string;
+    aiExecutionAction: string;
 }

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

@@ -8,18 +8,14 @@ export interface IStep {
 export interface IPayload {
     scriptName: string;
     scriptType: string;
-    type: string;
-    version: string;
-    projectId: string;
-    testCaseId: string;
-    promptId: string;
-    pageDetails: any;
-    generatedBy: string;
-    webSocketId: string;
-    licenseType: string;
-    licenseId: string;
-    userId: string;
-    projectType: string;
+    type?: string;
+    projectId?: string;
+    testCaseId?: string;
+    pageDetails?: any;
+    licenseType?: string;
+    licenseId?: string;
+    userId?: string;
+    projectType?: string;
     tokensConsumed?: number;
     error?: IErrorInfo;
     platform?: string;
@@ -27,15 +23,25 @@ export interface IPayload {
     model?: string;
 }
 export interface IFireFlinkApiService {
-    getInstancesDetailsApi(headers: Record<string, string>, url: string): Promise<any>;
+    getInstancesDetailsApi(url: string): Promise<any>;
 }
 export interface IFireflinkService {
     runGetInstancesDetails(projectId: string, token: string, serverData: string, licenseId: string): Promise<any>;
 }
 export interface IKafkaPayload {
-    message: IPayload & {
-        stepData: IScriptGenerationData[];
-        serverHost: string;
+    message: (IPayload & {
+        stepData?: IScriptGenerationData[];
+        serverHost?: string;
+        liveLogs: string;
+        executionId: string;
+        messageType: string;
+    }) | {
+        liveLogs: string | {
+            error: string;
+            errorDescription: string;
+        };
+        executionId: string;
+        messageType: string;
     };
     topic: string;
 }

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

@@ -2,6 +2,7 @@ export interface IKeywordAction {
     keywords: string[];
     elementName: string;
     action: string;
+    liveLog: string;
 }
 export interface IDragDropAction {
     drag: string;

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

@@ -36,4 +36,5 @@ export interface PromptArgsMap {
         extractedDomJson: any;
         priorAndNextSteps: string[];
     };
+    [PromptType.OTP_EXTRACTOR]: Record<string, never>;
 }

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

@@ -0,0 +1,9 @@
+import { ExecutionContext } from "./executionContext";
+import { AutomationRequest } from "../interfaces/executionDetails";
+export declare class SessionManager {
+    private static sessions;
+    private static workerPool;
+    static create(request: AutomationRequest): ExecutionContext;
+    static get(request: AutomationRequest): ExecutionContext | undefined;
+    static remove(request: AutomationRequest): void;
+}

package/dist/core/main/SessionManager.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SessionManager = void 0;
+const executionContext_1 = require("./executionContext");
+const LocatorWorkerPool_js_1 = require("../../utils/workers/LocatorWorkerPool.js");
+class SessionManager {
+    static create(request) {
+        if (!this.workerPool) {
+            this.workerPool = new LocatorWorkerPool_js_1.LocatorWorkerPool(request.sessionPath);
+        }
+        const context = new executionContext_1.ExecutionContext(request, this.workerPool);
+        this.sessions.set(request.kafkaMessageKey, context);
+        return context;
+    }
+    static get(request) {
+        return this.sessions.get(request.kafkaMessageKey);
+    }
+    static remove(request) {
+        this.sessions.delete(request.kafkaMessageKey);
+    }
+}
+exports.SessionManager = SessionManager;
+SessionManager.sessions = new Map();