From bcb80ffa66d0c49ef9e8399be9628db47feba00f Mon Sep 17 00:00:00 2001
From: Elegy233 <82034747+wan0ge@users.noreply.github.com>
Date: Fri, 17 Jul 2026 07:26:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=88=B1=E5=A5=87=E8=89=BA=E7=94=B5?=
 =?UTF-8?q?=E5=BD=B1=20share=5Furl=20=E7=9F=AD=E9=93=BE=E6=8E=A5=E6=97=B6?=
 =?UTF-8?q?=E5=9B=9E=E9=80=80=20entity=5Fid=EF=BC=8Cdecode=20=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E6=97=B6=E5=8E=9F=E5=A7=8B=20tvid=20=E9=87=8D?=
 =?UTF-8?q?=E8=AF=95=20(#372)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

share_url 部分已变为 qy.net 短链接，旧正则 v_(\w+)\.html 无法
匹配。share_url/page_url 提取失败时使用 qipuId(entity_id) 作为
视频ID。decode API 将 entity_id 错误转换为无效 tvid 时，
用原始 tvid 直接请求 baseinfo。
---
 danmu_api/sources/iqiyi.js | 45 +++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/danmu_api/sources/iqiyi.js b/danmu_api/sources/iqiyi.js
index 2545c7f..2866637 100644
--- a/danmu_api/sources/iqiyi.js
+++ b/danmu_api/sources/iqiyi.js
@@ -560,13 +560,12 @@ export default class IqiyiSource extends BaseSource {
       if (data.data && data.data.base_data) {
         const baseData = data.data.base_data;
 
-        // 尝试 1: 从 share_url 中提取（最可靠）
+        // 尝试 1: 从 share_url 中提取（旧格式 v_xxx.html）
         if (baseData.share_url) {
           const match = baseData.share_url.match(/v_(\w+)\.html/);
           if (match) {
-            const videoId = match[1];
-            log("info", `[iQiyi] 从 share_url 提取视频ID: ${videoId}`);
-            return videoId;
+            log("info", `[iQiyi] 从 share_url 提取视频ID: ${match[1]}`);
+            return match[1];
           }
         }
 
@@ -574,16 +573,16 @@ export default class IqiyiSource extends BaseSource {
         if (baseData.page_url) {
           const match = baseData.page_url.match(/v_(\w+)\.html/);
           if (match) {
-            const videoId = match[1];
-            log("info", `[iQiyi] 从 page_url 提取视频ID: ${videoId}`);
-            return videoId;
+            log("info", `[iQiyi] 从 page_url 提取视频ID: ${match[1]}`);
+            return match[1];
           }
         }
       }
 
-      log("error", "[iQiyi] base_info API 响应中未找到视频ID");
+      // 所有尝试均失败，使用 qipuId（entity_id）作为视频ID
+      log("info", `[iQiyi] 响应中未找到 v_xxx 格式视频ID，使用 entity_id: ${qipuId}`);
       log("info", `[iQiyi] 响应数据结构: ${JSON.stringify(data).substring(0, 1000)}...`);
-      return null;
+      return qipuId;
 
     } catch (error) {
       log("error", `[iQiyi] 获取电影视频ID时出错: ${error.message}`);
@@ -813,7 +812,7 @@ export default class IqiyiSource extends BaseSource {
     const api_video_info = "https://pcw-api.iqiyi.com/video/video/baseinfo/";
 
     // 解析 URL 获取 tvid
-    let tvid;
+    let tvid, originalTvid;
     try {
       const idMatch = id.match(/v_(\w+)/);
       if (!idMatch) {
@@ -825,6 +824,7 @@ export default class IqiyiSource extends BaseSource {
       }
       tvid = idMatch[1];
       log("info", `[iQiyi] tvid: ${tvid}`);
+      originalTvid = tvid; // 保存原始 tvid，用于解码失败回退
 
       // 获取 tvid 的解码信息
       const decodeUrl = `${api_decode_base}${tvid}?platformId=3&modeCode=intl&langCode=sg`;
@@ -869,6 +869,31 @@ export default class IqiyiSource extends BaseSource {
       log("info", `[iQiyi] 时长: ${duration}`);
     } catch (error) {
       log("error", "[iQiyi] 请求视频基础信息失败:", error);
+    }
+
+    // decode API 输出的 tvid 无效时（duration=0 或请求失败），用原始 tvid 重试
+    if (!duration && originalTvid && originalTvid !== tvid) {
+      log("info", `[iQiyi] decode 后 tvid 无效，用原始 tvid 重试: ${originalTvid}`);
+      try {
+        const retryUrl = `${api_video_info}${originalTvid}`;
+        const retryRes = await httpGet(retryUrl, {
+          headers: {
+            "Content-Type": "application/json",
+            "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36",
+          },
+        });
+        const retryData = typeof retryRes.data === "string" ? JSON.parse(retryRes.data) : retryRes.data;
+        const retryDuration = Number(retryData.data.durationSec) || 0;
+        if (retryDuration > 0) {
+          tvid = originalTvid;
+          duration = retryDuration;
+          log("info", `[iQiyi] 原始 tvid 有效，时长: ${duration}`);
+        }
+      } catch (retryError) {
+        log("error", "[iQiyi] 原始 tvid 重试也失败:", retryError);
+      }
+    }
+    if (!duration) {
       return new SegmentListResponse({
         "type": "qiyi",
         "segmentList": []