davidl/MoonTVPlus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化观影室状态下的play页面显示

Browse Source
This commit is contained in:
mtvpls
2025-12-08 20:57:19 +08:00
parent 44858b503a
commit a24c3f1a32
7 changed files with 181 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/app/api/danmaku/comment/route.ts
View File

@@ -68,27 +68,46 @@ export async function GET(request: NextRequest) {
apiUrl = `${baseUrl}/api/v2/comment?url=${encodeURIComponent(url!)}&format=xml`;
}
const response = await fetch(apiUrl, {
method: 'GET',
headers: {
'Accept': 'application/xml, text/xml',
},
});
// 添加超时控制
const controller = new AbortController();
const timeoutId = setTimeout(() => controller.abort(), 10000); // 10秒超时
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
try {
const response = await fetch(apiUrl, {
method: 'GET',
headers: {
'Accept': 'application/xml, text/xml',
},
signal: controller.signal,
keepalive: true,
});
clearTimeout(timeoutId);
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
// 获取 XML 文本
const xmlText = await response.text();
// 解析 XML 为 JSON
const comments = parseXmlDanmaku(xmlText);
return NextResponse.json({
count: comments.length,
comments,
});
} catch (fetchError) {
clearTimeout(timeoutId);
// 如果是超时错误，返回更友好的错误信息
if (fetchError instanceof Error && fetchError.name === 'AbortError') {
throw new Error('弹幕服务器请求超时，请稍后重试');
}
throw fetchError;
}
// 获取 XML 文本
const xmlText = await response.text();
// 解析 XML 为 JSON
const comments = parseXmlDanmaku(xmlText);
return NextResponse.json({
count: comments.length,
comments,
});
} catch (error) {
console.error('获取弹幕代理错误:', error);
return NextResponse.json(

44
src/app/api/danmaku/episodes/route.ts
View File

@@ -38,20 +38,40 @@ export async function GET(request: NextRequest) {
const apiUrl = `${baseUrl}/api/v2/bangumi/${animeId}`;
const response = await fetch(apiUrl, {
method: 'GET',
headers: {
'Content-Type': 'application/json',
},
});
// 添加超时控制和重试机制
const controller = new AbortController();
const timeoutId = setTimeout(() => controller.abort(), 10000); // 10秒超时
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
try {
const response = await fetch(apiUrl, {
method: 'GET',
headers: {
'Content-Type': 'application/json',
},
signal: controller.signal,
// 添加 keepalive 避免连接被重置
keepalive: true,
});
clearTimeout(timeoutId);
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
const data = await response.json();
return NextResponse.json(data);
} catch (fetchError) {
clearTimeout(timeoutId);
// 如果是超时错误，返回更友好的错误信息
if (fetchError instanceof Error && fetchError.name === 'AbortError') {
throw new Error('弹幕服务器请求超时，请稍后重试');
}
throw fetchError;
}
const data = await response.json();
return NextResponse.json(data);
} catch (error) {
console.error('获取剧集列表代理错误:', error);
return NextResponse.json(

45
src/app/api/danmaku/match/route.ts
View File

@@ -35,21 +35,40 @@ export async function POST(request: NextRequest) {
const apiUrl = `${baseUrl}/api/v2/match`;
const response = await fetch(apiUrl, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({ fileName }),
});
// 添加超时控制
const controller = new AbortController();
const timeoutId = setTimeout(() => controller.abort(), 10000); // 10秒超时
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
try {
const response = await fetch(apiUrl, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({ fileName }),
signal: controller.signal,
keepalive: true,
});
clearTimeout(timeoutId);
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
const data = await response.json();
return NextResponse.json(data);
} catch (fetchError) {
clearTimeout(timeoutId);
// 如果是超时错误，返回更友好的错误信息
if (fetchError instanceof Error && fetchError.name === 'AbortError') {
throw new Error('弹幕服务器请求超时，请稍后重试');
}
throw fetchError;
}
const data = await response.json();
return NextResponse.json(data);
} catch (error) {
console.error('自动匹配代理错误:', error);
return NextResponse.json(

43
src/app/api/danmaku/search/route.ts
View File

@@ -34,20 +34,39 @@ export async function GET(request: NextRequest) {
const apiUrl = `${baseUrl}/api/v2/search/anime?keyword=${encodeURIComponent(keyword)}`;
const response = await fetch(apiUrl, {
method: 'GET',
headers: {
'Content-Type': 'application/json',
},
});
// 添加超时控制
const controller = new AbortController();
const timeoutId = setTimeout(() => controller.abort(), 10000); // 10秒超时
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
try {
const response = await fetch(apiUrl, {
method: 'GET',
headers: {
'Content-Type': 'application/json',
},
signal: controller.signal,
keepalive: true,
});
clearTimeout(timeoutId);
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
const data = await response.json();
return NextResponse.json(data);
} catch (fetchError) {
clearTimeout(timeoutId);
// 如果是超时错误，返回更友好的错误信息
if (fetchError instanceof Error && fetchError.name === 'AbortError') {
throw new Error('弹幕服务器请求超时，请稍后重试');
}
throw fetchError;
}
const data = await response.json();
return NextResponse.json(data);
} catch (error) {
console.error('弹幕搜索代理错误:', error);
return NextResponse.json(

16
src/app/api/debug/watch-room-config/route.ts
View File

@@ -18,15 +18,23 @@ export async function GET(request: NextRequest) {
hasUpstashUrl: !!process.env.UPSTASH_REDIS_REST_URL,
hasUpstashToken: !!process.env.UPSTASH_REDIS_REST_TOKEN,
hasKvrocksUrl: !!process.env.KVROCKS_URL,
watchRoomEnabled: process.env.WATCH_ROOM_ENABLED,
watchRoomServerType: process.env.WATCH_ROOM_SERVER_TYPE,
hasWatchRoomExternalUrl: !!process.env.WATCH_ROOM_EXTERNAL_SERVER_URL,
hasWatchRoomExternalAuth: !!process.env.WATCH_ROOM_EXTERNAL_SERVER_AUTH,
},
watchRoomConfig: {
enabled: process.env.WATCH_ROOM_ENABLED === 'true',
serverType: process.env.WATCH_ROOM_SERVER_TYPE || 'internal',
externalServerUrl: process.env.WATCH_ROOM_EXTERNAL_SERVER_URL,
externalServerAuth: process.env.WATCH_ROOM_EXTERNAL_SERVER_AUTH ? '***' : undefined,
},
watchRoomConfig: null as any,
configReadError: null as string | null,
};
// 尝试读取配置
// 尝试读取配置（验证数据库连接）
try {
const config = await getConfig();
debugInfo.watchRoomConfig = config.WatchRoomConfig || null;
await getConfig();
} catch (error) {
debugInfo.configReadError = (error as Error).message;
}

37
src/app/play/page.tsx
View File

@@ -1976,7 +1976,7 @@ function PlayPageClient() {
// 检查是否有记忆
const memory = loadDanmakuMemory(title);
if (memory) {
console.log('[弹幕] 找到记忆 - 视频:', title, '→ 弹幕源:', memory.animeTitle);
console.log('[弹幕] 找到缓存 - 视频:', title, '→ 弹幕源:', memory.animeTitle);
// 获取该动漫的所有剧集列表
try {
@@ -2011,13 +2011,14 @@ function PlayPageClient() {
memory.searchKeyword // 保留原有的搜索关键词
);
console.log('[弹幕] 使用缓存成功，跳过搜索');
await loadDanmaku(episode.episodeId);
return;
return; // 成功使用缓存，直接返回
}
}
// 如果使用记忆加载失败，清除该记忆并继续自动搜索
console.warn('[弹幕] 使用缓存加载失败，清除缓存并从头搜索');
// 如果使用记忆加载失败（没有找到对应的剧集），清除该记忆并继续自动搜索
console.warn('[弹幕] 缓存中没有找到对应剧集，清除缓存并重新搜索');
if (artPlayerRef.current) {
artPlayerRef.current.notice.show = '缓存的弹幕源失效，正在重新搜索...';
}
@@ -2029,10 +2030,10 @@ function PlayPageClient() {
const memories = JSON.parse(memoriesJson);
delete memories[title];
localStorage.setItem('danmaku_memories', JSON.stringify(memories));
console.log('[弹幕] 已清除失效的缓存记忆');
console.log('[弹幕] 已清除失效的缓存');
}
} catch (e) {
console.error('[弹幕] 清除缓存记忆失败:', e);
console.error('[弹幕] 清除缓存失败:', e);
}
}
} catch (error) {
@@ -2048,14 +2049,14 @@ function PlayPageClient() {
const memories = JSON.parse(memoriesJson);
delete memories[title];
localStorage.setItem('danmaku_memories', JSON.stringify(memories));
console.log('[弹幕] 已清除失效的缓存记忆');
console.log('[弹幕] 已清除失效的缓存');
}
} catch (e) {
console.error('[弹幕] 清除缓存记忆失败:', e);
console.error('[弹幕] 清除缓存失败:', e);
}
}
}
// 继续执行后面的自动搜索逻辑，不要 return
// 如果缓存加载失败，继续执行后面的自动搜索逻辑
}
// 自动搜索弹幕
@@ -3534,8 +3535,8 @@ function PlayPageClient() {
</div>
{/* 第三方应用打开按钮 */}
{videoUrl && (
{/* 第三方应用打开按钮 - 观影室同步状态下隐藏 */}
{videoUrl && !playSync.isInRoom && (
<div className='mt-3 px-2 lg:flex-shrink-0 flex justify-end'>
<div className='bg-white/50 dark:bg-gray-800/50 backdrop-blur-sm rounded-lg p-2 border border-gray-200/50 dark:border-gray-700/50 w-full lg:w-auto overflow-x-auto'>
<div className='flex gap-1.5 justify-between lg:flex-wrap items-center'>
@@ -3802,29 +3803,19 @@ function PlayPageClient() {
{/* 选集和换源 - 在移动端始终显示，在 lg 及以上可折叠 */}
<div
className={`h-[300px] lg:h-full md:overflow-hidden transition-all duration-300 ease-in-out relative ${
className={`h-[300px] lg:h-full md:overflow-hidden transition-all duration-300 ease-in-out ${
isEpisodeSelectorCollapsed
? 'md:col-span-1 lg:hidden lg:opacity-0 lg:scale-95'
: 'md:col-span-1 lg:opacity-100 lg:scale-100'
}`}
>
{/* 观影室房员禁用层 */}
{playSync.isInRoom && playSync.shouldDisableControls && (
<div className="absolute inset-0 z-10 flex items-center justify-center bg-black/60 backdrop-blur-sm">
<div className="text-center p-4">
<p className="text-white text-lg font-bold mb-2">👥 观影室模式</p>
<p className="text-gray-300 text-sm">
{playSync.isOwner ? '您是房主，可以控制播放' : '房主控制中，无法切换集数和播放源'}
</p>
</div>
</div>
)}
<EpisodeSelector
totalEpisodes={totalEpisodes}
episodes_titles={detail?.episodes_titles || []}
value={currentEpisodeIndex + 1}
onChange={playSync.shouldDisableControls ? () => { /* disabled */ } : handleEpisodeChange}
onSourceChange={playSync.shouldDisableControls ? () => { /* disabled */ } : handleSourceChange}
isRoomMember={playSync.shouldDisableControls}
currentSource={currentSource}
currentId={currentId}
videoTitle={searchTitle || videoTitle}