@dev-blinq/cucumber_client 1.0.1516-dev → 1.0.1517-dev

package/bin/client/recorderv3/services.js

@@ -2,150 +2,209 @@ import { readdirSync, readFileSync } from "fs";
 import { getRunsServiceBaseURL } from "../utils/index.js";
 import { axiosClient } from "../utils/axiosClient.js";
 import path from "path";
-
+import { EventEmitter } from "events";
+import socketLogger from "../utils/socket_logger.js";
 export class NamesService {
-  constructor({ screenshotMap, TOKEN, projectDir, logger }) {
-    this.screenshotMap = screenshotMap;
-    this.TOKEN = TOKEN;
-    this.projectDir = projectDir;
-    this.logger = logger;
-  }
-  async generateStepName({ commands, stepsNames, parameters, map }) {
-    let screenshot = this.screenshotMap.get(commands[commands.length - 1].inputID);
-    if (!screenshot && commands.length > 1) {
-      screenshot = this.screenshotMap.get(commands[commands.length - 2].inputID);
+    screenshotMap;
+    TOKEN;
+    projectDir;
+    logger;
+    constructor({ screenshotMap, TOKEN, projectDir, logger }) {
+        this.screenshotMap = screenshotMap;
+        this.TOKEN = TOKEN;
+        this.projectDir = projectDir;
+        this.logger = logger;
     }
-
-    const url = `${getRunsServiceBaseURL()}/generate-step-information/generate`;
-    const TIMEOUT = 120; // 2 minutes
-    const { data } = await axiosClient({
-      url,
-      method: "POST",
-      data: {
-        commands,
-        stepsNames,
-        parameters,
-        //screenshot,
-        map,
-      },
-      headers: {
-        Authorization: `Bearer ${this.TOKEN}`,
-        "X-Source": "recorder",
-      },
-    });
-    const actionUrl = `${getRunsServiceBaseURL()}/action/get-action?id=${data.id}`;
-    let result = { status: 500 };
-    for (let i = 0; i < TIMEOUT; i++) {
-      try {
-        const action = await axiosClient({
-          url: actionUrl,
-          method: "GET",
-          headers: {
-            Authorization: `Bearer ${this.TOKEN}`,
-            "X-Source": "recorder",
-          },
+    //@ts-expect-error
+    async generateStepName({ commands, stepsNames, parameters, map }) {
+        let screenshot = this.screenshotMap.get(commands[commands.length - 1].inputID);
+        if (!screenshot && commands.length > 1) {
+            screenshot = this.screenshotMap.get(commands[commands.length - 2].inputID);
+        }
+        const url = `${getRunsServiceBaseURL()}/generate-step-information/generate`;
+        const TIMEOUT = 120; // 2 minutes
+        const { data } = await axiosClient({
+            url,
+            method: "POST",
+            data: {
+                commands,
+                stepsNames,
+                parameters,
+                //screenshot,
+                map,
+            },
+            headers: {
+                Authorization: `Bearer ${this.TOKEN}`,
+                "X-Source": "recorder",
+            },
         });
-
-        if (action.data.status) {
-          result = action;
-          break;
+        const actionUrl = `${getRunsServiceBaseURL()}/action/get-action?id=${data.id}`;
+        let result = { status: 500 };
+        for (let i = 0; i < TIMEOUT; i++) {
+            try {
+                const action = await axiosClient({
+                    url: actionUrl,
+                    method: "GET",
+                    headers: {
+                        Authorization: `Bearer ${this.TOKEN}`,
+                        "X-Source": "recorder",
+                    },
+                });
+                if (action.data.status) {
+                    result = action;
+                    break;
+                }
+            }
+            catch (error) {
+                if (i === TIMEOUT - 1) {
+                    this.logger.error("Timeout while generating step details: ", error instanceof Error ? error.message : JSON.stringify(error));
+                    console.error("Timeout while generating step details: ", error instanceof Error ? error.message : error);
+                }
+            }
+            await new Promise((resolve) => setTimeout(resolve, 1000));
         }
-      } catch (error) {
-        if (i === TIMEOUT - 1) {
-          this.logger.error("Timeout while generating step details: ", error);
-          console.error("Timeout while generating step details: ", error);
+        if (result.status !== 200) {
+            return { success: false, message: "Error while generating step details" };
         }
-      }
-
-      await new Promise((resolve) => setTimeout(resolve, 1000));
+        return result.data;
     }
-
-    if (result.status !== 200) {
-      return { success: false, message: "Error while generating step details" };
+    async generateScenarioAndFeatureNames(scenarioAsText) {
+        if (!this.projectDir) {
+            throw new Error("Project directory not found");
+        }
+        // read all files with .feature extension into an object {files:[{name: "", content: ""}]}
+        const featureFiles = readdirSync(path.join(this.projectDir, "features"));
+        const featureFilesContent = featureFiles
+            .filter((file) => file.endsWith(".feature"))
+            .map((file) => {
+            return {
+                name: file,
+                content: readFileSync(path.join(this.projectDir, "features", file), "utf8"),
+            };
+        });
+        const genObject = {
+            files: featureFilesContent,
+            scenario: scenarioAsText,
+        };
+        // get screenshot for the last command
+        const url = `${getRunsServiceBaseURL()}/generate-step-information/generate_scenario_feature`;
+        const TIMEOUT = 120; // 2 minutes
+        const { data } = await axiosClient({
+            url,
+            method: "POST",
+            data: {
+                ...genObject,
+            },
+            headers: {
+                Authorization: `Bearer ${this.TOKEN}`,
+                "X-Source": "recorder",
+            },
+        });
+        const actionUrl = `${getRunsServiceBaseURL()}/action/get-action?id=${data.id}`;
+        let result = { status: 500 };
+        for (let i = 0; i < TIMEOUT; i++) {
+            try {
+                const action = await axiosClient({
+                    url: actionUrl,
+                    method: "GET",
+                    headers: {
+                        Authorization: `Bearer ${this.TOKEN}`,
+                        "X-Source": "recorder",
+                    },
+                });
+                if (action.data.status) {
+                    result = action;
+                    break;
+                }
+            }
+            catch (error) {
+                if (i === TIMEOUT - 1) {
+                    console.error("Timeout while generating step details: ", error);
+                }
+            }
+            await new Promise((resolve) => setTimeout(resolve, 1000));
+        }
+        if (result.status !== 200) {
+            return { success: false, message: "Error while generating step details" };
+        }
+        return result.data;
     }
-    return result.data;
-  }
-  async generateScenarioAndFeatureNames(scenarioAsText) {
-    if (!this.projectDir) {
-      throw new Error("Project directory not found");
+    //@ts-expect-error
+    async generateCommandName({ command }) {
+        const url = `${getRunsServiceBaseURL()}/generate-step-information/generate-element-name`;
+        const screenshot = this.screenshotMap.get(command.inputID);
+        const result = await axiosClient({
+            url,
+            method: "POST",
+            data: { ...command, screenshot },
+            headers: {
+                Authorization: `Bearer ${this.TOKEN}`,
+                "X-Source": "recorder",
+            },
+        });
+        if (result.status !== 200) {
+            return { success: false, message: "Error while generating command details" };
+        }
+        return result.data;
     }
-    // read all files with .feature extension into an object {files:[{name: "", content: ""}]}
-    const featureFiles = readdirSync(path.join(this.projectDir, "features"));
-    const featureFilesContent = featureFiles
-      .filter((file) => file.endsWith(".feature"))
-      .map((file) => {
-        return {
-          name: file,
-          content: readFileSync(path.join(this.projectDir, "features", file), "utf8"),
-        };
-      });
-    const genObject = {
-      files: featureFilesContent,
-      scenario: scenarioAsText,
-    };
-
-    // get screenshot for the last command
-    const url = `${getRunsServiceBaseURL()}/generate-step-information/generate_scenario_feature`;
-    const TIMEOUT = 120; // 2 minutes
-    const { data } = await axiosClient({
-      url,
-      method: "POST",
-      data: {
-        ...genObject,
-      },
-      headers: {
-        Authorization: `Bearer ${this.TOKEN}`,
-        "X-Source": "recorder",
-      },
-    });
-    const actionUrl = `${getRunsServiceBaseURL()}/action/get-action?id=${data.id}`;
-    let result = { status: 500 };
-    for (let i = 0; i < TIMEOUT; i++) {
-      try {
-        const action = await axiosClient({
-          url: actionUrl,
-          method: "GET",
-          headers: {
-            Authorization: `Bearer ${this.TOKEN}`,
-            "X-Source": "recorder",
-          },
+}
+export class RemoteBrowserService extends EventEmitter {
+    CDP_CONNECT_URL;
+    pageMap = new Map();
+    _selectedPage;
+    logger = socketLogger;
+    constructor({ CDP_CONNECT_URL, currentPage }) {
+        super();
+        this.CDP_CONNECT_URL = CDP_CONNECT_URL;
+        this._selectedPage = currentPage;
+        this.getDebugURLs()
+            .then((debugData) => {
+            debugData.forEach((page) => {
+                if (page.type === "page") {
+                    this.pageMap.set(page.url, page.id);
+                }
+            });
+        })
+            .catch((error) => {
+            this.logger.error("Error fetching debug URLs: ", error instanceof Error ? error.message : error);
         });
-
-        if (action.data.status) {
-          result = action;
-          break;
+    }
+    set selectedPage(page) {
+        this._selectedPage = page;
+        const pageUrl = page.url();
+        const pageEntry = this.pageMap.get(pageUrl);
+        if (!pageEntry) {
+            this.getDebugURLs()
+                .then((debugData) => {
+                console.log("Fetched debug data: ", debugData);
+                debugData.forEach((page) => {
+                    this.pageMap.set(page.url, page.id);
+                });
+                const url = this.pageMap.get(pageUrl);
+                this.emit("debugURLChange", url);
+            })
+                .catch((error) => {
+                this.logger.error("Error fetching debug URLs: ", error instanceof Error ? error.message : JSON.stringify(error));
+            });
         }
-      } catch (error) {
-        if (i === TIMEOUT - 1) {
-          console.error("Timeout while generating step details: ", error);
+        else {
+            const url = this.pageMap.get(pageUrl);
+            this.emit("debugURLChange", url);
         }
-      }
-
-      await new Promise((resolve) => setTimeout(resolve, 1000));
     }
-
-    if (result.status !== 200) {
-      return { success: false, message: "Error while generating step details" };
+    get selectedPage() {
+        return this._selectedPage;
     }
-
-    return result.data;
-  }
-
-  async generateCommandName({ command }) {
-    const url = `${getRunsServiceBaseURL()}/generate-step-information/generate-element-name`;
-    const screenshot = this.screenshotMap.get(command.inputID);
-    const result = await axiosClient({
-      url,
-      method: "POST",
-      data: { ...command, screenshot },
-      headers: {
-        Authorization: `Bearer ${this.TOKEN}`,
-        "X-Source": "recorder",
-      },
-    });
-    if (result.status !== 200) {
-      return { success: false, message: "Error while generating command details" };
+    async getDebugURLs() {
+        const url = `${this.CDP_CONNECT_URL}/json`;
+        const response = await axiosClient({
+            url,
+            method: "GET",
+        });
+        if (response.status !== 200) {
+            throw new Error("Error while fetching debug URL");
+            return [];
+        }
+        return response.data;
     }
-    return result.data;
-  }
 }

package/bin/client/recorderv3/step_utils.js

@@ -337,7 +337,7 @@ const parameterizeLocators = ({ cmd, locs, isValueVariable, isTargetValueVariabl
     const variable = cmd.value.slice(1, -1);
     // const val = parametersMap[variable];
     if (typeof cmd.text === "string") {
-      const replacementFromValue = cmd.text.trim().replace(/\s+/, " ") ?? "" // val.trim();
+      const replacementFromValue = cmd.text.trim().replace(/\s+/, " ") ?? ""; // val.trim();
       if (replacementFromValue.length > 0) {
         const replacementToValue = `{${variable}}`;
         locs = _parameterizeLocators(locs, replacementFromValue, replacementToValue);
@@ -348,7 +348,7 @@ const parameterizeLocators = ({ cmd, locs, isValueVariable, isTargetValueVariabl
     const variable = cmd.targetValue.slice(1, -1);
     // const val = parametersMap[variable];
     if (typeof cmd.targetText === "string") {
-      const replacementFromValue = cmd.targetText.trim().replace(/\s+/, " ") ?? "" // val.trim();
+      const replacementFromValue = cmd.targetText.trim().replace(/\s+/, " ") ?? ""; // val.trim();
       if (replacementFromValue.length > 0) {
         const replacementToValue = `{${variable}}`;
         locs = _parameterizeLocators(locs, replacementFromValue, replacementToValue);

package/bin/client/utils/axiosClient.js

@@ -1,37 +1,35 @@
 import axios from "axios";
 import tunnel from "tunnel";
-
 const getProxy = () => {
-  if (!process.env.PROXY) {
-    return null;
-  }
-
-  const proxy = process.env.PROXY;
-  const url = new URL(proxy);
-  const proxyObject = {
-    host: url.hostname,
-    port: Number(url.port),
-  };
-
-  const { username, password } = url;
-
-  if (username && password) {
-    proxyObject.proxyAuth = `${username}:${password}`;
-  }
-  return tunnel.httpsOverHttp({ proxy: proxyObject });
+    if (!process.env.PROXY) {
+        return null;
+    }
+    const proxy = process.env.PROXY;
+    const url = new URL(proxy);
+    const proxyObject = {
+        host: url.hostname,
+        port: Number(url.port),
+    };
+    const { username, password } = url;
+    if (username && password) {
+        proxyObject.proxyAuth = `${username}:${password}`;
+    }
+    return tunnel.httpsOverHttp({ proxy: proxyObject });
 };
-
 const createAxiosClient = () => {
-  try {
-    const agent = getProxy();
-    return axios.create({
-      httpsAgent: agent,
-      proxy: false,
-    });
-  } catch (error) {
-    console.log(error.message);
-    throw new Error(`Error creating axios client ${error instanceof Error ? error.message : error.response.data}`);
-  }
+    try {
+        const agent = getProxy();
+        return axios.create({
+            httpsAgent: agent,
+            proxy: false,
+        });
+    }
+    catch (error) {
+        if (error instanceof Error) {
+            console.log(error.message);
+        }
+        //@ts-expect-error
+        throw new Error(`Error creating axios client ${error instanceof Error ? error.message : error?.response?.data}`);
+    }
 };
-
 export const axiosClient = createAxiosClient();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev-blinq/cucumber_client",
-  "version": "1.0.1516-dev",
+  "version": "1.0.1517-dev",
   "description": " ",
   "main": "bin/index.js",
   "types": "bin/index.d.ts",