koishi-plugin-video-parser-all 0.7.4 → 0.7.5

package/lib/index.js

@@ -414,20 +414,17 @@ function findValueInObject(obj, keys) {
 }
 function parseData(rawResponse, maxDescLength) {
     const root = rawResponse || {};
-    const data = root.data || root.result || root || {};
-    // 小红书特殊处理：API返回数据在 root 根节点而非 data 子节点
-    const isXiaohongshu = root.note_title || root.note_desc || root.author_name || root.cover;
-    const parseRoot = isXiaohongshu ? root : data;
+    const data = root.data || root;
     const stat = {};
     let totalImageCount = 0;
     Object.entries(VARIABLE_MAPPING).forEach(([varName, keys]) => {
-        let value = findValueInObject(parseRoot, keys) || findValueInObject(root, keys);
+        let value = findValueInObject(data, keys) || findValueInObject(root, keys);
         if (varName === '图片数量' && value === undefined) {
             let imgCount = 0;
             const imgSources = [
-                parseRoot.images, parseRoot.pics, parseRoot.pic_urls, parseRoot.image_list, parseRoot.imgurl,
+                data.images, data.pics, data.pic_urls, data.image_list, data.imgurl,
                 root.images, root.pics, root.pic_urls, root.image_list, root.imgurl,
-                parseRoot.item?.images
+                data.item?.images
             ];
             for (const source of imgSources) {
                 if (Array.isArray(source) && source.length > 0) {
@@ -436,8 +433,8 @@ function parseData(rawResponse, maxDescLength) {
                 }
             }
             totalImageCount = imgCount;
-            const cover = parseRoot.cover || parseRoot.video?.fm || parseRoot.imgurl || parseRoot.pic || parseRoot.thumbnail || parseRoot.cover_url ||
-                parseRoot.item?.cover || root.cover || parseRoot.live?.cover || parseRoot.live?.keyframe || '';
+            const cover = data.cover || data.video?.fm || data.imgurl || data.pic || data.thumbnail || data.cover_url ||
+                data.item?.cover || root.cover || data.live?.cover || data.live?.keyframe || '';
             if (cover && imgCount > 0) {
                 imgCount = imgSources.find(source => Array.isArray(source))?.filter(i => i && typeof i === 'string' && i !== cover).length || 0;
             }
@@ -447,118 +444,58 @@ function parseData(rawResponse, maxDescLength) {
             stat[varName] = value;
         }
     });
-    // 小红书字段兜底
-    if (isXiaohongshu) {
-        if (!stat['标题'])
-            stat['标题'] = root.note_title || root.title || '';
-        if (!stat['作者'])
-            stat['作者'] = root.author_name || root.nickname || root.author || '';
-        if (!stat['简介'])
-            stat['简介'] = root.note_desc || root.desc || root.content || '';
-        if (!stat['播放数'])
-            stat['播放数'] = root.play_count || root.view_count || '';
-        if (!stat['点赞数'])
-            stat['点赞数'] = root.like_count || root.attitudes_count || '';
-        if (!stat['评论数'])
-            stat['评论数'] = root.comment_count || root.comments_count || '';
-        if (!stat['收藏数'])
-            stat['收藏数'] = root.collect_count || root.favorite_count || '';
-        if (!stat['转发数'])
-            stat['转发数'] = root.share_count || root.repost_count || '';
-        if (!stat['发布时间'])
-            stat['发布时间'] = root.create_time || root.publish_time || '';
-        if (!stat['IP属地'])
-            stat['IP属地'] = root.ip_location || root.ip_info_str || '';
-    }
     let type = 'video';
-    if (parseRoot.jx?.type)
-        type = parseRoot.jx.type;
-    else if (parseRoot.type)
-        type = parseRoot.type;
+    if (data.jx?.type)
+        type = data.jx.type;
+    else if (data.type)
+        type = data.type;
     else if (root.msg === 'cv')
         type = 'cv';
     else if (root.msg === 'live')
         type = 'live';
-    else if ((parseRoot.images && parseRoot.images.length > 1) || (root.images && root.images.length > 1) ||
-        (parseRoot.imgurl && parseRoot.imgurl.length > 1) || (root.imgurl && root.imgurl.length > 1))
+    else if ((data.images && data.images.length > 1) || (root.images && root.images.length > 1) ||
+        (data.imgurl && data.imgurl.length > 1) || (root.imgurl && root.imgurl.length > 1))
         type = '图集';
-    const title = stat['标题'] || parseRoot.note_title || parseRoot.title || parseRoot.content_title || parseRoot.video?.title ||
-        parseRoot.item?.title || root.title || parseRoot.live?.title || '无标题';
-    let author = stat['作者'] || parseRoot.author?.name || parseRoot.nickname || parseRoot.user_name || parseRoot.owner?.name ||
-        parseRoot.item?.author || root.author || parseRoot.user?.name || parseRoot.live?.author || '';
-    if (typeof author === 'object') {
-        author = '';
+    const title = data.title || '无标题';
+    let author = '';
+    if (data.author && typeof data.author === 'object') {
+        author = data.author.name || '';
     }
     else {
-        author = author || '未知作者';
-    }
-    const rawDesc = stat['简介'] || parseRoot.note_desc || parseRoot.content || parseRoot.text || parseRoot.description ||
-        parseRoot.video?.desc || parseRoot.item?.description || root.desc || root.description ||
-        parseRoot.live?.desc || (title !== '无标题' ? title : '') || '暂无简介';
-    const desc = rawDesc.length > 0 ? rawDesc.slice(0, maxDescLength) : '暂无简介';
-    const cover = parseRoot.cover || parseRoot.video?.fm || parseRoot.imgurl || parseRoot.pic || parseRoot.thumbnail || parseRoot.cover_url ||
-        parseRoot.item?.cover || root.cover || parseRoot.live?.cover || parseRoot.live?.keyframe ||
-        (Array.isArray(parseRoot.images) && parseRoot.images[0]) ||
-        (Array.isArray(root.images) && root.images[0]) ||
-        (Array.isArray(parseRoot.imgurl) && parseRoot.imgurl[0]) || '';
-    let images = [];
-    const imgSources = [
-        parseRoot.images, parseRoot.pics, parseRoot.pic_urls, parseRoot.image_list, parseRoot.imgurl,
-        root.images, root.pics, root.pic_urls, root.image_list, root.imgurl,
-        parseRoot.item?.images
-    ];
-    for (const source of imgSources) {
-        if (Array.isArray(source) && source.length > 0) {
-            images = source.filter(i => i && typeof i === 'string' && i !== cover);
-            break;
-        }
-    }
-    let video = parseRoot.video?.url || parseRoot.url || parseRoot.download_url || parseRoot.playUrl ||
-        parseRoot.video_url || root.url || parseRoot.item?.url || parseRoot.live?.url ||
-        (parseRoot.live?.url && Array.isArray(parseRoot.live.url) ? parseRoot.live.url[0] : '') || '';
-    const durationValue = stat['视频时长'] || parseRoot.item?.duration || parseRoot.duration || 0;
+        author = data.author || '';
+    }
+    author = author || '未知作者';
+    const rawDesc = data.desc || data.content || '暂无简介';
+    const desc = rawDesc.slice(0, maxDescLength);
+    const cover = data.cover || '';
+    const images = Array.isArray(data.images) ? data.images : [];
+    const video = data.url || data.video_backup || '';
+    const durationValue = data.duration || 0;
     const duration = typeof durationValue === 'number' ? durationValue : parseInt(durationValue) || 0;
     const durationFormatted = formatDuration(durationValue);
-    const pubTime = formatPublishTime(stat['发布时间']);
+    const pubTime = formatPublishTime(data.create_time || data.publish_time);
     if (pubTime)
         stat['发布时间'] = pubTime;
-    else
-        delete stat['发布时间'];
-    if (durationFormatted !== '00:00:00') {
+    if (durationFormatted !== '00:00:00')
         stat['视频时长'] = durationFormatted;
-    }
-    else {
-        delete stat['视频时长'];
-    }
-    if (stat['图片数量'] === 0) {
+    if (stat['图片数量'] === 0)
         delete stat['图片数量'];
+    const live_photo = data.live_photo || [];
+    const h_w = data.item?.h_w || [];
+    const quality_urls = data.quality_urls || {};
+    const default_quality = data.default_quality || '';
+    const download_url = video;
+    const play_count = stat['播放数'] || '';
+    const reposts_count = Number(stat['转发数']) || 0;
+    const attitudes_count = Number(stat['点赞数']) || 0;
+    const comments_count = Number(stat['评论数']) || 0;
+    if (data.live) {
+        stat['直播间地址'] = data.live.room_url || '';
+        stat['直播间ID'] = data.live.room_id || '';
+        stat['直播间状态'] = data.live.status === 1 ? '直播中' : (data.live.status === 0 ? '未开播' : '未知');
+        stat['在线人数'] = data.live.online || '';
+        stat['关注数'] = data.live.attention || '';
     }
-    const sizeVal = stat['文件大小'];
-    if (sizeVal && !String(sizeVal).includes('MB')) {
-        const num = Number(sizeVal);
-        if (!isNaN(num) && num > 0)
-            stat['文件大小'] = `${num.toFixed(2)} MB`;
-    }
-    const live_photo = parseRoot.live_photo || root.live_photo || [];
-    const h_w = parseRoot.item?.h_w || root.h_w || [];
-    const quality_urls = parseRoot.quality_urls || root.quality_urls || {};
-    const default_quality = parseRoot.default_quality || root.default_quality || '';
-    const download_url = parseRoot.download_url || video;
-    const play_count = stat['播放数'] || parseRoot.play_count || root.play_count || '';
-    const reposts_count = Number(stat['转发数']) || parseRoot.reposts_count || root.reposts_count || 0;
-    const attitudes_count = Number(stat['点赞数']) || parseRoot.attitudes_count || root.attitudes_count || parseRoot.like || root.like || 0;
-    const comments_count = Number(stat['评论数']) || parseRoot.comments_count || root.comments_count || 0;
-    if (parseRoot.live) {
-        stat['直播间地址'] = parseRoot.live.room_url || '';
-        stat['直播间ID'] = parseRoot.live.room_id || '';
-        stat['直播间状态'] = parseRoot.live.status === 1 ? '直播中' : (parseRoot.live.status === 0 ? '未开播' : parseRoot.live.status || '未知');
-        stat['在线人数'] = parseRoot.live.online || '';
-        stat['关注数'] = parseRoot.live.attention || '';
-    }
-    if (parseRoot.followers_count)
-        stat['粉丝数'] = parseRoot.followers_count;
-    if (parseRoot.ip_info_str)
-        stat['IP属地'] = parseRoot.ip_info_str;
     return {
         type: type,
         rawData: rawResponse,
@@ -574,7 +511,7 @@ function parseData(rawResponse, maxDescLength) {
         totalImageCount,
         live_photo,
         h_w,
-        jx: parseRoot.jx || null,
+        jx: data.jx || null,
         quality_urls,
         default_quality,
         download_url,

package/package.json

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