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

2025-12-08 20:57:19 +08:00
parent 44858b503a
commit a24c3f1a32
7 changed files with 181 additions and 89 deletions
--- a/src/app/api/danmaku/comment/route.ts
+++ b/src/app/api/danmaku/comment/route.ts
@@ -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(
--- a/src/app/api/danmaku/episodes/route.ts
+++ b/src/app/api/danmaku/episodes/route.ts
@@ -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(
--- a/src/app/api/danmaku/match/route.ts
+++ b/src/app/api/danmaku/match/route.ts
@@ -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(
--- a/src/app/api/danmaku/search/route.ts
+++ b/src/app/api/danmaku/search/route.ts
@@ -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(
--- a/src/app/api/debug/watch-room-config/route.ts
+++ b/src/app/api/debug/watch-room-config/route.ts
@@ -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;
    }