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

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'],
@@ -123,9 +123,10 @@ const PLATFORM_KEYWORDS = {
     douyin: ['douyin', '抖音', 'v.douyin.com', 'douyinpic.com', 'douyinvod.com', 'douyin.com/video', 'douyin.com/note', 'www.douyin.com', 'tiktok.com'],
     zuiyou: ['zuiyou', '最右', 'xiaochuankeji.cn', 'izuiyou.com', 'izuiyou.com/topic']
 };
+// 更新API配置：B站和抖音使用新的api.xingzhige.com，其他平台保持不变
 const API_CONFIG = {
-    bilibili: 'https://api.bugpk.com/api/bilibili',
-    douyin: 'https://api.bugpk.com/api/dyjx',
+    bilibili: 'https://api.xingzhige.com/API/b_parse',
+    douyin: 'https://api.xingzhige.com/API/douyin/',
     kuaishou: 'https://api.bugpk.com/api/ksjx',
     xiaohongshu: 'https://api.bugpk.com/api/xhsjx',
     weibo: 'https://api.bugpk.com/api/weibo',
@@ -139,20 +140,24 @@ 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'],
-    '作者': ['author.name', 'author', 'name', 'Author', 'Name'],
+    '作者': ['author.name', 'author', 'name', 'Author', 'Name', 'owner.name'],
     '简介': ['desc', 'description', 'Desc', 'Description', 'content', 'Content'],
     '视频时长': ['duration', 'Duration', 'time', 'Time'],
-    '点赞数': ['like', 'Like', 'attitudes_count', 'digg_count', 'praise'],
+    '点赞数': ['like', 'Like', 'attitudes_count', 'digg_count', 'praise', 'stat.like'],
     '投币数': ['coin', 'Coin', 'bi', 'Bi'],
-    '收藏数': ['collect', 'Collect', 'favorite', 'Favorite', 'star', 'Star'],
-    '转发数': ['share', 'Share', 'forward', 'Forward', 'repost'],
+    '收藏数': ['collect', 'Collect', 'favorite', 'Favorite', 'star', 'Star', 'stat.collect'],
+    '转发数': ['share', 'Share', 'forward', 'Forward', 'repost', 'stat.share'],
     '播放数': ['view', 'View', 'play_count', 'PlayCount', 'play'],
-    '评论数': ['comment', 'Comment', 'comments_count', 'comment_count', 'discuss'],
-    '音乐名': ['music.title', 'music_name', 'audio_name', 'sound_name']
+    '评论数': ['comment', 'Comment', 'comments_count', 'comment_count', 'discuss', 'stat.comment'],
+    '音乐名': ['music.title', 'music_name', 'audio_name', 'sound_name', 'muisic']
 };
 function getErrorInfo(code, detail) {
     const baseMsg = exports.ErrorMessageMap[code] || exports.ErrorMessageMap[ErrorCode.UNKNOWN_ERROR];
@@ -315,19 +320,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) {
@@ -382,48 +409,126 @@ function findValueInObject(obj, keys) {
     }
     return undefined;
 }
+// 适配新的API返回格式
 function parseData(rawResponse, maxDescLength, platform) {
     let data = rawResponse;
-    if (data.data) {
+    // 处理不同平台的返回结构差异
+    if (platform === 'bilibili' && rawResponse.data) {
+        // 适配api.xingzhige.com的B站返回格式
+        data = rawResponse.data;
+    }
+    else if (platform === 'douyin' && rawResponse.data) {
+        // 适配api.xingzhige.com的抖音返回格式
+        data = rawResponse.data;
+    }
+    else if (data.data) {
+        // 其他平台保持原有逻辑
         data = data.data;
     }
     const stat = {};
+    // 适配新的字段映射
     Object.entries(VARIABLE_MAPPING).forEach(([varName, keys]) => {
         const value = findValueInObject(data, keys);
         if (value !== undefined) {
             stat[varName] = value;
         }
     });
-    let type = data.type || 'video';
-    const title = findValueInObject(data, ['title']) || '无标题';
-    const author = findValueInObject(data, ['author.name', 'author']) || '未知作者';
-    const desc = (findValueInObject(data, ['desc', 'description', 'content']) || title).toString().slice(0, maxDescLength);
-    const cover = findValueInObject(data, ['cover', 'imgurl', 'pic', 'thumbnail']) || '';
-    let images = findValueInObject(data, ['imgurl', 'images', 'pics']) || [];
+    // 处理不同平台的类型字段
+    let type = 'video';
+    if (platform === 'douyin' && data.jx && data.jx.type) {
+        type = data.jx.type; // 抖音的图集类型
+    }
+    else if (data.type) {
+        type = data.type;
+    }
+    // 适配不同平台的标题字段
+    let title = '无标题';
+    if (platform === 'bilibili' && data.video && data.video.title) {
+        title = data.video.title;
+    }
+    else if (platform === 'douyin' && data.item && data.item.title) {
+        title = data.item.title;
+    }
+    else {
+        title = findValueInObject(data, ['title']) || '无标题';
+    }
+    // 适配不同平台的作者字段
+    let author = '未知作者';
+    if (platform === 'bilibili' && data.owner && data.owner.name) {
+        author = data.owner.name;
+    }
+    else if (platform === 'douyin' && data.author && data.author.name) {
+        author = data.author.name;
+    }
+    else {
+        author = findValueInObject(data, ['author.name', 'author', 'name', 'auther']) || '未知作者';
+    }
+    // 适配不同平台的描述字段
+    let desc = title;
+    if (platform === 'bilibili' && data.video && data.video.desc) {
+        desc = data.video.desc;
+    }
+    else if (platform === 'douyin') {
+        desc = title; // 抖音没有单独的描述字段
+    }
+    else {
+        desc = findValueInObject(data, ['desc', 'description', 'content']) || title;
+    }
+    desc = desc.toString().slice(0, maxDescLength);
+    // 适配不同平台的封面字段
+    let cover = '';
+    if (platform === 'bilibili' && data.video && data.video.fm) {
+        cover = data.video.fm;
+    }
+    else if (platform === 'douyin' && data.item && data.item.cover) {
+        cover = data.item.cover;
+    }
+    else {
+        cover = findValueInObject(data, ['cover', 'imgurl', 'pic', 'thumbnail']) || '';
+    }
+    // 适配不同平台的图片字段
+    let images = [];
+    if (platform === 'douyin' && data.item && data.item.images) {
+        images = data.item.images;
+    }
+    else {
+        images = findValueInObject(data, ['imgurl', 'images', 'pics']) || [];
+    }
     if (!Array.isArray(images))
         images = [images];
-    const videoUrls = [
-        findValueInObject(data, ['url']),
-        findValueInObject(data, ['download_url']),
-        findValueInObject(data, ['video_backup']),
-        findValueInObject(data, ['playUrl']),
-        findValueInObject(data, ['video_url'])
-    ];
+    // 适配不同平台的视频链接字段
     let video = '';
-    if (Array.isArray(videoUrls[2])) {
-        video = videoUrls[2][0]?.url || '';
+    if (platform === 'bilibili' && data.video && data.video.url) {
+        video = data.video.url;
+    }
+    else if (platform === 'douyin') {
+        video = ''; // 抖音图集没有视频链接
     }
     else {
-        for (const url of videoUrls) {
-            if (url && typeof url === 'string' && url.trim() !== '') {
-                video = url;
-                break;
+        const videoUrls = [
+            findValueInObject(data, ['url']),
+            findValueInObject(data, ['download_url']),
+            findValueInObject(data, ['video_backup']),
+            findValueInObject(data, ['playUrl']),
+            findValueInObject(data, ['video_url'])
+        ];
+        if (Array.isArray(videoUrls[2])) {
+            video = videoUrls[2][0]?.url || '';
+        }
+        else {
+            for (const url of videoUrls) {
+                if (url && typeof url === 'string' && url.trim() !== '') {
+                    video = url;
+                    break;
+                }
             }
         }
     }
+    // 适配不同平台的时长字段
     const durationValue = findValueInObject(data, ['duration']);
     const duration = typeof durationValue === 'number' ? durationValue : parseInt(durationValue) || 0;
     const durationFormatted = formatDuration(durationValue || 0);
+    // 处理live_photo字段
     const live_photo = data.live_photo || [];
     return {
         type: type,
@@ -512,8 +617,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 +654,41 @@ 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);
+            // 适配不同平台的成功判断逻辑
+            let isSuccess = false;
+            // B站和抖音使用新的判断逻辑（code=0表示成功）
+            if (platform === 'bilibili' || platform === 'douyin') {
+                isSuccess = resData.code === 0 || (resData.msg && (resData.msg.includes('解析成功') || resData.msg === 'video'));
+            }
+            else {
+                // 其他平台保持原有逻辑
+                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' ||
+                    parseResult.type === '图集';
+                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 };
                 }
@@ -673,6 +816,12 @@ function apply(ctx, config) {
                         forwardMessages.push(buildForwardNode(session, item.text, botName));
                     if (item.cover && forwardMessages.length < 100)
                         forwardMessages.push(buildForwardNode(session, koishi_1.h.image(item.cover), botName));
+                    // 处理抖音图集
+                    if (item.type === '图集' && item.images?.length) {
+                        for (let i = 0; i < item.images.length && forwardMessages.length < 100; i++) {
+                            forwardMessages.push(buildForwardNode(session, koishi_1.h.image(item.images[i]), botName));
+                        }
+                    }
                     if (item.type === 'image' && item.images?.length) {
                         for (let i = 0; i < item.images.length && forwardMessages.length < 100; i++) {
                             forwardMessages.push(buildForwardNode(session, koishi_1.h.image(item.images[i]), botName));
@@ -740,7 +889,12 @@ function apply(ctx, config) {
                         await sendTimeout(session, item.text);
                         await delay(300);
                     }
-                    if (item.type === 'live' || item.type === 'live_photo') {
+                    // 处理抖音图集
+                    if (item.type === '图集' && item.images?.length) {
+                        const imgMsg = (0, koishi_1.h)('message', ...item.images.map((url) => koishi_1.h.image(url)));
+                        await sendTimeout(session, imgMsg);
+                    }
+                    else if (item.type === 'live' || item.type === 'live_photo') {
                         if (item.live_photo?.length) {
                             for (const liveItem of item.live_photo) {
                                 await sendTimeout(session, koishi_1.h.image(liveItem.image));

package/package.json

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