proxy-reader 3.0.0__tar.gz → 3.0.2__tar.gz

{proxy_reader-3.0.0/proxy_reader.egg-info → proxy_reader-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxy-reader
-Version: 3.0.0
+Version: 3.0.2
 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-3.0.0 → proxy_reader-3.0.2}/proxy_reader/__init__.py

@@ -3,4 +3,4 @@ from .reader import ProxiesReader
 
 __all__ = ["ProxiesChecker", "ProxiesReader"]
 
-__version__ = "3.0.0"
+__version__ = "3.0.2"

{proxy_reader-3.0.0 → proxy_reader-3.0.2}/proxy_reader/checker.py

@@ -1,4 +1,5 @@
 import asyncio
+import logging
 import random
 import sys
 
@@ -11,7 +12,7 @@ from .constants import (
     DEFAULT_CHECK_THREADS,
     MAX_RESPONSE_TIME,
 )
-from .logs_config import logger
+from .logs_config import logger as package_logger
 from .models.proxy import Proxy
 from .models.results import ProxyCheckResults
 from .reader import ProxiesReader
@@ -25,16 +26,17 @@ class ProxiesChecker:
         max_response_time: int = MAX_RESPONSE_TIME,
         connect_timeout: int = CONNECT_TIMEOUT,
         check_urls: list[str] = [],
+        logger: logging.Logger | None = None,
     ) -> None:
         self._thread_control: asyncio.Semaphore = asyncio.Semaphore(
             proxy_checking_threads
         )
         self._max_response_time = max_response_time
-        self._timeout_count = 0
-        self._proxies_checked = False
+        self._connect_timeout = connect_timeout
 
         self._default_timeout = aiohttp.ClientTimeout(
-            total=max_response_time,
+            total=self._max_response_time,
+            connect=self._connect_timeout,
         )
 
         self._check_urls = check_urls or CHECK_URLS
@@ -42,13 +44,19 @@ class ProxiesChecker:
         self._connector = aiohttp.TCPConnector(limit=self._connections_limit)
         self._session: aiohttp.ClientSession | None = None
 
+        self._logger = logger or package_logger
+
     async def close(self) -> None:
+        self._logger.debug("Closing checker resources")
         if self._session:
             await self._session.close()
         await self._connector.close()
 
     async def _get_session(self) -> aiohttp.ClientSession:
         if self._session is None or self._session.closed:
+            self._logger.debug(
+                "Creating ClientSession (connector limit=%s)", self._connections_limit
+            )
             self._session = aiohttp.ClientSession(connector=self._connector)
         return self._session
 
@@ -62,7 +70,7 @@ class ProxiesChecker:
         check_results: ProxyCheckResults = ProxyCheckResults(),
     ) -> bool:
         async with self._thread_control:
-            logger.debug(f"Checking proxy {proxy} ..")
+            self._logger.debug("Checking HTTP proxy %s", proxy)
             try:
                 session = await self._get_session()
                 resp = await session.get(
@@ -73,20 +81,22 @@ class ProxiesChecker:
                 )
 
                 if resp.status in range(200, 300):
-                    logger.debug(f"{proxy}: Working")
+                    self._logger.debug("%s: working (status=%s)", proxy, resp.status)
                     check_results.add_working(proxy)
                     return True
 
                 else:
-                    logger.debug(f"{proxy}: Not Working. Response code: {resp.status}")
+                    self._logger.debug("%s: bad response status=%s", proxy, resp.status)
                     check_results.add_bad(proxy)
 
             except asyncio.TimeoutError as e:
-                logger.debug(f"{proxy} : TIMEOUT {e}.")
+                self._logger.debug("%s: timeout (%s)", proxy, e)
                 check_results.add_timeout(proxy)
 
             except Exception as e:
-                logger.debug(f"Bad proxy raised. {e}", exc_info=True)
+                self._logger.debug(
+                    "Proxy check failed: %s (%s)", proxy, e, exc_info=True
+                )
                 check_results.add_error(proxy)
 
             return False
@@ -97,6 +107,7 @@ class ProxiesChecker:
         max_resp_time: int = MAX_RESPONSE_TIME,
         connect_timeout: int = CONNECT_TIMEOUT,
     ) -> bool:
+        self._logger.debug("check_single_proxy: %s", proxy)
         proxy_dict = parse_proxy_line(proxy)
         return await self._check_proxy(
             Proxy(proxy_dict),
@@ -113,6 +124,10 @@ class ProxiesChecker:
         proxies_list = (
             proxies.proxies if isinstance(proxies, ProxiesReader) else proxies
         )
+        self._logger.debug(
+            "check_multiple_proxies: starting %d HTTP checks (threads limited by semaphore)",
+            len(proxies_list),
+        )
         check_results = ProxyCheckResults()
         async with asyncio.TaskGroup() as gp:
             for proxy in proxies_list:
@@ -125,6 +140,13 @@ class ProxiesChecker:
                         check_results,
                     )
                 )
+        self._logger.debug(
+            "check_multiple_proxies: done working=%d bad=%d timeout=%d error=%d",
+            check_results.working_count,
+            check_results.bad_count,
+            check_results.timeout_count,
+            check_results.error_count,
+        )
         return check_results
 
     async def _check_proxy_socks(
@@ -135,9 +157,9 @@ class ProxiesChecker:
         check_results: ProxyCheckResults = ProxyCheckResults(),
     ) -> bool:
         url = self._random_proxy_check_url()
+        self._logger.debug("Checking SOCKS5 proxy %s via %s", proxy, url)
         socks_connector = ProxyConnector.from_url(proxy.socks5)  # type: ignore
         session = aiohttp.ClientSession(connector=socks_connector)  # type: ignore
-        logger.debug(f"Checking proxy {proxy} ..")
         try:
             resp = await asyncio.wait_for(
                 session.get(
@@ -150,13 +172,13 @@ class ProxiesChecker:
             )
 
         except asyncio.TimeoutError:
-            logger.debug(f"{proxy} : TIMEOUT: Not working.")
+            self._logger.debug("%s: SOCKS5 timeout", proxy)
             check_results.add_timeout(proxy)
             await session.close()
             return False
 
         except Exception as e:
-            logger.debug(f"Bad proxy raised. {e}", exc_info=True)
+            self._logger.debug("SOCKS5 check failed: %s (%s)", proxy, e, exc_info=True)
             check_results.add_error(proxy)
             await session.close()
             return False
@@ -164,10 +186,10 @@ class ProxiesChecker:
         await resp.read()
         await session.close()
         if resp.status == 200:
-            logger.debug(f"{proxy}: Working")
+            self._logger.debug("%s: SOCKS5 working (status=200)", proxy)
             check_results.add_working(proxy)
         else:
-            logger.debug(f"{proxy}: Not Working")
+            self._logger.debug("%s: SOCKS5 bad status=%s", proxy, resp.status)
             check_results.add_bad(proxy)
 
         return True
@@ -183,6 +205,9 @@ class ProxiesChecker:
         proxies_list = (
             proxies.proxies if isinstance(proxies, ProxiesReader) else proxies
         )
+        self._logger.debug(
+            "check_multiple_proxies_socks5: scheduling %d checks", len(proxies_list)
+        )
         for proxy in proxies_list:
             tasks.append(
                 asyncio.create_task(
@@ -195,4 +220,6 @@ class ProxiesChecker:
             )
         await asyncio.gather(*tasks)
         self._proxies_checked = True
-        logger.debug("All proxies checked.")
+        self._logger.debug(
+            "check_multiple_proxies_socks5: finished %d tasks", len(tasks)
+        )

{proxy_reader-3.0.0 → proxy_reader-3.0.2/proxy_reader.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxy-reader
-Version: 3.0.0
+Version: 3.0.2
 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-3.0.0 → proxy_reader-3.0.2}/pyproject.toml

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