lacuscore 1.10.10__py3-none-any.whl → 1.10.12__py3-none-any.whl

lacuscore/lacuscore.py

@@ -23,7 +23,8 @@ from typing import Literal, Any, overload, cast, Iterator
 from uuid import uuid4
 from urllib.parse import urlsplit
 
-from dns import resolver
+from dns.resolver import Cache
+from dns.asyncresolver import Resolver
 from dns.exception import DNSException
 from dns.exception import Timeout as DNSTimeout
 
@@ -98,8 +99,8 @@ class LacusCore():
         self.tor_proxy = tor_proxy
         self.only_global_lookups = only_global_lookups
         self.max_retries = max_retries
-        self.dnsresolver: resolver.Resolver = resolver.Resolver()
-        self.dnsresolver.cache = resolver.Cache(30)
+        self.dnsresolver: Resolver = Resolver()
+        self.dnsresolver.cache = Cache(900)
         self.dnsresolver.timeout = 2
         self.dnsresolver.lifetime = 3
 
@@ -414,7 +415,7 @@ class LacusCore():
                         except ValueError:
                             # not an IP, try resolving
                             try:
-                                ips_to_check = self.__get_ips(logger, splitted_url.hostname)
+                                ips_to_check = await self.__get_ips(logger, splitted_url.hostname)
                             except DNSTimeout as e:
                                 # for a timeout, we do not want to retry, as it is likely to timeout again
                                 result = {'error': f'DNS Timeout for "{splitted_url.hostname}": {e}'}
@@ -733,22 +734,40 @@ class LacusCore():
         p.zrem('lacus:ongoing', uuid)
         p.execute()
 
-    def __get_ips(self, logger: LacusCoreLogAdapter, hostname: str) -> list[IPv4Address | IPv6Address]:
+    async def __get_ips(self, logger: LacusCoreLogAdapter, hostname: str) -> list[IPv4Address | IPv6Address]:
         # We need to use dnspython for resolving because socket.getaddrinfo will sometimes be stuck for ~10s
         # It is happening when the error code is NoAnswer
         resolved_ips = []
-        try:
-            answers_a = self.dnsresolver.resolve(hostname, 'A')
-            resolved_ips += [ip_address(str(answer)) for answer in answers_a]
-        except DNSTimeout as e:
-            raise e
-        except DNSException as e:
-            logger.info(f'No A record for "{hostname}": {e}')
-        try:
-            answers_aaaa = self.dnsresolver.resolve(hostname, 'AAAA')
-            resolved_ips += [ip_address(str(answer)) for answer in answers_aaaa]
-        except DNSTimeout as e:
-            raise e
-        except DNSException as e:
-            logger.info(f'No AAAA record for "{hostname}": {e}')
+        max_timeout_retries = 3
+        _current_retries = 0
+        while _current_retries < max_timeout_retries:
+            _current_retries += 1
+            try:
+                answers_a = await self.dnsresolver.resolve(hostname, 'A')
+                resolved_ips += [ip_address(str(answer)) for answer in answers_a]
+            except DNSTimeout as e:
+                if _current_retries < max_timeout_retries:
+                    logger.info(f'DNS Timeout for "{hostname}" (A record), retrying.')
+                    await asyncio.sleep(1)
+                    continue
+                raise e
+            except DNSException as e:
+                logger.info(f'No A record for "{hostname}": {e}')
+            break
+
+        _current_retries = 0
+        while _current_retries < max_timeout_retries:
+            _current_retries += 1
+            try:
+                answers_aaaa = await self.dnsresolver.resolve(hostname, 'AAAA')
+                resolved_ips += [ip_address(str(answer)) for answer in answers_aaaa]
+            except DNSTimeout as e:
+                if _current_retries < max_timeout_retries:
+                    logger.info(f'DNS Timeout for "{hostname}" (AAAA record), retrying.')
+                    await asyncio.sleep(1)
+                    continue
+                raise e
+            except DNSException as e:
+                logger.info(f'No AAAA record for "{hostname}": {e}')
+            break
         return resolved_ips

{lacuscore-1.10.10.dist-info → lacuscore-1.10.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lacuscore
-Version: 1.10.10
+Version: 1.10.12
 Summary: Core of Lacus, usable as a module
 Home-page: https://github.com/ail-project/LacusCore
 License: BSD-3-Clause
@@ -30,7 +30,7 @@ Requires-Dist: async-timeout (>=4.0.3,<5.0.0) ; python_version < "3.11"
 Requires-Dist: defang (>=0.5.3,<0.6.0)
 Requires-Dist: dnspython (>=2.6.1,<3.0.0)
 Requires-Dist: eval-type-backport (>=0.2.0,<0.3.0) ; python_version < "3.10"
-Requires-Dist: playwrightcapture[recaptcha] (>=1.25.11,<2.0.0)
+Requires-Dist: playwrightcapture[recaptcha] (>=1.25.14,<2.0.0)
 Requires-Dist: pydantic (>=2.8.2,<3.0.0)
 Requires-Dist: redis[hiredis] (>=5.0.8,<6.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)

{lacuscore-1.10.10.dist-info → lacuscore-1.10.12.dist-info}/RECORD

@@ -1,10 +1,10 @@
 lacuscore/__init__.py,sha256=aLBshQPT9IBDKn5qWrX9A_exqtLFPyLsQiPWdfpAFjA,537
 lacuscore/helpers.py,sha256=qAB_E1wVisl-YgN41zTD35PzJc0i_CoA1sPAb73gzck,10855
 lacuscore/lacus_monitoring.py,sha256=UOfE_1-_rhVeKJXQ_m9XxYkr7VwyQnA6iK-x_tcXJfo,2775
-lacuscore/lacuscore.py,sha256=73yGF9hbLXg-HutLubIgx3CY4e7gVra-VT4PPtwUoDc,39489
+lacuscore/lacuscore.py,sha256=ae4Mt_DT_ALlySt_I3oiTKoVU6z4lm9LFCS3oWPqFcA,40330
 lacuscore/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lacuscore/task_logger.py,sha256=kWBThqfv_alu1YA3jEqP4GsqXIVKLbzyI7w14aJ2g9I,1908
-lacuscore-1.10.10.dist-info/LICENSE,sha256=4C4hLYrIkUD96Ggk-y_Go1Qf7PBZrEm9PSeTGe2nd4s,1516
-lacuscore-1.10.10.dist-info/METADATA,sha256=1Ha38GM8uu-uqAO8O40FxRCi81bQXeaGdYl-Us70za8,2859
-lacuscore-1.10.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-lacuscore-1.10.10.dist-info/RECORD,,
+lacuscore-1.10.12.dist-info/LICENSE,sha256=4C4hLYrIkUD96Ggk-y_Go1Qf7PBZrEm9PSeTGe2nd4s,1516
+lacuscore-1.10.12.dist-info/METADATA,sha256=sTwBsBrmH4AcIrs9jSqZWrN5HIuYJMdniqNbb6voghQ,2859
+lacuscore-1.10.12.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+lacuscore-1.10.12.dist-info/RECORD,,