Refactor imports, add tests, and clean up dependencies

diprog · diprog · commit 9530b671736a · 2025-05-13T01:41:33.000+03:00
- Replaced local `CaseInsensitiveDict` with `requests.structures.CaseInsensitiveDict` across multiple files - Added comprehensive test suite including: * Basic request tests (GET/POST) * Error handling tests * Session feature tests (cookies, headers, TLS) * Test configuration in `conftest.py` - Added `requests` as a dependency in `pyproject.toml` - Cleaned up `ClientIdentifiers` type formatting for better readability Cleanup notes: 1. The removal of `async_tls_client/structures.py` (commit 8283627) should have been part of this changeset since we're migrating to `requests.structures`. 2. The test-related `pyproject.toml` configuration (added in 9c38840) should have been included here instead, as it logically belongs with the new test suite. This change completes the transition away from internal structures while adding proper test coverage.
diff --git a/async_tls_client/cookies.py b/async_tls_client/cookies.py
@@ -4,7 +4,7 @@
 from typing import Any, MutableMapping, Union
 from urllib.parse import urlparse, urlunparse
 
-from .structures import CaseInsensitiveDict
+from requests.structures import CaseInsensitiveDict
 
 try:
     import threading
diff --git a/async_tls_client/response.py b/async_tls_client/response.py
@@ -2,8 +2,9 @@
 import json
 from typing import Union
 
+from requests.structures import CaseInsensitiveDict
+
 from .cookies import RequestsCookieJar, cookiejar_from_dict
-from .structures import CaseInsensitiveDict
 
 
 class Response:
diff --git a/async_tls_client/session/async_session.py b/async_tls_client/session/async_session.py
@@ -6,11 +6,12 @@
 from json import dumps, loads
 from typing import Any, Optional, Union
 
+from requests.structures import CaseInsensitiveDict
+
 from async_tls_client.cffi import destroySession, freeMemory, request
 from async_tls_client.cookies import cookiejar_from_dict, extract_cookies_to_jar, merge_cookies
 from async_tls_client.exceptions import TLSClientException
 from async_tls_client.response import Response, build_response
-from async_tls_client.structures import CaseInsensitiveDict
 from async_tls_client.types import ClientIdentifiers, Curves, DelegatedSignatureAlgorithms, H2Settings, \
     SignatureAlgorithms, \
     TLSVersions
diff --git a/async_tls_client/types.py b/async_tls_client/types.py
@@ -2,78 +2,53 @@
 
 ClientIdentifiers: TypeAlias = Literal[
     # Chrome
-    "chrome_103",
-    "chrome_104",
-    "chrome_105",
-    "chrome_106",
-    "chrome_107",
-    "chrome_108",
-    "chrome_109",
-    "chrome_110",
-    "chrome_111",
-    "chrome_112",
-    "chrome_116_PSK",
-    "chrome_116_PSK_PQ",
-    "chrome_117",
-    "chrome_120",
-    "chrome_124",
-    "chrome_131",
-    "chrome_131_PSK",
-    "chrome_133",
-    "chrome_133_PSK",
+    "chrome_103", "chrome_104", "chrome_105", "chrome_106", "chrome_107",
+    "chrome_108", "chrome_109", "chrome_110", "chrome_111", "chrome_112",
+    "chrome_116_PSK", "chrome_116_PSK_PQ", "chrome_117", "chrome_120",
+    "chrome_124", "chrome_131", "chrome_131_PSK", "chrome_133", "chrome_133_PSK",
     # Safari
-    "safari_15_6_1",
-    "safari_16_0",
+    "safari_15_6_1", "safari_16_0",
     # iOS (Safari)
-    "safari_ios_15_5",
-    "safari_ios_15_6",
-    "safari_ios_16_0",
-    "safari_ios_17_0",
-    "safari_ios_18_0",
+    "safari_ios_15_5", "safari_ios_15_6", "safari_ios_16_0", "safari_ios_17_0", "safari_ios_18_0",
     # iPadOS (Safari)
     "safari_ipad_15_6",
     # FireFox
-    "firefox_102",
-    "firefox_104",
-    "firefox_105",
-    "firefox_106",
-    "firefox_108",
-    "firefox_110",
-    "firefox_117",
-    "firefox_120",
-    "firefox_123",
-    "firefox_132",
-    "firefox_133",
-    "firefox_135",
+    "firefox_102", "firefox_104", "firefox_105", "firefox_106", "firefox_108",
+    "firefox_110", "firefox_117", "firefox_120", "firefox_123", "firefox_132",
+    "firefox_133", "firefox_135",
     # Opera
-    "opera_89",
-    "opera_90",
-    "opera_91",
+    "opera_89", "opera_90", "opera_91",
     # OkHttp4
-    "okhttp4_android_7",
-    "okhttp4_android_8",
-    "okhttp4_android_9",
-    "okhttp4_android_10",
-    "okhttp4_android_11",
-    "okhttp4_android_12",
-    "okhttp4_android_13",
+    "okhttp4_android_7", "okhttp4_android_8", "okhttp4_android_9", "okhttp4_android_10",
+    "okhttp4_android_11", "okhttp4_android_12", "okhttp4_android_13",
     # Custom
-    "zalando_ios_mobile",
-    "zalando_android_mobile",
-    "nike_ios_mobile",
-    "nike_android_mobile",
-    "cloudscraper",
-    "mms_ios",
-    "mms_ios_1",
-    "mms_ios_2",
-    "mms_ios_3",
-    "mesh_ios",
-    "mesh_ios_1",
-    "mesh_ios_2",
-    "mesh_android",
-    "mesh_android_1",
-    "mesh_android_2",
-    "confirmed_ios",
-    "confirmed_android",
-    "confirmed_android_2",
+    "zalando_ios_mobile", "zalando_android_mobile", "nike_ios_mobile", "nike_android_mobile",
+    "cloudscraper", "mms_ios", "mms_ios_1", "mms_ios_2", "mms_ios_3", "mesh_ios", "mesh_ios_1",
+    "mesh_ios_2", "mesh_android", "mesh_android_1", "mesh_android_2", "confirmed_ios", "confirmed_android",
+    "confirmed_android_2"
+]
+
+# https://github.com/bogdanfinn/tls-client/blob/7a71edbf6e05acd4ade8e910e4c29c968003e27b/mapper.go#L29
+SignatureAlgorithms: TypeAlias = Literal[
+    "PKCS1WithSHA256", "PKCS1WithSHA384", "PKCS1WithSHA512", "PSSWithSHA256", "PSSWithSHA384",
+    "PSSWithSHA512", "ECDSAWithP256AndSHA256", "ECDSAWithP384AndSHA384", "ECDSAWithP521AndSHA512",
+    "PKCS1WithSHA1", "ECDSAWithSHA1", "Ed25519", "SHA224_RSA", "SHA224_ECDSA"
+]
+
+DelegatedSignatureAlgorithms: TypeAlias = SignatureAlgorithms
+
+
+# https://github.com/bogdanfinn/tls-client/blob/7a71edbf6e05acd4ade8e910e4c29c968003e27b/mapper.go#L21
+TLSVersions: TypeAlias = Literal["GREASE", "1.3", "1.2", "1.1", "1.0"]
+
+# https://github.com/bogdanfinn/tls-client/blob/7a71edbf6e05acd4ade8e910e4c29c968003e27b/mapper.go#L75
+Curves: TypeAlias = Literal[
+    "GREASE", "P256", "P384", "P521", "X25519", "P256Kyber768", "X25519Kyber512D",
+    "X25519Kyber768", "X25519Kyber768Old", "X25519MLKEM768"
+]
+
+# https://github.com/bogdanfinn/tls-client/blob/7a71edbf6e05acd4ade8e910e4c29c968003e27b/mapper.go#L9
+H2Settings: TypeAlias = Literal[
+    "HEADER_TABLE_SIZE", "ENABLE_PUSH", "MAX_CONCURRENT_STREAMS", "INITIAL_WINDOW_SIZE", "MAX_FRAME_SIZE",
+    "MAX_HEADER_LIST_SIZE", "UNKNOWN_SETTING_7", "UNKNOWN_SETTING_8", "UNKNOWN_SETTING_9"
 ]
diff --git a/pyproject.toml b/pyproject.toml
@@ -28,6 +28,7 @@ classifiers = [
 requires-python = ">=3.9"
 dependencies = [
     "typing-extensions>=4.0",
+    "requests" # tested with 2.32.2
 ]
 
 [project.urls]
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -0,0 +1,7 @@
+import pytest
+from async_tls_client import AsyncSession
+
+@pytest.fixture
+async def session():
+    async with AsyncSession(client_identifier="chrome120") as sess:
+        yield sess
diff --git a/tests/test_basic_requests.py b/tests/test_basic_requests.py
@@ -0,0 +1,26 @@
+import pytest
+
+@pytest.mark.asyncio
+async def test_get_request(session):
+    response = await session.get("https://httpbin.org/get")
+    assert response.status_code == 200
+    assert response.url == "https://httpbin.org/get"
+    assert "headers" in response.json()
+
+@pytest.mark.asyncio
+async def test_post_with_data(session):
+    response = await session.post(
+        "https://httpbin.org/post",
+        data={"key": "value"}
+    )
+    assert response.status_code == 200
+    assert response.json()["form"] == {"key": "value"}
+
+@pytest.mark.asyncio
+async def test_post_with_json(session):
+    response = await session.post(
+        "https://httpbin.org/post",
+        json={"key": "value"}
+    )
+    assert response.status_code == 200
+    assert response.json()["json"] == {"key": "value"}
diff --git a/tests/test_errors.py b/tests/test_errors.py
@@ -0,0 +1,20 @@
+import pytest
+from async_tls_client.exceptions import TLSClientException
+
+@pytest.mark.asyncio
+async def test_invalid_url(session):
+    with pytest.raises(TLSClientException):
+        await session.get("invalid://invalid-url")
+
+@pytest.mark.asyncio
+async def test_timeout(session):
+    with pytest.raises(TLSClientException):
+        await session.get(
+            "https://httpbin.org/delay/5",
+            timeout_seconds=1
+        )
+
+@pytest.mark.asyncio
+async def test_nonexistent_domain(session):
+    with pytest.raises(TLSClientException):
+        await session.get("https://nonexistent-domain-12345.com")
diff --git a/tests/test_session_features.py b/tests/test_session_features.py
@@ -0,0 +1,25 @@
+import pytest
+
+@pytest.mark.asyncio
+async def test_cookie_handling(session):
+    # Set cookie
+    await session.get("https://httpbin.org/cookies/set/sessioncookie/12345")
+    # Verify persistence
+    response = await session.get("https://httpbin.org/cookies")
+    assert response.json()["cookies"] == {"sessioncookie": "12345"}
+
+@pytest.mark.asyncio
+async def test_custom_headers(session):
+    response = await session.get(
+        "https://httpbin.org/headers",
+        headers={"X-Test-Header": "value"}
+    )
+    assert response.json()["headers"]["X-Test-Header"] == "value"
+
+@pytest.mark.asyncio
+async def test_tls_fingerprinting(session):
+    response = await session.get("https://tls.peet.ws/api/all")
+    data = response.json()
+    assert "tls" in data
+    assert "ja3_hash" in data["tls"]
+    assert len(data["tls"]["ja3_hash"]) == 32  # MD5 hash length

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ classifiers = [`
`28`	`28`	`requires-python = ">=3.9"`
`29`	`29`	`dependencies = [`
`30`	`30`	`"typing-extensions>=4.0",`
	`31`	`+ "requests" # tested with 2.32.2`
`31`	`32`	`]`
`32`	`33`
`33`	`34`	`[project.urls]`