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

package/bin/client/recorderv3/index.js

@@ -4,10 +4,23 @@ import { BVTRecorder } from "./bvt_recorder.js";
 import { compareWithScenario } from "../code_gen/duplication_analysis.js";
 import { getAppDataDir } from "./app_dir.js";
 import { readdir } from "fs/promises";
+import socketLogger from "../utils/socket_logger.js";
 
 let port = process.env.EDITOR_PORT || 3003;
 const WS_URL = "http://localhost:" + port;
 
+const responseSize = (response) => {
+  try {
+    if (typeof response !== "string") {
+      return new Blob([JSON.stringify(response)]).size;
+    } else {
+      return new Blob([response]).size;
+    }
+  } catch {
+    return -1;
+  }
+};
+
 class PromisifiedSocketServer {
   constructor(socket, routes) {
     this.socket = socket;
@@ -16,7 +29,9 @@ class PromisifiedSocketServer {
   init() {
     this.socket.on("request", async (data) => {
       const { event, input, id, roomId, socketId } = data;
-      // console.log("request", { event, input, id, roomId, socketId });
+      if (event !== "recorderWindow.getCurrentChromiumPath") {
+        socketLogger.info("Received request", { event, input, id, roomId, socketId });
+      }
       try {
         const handler = this.routes[event];
         if (!handler) {
@@ -24,17 +39,19 @@ class PromisifiedSocketServer {
           return;
         }
         const response = await handler(input);
-        // console.log("response", { id, value: response, roomId, socketId });
+        if (event !== "recorderWindow.getCurrentChromiumPath") {
+          socketLogger.info(`Sending response for ${event}, ${responseSize(response)} bytes`);
+        }
         this.socket.emit("response", { id, value: response, roomId, socketId });
       } catch (error) {
-        console.log("request", JSON.stringify({ event, input, id, roomId, socketId }));
-        console.error("response", { id, error, roomId, socketId });
-        // console.error({
-        //   message: error?.message,
-        //   code: error?.code,
-        //   info: error?.info,
-        //   stack: error?.stack,
-        // })
+        socketLogger.error("Error handling request", {
+          event,
+          input,
+          id,
+          roomId,
+          socketId,
+          error: error instanceof Error ? `${error.message}\n${error.stack}` : error,
+        });
         this.socket.emit("response", {
           id,
           error: {
@@ -51,45 +68,17 @@ class PromisifiedSocketServer {
   }
 }
 
-function memorySizeOf(obj) {
-  var bytes = 0;
-
-  function sizeOf(obj) {
-    if (obj !== null && obj !== undefined) {
-      switch (typeof obj) {
-        case "number":
-          bytes += 8;
-          break;
-        case "string":
-          bytes += obj.length * 2;
-          break;
-        case "boolean":
-          bytes += 4;
-          break;
-        case "object":
-          var objClass = Object.prototype.toString.call(obj).slice(8, -1);
-          if (objClass === "Object" || objClass === "Array") {
-            for (var key in obj) {
-              if (!obj.hasOwnProperty(key)) continue;
-              sizeOf(obj[key]);
-            }
-          } else bytes += obj.toString().length * 2;
-          break;
-      }
-    }
-    return bytes;
-  }
-  return sizeOf(obj);
-}
-
 const init = ({ envName, projectDir, roomId, TOKEN }) => {
-  console.log("connecting to " + WS_URL);
+  console.log("Connecting to " + WS_URL);
   const socket = io(WS_URL);
+  socketLogger.init(socket, { context: "BVTRecorder", eventName: "BVTRecorder.log" });
   socket.on("connect", () => {
-    // console.log('connected to server')
+    socketLogger.info("Connected to BVTRecorder server");
+    console.log("Connected to BVTRecorder server");
   });
   socket.on("disconnect", () => {
-    // console.log('disconnected from server')
+    socketLogger.info("Disconnected from server");
+    console.log("Disconnected from server");
   });
   socket.emit("joinRoom", { id: roomId, window: "cucumber_client/bvt_recorder" });
   const recorder = new BVTRecorder({
@@ -97,19 +86,19 @@ const init = ({ envName, projectDir, roomId, TOKEN }) => {
     projectDir,
     TOKEN,
     sendEvent: (event, data) => {
-      console.log("Size of data", memorySizeOf(data), "bytes");
-      console.log("----", event, data, "roomId", roomId);
+      socketLogger.info("Sending event", { event, data, roomId });
       socket.emit(event, data, roomId);
-      console.log("Successfully sent event", event, "to room", roomId);
     },
+    logger: socketLogger,
   });
   recorder
     .openBrowser()
     .then(() => {
-      // console.log("BVTRecorder.browserOpened");
+      socketLogger.info("BVTRecorder.browserOpened");
       socket.emit("BVTRecorder.browserOpened", null, roomId);
     })
     .catch((e) => {
+      socketLogger.error("BVTRecorder.browserLaunchFailed", e);
       socket.emit("BVTRecorder.browserLaunchFailed", e, roomId);
     });
   const timeOutForFunction = async (promise, timeout = 5000) => {
@@ -120,6 +109,7 @@ const init = ({ envName, projectDir, roomId, TOKEN }) => {
       return res;
     } catch (error) {
       console.error(error);
+      socketLogger.error(error);
       throw error;
     }
   };
@@ -129,10 +119,13 @@ const init = ({ envName, projectDir, roomId, TOKEN }) => {
       return recorder
         .openBrowser(input)
         .then(() => {
+          socketLogger.info("BVTRecorder.browserOpened");
+          console.info("BVTRecorder.browserOpened");
           socket.emit("BVTRecorder.browserOpened", { roomId, window: "cucumber_client/bvt_recorder" });
         })
         .catch((e) => {
-          console.error(e);
+          socketLogger.error("Error opening browser", e);
+          console.error("BVTRecorder.browserLaunchFailed", e);
           socket.emit("BVTRecorder.browserLaunchFailed", { roomId, window: "cucumber_client/bvt_recorder" });
         });
     },
@@ -143,10 +136,13 @@ const init = ({ envName, projectDir, roomId, TOKEN }) => {
       return recorder
         .reOpenBrowser(input)
         .then(() => {
-          // console.log("BVTRecorder.browserOpened");
+          socketLogger.info("BVTRecorder.browserOpened");
+          console.log("BVTRecorder.browserOpened");
           socket.emit("BVTRecorder.browserOpened", null, roomId);
         })
-        .catch(() => {
+        .catch((e) => {
+          socketLogger.info("BVTRecorder.browserLaunchFailed");
+          console.error("BVTRecorder.browserLaunchFailed", e);
           socket.emit("BVTRecorder.browserLaunchFailed", null, roomId);
         });
     },
@@ -227,6 +223,12 @@ const init = ({ envName, projectDir, roomId, TOKEN }) => {
     "recorderWindow.abortExecution": async (input) => {
       return recorder.abortExecution(input);
     },
+    "recorderWindow.pauseExecution": async (input) => {
+      return recorder.pauseExecution(input);
+    },
+    "recorderWindow.resumeExecution": async (input) => {
+      return recorder.resumeExecution(input);
+    },
     "recorderWindow.loadExistingScenario": async (input) => {
       return recorder.loadExistingScenario(input);
     },
@@ -239,9 +241,7 @@ const init = ({ envName, projectDir, roomId, TOKEN }) => {
     "recorderWindow.getSnapshotFiles": async (input) => {
       const snapshotFolder = recorder.getSnapshotFolder();
       if (snapshotFolder) {
-        // Get the list of filenames in the snapshot folder
         const files = await readdir(snapshotFolder);
-        // Filter the files to only include .png files
         const ymlFiles = files.filter((file) => file.endsWith(".yml") || file.endsWith(".yaml"));
         return { folder: snapshotFolder, files: ymlFiles };
       } else return { folder: null, files: [] };
@@ -275,6 +275,18 @@ const init = ({ envName, projectDir, roomId, TOKEN }) => {
     "recorderWindow.getNetworkEvents": async (input) => {
       return await recorder.getNetworkEvents(input);
     },
+    "recorderWindow.initExecution": async (input) => {
+      return await recorder.initExecution(input);
+    },
+    "recorderWindow.cleanupExecution": async (input) => {
+      return await recorder.cleanupExecution(input);
+    },
+    "recorderWindow.resetExecution": async (input) => {
+      return await recorder.resetExecution(input);
+    },
+    "recorderWindow.stopRecordingNetwork": async (input) => {
+      return recorder.stopRecordingNetwork(input);
+    },
   });
   socket.on("targetBrowser.command.event", async (input) => {
     return recorder.onAction(input);
@@ -301,7 +313,6 @@ try {
   showUsage(error, usage);
 }
 try {
-  // console.log({ envName, projectDir, featureName, scenarioName, stepIndex, roomId })
   init({
     envName,
     projectDir,

package/bin/client/recorderv3/scriptTest.js

@@ -2,4 +2,4 @@
 
 // getImplementedSteps('/Users/yash/Library/Application Support/blinq.io/67d7c7ffb099a8da65d7e204').then((implementedSteps) => {
 //     console.log(JSON.stringify(implementedSteps, null, 2));
-// });
+// });

package/bin/client/recorderv3/services.js

@@ -15,20 +15,7 @@ export class NamesService {
     if (!screenshot && commands.length > 1) {
       screenshot = this.screenshotMap.get(commands[commands.length - 2].inputID);
     }
-    this.logger.info(
-      "data: " +
-        JSON.stringify(
-          {
-            commands,
-            stepsNames,
-            parameters,
-            map,
-          },
-          null,
-          2
-        )
-    );
-    // get screenshot for the last command
+
     const url = `${getRunsServiceBaseURL()}/generate-step-information/generate`;
     const TIMEOUT = 120; // 2 minutes
     const { data } = await axiosClient({
@@ -38,7 +25,7 @@ export class NamesService {
         commands,
         stepsNames,
         parameters,
-        screenshot,
+        //screenshot,
         map,
       },
       headers: {
@@ -65,6 +52,7 @@ export class NamesService {
         }
       } catch (error) {
         if (i === TIMEOUT - 1) {
+          this.logger.error("Timeout while generating step details: ", error);
           console.error("Timeout while generating step details: ", error);
         }
       }
@@ -96,7 +84,6 @@ export class NamesService {
       scenario: scenarioAsText,
     };
 
-    this.logger.info("data: " + JSON.stringify(genObject, null, 2));
     // get screenshot for the last command
     const url = `${getRunsServiceBaseURL()}/generate-step-information/generate_scenario_feature`;
     const TIMEOUT = 120; // 2 minutes
@@ -140,6 +127,7 @@ export class NamesService {
     if (result.status !== 200) {
       return { success: false, message: "Error while generating step details" };
     }
+
     return result.data;
   }