Compare commits
4
Commits
v-fixed132
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
500cc343ab | ||
|
|
58fb815c17 | ||
|
|
3b9f3bbf5d | ||
|
|
5d58eee4c7 |
No files matched your search
@@ -2,6 +2,46 @@
|
||||
|
||||
本文档记录 KatelyaTV 项目的重要更新和功能变更。
|
||||
|
||||
## [fixed135] - 2026-11-16
|
||||
|
||||
### 🎨 界面改进(翻页箭头始终可见)
|
||||
|
||||
- **翻页箭头不再只在 hover 时显示**:`PaginatedRow` 共享组件移除 `isHovered` 状态与 `onMouseEnter/onMouseLeave`,两个箭头按钮默认 `opacity-100`(hover 仅保留 `scale-110` 反馈)——此前箭头 hover 前 `opacity-0`,桌面端鼠标未悬停时不可见、触屏设备永远不可见;用户反馈「没看到有箭头」即为此。首页「最新港剧」与详情页「相关推荐」共用同一组件,一次修复两处。
|
||||
- **窄屏不再横向溢出**:箭头定位 `-left-12/-right-12` → `-left-2 md:-left-12` / `-right-2 md:-right-12`,小屏内收至网格边缘,大屏保持贴边;桌面 772px 与移动 375px 实测 `scrollWidth−clientWidth=0`、箭头完全在视口内。
|
||||
- **翻页逻辑不变**:每页 10 条、页尾回绕、左箭头返回第 1 页、不足 10 条不显示箭头;`/api/related` 36 候选/30 返回、匹配规则/证据门槛/排序/10 分钟缓存均不变。
|
||||
|
||||
### 🧪 验证(2026-11-16 实测)
|
||||
|
||||
- 桌面 772px:相关推荐第 1 页箭头 `opacity=1` 且**未 hover**;点击右箭头 → 第 2 页 10 条且内容不同、左箭头 opacity=1;再点右箭头 → 第 3 页 10 条;左箭头点回第 1 页;`overflowX=0`、无横向滚动条
|
||||
- 移动 375px(deviceScaleFactor=2):相关推荐与首页箭头 `opacity=1`、完全在视口内、`overflowX=0`
|
||||
- 响应式扫描 375/640/768/1024/1440 五档:箭头全部在视口内、opacity=1;640 首页的 `overflowX=24` 来自「继续观看」横向滚动区的有意设计,与本版无关
|
||||
- 容器 `katelyatv:fixed135` 重建(1:1 复刻原参数:`--env-file .env` + 网络 `katelyatv_katelyatv-network` + 双 `--add-host`),`/login` 200、页面 banner `vfixed135`
|
||||
|
||||
## [fixed134] - 2026-11-16
|
||||
|
||||
### ✨ 详情页「相关推荐」左右箭头翻页(与首页最新港剧同款)
|
||||
- **翻页控件复用首页共享组件 `PaginatedRow`**:相关推荐卡片网格外包同款翻页组件——hover 时网格两侧浮现紫色圆形箭头(右侧下一页、左侧上一页),每页 10 条,效果与首页「最新港剧」完全一致;第 3 页再点右箭头回第 1 页、第 2 页点左箭头回第 1 页(与首页行为一致);不足 10 条不显示箭头
|
||||
- **服务端候选扩容**:`/api/related` 元数据补全候选 12 → 36、返回上限 10 → 30 条,凑够 3 页翻页数据;匹配规则、证据门槛(主演≥3 或导演≥2)、排序、10 分钟缓存均不变,冷启动仅详情补全并发数增加(实测 14.0s 返回 30 条),缓存命中 0.009s
|
||||
|
||||
### 🧪 验证(2026-11-16 实测)
|
||||
- 接口:真实港剧参数调 `/api/related` 冷启动 **30 条**、二次请求 0.009s;每条带 source/id 直达与匹配依据(导演/主演/地区/语言)
|
||||
- UI(浏览器实测):第 1/2/3 页各 10 条且内容不同;右箭头翻到页尾自动回第 1 页、左箭头返回第 1 页;双箭头对称贴网格两侧、不压卡片不被裁切、页面无横向溢出(scrollWidth−clientWidth=0)
|
||||
- 容器 `katelyatv:fixed134` 重建(1:1 复刻原参数:`--env-file .env` + 网络 `katelyatv_katelyatv-network` + 双 `--add-host`),`/login` 200、公告弹窗显示 vfixed134
|
||||
|
||||
## [fixed133] - 2026-11-16
|
||||
|
||||
### ⚡ 性能:最新港剧等聚合板块秒开(对齐热门电影的加载体验)
|
||||
- **接口层 stale-while-revalidate**:`/api/tvbox/all` 缓存过期后先立即返回旧数据(`X-Cache: STALE`,实测 0.02s),同时在后台重新聚合——多源聚合实测 8~22s,用户请求从此零等待;60s 内 `X-Cache: HIT`(0.03s)
|
||||
- **分类端点并发竞速**:`fetchClass` 三个候选端点由「串行逐试、每端点等满 8s」改为「并发竞速、首个成功即用」(半死源最坏 3×8s=24s → 8s);容器重启后的冷启动全量聚合从 **60s+ 降到 22.3s**(前端 25s 超时内可通过)
|
||||
- **失败分类表缓存 30s → 2min**:避免每分钟刷新反复踩满超时拖慢整体
|
||||
- **保活**:模块级预热定时器(edge 隔离下不保证存活)+ 宿主 crontab 每分钟保活请求——无用户流量时聚合结果也持续续期,数据最多旧约 2 分钟
|
||||
- **根因说明**:热门电影走豆瓣单接口(1~2s 即回),最新港剧走全片源站聚合(分类表映射 + 列表拉取 + 硬过滤去重),慢在聚合本身与 60s 缓存过期后的同步等待;本版以 SWR + 端点竞速消灭「等待」,数据源保持片源直达不降级(不换豆瓣源,避免点击后退化为标题搜索)
|
||||
- Dockerfile `ENV NEXT_PUBLIC_SITE_VERSION` 同步 fixed133(客户端编译期常量)
|
||||
|
||||
### 🧪 验证(2026-11-16 实测)
|
||||
- tsc / next build 通过;冷启动聚合 22.3s(list=70)、第 2 发 HIT 0.031s、过期后 STALE 0.024s(list=65)
|
||||
- 站点 307→login 200、Redis 67 键完好、容器 `SITE_VERSION=fixed133`
|
||||
|
||||
## [fixed132] - 2026-11-16
|
||||
|
||||
### ✨ 全新浏览器标签页图标(favicon)
|
||||
|
||||
+2
-2
@@ -35,7 +35,7 @@ RUN find ./src -type f -name "route.ts" -print0 \
|
||||
ENV DOCKER_ENV=true
|
||||
# 海报走站内 /api/image-proxy(浏览器直连豆瓣图被拦导致全裂)
|
||||
ENV NEXT_PUBLIC_IMAGE_PROXY=/api/image-proxy
|
||||
ENV NEXT_PUBLIC_SITE_VERSION=fixed131
|
||||
ENV NEXT_PUBLIC_SITE_VERSION=fixed135
|
||||
ENV NEXT_PUBLIC_ENABLE_REGISTER=true
|
||||
# 存储模式必须烤进镜像:丢失会导致服务端数据(观看记录/账号/收藏)全部不可读,
|
||||
# 且登录接口走 localstorage 分支无 AUTH_PASSWORD 直接放行(2026-11-15 事故)
|
||||
@@ -59,7 +59,7 @@ ENV HOSTNAME=0.0.0.0
|
||||
ENV PORT=3000
|
||||
ENV DOCKER_ENV=true
|
||||
ENV NEXT_PUBLIC_IMAGE_PROXY=/api/image-proxy
|
||||
ENV NEXT_PUBLIC_SITE_VERSION=fixed131
|
||||
ENV NEXT_PUBLIC_SITE_VERSION=fixed135
|
||||
ENV NEXT_PUBLIC_ENABLE_REGISTER=true
|
||||
# 存储模式必须烤进镜像:丢失会导致服务端数据(观看记录/账号/收藏)全部不可读,
|
||||
# 且登录接口走 localstorage 分支无 AUTH_PASSWORD 直接放行(2026-11-15 事故)
|
||||
|
||||
@@ -247,6 +247,10 @@ docker compose -f docker-compose.redis.yml down
|
||||
|
||||
## 📋 更新日志
|
||||
|
||||
- **v-fixed135**:翻页箭头始终可见——`PaginatedRow` 移除 hover 门控(`isHovered`/`onMouseEnter/onMouseLeave`)与 `opacity-0`,箭头默认 `opacity-100`(hover 仅保留 `scale-110`),触屏/未悬停桌面端也能看到;窄屏箭头内收 `-left-2/-right-2`(≥md 贴边),桌面/移动实测 `overflowX=0`、箭头在视口内;首页「最新港剧」与详情页「相关推荐」同修
|
||||
- **v-fixed134**:详情页「相关推荐」加左右箭头翻页——复用首页「最新港剧」同款 `PaginatedRow` 翻页组件(hover 浮现紫色圆形箭头,每页 10 条,页尾回绕/返回与首页行为一致);`/api/related` 候选扩容 12→36、返回 10→30 条凑够 3 页,匹配规则/证据门槛/排序/10 分钟缓存均不变
|
||||
- **v-fixed133**:**最新港剧加载提速(对齐热门电影)**——`/api/tvbox/all` 聚合接口改 stale-while-revalidate:过期先秒回旧数据(STALE 实测 0.02s)后台再刷新,60s 内 HIT 0.03s;分类端点由串行逐试改并发竞速,**冷启动聚合 60s+ → 22.3s**;失败分类缓存 30s→2min + 宿主 cron 每分钟保活;热门电影仍走豆瓣单接口(数据源不变,点击仍直达片源)
|
||||
- **v-fixed132**:全新浏览器标签页图标——替换旧「暗黑肖像缩略图」favicon(16px 下糊成黑团),新图标为**深蓝渐变圆角底 + 天蓝播放三角 + 右上角星光**,与暗色主题/天蓝主色一致;16px 用专用优化版(三角放大加粗),32/48/64 为标准版(4K 超采样抗锯齿);同步更新 PWA 图标 `icons/icon-{192,256,384,512}.png`
|
||||
- **v-fixed131**:相关推荐重做——数据改为**本站已有片源**,新增 `/api/related` 按 **主演/导演/语言/地区/类型** 五项元数据匹配打分(豆瓣推荐接口不再用于推荐);卡片点击带 `source+id` **直达实际片源开播**(播放页直达模式不再按标题搜索,杜绝片源对不上);「相关推荐」标题旁常驻显示匹配规则「按主演 / 导演 / 语言 / 地区 / 类型匹配 · 本站片源直达」,卡片下标注重合依据
|
||||
- **v-fixed130**:详情页「相关推荐」标题旁显示推荐规则说明「豆瓣相似影片推荐 · 取前10」(数据来自豆瓣官方推荐接口,取前 10 条相似影片)
|
||||
|
||||
@@ -270,13 +274,13 @@ docker compose -f docker-compose.redis.yml down
|
||||
```bash
|
||||
# 公网可拉(匿名)
|
||||
docker pull gitea.88531.cn/jinghui/katelyatv:latest # 固定版本
|
||||
docker pull gitea.88531.cn/jinghui/katelyatv:fixed96
|
||||
docker pull gitea.88531.cn/jinghui/katelyatv:fixed135
|
||||
|
||||
# 腾讯云 TCR(东京,公网匿名)
|
||||
docker pull jpccr.ccs.tencentyun.com/jinghui/katelyatv:latest
|
||||
```
|
||||
|
||||
当前版本:**v-fixed96**
|
||||
当前版本:**v-fixed135**
|
||||
|
||||
## 🔗 源码
|
||||
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
if(!self.define){let e,s={};const i=(i,a)=>(i=new URL(i+".js",a).href,s[i]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=i,e.onload=s,document.head.appendChild(e)}else e=i,importScripts(i),s()}).then(()=>{let e=s[i];if(!e)throw new Error(`Module ${i} didn’t register its module`);return e}));self.define=(a,n)=>{const c=e||("document"in self?document.currentScript.src:"")||location.href;if(s[c])return;let t={};const u=e=>i(e,c),r={module:{uri:c},exports:t,require:u};s[c]=Promise.all(a.map(e=>r[e]||u(e))).then(e=>(n(...e),t))}}define(["./workbox-e9849328"],function(e){"use strict";importScripts(),self.skipWaiting(),e.clientsClaim(),e.precacheAndRoute([{url:"/_next/app-build-manifest.json",revision:"25e66d74fe8e173a352f137403fc1b41"},{url:"/_next/static/ZESVig0uAX5meOOL1E-0u/_buildManifest.js",revision:"85aecd8a55db42fc901f52386fd2a680"},{url:"/_next/static/ZESVig0uAX5meOOL1E-0u/_ssgManifest.js",revision:"b6652df95db52feb4daf4eca35380933"},{url:"/_next/static/chunks/234-b108db3d3cb1eaf9.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/242-5a0502f47346ed4a.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/273-fffc7e5390a1c642.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/609-46d66c37b95adf6a.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/732-ccd095260c41a876.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/78-b091442d784a205f.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/866-7f5b3d6941560701.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/app/_not-found/page-2f2263c5b98c190a.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/app/admin/page-20830ba52baaf531.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/app/anime/page-da4e609a40d81799.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/app/config/page-affbe8c5ef4d1058.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/app/douban/page-031ac55e075e253c.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/app/filter/page-4b5af6e51fd51bb5.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/app/ipv6/page-a35328d302bb65d6.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/app/layout-abad67b72f2d607d.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/app/live/page-9ed579d82b48211a.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/app/login/page-b2957b92254ae889.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/app/page-1635d434ad57af23.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/app/play/page-d9e8b68743f4288a.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/app/search/page-ba0b744cf689fe40.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/app/settings/page-136d93ac82c90f3c.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/app/tvbox/page-aee2e8c0cbeb259a.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/app/warning/page-e6b20b93b37dc516.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/b145b63a-d75d6adf389a7589.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/c72274ce-909438a8a5dd87a5.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/da9543df-c2ce5269243dd748.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/framework-6e06c675866dc992.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/main-0d408c4099fe4491.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/main-app-734bbab0f54e7373.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/pages/_app-3fcac1a2c632f1ef.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/pages/_error-d3fe151bf402c134.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/chunks/polyfills-42372ed130431b0a.js",revision:"846118c33b2c0e922d7b3a7676f81f6f"},{url:"/_next/static/chunks/webpack-f732225cafd52a05.js",revision:"ZESVig0uAX5meOOL1E-0u"},{url:"/_next/static/css/23100062f5d4aac0.css",revision:"23100062f5d4aac0"},{url:"/_next/static/css/3b3ab5132de7694d.css",revision:"3b3ab5132de7694d"},{url:"/_next/static/css/da6e9b4a73108890.css",revision:"da6e9b4a73108890"},{url:"/_next/static/media/19cfc7226ec3afaa-s.woff2",revision:"9dda5cfc9a46f256d0e131bb535e46f8"},{url:"/_next/static/media/21350d82a1f187e9-s.woff2",revision:"4e2553027f1d60eff32898367dd4d541"},{url:"/_next/static/media/8e9860b6e62d6359-s.woff2",revision:"01ba6c2a184b8cba08b0d57167664d75"},{url:"/_next/static/media/ba9851c3c22cd980-s.woff2",revision:"9e494903d6b0ffec1a1e14d34427d44d"},{url:"/_next/static/media/c5fe6dc8356a8c31-s.woff2",revision:"027a89e9ab733a145db70f09b8a18b42"},{url:"/_next/static/media/df0a9ae256c0569c-s.woff2",revision:"d54db44de5ccb18886ece2fda72bdfe0"},{url:"/_next/static/media/e4af272ccee01ff0-s.p.woff2",revision:"65850a373e258f1c897a2b3d75eb74de"},{url:"/favicon.ico",revLine truncated
|
||||
if(!self.define){let e,s={};const a=(a,n)=>(a=new URL(a+".js",n).href,s[a]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=a,e.onload=s,document.head.appendChild(e)}else e=a,importScripts(a),s()}).then(()=>{let e=s[a];if(!e)throw new Error(`Module ${a} didn’t register its module`);return e}));self.define=(n,t)=>{const i=e||("document"in self?document.currentScript.src:"")||location.href;if(s[i])return;let c={};const r=e=>a(e,i),d={module:{uri:i},exports:c,require:r};s[i]=Promise.all(n.map(e=>d[e]||r(e))).then(e=>(t(...e),c))}}define(["./workbox-e9849328"],function(e){"use strict";importScripts(),self.skipWaiting(),e.clientsClaim(),e.precacheAndRoute([{url:"/_next/app-build-manifest.json",revision:"9a98b95b3e515323e4f430c246143ea5"},{url:"/_next/static/chunks/234-e7b5ed098adb1a2e.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/242-5a0502f47346ed4a.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/609-46d66c37b95adf6a.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/732-ccd095260c41a876.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/776-5d2d621d4ff2d7a3.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/78-10d20a903fca08b0.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/866-7f5b3d6941560701.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/app/_not-found/page-2f2263c5b98c190a.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/app/admin/page-de981f276982fb16.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/app/anime/page-9998fde3394c0f38.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/app/config/page-3bb0944c3ff64b50.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/app/douban/page-031ac55e075e253c.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/app/filter/page-e4f45846b02e1649.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/app/ipv6/page-0244a05963c94b2e.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/app/layout-70de4c357938d57b.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/app/live/page-0faa8c77596f61cf.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/app/login/page-b2957b92254ae889.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/app/page-e6b12184ed279adf.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/app/play/page-f8b6dddba4e99b8a.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/app/search/page-ba0b744cf689fe40.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/app/settings/page-e15b9e1815c4fd3c.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/app/tvbox/page-1ce2e162149fb195.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/app/warning/page-e6b20b93b37dc516.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/b145b63a-d75d6adf389a7589.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/c72274ce-909438a8a5dd87a5.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/da9543df-c2ce5269243dd748.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/framework-6e06c675866dc992.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/main-589f2ff3882263e7.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/main-app-734bbab0f54e7373.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/pages/_app-3fcac1a2c632f1ef.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/pages/_error-d3fe151bf402c134.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/chunks/polyfills-42372ed130431b0a.js",revision:"846118c33b2c0e922d7b3a7676f81f6f"},{url:"/_next/static/chunks/webpack-f732225cafd52a05.js",revision:"tFd0v0rsHZE0WFOVByzMz"},{url:"/_next/static/css/23100062f5d4aac0.css",revision:"23100062f5d4aac0"},{url:"/_next/static/css/bab40fda62f980b4.css",revision:"bab40fda62f980b4"},{url:"/_next/static/css/da6e9b4a73108890.css",revision:"da6e9b4a73108890"},{url:"/_next/static/media/19cfc7226ec3afaa-s.woff2",revision:"9dda5cfc9a46f256d0e131bb535e46f8"},{url:"/_next/static/media/21350d82a1f187e9-s.woff2",revision:"4e2553027f1d60eff32898367dd4d541"},{url:"/_next/static/media/8e9860b6e62d6359-s.woff2",revision:"01ba6c2a184b8cba08b0d57167664d75"},{url:"/_next/static/media/ba9851c3c22cd980-s.woff2",revision:"9e494903d6b0ffec1a1e14d34427d44d"},{url:"/_next/static/media/c5fe6dc8356a8c31-s.woff2",revision:"027a89e9ab733a145db70f09b8a18b42"},{url:"/_next/static/media/df0a9ae256c0569c-s.woff2",revision:"d54db44de5ccb18886ece2fda72bdfe0"},{url:"/_next/static/media/e4af272ccee01ff0-s.p.woff2",revision:"65850a373e258f1c897a2b3d75eb74de"},{url:"/_next/static/tFd0v0rsHZE0WFOVByzMz/_buildManifest.js",revision:"85aecd8a55db42fc901f52386fd2a680"},{url:"/_next/static/tFd0v0rsHZE0WFOVByzMz/_ssgManifest.js",revision:"b6652df95db52feb4daf4eca35380933"},{url:"/favicon.ico",revLine truncated
|
||||
@@ -157,9 +157,10 @@ export async function GET(request: Request) {
|
||||
});
|
||||
if (pool.length === 0) return respond([]);
|
||||
|
||||
// 3) 按来源强度排序,取前 12 补全元数据(主演/导演/地区/语言 只在详情里有)
|
||||
// 3) 按来源强度排序,取前 36 补全元数据(主演/导演/地区/语言 只在详情里有);
|
||||
// 多补候选是为了前端相关推荐能翻页(每页 10 条,最多 3 页,与首页港剧行一致)
|
||||
pool.sort((a, b) => b.dir * 2 + b.act - (a.dir * 2 + a.act));
|
||||
const top = pool.slice(0, 12);
|
||||
const top = pool.slice(0, 36);
|
||||
const siteMap = new Map<string, ApiSite>(
|
||||
sites.map((s) => [s.key, s] as [string, ApiSite])
|
||||
);
|
||||
@@ -256,7 +257,7 @@ export async function GET(request: Request) {
|
||||
}
|
||||
|
||||
items.sort((a, b) => b.score - a.score);
|
||||
const finalItems = items.slice(0, 10);
|
||||
const finalItems = items.slice(0, 30);
|
||||
|
||||
if (cache.size > 100) cache.clear();
|
||||
cache.set(cacheKey, { ts: Date.now(), items: finalItems });
|
||||
|
||||
@@ -10,25 +10,81 @@ export const runtime = 'edge';
|
||||
// 聚合/class/9xx 映射逻辑已收拢到 @/lib/tvboxagg(旧补丁 ALL 逻辑的源码化实现),
|
||||
// 本文件只负责:进程内缓存 + 出口。
|
||||
|
||||
// 进程内响应缓存:相同查询 60s 内直接返回,避免每次刷新都重新聚合上游(最新港剧等栏目秒开)
|
||||
// 进程内响应缓存(stale-while-revalidate):
|
||||
// - HIT:有数据 60s 内直接返回(浏览器同样 max-age=60);
|
||||
// - STALE:过期后 10 分钟内先立刻返回旧数据,同时后台重新聚合——
|
||||
// 多源聚合实测 8~18s,用户请求永远零等待(最新港剧与热门电影一样秒开);
|
||||
// - 完全冷(容器刚重启、无任何旧数据)才同步等一次聚合。
|
||||
const respCache = new Map<string, [number, any]>();
|
||||
const refreshing = new Set<string>();
|
||||
const FRESH_MS = 60000; // 有数据的强新鲜窗口
|
||||
const FRESH_EMPTY_MS = 5000; // 空结果只短缓存 5s:上游偶发超时不能把空列表当正常数据缓存
|
||||
const STALE_MS = 10 * 60 * 1000; // stale 窗口:旧数据最多用 10 分钟,期间后台必然已刷新
|
||||
|
||||
async function aggregateNow(cacheKey: string, sp: URLSearchParams): Promise<any | null> {
|
||||
try {
|
||||
const config = await getConfig();
|
||||
const sourceConfigs: SrcCfg[] = (config.SourceConfig || []).filter((s: any) => !s.disabled);
|
||||
const r = await aggregateAll(sourceConfigs, sp);
|
||||
// 只缓存有数据的结果;空结果不驻留(下次请求立即重试)
|
||||
if (r && Array.isArray(r.list) && r.list.length) {
|
||||
respCache.set(cacheKey, [Date.now(), r]);
|
||||
if (respCache.size > 200) respCache.clear();
|
||||
return r;
|
||||
}
|
||||
} catch {
|
||||
// 聚合失败静默:stale 数据继续可用,下次请求/预热会再试
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
// 后台刷新(同一 key 并发去重,避免多个过期请求同时打上游)
|
||||
function refreshInBackground(cacheKey: string, sp: URLSearchParams) {
|
||||
if (refreshing.has(cacheKey)) return;
|
||||
refreshing.add(cacheKey);
|
||||
aggregateNow(cacheKey, sp).finally(() => refreshing.delete(cacheKey));
|
||||
}
|
||||
|
||||
export async function GET(request: NextRequest) {
|
||||
const { searchParams } = new URL(request.url);
|
||||
const cacheKey = searchParams.toString();
|
||||
const now = Date.now();
|
||||
const c = respCache.get(cacheKey);
|
||||
// 空结果只缓存 5s:上游偶发超时不能把空列表当 60s 正常数据缓存(最新港剧整栏消失的根因之一)
|
||||
const cTTL = c && c[1] && Array.isArray(c[1].list) && c[1].list.length ? 60000 : 5000;
|
||||
if (c && now - c[0] < cTTL) {
|
||||
const hasList = !!(c && c[1] && Array.isArray(c[1].list) && c[1].list.length);
|
||||
const freshTTL = hasList ? FRESH_MS : FRESH_EMPTY_MS;
|
||||
|
||||
if (c && now - c[0] < freshTTL) {
|
||||
return NextResponse.json(c[1], { headers: { 'Access-Control-Allow-Origin': '*', 'Cache-Control': 'public, max-age=60', 'X-Cache': 'HIT' } });
|
||||
}
|
||||
const config = await getConfig();
|
||||
const sourceConfigs: SrcCfg[] = (config.SourceConfig || []).filter((s: any) => !s.disabled);
|
||||
const r = await aggregateAll(sourceConfigs, searchParams);
|
||||
// 只缓存有数据的结果;空结果短缓存(上面 5s TTL)且不长期驻留
|
||||
if (r && Array.isArray(r.list) && r.list.length) respCache.set(cacheKey, [now, r]);
|
||||
// 防止缓存无限增长:超过 200 条清空
|
||||
if (respCache.size > 200) respCache.clear();
|
||||
return NextResponse.json(r, { headers: { 'Access-Control-Allow-Origin': '*', 'Cache-Control': 'public, max-age=60' } });
|
||||
// stale:先给旧数据、后台刷新——用户零等待
|
||||
if (hasList && now - c[0] < STALE_MS) {
|
||||
refreshInBackground(cacheKey, searchParams);
|
||||
return NextResponse.json(c[1], { headers: { 'Access-Control-Allow-Origin': '*', 'Cache-Control': 'public, max-age=60', 'X-Cache': 'STALE' } });
|
||||
}
|
||||
// 完全冷:没人有数据可给,只能同步聚合一等(配合下方启动预热 + 宿主保活 cron,正常用户几乎碰不到)
|
||||
const r = await aggregateNow(cacheKey, searchParams);
|
||||
return NextResponse.json(
|
||||
r || { code: 1, msg: '数据列表', page: 1, pagecount: 1, limit: 0, total: 0, list: [] },
|
||||
{ headers: { 'Access-Control-Allow-Origin': '*', 'Cache-Control': 'public, max-age=60' } },
|
||||
);
|
||||
}
|
||||
|
||||
// ---------- 启动预热 + 周期保活 ----------
|
||||
// 模块被首个请求加载后:3s 后预热首页聚合键(最新港剧),此后每 55s 续一次
|
||||
// (接在 60s fresh 窗口前),用户请求几乎永远命中 HIT/STALE。
|
||||
// edge isolate 若不保留定时器则自然退化为"过期请求触发后台刷新",无副作用。
|
||||
const WARM_KEYS = ['ac=videolist&t=902&pg=1&by=time'];
|
||||
function scheduleWarm() {
|
||||
const g = globalThis as any;
|
||||
if (g.__tvboxAllWarm) return;
|
||||
g.__tvboxAllWarm = true;
|
||||
const run = () => {
|
||||
for (const q of WARM_KEYS) {
|
||||
const ent = respCache.get(q);
|
||||
if (!ent || Date.now() - ent[0] > FRESH_MS - 5000) refreshInBackground(q, new URLSearchParams(q));
|
||||
}
|
||||
};
|
||||
setTimeout(run, 3000);
|
||||
setInterval(run, 55000);
|
||||
}
|
||||
scheduleWarm();
|
||||
@@ -21,7 +21,6 @@ export default function PaginatedRow({
|
||||
isLoading = false,
|
||||
}: PaginatedRowProps) {
|
||||
const [startIndex, setStartIndex] = useState(0);
|
||||
const [isHovered, setIsHovered] = useState(false);
|
||||
const uniqueId = useId(); // 为每个实例生成唯一ID
|
||||
|
||||
// 获取当前显示的项目 - 支持无限向前浏览
|
||||
@@ -80,23 +79,19 @@ export default function PaginatedRow({
|
||||
<div
|
||||
className={`relative ${className}`}
|
||||
data-paginated-row={uniqueId}
|
||||
onMouseEnter={() => setIsHovered(true)}
|
||||
onMouseLeave={() => setIsHovered(false)}
|
||||
>
|
||||
{/* 内容区域 - 移除group类以避免悬停效果冲突 */}
|
||||
<div className='grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 gap-4 relative'>
|
||||
{currentItems}
|
||||
|
||||
{/* 改进的导航按钮 - 仅在容器悬停时显示 */}
|
||||
{/* 导航按钮 - 始终可见(悬停仅放大反馈),小屏收进网格边缘防止顶出视口 */}
|
||||
{needsPagination && (
|
||||
<>
|
||||
{/* 左箭头按钮 - 只有不在第一页时才显示 */}
|
||||
{canGoPrev && (
|
||||
<button
|
||||
onClick={handlePrevPage}
|
||||
className={`absolute -left-12 z-20 w-10 h-10 bg-gradient-to-r from-purple-500 to-purple-600 hover:from-purple-600 hover:to-purple-700 rounded-full shadow-lg hover:shadow-xl flex items-center justify-center transition-all duration-300 hover:scale-110 focus:outline-none focus:ring-2 focus:ring-purple-400 focus:ring-offset-2 dark:focus:ring-offset-gray-900 ${
|
||||
isHovered ? 'opacity-100' : 'opacity-0'
|
||||
}`}
|
||||
className={`absolute -left-2 md:-left-12 z-20 w-10 h-10 bg-gradient-to-r from-purple-500 to-purple-600 hover:from-purple-600 hover:to-purple-700 rounded-full shadow-lg hover:shadow-xl flex items-center justify-center transition-all duration-300 hover:scale-110 focus:outline-none focus:ring-2 focus:ring-purple-400 focus:ring-offset-2 dark:focus:ring-offset-gray-900`}
|
||||
style={{
|
||||
// 确保按钮在两行中间
|
||||
top: 'calc(50% - 20px)',
|
||||
@@ -112,9 +107,7 @@ export default function PaginatedRow({
|
||||
<button
|
||||
onClick={handleNextPage}
|
||||
disabled={isLoading}
|
||||
className={`absolute -right-12 z-20 w-10 h-10 bg-gradient-to-r from-purple-500 to-purple-600 hover:from-purple-600 hover:to-purple-700 rounded-full shadow-lg hover:shadow-xl flex items-center justify-center transition-all duration-300 hover:scale-110 focus:outline-none focus:ring-2 focus:ring-purple-400 focus:ring-offset-2 dark:focus:ring-offset-gray-900 disabled:opacity-50 disabled:cursor-not-allowed ${
|
||||
isHovered ? 'opacity-100' : 'opacity-0'
|
||||
}`}
|
||||
className={`absolute -right-2 md:-right-12 z-20 w-10 h-10 bg-gradient-to-r from-purple-500 to-purple-600 hover:from-purple-600 hover:to-purple-700 rounded-full shadow-lg hover:shadow-xl flex items-center justify-center transition-all duration-300 hover:scale-110 focus:outline-none focus:ring-2 focus:ring-purple-400 focus:ring-offset-2 dark:focus:ring-offset-gray-900 disabled:opacity-50 disabled:cursor-not-allowed`}
|
||||
style={{
|
||||
// 确保按钮在两行中间
|
||||
top: 'calc(50% - 20px)',
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
import Link from 'next/link';
|
||||
import { useEffect, useState } from 'react';
|
||||
|
||||
import PaginatedRow from '@/components/PaginatedRow';
|
||||
|
||||
interface DoubanComment {
|
||||
id: string;
|
||||
user: string;
|
||||
@@ -265,7 +267,8 @@ export default function VideoMetaExtra({
|
||||
</div>
|
||||
)}
|
||||
{related.length > 0 && (
|
||||
<div className='grid grid-cols-5 gap-3'>
|
||||
/* 与首页「最新港剧」同款 PaginatedRow 翻页:左右箭头 hover 显示,每页 10 条 */
|
||||
<PaginatedRow itemsPerPage={10}>
|
||||
{related.map((r: any) => (
|
||||
<a
|
||||
key={`${r.source}-${r.id}`}
|
||||
@@ -297,7 +300,7 @@ export default function VideoMetaExtra({
|
||||
)}
|
||||
</a>
|
||||
))}
|
||||
</div>
|
||||
</PaginatedRow>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
+24
-14
@@ -36,28 +36,38 @@ export function ns(x: any, key: string) {
|
||||
return Object.assign({}, x, { vod_id: String(key) + ':' + String(x.vod_id) });
|
||||
}
|
||||
|
||||
// 源站分类表缓存:非空 10 分钟(分类表很稳定),空 30 秒(失败要尽快重试)
|
||||
// 源站分类表缓存:非空 10 分钟(分类表很稳定),空 2 分钟(失败过 2 分钟再试,
|
||||
// 30s 太短会让每分钟的刷新都重新踩满超时拖慢整体聚合)
|
||||
const classCache = new Map<string, [number, any[], boolean]>();
|
||||
export async function fetchClass(api: string): Promise<any[]> {
|
||||
const now = Date.now();
|
||||
const c = classCache.get(api);
|
||||
if (c && (c[2] ? now - c[0] < 30000 : now - c[0] < 600000)) return c[1];
|
||||
for (const ep of [api, api + (api.includes('?') ? '&' : '?') + 'ac=list', api + (api.includes('?') ? '&' : '?') + 'ac=class']) {
|
||||
if (c && (c[2] ? now - c[0] < 120000 : now - c[0] < 600000)) return c[1];
|
||||
// 三个候选端点并发竞速(旧行为是串行逐试:半死源每端点都等满 8s 超时,
|
||||
// 最坏 3×8s=24s 拖死整体聚合——冷启动 60s 的主要来源);首个返回非空分类的端点即胜,
|
||||
// 全部失败/超时(单端点 8s)才缓存空结果 → 冷启动最坏 8s 而非 24s
|
||||
const eps = [api, api + (api.includes('?') ? '&' : '?') + 'ac=list', api + (api.includes('?') ? '&' : '?') + 'ac=class'];
|
||||
const attempt = async (ep: string): Promise<any[]> => {
|
||||
const ctrl = new AbortController();
|
||||
const t = setTimeout(() => ctrl.abort(), 8000);
|
||||
try {
|
||||
const ctrl = new AbortController();
|
||||
const t = setTimeout(() => ctrl.abort(), 8000);
|
||||
const r = await fetch(ep, { headers: { 'User-Agent': UA, Accept: 'application/json' }, signal: ctrl.signal });
|
||||
clearTimeout(t);
|
||||
if (!r.ok) continue;
|
||||
if (!r.ok) throw new Error('http ' + r.status);
|
||||
const j = await r.json();
|
||||
if (Array.isArray(j?.class) && j.class.length) {
|
||||
classCache.set(api, [now, j.class, false]);
|
||||
return j.class;
|
||||
}
|
||||
} catch {}
|
||||
if (Array.isArray(j?.class) && j.class.length) return j.class;
|
||||
throw new Error('no class');
|
||||
} finally {
|
||||
clearTimeout(t);
|
||||
}
|
||||
};
|
||||
try {
|
||||
const classes = await Promise.any(eps.map(attempt));
|
||||
classCache.set(api, [now, classes, false]);
|
||||
return classes;
|
||||
} catch {
|
||||
classCache.set(api, [now, [], true]);
|
||||
return [];
|
||||
}
|
||||
classCache.set(api, [now, [], true]);
|
||||
return [];
|
||||
}
|
||||
|
||||
// 顶层 9xx 分类表 + 筛选器(旧补丁 MK):TVBox 端每个站点看到的就是这 7+1 个分类
|
||||
|
||||
Reference in new issue
Block a user