Compare commits

...
11 Commits
8 changed files with 120 additions and 51 deletions

No files matched your search

+1
View File
@@ -0,0 +1 @@
sha256:dbb7d866a1c1f4cfd4c427cda65634c956cf391fb0144a8e667c08fedc9717dc
+26
View File
@@ -2,6 +2,32 @@
格式参考本机发版惯例:按日期分条,`🐛修复` / `✨新功能`。
## v-fixed71 (2026-11-07)
### 🐛 修复
- 🎬 **最新港剧只出香港剧**:此前聚合拿第一个源的分类 ID 查全源,各源分类表 ID 不同导致串进内地剧;现每个源按自己的分类表映射(有香港剧类目直取,无则取电视剧类目+地区过滤),结果再硬过滤地区含香港,实测 51 条全香港,最新的排最前
## v-fixed70 (2026-11-07)
### ✨ 新功能
- 🎬 **最新港剧 10 个显示**:此前写死 5 个,现取前 10;加载中显示 10 个骨架占位,与热门电影/剧集同时出现,不再后半拍
- 🔢 版本号对齐 fixed70
## v-fixed69 (2026-11-07)
### ✨ 新功能
- 📋 **访问日志源码化**:middleware 内 `[ACCESS]` 日志(IP/方法/路径/UA/Referer,跳过 `_next/static` 与 favicon),替代旧 `patches/patch_access_log.js` 运行时注入 next 内部 start-server.js;上线验证日志行正常输出
- 📝 README 更新:版本号对齐 fixed69,「补丁固化」小节改为源码构建流程说明(补丁已全部源码化,apply.sh 无活跃注入)
## v-fixed68 (2026-11-07)
### ✨ 新功能
- 🧩 **右上角四件套每一页常驻**:新建 `TopRightButtons` 共用组件(版本角标 + 🔔通知铃铛 + 📺TVBOX接口 + 🌍IPV4/IPv6 + ⭐开源地址);PageLayout 去掉首页条件整块换共用组件;`/live` `/ipv6` `/config` `/settings` `/tvbox` 加 float 悬浮条;login/warning 为登录前页跳过;11 页验证全过
- 🗑️ `patch_cachebust.js` 过时停用(Next 构建自带 contenthash,容器内无 402 chunk),apply.sh 仅保留注释说明
### 🐛 修复
- 🔢 版本号双点对齐:Dockerfile ENV 与 TopRightButtons fallback 同为 fixed68(此前分别滞后 fixed54/fixed53)
## v-fixed44-hub-r3 (2026-11-07)
### ✨ 新功能
+8 -8
View File
@@ -54,7 +54,7 @@ git clone https://gitea.88531.cn/jinghui/katelyatv.git && cd katelyatv
docker pull gitea.88531.cn/jinghui/katelyatv:latest
# 国内慢可换腾讯云镜像(东京):
# docker pull jpccr.ccs.tencentyun.com/jinghui/katelyatv:latest
docker tag gitea.88531.cn/jinghui/katelyatv:latest katelyatv:fixed44 # 对齐 compose 的 image 名
docker tag gitea.88531.cn/jinghui/katelyatv:latest katelyatv:fixed71 # 对齐 compose 的 image 名
cp .env.example .env
vi .env # 至少填:PASSWORD(站点密码)、NEXTAUTH_SECRET(随机串)
@@ -86,6 +86,10 @@ docker restart katelyatv
## 📝 更新日志(最近)
- **2026-11-07 v-fixed71**:最新港剧只出香港剧(聚合接口按每个源各自的分类表映射香港剧/电视剧类目,不再拿第一个源的 ID 查全源;结果硬过滤地区含香港,之前串进内地剧;排序年份+更新时间双降序,最新排最前)
- **2026-11-07 v-fixed70**:最新港剧改为 10 个显示(此前写死 5 个);加载中显示 10 个骨架占位,与热门电影/剧集同时出现,不再后半拍跳动
- **2026-11-07 v-fixed69**:访问日志源码化(middleware 内 `[ACCESS]` 日志,替代注入 next 内部 start-server);版本号对齐 fixed69;四件套每一页常驻+11 页验证全过保持
- **2026-11-07 v-fixed68**:右上角四件套(版本角标 + 🔔通知铃铛 + 📺TVBOX接口 + 🌍IPV4/IPv6 + ⭐开源地址)每一页常驻 —— 新建 `TopRightButtons` 共用组件,11 页验证全过;`patch_cachebust.js` 过时停用(Next 构建自带 contenthash)
- **2026-11-06 v-fixed44**:管理页「用户配置」点击崩溃(React #31)彻底修复 —— 根因是配置模块把用户对象当用户名写进列表,已修编译产物与源码并清理 18 条脏数据;新增**全新「用户管理」面板**(用户列表 / 添加 / 改密 / 设为管理 / 封禁 / 删除)
- **2026-11-01 v-fixed43**:IPv6 智能跳转恢复(家宽有 IPv6 自动切到 tv6 高速线路);电脑端与移动端新增「AI短剧」入口;`/live` 直播页点击画面可暂停/继续;首页公告改为授权中心动态推送
- **2026-10-30 v-fixed38**:首页右上角新增「📺 TVBOX接口」一键复制配置地址;⭐ 开源地址与菜单版本按钮改指自建 Gitea(`https://gitea.88531.cn/jinghui/katelyatv`)
@@ -135,15 +139,11 @@ docker/katelyatv/
| `patch_access_log.js` | 访问日志注入([ACCESS] IP/UA/路径,供 `usage-stats.sh` 统计使用人数) |
| `patch_license.js` | 授权系统:CardAuth 装机/心跳/公告/版本推送、`/api/license-config` 路由、首页右上角四件套(版本角标+🔔通知铃铛+📺TVBOX接口一键复制配置地址+⭐开源地址指向自建Gitea,仅首页显示;直播页移除开源按钮)、每 IP 限流 429;运行时组件见 `license-hub.js` |
补丁固化在本地镜像(compose 引用,当前 `katelyatv:fixed44`)。上游大版本升级后重放补丁:
补丁已全部源码化,运行时注入仅保留注释说明(`patches/apply.sh` 无活跃 `docker cp/exec`,执行仅重启容器)。镜像构建:`source/` 源码构建 → `katelyatv:fixed71`(compose 引用)。上游大版本升级后:
```bash
bash patches/apply.sh # 重放补丁
python3 patches/inject_live.py # 重放直播注入(幂等)
docker cp license-hub.js katelyatv:/app/license-hub.js
node patches/patch_license.js # 重放授权/角标/限流(幂等)
docker commit katelyatv katelyatv:fixed44 # 固化新镜像
docker compose -f docker-compose.redis.yml up -d
pnpm --dir source build && docker build -t katelyatv:fixedXX ./source # 源码构建(新功能一律先改 source/ 再 build)
docker compose -f docker-compose.redis.yml up -d --force-recreate
```
## 🙏 致谢
+2 -2
View File
@@ -3,7 +3,7 @@ version: '3.8'
services:
# KatelyaTV 应用服务
katelyatv:
image: katelyatv:fixed44
image: katelyatv:fixed71
container_name: katelyatv
ports:
- "3030:3000"
@@ -36,7 +36,7 @@ services:
HUB_PROJECT_ID: ${HUB_PROJECT_ID:-11}
HUB_DISABLED: ${HUB_DISABLED:-0}
# 当前版本号(右上角角标 + 授权中心自检上报)
SITE_VERSION: ${SITE_VERSION:-fixed41}
SITE_VERSION: ${SITE_VERSION:-fixed44}
depends_on:
- katelyatv-redis
volumes:
+39 -35
View File
@@ -13,52 +13,56 @@ docker ps --filter "name=^${C}$" --format '{{.Names}} {{.Image}}' | grep -q . \
echo "[2/5] 校验产物版本(需含 TVBOX 补丁标记或同源 fixed13 产物)..."
# 目标文件必须存在且是可解析 JS
docker exec "$C" node --check /app/.next/server/app/api/tvbox/route.js
docker exec "$C" node --check /app/.next/server/app/api/filter/route.js
docker exec "$C" node --check /app/.next/server/app/api/filter/route.js || echo "filter路由为源码构建产物,跳过旧补丁校验"
echo "[3/5] 复制补丁文件 ..."
docker cp "$DIR/app-api-tvbox-route.js" "$C:/app/.next/server/app/api/tvbox/route.js"
docker cp "$DIR/app-api-filter-route.js" "$C:/app/.next/server/app/api/filter/route.js"
docker cp "$DIR/routes-manifest.json" "$C:/app/.next/routes-manifest.json"
docker cp "$DIR/filter-page-chunk.js" "$C:/app/.next/static/chunks/app/filter/page-4d01a87b20ac1a73.js"
echo "[3/5] 复制补丁文件 ... 已源码化(fixed58 tvbox直播透传/fixed63 filter前后端+菜单入口):不再覆盖 tvbox/filter 路由、routes-manifest、filter页面chunk"
# docker cp "$DIR/app-api-tvbox-route.js" "$C:/app/.next/server/app/api/tvbox/route.js"
# docker cp "$DIR/app-api-filter-route.js" "$C:/app/.next/server/app/api/filter/route.js"
# docker cp "$DIR/routes-manifest.json" "$C:/app/.next/routes-manifest.json"
# docker cp "$DIR/filter-page-chunk.js" "$C:/app/.next/static/chunks/app/filter/page-4d01a87b20ac1a73.js"
echo "[4/5] 语法校验 ..."
docker exec "$C" node --check /app/.next/server/app/api/tvbox/route.js
docker exec "$C" node --check /app/.next/server/app/api/filter/route.js
echo "[4/5] 语法校验 ... 已源码化,跳过旧补丁校验"
# docker exec "$C" node --check /app/.next/server/app/api/tvbox/route.js
# docker exec "$C" node --check /app/.next/server/app/api/filter/route.js
echo "[4a/5] 授权系统补丁(角标/铃铛/TVBOX按钮/IPv6探针)..."
docker cp "$DIR/patch_license.js" "$C:/tmp/patch_license.js"
docker exec "$C" node /tmp/patch_license.js || true
echo "[4a/5] 授权系统补丁(角标/铃铛/TVBOX按钮/IPv6探针)... 已源码化(fixed54: HubBell/HubNotice/TvboxButton/版本角标/layout公告),跳过运行时注入"
# docker cp "$DIR/patch_license.js" "$C:/tmp/patch_license.js"
# docker exec "$C" node /tmp/patch_license.js || true
echo "[4b/5] 应用公告补丁(免责声明→CardAuth公告)..."
docker cp "$DIR/patch-announcement.js" "$C:/tmp/patch-announcement.js"
docker exec "$C" node /tmp/patch-announcement.js || true
docker exec "$C" node --check /app/.next/server/chunks/8583.js || { echo "8583.js 语法失败"; exit 1; }
echo "[4b/5] 应用公告补丁(免责声明→CardAuth公告)... 已源码化(fixed54: layout.tsx读hub.getNotice),跳过运行时注入"
# docker cp "$DIR/patch-announcement.js" "$C:/tmp/patch-announcement.js"
# docker exec "$C" node /tmp/patch-announcement.js || true
# docker exec "$C" node --check /app/.next/server/chunks/8583.js || { echo "8583.js 语法失败"; exit 1; }
echo "[4c/5] 移除重复的 HubNotice 弹窗..."
docker cp "$DIR/patch-hubnotice-remove.js" "$C:/tmp/patch-hubnotice-remove.js"
docker exec "$C" node /tmp/patch-hubnotice-remove.js || true
echo "[4c/5] 移除重复的 HubNotice 弹窗... 已源码化(HubNotice组件挂载于PageLayout,无重复注入),跳过"
# docker cp "$DIR/patch-hubnotice-remove.js" "$C:/tmp/patch-hubnotice-remove.js"
# docker exec "$C" node /tmp/patch-hubnotice-remove.js || true
echo "[4d/5] 注入直播 /live 功能..."
python3 "$DIR/inject_live.py" || echo "live inject failed (non-fatal)"
echo "[4d/5] 注入直播 /live 功能... 已源码化(fixed58: live-inject.js随镜像发布+tvbox路由透传Response),跳过运行时注入"
# python3 "$DIR/inject_live.py" || echo "live inject failed (non-fatal)"
echo "[4e/5] 顶部/底部菜单加入 AI短剧 入口..."
docker cp "$DIR/patch-aidrama-menu.js" "$C:/tmp/patch-aidrama-menu.js"
docker exec "$C" node /tmp/patch-aidrama-menu.js || true
echo "[4e/5] 顶部/底部菜单加入 AI短剧 入口... 已源码化(PageLayout菜单含AI短剧),跳过运行时注入"
# docker cp "$DIR/patch-aidrama-menu.js" "$C:/tmp/patch-aidrama-menu.js"
# docker exec "$C" node /tmp/patch-aidrama-menu.js || true
echo "[4e2/5] 导航菜单可收缩(避免把右侧按钮挤出视口)..."
docker cp "$DIR/patch_nav_shrink.js" "$C:/tmp/patch_nav_shrink.js"
docker exec "$C" node /tmp/patch_nav_shrink.js || true
echo "[4e2/5] 导航菜单可收缩(避免把右侧按钮挤出视口)... 已源码化(PageLayout导航min-w-0/flex-1/overflow-x-auto),跳过运行时注入"
# docker cp "$DIR/patch_nav_shrink.js" "$C:/tmp/patch_nav_shrink.js"
# docker exec "$C" node /tmp/patch_nav_shrink.js || true
echo "[4f/5] 注入 /ipv6 线路选择页 + 首页 IPV4/IPV6 切换按钮..."
python3 "$DIR/inject_ipv6.py" || echo "ipv6 inject failed (non-fatal)"
python3 "$DIR/patch_middleware_whitelist.py" || echo "middleware whitelist failed (non-fatal)"
echo "[4f/5] 注入 /ipv6 线路选择页 + 首页 IPV4/IPV6 切换按钮... 已源码化(ipv6页+Iipv6Button+middleware白名单),跳过运行时注入"
# python3 "$DIR/inject_ipv6.py" || echo "ipv6 inject failed (non-fatal)"
# python3 "$DIR/patch_middleware_whitelist.py" || echo "middleware whitelist failed (non-fatal)"
echo "[4h/5] 用户最后登录/注册时间记录..."
python3 "$DIR/inject_last_login.py" || echo "last_login inject failed (non-fatal)"
echo "[4h/5] 用户最后登录/注册时间记录... 已源码化(redis.db touchLogin+login调用+admin回填),跳过运行时注入"
# python3 "$DIR/inject_last_login.py" || echo "last_login inject failed (non-fatal)"
echo "[4g/5] 前端资源防陈旧缓存(chunk按内容改名)..."
docker cp "$DIR/patch_cachebust.js" "$C:/tmp/patch_cachebust.js"
docker exec "$C" node /tmp/patch_cachebust.js || true
echo "[4g/5] 前端资源防陈旧缓存... 已过时停用(Next构建自带contenthash,容器内无402 chunk),跳过运行时改名"
# docker cp "$DIR/patch_cachebust.js" "$C:/tmp/patch_cachebust.js"
# docker exec "$C" node /tmp/patch_cachebust.js || true
echo "[4i/5] 访问日志... 已源码化(middleware内console.log [ACCESS],替代注入next内部start-server.js),跳过运行时注入"
# docker cp "$DIR/patch_access_log.js" "$C:/tmp/patch_access_log.js"
# docker exec "$C" node /tmp/patch_access_log.js || true
echo "[5/5] 重启 ..."
docker restart "$C" >/dev/null
+7 -4
View File
@@ -1,7 +1,10 @@
#!/usr/bin/env python3
"""注入 IPv4/IPv6 线路选择页 /ipv6 + 右上角切换按钮(幂等可重跑)"""
import os
import subprocess, json, tempfile, os
CT = os.environ.get("KAT_CONTAINER", "katelyatv")
P = "/app/.next/server/app/api/tvbox/route.js"
RM = "/app/.next/routes-manifest.json"
MC_DIR = "/app/.next/static/chunks"
@@ -9,9 +12,9 @@ MARK_S, MARK_E = "/* ==== IPV6PAGE:", "/* ==== IPV6PAGE END ==== */"
HOOK = 'try{let _ipv6p=new URL(e.url);if(_ipv6p.pathname==="/ipv6"||_ipv6p.searchParams.get("ipv6")==="page")return IPV6PAGE(e)}catch(_ie){console.log("[IPV6-HOOK]",_ie&&_ie.message)}'
def read(p):
return subprocess.run(["docker","exec","-u","root","katelyatv","cat",p],capture_output=True,check=True).stdout.decode()
return subprocess.run(["docker","exec","-u","root",CT,"cat",p],capture_output=True,check=True).stdout.decode()
def write(p, data):
r=subprocess.run(["docker","exec","-u","root","-i","katelyatv","sh","-c",f"cat > {p}"],input=data.encode(),capture_output=True)
r=subprocess.run(["docker","exec","-u","root","-i",CT,"sh","-c",f"cat > {p}"],input=data.encode(),capture_output=True)
assert r.returncode==0, r.stderr.decode()[:300]
# ---- 1) route.js: 注入 IPV6PAGE 函数 + 入口钩子 ----
@@ -50,10 +53,10 @@ if not any(x.get("source") == "/ipv6" for x in af):
# ---- 3) 右上角 IPV4/IPV6 切换按钮(注入 402 chunk,样式对齐 TVBOX接口按钮)----
target = None
files = subprocess.run(["docker","exec","katelyatv","ls",MC_DIR],capture_output=True,check=True).stdout.decode().split()
files = subprocess.run(["docker","exec",CT,"ls",MC_DIR],capture_output=True,check=True).stdout.decode().split()
for fn in files:
if not fn.endswith(".js"): continue
c = subprocess.run(["docker","exec","katelyatv","cat",f"{MC_DIR}/{fn}"],capture_output=True).stdout.decode()
c = subprocess.run(["docker","exec",CT,"cat",f"{MC_DIR}/{fn}"],capture_output=True).stdout.decode()
if 'gitea.88531.cn/jinghui/katelyatv' in c and 'mvModal' in c:
target = f"{MC_DIR}/{fn}"; break
if not target:
+5 -2
View File
@@ -1,7 +1,10 @@
#!/usr/bin/env python3
"""注入直播功能到运行中容器(幂等可重跑):LIVE 函数块 + 入口拦截 + /live rewrite + 菜单项"""
import os
import subprocess, json, tempfile, os
CT = os.environ.get("KAT_CONTAINER", "katelyatv")
P = "/app/.next/server/app/api/tvbox/route.js"
RM = "/app/.next/routes-manifest.json"
MC = "/app/.next/static/chunks/402-42ae253cc67eee98.js"
@@ -11,10 +14,10 @@ HOOK_OLD = 'try{let _lv=new URL(e.url).searchParams.get("live");if(_lv)return aw
HOOK = 'try{let _lurl=new URL(e.url),_lv=_lurl.searchParams.get("live");if(!_lv&&_lurl.pathname==="/live")_lv="page";if(_lv)return await LIVE(_lv,e)}catch(_le){console.log("[LIVE-HOOK]",_le&&_le.message)}'
def read(p):
return subprocess.run(["docker","exec","-u","root","katelyatv","cat",p],capture_output=True,check=True).stdout.decode()
return subprocess.run(["docker","exec","-u","root",CT,"cat",p],capture_output=True,check=True).stdout.decode()
def write(p, data):
r=subprocess.run(["docker","exec","-u","root","-i","katelyatv","sh","-c",f"cat > {p}"],input=data.encode(),capture_output=True)
r=subprocess.run(["docker","exec","-u","root","-i",CT,"sh","-c",f"cat > {p}"],input=data.encode(),capture_output=True)
assert r.returncode==0, r.stderr.decode()[:300]
# ---- 1) route.js: 删旧块+插新块+入口钩子 ----
+32
View File
@@ -0,0 +1,32 @@
#!/usr/bin/env bash
# 在临时容器上重放全部补丁(不动生产容器),用于出新的 fixedNN 镜像
# 用法: bash patches/stage_release.sh <源镜像> <临时容器名> <宿主端口>
set -euo pipefail
IMG="${1:?源镜像}"
C="${2:?临时容器名}"
PORT="${3:?宿主端口}"
DIR="$(cd "$(dirname "$0")" && pwd)"
DEPLOY="$(dirname "$DIR")"
docker rm -f "$C" >/dev/null 2>&1 || true
docker run -d --name "$C" \
--network katelyatv_katelyatv-network \
-p "${PORT}:3000" \
--env-file "$DEPLOY/.env" \
-v "$DEPLOY/config.json:/app/config.json:ro" \
-v "$DEPLOY/public-live:/app/public" \
"$IMG" >/dev/null
echo "[stage] 等待启动 ..."
for i in $(seq 1 40); do
code=$(curl -s -o /dev/null -w '%{http_code}' -m 3 "http://127.0.0.1:${PORT}/login" || true)
[ "$code" = "200" ] && break
sleep 2
done
echo "[stage] /login -> $code"
export KAT_CONTAINER="$C"
KAT_REDIS=katelyatv-redis bash "$DIR/apply.sh" "$C"
python3 "$DIR/fix_userlist_usernames.py" || echo "[stage] userlist fix skipped"
echo "[stage] 补丁完成,容器 $C 运行在 :$PORT"