ff-automationv2 2.2.29 → 2.2.30

package/dist/core/main/stepProcessor.js

@@ -11,8 +11,13 @@ class StepProcessor {
         return this.resultParser.getTokenUsage();
     }
     async getLLMResponse({ platform, type, args, input, isVision = false }) {
-        const response = await this.llm.getLLMResponse(platform, type, args, input, isVision);
-        return this.resultParser.fetchResult(response);
+        try {
+            const response = await this.llm.getLLMResponse(platform, type, args, input, isVision);
+            return this.resultParser.fetchResult(response);
+        }
+        catch (error) {
+            throw new Error("failed to get response from llm", { cause: error });
+        }
     }
 }
 exports.StepProcessor = StepProcessor;

package/dist/core/types/browserType.d.ts

@@ -1,8 +1,8 @@
-export declare const browsers: {
+export declare const browserName: {
     readonly "Microsoft Edge": "edge";
     readonly "Google Chrome": "chrome";
     readonly "Mozilla Firefox": "firefox";
     readonly Safari: "safari";
 };
-export type BrowserName = keyof typeof browsers;
-export type BrowserId = typeof browsers[BrowserName];
+export type BrowserName = keyof typeof browserName;
+export type BrowserId = typeof browserName[BrowserName];

package/dist/core/types/browserType.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.browsers = void 0;
-exports.browsers = {
+exports.browserName = void 0;
+exports.browserName = {
     "Microsoft Edge": "edge",
     "Google Chrome": "chrome",
     "Mozilla Firefox": "firefox",

package/dist/core/types/messageType.d.ts

@@ -0,0 +1,13 @@
+export declare const MessageType: {
+    readonly LiveLog: {
+        readonly Ongoing: "liveLogOngoing";
+        readonly Completed: "liveLogCompleted";
+        readonly Error: "liveLogError";
+        readonly Termination: "termination";
+        readonly ExecutionStopped: "executionStopped";
+        readonly retry: "retry";
+    };
+    readonly nextBatch: "nextBatch";
+    readonly AutomationScriptMetaData: "AutomationScriptMetaData";
+};
+export type MessageType = typeof MessageType[keyof typeof MessageType] | typeof MessageType.LiveLog[keyof typeof MessageType.LiveLog];

package/dist/core/types/messageType.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MessageType = void 0;
+exports.MessageType = {
+    LiveLog: {
+        Ongoing: "liveLogOngoing",
+        Completed: "liveLogCompleted",
+        Error: "liveLogError",
+        Termination: "termination",
+        ExecutionStopped: "executionStopped",
+        retry: "retry",
+    },
+    nextBatch: "nextBatch",
+    AutomationScriptMetaData: "AutomationScriptMetaData",
+};

package/dist/core/types/promptType.d.ts

@@ -7,5 +7,6 @@ export declare enum PromptType {
     VERIFY_PROMPT = "verifyActionExtractorPrompt",
     GET_PROMPT = "getActionExtractorPrompt",
     WAIT_ACTION_EXTRACTOR_PROMPT = "waitActionExtractorPrompt",
-    COMBINED_ACTION_EXTRACTOR_PROMPT = "combinedActionExtractorPrompt"
+    COMBINED_ACTION_EXTRACTOR_PROMPT = "combinedActionExtractorPrompt",
+    OTP_EXTRACTOR = "otpExtractorPrompt"
 }

package/dist/core/types/promptType.js

@@ -12,4 +12,5 @@ var PromptType;
     PromptType["GET_PROMPT"] = "getActionExtractorPrompt";
     PromptType["WAIT_ACTION_EXTRACTOR_PROMPT"] = "waitActionExtractorPrompt";
     PromptType["COMBINED_ACTION_EXTRACTOR_PROMPT"] = "combinedActionExtractorPrompt";
+    PromptType["OTP_EXTRACTOR"] = "otpExtractorPrompt";
 })(PromptType || (exports.PromptType = PromptType = {}));

package/dist/domAnalysis/searchBest.js

@@ -29,7 +29,7 @@ class DomSearcher {
             for (const i of [idx - 1, idx, idx + 1]) {
                 if (i >= 0 && i < total) {
                     if (nodes[i].node["FF-inspecter"]) {
-                        collected.push(i);
+                        collected.add(i);
                     }
                 }
             }
@@ -41,7 +41,7 @@ class DomSearcher {
                 const nx = nodes[j].node["ff-xpath"];
                 if (nx && isChild(cx, nx)) {
                     if (nodes[j].node["FF-inspecter"]) {
-                        collected.push(j);
+                        collected.add(j);
                     }
                     break;
                 }
@@ -50,7 +50,7 @@ class DomSearcher {
                 const nx = nodes[j].node["ff-xpath"];
                 if (nx && isSibling(cx, nx) && j !== idx) {
                     if (nodes[j].node["FF-inspecter"]) {
-                        collected.push(j);
+                        collected.add(j);
                     }
                     break;
                 }
@@ -70,33 +70,33 @@ class DomSearcher {
                 if (searchText === kw) {
                     exact.push(i);
                 }
-                if (searchText.includes(kw)) {
+                else if (searchText.includes(kw)) {
                     strong.push(i);
                 }
-                if (kw === tagName || tagName.includes(kw)) {
+                else if (kw === tagName || tagName.includes(kw)) {
                     tagMatches.push(i);
                 }
             }
-            const collected = [];
+            const collected = new Set();
             for (const idx of exact) {
                 addWithContext(idx, collected);
-                if (collected.length >= topN * 4)
+                if (collected.size >= topN * 4)
                     break;
             }
             for (const idx of strong) {
                 addWithContext(idx, collected);
-                if (collected.length >= topN * 4)
+                if (collected.size >= topN * 4)
                     break;
             }
             for (const idx of tagMatches) {
                 addWithContext(idx, collected);
-                if (collected.length >= topN * 4)
+                if (collected.size >= topN * 4)
                     break;
             }
-            if (collected.length > 0) {
+            if (collected.size > 0) {
                 hasAnyMatch = true;
             }
-            tempResults[kw] = collected;
+            tempResults[kw] = Array.from(collected);
         }
         if (!hasAnyMatch) {
             for (const kw of keywords) {
@@ -129,21 +129,20 @@ class DomSearcher {
                         fuzzyList.push([score, i]);
                     }
                 }
-                const collected = [];
+                const collected = new Set();
                 fuzzyList
                     .sort((a, b) => b[0] - a[0])
                     .forEach(([_, idx]) => {
-                    if (collected.length < topN * 4) {
+                    if (collected.size < topN * 4) {
                         addWithContext(idx, collected);
                     }
                 });
-                results[kw] = Array.from(new Set(collected)).map(i => nodes[i].node);
+                results[kw] = Array.from(collected).map(i => nodes[i].node);
             }
         }
         else {
             for (const kw of keywords) {
-                const uniqueIdx = Array.from(new Set(tempResults[kw]));
-                results[kw] = uniqueIdx.map(i => nodes[i].node);
+                results[kw] = tempResults[kw].map(i => nodes[i].node);
             }
         }
         const seen = new Set();

package/dist/domAnalysis/simplifyAndFlatten.js

@@ -70,9 +70,7 @@ class DomSimplifier {
                         directText += txt;
                 }
             });
-            const cleanText = directText
-                .replace(/[^a-zA-Z0-9\s]/g, " ")
-                .trim();
+            const cleanText = directText.trim();
             if (cleanText)
                 simplified["text"] = cleanText.slice(0, 200);
             // -----------------
@@ -94,7 +92,11 @@ class DomSimplifier {
             // -----------------
             const parts = new Set();
             if (cleanText && cleanText.length <= 70) {
-                parts.add(cleanText.toLowerCase().replace(/\s+/g, ""));
+                // parts.add(cleanText.toLowerCase().replace(/\s+/g, ""));
+                parts.add(cleanText
+                    .toLowerCase()
+                    .replace(/[^a-zA-Z0-9\s]/g, " ")
+                    .replace(/\s+/g, " "));
             }
             const SEARCH_EXCLUDED = new Set([
                 "class", "style", "onclick", "onchange",

package/dist/fireflinkData/fireflinkLocators/getListOfLocators.d.ts

@@ -1,3 +1,6 @@
+import { LocatorWorkerPool } from "../../utils/workers/LocatorWorkerPool.js";
 export declare class ElementGetter {
+    private readonly workerPool;
+    constructor(workerPool: LocatorWorkerPool);
     getFireFlinkElement(html: string, attribute: string): Promise<any>;
 }

package/dist/fireflinkData/fireflinkLocators/getListOfLocators.js

@@ -2,30 +2,38 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ElementGetter = void 0;
 const logData_js_1 = require("../../utils/logger/logData.js");
-const getElementsFromHTML_js_1 = require("./parser/getElementsFromHTML.js");
+// import { getAiElementsFromHTML } from "./parser/getElementsFromHTML.js";
 const platformContext_js_1 = require("../../utils/helpers/platformContext.js");
 class ElementGetter {
+    constructor(workerPool) {
+        this.workerPool = workerPool;
+    }
     async getFireFlinkElement(html, attribute) {
         const platform = (0, platformContext_js_1.getPlatform)();
-        const formattedAttribute = attribute.replace('[', '//*[@');
+        // const formattedAttribute = attribute.replace('[', '//*[@');
         try {
+            const result = await this.workerPool.getFireFlinkElement(html, attribute, platform);
             // logger.info("formattedAttribute", formattedAttribute);
-            const result = (0, getElementsFromHTML_js_1.getElementsFromHTML)({
-                locators: [
-                    {
-                        name: "xpath",
-                        type: "Static",
-                        value: formattedAttribute,
-                        reference: "local",
-                        status: "NOT_USED",
-                        isRecorded: "Y",
-                    }
-                ]
-            }, html, platform);
+            // const result = await getFireFlinkElement(
+            //     {
+            //         locators: [
+            //             {
+            //                 name: "xpath",
+            //                 type: "Static",
+            //                 value: formattedAttribute,
+            //                 reference: "local",
+            //                 status: "NOT_USED",
+            //                 isRecorded: "N",
+            //             }
+            //         ]
+            //     },
+            //     html,
+            //     platform
+            // );
             return Array.isArray(result) && result.length > 0 ? JSON.parse(JSON.stringify(result[0], null, 4)) : null;
         }
         catch (error) {
-            logData_js_1.logger.info("failed to get element from dom");
+            logData_js_1.logger.info("attribute");
             logData_js_1.logger.error(`[${Object.getPrototypeOf(this).constructor.name}] : `, "Unable to find the element", error);
             return "";
         }

package/dist/fireflinkData/fireflinkLocators/parser/getElementsFromHTML.d.ts

@@ -1,6 +1,6 @@
 import { ElementRecord } from "../types/locator.js";
 import { platform } from "../../../core/types/scriptTypesType.js";
-type ElementDetails = {
+type AiElementDetails = {
     id?: string | null;
     className?: string | null;
     xpathByText?: string | null;
@@ -14,5 +14,5 @@ type ElementDetails = {
     relativeXpath?: string | null;
     [key: string]: any;
 };
-declare const getElementsFromHTML: (record: ElementRecord, htmlString: string, platform: platform) => ElementDetails | null;
-export { getElementsFromHTML };
+declare const getAiElementsFromHTML: (record: ElementRecord, htmlString: string, platform: platform) => AiElementDetails | null;
+export { getAiElementsFromHTML };