proxy-reader 2.1.2__tar.gz → 2.1.4__tar.gz

{proxy_reader-2.1.2/proxy_reader.egg-info → proxy_reader-2.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxy-reader
-Version: 2.1.2
+Version: 2.1.4
 Summary: Proxy reader for Python
 Project-URL: Homepage, https://github.com/runetech0/proxy-reader
 Project-URL: github, https://github.com/runetech0/proxy-reader

{proxy_reader-2.1.2 → proxy_reader-2.1.4}/proxy_reader/__init__.py

@@ -1,3 +1,3 @@
 from .reader import *
 
-__version__ = "2.1.2"
+__version__ = "2.1.4"

{proxy_reader-2.1.2 → proxy_reader-2.1.4}/proxy_reader/reader.py

@@ -12,19 +12,19 @@ from aiohttp_socks import ProxyConnector
 
 from ._types import ProxiesList, ProxyDictT, ProxyiesGen
 from .logs_config import logger
-from .protocols.reader import ProxiesReaderProtocol
 from .proxy import Proxy
 from .utils import parse_proxy_line
 
 
-class ProxiesReader(ProxiesReaderProtocol):
+class ProxiesReader:
     def __init__(
         self,
         proxies_file: str,
         check_proxies: bool = False,
         proxy_checking_threads: int = 50,
-        max_response_time: int = 60,
+        max_response_time: int = 10,
         shuffle: bool = False,
+        check_urls: list[str] = [],
     ) -> None:
         self._raw_proxies = open(proxies_file, encoding="utf-8", mode="r").readlines()
 
@@ -50,7 +50,7 @@ class ProxiesReader(ProxiesReaderProtocol):
         self._timeout_count = 0
         self._proxies_checked = False
 
-        self._check_urls = [
+        self._check_urls = check_urls or [
             # New
             "http://checkip.amazonaws.com",
             "http://ipinfo.io/ip",
@@ -66,6 +66,8 @@ class ProxiesReader(ProxiesReaderProtocol):
             # "http://api.thecatapi.com/v1/images/search",
             # "http://dog.ceo/api/breeds/image/random",
         ]
+        self._connectins_limit = 60 if "win" in sys.platform else 100
+        self._connector = aiohttp.TCPConnector(limit=self._connectins_limit)
 
     @classmethod
     def load_list(
@@ -75,6 +77,7 @@ class ProxiesReader(ProxiesReaderProtocol):
         proxy_checking_threads: int = 50,
         max_response_time: int = 60,
         shuffle: bool = False,
+        check_urls: list[str] = [],
     ) -> "ProxiesReader":
         """Load proxies from a list"""
         proxies_file = tempfile.NamedTemporaryFile(
@@ -89,6 +92,7 @@ class ProxiesReader(ProxiesReaderProtocol):
                 proxy_checking_threads,
                 max_response_time,
                 shuffle,
+                check_urls,
             )
 
         finally:
@@ -172,48 +176,42 @@ class ProxiesReader(ProxiesReaderProtocol):
     async def _check_proxy(
         self, proxy: Proxy, response_time: int | None = None
     ) -> bool:
-        connectins_limit = 60 if "win" in sys.platform else 100
-        connector = aiohttp.TCPConnector(limit=connectins_limit)
-        session = aiohttp.ClientSession(connector=connector)
-        url = self._random_proxy_check_url()
-        p = proxy.http
-
         async with self._thread_control:
-            logger.debug(f"Checking proxy {p} ..")
+            session = aiohttp.ClientSession(connector=self._connector)
+            logger.debug(f"Checking proxy {proxy} ..")
             try:
                 # resp = await asyncio.wait_for(session.get(url, proxy=p), timeout=self._max_response_time)
                 resp = await session.get(
-                    url,
-                    timeout=aiohttp.ClientTimeout(self._max_response_time),
-                    proxy=p,
+                    self._random_proxy_check_url(),
+                    timeout=aiohttp.ClientTimeout(
+                        total=response_time or self._max_response_time
+                    ),
+                    proxy=proxy.http,
                     ssl=False,
                 )
-                # await resp.read()
+
+                if resp.status in range(200, 299):
+                    logger.debug(f"{proxy}: Working")
+                    self._working_proxies.append(proxy)
+                    return True
+
+                else:
+                    logger.debug(f"{proxy}: Not Working. Response code: {resp.status}")
+                    self._bad_proxies.append(proxy)
 
             except asyncio.TimeoutError as e:
                 self._timeout_count += 1
-                logger.debug(f"{p} : TIMEOUT {e}. {url}")
+                logger.debug(f"{proxy} : TIMEOUT {e}.")
                 self._bad_proxies.append(proxy)
-                await connector.close()
-                await session.close()
-                return False
 
             except Exception as e:
                 logger.debug(f"Bad proxy raised. {e}", exc_info=True)
-                return False
+                self._bad_proxies.append(proxy)
 
             finally:
                 await session.close()
 
-            if resp.status == 200:
-                logger.debug(f"{p}: Working")
-                self._working_proxies.append(proxy)
-
-            else:
-                logger.debug(f"{p}: Not Working. Response code: {resp.status}")
-                self._bad_proxies.append(proxy)
-
-            return True
+            return False
 
     async def check_all_proxies(self, max_resp_time: int = 30) -> None:
         """Run this to check all proxies at once."""

{proxy_reader-2.1.2 → proxy_reader-2.1.4/proxy_reader.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxy-reader
-Version: 2.1.2
+Version: 2.1.4
 Summary: Proxy reader for Python
 Project-URL: Homepage, https://github.com/runetech0/proxy-reader
 Project-URL: github, https://github.com/runetech0/proxy-reader

{proxy_reader-2.1.2 → proxy_reader-2.1.4}/proxy_reader.egg-info/SOURCES.txt

@@ -15,6 +15,5 @@ proxy_reader.egg-info/SOURCES.txt
 proxy_reader.egg-info/dependency_links.txt
 proxy_reader.egg-info/requires.txt
 proxy_reader.egg-info/top_level.txt
-proxy_reader/protocols/__init__.py
-proxy_reader/protocols/reader.py
+tests/test_checker.py
 tests/test_reader.py

{proxy_reader-2.1.2 → proxy_reader-2.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "proxy-reader"
-version = "2.1.2"
+version = "2.1.4"
 description = "Proxy reader for Python"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -28,7 +28,7 @@ github = "https://github.com/runetech0/proxy-reader"
 
 [tool.bumpver]
 
-current_version = "2.1.2"
+current_version = "2.1.4"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "bump version {old_version} -> {new_version}"
 tag_message = "{new_version}"

proxy_reader-2.1.4/tests/test_checker.py

@@ -0,0 +1,17 @@
+import asyncio
+
+from proxy_reader.reader import ProxiesReader
+
+
+async def main() -> None:
+    check_urls = ["https://proxy-check.queuetools.com"]
+    reader = ProxiesReader("proxies.txt", check_proxies=True, check_urls=check_urls)
+    await reader.check_all_proxies(max_resp_time=3)
+
+    print("Total working proxies:", reader.total_working)
+    print("Total bad proxies:", reader.total_bad)
+    print("Total proxies:", reader.total)
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

proxy_reader-2.1.2/proxy_reader/protocols/reader.py

@@ -1,74 +0,0 @@
-from typing import List, Optional, Dict, Any, Protocol
-from .._types import ProxiesList
-from ..proxy import Proxy
-
-
-class ProxiesReaderProtocol(Protocol):
-    @property
-    def total(self) -> int: ...
-
-    @property
-    def total_working(self) -> int: ...
-
-    @property
-    def total_bad(self) -> int: ...
-
-    @property
-    def proxies(self) -> ProxiesList: ...
-
-    @property
-    def bad_proxies(self) -> ProxiesList: ...
-
-    @property
-    def working_proxies(self) -> ProxiesList: ...
-
-    @working_proxies.setter
-    def working_proxies(self, working_proxies: List[Proxy]) -> None: ...
-
-    def _random_proxy_check_url(self) -> str: ...
-
-    def read_with_auth(self) -> None: ...
-
-    def read_authless(self) -> None: ...
-
-    async def _check_proxy(
-        self, proxy: Proxy, response_time: Optional[int] = None
-    ) -> bool: ...
-
-    async def check_all_proxies(self, max_resp_time: int = 30) -> None: ...
-
-    async def _check_proxy_socks(
-        self, proxy: Proxy, response_time: Optional[int] = None
-    ) -> bool: ...
-
-    async def check_all_proxies_socks5(self, max_resp_time: int = 5) -> None: ...
-
-    def get_working_proxies_list_http(self) -> List[str]: ...
-
-    def write_working_proxies(self, filename: str) -> None: ...
-
-    def get_random_http(self) -> Optional[str]: ...
-
-    def get_random_socks5(self) -> Optional[str]: ...
-
-    def get_random_socks5_telegram(self) -> Optional[Dict[str, Any]]: ...
-
-    def next_http_from_list(self) -> Optional[str]: ...
-
-    def next_http_from_cycle(self) -> str: ...
-
-    def next_socks5_from_list(self) -> str: ...
-
-    def next_socks5_from_cycle(self) -> str: ...
-
-    def next_http_telegram_from_list(self) -> Dict[str, Any]: ...
-
-    def next_http_telegram_from_cycle(self) -> Dict[str, Any]: ...
-
-    def next_socks5_telegram_from_cycle(self) -> Dict[str, Any]: ...
-
-    def next_socks5_telegram_from_list(self) -> Dict[str, Any]: ...
-
-    def next_https_from_list(self) -> str: ...
-
-    def next_https_from_cycle(self) -> str: ...