.gitignore

@@ -1,5 +1,5 @@
 # claude
-.claude/
+CLAUDE.md
 
 # python
 __pycache__/

README.md

@@ -11,18 +11,18 @@ and swap the HTTP client while inheriting everything else.
 `requirements.txt`:
 
 ```
-aioweb @ git+ssh://git@git.rethinkstudios.io/rethink-public/aioweb.git@v0.1.5
+aioweb @ git+ssh://git@git.rethinkstudios.io/rethink-public/aioweb.git@v0.1.4
 ```
 
 Direct:
 
 ```bash
-pip install "aioweb @ git+ssh://git@git.rethinkstudios.io/rethink-public/aioweb.git@v0.1.5"
+pip install "aioweb @ git+ssh://git@git.rethinkstudios.io/rethink-public/aioweb.git@v0.1.4"
 ```
 
 Requires `aiohttp` and `yarl` (pulled transitively).
 
-Drop the `@v0.1.5` suffix from the line above to install the latest unpinned.
+Drop the `@v0.1.4` suffix from the line above to install the latest unpinned.
 
 ## Usage
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "aioweb"
-version = "0.1.5"
+version = "0.1.4"
 description = "Async HTTP session wrapper over aiohttp — proxies, header overwrites, retries, previews. Config-free, installable."
 requires-python = ">=3.10"
 dependencies = [

src/aioweb/responses.py

@@ -92,9 +92,7 @@ class Response:
         """parsed JSON content, or None if not valid JSON"""
         try:
             return _json.loads(self.text())
-        except (_json.JSONDecodeError, UnicodeDecodeError):
+        except _json.JSONDecodeError:
-            # text() decodes the body and can raise UnicodeDecodeError on a non-UTF-8
-            # payload — that's a "not valid JSON" outcome, not an error to propagate
             return None
 
     def raise_for_status(self):

src/aioweb/session.py

@@ -316,13 +316,10 @@ class ExtendedSession:
             if debug and result.redirect_chain:
                 log.info("redirect chain: %s", result.redirect_chain)
             return result
-        except asyncio.TimeoutError as error:
+        except (aiohttp.ClientError, asyncio.TimeoutError) as error:
             # a total ClientTimeout raises a bare asyncio.TimeoutError, which is NOT an
-            # aiohttp.ClientError subclass — wrap it as ServerTimeoutError (which IS both
+            # aiohttp.ClientError subclass — wrap it into the same typed path so direct
-            # a ClientError AND a TimeoutError) so direct callers get a typed failure and
+            # callers get a consistent failure instead of a raw timeout
-            # request_with_retries can still label it a timeout
-            raise aiohttp.ServerTimeoutError(f"timeout for {url}: {error}") from error
-        except aiohttp.ClientError as error:
             raise aiohttp.ClientError(f"client error for {url}: {error}") from error
 
     async def request_with_retries(
@@ -367,15 +364,14 @@ class ExtendedSession:
             log.error("all %d attempts failed for %s (last status %s)",
                       attempts, url, exhausted.response.status_code)
             return exhausted.response
-        except asyncio.TimeoutError:
-            # request() wraps a total timeout as ServerTimeoutError (a ClientError AND a
-            # TimeoutError); catch the timeout case first so it's labeled a timeout rather
-            # than falling into the generic client-error branch below
-            log.error("all %d attempts timed out for %s", attempts, url)
-            return FailureResponse(reason="timeout", url=url)
         except aiohttp.ClientError as error:
             log.error("all %d attempts failed for %s (client error: %s)", attempts, url, error)
             return FailureResponse(reason=f"client error: {error}", url=url)
+        except asyncio.TimeoutError:
+            # a total ClientTimeout surfaces as a bare asyncio.TimeoutError; label it as
+            # a timeout rather than letting it fall to the generic "unexpected" branch
+            log.error("all %d attempts timed out for %s", attempts, url)
+            return FailureResponse(reason="timeout", url=url)
         except Exception as error:
             log.error("all %d attempts failed for %s (unexpected: %s)", attempts, url, error)
             return FailureResponse(reason=f"unexpected error: {error}", url=url)