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

package/lib/index.js

@@ -124,8 +124,8 @@ const PLATFORM_KEYWORDS = {
     zuiyou: ['zuiyou', '最右', 'xiaochuankeji.cn', 'izuiyou.com', 'izuiyou.com/topic']
 };
 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',
@@ -147,16 +147,16 @@ const PLATFORM_ERROR_CODE_MAP = {
 };
 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', 'reposts_count'],
     '播放数': ['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', 'music']
 };
 function getErrorInfo(code, detail) {
     const baseMsg = exports.ErrorMessageMap[code] || exports.ErrorMessageMap[ErrorCode.UNKNOWN_ERROR];
@@ -321,7 +321,6 @@ function getPlatformType(url) {
 }
 function cleanUrl(url) {
     try {
-        // 处理HTML实体编码
         url = url.replace(/&/g, '&');
         const urlObj = new URL(url);
         if (urlObj.hostname.includes('xiaohongshu.com')) {
@@ -329,7 +328,7 @@ function cleanUrl(url) {
             urlObj.searchParams.delete('xhsshare');
             urlObj.searchParams.delete('xsec_token');
             urlObj.searchParams.delete('xsec_source');
-            return urlObj.origin + urlObj.pathname + urlObj.search;
+            return urlObj.origin + urlObj.pathname;
         }
         if (urlObj.hostname.includes('douyin.com') || urlObj.hostname.includes('v.douyin.com')) {
             return urlObj.origin + urlObj.pathname;
@@ -337,7 +336,6 @@ function cleanUrl(url) {
         return url;
     }
     catch (e) {
-        // 处理HTML实体编码
         return url.replace(/&/g, '&');
     }
 }
@@ -410,7 +408,13 @@ function findValueInObject(obj, keys) {
 }
 function parseData(rawResponse, maxDescLength, platform) {
     let data = rawResponse;
-    if (data.data) {
+    if (platform === 'bilibili' && rawResponse.data) {
+        data = rawResponse.data;
+    }
+    else if (platform === 'douyin' && rawResponse.data) {
+        data = rawResponse.data;
+    }
+    else if (data.data) {
         data = data.data;
     }
     const stat = {};
@@ -420,30 +424,87 @@ function parseData(rawResponse, maxDescLength, platform) {
             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' && data.item && data.item.url) {
+        video = data.item.url;
     }
     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;
+                }
             }
         }
     }
@@ -451,6 +512,15 @@ function parseData(rawResponse, maxDescLength, platform) {
     const duration = typeof durationValue === 'number' ? durationValue : parseInt(durationValue) || 0;
     const durationFormatted = formatDuration(durationValue || 0);
     const live_photo = data.live_photo || [];
+    const music = findValueInObject(data, ['music', 'muisic']) || '';
+    const h_w = platform === 'douyin' && data.item && data.item.h_w ? data.item.h_w : [];
+    const quality_urls = data.quality_urls || {};
+    const default_quality = data.default_quality || '';
+    const download_url = data.download_url || '';
+    const play_count = data.play_count || '';
+    const reposts_count = data.reposts_count || 0;
+    const attitudes_count = data.attitudes_count || 0;
+    const comments_count = data.comments_count || 0;
     return {
         type: type,
         rawData: rawResponse,
@@ -463,7 +533,17 @@ function parseData(rawResponse, maxDescLength, platform) {
         duration,
         durationFormatted,
         stat,
-        live_photo
+        live_photo,
+        music,
+        h_w,
+        jx: data.jx || null,
+        quality_urls,
+        default_quality,
+        download_url,
+        play_count,
+        reposts_count,
+        attitudes_count,
+        comments_count
     };
 }
 function generateFormattedText(platform, parseData, config) {
@@ -542,8 +622,9 @@ function apply(ctx, config) {
         let lastError = null;
         for (let i = 0; i <= retryTimes; i++) {
             try {
+                const params = { url };
                 const res = await http.get(API_CONFIG[platform], {
-                    params: { url },
+                    params,
                     timeout: config.timeout
                 });
                 return res.data;
@@ -576,9 +657,14 @@ function apply(ctx, config) {
         }
         try {
             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('解析成功'));
+            let isSuccess = false;
+            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;
@@ -593,11 +679,11 @@ function apply(ctx, config) {
             }
             try {
                 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 === 'live' ||
+                    parseResult.type === '图集';
                 if (!hasValidContent) {
                     const code = ErrorCode.NO_VIDEO_FOUND;
                     const msg = getErrorInfo(code, '链接有效但未找到视频/图片内容（可能是直播、私密内容或已删除）');
@@ -658,7 +744,12 @@ function apply(ctx, config) {
                 images: parseData.images,
                 video: parseData.video,
                 type: parseData.type,
-                live_photo: parseData.live_photo
+                live_photo: parseData.live_photo,
+                music: parseData.music,
+                h_w: parseData.h_w,
+                quality_urls: parseData.quality_urls,
+                default_quality: parseData.default_quality,
+                download_url: parseData.download_url
             },
             code: ErrorCode.SUCCESS,
             msg: getErrorInfo(ErrorCode.SUCCESS)
@@ -728,6 +819,11 @@ 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));
@@ -795,7 +891,11 @@ 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));
@@ -975,9 +1075,5 @@ function apply(ctx, config) {
             logger.info(getErrorInfo(ErrorCode.SUCCESS, '自动清理缓存完成'));
         }, config.autoClearCacheInterval * 60000);
     }
-    process.on('exit', () => {
-        clearAllCache();
-        logger.info(getErrorInfo(ErrorCode.SUCCESS, '进程退出，已清理缓存'));
-    });
     logger.info(getErrorInfo(ErrorCode.SUCCESS, '视频解析插件已加载'));
 }

package/package.json

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