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

package/lib/index.js

@@ -32,27 +32,17 @@ exports.Config = koishi_1.Schema.intersect([
 转发：${'${转发数}'}
 播放：${'${播放数}'}
 评论：${'${评论数}'}
-音乐：${'${音乐名}'}
 IP属地：${'${IP属地}'}
 发布时间：${'${发布时间}'}
 粉丝数：${'${粉丝数}'}
 在线人数：${'${在线人数}'}
 关注数：${'${关注数}'}
-视频质量：${'${视频质量}'}
-帧率：${'${帧率}'}
-码率：${'${码率}'}
 文件大小：${'${文件大小}'}
-分辨率：${'${分辨率}'}
-音乐作者：${'${音乐作者}'}
-音乐标题：${'${音乐标题}'}
 直播间地址：${'${直播间地址}'}
 直播间ID：${'${直播间ID}'}
 直播间状态：${'${直播间状态}'}
-默认画质：${'${默认画质}'}
 图片数量：${'${图片数量}'}
-作者ID：${'${作者ID}'}
-封面链接：${'${封面链接}'}
-视频链接：${'${视频链接}'}`).description('统一消息格式（无法获取的变量会自动隐藏）'),
+作者ID：${'${作者ID}'}`).description('统一消息格式'),
     }).description('统一消息格式'),
     koishi_1.Schema.object({
         showImageText: koishi_1.Schema.boolean().default(true).description('显示图文内容'),
@@ -75,10 +65,10 @@ IP属地：${'${IP属地}'}
         enableForward: koishi_1.Schema.boolean().default(false).description('启用合并转发（仅OneBot平台）'),
         downloadVideoBeforeSend: koishi_1.Schema.boolean().default(false).description('发送前先下载视频'),
         maxVideoSize: koishi_1.Schema.number().min(0).default(0).description('最大视频大小限制（MB，0为不限制）'),
-        downloadThreads: koishi_1.Schema.number().min(0).max(10).default(0).description('多线程下载线程数（0为不使用多线程，1-10为启用对应线程数）'),
+        downloadThreads: koishi_1.Schema.number().min(0).max(10).default(0).description('多线程下载线程数（0为不使用多线程）'),
     }).description('发送方式设置'),
     koishi_1.Schema.object({
-        messageBufferDelay: koishi_1.Schema.number().min(0).default(0).description('消息缓冲延迟（毫秒，批量处理链接）'),
+        messageBufferDelay: koishi_1.Schema.number().min(0).default(0).description('消息缓冲延迟（毫秒）'),
     }).description('消息处理设置'),
     koishi_1.Schema.object({
         autoClearCacheInterval: koishi_1.Schema.number().min(0).default(0).description('自动清理缓存间隔（分钟，0为关闭）'),
@@ -114,7 +104,7 @@ exports.ErrorMessageMap = {
     [ErrorCode.PLATFORM_API_NOT_CONFIGURED]: '该平台暂未配置解析接口',
     [ErrorCode.REQUEST_TIMEOUT]: '请求超时',
     [ErrorCode.NETWORK_ERROR]: '网络请求失败',
-    [ErrorCode.DUPLICATE_PARSE]: '请勿重复解析（相同链接解析间隔未到）',
+    [ErrorCode.DUPLICATE_PARSE]: '请勿重复解析',
     [ErrorCode.INVALID_URL]: '无效的链接格式',
     [ErrorCode.API_RETURN_ERROR]: 'API返回错误',
     [ErrorCode.API_DATA_PARSE_FAILED]: '数据解析异常',
@@ -165,27 +155,17 @@ const VARIABLE_MAPPING = {
     '转发数': ['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'],
-    '音乐名': ['music.title', 'music_name', 'audio_name', 'sound_name', 'muisic', 'music', 'bgm_name', 'data.music.name', 'item.music.title', 'music.author', 'music.albumName'],
     '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'],
-    '视频质量': ['quality', 'max_qxd', 'data.quality', 'item.quality', 'quality_urls'],
-    '帧率': ['fps', 'item.fps', 'data.fps'],
-    '码率': ['bitrate', 'item.bitrate', 'data.bitrate', 'br', 'item.br'],
     '文件大小': ['size', 'size_str', 'item.size', 'item.size_str', 'data.size'],
-    '分辨率': ['height', 'width', 'h_w', 'item.h_w', 'data.resolution', 'item.height', 'item.width'],
-    '音乐作者': ['music.author', 'item.music.author', 'data.music.author', 'music.artist'],
-    '音乐标题': ['music.title', 'item.music.title', 'data.music.title', 'music.name'],
     '直播间地址': ['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'],
-    '默认画质': ['default_quality', 'data.default_quality', 'item.default_quality'],
     '图片数量': ['count', 'data.count', 'item.count', 'images.length', 'data.images.length'],
     '作者ID': ['userId', 'userID', 'author_id', 'data.userId', 'item.userID', 'author.mid', 'user.mid'],
-    '封面链接': ['cover', 'imgurl', 'pic', 'thumbnail', 'cover_url', 'data.cover', 'item.cover', 'live.cover'],
-    '视频链接': ['url', 'video_url', 'playUrl', 'download_url', 'data.url', 'item.url', 'live.url', 'quality_urls.*'],
 };
 function getErrorInfo(code, detail) {
     const baseMsg = exports.ErrorMessageMap[code] || exports.ErrorMessageMap[ErrorCode.UNKNOWN_ERROR];
@@ -375,7 +355,6 @@ async function resolveShortUrl(url) {
             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',
                 'Referer': 'https://www.baidu.com/',
-                'Cookie': 'xhsTrackerId=xxx; xhs_sessionId=xxx'
             }
         });
         return cleanUrl(res.request.res?.responseUrl || url);
@@ -386,21 +365,55 @@ async function resolveShortUrl(url) {
 }
 function formatDuration(input) {
     if (!input || input === 0 || input === '0' || input === '00:00')
-        return '00:00';
+        return '00:00:00';
     if (typeof input === 'string') {
-        if (input.includes(':'))
-            return input;
+        if (input.includes(':')) {
+            const parts = input.split(':');
+            if (parts.length === 2)
+                return `00:${parts[0].padStart(2, '0')}:${parts[1].padStart(2, '0')}`;
+            if (parts.length === 3)
+                return `${parts[0].padStart(2, '0')}:${parts[1].padStart(2, '0')}:${parts[2].padStart(2, '0')}`;
+            return '00:00:00';
+        }
         input = Number(input);
     }
     const seconds = Math.floor(Number(input));
-    if (isNaN(seconds) || seconds <= 0)
-        return '00:00';
+    if (isNaN(seconds) || seconds <= 0 || seconds > 315360000)
+        return '00:00:00';
     const hours = Math.floor(seconds / 3600);
     const minutes = Math.floor((seconds % 3600) / 60);
     const secs = Math.floor(seconds % 60);
-    return hours > 0
-        ? `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}`
-        : `${minutes.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}`;
+    return `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}`;
+}
+function formatPublishTime(value) {
+    if (!value)
+        return '';
+    const str = String(value).trim();
+    if (/^\d{10,}$/.test(str) && Number(str) > 1e12)
+        return '';
+    try {
+        const d = new Date(/^\d+$/.test(str) ? Number(str) * 1000 : str);
+        if (isNaN(d.getTime()))
+            return '';
+        const y = d.getFullYear();
+        const m = (d.getMonth() + 1).toString().padStart(2, '0');
+        const d_ = d.getDate().toString().padStart(2, '0');
+        const H = d.getHours().toString().padStart(2, '0');
+        const i = d.getMinutes().toString().padStart(2, '0');
+        const parts = [];
+        if (y > 2000)
+            parts.push(`${y}年`);
+        if (m)
+            parts.push(`${m}月`);
+        if (d_)
+            parts.push(`${d_}日`);
+        if (H && i)
+            parts.push(`${H}:${i}`);
+        return parts.join(' ').trim();
+    }
+    catch {
+        return '';
+    }
 }
 function getNestedValue(obj, path) {
     if (!obj || typeof obj !== 'object' || !path)
@@ -447,17 +460,6 @@ function parseData(rawResponse, maxDescLength) {
         if (varName === '图片数量' && value === undefined) {
             value = Array.isArray(data.images) ? data.images.length : (Array.isArray(rootData.images) ? rootData.images.length : undefined);
         }
-        if (varName === '分辨率' && value === undefined) {
-            const h = findValueInObject(data, ['height', 'item.height']) || findValueInObject(rootData, ['height', 'item.height']);
-            const w = findValueInObject(data, ['width', 'item.width']) || findValueInObject(rootData, ['width', 'item.width']);
-            if (h && w)
-                value = `${w}x${h}`;
-            else if (data.h_w && Array.isArray(data.h_w) && data.h_w.length)
-                value = data.h_w.join(', ');
-        }
-        if (varName === '视频链接' && value === undefined) {
-            value = data.url || data.video || data.download_url || rootData.url || rootData.video;
-        }
         if (value !== undefined && value !== null && value !== '') {
             stat[varName] = value;
         }
@@ -471,12 +473,13 @@ function parseData(rawResponse, maxDescLength) {
         type = 'cv';
     else if (rootData.msg === 'live')
         type = 'live';
-    else if (data.images && data.images.length > 0 && !data.url)
+    else if ((data.images && data.images.length > 1) || (rootData.images && rootData.images.length > 1))
         type = '图集';
-    const title = stat['标题'] || '无标题';
-    const author = stat['作者'] || '未知作者';
-    const desc = (stat['简介'] || title).slice(0, maxDescLength);
-    const cover = data.cover ?? data.imgurl ?? data.pic ?? data.thumbnail ?? data.cover_url ?? '';
+    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 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] : '');
     let images = [];
     const imgRaw = data.images ?? data.pics ?? data.pic_urls ?? data.image_list ?? [];
     if (Array.isArray(imgRaw))
@@ -487,8 +490,23 @@ function parseData(rawResponse, maxDescLength) {
     const durationValue = stat['视频时长'] || 0;
     const duration = typeof durationValue === 'number' ? durationValue : parseInt(durationValue) || 0;
     const durationFormatted = formatDuration(durationValue);
+    const pubTime = formatPublishTime(stat['发布时间']);
+    if (pubTime)
+        stat['发布时间'] = pubTime;
+    else
+        delete stat['发布时间'];
+    const durShow = durationFormatted === '00:00:00' && (String(durationValue).length > 12) ? '' : durationFormatted;
+    if (durShow)
+        stat['视频时长'] = durShow;
+    else
+        delete stat['视频时长'];
+    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 = data.live_photo ?? [];
-    const music = stat['音乐名'] || '';
     const h_w = data.item?.h_w ?? [];
     const quality_urls = data.quality_urls ?? {};
     const default_quality = data.default_quality ?? '';
@@ -510,7 +528,6 @@ function parseData(rawResponse, maxDescLength) {
         durationFormatted,
         stat,
         live_photo,
-        music: String(music),
         h_w,
         jx: data.jx ?? null,
         quality_urls,
@@ -534,8 +551,7 @@ function generateFormattedText(parseData, config) {
 收藏：${'${收藏数}'}
 转发：${'${转发数}'}
 播放：${'${播放数}'}
-评论：${'${评论数}'}
-音乐：${'${音乐名}'}`;
+评论：${'${评论数}'}`;
     }
     let result = format;
     const varMatches = result.match(/\$\{([^}]+)\}/g) || [];
@@ -711,7 +727,6 @@ function apply(ctx, config) {
                 video: parseData.video,
                 type: parseData.type,
                 live_photo: parseData.live_photo,
-                music: parseData.music,
                 h_w: parseData.h_w,
                 quality_urls: parseData.quality_urls,
                 default_quality: parseData.default_quality,
@@ -796,7 +811,7 @@ function apply(ctx, config) {
                                     forwardMessages.push(buildForwardNode(session, koishi_1.h.file(dl.filePath), botName));
                                 }
                                 else {
-                                    forwardMessages.push(buildForwardNode(session, koishi_1.h.text(`视频：${item.video}`), botName));
+                                    forwardMessages.push(buildForwardNode(session, koishi_1.h.video(item.video), botName));
                                 }
                             }
                             else {
@@ -804,7 +819,7 @@ function apply(ctx, config) {
                             }
                         }
                         catch (e) {
-                            forwardMessages.push(buildForwardNode(session, koishi_1.h.text(`视频：${item.video}`), botName));
+                            forwardMessages.push(buildForwardNode(session, koishi_1.h.video(item.video), botName));
                         }
                     }
                 }
@@ -828,7 +843,7 @@ function apply(ctx, config) {
                             await sendTimeout(session, koishi_1.h.video(item.video));
                         }
                         catch (e) {
-                            await sendTimeout(session, `视频：${item.video}`);
+                            await sendTimeout(session, koishi_1.h.video(item.video));
                         }
                         await delay(500);
                     }

package/package.json

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