Fix concurrent AutoGUILD access

versioning

fix

Author: davidhozic

docs/source/changelog.rst

@@ -32,6 +32,13 @@ Glossary
 Releases
 ----------------------
 
+v2.9.4
+=================
+- Fixed :class:`AutoGUILD` concurrent access. When updating AutoGUILD, the update method did not block
+  causing exceptions.
+- Chrome driver fixes regarding to proxies and timeouts.
+
+
 v2.9.3
 =================
 - Fixed :class:`AutoGUILD` and :class:`AutoCHANNEL` regex patterns. Users can now seperate names with "name1 | name2",

src/daf/__init__.py

@@ -19,4 +19,4 @@
     from .misc import *
 
 
-VERSION = "2.9.3"
+VERSION = "2.9.4"

src/daf/guild.py

@@ -860,7 +860,7 @@ def __init__(self,
         self.guild_query_iter = None
         self.last_guild_join = datetime.min
         self.guild_join_count = 0
-        misc._write_attr_once(self, "_safe_sem", asyncio.Semaphore(2))
+        misc._write_attr_once(self, "_safe_sem", asyncio.Semaphore(1))
 
     @property
     def guilds(self) -> List[GUILD]:

src/daf/web.py

@@ -4,11 +4,11 @@
 and definitions responsible for making HTTP requests to find servers
 the user might want to shill into.
 """
-from typing import Dict, Tuple, Callable, List, Optional, Any
+from typing import Callable, Optional, Any
 from contextlib import suppress
 from enum import auto, Enum
 
-from datetime import datetime, timedelta
+from datetime import timedelta
 from typeguard import typechecked
 
 from . import misc
@@ -38,7 +38,7 @@ class GLOBALS:
     from selenium.webdriver.support.expected_conditions import (
         presence_of_element_located,
         url_contains,
-        url_changes
+        url_changes,
     )
     from selenium.common.exceptions import (
         NoSuchElementException,
@@ -62,6 +62,7 @@ class GLOBALS:
 
 WD_TIMEOUT_SHORT = 5
 WD_TIMEOUT_MED = 15
+WD_TIMEOUT_30 = 30
 WD_TIMEOUT_LONG = 90
 WD_RD_CLICK_UPPER_N = 5
 WD_RD_CLICK_LOWER_N = 2
@@ -124,6 +125,42 @@ def __init__(self,
         self.driver = None
         self._token = None
 
+    async def initialize(self) -> None:
+        """
+        Starts the webdriver whenever the framework is started.
+
+        Raises
+        ----------
+        Any
+            Raised in :py:meth:`~SeleniumCLIENT.login` method.
+        """
+        WD_OUTPUT_PATH.mkdir(exist_ok=True, parents=True)
+        web_data_path = pathlib.Path(WD_PROFILES_PATH, self._username)
+
+        opts = Options()
+        opts.add_argument(f"--user-data-dir={web_data_path.absolute()}")
+        opts.add_argument("--profile-directory=Profile 1")
+        opts.add_argument("--no-sandbox")
+        opts.add_argument("--mute-audio")
+        opts.add_argument("--no-first-run")
+        opts.add_argument("--disable-background-networking")
+        opts.add_argument("--disable-sync")
+
+        if self._proxy is not None:
+            proxy = self._proxy.split("://")  # protocol, url
+            if '@' in proxy[1]:  # Username and password also provided
+                trace("Proxy with username and password provided. Enter manually.", TraceLEVELS.WARNING)
+                proxy[1] = proxy[1][proxy[1].find('@') + 1:]
+
+            proxy = f"{proxy[0]}://{proxy[1]}"
+            opts.add_argument(f"--proxy-server={proxy}")
+
+        driver = Chrome(options=opts)
+        driver.maximize_window()
+        self.driver = driver
+
+        return await self.login()
+
     def __str__(self) -> str:
         return f"{type(self).__name__}(username={self._username})"
 
@@ -258,10 +295,10 @@ async def fetch_invite_link(self, url: str):
         main_window_handle = driver.current_window_handle
         driver.switch_to.new_window("tab")
         await self.async_execute(driver.get, url)
-        await self.random_sleep(0.5, 1)
+        await asyncio.sleep(1)
         try:
             await self.async_execute(
-                WebDriverWait(driver, WD_TIMEOUT_MED).until,
+                WebDriverWait(driver, WD_TIMEOUT_LONG).until,
                 url_contains("discord.com")
             )
             await self.await_load()
@@ -340,8 +377,8 @@ async def await_load(self):
         TimeoutError
             The page loading timed-out.
         """
-        await self.random_sleep(2, 3)
         trace("Awaiting Discord load", TraceLEVELS.DEBUG)
+        await asyncio.sleep(3)
         try:
             await self.async_execute(
                 WebDriverWait(self.driver, WD_TIMEOUT_LONG).until_not,
@@ -426,37 +463,6 @@ async def await_captcha(self):
         except TimeoutException as exc:
             raise TimeoutError("CAPTCHA was not solved by the user") from exc
 
-    async def initialize(self) -> None:
-        """
-        Starts the webdriver whenever the framework is started.
-
-        Raises
-        ----------
-        Any
-            Raised in :py:meth:`~SeleniumCLIENT.login` method.
-        """
-        WD_OUTPUT_PATH.mkdir(exist_ok=True, parents=True)
-        web_data_path = pathlib.Path(WD_PROFILES_PATH, self._username)
-
-        opts = Options()
-        opts.add_argument(f"--user-data-dir={web_data_path.absolute()}")
-        opts.add_argument("--profile-directory=Profile 1")
-        opts.add_argument("--no-sandbox")
-        opts.add_argument("--mute-audio")
-
-        if self._proxy is not None:
-            proxy = self._proxy.split("://")  # protocol, url
-            if '@' in proxy[1]:
-                proxy[1] = proxy[1][proxy[1].find('@') + 1:]
-
-            proxy = f"{proxy[0]}://{proxy[1]}"
-            opts.add_argument(f"--proxy-server={proxy}")
-
-        driver = Chrome(options=opts)
-        driver.maximize_window()
-        self.driver = driver
-        return await self.login()
-
     async def login(self) -> str:
         """
         Logins to Discord using the webdriver
@@ -479,6 +485,7 @@ async def login(self) -> str:
             driver.get(DISCORD_LOGIN_URL)
             await self.await_load()
             await self.random_sleep(2, 3)
+
             # Check if already logged in
             if driver.current_url == DISCORD_LOGIN_URL:
                 # Check previous accounts
@@ -490,6 +497,13 @@ async def login(self) -> str:
                     )
                     await self.hover_click(login_bnt)
 
+                await self.async_execute(
+                    WebDriverWait(driver, WD_TIMEOUT_LONG).until,
+                    presence_of_element_located(
+                        (By.XPATH, "//input[@name='email']")
+                    )
+                )
+
                 # Not logged in
                 email_entry = driver.find_element(
                     By.XPATH,
@@ -507,8 +521,8 @@ async def login(self) -> str:
                 ActionChains(driver).send_keys(Keys.ENTER).perform()
 
                 await self.await_url_change()
-                await self.await_load()
 
+            await self.await_load()
             return self.update_token_file()
         except (WebDriverException, OSError) as exc:
             raise RuntimeError(
@@ -584,7 +598,7 @@ async def join_guild(self, invite: str) -> None:
 
             join_bnt = driver.find_element(
                 By.XPATH,
-                "//button[@type='button']/div[contains(text(), 'Join')]"
+                "//button[@type='button']/div[contains(text(), 'Join Server')]"
             )
             await self.hover_click(join_bnt)
             await self.random_sleep(3, 5)  # Wait for any CAPTCHA to appear
@@ -608,7 +622,7 @@ async def join_guild(self, invite: str) -> None:
                         (
                             By.XPATH,
                             "//button[@type='button']"
-                            "/div[contains(text(), 'Join')]"
+                            "/div[contains(text(), 'Join Server')]"
                         )
                     )
                 )

src/daf_gui/main.py

@@ -57,7 +57,7 @@
 """
 
 GITHUB_URL = "https://github.com/davidhozic/discord-advertisement-framework"
-DOC_URL = f"https://daf.davidhozic.com/en/v{daf.VERSION}"
+DOC_URL = f"https://daf.davidhozic.com/en/v{'.'.join(daf.VERSION.split('.')[:2])}.x/"
 DISCORD_URL = "https://discord.gg/DEnvahb2Sw"
 
 OPTIONAL_MODULES = [

src/daf_gui/object.py

@@ -40,7 +40,7 @@
 
 
 HELP_URLS = {
-    "daf": f"https://daf.davidhozic.com/en/v{daf.VERSION}/?rtd_search={{}}",
+    "daf": f"https://daf.davidhozic.com/en/v{'.'.join(daf.VERSION.split('.')[:2])}.x/?rtd_search={{}}",
     "_discord": f"https://docs.pycord.dev/en/v{discord._version.__version__}/search.html?q={{}}",
     "builtins": "https://docs.python.org/3/search.html?q={}"
 }