Playback: retry flaky upstream, faster proxy fail, cache /stream in browser

- upstream._get: one 300ms retry on transient errors (CF 403/503, 429,
  5xx); 404 stays final. Fixes the 502 cluster that hls.js couldn't
  recover from (fragLoadTimeOut x3 in error log)
- /stream: upstream timeout 12s < hls.js fragLoadingTimeOut (20s), so a
  hung segment 502s first and hls.js retries instead of fatal-timing-out
- /stream responses: Cache-Control public max-age=86400 (VOD + token is
  the exact upstream URL => immutable); re-opens/re-seeks skip the proxy
- /api/stream: drop unused qualities (frontend never read it; saved a
  ~0.2s cold upstream round-trip per episode)
- app.js/style.css: max-age=300 instead of no-store
- test_history_page_and_delete: stale selector (home redesign removed
  the 'view all' link; use 'history ->')
This commit is contained in:
jozamudi committed 2026-08-30 17:23:57 +00:00
1 parent 36be7d0a02
commit 0fd06f036a
4 files changed
+43 -29

No files matched your search

+20 -10
View File
@@ -393,13 +393,16 @@ def _upstream(fn, *a, **kw):
@app.middleware("http")
async def no_cache(request, call_next):
# ponytail: no-store on everything except /stream (immutable HLS
# data) and the vendored hls.min.js (immutable, 500KB — re-downloading
# it on every page load hurt on mobile)
# ponytail: no-store on everything except /stream (immutable HLS data,
# cached per upstream URL) and the vendored/static JS+CSS (re-downloaded
# on every page load hurt on mobile)
r = await call_next(request)
if request.url.path == "/hls.min.js":
p = request.url.path
if p == "/hls.min.js":
r.headers["Cache-Control"] = "public, max-age=2592000"
elif not request.url.path.startswith("/stream"):
elif p in ("/app.js", "/style.css"):
r.headers["Cache-Control"] = "public, max-age=300"
elif not p.startswith("/stream"):
r.headers["Cache-Control"] = "no-store"
return r
@@ -425,8 +428,7 @@ def api_stream(ep_id: int, lang: str = "jpn", request: Request = None):
master = _upstream(upstream.master_m3u8, ep_id, lang)
if not master:
raise HTTPException(404, f"no {lang} stream for episode {ep_id}")
return {"token": _b64(master),
"qualities": _upstream(upstream.master_variants, master)}
return {"token": _b64(master)}
try:
out = go()
@@ -461,6 +463,10 @@ def _rewrite_m3u8(text: str, base: str) -> str:
_STREAM_CACHE = OrderedDict() # ponytail: LRU of proxied HLS data (immutable);
_STREAM_MAX = 24 # segments ~1-2MB -> <= ~48MB
# ponytail: HLS VOD content is immutable and the token IS the exact upstream
# URL, so per-URL browser caching can't go stale — re-opens, re-seeks and
# auto-next come from the disk cache instead of proxy + CDN
_STREAM_CACHE_HDRS = {"Cache-Control": "public, max-age=86400"}
@app.get("/stream/{token}")
@@ -477,15 +483,19 @@ def stream(token: str):
hit = _STREAM_CACHE.get(url)
if hit:
_STREAM_CACHE.move_to_end(url)
return Response(hit[1], media_type=hit[0])
r = _upstream(upstream._get, url)
return Response(hit[1], media_type=hit[0], headers=_STREAM_CACHE_HDRS)
# ponytail: 12s < hls.js's fragLoadingTimeOut (20s) — on a hang the proxy
# 502s first, so hls.js retries the frag (backoff) instead of freezing
# on a fatal timeout race
r = _upstream(upstream._get, url, timeout=12)
body = r.content
if url.endswith(".m3u8") or "mpegurl" in r.headers.get("content-type", ""):
body = _rewrite_m3u8(body.decode(), url).encode()
_STREAM_CACHE[url] = (r.headers.get("content-type", "application/octet-stream"), body)
while len(_STREAM_CACHE) > _STREAM_MAX:
_STREAM_CACHE.popitem(last=False)
return Response(body, media_type=r.headers.get("content-type", "application/octet-stream"))
return Response(body, media_type=r.headers.get("content-type", "application/octet-stream"),
headers=_STREAM_CACHE_HDRS)
app.mount("/", StaticFiles(directory=ROOT / "static", html=True), name="static")