ff-automationv2 2.2.18 → 2.2.21

package/dist/ai/llmcalls/llmAction.js

@@ -31,7 +31,7 @@ export class llmAction {
     async getLLMResponseText(system, user) {
         let attempt = 0;
         const MAX_RETRIES = 5;
-        const startTime = new Date().getTime();
+        // const startTime = new Date().getTime()
         while (attempt < MAX_RETRIES) {
             attempt++;
             try {
@@ -49,7 +49,7 @@ export class llmAction {
                     logger.error(`Invalid LLM output. Retrying (${attempt})`);
                     continue;
                 }
-                logger.info("Time taken to get LLM response (Text):", Date.now() - startTime, "ms");
+                // logger.info("Time taken to get LLM response (Text):", Date.now() - startTime, "ms");
                 return response;
             }
             catch (error) {
@@ -64,7 +64,7 @@ export class llmAction {
     async getLLMResponseWithVision(system, userPrompt) {
         let attempt = 0;
         const MAX_RETRIES = 5;
-        const startTime = new Date().getTime();
+        // const startTime = new Date().getTime()
         while (attempt < MAX_RETRIES) {
             attempt++;
             try {
@@ -82,7 +82,7 @@ export class llmAction {
                     logger.error(`Invalid Vision output. Retrying (${attempt})`);
                     continue;
                 }
-                logger.info("Time taken to get LLM response (vision):", Date.now() - startTime, "ms");
+                // logger.info("Time taken to get LLM response (vision):", Date.now() - startTime, "ms");
                 return response;
             }
             catch (error) {

package/dist/ai/llmcalls/parseLlmOputput.js

@@ -1,4 +1,4 @@
-import { logger } from "../../utils/logger/logData.js";
+// import { logger } from "../../utils/logger/logData.js";
 export class LLMResultParser {
     constructor() {
         this.inputTokens = 0;
@@ -19,11 +19,9 @@ export class LLMResultParser {
             }
             let parsedContent;
             try {
-                // Try direct parse first
                 parsedContent = JSON.parse(content);
             }
             catch {
-                // If LLM added explanation text, extract JSON block
                 const extracted = this.extractJsonObject(content);
                 if (!extracted) {
                     throw new Error("Could not extract valid JSON from LLM response");
@@ -31,13 +29,10 @@ export class LLMResultParser {
                 parsedContent = extracted;
             }
             const usage = llmOutput?.usage ?? {};
-            const inputTokens = Number(usage.prompt_tokens ?? 0);
-            const outputTokens = Number(usage.completion_tokens ?? 0);
-            const totalTokens = Number(usage.total_tokens ?? 0);
-            this.inputTokens += inputTokens;
-            this.outputTokens += outputTokens;
-            this.totalTokens += totalTokens;
-            logger.info(`Total tokens for this call is : ${usage.total_tokens}`);
+            this.inputTokens += Number(usage.prompt_tokens ?? 0);
+            this.outputTokens += Number(usage.completion_tokens ?? 0);
+            this.totalTokens += Number(usage.total_tokens ?? 0);
+            // logger.info(`Total tokens for this call is : ${usage.total_tokens}`);
             return { response: parsedContent };
         }
         catch (error) {

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

@@ -18,7 +18,7 @@ export interface AutomationRequest {
     licenseId: string;
     userId: string;
     projectType: string;
-    serverData: any;
+    env: string;
     userName: string;
     serverHost: string;
     browser: BrowserConfig;
@@ -33,4 +33,5 @@ export interface AutomationRequest {
     isCloud?: boolean;
     capabilities?: Record<string, any>;
     cloudConfig?: CloudConfig;
+    serverData?: any;
 }

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

@@ -20,7 +20,7 @@ export interface IPayload {
     licenseId: string;
     userId: string;
     projectType: string;
-    tokensConsumed: number;
+    tokensConsumed?: number;
     errorInfo?: IErrorInfo;
 }
 export interface IFireFlinkApiService {

package/dist/core/main/runAutomationScript.js

@@ -82,12 +82,13 @@ export class AutomationRunner {
     async run(request) {
         const usedElementNames = [];
         initLogger(request.sessionPath);
+        logger.info("User Given Step", request.userStory);
         if (request.isTerminate)
             return AutomationRunner.updateSessionTerminationInfo(request.testCaseId);
         AutomationRunner.sessionTerminationDetails[request.testCaseId] = request.isTerminate;
         const apiService = new FireFlinkApiService();
         const fireflinkServiceInstance = new fireflinkService(apiService, request.broker, request.sslConfig);
-        const instanceDetails = await fireflinkServiceInstance.runGetInstancesDetails(request.projectId, request.token, request.serverData);
+        const instanceDetails = await fireflinkServiceInstance.runGetInstancesDetails(request.projectId, request.token, request.serverHost);
         const aiInfo = getAiInstanceInfo(instanceDetails.responseObject);
         const context = new ExecutionContext(request);
         const configProvider = new ServiceProviderBaseUrlProvider();
@@ -559,17 +560,19 @@ export class AutomationRunner {
         };
         try {
             await context.scriptAppender.waitForAllSteps();
-            logger.info(context.scriptAppender.getData(), payload);
-            this.KafkaPayload.topic = `Topic-FIREFLINK-api-requests-${request.serverHost}`;
+            logger.info(context.scriptAppender.getData());
+            this.KafkaPayload.topic = `Topic-FIREFLINK-api-requests-${request.env}`;
             this.KafkaPayload.message = {
                 ...payload,
                 stepData: context.scriptAppender.getData(),
                 serverHost: request.serverHost
             };
-            logger.info(this.KafkaPayload);
+            delete payload.tokensConsumed;
+            logger.info({ ...payload, topic: this.KafkaPayload.topic });
             await fireflinkServiceInstance.produceMessageToKafka(this.KafkaPayload);
         }
         catch (error) {
+            logger.error("Failed to produce message :", logger.getError(error));
             throw new Error("Failed to produce message :", { cause: error });
         }
         finally {

package/dist/service/fireflink.service.d.ts

@@ -3,6 +3,6 @@ export declare class fireflinkService implements IFireflinkService {
     private apiService;
     private kafkaProducer;
     constructor(apiService: IFireFlinkApiService, broker: string[], sslConfig: any);
-    runGetInstancesDetails(projectId: string, token: string, serverData: string): Promise<any>;
+    runGetInstancesDetails(projectId: string, token: string, serverHost: string): Promise<any>;
     produceMessageToKafka(kafkaArgs: IKafkaPayload): Promise<void>;
 }

package/dist/service/fireflink.service.js

@@ -5,7 +5,7 @@ export class fireflinkService {
         this.apiService = apiService;
         this.kafkaProducer = new KafkaProducerService(broker, sslConfig);
     }
-    async runGetInstancesDetails(projectId, token, serverData) {
+    async runGetInstancesDetails(projectId, token, serverHost) {
         const headers = {
             Accept: "*/*",
             "Accept-Language": "en-US,en;q=0.9",
@@ -13,7 +13,7 @@ export class fireflinkService {
             projectId: projectId || "",
             Authorization: `Bearer ${token}`,
         };
-        const url = `${serverData}/project/optimize/v3/ai-service-provider/selected-instance?projectId=${projectId}`;
+        const url = `${serverHost}/project/optimize/v3/ai-service-provider/selected-instance?projectId=${projectId}`;
         try {
             const finalResult = await this.apiService.getInstancesDetailsApi(headers, url);
             if (finalResult) {
@@ -30,6 +30,6 @@ export class fireflinkService {
         }
     }
     async produceMessageToKafka(kafkaArgs) {
-        this.kafkaProducer.produceMessage(kafkaArgs);
+        await this.kafkaProducer.produceMessage(kafkaArgs);
     }
 }

package/dist/service/kafka/fireflinkKafka.service.js

@@ -1,7 +1,5 @@
 import { Kafka, logLevel } from "kafkajs";
 import { logger } from "../../utils/logger/logData.js";
-import dotenv from "dotenv";
-dotenv.config();
 export class KafkaProducerService {
     constructor(brokers, sslConfig) {
         this.kafka = new Kafka({

package/dist/tests/test12.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tests/test12.js

@@ -0,0 +1,85 @@
+console.log(new Date().getTime());
+import { AutomationRunner } from "../index.js";
+import path from "path";
+import fs from "fs";
+const certPath = path.join("D:", "Bitbucket", "automationV2", "Certificates", "certificate.crt");
+const ssl = {
+    ca: [fs.readFileSync(certPath, "utf-8")],
+    rejectUnauthorized: false,
+};
+const runner = new AutomationRunner();
+console.log(new Date().getTime());
+runner.run({
+    userStory: [
+        ["Open browser"],
+        ["Navigate to https://www.google.com/"],
+        ["Maximize the browser"],
+        // ["Navigate to https://www.google.com/"],
+        // ["Maximize the browser"],
+        // ["Navigate to https://www.google.com/"],
+        // ["Maximize the browser"],
+        // ["click on Gmail link"],
+        ["Close browser"],
+        // ["start iteration using 'Data1' Dataprovider"],
+        // ["enter 'startIteration1' in search field"],
+        // ["enter level-A in search field"],
+        // ["start iteration using 'Data1' Dataprovider"],
+        // ["enter 'startIteration1' in search field"],
+        // ["enter level-B in search field"],
+        // ["End iteration"],
+        // ["End iteration"],
+        // ["click on Gmail link"],
+        // ["Close browser"],
+    ],
+    platform: "web",
+    pageDetails: {
+        Web: {
+            pageId: "PAG73a7a0ad-c092-4351-8a93-68647f60e343",
+            pageName: "ai-Page"
+        }
+    },
+    sessionPath: path.join("D:", "Bitbucket", "automationV2"),
+    serverHost: "https://test3.fireflink.com",
+    // topic: "",
+    // serviceAccounts: "",
+    webSocketId: "",
+    generatedBy: "",
+    licenseType: "C-Professional",
+    licenseId: "LIC3985",
+    userId: "USR26935",
+    projectType: "Web",
+    browser: {
+        browserName: "Google Chrome",
+    },
+    broker: ["test3.fireflink.com:9092"],
+    sslConfig: ssl,
+    env: "test3",
+    version: "asdfg",
+    type: "sdfg",
+    scriptName: "url",
+    scriptType: "web",
+    projectId: "PJT1116",
+    testCaseId: "SCR1208",
+    promptId: "3f6e123c-8ec6-47c1-90e1-1a2f53b49251",
+    userName: "default-user",
+    appiumPort: 0,
+    platformVersion: "",
+    realDeviceId: "",
+    serverData: "",
+    isCloud: false,
+    cloudConfig: {
+        accessKey: "yfAa_w199cJge2Gezsgb2Jnu7hKdqER1tExY5kKvgSvXfi1lRUelFsbTFI5pMq7zQuwwNXXnsLTkjKhvWcKDWsUoGLi9KjUV6gbUNDhqj0jWYFyW9h_0LIDEg5qXigwZdqzQqAvWwHin3gBhzGndeROtixv_VFhnseGSWRAHTajZzE-Zl0d8BP6gl0TEBUfoNgqBtAQVDLP6wAQzPfcyjjGFsdHkXWeHFkKmA78D7rKlnNuN2WgjIUlhYheDRDeqZ98Ig_PyS1GbUvjwJ73L38sr_cD4Y9lrKyWJV-m5RmtKhmkqRM8uk5gEfjzgwy30",
+        hostname: "devicefarm.fireflink.com",
+        licenseId: "LIC2026658",
+        projectName: "Project-6",
+        protocol: "https",
+        path: "backend/fireflinkcloud/wd/hub"
+    },
+    capabilities: {
+        browserName: "chrome",
+        platformName: "Windows 11",
+        browserVersion: "146"
+    },
+    isTerminate: false,
+    token: "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJRUFRfTnFuMkxxdDVmN09tOElWaW53dUJlR3ZVUUVBUkdxZkFuRHJxZU9NIn0.eyJleHAiOjE3NzUyODczODQsImlhdCI6MTc3NTIwMDk4NCwianRpIjoib25ydHJvOjYzOTYzMjJkLTNlZWYtNDg1NC04NmUzLTdlNzBhNjY1ZjM0MSIsImlzcyI6Imh0dHA6Ly8xMDMuMTgyLjIxMC4yMjY6MzAxMDcvcmVhbG1zL0ZpcmVGbGluay10ZXN0MyIsImF1ZCI6InRhcmdldC1jbGllbnQiLCJzdWIiOiJmOmNhMzBmNDk3LTY1Y2YtNGU4Zi1iZGE3LTE0ZjM1NTNiYzZmNTpqYWlha2FzaEB5b3BtYWlsLmNvbSIsInR5cCI6IkJlYXJlciIsImF6cCI6ImZsaW5rLXNlcnZpY2UiLCJzaWQiOiIxMDkzNTU4Yi0xMDY4LTQxM2MtYjhlNi0wMjE3NzQwODBjMjgiLCJhY3IiOiIxIiwiYWxsb3dlZC1vcmlnaW5zIjpbIioiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInNjb3BlIjoiZW1haWwgcHJvZmlsZSIsImN1cnJlbnRMaWNlbnNlSWQiOiJMSUMzOTg1IiwiZW1haWxfdmVyaWZpZWQiOmZhbHNlLCJjdXJyZW50UHJpdmlsZWdlIjoiU3VwZXIgQWRtaW4iLCJmdWxsTmFtZSI6ImphaSIsImFjdGl2YXRpb25TdGF0dXMiOiJBQ1RJVkUiLCJwcml2aWxlZ2UiOiJTdXBlciBBZG1pbiIsImxpY2Vuc2VOYW1lIjoiRmlyZUZsaW5rIC0gTElDMzk4NSIsInByZWZlcnJlZF91c2VybmFtZSI6ImphaSIsInVzZXJOYW1lIjoiamFpYWthc2hAeW9wbWFpbC5jb20iLCJiaWxsaW5nQ3ljbGUiOiJRdWFydGVybHkiLCJpZCI6IlVTUjI2OTM1IiwibGljZW5zZUlkIjoiTElDMzk4NSIsImVtYWlsIjoiamFpYWthc2hAeW9wbWFpbC5jb20ifQ.NOa6gz1thU8Qh04dvJMwUvGo3FZVc_ZAMbHL0j0pg_wOkmshcd8LSua0RoFYbBw5LR2RjJhVBkiZ2zD6s28EqdUdMJwjFfx4QF9ol8ut1T6-ohI_-xtCy1wdzx-dJ7svVSc7zptEcYEMEnkGEPXhTIjB0iql-Ry5MM2CkjOQP5yPdO3W8Lua2kSQmXWwWfZJSSnem8foN4oG7uJ_4T8Yh8V69iI2Trsbdp5k8CXUxs42vI73KyX0qwzcL-B-X6o1DnOaNS6T6RI7t9kGq6WXW0Iu29EVdqQ3jVnkPbOFfvSdRYRCb9Uw4qZL2qUQK3V31Jqw6Rd-r1IjDmBcXogoTg"
+});

package/dist/tests/test254.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/tests/test254.js

@@ -1,82 +1,87 @@
-import { remote } from 'webdriverio';
-import { encode } from '@toon-format/toon';
-import * as cheerio from 'cheerio';
-import fs from 'fs';
-import { encoding_for_model } from "@dqbd/tiktoken";
-// 🔄 HTML → JSON
-function htmlToJson(html) {
-    const $ = cheerio.load(html);
-    // 🧹 remove useless elements
-    $('script, style, noscript, iframe').remove();
-    function parseElement(elem, depth = 0) {
-        if (!elem || depth > 6)
-            return null;
-        const node = {
-            tag: elem.name,
-            attrs: elem.attribs || {},
-            children: [] // ✅ FIX
-        };
-        for (const child of elem.children || []) {
-            if (child.type === 'text') {
-                const text = child.data.trim();
-                if (text) {
-                    node.children.push({ text });
-                }
-            }
-            else if (child.type === 'tag') {
-                const parsed = parseElement(child, depth + 1);
-                if (parsed) {
-                    node.children.push(parsed);
-                }
-            }
-        }
-        return node;
-    }
-    return parseElement($('body')[0]);
-}
-// 🚀 Main runner
-async function run() {
-    const browser = await remote({
-        capabilities: {
-            browserName: 'chrome'
-        }
-    });
-    try {
-        // 🌐 Open Amazon
-        await browser.url('https://www.amzon.in/');
-        // ⏳ wait for search box
-        const searchBox = await browser.$('#twotabsearchtextbox');
-        await searchBox.waitForDisplayed({ timeout: 10000 });
-        // 📄 Get HTML
-        const html = await browser.getPageSource();
-        // 🔄 Convert HTML → JSON
-        const json = htmlToJson(html);
-        // 🔄 JSON → TOON
-        const start = performance.now();
-        const encoded = encode({ data: json });
-        const end = performance.now();
-        console.log('HTML :', html.length);
-        console.log('json size:', JSON.stringify(json).length);
-        console.log('Encoded length:', encoded.length);
-        console.log(`Time taken: ${(end - start).toFixed(2)} ms`);
-        // 💾 Save outputs (optional but useful)
-        fs.writeFileSync('output.json', JSON.stringify(json, null, 2));
-        fs.writeFileSync('output.toon', encoded);
-        const enc = encoding_for_model("gpt-4"); // closest available
-        function countTokens(text) {
-            return enc.encode(text).length;
-        }
-        const jsonString = JSON.stringify(json);
-        console.log("Token JSON count:", countTokens(jsonString));
-        const jsonStringencoded = JSON.stringify(encoded);
-        console.log("Token TOON count:", countTokens(jsonStringencoded));
-    }
-    catch (err) {
-        console.error(err);
-    }
-    finally {
-        await browser.deleteSession();
-    }
-}
-run();
-console.log("hi");
+"use strict";
+// import { remote } from 'webdriverio'
+// import { encode } from '@toon-format/toon'
+// import * as cheerio from 'cheerio'
+// import fs from 'fs'
+// import { Tokenizer } from "@huggingface/tokenizers"
+// import { encoding_for_model } from "@dqbd/tiktoken"
+// // 🧠 Define proper type (fixes "never" error)
+// type NodeType = {
+//     tag?: string
+//     attrs?: Record<string, string>
+//     children?: NodeType[]
+//     text?: string
+// }
+// // 🔄 HTML → JSON
+// function htmlToJson(html: string): NodeType | null {
+//     const $ = cheerio.load(html)
+//     // 🧹 remove useless elements
+//     $('script, style, noscript, iframe').remove()
+//     function parseElement(elem: any, depth = 0): NodeType | null {
+//         if (!elem || depth > 6) return null
+//         const node: NodeType = {
+//             tag: elem.name,
+//             attrs: elem.attribs || {},
+//             children: [] as NodeType[] // ✅ FIX
+//         }
+//         for (const child of elem.children || []) {
+//             if (child.type === 'text') {
+//                 const text = child.data.trim()
+//                 if (text) {
+//                     node.children!.push({ text })
+//                 }
+//             } else if (child.type === 'tag') {
+//                 const parsed = parseElement(child, depth + 1)
+//                 if (parsed) {
+//                     node.children!.push(parsed)
+//                 }
+//             }
+//         }
+//         return node
+//     }
+//     return parseElement($('body')[0])
+// }
+// // 🚀 Main runner
+// async function run() {
+//     const browser = await remote({
+//         capabilities: {
+//             browserName: 'chrome'
+//         }
+//     })
+//     try {
+//         // 🌐 Open Amazon
+//         await browser.url('https://www.amzon.in/')
+//         // ⏳ wait for search box
+//         const searchBox = await browser.$('#twotabsearchtextbox')
+//         await searchBox.waitForDisplayed({ timeout: 10000 })
+//         // 📄 Get HTML
+//         const html = await browser.getPageSource()
+//         // 🔄 Convert HTML → JSON
+//         const json = htmlToJson(html)
+//         // 🔄 JSON → TOON
+//         const start = performance.now()
+//         const encoded = encode({ data: json })
+//         const end = performance.now()
+//         console.log('HTML :', html.length)
+//         console.log('json size:', JSON.stringify(json).length)
+//         console.log('Encoded length:', encoded.length)
+//         console.log(`Time taken: ${(end - start).toFixed(2)} ms`)
+//         // 💾 Save outputs (optional but useful)
+//         fs.writeFileSync('output.json', JSON.stringify(json, null, 2))
+//         fs.writeFileSync('output.toon', encoded)
+//         const enc = encoding_for_model("gpt-4") // closest available
+//         function countTokens(text: string) {
+//             return enc.encode(text).length
+//         }
+//         const jsonString = JSON.stringify(json)
+//         console.log("Token JSON count:", countTokens(jsonString))
+//         const jsonStringencoded = JSON.stringify(encoded)
+//         console.log("Token TOON count:", countTokens(jsonStringencoded))
+//     } catch (err) {
+//         console.error(err)
+//     } finally {
+//         await browser.deleteSession()
+//     }
+// }
+// run()
+// console.log("hi")

package/package.json

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