一分钟搭建影视站,支持Docker等部署方式
fix(live): 修复直播播放与EPG解析的若干缺陷
bestZweib0a7c2a6fac9
diff --git a/src/app/live/page.tsx b/src/app/live/page.tsxindex 7ce9f3b..3f69e29 100644--- a/src/app/live/page.tsx+++ b/src/app/live/page.tsx@@ -24,6 +24,28 @@ export default function LivePage() {);}+/** 复制文本到剪贴板:优先 Clipboard API,http 环境降级 execCommand */+async function copyText(text: string): Promise<boolean> {+ try {+ await navigator.clipboard.writeText(text);+ return true;+ } catch {+ try {+ const ta = document.createElement('textarea');+ ta.value = text;+ ta.style.position = 'fixed';+ ta.style.opacity = '0';+ document.body.appendChild(ta);+ ta.select();+ const ok = document.execCommand('copy');+ ta.remove();+ return ok;+ } catch {+ return false;+ }+ }+}+function LiveContent() {const searchParams = useSearchParams();const router = useRouter();@@ -197,11 +219,11 @@ function LiveContent() {aria-label="复制播放地址"title="复制播放地址"onClick={async () => {- try {- await navigator.clipboard.writeText(currentChannel.url);+ const ok = await copyText(currentChannel.url);+ if (ok) {setCopied(true);setTimeout(() => setCopied(false), 1500);- } catch { /* 忽略 */ }+ }}}>{copied ? (diff --git a/src/components/live-player.tsx b/src/components/live-player.tsxindex 548753b..5020416 100644--- a/src/components/live-player.tsx+++ b/src/components/live-player.tsx@@ -37,6 +37,8 @@ export function LivePlayer({ url, title }: LivePlayerProps) {const [error, setError] = useState('');const [hint, setHint] = useState('');const [loading, setLoading] = useState(true);+ // 手动重试计数:变化时重建整个播放器实例(比 location.reload() 轻得多)+ const [retryNonce, setRetryNonce] = useState(0);// 起播前的品牌占位图(与点播 player-shell 共用 /player-poster.png),实际开始播放后隐藏const [showPoster, setShowPoster] = useState(true);const hintTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);@@ -71,6 +73,7 @@ export function LivePlayer({ url, title }: LivePlayerProps) {const setupHls = (video: HTMLVideoElement, mediaUrl: string, allowProxyFallback: boolean) => {cleanupEngines();let liveNetRetryCount = 0;+ let mediaRecoverCount = 0;const hlsConfig: Partial<HlsConfig> = {debug: false,enableWorker: true,@@ -103,7 +106,18 @@ export function LivePlayer({ url, title }: LivePlayerProps) {if (disposed || destroyed) return;const httpCode = data.response?.code;const codeHint = httpCode ? `(HTTP ${httpCode})` : '';- if (data.fatal && !playbackStarted) {+ if (!data.fatal) return;+ // 媒体错误:起播前后统一尝试恢复,次数受限防止无限 recover 循环+ if (data.type === Hls.ErrorTypes.MEDIA_ERROR) {+ if (mediaRecoverCount < 2) {+ mediaRecoverCount++;+ hls.recoverMediaError();+ return;+ }+ setError('直播流解码失败,可能该频道编码不受当前浏览器支持,请尝试其他频道');+ return;+ }+ if (!playbackStarted) {if (allowProxyFallback &&!mediaUrl.startsWith(STREAM_PROXY_PREFIX) &&@@ -114,12 +128,10 @@ export function LivePlayer({ url, title }: LivePlayerProps) {setupHls(video, proxyUrl(url), false);return;}- if (data.type === Hls.ErrorTypes.MEDIA_ERROR) {- hls.recoverMediaError();- return;- }setError(`直播流加载失败${codeHint},可能该频道已失效,请尝试其他频道`);- } else if (data.fatal && data.type === Hls.ErrorTypes.NETWORK_ERROR) {+ return;+ }+ if (data.type === Hls.ErrorTypes.NETWORK_ERROR) {// 播放中网络抖动:尝试恢复拉流;连续失败达到阈值则报错退出liveNetRetryCount++;if (liveNetRetryCount > 5) {@@ -253,7 +265,7 @@ export function LivePlayer({ url, title }: LivePlayerProps) {destroyed = true;};// eslint-disable-next-line react-hooks/exhaustive-deps- }, [url]);+ }, [url, retryNonce]);return (<div className="relative w-full h-full">@@ -285,7 +297,15 @@ export function LivePlayer({ url, title }: LivePlayerProps) {{error && (<div className="absolute inset-0 flex flex-col items-center justify-center gap-2 bg-black/80"><p className="text-red-400 text-sm px-4 text-center">{error}</p>- <button className="btn-ghost text-xs !bg-white/10 !text-white !border-white/20" onClick={() => location.reload()}>+ <button+ className="btn-ghost text-xs !bg-white/10 !text-white !border-white/20"+ onClick={() => {+ // 重建播放器实例即可,无需整页刷新+ setError('');+ setHint('');+ setRetryNonce((n) => n + 1);+ }}+ >重新加载</button></div>diff --git a/src/lib/xmltv.ts b/src/lib/xmltv.tsindex bc6b0ea..d8395eb 100644--- a/src/lib/xmltv.ts+++ b/src/lib/xmltv.ts@@ -18,14 +18,19 @@ const DESC_RE = /<desc(?:\s[^>]*)?>([\s\S]*?)<\/desc>/i;const DEFAULT_WINDOW_MS = 24 * 60 * 60 * 1000;+/** 安全解码码点:畸形实体(越界/NaN)返回空串而非抛 RangeError,避免单条脏数据毁掉整份 EPG */+function safeCodePoint(n: number): string {+ return Number.isInteger(n) && n >= 0 && n <= 0x10ffff ? String.fromCodePoint(n) : '';+}+/** 解析 XMLTV 实体(含 CDATA 与数字实体) */function decodeXmlText(raw: string): string {let text = raw.trim();const cdata = text.match(/^<!\[CDATA\[([\s\S]*)\]\]>$/);if (cdata) text = cdata[1];return text- .replace(/&#x([0-9a-fA-F]+);/g, (_, hex: string) => String.fromCodePoint(parseInt(hex, 16)))- .replace(/&#(\d+);/g, (_, dec: string) => String.fromCodePoint(parseInt(dec, 10)))+ .replace(/&#x([0-9a-fA-F]+);/g, (_, hex: string) => safeCodePoint(parseInt(hex, 16)))+ .replace(/&#(\d+);/g, (_, dec: string) => safeCodePoint(parseInt(dec, 10))).replace(/"/g, '"').replace(/'/g, "'").replace(/</g, '<')