diff --git a/CHANGELOG.md b/CHANGELOG.md index c5a15e5..2cdef82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ 格式参考本机发版惯例:按日期分条,`🐛修复` / `✨新功能`。 +## 2026-10-26 → v-fixed14 + +- ✨ **顶部菜单新增「直播」**:51 个港澳台电视频道(凤凰卫视全系 / TVB 翡翠·明珠·无线新闻 / ViuTV / 有线新闻 / NOW 视闻台 / 东森 / 中天 / TVBS 等),点菜单直达 `/live` 播放页 +- ✨ **自研无广告播放页**:频道网格 + 16:9 播放器 + 多线路切换;FLV 走 mpegts.js、HLS 走 hls.js,两个播放器本地托管(`/hls.min.js`、`/mpegts.min.js`,挂载于 `public-live/`);线路失败自动切下一条 +- ✨ **接口族 `/api/tvbox?live=`**:`channels`(频道列表,1h 缓存)/ `lines`(线路解码,30min 缓存)/ `m3u8`(解析线路 → 跟随多级 302 → m3u8 分片改写为本站反代)/ `ts`(流反代,域名白名单防开放代理) +- ✨ **上游线路动态解码**:上游播放页内联 JS 每页随机化函数名/变量名,按内容特征(keyStr base64 表、固定 XOR 盐)在 vm 沙箱内求值解码,`new Function` 兜底 +- 🔒 **来源隐藏**:页面与接口响应不含任何上游域名;播放数据全程经本站反代转发(浏览器网络面板只见 `192.168.68.19:3030`) +- 🔒 **零广告**:播放页完全自研,上游页面的 googletagmanager / popunder / 51.la 统计等广告脚本全部不加载 +- 🔧 flv 长流反代超时放宽至 1h(20s 会掐断直播流);play.php 上游校验 Referer,反代自动携带 + ## 2026-10-10 → v-fixed13 - ✨ **TVBOX 全源聚合站点「全部资源」**:新增 `site=all`,搜索/浏览并行查全部 8 个启用源,按片名去重合并、按时间排序;详情带源标记(如 `dyttzyapi:124684`)自动路由回原源取播放链接 diff --git a/README.md b/README.md index 009414c..cabad33 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,11 @@ docker/katelyatv/ │ ├── apply.sh # 一键重放补丁到运行中容器 │ ├── app-api-tvbox-route.js # TVBOX 接口(聚合/筛选/分类) │ ├── app-api-filter-route.js# 筛选页接口(提速/分页) -│ ├── routes-manifest.json # 路径式 TVBOX API rewrite -│ └── filter-page-chunk.js # 筛选页前端去重 +│ ├── routes-manifest.json # 路径式 TVBOX API rewrite + /live rewrite +│ ├── filter-page-chunk.js # 筛选页前端去重 +│ ├── live-inject.js # ★ 直播功能注入块(解码/反代/播放页) +│ └── inject_live.py # 直播注入脚本(幂等可重跑) +├── public-live/ # 直播页静态资产(hls.min.js / mpegts.min.js + 站点原 public,挂载 /app/public) ├── README.md └── CHANGELOG.md # 更新日志 ``` @@ -81,4 +84,12 @@ docker compose -f docker-compose.redis.yml up -d 3. 其后 8 个单源站点可单独进入 4. 顶级分类固定 7 个:香港电影 / 香港剧 / 电影 / 电视剧 / 综艺 / 动画片 / 动漫;点进分类后 OK 键弹出筛选:**子分类 / 年份 / 地区 / 排序** +## 电视直播(港澳台) + +1. 顶部菜单点 **「直播」**(或浏览器打开 `http://192.168.68.19:3030/live`,需登录站点账号) +2. 51 个港澳台频道:凤凰卫视全系、TVB 翡翠/明珠/无线新闻、ViuTV、有线新闻、NOW 视闻台、东森/中天/TVBS 等 +3. 左侧频道网格点选即播,右上角可切线路(线路失败自动跳下一条);FLV 与 HLS 双格式自动适配 +4. 页面自研无任何广告;播放数据全部经本站反代转发(`/api/tvbox?live=` 接口族),浏览器不接触任何第三方域名 +5. 重放直播补丁:`python3 patches/inject_live.py && docker restart katelyatv`(须在 compose up 之前跑,容器重建会回退到镜像内容——已固化进 fixed14 镜像) + 详见 [CHANGELOG.md](CHANGELOG.md)。 diff --git a/docker-compose.redis.yml b/docker-compose.redis.yml index 5005b20..7ae1797 100644 --- a/docker-compose.redis.yml +++ b/docker-compose.redis.yml @@ -3,7 +3,7 @@ version: '3.8' services: # KatelyaTV 应用服务 katelyatv: - image: katelyatv:fixed13 + image: katelyatv:fixed14 container_name: katelyatv ports: - "3030:3000" @@ -31,6 +31,8 @@ services: - katelyatv-redis volumes: - ./config.json:/app/config.json:ro + # 直播页静态资产(hls.js / mpegts.js + 站点原静态文件) + - ./public-live:/app/public restart: always networks: - katelyatv-network diff --git a/patches/inject_live.py b/patches/inject_live.py new file mode 100644 index 0000000..e9245cd --- /dev/null +++ b/patches/inject_live.py @@ -0,0 +1,63 @@ +#!/usr/bin/env python3 +"""注入直播功能到运行中容器(幂等可重跑):LIVE 函数块 + 入口拦截 + /live rewrite + 菜单项""" +import subprocess, json, tempfile, os + +P = "/app/.next/server/app/api/tvbox/route.js" +RM = "/app/.next/routes-manifest.json" +MC = "/app/.next/static/chunks/402-42ae253cc67eee98.js" +BASE = os.path.dirname(os.path.abspath(__file__)) +MARK_S, MARK_E = "/* ==== LIVE:", "/* ==== LIVE END ==== */" +HOOK = 'try{let _lv=new URL(e.url).searchParams.get("live");if(_lv)return await LIVE(_lv,e)}catch(_le){console.log("[LIVE-HOOK]",_le&&_le.message)}' + +def read(p): + return subprocess.run(["docker","exec","katelyatv","cat",p],capture_output=True,check=True).stdout.decode() + +def write(p, data): + r=subprocess.run(["docker","exec","-i","katelyatv","sh","-c",f"cat > {p}"],input=data.encode(),capture_output=True) + assert r.returncode==0, r.stderr.decode()[:300] + +# ---- 1) route.js: 删旧块+插新块+入口钩子 ---- +src = read(P) +live = open(os.path.join(BASE, "live-inject.js")).read().strip() +i, j = src.find(MARK_S), src.find(MARK_E) +if i >= 0 and j > i: + src = src[:i] + src[j+len(MARK_E)+1:] + print("old LIVE block removed") +anchor = "let _aggC=new Map();" +assert src.count(anchor) == 1, "anchor A" +if MARK_S not in src: + src = src.replace(anchor, live + "\n" + anchor, 1) + print("LIVE block injected") +a = 'async function u(e){console.log("[TVBOX-REQ]",e.method,e.url);' +assert src.count(a) == 1, "anchor B" +if HOOK not in src: + src = src.replace(a, a + HOOK, 1) + print("entry hook injected") +with tempfile.NamedTemporaryFile('w', suffix='.js', delete=False) as f: + f.write(src); tmp = f.name +r = subprocess.run(['node', '--check', tmp], capture_output=True, text=True) +os.unlink(tmp) +assert r.returncode == 0, r.stderr[:600] +write(P, src) +print("route.js OK") + +# ---- 2) rewrite /live ---- +rm = json.loads(read(RM)) +af = rm.get("rewrites", {}).get("afterFiles", []) +if not any(x.get("source") == "/live" for x in af): + af.append({"source": "/live", "destination": "/api/tvbox?live=page", "regex": "^/live$"}) + rm["rewrites"]["afterFiles"] = af + write(RM, json.dumps(rm, ensure_ascii=False)) + print("rewrite /live added") + +# ---- 3) 菜单 ---- +mc = read(MC) +if '"直播"' not in mc: + old = '{icon:o.Z,label:"综艺",href:"/douban?type=show"}' + n = mc.count(old) + assert n == 2, f"menu anchor {n}" + mc = mc.replace(old, old + ',{icon:o.Z,label:"直播",href:"/live"}') + write(MC, mc) + print(f"menu injected x{n}") + +print("DONE - restart container to apply") diff --git a/patches/live-inject.js b/patches/live-inject.js new file mode 100644 index 0000000..f516751 --- /dev/null +++ b/patches/live-inject.js @@ -0,0 +1,169 @@ +/* ==== LIVE: 港澳台电视直播(注入片段,纯函数,无模块依赖) ==== */ +const LIVE_UP="https://m.iptv807.com"; +let _liveVm=null;try{_liveVm=require("vm")}catch(e){} +const LIVE_UA="Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.0 Mobile/15E148 Safari/604.1"; +const LIVE_HOSTS=/(^|\.)(iptv200\.com|2026016\.xyz)$/; +const liveCh={ts:0,list:null},liveLn=new Map(),liveRv=new Map(); +async function liveText(u,ms){const c=new AbortController();const t=setTimeout(()=>c.abort(),ms||15000); +try{const r=await fetch(u,{redirect:"follow",signal:c.signal,headers:{"User-Agent":LIVE_UA,"Referer":LIVE_UP+"/"}});return await r.text()}finally{clearTimeout(t)}} +async function liveChannels(){ +if(liveCh.list&&Date.now()-liveCh.ts<3600e3)return liveCh.list; +const h=await liveText(LIVE_UP+"/?tid=gt");const seen=new Set(),list=[]; +for(const m of h.matchAll(/href="\?act=play&(?:amp;)?tid=gt&(?:amp;)?id=(\d+)"[^>]*>\s*([^<]+?)\s*([\s\S]*?)<\/script>/g)].map(m=>m[1]) + .filter(s=>/keyStr|reverse\(\)\.join/.test(s)&&/function|var /.test(s)); +let ctx={}; +if(_liveVm){ + ctx=_liveVm.createContext({}); + for(const s of blocks){try{_liveVm.runInContext(s,ctx)}catch(e){console.log("[LIVE-BLK-VM]",e&&e.message)}} +}else{ + for(const s of blocks){ + try{ + const names=[...s.matchAll(/function\s+(\w+)\s*\(/g)].map(m=>m[1]); + const vars=[...s.matchAll(/var\s+(\w+)/g)].map(m=>m[1]); + const uniq=[...new Set(names.concat(vars))]; + const fn=new Function(s+"\nvar __o={};"+uniq.map(n=>"try{__o."+n+"="+n+"}catch(e){}").join("")+"\nreturn __o;"); + Object.assign(ctx,fn()); + }catch(e){console.log("[LIVE-BLK-FN]",e&&e.message)}} +} +const fns=Object.keys(ctx).filter(k=>typeof ctx[k]==="function"); +const dec=fns.find(k=>/replace\(["']token=/.test(ctx[k].toString())); +console.log("[LIVE-LINES]",id,"blocks="+blocks.length,"fns="+fns.length,"dec="+dec); +if(!dec)throw new Error("decoder unavailable"); +const lines=[...h.matchAll(/