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

package/lib/index.js

@@ -123,7 +123,6 @@ 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.xingzhige.com/API/b_parse',
     douyin: 'https://api.xingzhige.com/API/douyin/',
@@ -154,10 +153,10 @@ const VARIABLE_MAPPING = {
     '点赞数': ['like', 'Like', 'attitudes_count', 'digg_count', 'praise', 'stat.like'],
     '投币数': ['coin', 'Coin', 'bi', 'Bi'],
     '收藏数': ['collect', 'Collect', 'favorite', 'Favorite', 'star', 'Star', 'stat.collect'],
-    '转发数': ['share', 'Share', 'forward', 'Forward', 'repost', 'stat.share'],
+    '转发数': ['share', 'Share', 'forward', 'Forward', 'repost', 'stat.share', 'reposts_count'],
     '播放数': ['view', 'View', 'play_count', 'PlayCount', 'play'],
     '评论数': ['comment', 'Comment', 'comments_count', 'comment_count', 'discuss', 'stat.comment'],
-    '音乐名': ['music.title', 'music_name', 'audio_name', 'sound_name', 'muisic']
+    '音乐名': ['music.title', 'music_name', 'audio_name', 'sound_name', 'muisic', 'music']
 };
 function getErrorInfo(code, detail) {
     const baseMsg = exports.ErrorMessageMap[code] || exports.ErrorMessageMap[ErrorCode.UNKNOWN_ERROR];
@@ -322,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')) {
@@ -330,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;
@@ -338,7 +336,6 @@ function cleanUrl(url) {
         return url;
     }
     catch (e) {
-        // 处理HTML实体编码
         return url.replace(/&/g, '&');
     }
 }
@@ -409,39 +406,31 @@ function findValueInObject(obj, keys) {
     }
     return undefined;
 }
-// 适配新的API返回格式
 function parseData(rawResponse, maxDescLength, platform) {
     let data = rawResponse;
-    // 处理不同平台的返回结构差异
     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 = 'video';
     if (platform === 'douyin' && data.jx && data.jx.type) {
-        type = 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;
@@ -452,7 +441,6 @@ function parseData(rawResponse, maxDescLength, platform) {
     else {
         title = findValueInObject(data, ['title']) || '无标题';
     }
-    // 适配不同平台的作者字段
     let author = '未知作者';
     if (platform === 'bilibili' && data.owner && data.owner.name) {
         author = data.owner.name;
@@ -463,19 +451,17 @@ function parseData(rawResponse, maxDescLength, platform) {
     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; // 抖音没有单独的描述字段
+        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;
@@ -486,7 +472,6 @@ function parseData(rawResponse, maxDescLength, platform) {
     else {
         cover = findValueInObject(data, ['cover', 'imgurl', 'pic', 'thumbnail']) || '';
     }
-    // 适配不同平台的图片字段
     let images = [];
     if (platform === 'douyin' && data.item && data.item.images) {
         images = data.item.images;
@@ -496,13 +481,12 @@ function parseData(rawResponse, maxDescLength, platform) {
     }
     if (!Array.isArray(images))
         images = [images];
-    // 适配不同平台的视频链接字段
     let video = '';
     if (platform === 'bilibili' && data.video && data.video.url) {
         video = data.video.url;
     }
-    else if (platform === 'douyin') {
-        video = ''; // 抖音图集没有视频链接
+    else if (platform === 'douyin' && data.item && data.item.url) {
+        video = data.item.url;
     }
     else {
         const videoUrls = [
@@ -524,12 +508,19 @@ function parseData(rawResponse, maxDescLength, platform) {
             }
         }
     }
-    // 适配不同平台的时长字段
     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 || [];
+    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,
@@ -542,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) {
@@ -621,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;
@@ -655,14 +657,11 @@ function apply(ctx, config) {
         }
         try {
             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('解析成功'));
             }
@@ -680,7 +679,6 @@ 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) ||
@@ -746,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)
@@ -816,7 +819,6 @@ 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));
@@ -889,7 +891,6 @@ function apply(ctx, config) {
                         await sendTimeout(session, item.text);
                         await delay(300);
                     }
-                    // 处理抖音图集
                     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);
@@ -1074,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.5",  
+  "version": "0.5.7",  
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [