Peach: Local-first video metadata scraper and media manager.
Merge branch 'agent/claude/perf-bundle'
longmeidao8894df2900c4
diff --cc src/peach/routes_pages.pyindex ea956e691,5dab40894..397ec1f5c--- a/src/peach/routes_pages.py+++ b/src/peach/routes_pages.py@@@ -174,29 -171,20 +174,32 @@@ def asset_response(request: Request, paETag 取 mtime_ns 加字节数,不读文件内容:这几个文件都由 Git 检出或 `frontend/`构建产生,改一次就换一次 mtime,不需要为了强校验去算全文哈希。+ 文本类资产在浏览器接受 gzip 时发压缩体,压缩结果按文件版本记住,见 `_gzipped()`。+ 压缩体与原文是两个表示,ETag 各不相同。+++ `immutable` 给名字里带内容哈希的主包 chunk(ADR-0117):内容一变名字就变,浏览器一年内+ 不再回源。它们要会话才能取,所以只许浏览器自己缓存(`private`),不许共享缓存转给别人。"""stat = path.stat()- etag = f'"peach-{stat.st_mtime_ns:x}-{stat.st_size:x}"'+ compress = (media.startswith(_COMPRESSIBLE_MEDIA) and stat.st_size >= _GZIP_MINIMUM+ and _accepts_gzip(request.headers.get("accept-encoding", "")))+ etag = f'"peach-{stat.st_mtime_ns:x}-{stat.st_size:x}{"-gz" if compress else ""}"'+ # charset 只对文本类型成立。图标是字节流,声明里挂一个字符集,在全站的+ # `X-Content-Type-Options: nosniff` 之下就是让浏览器照一个自相矛盾的类型解码。+ media_type = f"{media}; charset=utf-8" if media.startswith("text/") else mediaif request.headers.get("if-none-match") == etag:response: Response = Response(status_code=304)+ elif compress:+ body = _gzipped(path, stat)+ response = Response(b"" if request.method == "HEAD" else body, media_type=media_type,+ headers={"Content-Encoding": "gzip"})+ response.headers["Content-Length"] = str(len(body))else:- # charset 只对文本类型成立。图标是字节流,声明里挂一个字符集,在全站的- # `X-Content-Type-Options: nosniff` 之下就是让浏览器照一个自相矛盾的类型解码。- media_type = f"{media}; charset=utf-8" if media.startswith("text/") else mediaresponse = FileResponse(path, media_type=media_type)+ if media.startswith(_COMPRESSIBLE_MEDIA):+ response.headers["Vary"] = "Accept-Encoding"response.headers["ETag"] = etag- response.headers["Cache-Control"] = "no-cache"+ response.headers["Cache-Control"] = "private, max-age=31536000, immutable" if immutable else "no-cache"return responsediff --cc tests/test_fastapi_api.pyindex be92b9e13,1590701eb..48d36db02--- a/tests/test_fastapi_api.py+++ b/tests/test_fastapi_api.py@@@ -593,39 -581,24 +593,57 @@@ class FastApiContractTests(unittest.Isodenied = await self.client.get(f"/dist/{escape}?t=secret")self.assertEqual(denied.status_code, 404, f"{escape} 不该被提供")+ async def test_main_bundle_is_compressed_once_per_file_version(self):+ import gzip+ from peach import routes_pages+ bundle = self.root / "dist" / "peach-app.js"+ bundle.write_text("export const filler = '" + "peach " * 2000 + "';", encoding="utf-8")+ path, params = "/dist/peach-app.js", {"t": "secret"}+ packed, plain = {"Accept-Encoding": "gzip"}, {"Accept-Encoding": "identity"}+ with patch.object(routes_pages.gzip, "compress", wraps=gzip.compress) as compress:+ served = await self.client.get(path, params=params, headers=packed)+ again = await self.client.get(path, params=params, headers=packed)+ self.assertEqual(compress.call_count, 1)+ head = await self.client.head(path, params=params, headers=packed)+ original = await self.client.get(path, params=params, headers=plain)+ for etag, headers in ((served.headers["etag"], packed), (original.headers["etag"], plain)):+ cached = await self.client.get(path, params=params, headers={**headers, "If-None-Match": etag})+ self.assertEqual(cached.status_code, 304)+ bundle.write_text("export const filler = '" + "pêche " * 2000 + "';", encoding="utf-8")+ changed = await self.client.get(path, params=params,+ headers={**packed, "If-None-Match": served.headers["etag"]})+ self.assertEqual(compress.call_count, 2)+ self.assertEqual(changed.status_code, 200)+ self.assertIn("pêche".encode(), changed.content)+ for response in (served, again):+ self.assertEqual(response.headers["content-encoding"], "gzip")+ self.assertEqual(response.headers["vary"], "Accept-Encoding")+ self.assertEqual(response.content, "export const filler = '{}';".format("peach " * 2000).encode())+ self.assertLess(int(response.headers["content-length"]), 1000)+ self.assertEqual((head.content, head.headers["content-length"], head.headers["etag"]),+ (b"", served.headers["content-length"], served.headers["etag"]))+ self.assertNotIn("content-encoding", original.headers)+ self.assertEqual(original.content, served.content)+ self.assertNotEqual(original.headers["etag"], served.headers["etag"])++ async def test_main_bundle_chunks_need_the_session_and_stay_cached_for_good(self):+ """按页拆出的 chunk 名字带内容哈希(ADR-0117):要会话,取到后浏览器一年内不回源,共享缓存不许留。"""+ name = "peach-app.stats-page-Ab1_x-Y9.js"+ (self.root / "dist" / name).write_text("export const page = 1;", encoding="utf-8")+ self.assertEqual((await self.client.get(f"/dist/{name}")).status_code, 401)+ for method in ("GET", "HEAD"):+ served = await self.client.request(method, f"/dist/{name}", params={"t": "secret"})+ self.assertEqual(served.status_code, 200, method)+ self.assertEqual(served.headers["content-type"], "text/javascript; charset=utf-8")+ self.assertEqual(served.headers["cache-control"], "private, max-age=31536000, immutable")+ self.assertEqual((await self.client.get(f"/dist/{name}", params={"t": "secret"})).content,+ b"export const page = 1;")+ for missing in ("peach-app.gone-Zz99Zz99.js", "peach-app.stats-page-Ab1_x-Y9.js.map", "peach-app..js",+ "peach-app.a.b.js", "peach-pages.chunk-Ab12Cd34.js", "peach-app.%2e%2e%2fapp.js",+ "peach-app.stats-page-Ab1_x-Y9.mjs"):+ denied = await self.client.get(f"/dist/{missing}?t=secret")+ self.assertEqual(denied.status_code, 404, f"{missing} 不该被提供")+async def test_page_bundle_is_public_with_only_its_literal_names(self):for name, media in (("peach-pages.js", "text/javascript"), ("peach-pages.css", "text/css")):path = f"/dist/{name}"