koishi-plugin-video-parser-all 0.6.8 → 0.6.9

package/lib/index.js

@@ -15,12 +15,12 @@ const worker_threads_1 = require("worker_threads");
 exports.name = 'video-parser-all';
 exports.Config = koishi_1.Schema.intersect([
     koishi_1.Schema.object({
-        enable: koishi_1.Schema.boolean().default(true).description('是否启用视频解析插件'),
-        botName: koishi_1.Schema.string().default('视频解析机器人').description('机器人显示名称'),
-        showWaitingTip: koishi_1.Schema.boolean().default(true).description('解析时显示等待提示'),
-        waitingTipText: koishi_1.Schema.string().default('正在解析视频，请稍候...').description('等待提示文本内容'),
-        sameLinkInterval: koishi_1.Schema.number().min(0).default(180).description('相同链接重复解析间隔（秒）'),
-    }).description('基础设置'),
+        enable: koishi_1.Schema.boolean().default(true),
+        botName: koishi_1.Schema.string().default('视频解析机器人'),
+        showWaitingTip: koishi_1.Schema.boolean().default(true),
+        waitingTipText: koishi_1.Schema.string().default('正在解析视频，请稍候...'),
+        sameLinkInterval: koishi_1.Schema.number().min(0).default(180),
+    }),
     koishi_1.Schema.object({
         unifiedMessageFormat: koishi_1.Schema.string().role('textarea').default(`标题：${'${标题}'}
 作者：${'${作者}'}
@@ -42,38 +42,37 @@ IP属地：${'${IP属地}'}
 直播间ID：${'${直播间ID}'}
 直播间状态：${'${直播间状态}'}
 图片数量：${'${图片数量}'}
-作者ID：${'${作者ID}'}
-视频备用链接：${'${视频备用链接}'}`).description('统一消息格式'),
-    }).description('统一消息格式'),
+作者ID：${'${作者ID}'}`),
+    }),
     koishi_1.Schema.object({
-        showImageText: koishi_1.Schema.boolean().default(true).description('显示图文内容'),
-        showVideoFile: koishi_1.Schema.boolean().default(true).description('发送视频文件（关闭则只发链接）'),
-    }).description('内容显示设置'),
+        showImageText: koishi_1.Schema.boolean().default(true),
+        showVideoFile: koishi_1.Schema.boolean().default(true),
+    }),
     koishi_1.Schema.object({
-        maxDescLength: koishi_1.Schema.number().default(200).description('简介内容最大长度（字符）'),
-    }).description('内容长度限制'),
+        maxDescLength: koishi_1.Schema.number().default(200),
+    }),
     koishi_1.Schema.object({
-        timeout: koishi_1.Schema.number().min(0).default(180000).description('API请求超时时间（毫秒）'),
-        videoSendTimeout: koishi_1.Schema.number().min(0).default(0).description('视频发送超时时间（毫秒，0为不限制）'),
-        userAgent: koishi_1.Schema.string().default('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36').description('请求UA标识'),
-    }).description('网络与API设置'),
+        timeout: koishi_1.Schema.number().min(0).default(180000),
+        videoSendTimeout: koishi_1.Schema.number().min(0).default(0),
+        userAgent: koishi_1.Schema.string().default('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36'),
+    }),
     koishi_1.Schema.object({
-        ignoreSendError: koishi_1.Schema.boolean().default(true).description('忽略发送失败错误'),
-        retryTimes: koishi_1.Schema.number().min(0).default(3).description('API请求重试次数'),
-        retryInterval: koishi_1.Schema.number().min(0).default(1000).description('重试间隔时间（毫秒）'),
-    }).description('错误与重试设置'),
+        ignoreSendError: koishi_1.Schema.boolean().default(true),
+        retryTimes: koishi_1.Schema.number().min(0).default(3),
+        retryInterval: koishi_1.Schema.number().min(0).default(1000),
+    }),
     koishi_1.Schema.object({
-        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为不使用多线程）'),
-    }).description('发送方式设置'),
+        enableForward: koishi_1.Schema.boolean().default(false),
+        downloadVideoBeforeSend: koishi_1.Schema.boolean().default(false),
+        maxVideoSize: koishi_1.Schema.number().min(0).default(0),
+        downloadThreads: koishi_1.Schema.number().min(0).max(10).default(0),
+    }),
     koishi_1.Schema.object({
-        messageBufferDelay: koishi_1.Schema.number().min(0).default(0).description('消息缓冲延迟（毫秒）'),
-    }).description('消息处理设置'),
+        messageBufferDelay: koishi_1.Schema.number().min(0).default(0),
+    }),
     koishi_1.Schema.object({
-        autoClearCacheInterval: koishi_1.Schema.number().min(0).default(0).description('自动清理缓存间隔（分钟，0为关闭）'),
-    }).description('缓存清理设置'),
+        autoClearCacheInterval: koishi_1.Schema.number().min(0).default(0),
+    }),
 ]);
 var ErrorCode;
 (function (ErrorCode) {
@@ -166,8 +165,7 @@ const VARIABLE_MAPPING = {
     '直播间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', 'author.id', 'uid', 'short_id', 'data.author.id'],
-    '视频备用链接': ['data.video_backup', 'video_backup']
+    '作者ID': ['userId', 'userID', 'author_id', 'data.userId', 'item.userID', 'author.mid', 'user.mid', 'data.item.userID', 'data.author_id', 'data.user.mid', 'author.id', 'uid', 'short_id', 'data.author.id']
 };
 function getErrorInfo(code, detail) {
     const baseMsg = exports.ErrorMessageMap[code] || exports.ErrorMessageMap[ErrorCode.UNKNOWN_ERROR];
@@ -468,11 +466,24 @@ function parseData(rawResponse, maxDescLength) {
     Object.entries(VARIABLE_MAPPING).forEach(([varName, keys]) => {
         let value = findValueInObject(data, keys) || findValueInObject(root, keys);
         if (varName === '图片数量' && value === undefined) {
-            value = Array.isArray(data.images) ? data.images.length :
-                Array.isArray(root.images) ? root.images.length :
-                    Array.isArray(data.imgurl) ? data.imgurl.length :
-                        Array.isArray(root.imgurl) ? root.imgurl.length :
-                            data.count || root.count || undefined;
+            let imgCount = 0;
+            const imgSources = [
+                data.images, data.pics, data.pic_urls, data.image_list, data.imgurl,
+                root.images, root.pics, root.pic_urls, root.image_list, root.imgurl,
+                data.item?.images
+            ];
+            for (const source of imgSources) {
+                if (Array.isArray(source) && source.length > 0) {
+                    imgCount = source.filter(i => i && typeof i === 'string').length;
+                    break;
+                }
+            }
+            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;
+            }
+            value = imgCount;
         }
         if (value !== undefined && value !== null && value !== '' && value !== 0) {
             stat[varName] = value;
@@ -493,9 +504,13 @@ function parseData(rawResponse, maxDescLength) {
     const title = stat['标题'] || data.note_title || data.title || data.content_title || data.video?.title ||
         data.item?.title || root.title || data.live?.title || '无标题';
     let author = stat['作者'] || data.author?.name || data.nickname || data.user_name || data.owner?.name ||
-        data.item?.author || root.author || data.user?.name || data.live?.author || '未知作者';
-    if (typeof author === 'object' && author.name)
-        author = author.name;
+        data.item?.author || root.author || data.user?.name || data.live?.author || '';
+    if (typeof author === 'object') {
+        author = '';
+    }
+    else {
+        author = author || '未知作者';
+    }
     const rawDesc = stat['简介'] || data.note_desc || data.content || data.text || data.description ||
         data.video?.desc || data.item?.description || root.desc || root.description ||
         data.live?.desc || (title !== '无标题' ? title : '') || '暂无简介';
@@ -513,7 +528,7 @@ function parseData(rawResponse, maxDescLength) {
     ];
     for (const source of imgSources) {
         if (Array.isArray(source) && source.length > 0) {
-            images = source.filter(i => i && typeof i === 'string');
+            images = source.filter(i => i && typeof i === 'string' && i !== cover);
             break;
         }
     }
@@ -534,6 +549,9 @@ function parseData(rawResponse, maxDescLength) {
     else {
         delete stat['视频时长'];
     }
+    if (stat['图片数量'] === 0) {
+        delete stat['图片数量'];
+    }
     const sizeVal = stat['文件大小'];
     if (sizeVal && !String(sizeVal).includes('MB')) {
         const num = Number(sizeVal);
@@ -560,8 +578,6 @@ function parseData(rawResponse, maxDescLength) {
         stat['粉丝数'] = data.followers_count;
     if (data.ip_info_str)
         stat['IP属地'] = data.ip_info_str;
-    if (data.video_backup)
-        stat['视频备用链接'] = data.video_backup;
     return {
         type: type,
         rawData: rawResponse,
@@ -598,8 +614,7 @@ function generateFormattedText(parseData, config) {
 收藏：${'${收藏数}'}
 转发：${'${转发数}'}
 播放：${'${播放数}'}
-评论：${'${评论数}'}
-视频备用链接：${'${视频备用链接}'}`;
+评论：${'${评论数}'}`;
     }
     let result = format;
     const varMatches = result.match(/\$\{([^}]+)\}/g) || [];
@@ -856,12 +871,8 @@ function apply(ctx, config) {
                 if (enableForward) {
                     if (item.text)
                         forwardMessages.push(buildForwardNode(session, item.text, botName));
-                    if (item.cover)
+                    if (item.cover && item.type !== '图集') {
                         forwardMessages.push(buildForwardNode(session, koishi_1.h.image(item.cover), botName));
-                    if ((item.type === '图集' || item.type === 'image') && item.images?.length) {
-                        for (const img of item.images) {
-                            forwardMessages.push(buildForwardNode(session, koishi_1.h.image(img), botName));
-                        }
                     }
                     if (item.video && config.showVideoFile) {
                         try {
@@ -883,22 +894,22 @@ function apply(ctx, config) {
                             forwardMessages.push(buildForwardNode(session, koishi_1.h.video(item.video), botName));
                         }
                     }
+                    if ((item.type === '图集' || item.type === 'image') && item.images?.length) {
+                        forwardMessages.push(buildForwardNode(session, `📸 图集内容（共${item.images.length}张）`, botName));
+                        for (const img of item.images) {
+                            forwardMessages.push(buildForwardNode(session, koishi_1.h.image(img), botName));
+                        }
+                    }
                 }
                 else {
                     if (item.text) {
                         await sendTimeout(session, item.text);
                         await delay(300);
                     }
-                    if (item.cover) {
+                    if (item.cover && item.type !== '图集') {
                         await sendTimeout(session, koishi_1.h.image(item.cover));
                         await delay(300);
                     }
-                    if ((item.type === '图集' || item.type === 'image') && item.images?.length) {
-                        for (const img of item.images) {
-                            await sendTimeout(session, koishi_1.h.image(img));
-                            await delay(200);
-                        }
-                    }
                     if (item.video && config.showVideoFile) {
                         try {
                             await sendTimeout(session, koishi_1.h.video(item.video));
@@ -908,6 +919,14 @@ function apply(ctx, config) {
                         }
                         await delay(500);
                     }
+                    if ((item.type === '图集' || item.type === 'image') && item.images?.length) {
+                        await sendTimeout(session, `📸 图集内容（共${item.images.length}张）`);
+                        await delay(300);
+                        for (const img of item.images) {
+                            await sendTimeout(session, koishi_1.h.image(img));
+                            await delay(200);
+                        }
+                    }
                 }
             }
             catch (e) { }

package/package.json

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