ff-automationv2 2.2.16 → 2.2.18

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

@@ -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/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

@@ -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/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

@@ -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/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.16",
+  "version": "2.2.18",
   "private": false,
   "type": "module",
   "description": "This lib is used to automate the manual testcase",

package/dist/tests/test12.d.ts

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

package/dist/tests/test12.js

@@ -1,74 +0,0 @@
-import { AutomationRunner } from "../index.js";
-import path from "path";
-const runner = new AutomationRunner();
-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: "test3",
-    // topic: "",
-    // serviceAccounts: "",
-    webSocketId: "",
-    generatedBy: "",
-    licenseType: "C-Professional",
-    licenseId: "LIC3985",
-    userId: "USR26935",
-    projectType: "Web",
-    browser: {
-        browserName: "chrome",
-    },
-    serverData: "https://test3.fireflink.com",
-    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: "",
-    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.eyJleHAiOjE3NzUwNDMwMjcsImlhdCI6MTc3NDk1NjYyNywianRpIjoib25ydHJvOjk5MjQwN2U3LWU2ZWQtNDUwMS05NDhhLTA2YmQyMGIwZmNhZSIsImlzcyI6Imh0dHA6Ly8xMDMuMTgyLjIxMC4yMjY6MzAxMDcvcmVhbG1zL0ZpcmVGbGluay10ZXN0MyIsImF1ZCI6InRhcmdldC1jbGllbnQiLCJzdWIiOiJmOmNhMzBmNDk3LTY1Y2YtNGU4Zi1iZGE3LTE0ZjM1NTNiYzZmNTpqYWlha2FzaEB5b3BtYWlsLmNvbSIsInR5cCI6IkJlYXJlciIsImF6cCI6ImZsaW5rLXNlcnZpY2UiLCJzaWQiOiI1NGVlNDQ0YS0zMzdkLTQwNjMtYjhlZC0yOWI2ZTFmZjBhN2YiLCJhY3IiOiIxIiwiYWxsb3dlZC1vcmlnaW5zIjpbIioiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInNjb3BlIjoiZW1haWwgcHJvZmlsZSIsImN1cnJlbnRMaWNlbnNlSWQiOiJMSUMzOTg1IiwiZW1haWxfdmVyaWZpZWQiOmZhbHNlLCJjdXJyZW50UHJpdmlsZWdlIjoiU3VwZXIgQWRtaW4iLCJmdWxsTmFtZSI6ImphaSIsImFjdGl2YXRpb25TdGF0dXMiOiJBQ1RJVkUiLCJwcml2aWxlZ2UiOiJTdXBlciBBZG1pbiIsImxpY2Vuc2VOYW1lIjoiRmlyZUZsaW5rIC0gTElDMzk4NSIsInByZWZlcnJlZF91c2VybmFtZSI6ImphaSIsInVzZXJOYW1lIjoiamFpYWthc2hAeW9wbWFpbC5jb20iLCJiaWxsaW5nQ3ljbGUiOiJRdWFydGVybHkiLCJpZCI6IlVTUjI2OTM1IiwibGljZW5zZUlkIjoiTElDMzk4NSIsImVtYWlsIjoiamFpYWthc2hAeW9wbWFpbC5jb20ifQ.u_ZqC8OLDQCPyqd-7Y8iby0ylHJq5MRXzSxQ0fHv8ofWPYEeOW428NKJEnddddqvgGYxY-oYm9QbalDxqt3KGPnrMPfDvD1KyoVEAisZEq6N_DvN5G0OunH5pEMtubfGJVTKRlAE1OZfHETZrfe5vveKBmycJbeR8_nAdhsu3TGovAwkhGHUeeDIvR_5q0i-Rw_XasXn2Vx7T4l05kdPlu_-9a5J4MIRm3fA7IT9LV2wy63-7alnB1btx2Z4nU2yLcSWdr2gWKNz8a_ulPa2aDHZK-0AyEUtn9-WnLPwV5ZEbGcTDxt-ybN2FKnNIKrI8Ka0RGDyfTTYK50xUlNOIQ"
-});