@dev-blinq/cucumber_client 1.0.1426-dev → 1.0.1426-stage

package/bin/client/recorderv3/update_feature.js

@@ -235,7 +235,7 @@ const GherkinToObject = (gherkin) => {
     skipEmptyLines();
 
     if (idx >= lines.length) {
-      return -1;
+      return scenario;
     }
 
     while (
@@ -292,25 +292,46 @@ const GherkinToObject = (gherkin) => {
 
 // remove lines starting with "Scenario:" or "Scenario Outline:" that contain the scenario name until the next scenario and then append the new scenario content
 // assumes that there are no multiple scenarios with the same name and having comments and tags in each scenario
-function updateExistingScenario({ featureFileContent, scenarioName, scenarioContent }) {
+function updateExistingScenario({
+  featureFileContent,
+  scenarioName: newScenarioName,
+  scenarioContent: newScenarioContent,
+}) {
   const featureFileObject = GherkinToObject(featureFileContent);
   if (featureFileObject.error) return "error";
+
   const results = [];
-  let skipScenarioIndex = -1;
   results.push(`Feature: ${featureFileObject.featureName}`);
+
+  let indexOfScenarioToUpdate = -1;
+
+  for (let i = 0; i < featureFileObject.scenarios.length; i++) {
+    if (featureFileObject.scenarios[i].name === newScenarioName) {
+      indexOfScenarioToUpdate = i;
+      break;
+    }
+  }
+
   for (let i = 0; i < featureFileObject.scenarios.length; i++) {
     const scenario = featureFileObject.scenarios[i];
-    if (scenario.name === scenarioName) {
-      skipScenarioIndex = i;
+
+    if (i === indexOfScenarioToUpdate) {
+      results.push("");
+      results.push(newScenarioContent.trim());
+      results.push("");
       continue;
     }
-    let scenarioContent = `${scenario.hasParams ? "Scenario Outline" : "Scenario"}: ${scenario.name}`;
+
+    let scenarioHeader = `${scenario.hasParams ? "Scenario Outline" : "Scenario"}: ${scenario.name}`;
     let tagsLine;
+
     if (scenario.tags?.length > 0) {
-      tagsLine = `${scenario.tags.map((t) => `@${t}`).join(" ")}`;
+      tagsLine = scenario.tags.map((t) => `@${t}`).join(" ");
     }
+
     if (tagsLine) results.push("\t" + tagsLine);
-    results.push(`\t${scenarioContent}`);
+    results.push(`\t${scenarioHeader}`);
+
     for (const step of scenario.steps) {
       if (step.type === "examples") {
         results.push(`\t\tExamples:`);
@@ -323,12 +344,10 @@ function updateExistingScenario({ featureFileContent, scenarioName, scenarioCont
     }
     results.push("");
   }
-  let finalContent = results.join("\n");
-  if (skipScenarioIndex !== -1) {
-    finalContent = results.join("\n") + "\n" + scenarioContent;
-  }
-  return finalContent;
+
+  return results.join("\n");
 }
+
 export async function updateFeatureFile({ featureName, scenario, override, projectDir }) {
   const featureFilePath = path.join(projectDir, "features", featureName + ".feature");
   const isFeatureFileExists = existsSync(featureFilePath);

package/bin/client/recorderv3/wbr_entry.js

@@ -0,0 +1,61 @@
+import { io } from "socket.io-client";
+import { BVTRecorderInit } from "./bvt_init.js";
+import { loadArgs, showUsage, validateCLIArg } from "../cli_helpers.js";
+const requiredEnvVars = ["PROJECT_ID", "BLINQ_TOKEN", "SESSION_ID", "WORKER_WS_SERVER_URL", "REMOTE_ORIGINS_URL"];
+function validateEnvVariables() {
+    const missingVars = requiredEnvVars.filter((varName) => !process.env[varName]);
+    if (missingVars.length > 0) {
+        throw new Error(`Missing required environment variables: ${missingVars.join(", ")}`);
+    }
+    else {
+        console.log("All required environment variables are set.");
+        requiredEnvVars.forEach((varName) => {
+            console.log(`${varName}: ${process.env[varName]}`);
+        });
+    }
+}
+function getEnvironmentConfig() {
+    const args = loadArgs();
+    const projectDir = args[0] || process.env.PROJECT_ID;
+    const envName = args[1]?.split("=")[1] || process.env.ENV_NAME;
+    const roomId = args[2] || process.env.SESSION_ID;
+    const shouldTakeScreenshot = args[3] || process.env.SHOULD_TAKE_SCREENSHOT;
+    const TOKEN = process.env.BLINQ_TOKEN;
+    try {
+        validateCLIArg(projectDir, "projectDir");
+        validateCLIArg(envName, "envName");
+        validateCLIArg(roomId, "roomId");
+        validateCLIArg(shouldTakeScreenshot, "shouldTakeScreenshot");
+        if (!TOKEN) {
+            throw new Error("BLINQ_TOKEN env variable not set");
+        }
+    }
+    catch (error) {
+        const usage = `Usage: node bvt_recorder.js <projectDir> <envName> <roomId>`;
+        if (error instanceof Error) {
+            showUsage(error, usage);
+        }
+        else {
+            const unknownError = new Error("An unknown error occurred");
+            showUsage(unknownError, usage);
+        }
+    }
+    return { envName, projectDir, roomId, TOKEN };
+}
+function initWebBVTRecorder() {
+    const socket = io(process.env.WORKER_WS_SERVER_URL, {
+        path: "/ws",
+        transports: ["websocket", "polling"],
+        reconnection: true,
+    });
+    validateEnvVariables();
+    const { envName, projectDir, roomId, TOKEN } = getEnvironmentConfig();
+    BVTRecorderInit({
+        envName: envName,
+        projectDir,
+        roomId,
+        TOKEN,
+        socket: socket,
+    });
+}
+initWebBVTRecorder();

package/bin/client/recording.js

@@ -53,6 +53,7 @@ const Types = {
   SET_INPUT_FILES: "set_input_files",
   VERIFY_PAGE_SNAPSHOT: "verify_page_snapshot",
   CONDITIONAL_WAIT: "conditional_wait",
+  SLEEP: "sleep",
 };
 class Recording {
   steps = [];

package/bin/client/upload-service.js

@@ -12,6 +12,7 @@ class ScenarioUploadService {
       this.runsApiBaseURL + "/scenarios/create",
       {
         name,
+        branch: process.env.GIT_BRANCH ? process.env.GIT_BRANCH : "main",
       },
       {
         headers: {
@@ -37,7 +38,7 @@ class ScenarioUploadService {
       },
     });
 
-    if(response.status === 401) {
+    if (response.status === 401) {
       throw new Error("Your trial plan has ended. Cannot upload reports and perform retraining");
     }
 
@@ -63,7 +64,7 @@ class ScenarioUploadService {
       }
     );
 
-    if(response.status === 403) {
+    if (response.status === 403) {
       throw new Error("Your trial plan has ended. Cannot upload reports and perform retraining");
     }
 
@@ -107,6 +108,7 @@ class ScenarioUploadService {
       {
         scenarioId,
         projectId,
+        testcase_id: process.env.TESTCASE_ID,
       },
       {
         headers: {

package/bin/client/utils/socket_logger.js

@@ -73,7 +73,7 @@ const SocketLogger = (function () {
       {
         level: level,
         context: context || defaultContext,
-        data: data,
+        data: JSON.stringify(data),
         timestamp: new Date().toISOString(),
         dataSize: dataSize,
       },

package/bin/index.js

@@ -1,4 +1,5 @@
 export * from "./client/code_gen/page_reflection.js";
+
 export * from "./client/code_gen/playwright_codeget.js";
 export * from "./client/cucumber/feature.js";
 export * from "./client/cucumber/project_to_document.js";
@@ -13,5 +14,7 @@ export * from "./client/cucumber/feature_data.js";
 export * from "./client/cucumber/steps_definitions.js";
 export * from "./client/profiler.js";
 export * from "./client/code_cleanup/utils.js";
-
 export * from "./client/code_cleanup/find_step_definition_references.js";
+export * from "./client/recorderv3/step_utils.js";
+export * from "./client/recorderv3/update_feature.js";
+export * from "./client/recorderv3/bvt_init.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev-blinq/cucumber_client",
-  "version": "1.0.1426-dev",
+  "version": "1.0.1426-stage",
   "description": " ",
   "main": "bin/index.js",
   "types": "bin/index.d.ts",
@@ -37,9 +37,9 @@
     "@babel/traverse": "^7.27.1",
     "@babel/types": "^7.27.1",
     "@cucumber/tag-expressions": "^6.1.1",
-    "@dev-blinq/cucumber-js": "1.0.184-dev",
-    "@faker-js/faker": "^8.1.0",
-    "automation_model": "1.0.826-dev",
+    "@dev-blinq/cucumber-js": "1.0.120-stage",
+    "@faker-js/faker": "^8.4.1",
+    "automation_model": "1.0.793-stage",
     "axios": "^1.7.4",
     "chokidar": "^3.6.0",
     "create-require": "^1.1.1",
@@ -57,6 +57,7 @@
     "pureimage": "0.4.9",
     "socket.io": "^4.7.5",
     "socket.io-client": "^4.7.5",
+    "strip-comments": "^2.0.1",
     "tunnel": "^0.0.6",
     "unzipper": "^0.12.3",
     "win-ca": "^3.5.1",
@@ -74,6 +75,7 @@
     "mocha": "^10.2.0",
     "ncp": "^2.0.0",
     "readline-sync": "^1.4.10",
+    "ts-node": "^10.9.2",
     "tsup": "^8.5.0",
     "typescript": "^5.9.2"
   }