mm-std 0.3.23__py3-none-any.whl → 0.3.25__py3-none-any.whl

mm_std/http_.py

@@ -1,13 +1,13 @@
-import asyncio
 import json
 from dataclasses import asdict, dataclass, field
-from typing import Any
-from urllib.parse import urlencode
+from typing import Any, cast
+from urllib.parse import urlencode, urlparse
 
 import aiohttp
 import pydash
 import requests
 from aiohttp_socks import ProxyConnector
+from multidict import CIMultiDictProxy
 from requests.auth import AuthBase
 
 from mm_std.result import Err, Ok, Result
@@ -73,10 +73,13 @@ class HResponse:
         return self.error == "timeout"
 
     def is_proxy_error(self) -> bool:
-        return self.error == "proxy_error"
+        return self.error == "proxy"
 
     def is_connection_error(self) -> bool:
-        return self.error is not None and self.error.startswith("connection_error:")
+        return self.error is not None and self.error.startswith("connection:")
+
+    def is_dns_error(self) -> bool:
+        return self.error is not None and self.error.startswith("dns:")
 
     def to_dict(self) -> dict[str, Any]:
         return pydash.omit(asdict(self), "_json_data")
@@ -136,9 +139,9 @@ def hrequest(
     except requests.exceptions.Timeout:
         return HResponse(error="timeout")
     except requests.exceptions.ProxyError:
-        return HResponse(error="proxy_error")
+        return HResponse(error="proxy")
     except requests.exceptions.RequestException as err:
-        return HResponse(error=f"connection_error: {err}")
+        return HResponse(error=f"connection: {err}")
     except Exception as err:
         return HResponse(error=f"exception: {err}")
 
@@ -155,7 +158,6 @@ async def hrequest_async(
     user_agent: str | None = None,
     json_params: bool = True,
     auth: tuple[str, str] | None = None,
-    verify: bool = True,
 ) -> HResponse:
     query_params: dict[str, Any] | None = None
     data: dict[str, Any] | None = None
@@ -174,54 +176,65 @@ async def hrequest_async(
         data = params
 
     try:
-        # Configure connector based on proxy type
-        if proxy:
-            # HTTP proxy will be handled in request kwargs
-            connector = ProxyConnector.from_url(proxy) if proxy.startswith("socks5://") else aiohttp.TCPConnector(ssl=verify)
-        else:
-            connector = aiohttp.TCPConnector(ssl=verify)
-
-        timeout_obj = aiohttp.ClientTimeout(total=timeout)
-
-        async with aiohttp.ClientSession(connector=connector, timeout=timeout_obj, cookies=cookies) as session:
-            request_kwargs: dict[str, Any] = {"headers": headers}
-
-            if query_params:
-                request_kwargs["params"] = query_params
-            if json_:
-                request_kwargs["json"] = json_
-            if data:
-                request_kwargs["data"] = data
-
-            if auth and isinstance(auth, tuple) and len(auth) == 2:
-                request_kwargs["auth"] = aiohttp.BasicAuth(auth[0], auth[1])
-
-            # Set HTTP proxy (not needed for SOCKS5)
-            if proxy and not proxy.startswith("socks5://"):
-                request_kwargs["proxy"] = proxy
-
-            try:
-                async with await asyncio.wait_for(session.request(method, url, **request_kwargs), timeout=timeout) as response:
-                    body = await response.text()
-                    return HResponse(code=response.status, body=body, headers=dict(response.headers))
-            except TimeoutError:
-                return HResponse(error="timeout")
-            except (aiohttp.ClientProxyConnectionError, aiohttp.ClientHttpProxyError):
-                return HResponse(error="proxy_error")
-            except aiohttp.ClientConnectorError as err:
-                return HResponse(error=f"connection_error: {err}")
-            except aiohttp.ClientError as err:
-                return HResponse(error=f"connection_error: {err}")
-            except Exception as err:
-                if "couldn't connect to proxy" in str(err).lower():
-                    return HResponse(error="proxy_error")
-                return HResponse(error=f"exception: {err}")
+        request_kwargs: dict[str, Any] = {"headers": headers}
+        if query_params:
+            request_kwargs["params"] = query_params
+        if json_:
+            request_kwargs["json"] = json_
+        if data:
+            request_kwargs["data"] = data
+        if cookies:
+            request_kwargs["cookies"] = cookies
+        if auth and isinstance(auth, tuple) and len(auth) == 2:
+            request_kwargs["auth"] = aiohttp.BasicAuth(auth[0], auth[1])
+
+        if proxy and proxy.startswith("socks"):
+            return await _aiohttp_socks5(url, method, proxy, request_kwargs, timeout)
+        return await _aiohttp(url, method, request_kwargs, timeout=timeout, proxy=proxy)
+
     except TimeoutError:
         return HResponse(error="timeout")
+    except (aiohttp.ClientProxyConnectionError, aiohttp.ClientHttpProxyError, aiohttp.ClientConnectorError) as err:
+        if is_proxy_error(str(err), proxy):
+            return HResponse(error="proxy")
+        return HResponse(error=f"connection: {err}")
+    except aiohttp.ClientError as err:
+        return HResponse(error=f"error: {err}")
     except Exception as err:
         return HResponse(error=f"exception: {err}")
 
 
+def is_proxy_error(error_message: str, proxy: str | None) -> bool:
+    if not proxy:
+        return False
+    error_message = error_message.lower()
+    if "proxy" in error_message:
+        return True
+    return bool("cannot connect to" in error_message and cast(str, urlparse(proxy).hostname) in error_message)
+
+
+async def _aiohttp(
+    url: str, method: str, request_kwargs: dict[str, object], timeout: float | None = None, proxy: str | None = None
+) -> HResponse:
+    if proxy:
+        request_kwargs["proxy"] = proxy
+    client_timeout = aiohttp.ClientTimeout(total=timeout) if timeout else None
+    async with aiohttp.ClientSession(timeout=client_timeout) as session, session.request(method, url, **request_kwargs) as res:  # type: ignore[arg-type]
+        return HResponse(code=res.status, body=await res.text(), headers=headers_dict(res.headers))
+
+
+async def _aiohttp_socks5(
+    url: str, method: str, proxy: str, request_kwargs: dict[str, object], timeout: float | None = None
+) -> HResponse:
+    connector = ProxyConnector.from_url(proxy)
+    client_timeout = aiohttp.ClientTimeout(total=timeout) if timeout else None
+    async with (
+        aiohttp.ClientSession(connector=connector, timeout=client_timeout) as session,
+        session.request(method, url, **request_kwargs) as res,  # type: ignore[arg-type]
+    ):
+        return HResponse(code=res.status, body=await res.text(), headers=headers_dict(res.headers))
+
+
 def add_query_params_to_url(url: str, params: dict[str, object]) -> str:
     query_params = urlencode({k: v for k, v in params.items() if v is not None})
     if query_params:
@@ -231,3 +244,14 @@ def add_query_params_to_url(url: str, params: dict[str, object]) -> str:
 
 hr = hrequest
 hra = hrequest_async
+
+
+def headers_dict(headers: CIMultiDictProxy[str]) -> dict[str, str]:
+    result: dict[str, str] = {}
+    for key in headers:
+        values = headers.getall(key)
+        if len(values) == 1:
+            result[key] = values[0]
+        else:
+            result[key] = ", ".join(values)
+    return result

{mm_std-0.3.23.dist-info → mm_std-0.3.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mm-std
-Version: 0.3.23
+Version: 0.3.25
 Requires-Python: >=3.12
 Requires-Dist: aiohttp-socks~=0.10.1
 Requires-Dist: aiohttp~=3.11.16

{mm_std-0.3.23.dist-info → mm_std-0.3.25.dist-info}/RECORD

@@ -6,7 +6,7 @@ mm_std/date.py,sha256=976eEkSONuNqHQBgSRu8hrtH23tJqztbmHFHLdbP2TY,1879
 mm_std/dict.py,sha256=6GkhJPXD0LiJDxPcYe6jPdEDw-MN7P7mKu6U5XxwYDk,675
 mm_std/env.py,sha256=5zaR9VeIfObN-4yfgxoFeU5IM1GDeZZj9SuYf7t9sOA,125
 mm_std/fs.py,sha256=RwarNRJq3tIMG6LVX_g03hasfYpjYFh_O27oVDt5IPQ,291
-mm_std/http_.py,sha256=75GX21e3OSVjJsHzUjFoMIfT8Iq4Fe6YHaEr9EWOF4o,7422
+mm_std/http_.py,sha256=5_V5Hx1M07xwzf0VVqAsxSFJkvtaAhj9_sFQP_HliQw,8215
 mm_std/json_.py,sha256=Naa6mBE4D0yiQGkPNRrFvndnUH3R7ovw3FeaejWV60o,1196
 mm_std/log.py,sha256=0TkTsAlUTt00gjgukvsvnZRIAGELq0MI6Lv8mKP-Wz4,2887
 mm_std/net.py,sha256=qdRCBIDneip6FaPNe5mx31UtYVmzqam_AoUF7ydEyjA,590
@@ -25,6 +25,6 @@ mm_std/concurrency/async_task_runner.py,sha256=EN7tN2enkVYVgDbhSiAr-_W4o9m9wBXCv
 mm_std/concurrency/sync_decorators.py,sha256=syCQBOmN7qPO55yzgJB2rbkh10CVww376hmyvs6e5tA,1080
 mm_std/concurrency/sync_scheduler.py,sha256=j4tBL_cBI1spr0cZplTA7N2CoYsznuORMeRN8rpR6gY,2407
 mm_std/concurrency/sync_task_runner.py,sha256=s5JPlLYLGQGHIxy4oDS-PN7O9gcy-yPZFoNm8RQwzcw,1780
-mm_std-0.3.23.dist-info/METADATA,sha256=8i2Wl_kTQ4IApdDBUzpbp8Q6P0RG3V8bffoMp2_9UeE,415
-mm_std-0.3.23.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_std-0.3.23.dist-info/RECORD,,
+mm_std-0.3.25.dist-info/METADATA,sha256=dLHZWg8G8cs5y3S8bu3zwxW-qgJaGaBGVQxS8vl4lcg,415
+mm_std-0.3.25.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_std-0.3.25.dist-info/RECORD,,