Update CDP Mode

Author: mdmintz

seleniumbase/core/sb_cdp.py

@@ -187,46 +187,23 @@ def find_element_by_text(self, text, tag_name=None, timeout=None):
         element with the given tag. (Eg: a, button, div, script, span)"""
         if not timeout:
             timeout = settings.SMALL_TIMEOUT
-        self.__add_light_pause()
-        time_now = time.time()
-        self.assert_text(text, timeout=timeout)
-        spent = int(time.time() - time_now)
-        remaining = 1 + timeout - spent
-        if tag_name:
-            self.assert_element(tag_name, timeout=remaining)
-        elements = self.loop.run_until_complete(
-            self.page.find_elements_by_text(text=text)
-        )
         if tag_name:
-            tag_name = tag_name.lower().strip()
-        for element in elements:
-            if element and not tag_name:
-                element = self.__add_sync_methods(element)
-                return self.__add_sync_methods(element)
-            elif (
-                element
-                and tag_name in element.tag_name.lower()
-                and text.strip() in element.text
-            ):
-                element = self.__add_sync_methods(element)
-                return self.__add_sync_methods(element)
-            elif (
-                element
-                and element.parent
-                and tag_name in element.parent.tag_name.lower()
-                and text.strip() in element.parent.text
-            ):
-                element = self.__add_sync_methods(element.parent)
-                return self.__add_sync_methods(element)
-            elif (
-                element
-                and element.parent
-                and element.parent.parent
-                and tag_name in element.parent.parent.tag_name.lower()
-                and text.strip() in element.parent.parent.text
-            ):
-                element = self.__add_sync_methods(element.parent.parent)
-                return self.__add_sync_methods(element)
+            try:
+                return self.find_element(
+                    '%s:contains("%s")' % (tag_name, text), timeout=timeout
+                )
+            except Exception:
+                pass  # The exception will be raised later
+        else:
+            self.__add_light_pause()
+            self.assert_text(text, timeout=timeout)
+            elements = self.loop.run_until_complete(
+                self.page.find_elements_by_text(text=text)
+            )
+            for element in elements:
+                if element:
+                    element = self.__add_sync_methods(element)
+                    return self.__add_sync_methods(element)
         plural = "s"
         if timeout == 1:
             plural = ""

seleniumbase/fixtures/base_case.py

@@ -10173,7 +10173,7 @@ def wait_for_text_visible(
         text = self.__get_type_checked_text(text)
         selector, by = self.__recalculate_selector(selector, by)
         if self.__is_cdp_swap_needed():
-            return self.cdp.find_element(selector, timeout=timeout)
+            return self.cdp.wait_for_text(text, selector, timeout=timeout)
         elif self.__is_shadow_selector(selector):
             return self.__wait_for_shadow_text_visible(text, selector, timeout)
         return page_actions.wait_for_text_visible(
@@ -10530,6 +10530,8 @@ def wait_for_link_text_visible(self, link_text, timeout=None):
             timeout = settings.LARGE_TIMEOUT
         if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
+        if self.__is_cdp_swap_needed():
+            return self.cdp.find_element_by_text(text=link_text, tag_name="a")
         return self.wait_for_element_visible(
             link_text, by="link text", timeout=timeout
         )

seleniumbase/undetected/cdp_driver/browser.py

@@ -369,7 +369,8 @@ async def get(
                 proxy_user = username_and_password.split(":")[0]
                 proxy_pass = username_and_password.split(":")[1]
                 await connection.set_auth(proxy_user, proxy_pass, self.tabs[0])
-                time.sleep(0.25)
+                time.sleep(0.22)
+            await connection.sleep(0.05)
             frame_id, loader_id, *_ = await connection.send(
                 cdp.page.navigate(url)
             )