Bug Fixes

Author: davidhozic

docs/source/changelog.rst

@@ -41,6 +41,8 @@ Releases
 =======================
 - Fixed *Unclosed client session* warning when removing an user account.
 - Fixed documentation of :func:`daf.core.shutdown` - removed information about non existent parameters.
+- Selenium better waiting avoidance
+- Fixed ACCOUNT not being removed from the list if the update failed and the re-login after update failed.
 
 
 v2.10.1

src/daf/client.py

@@ -550,6 +550,10 @@ async def update_servers(self_):
             await async_util.update_obj_param(self, **kwargs)
             await update_servers(self)
         except Exception:
-            await self.initialize()  # re-login
-            await update_servers(self)
+            try:
+                await self.initialize()  # re-login
+                await update_servers(self)
+            except Exception:
+                self._delete()
+
             raise

src/daf/web.py

@@ -65,7 +65,9 @@ class GLOBALS:
 WD_TIMEOUT_30 = 30
 WD_TIMEOUT_LONG = 90
 
-WD_FETCH_INVITE_CLOUDFLARE_TRIES = 5
+WD_FETCH_INVITE_CLOUDFLARE_TRIES = 3
+WD_FETCH_INVITE_CLOUDFLARE_DELAY = 7
+
 WD_RD_CLICK_UPPER_N = 5
 WD_RD_CLICK_LOWER_N = 2
 WD_OUTPUT_PATH = pathlib.Path.home().joinpath("daf/daf_web_data")
@@ -78,7 +80,6 @@ class GLOBALS:
 
 TOP_GG_SEARCH_URL = "https://top.gg/api/client/entities/search"
 TOP_GG_SERVER_JOIN_URL = "https://top.gg/servers/{id}/join"
-TOP_GG_REFRESH_TIME = timedelta(hours=1)
 
 
 @doc.doc_category("Clients")
@@ -155,7 +156,8 @@ async def initialize(self) -> None:
         opts.add_argument("--no-first-run")
         opts.add_argument("--disable-background-networking")
         opts.add_argument("--disable-sync")
-        opts.add_argument("--disable-popup-blocking")
+        opts.add_argument("--disable-popup-blocking")  # For purposes of opening a new window with JavaScript
+
 
         if self._proxy is not None:
             proxy = self._proxy.split("://")  # protocol, url
@@ -305,7 +307,7 @@ async def fetch_invite_link(self, url: str):
         driver = self.driver
         main_window_handle = driver.current_window_handle
         # Open a new tab with javascript to bypass detection
-        driver.execute_script("window.open('https://top.gg', '_blank');")  # Open a new tab
+        driver.execute_script(f"window.open('{url}', '_blank');")  # Open a new tab
         await asyncio.sleep(3)
         new_handle = driver.window_handles[-1]
         try:
@@ -315,17 +317,20 @@ async def fetch_invite_link(self, url: str):
                     trace("Finding 'challenge-running' cloudflare ID", TraceLEVELS.DEBUG)
                     driver.find_element(By.ID, "challenge-running")
                     driver.switch_to.window(main_window_handle)
-                    await asyncio.sleep(5 * (i + 1))
+                    await asyncio.sleep(WD_FETCH_INVITE_CLOUDFLARE_DELAY * (i + 1))
                     continue
 
                 await asyncio.sleep(2)
                 driver.switch_to.window(new_handle)
                 trace("No 'challenge-running' found. Checks suceeded", TraceLEVELS.DEBUG)
                 break
             else:
+                driver.switch_to.window(new_handle)
+                driver.close()
+                driver.switch_to.window(main_window_handle)
                 raise RuntimeError("Could not complete cloudflare checks")
 
-            await self.async_execute(driver.get, url)
+            # await self.async_execute(driver.get, url)
             await self.async_execute(
                 WebDriverWait(driver, WD_TIMEOUT_LONG).until,
                 url_contains("discord.com")