@dev-blinq/cucumber_client 1.0.1253-dev → 1.0.1255-dev

package/bin/client/recorderv3/bvt_recorder.js

@@ -3,7 +3,6 @@ import { closeContext, initContext, _getDataFile, resetTestData } from "automati
 import { existsSync, readdirSync, readFileSync, rmSync } from "fs";
 import path from "path";
 import url from "url";
-import pkg from "../../min/injectedScript.min.cjs";
 import { getImplementedSteps, getStepsAndCommandsForScenario } from "./implemented_steps.js";
 import { NamesService } from "./services.js";
 import { BVTStepRunner } from "./step_runner.js";
@@ -16,41 +15,19 @@ import chokidar from "chokidar";
 import logger from "../../logger.js";
 import { unEscapeNonPrintables } from "../cucumber/utils.js";
 import { findAvailablePort } from "../utils/index.js";
-import { getAiConfig } from "../code_gen/page_reflection.js";
-const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
-const { source: injectedScriptSource } = pkg;
-const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-export function getInitScript(config) {
-  const popupHandlers = config?.popupHandlers ?? [];
 
-  const disableHighlight = config?.disableHighlight ?? false;
-
-  const disableMultipleLocators = config?.disableMultipleLocators ?? false;
+const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 
-  const popupScript = `
-  window.__bvt_Recorder.setPopupHandlers(${JSON.stringify(popupHandlers)}); 
-  window.__bvt_Recorder.setDisableHighlight(${JSON.stringify(disableHighlight)});
-  window.__bvt_Recorder.setImproviseLocators(${JSON.stringify(!disableMultipleLocators)});`;
+const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+export function getInitScript(config, options) {
+  const preScript = `
+  window.__bvt_Recorder_config = ${JSON.stringify(config ?? null)};
+  window.__PW_options = ${JSON.stringify(options ?? null)};
+  `;
+  const recorderScript = readFileSync(path.join(__dirname, "..", "..", "assets", "bundled_scripts", "recorder.js"), "utf8")
   return (
-    [
-      path.join(__dirname, "..", "..", "assets", "preload", "accessibility.js"),
-      path.join(__dirname, "..", "..", "assets", "preload", "dom-utils.js"),
-      path.join(__dirname, "..", "..", "assets", "preload", "generateSelector.js"),
-      path.join(__dirname, "..", "..", "assets", "preload", "locators.js"),
-      path.join(__dirname, "..", "..", "assets", "preload", "unique_locators.js"),
-      // path.join(__dirname, "..", "..", "assets", "preload", "pw_locators.js"),
-      path.join(__dirname, "..", "..", "assets", "preload", "climb.js"),
-      path.join(__dirname, "..", "..", "assets", "preload", "text-locator.js"),
-      path.join(__dirname, "..", "..", "assets", "preload", "toolbar.js"),
-      path.join(__dirname, "..", "..", "assets", "preload", "recording-tool.js"),
-      path.join(__dirname, "..", "..", "assets", "preload", "find_context.js"),
-      path.join(__dirname, "..", "..", "assets", "preload", "recorderv3.js"),
-      path.join(__dirname, "..", "..", "assets", "preload", "findElementText.js"),
-      path.join(__dirname, "..", "..", "assets", "preload", "css_gen.js"),
-      path.join(__dirname, "..", "..", "assets", "preload", "yaml.js"),
-    ]
-      .map((filePath) => readFileSync(filePath, "utf8"))
-      .join("\n") + popupScript
+    preScript +
+    recorderScript
   );
 }
 
@@ -213,7 +190,7 @@ export class BVTRecorder {
 
     this.lastKnownUrlPath = "";
     // TODO: what is world?
-    this.world = { attach: () => {} };
+    this.world = { attach: () => { } };
     this.shouldTakeScreenshot = true;
     this.watcher = null;
   }
@@ -301,22 +278,15 @@ export class BVTRecorder {
     return result;
   }
   getInitScripts(config) {
-    return getInitScript(config);
-    // const scripts = []
-    // scripts.push(...this.getPWScript());
-    // scripts.push(...this.getRecorderScripts());
-
-    // const popupHandlers = config?.popupHandlers ?? [];
-    // const disableHighlight = config?.disableHighlight ?? false;
-    // const disableMultipleLocators = config?.disableMultipleLocators ?? false;
-
-    // const inlineScript = `
-    // window.__bvt_Recorder.setPopupHandlers(${JSON.stringify(popupHandlers)});
-    // window.__bvt_Recorder.setDisableHighlight(${JSON.stringify(disableHighlight)});
-    // window.__bvt_Recorder.setImproviseLocators(${JSON.stringify(!disableMultipleLocators)});
-    // `
-    // scripts.push(inlineScript);
-    // return scripts;
+    return getInitScript(config, {
+      sdkLanguage: "javascript",
+      testIdAttributeName: "blinq-test-id",
+      stableRafCount: 0,
+      browserName: this.browser?.browserType().name(),
+      inputFileRoleTextbox: false,
+      customEngines: [],
+      isUnderTest: true,
+    });
   }
 
   async _initBrowser({ url }) {
@@ -324,7 +294,7 @@ export class BVTRecorder {
     process.env.CDP_LISTEN_PORT = this.#remoteDebuggerPort;
 
     this.stepRunner.setRemoteDebugPort(this.#remoteDebuggerPort);
-    this.world = { attach: () => {} };
+    this.world = { attach: () => { } };
 
     const ai_config_file = path.join(this.projectDir, "ai_config.json");
     let ai_config = {};
@@ -336,7 +306,7 @@ export class BVTRecorder {
       }
     }
     const initScripts = {
-      recorderCjs: injectedScriptSource,
+      // recorderCjs: injectedScriptSource,
       scripts: [
         this.getInitScripts(ai_config),
         `\ndelete Object.getPrototypeOf(navigator).webdriver;${process.env.WINDOW_DEBUGGER ? "window.debug=true;\n" : ""}`,
@@ -626,7 +596,7 @@ export class BVTRecorder {
   }
   async closeBrowser() {
     delete process.env.TEMP_RUN;
-    await this.watcher.close().then(() => {});
+    await this.watcher.close().then(() => { });
     this.watcher = null;
     await closeContext();
     this.pageSet.clear();

package/package.json

@@ -1,22 +1,25 @@
 {
   "name": "@dev-blinq/cucumber_client",
-  "version": "1.0.1253-dev",
+  "version": "1.0.1255-dev",
   "description": "",
   "main": "bin/index.js",
   "types": "bin/index.d.ts",
   "type": "module",
   "scripts": {
-    "pack": "mkdir build && mkdir build/bin && cp -R ./src/* ./build/bin && cp ./package.json ./build",
+    "pack": "npm run bundle && mkdir build && mkdir build/bin && cp -R ./src/* ./build/bin && cp ./package.json ./build",
     "test": "node ./test/test.js",
     "tests_prod": "rm -rf results.json && cross-env NODE_ENV_BLINQ=prod TOKEN=xxx npx mocha --parallel --jobs=10 ./tests",
     "tests": "node ./multi_test_runner.js",
     "lint": "eslint ./src/**/*.js",
     "clean": "rm -rf ./build",
     "build": "npm run clean && npm run pack",
+    "build:watch": "npx nodemon --watch src --exec 'npm run build'",
     "update_logic": "rm -rf ../logic/node_modules/@dev-blinq && mkdir ../logic/node_modules/@dev-blinq && mkdir ../logic/node_modules/@dev-blinq/cucumber_client && mkdir ../logic/node_modules/@dev-blinq/cucumber_client/bin && mkdir ../logic/node_modules/@dev-blinq/cucumber_client/node_modules && cp -R ./build/* ../logic/node_modules/@dev-blinq/cucumber_client/bin && cp -R ./node_modules/* ../logic/node_modules/@dev-blinq/cucumber_client/node_modules && cp ./package.json ../logic/node_modules/@dev-blinq/cucumber_client/",
     "version-bump": "npm version prepatch --preid=dev",
     "scripts_regression": "cross-env HEADLESS=true npx mocha --bail --parallel --jobs=12 ./scripts_regression/ --timeout 120000",
-    "runtime_reg": "cross-env HEADLESS=true npx mocha --bail --parallel --jobs=12 ./runtime_regression/ --timeout 4800000"
+    "runtime_reg": "cross-env HEADLESS=true npx mocha --bail --parallel --jobs=12 ./runtime_regression/ --timeout 4800000",
+    "bundle": "npx tsup",
+    "bundle:watch": "npx tsup --watch"
   },
   "author": "",
   "license": "ISC",
@@ -46,7 +49,9 @@
     "pureimage": "0.4.9",
     "socket.io": "^4.7.5",
     "socket.io-client": "^4.7.5",
+    "tsup": "^8.5.0",
     "tunnel": "^0.0.6",
+    "typescript": "^5.8.3",
     "unzipper": "^0.12.3",
     "win-ca": "^3.5.1",
     "winston": "^3.10.0",