ff-automationv2 2.2.16 → 2.2.17

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

@@ -27,8 +27,10 @@ export interface AutomationRequest {
     appiumPort: number;
     realDeviceId: string;
     platformVersion: string;
+    broker: string[];
+    sslConfig: any;
+    isTerminate: boolean;
     isCloud?: boolean;
     capabilities?: Record<string, any>;
     cloudConfig?: CloudConfig;
-    isTerminate: boolean;
 }

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

@@ -31,7 +31,7 @@ export interface IFireflinkService {
 }
 export interface IKafkaPayload {
     message: IPayload & {
-        scriptGenerationData: IScriptGenerationData[];
+        stepData: IScriptGenerationData[];
         serverHost: string;
     };
     topic: string;

package/dist/core/main/runAutomationScript.js

@@ -86,7 +86,7 @@ export class AutomationRunner {
             return AutomationRunner.updateSessionTerminationInfo(request.testCaseId);
         AutomationRunner.sessionTerminationDetails[request.testCaseId] = request.isTerminate;
         const apiService = new FireFlinkApiService();
-        const fireflinkServiceInstance = new fireflinkService(apiService);
+        const fireflinkServiceInstance = new fireflinkService(apiService, request.broker, request.sslConfig);
         const instanceDetails = await fireflinkServiceInstance.runGetInstancesDetails(request.projectId, request.token, request.serverData);
         const aiInfo = getAiInstanceInfo(instanceDetails.responseObject);
         const context = new ExecutionContext(request);
@@ -559,11 +559,11 @@ export class AutomationRunner {
         };
         try {
             await context.scriptAppender.waitForAllSteps();
-            // logger.info(context.scriptAppender.getData(), payload)
+            logger.info(context.scriptAppender.getData(), payload);
             this.KafkaPayload.topic = `Topic-FIREFLINK-api-requests-${request.serverHost}`;
             this.KafkaPayload.message = {
                 ...payload,
-                scriptGenerationData: context.scriptAppender.getData(),
+                stepData: context.scriptAppender.getData(),
                 serverHost: request.serverHost
             };
             logger.info(this.KafkaPayload);

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

@@ -2,7 +2,7 @@ import { IFireflinkService, IFireFlinkApiService, IKafkaPayload } from "../core/
 export declare class fireflinkService implements IFireflinkService {
     private apiService;
     private kafkaProducer;
-    constructor(apiService: IFireFlinkApiService);
+    constructor(apiService: IFireFlinkApiService, broker: string[], sslConfig: any);
     runGetInstancesDetails(projectId: string, token: string, serverData: string): Promise<any>;
     produceMessageToKafka(kafkaArgs: IKafkaPayload): Promise<void>;
 }

package/dist/service/fireflink.service.js

@@ -1,9 +1,9 @@
 import { KafkaProducerService } from "./kafka/fireflinkKafka.service.js";
 import { logger } from "../utils/logger/logData.js";
 export class fireflinkService {
-    constructor(apiService) {
+    constructor(apiService, broker, sslConfig) {
         this.apiService = apiService;
-        this.kafkaProducer = new KafkaProducerService();
+        this.kafkaProducer = new KafkaProducerService(broker, sslConfig);
     }
     async runGetInstancesDetails(projectId, token, serverData) {
         const headers = {

package/dist/service/kafka/fireflinkKafka.service.d.ts

@@ -2,6 +2,6 @@ import { IKafkaPayload } from "../../core/interfaces/fireflinkScriptPayloadInter
 export declare class KafkaProducerService {
     private kafka;
     private kafkaProducer;
-    constructor();
+    constructor(brokers: string[], sslConfig: any);
     produceMessage(kafkaArgs: IKafkaPayload): Promise<void>;
 }

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

@@ -1,18 +1,19 @@
-import { Kafka } from "kafkajs";
+import { Kafka, logLevel } from "kafkajs";
 import { logger } from "../../utils/logger/logData.js";
-import fs from "fs";
 import dotenv from "dotenv";
 dotenv.config();
 export class KafkaProducerService {
-    constructor() {
+    constructor(brokers, sslConfig) {
         this.kafka = new Kafka({
-            clientId: process.env.KAFKA_CLIENT_ID,
-            brokers: process.env.KAFKA_BROKERS.split(","),
-            ssl: {
-                ca: [fs.readFileSync(process.env.KAFKA_SSL_CA, "utf-8")],
-                key: fs.readFileSync(process.env.KAFKA_SSL_KEY, "utf-8"),
-                cert: fs.readFileSync(process.env.KAFKA_SSL_CERT, "utf-8"),
-                rejectUnauthorized: true,
+            clientId: "FireFlinK-AI-Automation",
+            brokers: brokers,
+            ssl: sslConfig,
+            logLevel: logLevel.ERROR,
+            connectionTimeout: 10000,
+            requestTimeout: 60000,
+            retry: {
+                initialRetryTime: 300,
+                retries: 10,
             },
         });
         this.kafkaProducer = this.kafka.producer();

package/dist/tests/test12.js

@@ -30,6 +30,11 @@ 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",
     // topic: "",
@@ -70,5 +75,5 @@ runner.run({
         browserVersion: "146"
     },
     isTerminate: false,
-    token: "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJRUFRfTnFuMkxxdDVmN09tOElWaW53dUJlR3ZVUUVBUkdxZkFuRHJxZU9NIn0.eyJleHAiOjE3NzUwNDMwMjcsImlhdCI6MTc3NDk1NjYyNywianRpIjoib25ydHJvOjk5MjQwN2U3LWU2ZWQtNDUwMS05NDhhLTA2YmQyMGIwZmNhZSIsImlzcyI6Imh0dHA6Ly8xMDMuMTgyLjIxMC4yMjY6MzAxMDcvcmVhbG1zL0ZpcmVGbGluay10ZXN0MyIsImF1ZCI6InRhcmdldC1jbGllbnQiLCJzdWIiOiJmOmNhMzBmNDk3LTY1Y2YtNGU4Zi1iZGE3LTE0ZjM1NTNiYzZmNTpqYWlha2FzaEB5b3BtYWlsLmNvbSIsInR5cCI6IkJlYXJlciIsImF6cCI6ImZsaW5rLXNlcnZpY2UiLCJzaWQiOiI1NGVlNDQ0YS0zMzdkLTQwNjMtYjhlZC0yOWI2ZTFmZjBhN2YiLCJhY3IiOiIxIiwiYWxsb3dlZC1vcmlnaW5zIjpbIioiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInNjb3BlIjoiZW1haWwgcHJvZmlsZSIsImN1cnJlbnRMaWNlbnNlSWQiOiJMSUMzOTg1IiwiZW1haWxfdmVyaWZpZWQiOmZhbHNlLCJjdXJyZW50UHJpdmlsZWdlIjoiU3VwZXIgQWRtaW4iLCJmdWxsTmFtZSI6ImphaSIsImFjdGl2YXRpb25TdGF0dXMiOiJBQ1RJVkUiLCJwcml2aWxlZ2UiOiJTdXBlciBBZG1pbiIsImxpY2Vuc2VOYW1lIjoiRmlyZUZsaW5rIC0gTElDMzk4NSIsInByZWZlcnJlZF91c2VybmFtZSI6ImphaSIsInVzZXJOYW1lIjoiamFpYWthc2hAeW9wbWFpbC5jb20iLCJiaWxsaW5nQ3ljbGUiOiJRdWFydGVybHkiLCJpZCI6IlVTUjI2OTM1IiwibGljZW5zZUlkIjoiTElDMzk4NSIsImVtYWlsIjoiamFpYWthc2hAeW9wbWFpbC5jb20ifQ.u_ZqC8OLDQCPyqd-7Y8iby0ylHJq5MRXzSxQ0fHv8ofWPYEeOW428NKJEnddddqvgGYxY-oYm9QbalDxqt3KGPnrMPfDvD1KyoVEAisZEq6N_DvN5G0OunH5pEMtubfGJVTKRlAE1OZfHETZrfe5vveKBmycJbeR8_nAdhsu3TGovAwkhGHUeeDIvR_5q0i-Rw_XasXn2Vx7T4l05kdPlu_-9a5J4MIRm3fA7IT9LV2wy63-7alnB1btx2Z4nU2yLcSWdr2gWKNz8a_ulPa2aDHZK-0AyEUtn9-WnLPwV5ZEbGcTDxt-ybN2FKnNIKrI8Ka0RGDyfTTYK50xUlNOIQ"
+    token: "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJRUFRfTnFuMkxxdDVmN09tOElWaW53dUJlR3ZVUUVBUkdxZkFuRHJxZU9NIn0.eyJleHAiOjE3NzUxMDczODIsImlhdCI6MTc3NTAyMDk4MiwianRpIjoib25ydHJvOmVkOGU3NzA4LTQ0OGUtNDdhZi05OTU0LWNjMWZkMzNlN2E1OCIsImlzcyI6Imh0dHA6Ly8xMDMuMTgyLjIxMC4yMjY6MzAxMDcvcmVhbG1zL0ZpcmVGbGluay10ZXN0MyIsImF1ZCI6InRhcmdldC1jbGllbnQiLCJzdWIiOiJmOmNhMzBmNDk3LTY1Y2YtNGU4Zi1iZGE3LTE0ZjM1NTNiYzZmNTpqYWlha2FzaEB5b3BtYWlsLmNvbSIsInR5cCI6IkJlYXJlciIsImF6cCI6ImZsaW5rLXNlcnZpY2UiLCJzaWQiOiIxOGExYWFiYy0xYzA5LTQ4YTMtOGJhMi01OThhYTc2MDkyZjYiLCJhY3IiOiIxIiwiYWxsb3dlZC1vcmlnaW5zIjpbIioiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInNjb3BlIjoiZW1haWwgcHJvZmlsZSIsImN1cnJlbnRMaWNlbnNlSWQiOiJMSUMzOTg1IiwiZW1haWxfdmVyaWZpZWQiOmZhbHNlLCJjdXJyZW50UHJpdmlsZWdlIjoiU3VwZXIgQWRtaW4iLCJmdWxsTmFtZSI6ImphaSIsImFjdGl2YXRpb25TdGF0dXMiOiJBQ1RJVkUiLCJwcml2aWxlZ2UiOiJTdXBlciBBZG1pbiIsImxpY2Vuc2VOYW1lIjoiRmlyZUZsaW5rIC0gTElDMzk4NSIsInByZWZlcnJlZF91c2VybmFtZSI6ImphaSIsInVzZXJOYW1lIjoiamFpYWthc2hAeW9wbWFpbC5jb20iLCJiaWxsaW5nQ3ljbGUiOiJRdWFydGVybHkiLCJpZCI6IlVTUjI2OTM1IiwibGljZW5zZUlkIjoiTElDMzk4NSIsImVtYWlsIjoiamFpYWthc2hAeW9wbWFpbC5jb20ifQ.HxaDrSYbsIjz0u0_Kmg3rEy4y4-tFuDWhbWYHllWUQnXD9-yQQEx1u2dE_nzc-wRHkwtKf3nieO1HjQ-rmm0wy7P9vCpSTQg8Z8EY7G1GpxObHdLgqoRe1JvXbMXJu9LSWI80Kt0EgdTEdN93MwfhRTyHNEkdr4X8q0bvbkkYNu9r5PZs-NZnsQaAeHygsx85CSuYfXq43_LgMC6qPVpRS0y0V36hzEJVylwSg2z3xP9znAWHohL_F5gQ9Er8r1t3xUgy6_ob-0t_q7Bha5iaYOq0vl2P51DkT87C7NIzm5TjiiSUWZwIdLBKUKXSWNUG1RX89mrTZyuYyocO1yNng"
 });

package/package.json

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