14 Commits
Author SHA1 Message Date
dsql 929d248a3a build: re-pin aioweb to v1.1.0 (inherit the request() hang-guard)
aioweb v1.1.0 adds an outer asyncio deadline on every request so a wedged backend can't
park the loop forever. TLSSession inherits request()/request_with_retries unchanged, so
the guard applies to the curl_cffi/noble backends with no code change here. patch bump -
dependency-only, no aioweb_tls API change.

Signed-off-by: disqualifier <dev@disqualifier.me>
2026-07-27 11:33:35 -04:00
dsql a37805cad1 build: use git+https for inter-lib deps (docker ssh limitation)
docker builds can't use git+ssh (no ssh key / agent in the build), so the inter-lib
dependency references move to git+https (repos are public, anonymous clone). pins are
unchanged in target; bump to 1.0.2 so the https dependency spec ships under a new tag.
README install lines intentionally keep the ssh form for local/dev use.

Signed-off-by: disqualifier <dev@disqualifier.me>
2026-07-20 22:25:06 -04:00
dsql e5710f4e3b fix: pin inter-lib dependencies to their v1.0.0 tags
the v1.0.0 release still pinned pre-1.0.0 sibling tags, so a fresh install dragged in
stale transitive deps. update the pin(s) to the current v1.0.x release and bump this lib
to 1.0.1 so the corrected dependency chain ships under a new tag (v1.0.0 left intact).

Signed-off-by: disqualifier <dev@disqualifier.me>
2026-07-17 17:46:10 -04:00
dsql 7ee6cc9b88 release: 1.0.0
first stable release. pre-1.0.0 verification complete: all surviving MED regressions and
gaps resolved and independently re-fired, tree audited clean across the suite.

Signed-off-by: disqualifier <dev@disqualifier.me>
2026-07-09 18:53:15 -04:00
dsql b5cc6b9374 fix: _jar_to_dict prefers get_dict() to survive cross-domain cookie conflicts
the preview cookie map still used jar.items(), which raises curl_cffi CookieConflict when
the same cookie name lives on two domains - the blanket except then returned {}, so preview()
silently showed zero cookies in exactly the state ec1a20a adopted get_dict() to survive on
get_cookies. prefer get_dict() when the jar exposes it (hasattr-guarded), fall back to items()
for a plain mapping jar. preview-only; the items() path is unchanged for jars without get_dict.

Signed-off-by: disqualifier <dev@disqualifier.me>
2026-07-06 21:16:15 -04:00
dsql cc5e4a9414 docs: correct the CurlCffi redirect-history claim
curl_cffi never populates Response.history (it follows redirects in the native curl layer
and surfaces only the final URL/status), so the v0.1.7 claim that resp.history shows 'the
real hops on either backend' was false for CurlCffi - resp.history/redirect_chain are []
there even after a redirect. README + changelog now document this curl_cffi limitation
instead. Noble threads whatever noble_tls records. No code change (the adapter is correct;
curl_cffi just has no data to map).

Signed-off-by: disqualifier <dev@disqualifier.me>
2026-07-06 19:57:59 -04:00
dsql ec1a20a3f6 fix: CurlCffi preserves duplicate Set-Cookie and get_cookies survives cross-domain names
CIMultiDict(response.headers) consumed curl_cffi Headers.items(), which comma-joins
duplicate header keys, collapsing multiple Set-Cookie lines into one corrupted value -
now uses multi_items() so duplicates stay separate. get_cookies used dict(cookies.items()),
which raises curl_cffi CookieConflict when the same name exists on two domains - now uses
get_dict() (flattens, no raise). Noble.get_cookies prefers get_dict() where the jar exposes
it (unverified live-gap: the noble extra isn't installed here).

Signed-off-by: disqualifier <dev@disqualifier.me>
2026-07-06 19:28:40 -04:00
dsql 8ed97a185f docs: bump stale aioweb dependency pin; note setup() is not auto-invoked
aioweb's git+ssh pin was stale at v0.1.5 against aioweb's actual latest tag,
v0.1.10 - bumped the pin, no change to aioweb_tls's own version. Also updates the
README's backend-protocol table to state that TLSSession never auto-invokes a
backend's setup(), matching the session.py docstring fix.

Signed-off-by: disqualifier <dev@disqualifier.me>
2026-07-06 00:10:27 -04:00
dsql df48d1cea3 fix: TLS backends return case-insensitive response headers
CurlCffi.raw_request and Noble's _flatten_headers built Response.headers as a plain
case-sensitive dict, while aioweb's aiohttp-backed path returns a CIMultiDict -
resp.headers.get('content-type') silently returned None on TLS backends when the
server sent 'Content-Type', contradicting the "backends behave identically" claim.
Both paths now build a multidict.CIMultiDict instead.

Signed-off-by: disqualifier <dev@disqualifier.me>
2026-07-06 00:10:20 -04:00
dsql b23e1d399e fix: TLSSession guards unbuilt session in _is_closed/close; document setup() is not auto-invoked
_is_closed() and close() called self.session unconditionally, routing through the
lazy session property and building a real backend client even when the session was
never used - including during __del__ on GC of a constructed-but-unused TLSSession,
silently building (and leaking) a backend client nothing ever closes. Mirrors
aioweb.ExtendedSession's own _session is None guards. Also corrects setup()'s
docstring, which claimed TLSSession invokes a backend's setup() lazily before the
first request - it never does; only Noble self-invokes it from its own raw_request.

Signed-off-by: disqualifier <dev@disqualifier.me>
2026-07-06 00:10:11 -04:00
dsql d40be6928a refactor: derive __version__ from package metadata (single source)
Signed-off-by: disqualifier <dev@disqualifier.me>
2026-07-03 17:01:01 -04:00
dsql 76c3024ccc docs: compress residual internal helper docstrings
Signed-off-by: disqualifier <dev@disqualifier.me>
2026-07-03 16:46:55 -04:00
dsql 92ddd5dc39 fix: thread redirect history through both TLS backends
CurlCffi.raw_request and Noble.raw_request built their Response without
history=, so resp.history/redirect_chain were always empty after a real
redirect despite inheriting aioweb's feature set unchanged. A shared
_history_entries() now maps each client's native history shape (curl_cffi
list[dict], noble_tls list[Response]) into aioweb's (status, url) tuples.

Signed-off-by: disqualifier <dev@disqualifier.me>
2026-07-03 16:19:46 -04:00
dsql 226f273695 docs: compress prose/module docstrings, em-dash->hyphen (de-bloat wave 1)
Signed-off-by: disqualifier <dev@disqualifier.me>
2026-07-03 00:16:00 -04:00
6 changed files with 156 additions and 202 deletions
+39 -8
View File
@@ -22,17 +22,17 @@ you want; importing the package never fails because an extra is missing.
`requirements.txt` (pick the extra you need): `requirements.txt` (pick the extra you need):
``` ```
aioweb_tls[curl] @ git+ssh://git@git.rethinkstudios.io/rethink-public/aioweb_tls.git@v0.1.5 aioweb_tls[curl] @ git+ssh://git@git.rethinkstudios.io/rethink-public/aioweb_tls.git@v1.0.3
aioweb_tls[noble] @ git+ssh://git@git.rethinkstudios.io/rethink-public/aioweb_tls.git@v0.1.5 aioweb_tls[noble] @ git+ssh://git@git.rethinkstudios.io/rethink-public/aioweb_tls.git@v1.0.3
aioweb_tls[all] @ git+ssh://git@git.rethinkstudios.io/rethink-public/aioweb_tls.git@v0.1.5 aioweb_tls[all] @ git+ssh://git@git.rethinkstudios.io/rethink-public/aioweb_tls.git@v1.0.3
``` ```
Direct: Direct:
```bash ```bash
pip install "aioweb_tls[curl] @ git+ssh://git@git.rethinkstudios.io/rethink-public/aioweb_tls.git@v0.1.5" pip install "aioweb_tls[curl] @ git+ssh://git@git.rethinkstudios.io/rethink-public/aioweb_tls.git@v1.0.3"
pip install "aioweb_tls[noble] @ git+ssh://git@git.rethinkstudios.io/rethink-public/aioweb_tls.git@v0.1.5" pip install "aioweb_tls[noble] @ git+ssh://git@git.rethinkstudios.io/rethink-public/aioweb_tls.git@v1.0.3"
pip install "aioweb_tls[all] @ git+ssh://git@git.rethinkstudios.io/rethink-public/aioweb_tls.git@v0.1.5" pip install "aioweb_tls[all] @ git+ssh://git@git.rethinkstudios.io/rethink-public/aioweb_tls.git@v1.0.3"
``` ```
- `[curl]` → curl_cffi backend · `[noble]` → noble_tls backend · `[all]` → both. - `[curl]` → curl_cffi backend · `[noble]` → noble_tls backend · `[all]` → both.
@@ -44,7 +44,7 @@ pip install "aioweb_tls[all] @ git+ssh://git@git.rethinkstudios.io/rethink-publi
Constructing a backend whose client isn't installed raises that `RuntimeError` at Constructing a backend whose client isn't installed raises that `RuntimeError` at
construction, never at import. construction, never at import.
Drop the `@v0.1.5` suffix from the line above to install the latest unpinned. Drop the `@v1.0.3` suffix from the line above to install the latest unpinned.
## curl_cffi backend ## curl_cffi backend
@@ -116,7 +116,7 @@ for the authoritative contract):
| `set_cookie` | optional | `(session, name, value, domain=None, path="/") -> None` | backs `TLSSession.set_cookie()`; raises `NotImplementedError` if absent | | `set_cookie` | optional | `(session, name, value, domain=None, path="/") -> None` | backs `TLSSession.set_cookie()`; raises `NotImplementedError` if absent |
| `get_cookies` | optional | `(session) -> dict` | backs `TLSSession.get_cookies()`; raises `NotImplementedError` if absent | | `get_cookies` | optional | `(session) -> dict` | backs `TLSSession.get_cookies()`; raises `NotImplementedError` if absent |
| `clear_cookies` | optional | `(session) -> None` | backs `TLSSession.clear_cookies()`; raises `NotImplementedError` if absent | | `clear_cookies` | optional | `(session) -> None` | backs `TLSSession.clear_cookies()`; raises `NotImplementedError` if absent |
| `setup` | optional | `async () -> None` | one-time prep (e.g. fetch a native lib); idempotent | | `setup` | optional | `async () -> None` | one-time prep (e.g. fetch a native lib); idempotent. `TLSSession` never calls this automatically - a backend needing lazy setup must self-invoke it from its own `raw_request`, as `Noble` does, or the caller must run `await session.setup()` explicitly |
| `close` | optional | `async (session) -> None` | close the session; defaults to `await session.close()` | | `close` | optional | `async (session) -> None` | close the session; defaults to `await session.close()` |
`raw_request` receives aioweb-shaped kwargs: the proxy is already resolved into `raw_request` receives aioweb-shaped kwargs: the proxy is already resolved into
@@ -198,12 +198,43 @@ cookie store (both expose a `requests`-style `session.cookies` with `set()` /
`items()` / `clear()`), so these calls work the same way they do on the base `items()` / `clear()`), so these calls work the same way they do on the base
`aioweb.ExtendedSession`, not just `_cookies_for_url()` (used by `preview()`). `aioweb.ExtendedSession`, not just `_cookies_for_url()` (used by `preview()`).
`resp.history` / `resp.redirect_chain` (`[(status, url), ...]`) and `resp.is_redirect`
are threaded through from whatever redirect history the backend exposes. **Caveat — the
CurlCffi backend has no per-hop history:** `curl_cffi` follows redirects internally in the
native curl layer and surfaces only the final URL/status, leaving `Response.history` an
empty list (it never populates it). So on `CurlCffi`, `resp.history`/`resp.redirect_chain`
are `[]` and `resp.is_redirect` reflects only the final response, even after a redirect —
this is a `curl_cffi` limitation, not a bug here, and it differs from the base aiohttp
`ExtendedSession` (which does record the hops). The `Noble` backend threads whatever
`noble_tls` exposes as its per-response history. If you need the redirect chain, use the
base backend or read the final URL.
## Honesty note ## Honesty note
TLS fingerprinting changes one layer — the TLS/HTTP fingerprint. It does **not** by TLS fingerprinting changes one layer — the TLS/HTTP fingerprint. It does **not** by
itself defeat modern bot protection: behavioral analysis, captchas, and JS challenges itself defeat modern bot protection: behavioral analysis, captchas, and JS challenges
are separate signals. Use this as one component, not a complete anti-bot solution. are separate signals. Use this as one component, not a complete anti-bot solution.
## Changelog
### v0.1.8
- Compressed 4 residual internal-helper docstrings (`_is_timeout_error`,
`_noble_timeout_seconds`, `_noble_content`, `_jar_to_dict`) to one-liners.
Cosmetic, zero behavior change.
### v0.1.7
- **Backends thread whatever redirect history the client exposes.** `CurlCffi.raw_request`
and `Noble.raw_request` built their `Response` without `history=`, so
`resp.history`/`resp.redirect_chain`/`resp.is_redirect`-after-follow were always empty
and aioweb's own `debug=True` "redirect chain:" log line was dead on both TLS backends.
Each backend now maps its client's history into aioweb's `(status, url)` tuple shape.
**Caveat:** `curl_cffi` never populates `Response.history` (it follows redirects in the
native curl layer and surfaces only the final URL/status), so on the `CurlCffi` backend
`resp.history` is `[]` even after a redirect — a `curl_cffi` limitation, not addressable
here. `Noble` passes through whatever `noble_tls` records.
## Versioning ## Versioning
Releases are tagged `vX.Y.Z`. The install line above pins a release; drop the `@vX.Y.Z` suffix to install the latest unpinned. Pin deliberately for reproducible installs. Releases are tagged `vX.Y.Z`. The install line above pins a release; drop the `@vX.Y.Z` suffix to install the latest unpinned. Pin deliberately for reproducible installs.
+2 -2
View File
@@ -4,11 +4,11 @@ build-backend = "hatchling.build"
[project] [project]
name = "aioweb_tls" name = "aioweb_tls"
version = "0.1.5" version = "1.0.3"
description = "TLS-fingerprinting backends (curl_cffi / noble_tls) for aioweb via one injectable TLSSession, config-free, installable." description = "TLS-fingerprinting backends (curl_cffi / noble_tls) for aioweb via one injectable TLSSession, config-free, installable."
requires-python = ">=3.10" requires-python = ">=3.10"
dependencies = [ dependencies = [
"aioweb @ git+ssh://git@git.rethinkstudios.io/rethink-public/aioweb.git@v0.1.5", "aioweb @ git+https://git.rethinkstudios.io/rethink-public/aioweb.git@v1.1.0",
] ]
[project.optional-dependencies] [project.optional-dependencies]
+8 -15
View File
@@ -1,28 +1,21 @@
""" """
tls-fingerprinting backends for aioweb tls-fingerprinting backends for aioweb - see README for usage and the extras contract
one session class, TLSSession, takes an injected backend that swaps the HTTP client
(and thus the TLS/HTTP fingerprint) while inheriting every aioweb feature — header
overwrites, domain rewriting, ephemeral headers, proxies, retries, previews —
unchanged.
from aioweb_tls import TLSSession, CurlCffi, Noble from aioweb_tls import TLSSession, CurlCffi, Noble
async with TLSSession(backend=CurlCffi(impersonate="chrome")) as s: # [curl] extra async with TLSSession(backend=CurlCffi(impersonate="chrome")) as s: # [curl] extra
resp = await s.request_with_retries("GET", url) resp = await s.request_with_retries("GET", url)
async with TLSSession(backend=Noble(client="chrome_133")) as s: # [noble] extra
await s.setup() # fetch Go lib once
resp = await s.request_with_retries("GET", url)
the tls clients are optional extras, not base deps. importing this package never
fails because an extra is missing; the matching RuntimeError is raised only when you
construct a backend whose client isn't installed. custom backends implement the
TLSBackend protocol and inject the same way.
""" """
from importlib.metadata import version, PackageNotFoundError
from .session import TLSSession from .session import TLSSession
from .backends import CurlCffi, Noble from .backends import CurlCffi, Noble
from .protocol import TLSBackend from .protocol import TLSBackend
try:
__version__ = version("aioweb_tls")
except PackageNotFoundError:
__version__ = "0.0.0+unknown"
__all__ = ["TLSSession", "CurlCffi", "Noble", "TLSBackend"] __all__ = ["TLSSession", "CurlCffi", "Noble", "TLSBackend"]
+82 -104
View File
@@ -1,14 +1,6 @@
""" """
tls backends for TLSSession tls backends for TLSSession - stateless config+behavior objects implementing the
TLSBackend protocol (see protocol.py); see README for the extras contract
each backend is a stateless config+behavior object implementing the TLSBackend
protocol (see protocol.py). it owns its own config vocabulary — CurlCffi takes
impersonate=, Noble takes client= — so there is no shared kwarg-soup. TLSSession
owns the live session object and passes it into every method here.
the underlying tls clients are optional extras: constructing a backend whose client
is not installed raises a clear RuntimeError naming the extra to install. importing
this module never fails because an extra is missing.
""" """
import asyncio import asyncio
@@ -17,18 +9,14 @@ import logging
import math import math
import aiohttp import aiohttp
from multidict import CIMultiDict
from aioweb import Response from aioweb import Response
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
def _as_client_error(error: Exception, backend: str) -> aiohttp.ClientError: def _as_client_error(error: Exception, backend: str) -> aiohttp.ClientError:
"""wrap a backend-native network exception as an aiohttp.ClientError """wrap a backend-native network exception (neither is an aiohttp.ClientError) as one"""
curl_cffi raises RequestException(OSError), noble_tls raises
TLSClientException(IOError) — neither is an aiohttp.ClientError, which is all
aioweb's request() re-wraps; translating here gives both the same typed contract.
"""
return aiohttp.ClientError(f"{backend} request failed: {error}") return aiohttp.ClientError(f"{backend} request failed: {error}")
@@ -36,14 +24,7 @@ _TIMEOUT_TEXT = ("timeout", "timed out", "deadline exceeded")
def _is_timeout_error(error: Exception) -> bool: def _is_timeout_error(error: Exception) -> bool:
"""whether a backend-native network error is a timeout """whether a backend-native OSError is a timeout, by type name (curl_cffi) or Go error text (noble_tls)"""
neither backend raises asyncio.TimeoutError for a wire timeout: curl_cffi's own
Timeout and noble_tls's Go-side TLSClientException are both plain OSError
subclasses with no dedicated timeout type — check curl_cffi's Timeout class by
name first (precise), then fall back to matching the error text (covers
noble_tls's Go messages, e.g. "context deadline exceeded").
"""
timeout_type = getattr(error, "__class__", None) timeout_type = getattr(error, "__class__", None)
if timeout_type is not None and any(base.__name__ == "Timeout" for base in timeout_type.__mro__): if timeout_type is not None and any(base.__name__ == "Timeout" for base in timeout_type.__mro__):
return True return True
@@ -51,11 +32,7 @@ def _is_timeout_error(error: Exception) -> bool:
def _as_timeout_error(error: Exception, backend: str) -> aiohttp.ServerTimeoutError: def _as_timeout_error(error: Exception, backend: str) -> aiohttp.ServerTimeoutError:
"""wrap a backend-native timeout as aiohttp.ServerTimeoutError """wrap a backend-native timeout as aiohttp.ServerTimeoutError, matching aioweb's own contract"""
matches aioweb's own contract (a total timeout raises ServerTimeoutError, both a
ClientError and a TimeoutError) instead of surfacing as a generic client error.
"""
return aiohttp.ServerTimeoutError(f"{backend} request timed out: {error}") return aiohttp.ServerTimeoutError(f"{backend} request timed out: {error}")
@@ -77,23 +54,14 @@ except ImportError as error:
def _coerce_timeout(value): def _coerce_timeout(value):
"""unwrap aioweb's aiohttp ClientTimeout (or a plain number) to a number """unwrap aioweb's aiohttp.ClientTimeout (or a plain number) to a bare number for the tls clients"""
aioweb.request() wraps a numeric timeout in aiohttp.ClientTimeout before the seam
sees it; the tls clients want a bare number.
"""
total = getattr(value, "total", value) total = getattr(value, "total", value)
return total if isinstance(total, (int, float)) else None return total if isinstance(total, (int, float)) else None
def _noble_timeout_seconds(value): def _noble_timeout_seconds(value):
"""coerce a raw or wrapped timeout into whole seconds for noble's Go int field """coerce a raw or wrapped timeout into whole seconds (min 1), rounding up so noble's Go int
field never truncates to 0/fails unmarshal; None if uncoercible; shared by both Noble timeout paths"""
single source of truth for both Noble timeout paths (session-default and
per-call): the Go field timeoutSeconds is an int, so a sub-second float truncates
to 0 (= no timeout) and a non-integer fails Go-side JSON unmarshal outright.
rounds up so a sub-second timeout still waits at least 1s. None if uncoercible.
"""
timeout = _coerce_timeout(value) timeout = _coerce_timeout(value)
if timeout is None: if timeout is None:
return None return None
@@ -101,14 +69,8 @@ def _noble_timeout_seconds(value):
def _noble_content(response) -> bytes: def _noble_content(response) -> bytes:
"""extract true response bytes from a noble_tls response fetched with is_byte_response """extract true response bytes from a noble_tls response fetched with is_byte_response, decoding
the base64 data-URI in response.text (falls back to a plain utf-8 encode if not a data-URI)"""
with is_byte_response=True, noble_tls's Go side returns the body as a
`data:<mime>;base64,<payload>` URI string in response.text (the whole Go response
is UTF-8-decoded before JSON parsing, so raw bytes travel as base64) —
response.content just re-encodes that string, so decode the data-URI here
instead. falls back to a plain utf-8 encode if the body isn't a data-URI.
"""
text = getattr(response, "text", "") or "" text = getattr(response, "text", "") or ""
if text.startswith("data:") and ";base64," in text: if text.startswith("data:") and ";base64," in text:
_, _, payload = text.partition(";base64,") _, _, payload = text.partition(";base64,")
@@ -116,30 +78,50 @@ def _noble_content(response) -> bytes:
return text.encode() return text.encode()
def _flatten_headers(headers) -> dict: def _flatten_headers(headers) -> CIMultiDict:
"""flatten a Go-style map[str][]str header dict into plain str values """flatten a Go-style map[str][]str header dict (multi-valued headers as a list)
into plain str values, joined with ", " per RFC 7230, into a case-insensitive
noble_tls keeps a multi-valued header (e.g. two Set-Cookie lines) as a Python mapping matching aioweb's aiohttp-backed Response.headers"""
list, breaking any downstream .split()/.lower() call; join with ", " per RFC 7230 return CIMultiDict(
field-value combination, leaving single values untouched. (key, ", ".join(value) if isinstance(value, list) else value)
"""
return {
key: ", ".join(value) if isinstance(value, list) else value
for key, value in headers.items() for key, value in headers.items()
} )
def _history_entries(history) -> list:
"""map a backend-native redirect history into aioweb's `Response(history=...)` shape
aioweb's own `_raw_request` threads `[(status, url), ...]`; curl_cffi's
`Response.history` is `list[dict]` (dict-shaped hop records) and noble_tls's is
`list[Response]` (object-shaped, same accessors as the top-level response) - this
reads a hop's status/url either way. an unparseable hop is skipped rather than
raising, so a redirect-history quirk never breaks the response it's attached to.
"""
entries = []
for hop in history or []:
if isinstance(hop, dict):
status = hop.get("status_code", hop.get("status"))
url = hop.get("url")
else:
status = getattr(hop, "status_code", getattr(hop, "status", None))
url = getattr(hop, "url", None)
if status is None or url is None:
continue
entries.append((status, str(url)))
return entries
def _jar_to_dict(session): def _jar_to_dict(session):
"""best-effort map of a requests-style cookie jar on session to a plain dict """best-effort map of a requests-style cookie jar on session to a plain dict, feeding preview()
only; a jar that fails to iterate degrades to {} rather than raising"""
feeds preview() only; the two backends expose differently-shaped jars and a
cookie read must never crash a request, so a jar that fails to iterate degrades
to {} rather than raising.
"""
jar = getattr(session, "cookies", None) jar = getattr(session, "cookies", None)
if not jar: if not jar:
return {} return {}
try: try:
# prefer get_dict() where the jar exposes it: items() raises curl_cffi CookieConflict
# when the same name lives on two domains, get_dict() flattens instead (mirrors get_cookies)
if hasattr(jar, "get_dict"):
return jar.get_dict()
return {k: v for k, v in jar.items()} return {k: v for k, v in jar.items()}
except Exception: except Exception:
return {} return {}
@@ -150,10 +132,9 @@ class CurlCffi:
config: config:
impersonate: browser profile to forge (default "chrome"); override per call impersonate: browser profile to forge (default "chrome"); override per call
by passing impersonate= to the low-level request()/_raw_request path via request()/_raw_request (forwards **kwargs) - NOT request_with_retries,
(forwards **kwargs to the backend) — NOT request_with_retries, whose whose fixed signature raises TypeError on it. for the retrying path, set
fixed signature has no **kwargs and raises TypeError. for the retrying the profile on the CurlCffi instance instead.
path, set the profile on the CurlCffi instance instead.
requires the [curl] extra (pip install "aioweb_tls[curl]"). requires the [curl] extra (pip install "aioweb_tls[curl]").
""" """
@@ -172,7 +153,7 @@ class CurlCffi:
deliberately does NOT pass `headers`: curl_cffi bakes a constructor deliberately does NOT pass `headers`: curl_cffi bakes a constructor
`headers=` into the client and re-merges it under per-request headers, `headers=` into the client and re-merges it under per-request headers,
which would desync update_headers()/clear_headers() from what's actually on which would desync update_headers()/clear_headers() from what's actually on
the wire aioweb's session-default headers already apply per request via the wire - aioweb's session-default headers already apply per request via
the base's _default_headers merge (see ExtendedSession._create_session). the base's _default_headers merge (see ExtendedSession._create_session).
""" """
return _CurlAsyncSession(timeout=timeout, **kwargs) return _CurlAsyncSession(timeout=timeout, **kwargs)
@@ -196,28 +177,26 @@ class CurlCffi:
except asyncio.TimeoutError: except asyncio.TimeoutError:
raise raise
except OSError as error: except OSError as error:
# RequestException (incl. curl_cffi's own Timeout) subclasses OSError, never
# asyncio.TimeoutError — check for a timeout first so it surfaces as
# ServerTimeoutError; narrowed from bare Exception so a real bug surfaces
if _is_timeout_error(error): if _is_timeout_error(error):
raise _as_timeout_error(error, "curl_cffi") from error raise _as_timeout_error(error, "curl_cffi") from error
raise _as_client_error(error, "curl_cffi") from error raise _as_client_error(error, "curl_cffi") from error
content = response.content if response.content is not None else b"" content = response.content if response.content is not None else b""
return Response( return Response(
status_code=response.status_code, status_code=response.status_code,
headers=dict(response.headers), headers=CIMultiDict(response.headers.multi_items()),
content=content, content=content,
url=str(response.url), url=str(response.url),
reason=getattr(response, "reason", None), reason=getattr(response, "reason", None),
history=_history_entries(getattr(response, "history", None)),
cookies=getattr(response, "cookies", None), cookies=getattr(response, "cookies", None),
) )
def is_closed(self, session) -> bool: def is_closed(self, session) -> bool:
"""whether the curl_cffi session is closed """whether the curl_cffi session is closed
curl_cffi tracks closed state in the private `_closed` (no public `closed`); curl_cffi tracks this in the private `_closed` (no public `closed` today);
fall back to a public `closed` if a future version adds one. TLSSession's own falls back to a public `closed` if a future version adds one. best-effort -
`_closed` flag is the primary signal — this is a best-effort out-of-band check. TLSSession's own `_closed` flag is the primary signal.
""" """
closed = getattr(session, "_closed", None) closed = getattr(session, "_closed", None)
if closed is None: if closed is None:
@@ -233,8 +212,13 @@ class CurlCffi:
session.cookies.set(name, value, domain=domain or "", path=path) session.cookies.set(name, value, domain=domain or "", path=path)
def get_cookies(self, session) -> dict: def get_cookies(self, session) -> dict:
"""all cookies stored in curl_cffi's cookie store""" """all cookies stored in curl_cffi's cookie store
return dict(session.cookies.items())
uses get_dict() rather than dict(cookies.items()): items() raises curl_cffi
CookieConflict when the same name exists on two domains, get_dict() flattens
(last value wins) without raising.
"""
return session.cookies.get_dict()
def clear_cookies(self, session) -> None: def clear_cookies(self, session) -> None:
"""clear curl_cffi's cookie store""" """clear curl_cffi's cookie store"""
@@ -251,8 +235,8 @@ class Noble:
config: config:
client: noble_tls Client profile (enum or string, default "chrome_133"). client: noble_tls Client profile (enum or string, default "chrome_133").
noble_tls downloads a Go shared library on first use; setup() fetches it once downloads a Go shared library on first use; setup() fetches it once (via
(run via TLSSession.setup() or lazily before the first request). TLSSession.setup() or lazily before the first request).
requires the [noble] extra (pip install "aioweb_tls[noble]"). requires the [noble] extra (pip install "aioweb_tls[noble]").
""" """
@@ -269,11 +253,8 @@ class Noble:
@staticmethod @staticmethod
def _resolve_client(client): def _resolve_client(client):
"""turn a string or Client enum into a noble_tls Client value """turn a string or Client enum into a noble_tls Client value, raising ValueError
naming the valid profiles for an unknown string"""
raises ValueError naming the valid profiles for an unknown string, instead of
letting getattr's raw AttributeError leak the enum's internal lookup mechanics.
"""
if not isinstance(client, str): if not isinstance(client, str):
return client return client
name = client.upper() name = client.upper()
@@ -286,12 +267,9 @@ class Noble:
async def setup(self) -> None: async def setup(self) -> None:
"""fetch the noble_tls Go shared library once; idempotent and concurrency-safe """fetch the noble_tls Go shared library once; idempotent and concurrency-safe
uses noble_tls.download_if_necessary (fetches on first use, no-ops if uses download_if_necessary (falls back to update_if_necessary on older
present); falls back to update_if_necessary on older noble_tls. noble_tls). guarded by an asyncio.Lock with a check-lock-recheck so concurrent
first requests don't both run the fetch.
guarded by an asyncio.Lock with a check-lock-recheck so concurrent first
requests don't both run the fetch — only the first caller through the lock
does the work, the rest see _updated already set.
""" """
if self._updated: if self._updated:
return return
@@ -308,10 +286,8 @@ class Noble:
def create_session(self, headers, timeout, **kwargs): def create_session(self, headers, timeout, **kwargs):
"""build the noble_tls Session, honoring the session-default timeout """build the noble_tls Session, honoring the session-default timeout
noble_tls.Session takes neither headers nor timeout in its constructor. deliberately does NOT bake `headers` into session.headers - same header-baking
deliberately does NOT bake `headers` into session.headers, same rationale as rationale as CurlCffi.create_session (see its docstring).
CurlCffi.create_session — aioweb's per-request _default_headers merge already
applies them, so baking here would desync update_headers()/clear_headers().
the coerced timeout IS applied here (matching raw_request's per-call path): the coerced timeout IS applied here (matching raw_request's per-call path):
noble's Go field timeoutSeconds is an int, so an uncoerced sub-second/float noble's Go field timeoutSeconds is an int, so an uncoerced sub-second/float
@@ -336,9 +312,6 @@ class Noble:
if proxy: if proxy:
kwargs["proxy"] = proxy kwargs["proxy"] = proxy
# byte-safe transport: without this, noble_tls's Go side returns the body as a
# plain UTF-8 JSON string (U+FFFD-mangling any binary payload on a 200 response);
# see _noble_content() for the base64 data-URI decode this pairs with.
kwargs.setdefault("is_byte_response", True) kwargs.setdefault("is_byte_response", True)
try: try:
@@ -348,9 +321,6 @@ class Noble:
except asyncio.TimeoutError: except asyncio.TimeoutError:
raise raise
except OSError as error: except OSError as error:
# TLSClientException subclasses IOError (== OSError); the Go side has no
# distinct timeout type either, just a text body ("context deadline
# exceeded") — check for one before the generic client-error wrap
if _is_timeout_error(error): if _is_timeout_error(error):
raise _as_timeout_error(error, "noble_tls") from error raise _as_timeout_error(error, "noble_tls") from error
raise _as_client_error(error, "noble_tls") from error raise _as_client_error(error, "noble_tls") from error
@@ -361,6 +331,7 @@ class Noble:
content=content, content=content,
url=str(getattr(response, "url", url)), url=str(getattr(response, "url", url)),
reason=getattr(response, "reason", None), reason=getattr(response, "reason", None),
history=_history_entries(getattr(response, "history", None)),
cookies=getattr(response, "cookies", None), cookies=getattr(response, "cookies", None),
) )
@@ -377,8 +348,15 @@ class Noble:
session.cookies.set(name, value, domain=domain or "", path=path) session.cookies.set(name, value, domain=domain or "", path=path)
def get_cookies(self, session) -> dict: def get_cookies(self, session) -> dict:
"""all cookies stored in noble_tls's cookie jar""" """all cookies stored in noble_tls's cookie jar
return dict(session.cookies.items())
prefers get_dict() when the jar exposes it (flattens cross-domain duplicate
names without raising, like curl_cffi); falls back to items() otherwise
"""
jar = session.cookies
if hasattr(jar, "get_dict"):
return jar.get_dict()
return dict(jar.items())
def clear_cookies(self, session) -> None: def clear_cookies(self, session) -> None:
"""clear noble_tls's cookie jar""" """clear noble_tls's cookie jar"""
+1 -45
View File
@@ -1,48 +1,4 @@
""" """the tls backend protocol - see TLSBackend below and README"""
the tls backend protocol
a backend is a stateless config+behavior object that teaches TLSSession how to talk
to one HTTP client. TLSSession owns the live session object (built by create_session)
and passes it into every backend call, so backends hold no per-request state.
implement this protocol to add a custom backend (e.g. a local Go TLS server); inject
it via TLSSession(backend=MyBackend(...)) and it inherits aioweb's domain / header /
ephemeral / proxy / retry / preview logic unchanged — those operate on plain dicts
and never touch the backend.
required:
create_session(headers: dict, timeout, **kwargs) -> session
build and return the live client session object, stored as self.session and
passed to every method below.
async raw_request(session, method, url, **kwargs) -> aioweb.Response
send one request; adapt the client's response into an aioweb.Response built
from primitives (status_code, headers, content bytes, url, reason). kwargs
arrive aioweb-shaped: proxy resolved into kwargs["proxy"], headers merged
into kwargs["headers"], numeric timeout wrapped in aiohttp.ClientTimeout
(unwrap .total).
is_closed(session) -> bool
whether `session` is closed.
optional:
cookies_for_url(session, url) -> dict
cookies the client would send for url, for preview(). default {}.
set_cookie(session, name, value, domain=None, path="/") -> None
get_cookies(session) -> dict
clear_cookies(session) -> None
back TLSSession's mutable cookie api. the aiohttp-only base reaches into
session.cookie_jar, which TLS backends lack, so an implementation without
these raises NotImplementedError instead of a private-attribute AttributeError.
async setup() -> None
one-time async preparation (e.g. fetch a native lib); idempotent. called via
TLSSession.setup() and lazily before the first request.
async close(session) -> None
close `session`. default awaits session.close() if present.
"""
from typing import Any, Protocol, runtime_checkable from typing import Any, Protocol, runtime_checkable
+24 -28
View File
@@ -1,26 +1,16 @@
""" """
TLSSession one aioweb session, any tls backend TLSSession - one aioweb session, any tls backend
TLSSession subclasses aioweb.ExtendedSession and delegates only the four backend subclasses aioweb.ExtendedSession, delegating only the four backend seams to an
seams to an injected backend object (see protocol.py). everything else — header injected backend object (see protocol.py); everything else is inherited unchanged.
overwrites, domain rewriting, ephemeral headers, proxies, retries, previews — is see README for usage.
inherited unchanged, since that logic operates on plain dicts and never touches
the backend.
from aioweb_tls import TLSSession, CurlCffi, Noble from aioweb_tls import TLSSession, CurlCffi
async with TLSSession(backend=CurlCffi(impersonate="chrome")) as s: async with TLSSession(backend=CurlCffi(impersonate="chrome")) as s:
resp = await s.request_with_retries("GET", "https://tls.peet.ws/api/all") resp = await s.request_with_retries("GET", "https://tls.peet.ws/api/all")
if resp: if resp:
print(resp.json()["tls"]["ja3"]) print(resp.json()["tls"]["ja3"])
s = TLSSession(backend=Noble(client="chrome_133"))
await s.setup() # fetch noble's Go lib once
...
a custom backend (e.g. a local Go TLS server) injects the same way — implement the
TLSBackend protocol and pass it as backend=. one TLSSession is the only session
class; the backend swaps the wire, not the session.
""" """
import logging import logging
@@ -46,12 +36,12 @@ class TLSSession(ExtendedSession):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
async def setup(self) -> None: async def setup(self) -> None:
"""run the backend's one-time setup if it has one (idempotent) """run the backend's one-time setup if it has one (idempotent, e.g. noble's Go lib fetch)
delegates to backend.setup() when defined (e.g. noble fetching its Go lib); optional to call upfront to pre-warm at startup. TLSSession itself never calls
a no-op for backends without it. also invoked lazily before the first request this automatically - a backend needing lazy setup must self-invoke it from its
by backends that guard their own setup, so calling this is optional but lets own raw_request, as Noble does; a custom backend that skips this will never run
callers pre-warm at startup. setup() unless the caller calls TLSSession.setup() explicitly.
""" """
setup = getattr(self.backend, "setup", None) setup = getattr(self.backend, "setup", None)
if setup is not None: if setup is not None:
@@ -76,15 +66,19 @@ class TLSSession(ExtendedSession):
return cookies_for_url(self.session, url) return cookies_for_url(self.session, url)
def _is_closed(self) -> bool: def _is_closed(self) -> bool:
"""closed if explicitly closed here or the backend reports it""" """closed if explicitly closed here, never built, or the backend reports it
an unbuilt session counts as closed: nothing was opened, nothing to leak.
"""
if self._closed: if self._closed:
return True return True
if self._session is None:
return True
return self.backend.is_closed(self.session) return self.backend.is_closed(self.session)
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
# mutable cookie api — the base's set_cookie/get_cookies/clear_cookies reach # mutable cookie api - base reaches into aiohttp-only session.cookie_jar, so
# into self.session.cookie_jar (aiohttp-only), so TLS backends override them # TLS backends override these to route through the backend instead
# to route through the backend instead of crashing with AttributeError
def set_cookie(self, name, value, domain=None, path="/"): def set_cookie(self, name, value, domain=None, path="/"):
"""set a cookie via the backend's own cookie store""" """set a cookie via the backend's own cookie store"""
@@ -114,13 +108,15 @@ class TLSSession(ExtendedSession):
clear_cookies(self.session) clear_cookies(self.session)
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
# lifecycle backends close differently, so route through the backend # lifecycle - backends close differently, so route through the backend
async def close(self) -> None: async def close(self) -> None:
"""close via the backend's close (falls back to session.close)""" """close via the backend's close (falls back to session.close); no-op if never built"""
self._closed = True self._closed = True
if self._session is None:
return
close = getattr(self.backend, "close", None) close = getattr(self.backend, "close", None)
if close is not None: if close is not None:
await close(self.session) await close(self._session)
else: else:
await self.session.close() await self._session.close()