ff-automationv2 2.2.17 → 2.2.20

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/automation/browserSession/initiateBrowserSession.d.ts

@@ -1,4 +1,4 @@
-import { Browser } from "../../core/types/browserType.js";
+import { BrowserId } from "../../core/types/browserType.js";
 import { CloudConfig } from "../../core/interfaces/cloudConfigInterface.js";
 export declare class BrowserSession {
     private driver;
@@ -6,7 +6,7 @@ export declare class BrowserSession {
     private pageLoad;
     private cloudSessionInstances;
     private isCloud;
-    constructor(browserName: Browser, isCloud: boolean | undefined, capabilities: Record<string, any> | undefined, pageLoad: number, CloudConfig: CloudConfig | undefined);
+    constructor(browserName: BrowserId, isCloud: boolean | undefined, capabilities: Record<string, any> | undefined, pageLoad: number, CloudConfig: CloudConfig | undefined);
     private openBrowser;
     open(): Promise<void>;
     close(): Promise<void>;

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

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

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/executionContext.js

@@ -3,11 +3,12 @@ import { MobileSession } from "../../automation/mobileSession/initiateMobileSess
 import { ElementGetter } from "../../fireflinkData/fireflinkLocators/getListOfLocators.js";
 import { ScriptDataAppender } from "../../fireflinkData/fireflinkScript/scriptGenrationData.js";
 import { DEFAULT_PAGE_LOAD } from "../constants/defaultValues.js";
+import { browsers } from "../../core/types/browserType.js";
 export class ExecutionContext {
     constructor(request) {
         this.request = request;
         this.executor = null;
-        this.session = new BrowserSession(request.browser.browserName, request.isCloud, request.capabilities, DEFAULT_PAGE_LOAD, request.cloudConfig);
+        this.session = new BrowserSession(browsers[request.browser.browserName], request.isCloud, request.capabilities, DEFAULT_PAGE_LOAD, request.cloudConfig);
         this.locator = new ElementGetter();
         this.scriptAppender = new ScriptDataAppender();
         this.androidSession = new MobileSession(request.appiumPort, request.isCloud, request.capabilities, request.cloudConfig);

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/core/types/browserType.d.ts

@@ -1 +1,8 @@
-export type Browser = 'chrome' | 'firefox' | 'edge' | 'safari';
+export declare const browsers: {
+    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];

package/dist/core/types/browserType.js

@@ -1 +1,6 @@
-export {};
+export const browsers = {
+    "Microsoft Edge": "edge",
+    "Google Chrome": "chrome",
+    "Mozilla Firefox": "firefox",
+    "Safari": "safari"
+};

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.js

@@ -1,6 +1,14 @@
+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 = {
+    cert: fs.readFileSync(certPath, "utf-8"),
+    rejectUnauthorized: false,
+};
 const runner = new AutomationRunner();
+console.log(new Date().getTime());
 runner.run({
     userStory: [
         ["Open browser"],
@@ -30,13 +38,8 @@ runner.run({
             pageName: "ai-Page"
         }
     },
-    broker: ["test3.fireflink.com:9092"],
-    sslConfig: {
-        rejectUnauthorized: false,
-        ca: ["D:\Bitbucket\automationV2\Certificates\certificate.crt"]
-    },
     sessionPath: path.join("D:", "Bitbucket", "automationV2"),
-    serverHost: "test3",
+    serverHost: "https://test3.fireflink.com",
     // topic: "",
     // serviceAccounts: "",
     webSocketId: "",
@@ -46,9 +49,11 @@ runner.run({
     userId: "USR26935",
     projectType: "Web",
     browser: {
-        browserName: "chrome",
+        browserName: "Google Chrome",
     },
-    serverData: "https://test3.fireflink.com",
+    broker: ["test3.fireflink.com"],
+    sslConfig: ssl,
+    env: "test3",
     version: "asdfg",
     type: "sdfg",
     scriptName: "url",
@@ -60,6 +65,7 @@ runner.run({
     appiumPort: 0,
     platformVersion: "",
     realDeviceId: "",
+    serverData: "",
     isCloud: false,
     cloudConfig: {
         accessKey: "yfAa_w199cJge2Gezsgb2Jnu7hKdqER1tExY5kKvgSvXfi1lRUelFsbTFI5pMq7zQuwwNXXnsLTkjKhvWcKDWsUoGLi9KjUV6gbUNDhqj0jWYFyW9h_0LIDEg5qXigwZdqzQqAvWwHin3gBhzGndeROtixv_VFhnseGSWRAHTajZzE-Zl0d8BP6gl0TEBUfoNgqBtAQVDLP6wAQzPfcyjjGFsdHkXWeHFkKmA78D7rKlnNuN2WgjIUlhYheDRDeqZ98Ig_PyS1GbUvjwJ73L38sr_cD4Y9lrKyWJV-m5RmtKhmkqRM8uk5gEfjzgwy30",
@@ -75,5 +81,5 @@ runner.run({
         browserVersion: "146"
     },
     isTerminate: false,
-    token: "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJRUFRfTnFuMkxxdDVmN09tOElWaW53dUJlR3ZVUUVBUkdxZkFuRHJxZU9NIn0.eyJleHAiOjE3NzUxMDczODIsImlhdCI6MTc3NTAyMDk4MiwianRpIjoib25ydHJvOmVkOGU3NzA4LTQ0OGUtNDdhZi05OTU0LWNjMWZkMzNlN2E1OCIsImlzcyI6Imh0dHA6Ly8xMDMuMTgyLjIxMC4yMjY6MzAxMDcvcmVhbG1zL0ZpcmVGbGluay10ZXN0MyIsImF1ZCI6InRhcmdldC1jbGllbnQiLCJzdWIiOiJmOmNhMzBmNDk3LTY1Y2YtNGU4Zi1iZGE3LTE0ZjM1NTNiYzZmNTpqYWlha2FzaEB5b3BtYWlsLmNvbSIsInR5cCI6IkJlYXJlciIsImF6cCI6ImZsaW5rLXNlcnZpY2UiLCJzaWQiOiIxOGExYWFiYy0xYzA5LTQ4YTMtOGJhMi01OThhYTc2MDkyZjYiLCJhY3IiOiIxIiwiYWxsb3dlZC1vcmlnaW5zIjpbIioiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInNjb3BlIjoiZW1haWwgcHJvZmlsZSIsImN1cnJlbnRMaWNlbnNlSWQiOiJMSUMzOTg1IiwiZW1haWxfdmVyaWZpZWQiOmZhbHNlLCJjdXJyZW50UHJpdmlsZWdlIjoiU3VwZXIgQWRtaW4iLCJmdWxsTmFtZSI6ImphaSIsImFjdGl2YXRpb25TdGF0dXMiOiJBQ1RJVkUiLCJwcml2aWxlZ2UiOiJTdXBlciBBZG1pbiIsImxpY2Vuc2VOYW1lIjoiRmlyZUZsaW5rIC0gTElDMzk4NSIsInByZWZlcnJlZF91c2VybmFtZSI6ImphaSIsInVzZXJOYW1lIjoiamFpYWthc2hAeW9wbWFpbC5jb20iLCJiaWxsaW5nQ3ljbGUiOiJRdWFydGVybHkiLCJpZCI6IlVTUjI2OTM1IiwibGljZW5zZUlkIjoiTElDMzk4NSIsImVtYWlsIjoiamFpYWthc2hAeW9wbWFpbC5jb20ifQ.HxaDrSYbsIjz0u0_Kmg3rEy4y4-tFuDWhbWYHllWUQnXD9-yQQEx1u2dE_nzc-wRHkwtKf3nieO1HjQ-rmm0wy7P9vCpSTQg8Z8EY7G1GpxObHdLgqoRe1JvXbMXJu9LSWI80Kt0EgdTEdN93MwfhRTyHNEkdr4X8q0bvbkkYNu9r5PZs-NZnsQaAeHygsx85CSuYfXq43_LgMC6qPVpRS0y0V36hzEJVylwSg2z3xP9znAWHohL_F5gQ9Er8r1t3xUgy6_ob-0t_q7Bha5iaYOq0vl2P51DkT87C7NIzm5TjiiSUWZwIdLBKUKXSWNUG1RX89mrTZyuYyocO1yNng"
+    token: "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJRUFRfTnFuMkxxdDVmN09tOElWaW53dUJlR3ZVUUVBUkdxZkFuRHJxZU9NIn0.eyJleHAiOjE3NzUyODczODQsImlhdCI6MTc3NTIwMDk4NCwianRpIjoib25ydHJvOjYzOTYzMjJkLTNlZWYtNDg1NC04NmUzLTdlNzBhNjY1ZjM0MSIsImlzcyI6Imh0dHA6Ly8xMDMuMTgyLjIxMC4yMjY6MzAxMDcvcmVhbG1zL0ZpcmVGbGluay10ZXN0MyIsImF1ZCI6InRhcmdldC1jbGllbnQiLCJzdWIiOiJmOmNhMzBmNDk3LTY1Y2YtNGU4Zi1iZGE3LTE0ZjM1NTNiYzZmNTpqYWlha2FzaEB5b3BtYWlsLmNvbSIsInR5cCI6IkJlYXJlciIsImF6cCI6ImZsaW5rLXNlcnZpY2UiLCJzaWQiOiIxMDkzNTU4Yi0xMDY4LTQxM2MtYjhlNi0wMjE3NzQwODBjMjgiLCJhY3IiOiIxIiwiYWxsb3dlZC1vcmlnaW5zIjpbIioiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInNjb3BlIjoiZW1haWwgcHJvZmlsZSIsImN1cnJlbnRMaWNlbnNlSWQiOiJMSUMzOTg1IiwiZW1haWxfdmVyaWZpZWQiOmZhbHNlLCJjdXJyZW50UHJpdmlsZWdlIjoiU3VwZXIgQWRtaW4iLCJmdWxsTmFtZSI6ImphaSIsImFjdGl2YXRpb25TdGF0dXMiOiJBQ1RJVkUiLCJwcml2aWxlZ2UiOiJTdXBlciBBZG1pbiIsImxpY2Vuc2VOYW1lIjoiRmlyZUZsaW5rIC0gTElDMzk4NSIsInByZWZlcnJlZF91c2VybmFtZSI6ImphaSIsInVzZXJOYW1lIjoiamFpYWthc2hAeW9wbWFpbC5jb20iLCJiaWxsaW5nQ3ljbGUiOiJRdWFydGVybHkiLCJpZCI6IlVTUjI2OTM1IiwibGljZW5zZUlkIjoiTElDMzk4NSIsImVtYWlsIjoiamFpYWthc2hAeW9wbWFpbC5jb20ifQ.NOa6gz1thU8Qh04dvJMwUvGo3FZVc_ZAMbHL0j0pg_wOkmshcd8LSua0RoFYbBw5LR2RjJhVBkiZ2zD6s28EqdUdMJwjFfx4QF9ol8ut1T6-ohI_-xtCy1wdzx-dJ7svVSc7zptEcYEMEnkGEPXhTIjB0iql-Ry5MM2CkjOQP5yPdO3W8Lua2kSQmXWwWfZJSSnem8foN4oG7uJ_4T8Yh8V69iI2Trsbdp5k8CXUxs42vI73KyX0qwzcL-B-X6o1DnOaNS6T6RI7t9kGq6WXW0Iu29EVdqQ3jVnkPbOFfvSdRYRCb9Uw4qZL2qUQK3V31Jqw6Rd-r1IjDmBcXogoTg"
 });

package/dist/utils/browserCap/capability.d.ts

@@ -1,5 +1,5 @@
-import { Browser } from "../../core/types/browserType";
-export declare function getCapabilities(browserName: Browser): {
+import { BrowserId } from "../../core/types/browserType.js";
+export declare function getCapabilities(browserName: BrowserId): {
     'goog:chromeOptions'?: {
         args: string[];
     } | undefined;

package/package.json

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