@dev-blinq/cucumber_client 1.0.1580-dev → 1.0.1582-dev

package/bin/client/code_gen/playwright_codeget.js

@@ -5,6 +5,8 @@ import path from "path";
 import { CodePage } from "./page_reflection.js";
 import { convertToIdentifier, escapeNonPrintables } from "./utils.js";
 import socketLogger from "../utils/socket_logger.js";
+import fs from "fs";
+
 const findElementIdentifier = (node, step, userData, elements) => {
   if (node.key) {
     // incase of rerunning implemented steps
@@ -366,7 +368,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       codeLines.push(line);
       break;
     }
-    case Types.VERIFY_PAGE_SNAPSHOT:
+    case Types.VERIFY_PAGE_SNAPSHOT: {
       comment = step.nestFrmLoc
         ? `// Verify page snapshot ${step.parameters[0]} in the frame ${step.selectors.iframe_src}`
         : `// Verify page snapshot ${step.parameters[0]}`;
@@ -375,7 +377,24 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       codeLines.push(line);
       line = `await context.web.snapshotValidation(frameLocator, _param_0 , _params, ${JSON.stringify(options)}, this);`;
       codeLines.push(line);
+
+      const data = step.data;
+      if (data) {
+        try {
+          const { snapshot, fileName, filePath } = data;
+          const folderPath = process.env.BVT_TEMP_SNAPSHOTS_FOLDER ?? filePath;
+          const filePathWithName = path.join(folderPath, fileName);
+          if (!fs.existsSync(folderPath)) {
+            fs.mkdirSync(folderPath, { recursive: true });
+          }
+          fs.writeFileSync(filePathWithName, snapshot, "utf-8");
+        } catch (e) {
+          console.log(`Error saving snapshot file: ${e}`);
+          throw e;
+        }
+      }
       break;
+    }
     case Types.VERIFY_PAGE_CONTAINS_TEXT:
       line = "await context.web.verifyTextExistInPage( ";
       input = `${escapeNonPrintables(JSON.stringify(step.parameters[0]))}`;

package/bin/client/recorderv3/bvt_recorder.js

@@ -4,7 +4,7 @@ import { existsSync, readdirSync, readFileSync, rmSync } from "fs";
 import path from "path";
 import url from "url";
 import { getImplementedSteps, parseRouteFiles } from "./implemented_steps.js";
-import { NamesService, RemoteBrowserService } from "./services.js";
+import { NamesService, RemoteBrowserService, PublishService } from "./services.js";
 import { BVTStepRunner } from "./step_runner.js";
 import { readFile, writeFile } from "fs/promises";
 import { updateStepDefinitions, loadStepDefinitions, getCommandsForImplementedStep } from "./step_utils.js";
@@ -197,12 +197,17 @@ export class BVTRecorder {
       projectDir: this.projectDir,
       logger: this.logger,
     });
+    this.workspaceService = new PublishService(this.TOKEN);
     this.pageSet = new Set();
     this.lastKnownUrlPath = "";
     this.world = { attach: () => {} };
     this.shouldTakeScreenshot = true;
     this.watcher = null;
     this.networkEventsFolder = path.join(tmpdir(), "blinq_network_events");
+
+    this.tempProjectFolder = `${tmpdir()}/bvt_temp_project_${Math.floor(Math.random() * 1000000)}`;
+    this.tempSnapshotsFolder = path.join(this.tempProjectFolder, "data/snapshots");
+
     if (existsSync(this.networkEventsFolder)) {
       rmSync(this.networkEventsFolder, { recursive: true, force: true });
     }
@@ -676,7 +681,7 @@ export class BVTRecorder {
         context: this.context,
       });
       this.browserEmitter.on(this.events.browserStateSync, (state) => {
-        this.page = this.browserEmitter.getSelectedPage();
+        // this.page = this.browserEmitter.getSelectedPage();
         this.sendEvent(this.events.browserStateSync, state);
       });
     }
@@ -755,7 +760,7 @@ export class BVTRecorder {
       [id, contextId, mode]
     );
 
-    console.log(`Generated locators: for ${inputID}: `, JSON.stringify(locatorsObj));
+    // console.log(`Generated locators: for ${inputID}: `, JSON.stringify(locatorsObj));
     await newPage.close();
     if (event.nestFrmLoc?.children) {
       locatorsObj.nestFrmLoc = event.nestFrmLoc.children;
@@ -926,6 +931,7 @@ export class BVTRecorder {
       REPORT_FOLDER: this.bvtContext.reportFolder,
       BLINQ_ENV: this.envName,
       DEBUG: "blinq:route",
+      BVT_TEMP_SNAPSHOTS_FOLDER: this.tempSnapshotsFolder,
     };
 
     this.bvtContext.navigate = true;
@@ -972,10 +978,23 @@ export class BVTRecorder {
       this.bvtContext.navigate = false;
     }
   }
-  async saveScenario({ scenario, featureName, override, isSingleStep }) {
-    await updateStepDefinitions({ scenario, featureName, projectDir: this.projectDir }); // updates mjs files
-    if (!isSingleStep) await updateFeatureFile({ featureName, scenario, override, projectDir: this.projectDir }); // updates gherkin files
-    await this.cleanup({ tags: scenario.tags });
+  async saveScenario({ scenario, featureName, override, isSingleStep, branch, isEditing }) {
+    // await updateStepDefinitions({ scenario, featureName, projectDir: this.projectDir }); // updates mjs files
+    // if (!isSingleStep) await updateFeatureFile({ featureName, scenario, override, projectDir: this.projectDir }); // updates gherkin files
+    const res = await this.workspaceService.saveScenario({
+      scenario,
+      featureName,
+      override,
+      isSingleStep,
+      branch,
+      isEditing,
+      projectId: path.basename(this.projectDir),
+    });
+    if (res.success) {
+      await this.cleanup({ tags: scenario.tags });
+    } else {
+      throw new Error(res.message || "Error saving scenario");
+    }
   }
   async getImplementedSteps() {
     const stepsAndScenarios = await getImplementedSteps(this.projectDir);

package/bin/client/recorderv3/services.js

@@ -147,6 +147,69 @@ export class NamesService {
         return result.data;
     }
 }
+export class PublishService {
+    TOKEN;
+    constructor(TOKEN) {
+        this.TOKEN = TOKEN;
+    }
+    async saveScenario({ scenario, featureName, override, branch, isEditing, projectId }) {
+        const url = path.join(`${getRunsServiceBaseURL()}`, "..", "workspace/publish-recording");
+        const result = await axiosClient({
+            url,
+            method: "POST",
+            data: {
+                scenario,
+                featureName,
+                override,
+            },
+            params: {
+                branch,
+            },
+            headers: {
+                Authorization: `Bearer ${this.TOKEN}`,
+                "X-Source": "recorder",
+            },
+        });
+        if (result.status !== 200) {
+            return { success: false, message: "Error while saving scenario" };
+        }
+        try {
+            this.updateProjectMetadata({
+                featureName,
+                scenarioName: scenario.name,
+                projectId,
+                branch,
+                isEditing: override,
+            });
+        }
+        catch (error) { }
+        return { success: true, data: result.data };
+    }
+    async updateProjectMetadata({ featureName, scenarioName, projectId, branch, isEditing }) {
+        try {
+            await axiosClient({
+                method: "POST",
+                url: `${getRunsServiceBaseURL()}/project/updateProjectMetadata`,
+                data: {
+                    featureName,
+                    scenarioName,
+                    eventType: isEditing ? "editScenario" : "createScenario",
+                    projectId,
+                    branch: branch,
+                },
+                headers: {
+                    Authorization: `Bearer ${this.TOKEN}`,
+                    "X-Source": "recorder",
+                },
+            });
+        }
+        catch (error) {
+            // logger.error("Failed to update project metadata: " + error.message);
+            // @ts-ignore
+            console.error("run_recorder", `Failed to update project metadata: ${error.message ?? error}`);
+        }
+    }
+}
 export class RemoteBrowserService extends EventEmitter {
     CDP_CONNECT_URL;
     context;
@@ -190,6 +253,7 @@ export class RemoteBrowserService extends EventEmitter {
                 this.pages.set(id, page);
             }
             page.on("framenavigated", async () => {
+                await new Promise((resolve) => setTimeout(resolve, 1000)); // wait for a bit
                 await this.syncState();
             });
         }

package/bin/client/recorderv3/step_utils.js

@@ -296,6 +296,7 @@ const _toRecordingStep = (cmd) => {
         type: "verify_page_snapshot",
         parameters: [cmd.value],
         selectors: cmd.selectors,
+        data: cmd.data,
       };
     }
     default: {

package/bin/client/utils/socket_logger.js

@@ -38,7 +38,7 @@ export class SocketLogger {
         const eventPayload = {
             level,
             context: context || this.defaultContext,
-            data,
+            data: JSON.stringify(data),
             timestamp: new Date().toISOString(),
             dataSize,
             ...extra,

package/package.json

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