- fixed proxy support

Author: EchterAlsFake

docs/source/guides/pkg-usage.rst

@@ -36,6 +36,21 @@ You can switch with: `use_webmaster_api = True` or False.
 
     client = phub.Client(language = 'de')
 
+
+
+
+Proxy support is also possible, but only SOCKS5 protocol is supported. You need to apply the proxy in the
+format "socks5://<ip>:<port>" and set it in the consts file. Here's an example:
+
+.. code-block:: python
+    import phub
+    phub.consts.PROXY = "socks5://187.133.7.42:420"
+    client = phub.Client() # This client has proxies enabled
+
+NOTE:
+
+There absolutely NO guarantee that this feature is perfectly functional. Your IP could always be leaked.
+
 Fetching a video
 ----------------
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "phub"
-version = "4.7.6"
+version = "4.7.7"
 description = "An API for Pornhub"
 authors = [
   {name = 'Egsagon', email = "[email protected]"},

src/phub/consts.py

@@ -38,14 +38,14 @@
 RSS = 'https://www.pornhub.com/video/webmasterss'
 
 PROXY = None
-# Example Proxy dictionary:
-# {"http://": "http://4.20.69.42:1337"}
+# Needs to be a SOCKS5 in the format: "socks5://<host>:<port>"
 
 
 MAX_CALL_RETRIES = 4 # Maximum times a HTTPError can be reproduced
 MAX_CALL_TIMEOUT = .4 # Time to wait before retrying basic calls
 CALL_TIMEOUT = 30 # Time to wait before retrying calls (in case no error happens)
 CHALLENGE_TIMEOUT = 2 # Time to wait before injecting the new cookie for resolving the challenge (needs to be at least 1)
+DELAY = 0 # Minimum time between requests
 
 DOWNLOAD_SEGMENT_MAX_ATTEMPS = 5
 DOWNLOAD_SEGMENT_ERROR_DELAY = .5

src/phub/core.py

@@ -35,7 +35,6 @@ def __init__(self,
                  password: str = None,
                  *,
                  language: literals.language = 'en',
-                 delay: Union[int, float] = 0,
                  login: bool = True,
                  bypass_geo_blocking: bool = False,
                  change_title_language: bool = True,
@@ -47,7 +46,6 @@ def __init__(self,
             email (str): Account email address.
             password (str): Account password.
             language (str): Client language (fr, en, ru, etc.)
-            delay (int | float): Minimum delay between requests.
             login (bool): Whether to directly log in after initialization.
             bypass_geo_blocking (bool): Whether to bypass geo-blocking.
             change_title_language (bool): Whether to change title language into your language based on the input URL
@@ -71,7 +69,7 @@ def __init__(self,
         self.credentials = {'email': email,
                             'password': password}
 
-        self.delay = delay
+        self.delay = consts.DELAY
         self.start_delay = False
         self.last_request_time = None
 
@@ -90,13 +88,17 @@ def reset(self) -> None:
         This is useful if you are keeping the client running
         for a long time and can help with Pornhub rate limit.
         '''
+        verify = True
+        if consts.PROXY is not None:
+            verify = False
 
         # Initialise session
         self.session = httpx.Client(
             headers = consts.HEADERS,
             cookies = consts.COOKIES,
             follow_redirects = True,
-            proxies = consts.PROXY)
+            proxy = consts.PROXY,
+            verify = verify)
 
         self._clear_granted_token()