Skip to content

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

fix(live): 修复测活误判正常源为不可用的两个问题

bestZweia2cf1a3496f3
diff --git a/package.json b/package.json
index 86cd222..8389853 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "libretv",
- "version": "2.7.0",
+ "version": "2.7.1",
"private": true,
"description": "免费在线视频搜索与观看平台(Next.js 重构版)",
"license": "AGPL-3.0-or-later",
diff --git a/src/app/api/live/probe/route.test.ts b/src/app/api/live/probe/route.test.ts
index 8872cba..4f36b76 100644
--- a/src/app/api/live/probe/route.test.ts
+++ b/src/app/api/live/probe/route.test.ts
@@ -125,6 +125,84 @@ describe('POST /api/live/probe', () => {
expect(fn.mock.calls.length).toBe(callsAfterFirst);
});
+ it('探测窗口内最新分片(滑动窗口下最不易过期)', async () => {
+ const MEDIA3 = [
+ '#EXTM3U',
+ '#EXT-X-TARGETDURATION:5',
+ '#EXTINF:5.0,',
+ 'old_seg.ts',
+ '#EXTINF:5.0,',
+ 'mid_seg.ts',
+ '#EXTINF:5.0,',
+ 'newest_seg.ts',
+ '',
+ ].join('\n');
+ const requested: string[] = [];
+ vi.stubGlobal(
+ 'fetch',
+ vi.fn(async (input: RequestInfo | URL) => {
+ const url = String(input);
+ requested.push(url);
+ if (url.includes('newest.test')) {
+ return jsonRes(MEDIA3, 'application/vnd.apple.mpegurl');
+ }
+ return new Response('x', {
+ status: 206,
+ headers: { 'content-type': 'video/mp2t' },
+ });
+ })
+ );
+
+ const res = await POST(makeRequest(['https://newest.test/live/index.m3u8'], true));
+ const [line] = await readNdjson(res);
+ expect(line.ok).toBe(true);
+ expect(line.level).toBe('segment');
+ expect(requested.some((u) => u.includes('newest_seg.ts'))).toBe(true);
+ expect(requested.some((u) => u.includes('old_seg.ts'))).toBe(false);
+ });
+
+ it('manifest 请求不携带 Range,分片请求才携带(避免被源截断成 2 字节误判)', async () => {
+ const seen: { url: string; range?: string }[] = [];
+ vi.stubGlobal(
+ 'fetch',
+ vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
+ const url = String(input);
+ const headers = (init?.headers ?? {}) as Record<string, string>;
+ seen.push({ url, range: headers.Range });
+ if (url.includes('/live/master.m3u8') || url.includes('/live/media.m3u8')) {
+ // 模拟严格按 Range 截断的源:一旦带 Range 就只回 2 字节
+ if (headers.Range) {
+ return new Response('#E', {
+ status: 206,
+ headers: { 'content-type': 'application/vnd.apple.mpegurl' },
+ });
+ }
+ return jsonRes(
+ url.includes('master.m3u8') ? MASTER : MEDIA,
+ 'application/vnd.apple.mpegurl'
+ );
+ }
+ return new Response('x', {
+ status: headers.Range ? 206 : 200,
+ headers: { 'content-type': 'video/mp2t' },
+ });
+ })
+ );
+
+ const res = await POST(makeRequest(['https://range.test/live/master.m3u8'], true));
+ const [line] = await readNdjson(res);
+ expect(line.ok).toBe(true);
+ expect(line.level).toBe('segment');
+
+ const manifestCalls = seen.filter((s) => s.url.includes('/live/') && !s.url.includes('seg1.ts'));
+ expect(manifestCalls.length).toBeGreaterThan(0);
+ expect(manifestCalls.every((c) => !c.range)).toBe(true);
+
+ const segmentCalls = seen.filter((s) => s.url.includes('seg1.ts'));
+ expect(segmentCalls.length).toBeGreaterThan(0);
+ expect(segmentCalls.every((c) => c.range === 'bytes=0-1')).toBe(true);
+ });
+
it('未开启 LIVE_ALLOW_PRIVATE 时拒绝内网地址', async () => {
mockUpstream();
delete process.env.LIVE_ALLOW_PRIVATE;
diff --git a/src/app/api/live/probe/route.ts b/src/app/api/live/probe/route.ts
index bbe9531..6b494c8 100644
--- a/src/app/api/live/probe/route.ts
+++ b/src/app/api/live/probe/route.ts
@@ -12,8 +12,9 @@ export const dynamic = 'force-dynamic';
* 单级「manifest 可访问」不足以判断可播:大量 IPTV 源 manifest 正常但
* 分片请求被拒(token/Referer 校验、源瞬断)。因此探测追到真实分片:
*
- * m3u8 → [master playlist → 第一个 variant] → media playlist → 第一个分片
+ * m3u8 → [master playlist → 第一个 variant] → media playlist → 初始化段/最新分片
* 分片以 Range: bytes=0-1 请求,收到响应头即 cancel body,不下载媒体数据。
+ * manifest 请求**不带 Range**(部分源会严格按 Range 截断,只回 2 字节)。
*
* 非 m3u8(FLV 等)维持单级探测。结果 level 标识探测深度:
* segment=分片级(最可信)/ manifest=仅 manifest 级 / head=单级直探
@@ -85,17 +86,24 @@ function refererOf(url: string): string | undefined {
}
}
-/** 请求一个资源,拿到响应头即断开 body(m3u8 额外读取文本以供解析) */
+/**
+ * 请求一个资源,拿到响应头即断开 body(m3u8 额外读取文本以供解析)。
+ *
+ * range 仅用于分片级探测:部分源(openresty 等)对 Range 请求严格截断,
+ * 若给 manifest 也带 `Range: bytes=0-1` 会只拿到 2 字节(如 `#E`),
+ * 导致 m3u8 解析与 #EXTM3U 校验失败而被误判为不可用。
+ */
async function fetchHeadersOnly(
url: string,
timeoutMs: number,
- referer?: string
+ referer?: string,
+ range = false
): Promise<FetchHeadResult> {
const headers: Record<string, string> = {
'User-Agent': UA,
Accept: '*/*',
- Range: 'bytes=0-1',
};
+ if (range) headers.Range = 'bytes=0-1';
if (referer) headers.Referer = referer;
// allowPrivate:与直播流代理同一把尺子,LIVE_ALLOW_PRIVATE=1 时自建内网 IPTV 才能测通;
@@ -121,8 +129,15 @@ async function fetchHeadersOnly(
return { ok: res.ok, status: res.status, text, finalUrl, contentType, isM3u8 };
}
-/** 从 media playlist 中取第一个分片/初始化段 URL */
-function firstSegmentUrl(content: string, baseUrl: string): string | undefined {
+/**
+ * 从 media playlist 中选一个用于探测的分片:优先初始化段(EXT-X-MAP),
+ * 否则取**窗口内最后一个**(最新)分片。
+ *
+ * 不取第一个:直播是滑动窗口,列表首个分片最接近过期,
+ * manifest 解析与分片请求之间的几十毫秒延迟就可能让它 404 而在测活中误判为不可用。
+ */
+function lastSegmentUrl(content: string, baseUrl: string): string | undefined {
+ let last: string | undefined;
for (const rawLine of content.split(/\r?\n/)) {
const line = rawLine.trim();
if (!line) continue;
@@ -132,9 +147,9 @@ function firstSegmentUrl(content: string, baseUrl: string): string | undefined {
continue;
}
if (line.startsWith('#')) continue;
- return new URL(line, baseUrl).href;
+ last = new URL(line, baseUrl).href;
}
- return undefined;
+ return last;
}
/** 从 master playlist 中取第一个 variant 的地址(无 STREAM-INF 则视为 media playlist 返回 null) */
@@ -229,13 +244,18 @@ async function probeOne(url: string): Promise<ProbeOutcome> {
}
// 第三级:分片
- const segmentUrl = firstSegmentUrl(mediaText, mediaUrl);
+ const segmentUrl = lastSegmentUrl(mediaText, mediaUrl);
if (!segmentUrl) {
// 空 media playlist(直播源刚启动/无分片)视为 manifest 级通过
return { url, ok: true, status: entry.status, ms: elapsed(start), level: 'manifest', codec };
}
const segmentStart = performance.now();
- const segment = await fetchHeadersOnly(segmentUrl, Math.min(timeout(), SEGMENT_TIMEOUT_MS), referer);
+ const segment = await fetchHeadersOnly(
+ segmentUrl,
+ Math.min(timeout(), SEGMENT_TIMEOUT_MS),
+ referer,
+ true
+ );
// ms 只统计分片往返:三级累计耗时当作「延迟」对用户没有参考意义
const segmentMs = elapsed(segmentStart);
return {