koishi-plugin-video-parser-all 0.6.5 → 0.6.6

package/lib/index.js

@@ -141,31 +141,31 @@ const API_CONFIG = {
     weibo: 'https://api.bugpk.com/api/weibo',
     toutiao: 'https://api.bugpk.com/api/toutiao',
     pipigx: 'https://api.bugpk.com/api/pipigx',
-    pipixia: 'https://api.bugpk.com/api/ppx',
+    pipixia: 'https://api.bugpk.com/api/pipixia',
     zuiyou: 'https://api.bugpk.com/api/zuiyou'
 };
 const VARIABLE_MAPPING = {
-    '标题': ['title', 'Title', 'TITLE', 'note_title', 'content_title', 'item.title', 'data.title', 'video.title', 'live.title'],
-    '作者': ['author.name', 'author', 'name', 'Author', 'Name', 'owner.name', 'nickname', 'user_name', 'data.author', 'item.author', 'user.name', 'live.author'],
-    '简介': ['desc', 'description', 'Desc', 'Description', 'content', 'Content', 'note_desc', 'text', 'data.desc', 'item.description', 'live.desc'],
-    '视频时长': ['duration', 'Duration', 'time', 'Time', 'video_duration', 'item.duration', 'stat.duration'],
-    '点赞数': ['like', 'Like', 'attitudes_count', 'digg_count', 'praise', 'stat.like', 'liked_count', 'data.like', 'data.attitudes_count', 'item.attitudes_count'],
+    '标题': ['title', 'Title', 'TITLE', 'note_title', 'content_title', 'item.title', 'data.title', 'video.title', 'live.title', 'data.item.title'],
+    '作者': ['author.name', 'author', 'name', 'Author', 'Name', 'owner.name', 'nickname', 'user_name', 'data.author', 'item.author', 'user.name', 'live.author', 'data.user.name', 'data.author.name'],
+    '简介': ['desc', 'description', 'Desc', 'Description', 'content', 'Content', 'note_desc', 'text', 'data.desc', 'item.description', 'live.desc', 'data.item.description'],
+    '视频时长': ['duration', 'Duration', 'time', 'Time', 'video_duration', 'item.duration', 'stat.duration', 'data.item.duration'],
+    '点赞数': ['like', 'Like', 'attitudes_count', 'digg_count', 'praise', 'stat.like', 'liked_count', 'data.like', 'data.attitudes_count', 'item.attitudes_count', 'data.item.attitudes_count'],
     '投币数': ['coin', 'Coin', 'bi', 'Bi', 'stat.coin', 'stast.coin'],
-    '收藏数': ['collect', 'Collect', 'favorite', 'Favorite', 'star', 'Star', 'stat.collect', 'collected_count', 'stast.favorite', 'data.favorite'],
-    '转发数': ['share', 'Share', 'forward', 'Forward', 'repost', 'stat.share', 'reposts_count', 'shared_count', 'stast.share', 'data.reposts_count'],
-    '播放数': ['view', 'View', 'play_count', 'PlayCount', 'play', 'stat.view', 'play_times', 'stast.view', 'data.play_count', 'item.play_count'],
-    '评论数': ['comment', 'Comment', 'comments_count', 'comment_count', 'discuss', 'stat.comment', 'stast.reply', 'data.comments_count', 'item.comments_count'],
-    'IP属地': ['ip_info_str', 'data.ip_info_str', 'item.ip_info'],
-    '发布时间': ['date', 'time', 'publish_time', 'data.date', 'item.publish_time', 'live.time', 'stast.publish_time'],
-    '粉丝数': ['followers_count', 'data.followers_count', 'item.followers', 'author.fans'],
-    '在线人数': ['online', 'data.online', 'live.online', 'room.online'],
-    '关注数': ['attention', 'data.attention', 'live.attention', 'stast.attention'],
-    '文件大小': ['size', 'size_str', 'item.size', 'item.size_str', 'data.size'],
-    '直播间地址': ['room_url', 'live.room_url', 'data.room_url', 'live.url'],
-    '直播间ID': ['room_id', 'live.room_id', 'data.room_id', 'live.room_id'],
-    '直播间状态': ['status', 'live.status', 'data.status', 'room.status'],
-    '图片数量': ['count', 'data.count', 'item.count', 'images.length', 'data.images.length'],
-    '作者ID': ['userId', 'userID', 'author_id', 'data.userId', 'item.userID', 'author.mid', 'user.mid'],
+    '收藏数': ['collect', 'Collect', 'favorite', 'Favorite', 'star', 'Star', 'stat.collect', 'collected_count', 'stast.favorite', 'data.favorite', 'stast.favorite'],
+    '转发数': ['share', 'Share', 'forward', 'Forward', 'repost', 'stat.share', 'reposts_count', 'shared_count', 'stast.share', 'data.reposts_count', 'data.item.reposts_count'],
+    '播放数': ['view', 'View', 'play_count', 'PlayCount', 'play', 'stat.view', 'play_times', 'stast.view', 'data.play_count', 'item.play_count', 'data.item.play_count'],
+    '评论数': ['comment', 'Comment', 'comments_count', 'comment_count', 'discuss', 'stat.comment', 'stast.reply', 'data.comments_count', 'item.comments_count', 'data.item.comments_count'],
+    'IP属地': ['ip_info_str', 'data.ip_info_str', 'item.ip_info', 'data.item.ip_info_str'],
+    '发布时间': ['date', 'time', 'publish_time', 'data.date', 'item.publish_time', 'live.time', 'stast.publish_time', 'stat.time', 'data.time.publish_time', 'data.live.time'],
+    '粉丝数': ['followers_count', 'data.followers_count', 'item.followers', 'author.fans', 'data.item.followers_count'],
+    '在线人数': ['online', 'data.online', 'live.online', 'room.online', 'data.live.online'],
+    '关注数': ['attention', 'data.attention', 'live.attention', 'stast.attention', 'data.live.attention'],
+    '文件大小': ['size', 'size_str', 'item.size', 'item.size_str', 'data.size', 'data.item.size_str'],
+    '直播间地址': ['room_url', 'live.room_url', 'data.room_url', 'live.url', 'data.live.room_url'],
+    '直播间ID': ['room_id', 'live.room_id', 'data.room_id', 'live.room_id', 'data.live.room_id'],
+    '直播间状态': ['status', 'live.status', 'data.status', 'room.status', 'data.live.status'],
+    '图片数量': ['count', 'data.count', 'item.count', 'images.length', 'data.images.length', 'data.item.count'],
+    '作者ID': ['userId', 'userID', 'author_id', 'data.userId', 'item.userID', 'author.mid', 'user.mid', 'data.item.userID', 'data.author_id', 'data.user.mid'],
 };
 function getErrorInfo(code, detail) {
     const baseMsg = exports.ErrorMessageMap[code] || exports.ErrorMessageMap[ErrorCode.UNKNOWN_ERROR];
@@ -389,8 +389,11 @@ function formatPublishTime(value) {
     if (!value)
         return '';
     const str = String(value).trim();
-    if (/^\d{10,}$/.test(str) && Number(str) > 1e12)
-        return '';
+    if (/^\d{10,}$/.test(str) && Number(str) > 1e12) {
+        if (Number(str) > 1e15) {
+            value = Number(str) / 1000;
+        }
+    }
     try {
         const d = new Date(/^\d+$/.test(str) ? Number(str) * 1000 : str);
         if (isNaN(d.getTime()))
@@ -412,7 +415,7 @@ function formatPublishTime(value) {
         return parts.join(' ').trim();
     }
     catch {
-        return '';
+        return str;
     }
 }
 function getNestedValue(obj, path) {
@@ -458,7 +461,10 @@ function parseData(rawResponse, maxDescLength) {
     Object.entries(VARIABLE_MAPPING).forEach(([varName, keys]) => {
         let value = findValueInObject(data, keys) || findValueInObject(rootData, keys);
         if (varName === '图片数量' && value === undefined) {
-            value = Array.isArray(data.images) ? data.images.length : (Array.isArray(rootData.images) ? rootData.images.length : undefined);
+            value = Array.isArray(data.images) ? data.images.length :
+                Array.isArray(rootData.images) ? rootData.images.length :
+                    Array.isArray(data.imgurl) ? data.imgurl.length :
+                        Array.isArray(rootData.imgurl) ? rootData.imgurl.length : undefined;
         }
         if (value !== undefined && value !== null && value !== '') {
             stat[varName] = value;
@@ -473,21 +479,35 @@ function parseData(rawResponse, maxDescLength) {
         type = 'cv';
     else if (rootData.msg === 'live')
         type = 'live';
-    else if ((data.images && data.images.length > 1) || (rootData.images && rootData.images.length > 1))
+    else if ((data.images && data.images.length > 1) || (rootData.images && rootData.images.length > 1) ||
+        (data.imgurl && data.imgurl.length > 1) || (rootData.imgurl && rootData.imgurl.length > 1))
         type = '图集';
-    const title = stat['标题'] || (data.note_title || data.title || data.content_title || '无标题');
-    const author = stat['作者'] || (data.author?.name || data.nickname || data.user_name || '未知作者');
-    const rawDesc = stat['简介'] || data.note_desc || data.content || data.text || data.description || '';
+    const title = stat['标题'] || data.note_title || data.title || data.content_title || data.item?.title || rootData.title || '无标题';
+    let author = stat['作者'] || data.author?.name || data.nickname || data.user_name || data.item?.author ||
+        rootData.author || data.user?.name || data.owner?.name || '未知作者';
+    if (typeof author === 'object' && author.name)
+        author = author.name;
+    const rawDesc = stat['简介'] || data.note_desc || data.content || data.text || data.description ||
+        data.item?.description || rootData.desc || rootData.description || '';
     const desc = rawDesc.length > 0 ? rawDesc.slice(0, maxDescLength) : (title.length > 0 ? title : '暂无简介');
-    const cover = data.cover ?? data.imgurl ?? data.pic ?? data.thumbnail ?? data.cover_url ?? (Array.isArray(data.images) && data.images[0] ? data.images[0] : '');
+    const cover = data.cover || data.imgurl || data.pic || data.thumbnail || data.cover_url ||
+        data.item?.cover || rootData.cover || (Array.isArray(data.images) && data.images[0]) ||
+        (Array.isArray(rootData.images) && rootData.images[0]) || '';
     let images = [];
-    const imgRaw = data.images ?? data.pics ?? data.pic_urls ?? data.image_list ?? [];
-    if (Array.isArray(imgRaw))
-        images = imgRaw.filter(i => i && typeof i === 'string');
-    else if (imgRaw)
-        images = [String(imgRaw)];
-    let video = data.video?.url ?? data.item?.url ?? data.url ?? data.download_url ?? data.playUrl ?? data.video_url ?? '';
-    const durationValue = stat['视频时长'] || 0;
+    const imgSources = [
+        data.images, data.pics, data.pic_urls, data.image_list, data.imgurl,
+        rootData.images, rootData.pics, rootData.pic_urls, rootData.image_list, rootData.imgurl,
+        data.item?.images
+    ];
+    for (const source of imgSources) {
+        if (Array.isArray(source) && source.length > 0) {
+            images = source.filter(i => i && typeof i === 'string');
+            break;
+        }
+    }
+    let video = data.video?.url || data.item?.url || data.url || data.download_url || data.playUrl ||
+        data.video_url || rootData.url || data.item?.url || '';
+    const durationValue = stat['视频时长'] || data.item?.duration || data.duration || 0;
     const duration = typeof durationValue === 'number' ? durationValue : parseInt(durationValue) || 0;
     const durationFormatted = formatDuration(durationValue);
     const pubTime = formatPublishTime(stat['发布时间']);
@@ -506,15 +526,15 @@ function parseData(rawResponse, maxDescLength) {
         if (!isNaN(num) && num > 0)
             stat['文件大小'] = `${num.toFixed(2)} MB`;
     }
-    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 = data.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;
+    const live_photo = data.live_photo || rootData.live_photo || [];
+    const h_w = data.item?.h_w || rootData.h_w || [];
+    const quality_urls = data.quality_urls || rootData.quality_urls || {};
+    const default_quality = data.default_quality || rootData.default_quality || '';
+    const download_url = data.download_url || video;
+    const play_count = stat['播放数'] || '';
+    const reposts_count = Number(stat['转发数']) || data.reposts_count || rootData.reposts_count || 0;
+    const attitudes_count = Number(stat['点赞数']) || data.attitudes_count || rootData.attitudes_count || 0;
+    const comments_count = Number(stat['评论数']) || data.comments_count || rootData.comments_count || 0;
     return {
         type: type,
         rawData: rawResponse,
@@ -529,7 +549,7 @@ function parseData(rawResponse, maxDescLength) {
         stat,
         live_photo,
         h_w,
-        jx: data.jx ?? null,
+        jx: data.jx || null,
         quality_urls,
         default_quality,
         download_url,
@@ -663,7 +683,7 @@ function apply(ctx, config) {
             }
             const isSuccess = resData.code === 0 || resData.code === 200 || resData.code === 1 ||
                 (resData.msg && (resData.msg.includes('解析成功') || resData.msg.includes('success') || resData.msg.includes('请求成功'))) ||
-                !!resData.data || !!resData.result || !!resData.video || !!resData.images;
+                !!resData.data || !!resData.result || !!resData.video || !!resData.images || !!resData.imgurl;
             if (!isSuccess) {
                 const apiErrorMsg = resData.msg || resData.error || '解析失败';
                 const code = ErrorCode.API_RETURN_ERROR;

package/package.json

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