anti-cf 1.0.2__tar.gz → 1.1.1__tar.gz

{anti_cf-1.0.2 → anti_cf-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: anti_cf
-Version: 1.0.2
+Version: 1.1.1
 Summary: Anti-CloudFlare package
 License: MIT
 Author: Steven Van Ingelgem

{anti_cf-1.0.2 → anti_cf-1.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "anti_cf"
-version = "1.0.2"
+version = "1.1.1"
 description = "Anti-CloudFlare package"
 authors = ["Steven Van Ingelgem <steven@vaningelgem.be>"]
 license = "MIT"

{anti_cf-1.0.2 → anti_cf-1.1.1}/src/anti_cf/_persistent_session.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import pickle
 import tempfile
+from pathlib import Path
 from typing import TYPE_CHECKING, ClassVar
 
 import fake_useragent
@@ -22,8 +23,6 @@ except ImportError:
     _HAS_CACHE = False
 
 if TYPE_CHECKING:
-    from pathlib import Path
-
     from requests import Response
 
 
@@ -47,10 +46,11 @@ class PersistentSession(Session):
             super().__init__()
 
         self._load_cookies()
-        ensure_flaresolverr_running()
         self.set_user_agent()
+        self._flaresolverr_initialized = False
 
     def _get_user_agent(self) -> str:
+        # Try FlareSolverr first, but don't start it if not running
         flaresolverr_settings = get_flaresolverr_settings()
         if flaresolverr_settings is not None:
             return flaresolverr_settings["userAgent"]
@@ -79,7 +79,9 @@ class PersistentSession(Session):
 
     def save_cookies(self) -> None:
         """Save current cookies to file."""
-        self._COOKIES_FILE.write_bytes(pickle.dumps(self.cookies, protocol=4))
+        temp_file = Path(tempfile.mktemp(dir=self._COOKIES_FILE.parent))
+        temp_file.write_bytes(pickle.dumps(self.cookies, protocol=4))
+        temp_file.replace(self._COOKIES_FILE)
 
     def request(self, *args: object, **kwargs: object) -> Response:
         """Override request method to save cookies after each request."""
@@ -87,6 +89,12 @@ class PersistentSession(Session):
         self.save_cookies()
         return response
 
+    def _ensure_flaresolverr_initialized(self) -> None:
+        """Ensure FlareSolverr is ready when needed."""
+        if not self._flaresolverr_initialized:
+            ensure_flaresolverr_running()
+            self._flaresolverr_initialized = True
+
     def get(self, url: str | bytes, *, try_with_cloudflare: bool = False, _cloudflare_counter: int = 0, **kwargs: object) -> Response | None:
         if not try_with_cloudflare or "cf_clearance" in self.cookies:
             try:
@@ -107,10 +115,10 @@ class PersistentSession(Session):
                 else:
                     logger.warning("Cloudflare detected, but `try_with_cloudflare` wasn't set to True!")
 
+        self._ensure_flaresolverr_initialized()
+
         try:
             self._get_url_via_flaresolverr(url)
-            # After the url is retrieved from the flaresolverr proxy, it's not necessarily the one we want
-            #  --> So we'll re-request it here:
             return super().get(url, **kwargs)
         except Exception:
             logger.error("FlareSolverr didn't solve it :(")
@@ -129,8 +137,8 @@ class PersistentSession(Session):
         dta = response.json()
         for cookie in dta["solution"]["cookies"]:
             self.cookies.set(
-                name=cookie["name"],  # required
-                value=cookie["value"],  # required
+                name=cookie["name"],
+                value=cookie["value"],
                 version=cookie.get("version", 0),
                 port=cookie.get("port", None),
                 domain=cookie.get("domain", ""),