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

package/bin/client/recorderv3/step_runner.js

@@ -14,6 +14,7 @@ import { escapeString, getExamplesContent } from "./update_feature.js";
 import fs from "fs";
 import { locateDefinitionPath } from "../cucumber/steps_definitions.js";
 import { tmpdir } from "os";
+import socketLogger from "../utils/socket_logger.js";
 
 export class BVTStepRunner {
   #currentStepController = null;
@@ -44,7 +45,10 @@ export class BVTStepRunner {
 
   async pauseExecution(cmdId) {
     if (this.bvtContext.web) {
-      this.bvtContext.web.pausedCmd = this.liveExecutionMap.get(cmdId);
+      this.bvtContext.web.pausedCmd = {
+        id: cmdId,
+        ...this.liveExecutionMap.get(cmdId),
+      };
     }
   }
 
@@ -56,6 +60,7 @@ export class BVTStepRunner {
       }
       this.bvtContext.web.pausedCmd = null;
     } else {
+      socketLogger.warn(`bvtContext.web.pausedCmd is null`);
       if (this.liveExecutionMap.has(cmdId)) {
         const { resolve } = this.liveExecutionMap.get(cmdId);
         if (resolve) {
@@ -63,6 +68,7 @@ export class BVTStepRunner {
         }
       } else {
         console.warn(`No paused command found for cmdId: ${cmdId}`);
+        socketLogger.error(`No paused command found for cmdId: ${cmdId}`);
       }
     }
   }
@@ -210,6 +216,7 @@ export class BVTStepRunner {
             this.sendExecutionStatus({
               type: "cmdExecutionSuccess",
               cmdId: body.cmdId,
+              info,
               selectedStrategy: info?.selectedStrategy,
             });
           } else {
@@ -250,7 +257,7 @@ export class BVTStepRunner {
 
     try {
       this.#lastAttemptedCmdId = null;
-      let cmdIDs = (step.commands || []).map((cmd) => cmd.cmdId);
+      let cmdIDs = (step.commands || []).map((cmd) => cmd.cmdId ?? cmd.id);
       bvtContext.web.pausedCmd = null;
 
       // Clear the liveExecutionMap and set up new entries for this step
@@ -258,15 +265,29 @@ export class BVTStepRunner {
 
       for (const cmdId of cmdIDs) {
         this.liveExecutionMap.set(cmdId, {
-          resolve: () => { },
-          reject: () => { },
+          resolve: () => {},
+          reject: () => {},
         });
       }
 
       if (bvtContext.web) {
         bvtContext.web.getCmdId = () => {
           if (cmdIDs.length === 0) {
-            cmdIDs = (step.commands || []).map((cmd) => cmd.cmdId);
+            cmdIDs = (step.commands || []).map((cmd) => cmd.cmdId ?? cmd.id);
+          }
+          const cId = cmdIDs.shift();
+          this.sendExecutionStatus({
+            type: "cmdExecutionStart",
+            cmdId: cId,
+          });
+          this.#lastAttemptedCmdId = cId;
+          return cId;
+        };
+      }
+      if (bvtContext.api) {
+        bvtContext.api.getCmdId = () => {
+          if (cmdIDs.length === 0) {
+            cmdIDs = (step.commands || []).map((cmd) => cmd.cmdId ?? cmd.id);
           }
           const cId = cmdIDs.shift();
           this.sendExecutionStatus({
@@ -313,6 +334,7 @@ export class BVTStepRunner {
           codePage,
           projectDir: this.projectDir,
           stepsDefinitions,
+          parametersMap,
         });
         if (codePage) {
           await codePage.save(stepDefsFilePath);
@@ -373,13 +395,17 @@ export class BVTStepRunner {
       this.#currentStepController = null;
       global.__BVT_STEP_ABORT_SIGNAL = null;
 
-      // Clean up temp folder
-      const __temp_features_FolderName = process.env.tempFeaturesFolderPath;
-      if (__temp_features_FolderName) {
-        const tempFolderPath = path.join(this.projectDir, __temp_features_FolderName);
-        if (fs.existsSync(tempFolderPath)) {
-          fs.rmSync(tempFolderPath, { recursive: true });
+      try {
+        // Clean up temp folder
+        const __temp_features_FolderName = process.env.tempFeaturesFolderPath;
+        if (__temp_features_FolderName) {
+          const tempFolderPath = path.join(this.projectDir, __temp_features_FolderName);
+          if (fs.existsSync(tempFolderPath)) {
+            fs.rmSync(tempFolderPath, { recursive: true });
+          }
         }
+      } catch (error) {
+        console.error("Error cleaning up temp folder", error);
       }
     }
   }