Skip to content

一分钟搭建影视站,支持Docker等部署方式

feat(live): 升级直播探测为分片级并优化播放容错

bestZweid4ab651fc085
diff --git a/src/app/api/live/probe/route.ts b/src/app/api/live/probe/route.ts
index 2fea197..6041193 100644
--- a/src/app/api/live/probe/route.ts
+++ b/src/app/api/live/probe/route.ts
@@ -1,19 +1,24 @@
import { NextResponse } from 'next/server';
import { guardRequest, jsonError } from '@/lib/api-guard';
import { checkUpstreamAllowed } from '@/lib/ssrf';
-import { fetchUpstream } from '@/lib/fetch-utils';
+import { fetchUpstreamWithMeta } from '@/lib/fetch-utils';
export const runtime = 'nodejs';
export const dynamic = 'force-dynamic';
/**
- * 直播频道批量测活。
+ * 直播频道批量测活(分片级)。
* POST /api/live/probe body: { urls: string[] }
*
- * 以带 Range 的 GET 轻量探测(部分源不支持 HEAD 且会忽略 Range),
- * 收到响应头即 cancel body 终止连接,不下载任何媒体数据;
- * 返回 2xx 视为可用(206 同样算通)。单次最多 50 条,服务端并发 8。
- * 结果为 best-effort:200 响应不保证编码可解码(H.265 等),仅代表网络可达。
+ * 单级「manifest 可访问」不足以判断可播:大量 IPTV 源 manifest 正常但
+ * 分片请求被拒(token/Referer 校验、源瞬断)。因此探测追到真实分片:
+ *
+ * m3u8 → [master playlist → 第一个 variant] → media playlist → 第一个分片
+ * 分片以 Range: bytes=0-1 请求,收到响应头即 cancel body,不下载媒体数据。
+ *
+ * 非 m3u8(FLV 等)维持单级探测。结果 level 标识探测深度:
+ * segment=分片级(最可信)/ manifest=仅 manifest 级 / head=单级直探
+ * 200/206 响应头视为可达;仍不保证编码可解码(H.265 等)。
*/
const MAX_URLS = 50;
@@ -28,35 +33,141 @@ interface ProbeOutcome {
ok: boolean;
status?: number;
ms?: number;
+ level?: 'segment' | 'manifest' | 'head';
error?: string;
}
+/** 请求一个资源,拿到响应头即断开 body;返回 ok、状态码与重定向后的最终 URL */
+async function fetchHeadersOnly(url: string): Promise<{ ok: boolean; status: number; text?: string; finalUrl: string }> {
+ const { res, finalUrl } = await fetchUpstreamWithMeta(url, {
+ timeoutMs: TIMEOUT_MS,
+ retries: 0,
+ headers: { 'User-Agent': UA, Accept: '*/*', Range: 'bytes=0-1' },
+ });
+ const ok = res.ok;
+ const status = res.status;
+ const contentType = res.headers.get('content-type') || '';
+ const looksLikeM3u8 =
+ contentType.includes('mpegurl') || contentType.includes('x-mpegurl') ||
+ url.toLowerCase().split('?')[0].endsWith('.m3u8');
+ let text: string | undefined;
+ if (looksLikeM3u8) {
+ // m3u8 是小文本,读取以供解析;分片则不读取
+ text = await res.text();
+ } else if (res.body) {
+ try { await res.body.cancel(); } catch { /* 忽略 */ }
+ }
+ return { ok, status, text, finalUrl };
+}
+
+/** 从 media playlist 中取第一个分片/初始化段 URL */
+function firstSegmentUrl(content: string, baseUrl: string): string | undefined {
+ for (const rawLine of content.split(/\r?\n/)) {
+ const line = rawLine.trim();
+ if (!line) continue;
+ if (line.startsWith('#EXT-X-MAP')) {
+ const m = line.match(/URI="([^"]+)"/);
+ if (m) return new URL(m[1], baseUrl).href;
+ continue;
+ }
+ if (line.startsWith('#')) continue;
+ return new URL(line, baseUrl).href;
+ }
+ return undefined;
+}
+
+/** 从 master playlist 中取第一个 variant 的地址(无 STREAM-INF 则视为 media playlist 返回 null) */
+function firstVariantUrl(content: string, baseUrl: string): string | undefined | null {
+ if (!content.includes('#EXT-X-STREAM-INF')) return null;
+ const lines = content.split(/\r?\n/).map((l) => l.trim());
+ for (let i = 0; i < lines.length; i++) {
+ if (lines[i].startsWith('#EXT-X-STREAM-INF')) {
+ for (let j = i + 1; j < lines.length; j++) {
+ const next = lines[j];
+ if (!next) continue;
+ if (next.startsWith('#')) continue;
+ return new URL(next, baseUrl).href;
+ }
+ }
+ }
+ return undefined;
+}
+
+/** 两级探测:manifest →(master 时穿透 variant)→ 分片 */
async function probeOne(url: string): Promise<ProbeOutcome> {
const start = performance.now();
const verdict = await checkUpstreamAllowed(url);
if (!verdict.ok) return { url, ok: false, error: verdict.reason };
+
try {
- const res = await fetchUpstream(url, {
- timeoutMs: TIMEOUT_MS,
- retries: 0,
- headers: { 'User-Agent': UA, Accept: '*/*', Range: 'bytes=0-1' },
- });
- const ms = Math.round(performance.now() - start);
- // 拿到响应头即断开,避免直播流持续下载
- if (res.body) {
- try { await res.body.cancel(); } catch { /* 忽略 */ }
+ // 第一级:入口地址
+ const entry = await fetchHeadersOnly(url);
+ if (!entry.ok) {
+ return { url, ok: false, status: entry.status, ms: elapsed(start), error: `入口响应 ${entry.status}` };
}
- return { url, ok: res.ok, status: res.status, ms };
+ // 非 m3u8(FLV/TS 直链):单级判定
+ if (!entry.text) {
+ return { url, ok: true, status: entry.status, ms: elapsed(start), level: 'head' };
+ }
+
+ // 第二级:media playlist(master 则先穿透 variant)。
+ // 相对地址一律以重定向后的最终 URL 为 base(gslb 调度源 302 后路径会变)
+ let mediaUrl = entry.finalUrl;
+ let mediaText = entry.text;
+ const variant = firstVariantUrl(entry.text, entry.finalUrl);
+ if (variant === undefined) {
+ return { url, ok: false, ms: elapsed(start), error: 'playlist 中没有可用的流地址' };
+ }
+ if (variant !== null) {
+ const variantVerdict = await checkUpstreamAllowed(variant);
+ if (!variantVerdict.ok) {
+ return { url, ok: false, ms: elapsed(start), error: `子播放列表被拒绝: ${variantVerdict.reason}` };
+ }
+ const variantRes = await fetchHeadersOnly(variant);
+ if (!variantRes.ok || !variantRes.text) {
+ return { url, ok: false, status: variantRes.status, ms: elapsed(start), error: `子播放列表响应 ${variantRes.status}` };
+ }
+ mediaUrl = variantRes.finalUrl;
+ mediaText = variantRes.text;
+ }
+ const mediaVerdict = await checkUpstreamAllowed(mediaUrl);
+ if (!mediaVerdict.ok) {
+ return { url, ok: false, ms: elapsed(start), error: `播放列表被拒绝: ${mediaVerdict.reason}` };
+ }
+
+ // 第三级:分片
+ const segmentUrl = firstSegmentUrl(mediaText, mediaUrl);
+ if (!segmentUrl) {
+ // 空 media playlist(直播源刚启动/无分片)视为 manifest 级通过
+ return { url, ok: true, status: entry.status, ms: elapsed(start), level: 'manifest' };
+ }
+ const segmentVerdict = await checkUpstreamAllowed(segmentUrl);
+ if (!segmentVerdict.ok) {
+ return { url, ok: false, ms: elapsed(start), error: `分片地址被拒绝: ${segmentVerdict.reason}` };
+ }
+ const segment = await fetchHeadersOnly(segmentUrl);
+ return {
+ url,
+ ok: segment.ok,
+ status: segment.status,
+ ms: elapsed(start),
+ level: 'segment',
+ error: segment.ok ? undefined : `分片响应 ${segment.status}`,
+ };
} catch (err) {
return {
url,
ok: false,
- ms: Math.round(performance.now() - start),
+ ms: elapsed(start),
error: err instanceof Error ? err.message : '探测失败',
};
}
}
+function elapsed(start: number): number {
+ return Math.round(performance.now() - start);
+}
+
export async function POST(req: Request) {
const guarded = guardRequest(req);
if (guarded) return guarded;
diff --git a/src/app/api/live/stream/[url]/route.ts b/src/app/api/live/stream/[url]/route.ts
index 1df3241..9ea8b26 100644
--- a/src/app/api/live/stream/[url]/route.ts
+++ b/src/app/api/live/stream/[url]/route.ts
@@ -50,12 +50,14 @@ async function checkStreamAllowed(urlString: string): Promise<UpstreamVerdict> {
* 带响应头超时的上游抓取:仅首字节(响应头)限时,超时 abort;
* 响应头到达后清除计时器,body 流不再受限。手动逐跳跟随重定向,
* 每一跳重新执行 SSRF 校验(302 跳内网是经典绕过手法)。
+ * 返回最终 URL:gslb 调度源 302 后路径会变,manifest 内相对分片地址
+ * 必须以最终 URL 为 base 解析,否则分片请求会 404。
*/
async function fetchLiveUpstream(
targetUrl: string,
headers: Record<string, string>,
controller: AbortController
-): Promise<Response> {
+): Promise<{ res: Response; finalUrl: string }> {
let current = targetUrl;
for (let hop = 0; hop <= MAX_REDIRECT_HOPS; hop++) {
const verdict = await checkStreamAllowed(current);
@@ -73,9 +75,9 @@ async function fetchLiveUpstream(
clearTimeout(timer);
}
- if (!REDIRECT_STATUSES.has(res.status)) return res;
+ if (!REDIRECT_STATUSES.has(res.status)) return { res, finalUrl: current };
const location = res.headers.get('location');
- if (!location) return res;
+ if (!location) return { res, finalUrl: current };
current = new URL(location, current).href;
}
throw new Error('重定向次数过多');
@@ -101,8 +103,11 @@ export async function GET(req: Request, ctx: { params: Promise<{ url: string }>
const headers: Record<string, string> = { 'User-Agent': UA, Accept: '*/*' };
let response: Response;
+ let finalUrl: string;
try {
- response = await fetchLiveUpstream(targetUrl, headers, controller);
+ const result = await fetchLiveUpstream(targetUrl, headers, controller);
+ response = result.res;
+ finalUrl = result.finalUrl;
} catch (err) {
return jsonError(
`直播流连接失败: ${err instanceof Error ? err.message : '未知错误'}`,
@@ -111,9 +116,16 @@ export async function GET(req: Request, ctx: { params: Promise<{ url: string }>
}
if (!response.ok && response.body) {
- // 非直播正常响应(403/404 等):丢弃 body 连接
+ // 非直播正常响应(403/404 等):透传原始状态码便于前端与开发者工具定位
+ // (一律包成 502 会掩盖「token 过期 403」与「源瞬断」的区别)
try { await response.body.cancel(); } catch { /* 忽略 */ }
- return jsonError(`直播流上游返回 ${response.status}`, 502);
+ return NextResponse.json(
+ { error: `直播流上游返回 ${response.status}` },
+ {
+ status: response.status,
+ headers: { 'Cache-Control': 'no-store', 'X-Live-Upstream-Status': String(response.status) },
+ }
+ );
}
const contentType = response.headers.get('content-type') || '';
@@ -121,10 +133,11 @@ export async function GET(req: Request, ctx: { params: Promise<{ url: string }>
contentType.includes('mpegurl') || contentType.includes('x-mpegurl') ||
targetUrl.toLowerCase().split('?')[0].endsWith('.m3u8');
- // HLS manifest:重写变体/分片地址指向本路由,保证后续请求同源同鉴权
+ // HLS manifest:重写变体/分片地址指向本路由,保证后续请求同源同鉴权。
+ // 关键:以重定向后的最终 URL 为 base 解析相对地址(gslb 调度源 302 后路径会变)
if (isM3u8) {
const text = await response.text();
- return new NextResponse(rewriteM3u8(text, targetUrl, 0, LIVE_PREFIX), {
+ return new NextResponse(rewriteM3u8(text, finalUrl, 0, LIVE_PREFIX), {
status: response.status,
headers: {
'Content-Type': 'application/vnd.apple.mpegurl',
diff --git a/src/app/api/proxy/[url]/route.ts b/src/app/api/proxy/[url]/route.ts
index 97e2423..1071ed3 100644
--- a/src/app/api/proxy/[url]/route.ts
+++ b/src/app/api/proxy/[url]/route.ts
@@ -18,11 +18,12 @@ const MAX_REDIRECT_HOPS = 5;
* 代理专用上游抓取:手动逐跳跟随跳转,每一跳重新执行 SSRF 校验。
* 不能用 redirect:'follow'——预检之后 fetch 自动跟随的 3xx 可把请求
* 带进内网/元数据地址,绕过下方对首跳的校验。
+ * 返回最终 URL:m3u8 内相对分片地址必须以重定向后的 URL 为 base 解析。
*/
async function proxyFetch(
targetUrl: string,
init: { headers: Record<string, string> }
-): Promise<Response> {
+): Promise<{ res: Response; finalUrl: string }> {
let current = targetUrl;
for (let hop = 0; hop <= MAX_REDIRECT_HOPS; hop++) {
const verdict = await checkUpstreamAllowed(current);
@@ -34,9 +35,9 @@ async function proxyFetch(
redirect: 'manual',
signal: AbortSignal.timeout(TIMEOUT_MS),
});
- if (!REDIRECT_STATUSES.has(res.status)) return res;
+ if (!REDIRECT_STATUSES.has(res.status)) return { res, finalUrl: current };
const location = res.headers.get('location');
- if (!location) return res;
+ if (!location) return { res, finalUrl: current };
current = new URL(location, current).href;
}
throw new Error('重定向次数过多');
@@ -96,10 +97,13 @@ export async function GET(req: Request, ctx: { params: Promise<{ url: string }>
if (range) headers.Range = range;
let response: Response | undefined;
+ let finalUrl = targetUrl;
let lastError: unknown = null;
for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
try {
- response = await proxyFetch(targetUrl, { headers });
+ const result = await proxyFetch(targetUrl, { headers });
+ response = result.res;
+ finalUrl = result.finalUrl;
lastError = null;
break;
} catch (err) {
@@ -118,10 +122,10 @@ export async function GET(req: Request, ctx: { params: Promise<{ url: string }>
contentType.includes('mpegurl') || contentType.includes('x-mpegurl') ||
targetUrl.toLowerCase().endsWith('.m3u8');
- // m3u8 文本:重写为代理路径
+ // m3u8 文本:重写为代理路径(以重定向后的最终 URL 为 base 解析相对地址)
if (isM3u8) {
const text = await response.text();
- return new NextResponse(rewriteM3u8(text, targetUrl), {
+ return new NextResponse(rewriteM3u8(text, finalUrl), {
status: response.status,
headers: {
'Content-Type': 'application/vnd.apple.mpegurl',
diff --git a/src/app/live/page.tsx b/src/app/live/page.tsx
index 2e4a465..7ce9f3b 100644
--- a/src/app/live/page.tsx
+++ b/src/app/live/page.tsx
@@ -33,7 +33,11 @@ function LiveContent() {
const { verified } = useAuth();
const [copied, setCopied] = useState(false);
- const sources = useMemo(() => allLiveSources(store), [store]);
+ // 仅聚合已启用的直播源(设置 → 直播源中的勾选状态)
+ const sources = useMemo(() => {
+ const selected = new Set(store.liveSelectedUrls);
+ return allLiveSources(store).filter((s) => selected.has(s.url));
+ }, [store]);
// 聚合全部直播源的 M3U 解析结果(单源失败不影响整体)
const playlistsQuery = useQuery({
@@ -130,7 +134,9 @@ function LiveContent() {
<span className="live-dot" />
<p className="text-white/60 text-sm">
{sources.length === 0
- ? '请先在设置中添加直播源(M3U 订阅)'
+ ? store.liveEnvSources.length + store.liveSubscriptions.length > 0
+ ? '所有直播源均已停用,请在设置中勾选启用'
+ : '请先在设置中添加直播源(M3U 订阅)'
: playlistsQuery.isLoading
? '频道列表加载中...'
: '从右侧选择一个频道开始观看'}
@@ -241,8 +247,10 @@ function LiveContent() {
{(failedCount > 0 || sources.length === 0) && (
<p className="text-[10px] text-faint px-3 py-1.5 border-t border-line shrink-0">
{sources.length === 0
- ? '暂无直播源,请在设置 → 直播源中添加'
- : `${failedCount} 个订阅拉取失败(共 ${sources.length} 个)`}
+ ? store.liveEnvSources.length + store.liveSubscriptions.length > 0
+ ? '所有直播源均已停用,请在设置中勾选启用'
+ : '暂无直播源,请在设置 → 直播源中添加'
+ : `${failedCount > 0 ? `${failedCount} 个订阅拉取失败 · ` : ''}共 ${sources.length} 个已启用源`}
</p>
)}
</aside>
diff --git a/src/components/live-channel-list.tsx b/src/components/live-channel-list.tsx
index a37fd7d..a1d68e7 100644
--- a/src/components/live-channel-list.tsx
+++ b/src/components/live-channel-list.tsx
@@ -296,7 +296,7 @@ function ChannelRow({
'w-1.5 h-1.5 rounded-full shrink-0',
probe.ok ? 'bg-green-500' : 'bg-red-400'
)}
- title={probe.ok ? `可用 · ${probe.ms}ms` : probe.error || '不可用'}
+ title={probe.ok ? `${probe.level === 'segment' ? '分片可用' : 'manifest 可用'} · ${probe.ms}ms` : probe.error || '不可用'}
/>
)}
<span className={cn('text-xs truncate', active ? 'text-accent font-medium' : 'text-content')}>
diff --git a/src/components/live-player.tsx b/src/components/live-player.tsx
index ede107b..3950e95 100644
--- a/src/components/live-player.tsx
+++ b/src/components/live-player.tsx
@@ -67,6 +67,7 @@ export function LivePlayer({ url, title }: LivePlayerProps) {
/** HLS 直播参数:小缓冲、快速追帧;与点播(大缓冲、进度恢复)刻意区分 */
const setupHls = (video: HTMLVideoElement, mediaUrl: string, allowProxyFallback: boolean) => {
cleanupEngines();
+ let liveNetRetryCount = 0;
const hlsConfig: Partial<HlsConfig> = {
debug: false,
enableWorker: true,
@@ -84,11 +85,21 @@ export function LivePlayer({ url, title }: LivePlayerProps) {
hlsRef.current = hls;
hls.loadSource(mediaUrl);
hls.attachMedia(video);
- hls.on(Hls.Events.MANIFEST_PARSED, () => {
+ hls.on(Hls.Events.MANIFEST_PARSED, (_evt, manifestData) => {
+ // H.265 检测:大量国内 IPTV 源为 HEVC 编码,Chromium 内核通常无法软解
+ const videoCodecs = (manifestData.levels || []).map((l) => l.videoCodec || '').join(',');
+ if (/hvc1|hev1|hevc/i.test(videoCodecs)) {
+ const support = video.canPlayType('video/mp4; codecs="hvc1.1.6.L93.B0"');
+ if (!support) {
+ showHint('该频道为 H.265 编码,当前浏览器可能无法解码,建议用 Edge/Safari');
+ }
+ }
video.play().catch(() => {});
});
hls.on(Hls.Events.ERROR, (_evt, data) => {
if (disposed || destroyed) return;
+ const httpCode = data.response?.code;
+ const codeHint = httpCode ? `(HTTP ${httpCode})` : '';
if (data.fatal && !playbackStarted) {
if (
allowProxyFallback &&
@@ -104,9 +115,14 @@ export function LivePlayer({ url, title }: LivePlayerProps) {
hls.recoverMediaError();
return;
}
- setError('直播流加载失败,可能该频道已失效,请尝试其他频道');
+ setError(`直播流加载失败${codeHint},可能该频道已失效,请尝试其他频道`);
} else if (data.fatal && data.type === Hls.ErrorTypes.NETWORK_ERROR) {
- // 播放中网络抖动:尝试恢复拉流
+ // 播放中网络抖动:尝试恢复拉流;连续失败达到阈值则报错退出
+ liveNetRetryCount++;
+ if (liveNetRetryCount > 5) {
+ setError(`直播流中断${codeHint},该源可能已失效,请尝试其他频道`);
+ return;
+ }
hls.startLoad();
}
});
diff --git a/src/components/live-source-manager.tsx b/src/components/live-source-manager.tsx
index b68c736..350c06e 100644
--- a/src/components/live-source-manager.tsx
+++ b/src/components/live-source-manager.tsx
@@ -85,6 +85,14 @@ export function LiveSourceManager() {
const renderRow = (url: string, label: string, epgUrl?: string, preset = false, lastSync?: number) => (
<li className="bg-card rounded-lg p-3 transition-colors hover:bg-hover/50">
<div className="flex items-center gap-2">
+ <input
+ type="checkbox"
+ className="h-4 w-4 accent-[#2563eb] shrink-0"
+ checked={store.liveSelectedUrls.includes(url)}
+ onChange={() => store.toggleLiveSelected(url)}
+ aria-label={store.liveSelectedUrls.includes(url) ? `停用 ${label}` : `启用 ${label}`}
+ title={store.liveSelectedUrls.includes(url) ? '已启用,取消勾选可停用' : '已停用,勾选后生效'}
+ />
<div className="flex-1 min-w-0">
<div className="text-sm font-medium text-content truncate">
{label}
diff --git a/src/components/providers.tsx b/src/components/providers.tsx
index af0f5d8..5748f72 100644
--- a/src/components/providers.tsx
+++ b/src/components/providers.tsx
@@ -20,10 +20,14 @@ export function Providers({ children }: { children: ReactNode }) {
// store 配置了 skipHydration:等挂载后再读 localStorage,
// 保证 hydration 阶段客户端与服务端渲染结果一致。
useEffect(() => {
- void useAppStore.persist.rehydrate();
- // 拉取部署者通过 DEFAULT_SOURCES 预置的采集站(失败时静默忽略)
- fetch('/api/status')
- .then((r) => (r.ok ? r.json() : null))
+ // 先等持久化状态恢复,再拉服务端下发数据:
+ // 避免 setEnvSources/setLiveEnvSources 的勾选合并发生在 rehydrate 之前被覆盖
+ Promise.resolve(useAppStore.persist.rehydrate())
+ .then(() => {
+ // 拉取部署者通过 DEFAULT_SOURCES / DEFAULT_LIVE_SOURCES 预置的源(失败时静默忽略)
+ return fetch('/api/status');
+ })
+ .then((r) => (r && r.ok ? r.json() : null))
.then((d) => {
if (d && Array.isArray(d.defaultSources)) {
useAppStore.getState().setEnvSources(d.defaultSources);
diff --git a/src/components/use-live-probe.ts b/src/components/use-live-probe.ts
index 16bf8bf..12e1cd2 100644
--- a/src/components/use-live-probe.ts
+++ b/src/components/use-live-probe.ts
@@ -13,6 +13,7 @@ import { api } from '@/lib/client-api';
export interface ProbeResult {
ok: boolean;
ms?: number;
+ level?: 'segment' | 'manifest' | 'head';
error?: string;
}
@@ -43,7 +44,7 @@ export function useLiveProbe() {
const { results: list } = await api.liveProbe(chunk);
setResults((prev) => {
const next = new Map(prev);
- for (const r of list) next.set(r.url, { ok: r.ok, ms: r.ms, error: r.error });
+ for (const r of list) next.set(r.url, { ok: r.ok, ms: r.ms, level: r.level, error: r.error });
return next;
});
} catch (err) {
diff --git a/src/lib/client-api.ts b/src/lib/client-api.ts
index fc9fb4a..a7a8b3b 100644
--- a/src/lib/client-api.ts
+++ b/src/lib/client-api.ts
@@ -147,9 +147,9 @@ export const api = {
return `/api/live/playlist?${sp.toString()}`;
},
- /** 批量测活:轻量探测频道可达性与延迟(单批最多 50 条) */
+ /** 批量测活:分片级探测频道可达性与延迟(单批最多 50 条) */
liveProbe: (urls: string[]) =>
- request<{ results: { url: string; ok: boolean; status?: number; ms?: number; error?: string }[] }>(
+ request<{ results: { url: string; ok: boolean; status?: number; ms?: number; level?: 'segment' | 'manifest' | 'head'; error?: string }[] }>(
'/api/live/probe',
{
method: 'POST',
diff --git a/src/lib/fetch-utils.ts b/src/lib/fetch-utils.ts
index 44b200e..ad69170 100644
--- a/src/lib/fetch-utils.ts
+++ b/src/lib/fetch-utils.ts
@@ -15,17 +15,30 @@ export interface FetchOptions extends RequestInit {
const REDIRECT_STATUSES = new Set([301, 302, 303, 307, 308]);
const MAX_REDIRECT_HOPS = 5;
+export interface FetchResult {
+ res: Response;
+ /** 跟随重定向后的最终 URL(manual 模式下 res.url 不可靠,须自行跟踪)。
+ * 解析 manifest 内的相对地址必须用它,否则分片路径会指向错误目录。 */
+ finalUrl: string;
+}
+
export async function fetchUpstream(url: string, options: FetchOptions = {}): Promise<Response> {
+ return (await fetchUpstreamWithMeta(url, options)).res;
+}
+
+/** 同 fetchUpstream,额外返回重定向后的最终 URL */
+export async function fetchUpstreamWithMeta(url: string, options: FetchOptions = {}): Promise<FetchResult> {
const { timeoutMs = 8000, retries = 0, safeRedirects = true, ...init } = options;
let lastError: unknown;
for (let attempt = 0; attempt <= retries; attempt++) {
try {
if (!safeRedirects) {
- return await fetch(url, {
+ const res = await fetch(url, {
...init,
signal: AbortSignal.timeout(timeoutMs),
redirect: init.redirect ?? 'follow',
});
+ return { res, finalUrl: res.url || url };
}
// 手动逐跳跟随,每一跳重新过 SSRF 校验
let current = url;
@@ -39,9 +52,9 @@ export async function fetchUpstream(url: string, options: FetchOptions = {}): Pr
redirect: 'manual',
signal: AbortSignal.timeout(timeoutMs),
});
- if (!REDIRECT_STATUSES.has(res.status)) return res;
+ if (!REDIRECT_STATUSES.has(res.status)) return { res, finalUrl: current };
const location = res.headers.get('location');
- if (!location) return res;
+ if (!location) return { res, finalUrl: current };
current = new URL(location, current).href;
}
throw new Error('重定向次数过多');
diff --git a/src/lib/store.ts b/src/lib/store.ts
index e2ee1fc..b0b6877 100644
--- a/src/lib/store.ts
+++ b/src/lib/store.ts
@@ -73,6 +73,8 @@ interface AppState extends AppSettings {
liveEnvKeysSeen: string[];
/** 用户添加的 M3U 订阅 */
liveSubscriptions: LiveSubscription[];
+ /** 已启用的直播源(按订阅 URL 唯一标识,首次出现自动勾选) */
+ liveSelectedUrls: string[];
/** 收藏频道(按流 URL 唯一标识) */
liveFavorites: string[];
/** 最近观看频道(上限 20) */
@@ -92,6 +94,7 @@ interface AppState extends AppSettings {
addLiveSubscription: (url: string, name?: string, epg?: string) => void;
removeLiveSubscription: (url: string) => void;
markLiveSynced: (url: string, name?: string, epg?: string) => void;
+ toggleLiveSelected: (url: string) => void;
toggleLiveFavorite: (channelUrl: string) => void;
addLiveRecent: (entry: Omit<LiveRecentEntry, 'timestamp'>) => void;
updateSettings: (patch: Partial<Omit<AppSettings, 'customAPIs' | 'selectedKeys'>>) => void;
@@ -119,6 +122,7 @@ export const useAppStore = create<AppState>()(
liveEnvSources: [],
liveEnvKeysSeen: [],
liveSubscriptions: [],
+ liveSelectedUrls: [],
liveFavorites: [],
liveRecent: [],
selectedKeys: [],
@@ -232,12 +236,13 @@ export const useAppStore = create<AppState>()(
},
setLiveEnvSources: (list) => {
- // 预置直播源记下已见 key(用户在设置中不可移除预置项,仅作来源去重展示)
+ // 预置直播源首次出现时自动启用;用户此后停用不会被反复勾回
const seen = new Set(get().liveEnvKeysSeen);
- const freshKeys = list.map((s) => s.key).filter((k) => !seen.has(k));
+ const freshUrls = list.filter((s) => !seen.has(s.key)).map((s) => s.url);
set({
liveEnvSources: list,
- liveEnvKeysSeen: [...get().liveEnvKeysSeen, ...freshKeys],
+ liveEnvKeysSeen: [...get().liveEnvKeysSeen, ...list.map((s) => s.key)],
+ liveSelectedUrls: [...get().liveSelectedUrls, ...freshUrls],
});
},
@@ -246,12 +251,24 @@ export const useAppStore = create<AppState>()(
if (!trimmed || get().liveSubscriptions.some((s) => s.url === trimmed)) return;
set({
liveSubscriptions: [...get().liveSubscriptions, { url: trimmed, name, epg }],
+ // 新添加的订阅默认启用
+ liveSelectedUrls: [...new Set([...get().liveSelectedUrls, trimmed])],
});
},
removeLiveSubscription: (url) => {
set({
liveSubscriptions: get().liveSubscriptions.filter((s) => s.url !== url),
+ liveSelectedUrls: get().liveSelectedUrls.filter((u) => u !== url),
+ });
+ },
+
+ toggleLiveSelected: (url) => {
+ const cur = get().liveSelectedUrls;
+ set({
+ liveSelectedUrls: cur.includes(url)
+ ? cur.filter((u) => u !== url)
+ : [...cur, url],
});
},
@@ -306,6 +323,7 @@ export const useAppStore = create<AppState>()(
subscriptions: s.subscriptions,
liveEnvKeysSeen: s.liveEnvKeysSeen,
liveSubscriptions: s.liveSubscriptions,
+ liveSelectedUrls: s.liveSelectedUrls,
liveFavorites: s.liveFavorites,
liveRecent: s.liveRecent,
yellowFilter: s.yellowFilter,