automation_model 1.0.810-dev → 1.0.812-dev

package/lib/stable_browser.js

@@ -508,12 +508,6 @@ class StableBrowser {
                 if (!el.setAttribute) {
                     el = el.parentElement;
                 }
-                // remove any attributes start with data-blinq-id
-                // for (let i = 0; i < el.attributes.length; i++) {
-                //   if (el.attributes[i].name.startsWith("data-blinq-id")) {
-                //     el.removeAttribute(el.attributes[i].name);
-                //   }
-                // }
                 el.setAttribute("data-blinq-id-" + randomToken, "");
                 return true;
             }, [tag1, randomToken]))) {
@@ -808,16 +802,23 @@ class StableBrowser {
                 element = await this._locate_internal(selectors, info, _params, timeout, allowDisabled);
             }
             if (!element.rerun) {
-                const randomToken = Math.random().toString(36).substring(7);
-                await element.evaluate((el, randomToken) => {
-                    el.setAttribute("data-blinq-id-" + randomToken, "");
-                    console.log("set data-blinq-id-" + randomToken + " on element", el);
+                const randomToken = "blinq_" + Math.random().toString(36).substring(7);
+                const id = await element.evaluate((el, randomToken) => {
+                    // check if the element has id attribute
+                    if (el.id) {
+                        return el.id;
+                    }
+                    el.setAttribute("id", randomToken);
+                    console.log("set id=" + randomToken + " on element", el);
+                    return randomToken;
                 }, randomToken);
-                // if (element._frame) {
-                //   return element;
-                // }
                 const scope = element._frame ?? element.page();
-                let newElementSelector = "[data-blinq-id-" + randomToken + "]";
+                let newElementSelector = "#" + id;
+                // check if the id contains :
+                if (id.includes(":")) {
+                    // //*[@id="radix-:r0:"]
+                    newElementSelector = `//*[@id="${id}"]`;
+                }
                 let prefixSelector = "";
                 const frameControlSelector = " >> internal:control=enter-frame";
                 const frameSelectorIndex = element._selector.lastIndexOf(frameControlSelector);
@@ -1245,11 +1246,16 @@ class StableBrowser {
             operation: "click",
             log: "***** click on " + selectors.element_name + " *****\n",
         };
+        //profile("click_all ***", this.context, true);
         try {
+            //profile("click_preCommand", this.context, true);
             await _preCommand(state, this);
+            //profile("click_preCommand", this.context, false);
             await performAction("click", state.element, options, this, state, _params);
             if (!this.fastMode) {
+                //profile("click_waitForPageLoad", this.context, true);
                 await this.waitForPageLoad({ noSleep: true });
+                //profile("click_waitForPageLoad", this.context, false);
             }
             return state.info;
         }
@@ -1257,7 +1263,10 @@ class StableBrowser {
             await _commandError(state, e, this);
         }
         finally {
+            //profile("click_commandFinally", this.context, true);
             await _commandFinally(state, this);
+            //profile("click_commandFinally", this.context, false);
+            //profile("click_all ***", this.context, false);
         }
     }
     async waitForElement(selectors, _params, options = {}, world = null) {