proxy-reader 2.0.0__py3-none-any.whl → 2.1.0__py3-none-any.whl

proxy_reader/__init__.py

@@ -1,4 +1,3 @@
 from .reader import *
 
-
-__version__ = "2.0.0"
+__version__ = "2.1.0"

proxy_reader/proxy.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
-from typing import TYPE_CHECKING, Optional, Dict, Any
 
+from typing import TYPE_CHECKING, Any, Dict, Optional
 
 if TYPE_CHECKING:
     from ._types import GeneralDict, ProxyDictT

proxy_reader/reader.py

@@ -1,18 +1,20 @@
+import asyncio
+import itertools
 import os
 import random
-import itertools
+import sys
 import tempfile
 import warnings
-from .utils import parse_proxy_line
-from .proxy import Proxy
+from typing import Any
+
 import aiohttp
-import asyncio
-from .logs_config import logger
 from aiohttp_socks import ProxyConnector
-import sys
-from typing import Optional, List, Dict, Any
+
 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):
@@ -39,8 +41,8 @@ class ProxiesReader(ProxiesReaderProtocol):
             [] if self._check_proxies else self._all_proxies
         )
 
-        self._proxy_iterator: Optional[ProxyiesGen] = None
-        self._proxy_iterator_cycle: Optional[ProxyiesGen] = None
+        self._proxy_iterator: ProxyiesGen | None = None
+        self._proxy_iterator_cycle: ProxyiesGen | None = None
         self._thread_control: asyncio.Semaphore = asyncio.Semaphore(
             proxy_checking_threads
         )
@@ -168,7 +170,7 @@ class ProxiesReader(ProxiesReaderProtocol):
             random.shuffle(self._all_proxies)
 
     async def _check_proxy(
-        self, proxy: Proxy, response_time: Optional[int] = None
+        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)
@@ -223,7 +225,7 @@ class ProxiesReader(ProxiesReaderProtocol):
             logger.debug("All proxies checked.")
 
     async def _check_proxy_socks(
-        self, proxy: Proxy, response_time: Optional[int] = None
+        self, proxy: Proxy, response_time: int | None = None
     ) -> bool:
         url = self._random_proxy_check_url()
         socks_connector = ProxyConnector.from_url(proxy.socks5)  # type: ignore
@@ -256,7 +258,7 @@ class ProxiesReader(ProxiesReaderProtocol):
 
     async def check_all_proxies_socks5(self, max_resp_time: int = 5) -> None:
         """Run the check on all proxies at once."""
-        tasks: List[asyncio.Task[bool]] = []
+        tasks: list[asyncio.Task[bool]] = []
         for proxy in self._all_proxies:
             tasks.append(
                 asyncio.create_task(self._check_proxy_socks(proxy, max_resp_time))
@@ -265,8 +267,8 @@ class ProxiesReader(ProxiesReaderProtocol):
         self._proxies_checked = True
         logger.debug("All proxies checked.")
 
-    def get_working_proxies_list_http(self) -> List[str]:
-        working_list: List[str] = []
+    def get_working_proxies_list_http(self) -> list[str]:
+        working_list: list[str] = []
         for proxy in self._working_proxies:
             working_list.append(proxy.http)
         return working_list
@@ -278,28 +280,28 @@ class ProxiesReader(ProxiesReaderProtocol):
             f.write("\n".join([proxy.strip() for proxy in working_list]))
         logger.debug(f"Proxies written to: {filename}")
 
-    def get_random_http(self) -> Optional[str]:
+    def get_random_http(self) -> str | None:
         _p = None
         if len(self._working_proxies) > 0:
             proxy = random.choice(self._working_proxies)
             _p = proxy.http
         return _p
 
-    def get_random_socks5(self) -> Optional[str]:
+    def get_random_socks5(self) -> str | None:
         _p = None
         if len(self._working_proxies) > 0:
             proxy = random.choice(self._working_proxies)
             _p = proxy.socks5
         return _p
 
-    def get_random_socks5_telegram(self) -> Optional[Dict[str, Any]]:
+    def get_random_socks5_telegram(self) -> dict[str, Any] | None:
         _p = None
         if len(self._working_proxies) > 0:
             proxy = random.choice(self._working_proxies)
             _p = proxy.telegram_socks5
         return _p
 
-    def next_http_from_list(self) -> Optional[str]:
+    def next_http_from_list(self) -> str | None:
         """Get next proxy from proxies list"""
 
         def __iter() -> ProxyiesGen:
@@ -339,14 +341,14 @@ class ProxiesReader(ProxiesReaderProtocol):
             )
         return str(next(self._proxy_iterator_cycle).socks5)
 
-    def next_http_telegram_from_list(self) -> Dict[str, Any]:
+    def next_http_telegram_from_list(self) -> dict[str, Any]:
         """Get next proxy from proxies list"""
 
         if self._proxy_iterator is None:
             self._proxy_iterator = self.__proxies_gen(self._working_proxies)
         return dict(next(self._proxy_iterator).telegram_http)
 
-    def next_http_telegram_from_cycle(self) -> Dict[str, Any]:
+    def next_http_telegram_from_cycle(self) -> dict[str, Any]:
         """Get next proxy from proxies cycle"""
 
         if self._proxy_iterator is None:
@@ -355,7 +357,7 @@ class ProxiesReader(ProxiesReaderProtocol):
             )
         return dict(next(self._proxy_iterator).telegram_http)
 
-    def next_socks5_telegram_from_cycle(self) -> Dict[str, Any]:
+    def next_socks5_telegram_from_cycle(self) -> dict[str, Any]:
         """Get next proxy from proxies cycle"""
         if self._proxy_iterator_cycle is None:
             self._proxy_iterator_cycle = self.__proxies_gen(
@@ -363,7 +365,7 @@ class ProxiesReader(ProxiesReaderProtocol):
             )
         return dict(next(self._proxy_iterator_cycle).telegram_socks5)
 
-    def next_socks5_telegram_from_list(self) -> Dict[str, Any]:
+    def next_socks5_telegram_from_list(self) -> dict[str, Any]:
         """Get next proxy from proxies cycle"""
 
         if self._proxy_iterator_cycle is None:
@@ -389,7 +391,7 @@ class ProxiesReader(ProxiesReaderProtocol):
         return str(next(self._proxy_iterator_cycle).https)
 
     def __proxies_gen(
-        self, proxies_list: List[Proxy], cycle_proxies: bool = False
+        self, proxies_list: list[Proxy], cycle_proxies: bool = False
     ) -> ProxyiesGen:
         if cycle_proxies:
             for proxy in itertools.cycle(self._working_proxies):

proxy_reader/utils.py

@@ -1,6 +1,7 @@
-from ._types import ProxyDictT
 import re
 from typing import cast
+
+from ._types import ProxyDictT
 from .logs_config import logger
 
 
@@ -8,7 +9,7 @@ def parse_proxy_line(proxy: str) -> ProxyDictT:
     """
     Detects the format of the proxy string and extracts the components.
 
-    Returns a dictionary with 'ip_or_host', 'port', 'username', and 'password'.
+    Returns a dictionary with 'host', 'port', 'username', and 'password'.
     """
     logger.info("Reading the proxy format ...")
     patterns: list[str] = [
@@ -21,7 +22,7 @@ def parse_proxy_line(proxy: str) -> ProxyDictT:
         # Format 4: USERNAME:PASSWORD@IP/Hostname:PORT
         r"^(?P<username>[^:]+):(?P<password>[^@]+)@(?P<host>[\w\.-]+):(?P<port>\d+)$",
         # Format 5: IP/Hostname:PORT (No Username/Password)
-        r"^(?P<ip_or_host>[\w\.-]+):(?P<port>\d+)$",
+        r"^(?P<host>[\w\.-]+):(?P<port>\d+)$",
     ]
 
     for pattern in patterns:

proxy_reader-2.1.0.dist-info/METADATA

@@ -0,0 +1,48 @@
+Metadata-Version: 2.4
+Name: proxy-reader
+Version: 2.1.0
+Summary: Proxy reader for Python
+Project-URL: Homepage, https://github.com/runetech0/proxy-reader
+Project-URL: github, https://github.com/runetech0/proxy-reader
+Requires-Python: >=3.12
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: aiohttp>=3.12.15
+Requires-Dist: aiohttp-socks>=0.10.1
+Requires-Dist: pytest>=8.4.1
+Provides-Extra: test
+Requires-Dist: pytest>=7.0.0; extra == "test"
+Dynamic: license-file
+
+
+
+
+# proxy-reader - A simple but useful bulk proxies reader and checker.
+
+This is useful when you are working with multiple proxies and want to bulk check
+these proxies before using them.
+It has iterators to iterate the proxies for easy reading.
+
+
+## Installation
+
+```
+pip install proxy-reader
+```
+
+## Changelogs
+
+### [v0.3.0]
+*   Add load_list class method to load proxies from list
+*   MAJOR: auto detect the proxies format
+*   Use new logging config to disable logs and prevent proxy_reader.log from creating
+*   Logs can be enabled from user-side
+*   Add option to disable proxies checking from __init__
+
+
+### [v0.2.0] - 2024-10-21
+
+*   Previous unrecorded changes
+
+
+For more info/queries Telegram: [@runetech](https://t.me/runetech)

proxy_reader-2.1.0.dist-info/RECORD

@@ -0,0 +1,15 @@
+proxy_reader/__init__.py,sha256=L3-vb_-fS3dfrnunLqTxpqwIOq_ygiV8cKZpfJsXWns,45
+proxy_reader/_types.py,sha256=C285ga4m1KGJ9IREBGzXp6bdOIOm87rJKu2USQ1tZG0,488
+proxy_reader/domains.py,sha256=d4FUb2zw3Kg9bAjtaggEcxZA293WvVcRTgMKKPmYr1A,135662
+proxy_reader/logs_config.py,sha256=SXNDi0op7Bk69qxbVsYajdSAfhhw9eTVVdf6MS2v6Ts,747
+proxy_reader/proxy.py,sha256=THieTNRtZEl86ijK5nFbSqQ030alzkFFU7aSkOPr6JU,2676
+proxy_reader/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+proxy_reader/reader.py,sha256=vlehkoWcgO3QoWBV2X33_HUzCzphfIogaH-Autl-USk,13519
+proxy_reader/utils.py,sha256=LkRUug8Utm-zsje50L3n80V7DPJ8FSHjoyQKEPlUIOY,1451
+proxy_reader/protocols/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+proxy_reader/protocols/reader.py,sha256=UbQKOPhIqRwaGpgN29-zdUs1hYOaBKCyqjgb9gQHrD0,2004
+proxy_reader-2.1.0.dist-info/licenses/LICENSE,sha256=8DyHi9RsZXeM8s1DpaXubZSSG44PkzV2oskJE3E09F4,1081
+proxy_reader-2.1.0.dist-info/METADATA,sha256=gWBCI39LWS5UdC08lSQ8vmyAK0ExnkAJDv_PWNbplDQ,1229
+proxy_reader-2.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+proxy_reader-2.1.0.dist-info/top_level.txt,sha256=NIrKvLf5DF2_oEnj0yg84roFna2-MaJ7zE1jY2CIU0I,13
+proxy_reader-2.1.0.dist-info/RECORD,,

{proxy_reader-2.0.0.dist-info → proxy_reader-2.1.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.0.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

proxy_reader-2.0.0.dist-info/METADATA

@@ -1,54 +0,0 @@
-Metadata-Version: 2.2
-Name: proxy-reader
-Version: 2.0.0
-Summary: Read and check bulk proxies effectively
-Author-email: Rune Tech <runetech2024@gmail.com>
-License: The MIT License (MIT)
-        Copyright © 2024 Rune Tech
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Project-URL: Homepage, https://github.com/runetech0/proxy-reader
-Project-URL: github, https://github.com/runetech0/proxy-reader
-Keywords: proxies,proxy,reader,checker,bulk
-Requires-Python: >=3.11
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: aiohttp>=3.10.10
-Requires-Dist: aiohttp_socks>=0.9.0
-
-
-
-
-# proxy-reader - A simple but useful bulk proxies reader and checker.
-
-This is useful when you are working with multiple proxies and want to bulk check
-these proxies before using them.
-It has iterators to iterate the proxies for easy reading.
-
-
-## Installation
-
-```
-pip install proxy-reader
-```
-
-## Changelogs
-
-### [v0.3.0]
-*   Add load_list class method to load proxies from list
-*   MAJOR: auto detect the proxies format
-*   Use new logging config to disable logs and prevent proxy_reader.log from creating
-*   Logs can be enabled from user-side
-*   Add option to disable proxies checking from __init__
-
-
-### [v0.2.0] - 2024-10-21
-
-*   Previous unrecorded changes
-
-
-For more info/queries Telegram: [@runetech](https://t.me/runetech)

proxy_reader-2.0.0.dist-info/RECORD

@@ -1,15 +0,0 @@
-proxy_reader/__init__.py,sha256=vfiYXTHuR6qdMnj59SpTDv8lfyhX7BXRCJz16ejC3QI,46
-proxy_reader/_types.py,sha256=C285ga4m1KGJ9IREBGzXp6bdOIOm87rJKu2USQ1tZG0,488
-proxy_reader/domains.py,sha256=d4FUb2zw3Kg9bAjtaggEcxZA293WvVcRTgMKKPmYr1A,135662
-proxy_reader/logs_config.py,sha256=SXNDi0op7Bk69qxbVsYajdSAfhhw9eTVVdf6MS2v6Ts,747
-proxy_reader/proxy.py,sha256=R_imEwRmuHoflSsY5-SL6x840aRAGswwSYQkjUEF0MU,2676
-proxy_reader/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-proxy_reader/reader.py,sha256=-TM1yyZJm4KjayzYuxVwuXYSJ4AUIMimlwdxP41cNSY,13563
-proxy_reader/utils.py,sha256=WI-yVQF_Jjz9z-ougsHJgoXGC9fTqWwWHfwd1-7HUh4,1462
-proxy_reader/protocols/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-proxy_reader/protocols/reader.py,sha256=UbQKOPhIqRwaGpgN29-zdUs1hYOaBKCyqjgb9gQHrD0,2004
-proxy_reader-2.0.0.dist-info/LICENSE,sha256=8DyHi9RsZXeM8s1DpaXubZSSG44PkzV2oskJE3E09F4,1081
-proxy_reader-2.0.0.dist-info/METADATA,sha256=SUjVd02zim8EpqL5pRtrCHUgLakuIVMh0qfsGS8r4bQ,2366
-proxy_reader-2.0.0.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-proxy_reader-2.0.0.dist-info/top_level.txt,sha256=NIrKvLf5DF2_oEnj0yg84roFna2-MaJ7zE1jY2CIU0I,13
-proxy_reader-2.0.0.dist-info/RECORD,,