koishi-plugin-video-parser-all 0.5.3 → 0.5.4

package/lib/index.js

@@ -38,8 +38,8 @@ exports.Config = koishi_1.Schema.intersect([
     }).description('网络与API设置'),
     koishi_1.Schema.object({
         ignoreSendError: koishi_1.Schema.boolean().default(true).description('忽略发送失败错误'),
-        retryTimes: koishi_1.Schema.number().min(0).default(0).description('API请求重试次数'),
-        retryInterval: koishi_1.Schema.number().min(0).default(0).description('重试间隔时间（毫秒）'),
+        retryTimes: koishi_1.Schema.number().min(0).default(3).description('API请求重试次数'),
+        retryInterval: koishi_1.Schema.number().min(0).default(1000).description('重试间隔时间（毫秒）'),
     }).description('错误与重试设置'),
     koishi_1.Schema.object({
         enableForward: koishi_1.Schema.boolean().default(false).description('启用合并转发（仅OneBot平台）'),
@@ -115,7 +115,7 @@ const logger = new koishi_1.Logger(exports.name);
 const PLATFORM_KEYWORDS = {
     bilibili: ['bilibili', 'b23', 'B站', 'www.bilibili.com', 'm.bilibili.com', '哔哩哔哩', 'bilibili.com/opus', 'bilibili.com/video', 'b23.tv', 't.bilibili.com', 'bilibili.com/bangumi'],
     kuaishou: ['kuaishou', '快手', 'v.kuaishou.com', 'www.kuaishou.com', 'kwimgs.com', 'kuaishou.com/app'],
-    xiaohongshu: ['xiaohongshu', '小红书', 'xhslink.com', 'xiaohongshu.com', 'xhscdn.com', 'xiaohongshu.com/explore', 'xhslink.com/'],
+    xiaohongshu: ['xiaohongshu', '小红书', 'xhslink.com', 'xiaohongshu.com', 'xhscdn.com', 'xiaohongshu.com/explore', 'xhslink.com/', 'xiaohongshu.com/discovery/item'],
     weibo: ['weibo', '微博', 'weibo.com', 'video.weibo.com', 'm.weibo.cn', 'weibo.com/tv/show', 'weibo.com/feed'],
     toutiao: ['toutiao', '今日头条', 'm.toutiao.com', 'toutiao.com', 'ixigua.com', 'toutiao.com/video', 'ixigua.com/i'],
     pipigx: ['pipigx', '皮皮搞笑', 'h5.pipigx.com', 'ippzone.com', 'pipigx.com/share'],
@@ -139,7 +139,11 @@ const PLATFORM_ERROR_CODE_MAP = {
     xiaohongshu: ErrorCode.XIAOHONGSHU_PARSE_FAILED,
     bilibili: ErrorCode.BILIBILI_PARSE_FAILED,
     kuaishou: ErrorCode.KUAISHOU_PARSE_FAILED,
-    weibo: ErrorCode.WEIBO_PARSE_FAILED
+    weibo: ErrorCode.WEIBO_PARSE_FAILED,
+    toutiao: ErrorCode.API_RETURN_ERROR,
+    pipigx: ErrorCode.API_RETURN_ERROR,
+    pipixia: ErrorCode.API_RETURN_ERROR,
+    zuiyou: ErrorCode.API_RETURN_ERROR
 };
 const VARIABLE_MAPPING = {
     '标题': ['title', 'Title', 'TITLE'],
@@ -315,19 +319,41 @@ function getPlatformType(url) {
         return 'zuiyou';
     return null;
 }
+function cleanUrl(url) {
+    try {
+        // 处理HTML实体编码
+        url = url.replace(/&/g, '&');
+        const urlObj = new URL(url);
+        if (urlObj.hostname.includes('xiaohongshu.com')) {
+            urlObj.searchParams.delete('source');
+            urlObj.searchParams.delete('xhsshare');
+            urlObj.searchParams.delete('xsec_token');
+            urlObj.searchParams.delete('xsec_source');
+            return urlObj.origin + urlObj.pathname + urlObj.search;
+        }
+        if (urlObj.hostname.includes('douyin.com') || urlObj.hostname.includes('v.douyin.com')) {
+            return urlObj.origin + urlObj.pathname;
+        }
+        return url;
+    }
+    catch (e) {
+        // 处理HTML实体编码
+        return url.replace(/&/g, '&');
+    }
+}
 async function resolveShortUrl(url) {
     try {
         const res = await axios_1.default.head(url, {
-            timeout: 5000,
-            maxRedirects: 5,
+            timeout: 10000,
+            maxRedirects: 10,
             headers: {
                 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
             }
         });
-        return res.request.res?.responseUrl || url;
+        return cleanUrl(res.request.res?.responseUrl || url);
     }
     catch (e) {
-        return url;
+        return cleanUrl(url);
     }
 }
 function formatDuration(input) {
@@ -512,8 +538,28 @@ function apply(ctx, config) {
         timeout: config.timeout,
         headers: { 'User-Agent': config.userAgent || 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36' }
     });
+    async function parseWithRetry(url, platform, retryTimes) {
+        let lastError = null;
+        for (let i = 0; i <= retryTimes; i++) {
+            try {
+                const res = await http.get(API_CONFIG[platform], {
+                    params: { url },
+                    timeout: config.timeout
+                });
+                return res.data;
+            }
+            catch (error) {
+                lastError = error;
+                if (i < retryTimes) {
+                    await delay(config.retryInterval);
+                }
+            }
+        }
+        throw lastError;
+    }
     async function parse(url) {
-        const realUrl = await resolveShortUrl(url);
+        let realUrl = await resolveShortUrl(url);
+        realUrl = cleanUrl(realUrl);
         const platform = getPlatformType(realUrl);
         if (!platform) {
             const code = ErrorCode.UNSUPPORTED_PLATFORM;
@@ -529,23 +575,32 @@ function apply(ctx, config) {
             return { data: null, code, msg };
         }
         try {
-            const res = await http.get(apiUrl, {
-                params: { url: realUrl },
-                timeout: config.timeout
-            });
-            if (res.data.code !== 200 && res.data.code !== 0) {
-                const apiErrorMsg = res.data.msg || '解析失败';
+            const resData = await parseWithRetry(realUrl, platform, config.retryTimes);
+            // 正确的成功判断逻辑：code为200或0，或者msg包含"解析成功"
+            const isSuccess = resData.code === 200 || resData.code === 0 ||
+                (resData.msg && resData.msg.includes('解析成功'));
+            if (!isSuccess) {
+                const apiErrorMsg = resData.msg || '解析失败';
                 const platformCode = PLATFORM_ERROR_CODE_MAP[platform] || ErrorCode.API_RETURN_ERROR;
+                let detailedMsg = apiErrorMsg;
+                if (apiErrorMsg.includes('无法识别解析类型') || apiErrorMsg.includes('未找到有效内容')) {
+                    detailedMsg = `链接格式不支持或内容已失效：${apiErrorMsg}`;
+                }
                 const code = platformCode;
-                const msg = getErrorInfo(code, apiErrorMsg);
+                const msg = getErrorInfo(code, detailedMsg);
                 logger.error(`[${code}] API返回错误: ${platform}, URL: ${url}, 错误: ${apiErrorMsg}`);
                 return { data: null, code, msg };
             }
             try {
-                const parseResult = parseData(res.data, config.maxDescLength, platform);
-                if (!parseResult.video && !parseResult.images.length && !parseResult.live_photo?.length) {
+                const parseResult = parseData(resData, config.maxDescLength, platform);
+                // 修正内容判断逻辑：支持live类型和live_photo
+                const hasValidContent = parseResult.video ||
+                    (parseResult.images && parseResult.images.length > 0) ||
+                    (parseResult.live_photo && parseResult.live_photo.length > 0) ||
+                    parseResult.type === 'live';
+                if (!hasValidContent) {
                     const code = ErrorCode.NO_VIDEO_FOUND;
-                    const msg = getErrorInfo(code, '未找到视频或图片内容');
+                    const msg = getErrorInfo(code, '链接有效但未找到视频/图片内容（可能是直播、私密内容或已删除）');
                     logger.warn(`[${code}] 解析成功但无有效内容: ${platform}, URL: ${url}`);
                     return { data: null, code, msg };
                 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-video-parser-all",
   "description": "Koishi 全平台视频解析插件，支持抖音/快手/B站/小红书/微博/今日头条/皮皮搞笑/皮皮虾/最右视频链接解析",
-  "version": "0.5.3",  
+  "version": "0.5.4",  
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [