fix(api): address review on the event-loop streams

- Per-user SSE cap uses per-connection leases in a sorted set instead of
  a shared INCR/DECR counter with a TTL. A stream that outlived the TTL
  could let the counter expire, then decrement another stream's slot or
  drive the count negative. Leases refresh while a stream sends frames
  and age out when a stream dies without cleanup.
- Shielded cleanup is bounded per step: stream close and on_close in
  ClosingStreamingResponse, unsubscribe and close in AsyncTopic, lease
  release, and the replay-budget check, so a dead Redis connection can't
  hold a request or a graceful shutdown.
- Artifact downloads send an ASCII filename plus an RFC 5987 filename*
  for non-ASCII names, build headers before opening the file, and close
  disk handles off the event loop.
- Type hints and docstrings on the new helpers.
This commit is contained in:
Alex committed 2026-09-14 10:19:59 +01:00
1 parent 54b540ea42
commit e889392eba
17 files changed
+911 -255

No files matched your search

+33 -16
View File
@@ -3,7 +3,7 @@
from __future__ import annotations
import logging
from typing import Awaitable, Callable, Optional
from typing import Any, AsyncIterable, Awaitable, Callable, Optional
import anyio
from starlette.responses import StreamingResponse
@@ -11,6 +11,11 @@ from starlette.types import Receive, Scope, Send
logger = logging.getLogger(__name__)
# Upper bound on each cleanup step. Cleanup is shielded from the cancellation
# that ended the response, so a step stuck on a dead connection would otherwise
# hold the request task, and a graceful shutdown, indefinitely.
_CLEANUP_TIMEOUT_SECONDS = 5.0
class ClosingStreamingResponse(StreamingResponse):
"""``StreamingResponse`` that always finalizes its stream.
@@ -18,11 +23,19 @@ class ClosingStreamingResponse(StreamingResponse):
When a client disconnects, Starlette cancels the send loop and drops the
body iterator: a generator paused between frames, or one that never
started, would leave its cleanup to garbage collection. This closes the
iterator and then runs ``on_close`` once the response is over, shielded
from the cancellation that ended it.
iterator and then runs ``on_close`` once the response is over. Each step is
shielded from the cancellation that ended the response and bounded by
``_CLEANUP_TIMEOUT_SECONDS``, so ``on_close`` still runs if closing the
iterator hangs.
"""
def __init__(self, content, *, on_close: Optional[Callable[[], Awaitable[None]]] = None, **kwargs) -> None:
def __init__(
self,
content: AsyncIterable[Any],
*,
on_close: Optional[Callable[[], Awaitable[None]]] = None,
**kwargs: Any,
) -> None:
super().__init__(content, **kwargs)
self._on_close = on_close
@@ -30,15 +43,19 @@ class ClosingStreamingResponse(StreamingResponse):
try:
await super().__call__(scope, receive, send)
finally:
with anyio.CancelScope(shield=True):
aclose = getattr(self.body_iterator, "aclose", None)
if aclose is not None:
try:
await aclose()
except Exception:
logger.exception("closing the response stream failed")
if self._on_close is not None:
try:
await self._on_close()
except Exception:
logger.exception("response on_close hook failed")
aclose = getattr(self.body_iterator, "aclose", None)
if aclose is not None:
await _bounded(aclose, "closing the response stream")
if self._on_close is not None:
await _bounded(self._on_close, "response on_close hook")
async def _bounded(step: Callable[[], Awaitable[None]], what: str) -> None:
"""Run one cleanup step shielded from cancellation, giving up after the cleanup timeout."""
with anyio.move_on_after(_CLEANUP_TIMEOUT_SECONDS, shield=True) as scope:
try:
await step()
except Exception:
logger.exception("%s failed", what)
if scope.cancelled_caught:
logger.warning("%s timed out after %ss", what, _CLEANUP_TIMEOUT_SECONDS)