lacuscore 1.13.9__tar.gz → 1.14.1__tar.gz

{lacuscore-1.13.9 → lacuscore-1.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lacuscore
-Version: 1.13.9
+Version: 1.14.1
 Summary: Core of Lacus, usable as a module
 License: BSD-3-Clause
 Author: Raphaël Vinot
@@ -26,9 +26,9 @@ Requires-Dist: async-timeout (>=5.0.1) ; python_version < "3.11"
 Requires-Dist: defang (>=0.5.3)
 Requires-Dist: dnspython (>=2.7.0)
 Requires-Dist: eval-type-backport (>=0.2.2) ; python_version < "3.10"
-Requires-Dist: playwrightcapture[recaptcha] (>=1.28.5)
-Requires-Dist: pydantic (>=2.11.2)
-Requires-Dist: redis[hiredis] (>=5.2.1)
+Requires-Dist: playwrightcapture[recaptcha] (>=1.29.2)
+Requires-Dist: pydantic (>=2.11.4)
+Requires-Dist: redis[hiredis] (>=5.3.0,<6.0.0)
 Requires-Dist: requests (>=2.32.3)
 Requires-Dist: typing-extensions (>=4.12.2,<5.0.0) ; python_version < "3.12"
 Requires-Dist: ua-parser[regex] (>=1.0.1)

{lacuscore-1.13.9 → lacuscore-1.14.1}/lacuscore/helpers.py

@@ -114,6 +114,7 @@ class CaptureSettings(BaseModel):
     device_name: str | None = None
     user_agent: str | None = None
     proxy: str | dict[str, str] | None = None
+    socks5_dns_resolver: str | list[str] | None = None
     general_timeout_in_sec: int | None = None
     cookies: list[Cookie] | None = None
     # NOTE: should be that, but StorageState doesn't define the indexeddb

{lacuscore-1.13.9 → lacuscore-1.14.1}/lacuscore/lacuscore.py

@@ -131,6 +131,7 @@ class LacusCore():
                 browser: BROWSER | None=None, device_name: str | None=None,
                 user_agent: str | None=None,
                 proxy: str | dict[str, str] | None=None,
+                socks5_dns_resolver: str | list[str] | None=None,
                 general_timeout_in_sec: int | None=None,
                 cookies: list[dict[str, Any]] | list[Cookie] | None=None,
                 storage: dict[str, Any] | None=None,
@@ -164,6 +165,7 @@ class LacusCore():
                 browser: BROWSER | None=None, device_name: str | None=None,
                 user_agent: str | None=None,
                 proxy: str | dict[str, str] | None=None,
+                socks5_dns_resolver: str | list[str] | None=None,
                 general_timeout_in_sec: int | None=None,
                 cookies: list[dict[str, Any]] | list[Cookie] | None=None,
                 storage: dict[str, Any] | None=None,
@@ -199,6 +201,7 @@ class LacusCore():
         :param device_name: The name of the device, must be something Playwright knows
         :param user_agent: The user agent the browser will use for the capture
         :param proxy: SOCKS5 proxy to use for capturing
+        :param socks5_dns_resolver: DNS resolver for to populate IPs in HAR when a capture is done via a socks5 proxy.
         :param general_timeout_in_sec: The capture will raise a timeout it it takes more than that time
         :param cookies: A list of cookies
         :param storage: A storage state from another capture
@@ -229,7 +232,7 @@ class LacusCore():
             settings = {'depth': depth, 'rendered_hostname_only': rendered_hostname_only,
                         'url': url, 'document_name': document_name, 'document': document,
                         'browser': browser, 'device_name': device_name,
-                        'user_agent': user_agent, 'proxy': proxy,
+                        'user_agent': user_agent, 'proxy': proxy, 'socks5_dns_resolver': socks5_dns_resolver,
                         'general_timeout_in_sec': general_timeout_in_sec,
                         'cookies': cookies, 'storage': storage, 'headers': headers,
                         'http_credentials': http_credentials, 'geolocation': geolocation,
@@ -266,6 +269,7 @@ class LacusCore():
         p = self.redis.pipeline()
         p.set(f'lacus:query_hash:{hash_query}', perma_uuid, nx=True, ex=recapture_interval)
         p.hset(f'lacus:capture_settings:{perma_uuid}', mapping=to_enqueue.redis_dump())
+        p.expire(f'lacus:capture_settings:{perma_uuid}', self.max_capture_time * 2)
         p.zadd('lacus:to_capture', {perma_uuid: priority if priority is not None else 0})
         try:
             p.execute()
@@ -501,6 +505,7 @@ class LacusCore():
                         browser=browser_engine,
                         device_name=to_capture.device_name,
                         proxy=proxy,
+                        socks5_dns_resolver=to_capture.socks5_dns_resolver,
                         general_timeout_in_sec=to_capture.general_timeout_in_sec,
                         loglevel=self.master_logger.getEffectiveLevel(),
                         headless=to_capture.headless,

{lacuscore-1.13.9 → lacuscore-1.14.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lacuscore"
-version = "1.13.9"
+version = "1.14.1"
 description = "Core of Lacus, usable as a module"
 authors = [
     {name="Raphaël Vinot", email="raphael.vinot@circl.lu"}
@@ -15,13 +15,13 @@ dynamic = [ "classifiers" ]
 
 dependencies = [
     "requests (>=2.32.3)",
-    "playwrightcapture[recaptcha] (>=1.28.5)",
+    "playwrightcapture[recaptcha] (>=1.29.2)",
     "defang (>=0.5.3)",
     "ua-parser[regex] (>=1.0.1)",
-    "redis [hiredis] (>=5.2.1)",
+    "redis[hiredis] (>=5.3.0,<6.0.0)",
     "dnspython (>=2.7.0)",
     "async-timeout (>=5.0.1) ; python_version < \"3.11\"",
-    "pydantic (>=2.11.2)",
+    "pydantic (>=2.11.4)",
     "eval-type-backport (>=0.2.2) ; python_version < \"3.10\"",
     "typing-extensions (>=4.12.2,<5.0.0) ; python_version < \"3.12\""
 ]