koishi-plugin-video-parser-all 0.5.1 → 0.5.2

package/lib/index.js

@@ -22,7 +22,7 @@ exports.Config = koishi_1.Schema.intersect([
         sameLinkInterval: koishi_1.Schema.number().min(0).default(180).description('相同链接重复解析间隔（秒）'),
     }).description('基础设置'),
     koishi_1.Schema.object({
-        unifiedMessageFormat: koishi_1.Schema.string().role('textarea').default('标题：${标题}\n作者：${作者}\n简介：${简介}\n时长：${视频时长}\n点赞：${点赞数}\n投币：${投币数}\n收藏：${收藏数}\n转发：${转发数}\n播放：${播放数}').description('统一消息格式（B站会显示投币，其他平台自动隐藏；无法获取的变量会自动隐藏）'),
+        unifiedMessageFormat: koishi_1.Schema.string().role('textarea').default('标题：${标题}\n作者：${作者}\n简介：${简介}\n时长：${视频时长}\n点赞：${点赞数}\n投币：${投币数}\n收藏：${收藏数}\n转发：${转发数}\n播放：${播放数}\n评论：${评论数}\n音乐：${音乐名}').description('统一消息格式（B站会显示投币，其他平台自动隐藏；无法获取的变量会自动隐藏）'),
     }).description('统一消息格式'),
     koishi_1.Schema.object({
         showImageText: koishi_1.Schema.boolean().default(true).description('显示图文内容'),
@@ -59,7 +59,7 @@ const linkBuffer = new Map();
 const logger = new koishi_1.Logger(exports.name);
 const PLATFORM_KEYWORDS = {
     bilibili: ['bilibili', 'b23', 'B站', 'www.bilibili.com', 'm.bilibili.com', '哔哩哔哩', 'bilibili.com/opus', 'bilibili.com/video', 'b23.tv', 't.bilibili.com', 'bilibili.com/bangumi'],
-    kuaishou: ['kuaishou', '快手', 'v.kuaishou.com', 'www.kuaishou.com', 'kwimgs.com', 'kuaishou.com/app', 'kuaishou.com/short-video'],
+    kuaishou: ['kuaishou', '快手', 'v.kuaishou.com', 'www.kuaishou.com', 'kwimgs.com', 'kuaishou.com/app'],
     xiaohongshu: ['xiaohongshu', '小红书', 'xhslink.com', 'xiaohongshu.com', 'xhscdn.com', 'xiaohongshu.com/explore', 'xhslink.com/'],
     weibo: ['weibo', '微博', 'weibo.com', 'video.weibo.com', 'm.weibo.cn', 'weibo.com/tv/show', 'weibo.com/feed'],
     toutiao: ['toutiao', '今日头条', 'm.toutiao.com', 'toutiao.com', 'ixigua.com', 'toutiao.com/video', 'ixigua.com/i'],
@@ -69,15 +69,28 @@ const PLATFORM_KEYWORDS = {
     zuiyou: ['zuiyou', '最右', 'xiaochuankeji.cn', 'izuiyou.com', 'izuiyou.com/topic']
 };
 const API_CONFIG = {
-    bilibili: 'https://api.xingzhige.com/API/b_parse/',
-    douyin: 'https://api.bugpk.com/api/short_videos',
-    kuaishou: 'https://api.bugpk.com/api/short_videos',
-    xiaohongshu: 'https://api.bugpk.com/api/short_videos',
+    bilibili: 'https://api.bugpk.com/api/bilibili',
+    douyin: 'https://api.bugpk.com/api/dyjx',
+    kuaishou: 'https://api.bugpk.com/api/ksjx',
+    xiaohongshu: 'https://api.bugpk.com/api/xhsjx',
     weibo: 'https://api.bugpk.com/api/weibo',
-    zuiyou: 'https://api.bugpk.com/api/short_videos',
-    pipixia: 'https://api.bugpk.com/api/short_videos',
-    pipigx: 'https://api.bugpk.com/api/short_videos',
-    toutiao: 'https://api.bugpk.com/api/toutiao'
+    toutiao: 'https://api.bugpk.com/api/toutiao',
+    pipigx: 'https://api.bugpk.com/api/pipigx',
+    pipixia: 'https://api.bugpk.com/api/ppx',
+    zuiyou: 'https://api.bugpk.com/api/zuiyou'
+};
+const VARIABLE_MAPPING = {
+    '标题': ['title', 'Title', 'TITLE'],
+    '作者': ['author', 'name', 'Author', 'Name'],
+    '简介': ['desc', 'description', 'Desc', 'Description', 'content', 'Content'],
+    '视频时长': ['duration', 'Duration', 'time', 'Time'],
+    '点赞数': ['like', 'Like', 'attitudes_count', 'digg_count', 'praise'],
+    '投币数': ['coin', 'Coin', 'bi', 'Bi'],
+    '收藏数': ['collect', 'Collect', 'favorite', 'Favorite', 'star', 'Star'],
+    '转发数': ['share', 'Share', 'forward', 'Forward', 'repost'],
+    '播放数': ['view', 'View', 'play_count', 'PlayCount', 'play'],
+    '评论数': ['comment', 'Comment', 'comments_count', 'comment_count', 'discuss'],
+    '音乐名': ['music.title', 'music_name', 'audio_name', 'sound_name']
 };
 function getErrorMessage(error) {
     if (error instanceof Error)
@@ -203,43 +216,6 @@ async function downloadVideo(url, filename, userAgent, maxSize, threads) {
         throw error;
     }
 }
-function parseXingzhigeData(resData, platform) {
-    const result = {
-        title: '',
-        author: '未知作者',
-        desc: '',
-        cover: '',
-        video: '',
-        images: [],
-        stat: {
-            like: 0,
-            coin: 0,
-            favorite: 0,
-            share: 0,
-            view: 0,
-            duration: '00:00'
-        },
-        type: 'video'
-    };
-    if (platform === 'bilibili') {
-        const d = resData.data || resData;
-        result.title = d.video?.title || d.title || '';
-        result.author = d.owner?.name || d.name || '未知UP主';
-        result.desc = d.video?.desc || d.desc || '';
-        result.cover = d.video?.fm || d.fm || '';
-        result.video = d.video?.url || d.url || '';
-        result.stat = {
-            view: d.stat?.view || 0,
-            favorite: d.stat?.favorite || 0,
-            like: d.stat?.like || 0,
-            coin: d.stat?.coin || 0,
-            share: d.stat?.share || 0,
-            duration: formatDuration(d.duration || 0)
-        };
-        result.duration = d.duration || 0;
-    }
-    return result;
-}
 function extractUrl(content) {
     let urlMatches = content.match(/https?:\/\/[^\s\"\'\>]+/gi) || [];
     return urlMatches.filter(url => {
@@ -288,8 +264,16 @@ async function resolveShortUrl(url) {
         return url;
     }
 }
-function formatDuration(seconds) {
-    if (!seconds)
+function formatDuration(input) {
+    if (!input || input === 0 || input === '0' || input === '00:00')
+        return '00:00';
+    if (typeof input === 'string') {
+        if (input.includes(':'))
+            return input;
+        input = Number(input);
+    }
+    const seconds = Math.floor(Number(input));
+    if (isNaN(seconds) || seconds <= 0)
         return '00:00';
     const hours = Math.floor(seconds / 3600);
     const minutes = Math.floor((seconds % 3600) / 60);
@@ -298,39 +282,87 @@ function formatDuration(seconds) {
         ? `${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')}`;
 }
-function parseData(data, maxDescLength, platform) {
-    let type = data.type || 'video';
-    let title = data.title || data.desc || '无标题';
-    let author = data.author || data.name || '未知作者';
-    let desc = (data.desc || data.description || title).slice(0, maxDescLength);
-    let cover = data.cover || data.imgurl || data.pic || data.fm || '';
-    let images = data.images || [];
-    let video = data.video || data.url || data.playUrl || '';
-    let duration = data.duration || 0;
-    let stat = data.stat || {
-        like: 0,
-        coin: 0,
-        favorite: 0,
-        share: 0,
-        view: 0,
-        duration: '00:00'
-    };
-    const durationFormatted = formatDuration(duration);
-    if (platform === 'bilibili' && data.data) {
-        title = data.data.title || title;
-        author = data.data.owner?.name || '未知作者';
-        desc = (data.data.desc || title).slice(0, maxDescLength);
-        cover = data.data.pic || cover;
-        duration = data.data.duration || 0;
-        video = data.playUrl || video;
-        stat = data.data.stat || stat;
+function getNestedValue(obj, path) {
+    if (!obj || typeof obj !== 'object')
+        return undefined;
+    const keys = path.split('.');
+    let value = obj;
+    for (const key of keys) {
+        if (value === null || value === undefined)
+            return undefined;
+        value = value[key];
+    }
+    return value;
+}
+function findValueInObject(obj, keys) {
+    if (!obj || typeof obj !== 'object')
+        return undefined;
+    for (const key of keys) {
+        if (key.includes('.')) {
+            const value = getNestedValue(obj, key);
+            if (value !== undefined && value !== null && value !== '')
+                return value;
+        }
+        else {
+            if (obj[key] !== undefined && obj[key] !== null && obj[key] !== '')
+                return obj[key];
+            const lowerKey = key.toLowerCase();
+            for (const objKey of Object.keys(obj)) {
+                if (objKey.toLowerCase() === lowerKey) {
+                    return obj[objKey];
+                }
+            }
+        }
+    }
+    return undefined;
+}
+function parseData(rawResponse, maxDescLength, platform) {
+    let data = rawResponse;
+    if (data.data) {
+        data = data.data;
     }
-    if (images.length > 0 && !video)
+    const stat = {};
+    Object.entries(VARIABLE_MAPPING).forEach(([varName, keys]) => {
+        const value = findValueInObject(data, keys);
+        if (value !== undefined) {
+            stat[varName] = value;
+        }
+    });
+    let type = 'video';
+    const title = findValueInObject(data, ['title']) || '无标题';
+    const author = findValueInObject(data, ['author', 'name']) || '未知作者';
+    const desc = (findValueInObject(data, ['desc', 'description', 'content']) || title).toString().slice(0, maxDescLength);
+    const cover = findValueInObject(data, ['cover', 'imgurl', 'pic', 'thumbnail']) || '';
+    let images = findValueInObject(data, ['imgurl', 'images', 'pics']) || [];
+    if (!Array.isArray(images))
+        images = [images];
+    const videoUrls = [
+        findValueInObject(data, ['url']),
+        findValueInObject(data, ['download_url']),
+        findValueInObject(data, ['video_backup']),
+        findValueInObject(data, ['playUrl']),
+        findValueInObject(data, ['video_url'])
+    ];
+    let video = '';
+    for (const url of videoUrls) {
+        if (url && typeof url === 'string' && url.trim() !== '') {
+            video = url;
+            break;
+        }
+    }
+    const durationValue = findValueInObject(data, ['duration']);
+    const duration = typeof durationValue === 'number' ? durationValue : parseInt(durationValue) || 0;
+    const durationFormatted = formatDuration(durationValue || 0);
+    const dataType = findValueInObject(data, ['type']);
+    if (dataType === 'image' || (images.length > 0 && !video)) {
         type = 'image';
-    if (video && (video.endsWith('.m4a') || video.endsWith('.mp3')))
+    }
+    if (video && (video.endsWith('.m4a') || video.endsWith('.mp3'))) {
         video = '';
+    }
     return {
         type,
+        rawData: rawResponse,
         title,
         author,
         desc,
@@ -339,14 +371,7 @@ function parseData(data, maxDescLength, platform) {
         video,
         duration,
         durationFormatted,
-        stat: {
-            like: stat.like || 0,
-            coin: stat.coin || 0,
-            favorite: stat.favorite || 0,
-            share: stat.share || 0,
-            view: stat.view || 0,
-            duration: durationFormatted
-        }
+        stat
     };
 }
 function generateFormattedText(platform, parseData, config) {
@@ -354,28 +379,28 @@ function generateFormattedText(platform, parseData, config) {
     if (platform !== 'bilibili') {
         format = format.replace(/投币：\$\{投币数\}\n?/g, '');
     }
-    const variables = {
-        '标题': parseData.title || '',
-        '作者': parseData.author || '',
-        '简介': parseData.desc || '',
-        '视频时长': parseData.stat.duration || '',
-        '点赞数': parseData.stat.like > 0 ? parseData.stat.like : '',
-        '投币数': parseData.stat.coin > 0 ? parseData.stat.coin : '',
-        '收藏数': parseData.stat.favorite > 0 ? parseData.stat.favorite : '',
-        '转发数': parseData.stat.share > 0 ? parseData.stat.share : '',
-        '播放数': parseData.stat.view > 0 ? parseData.stat.view : ''
-    };
     let result = format;
-    Object.entries(variables).forEach(([key, value]) => {
-        const regex = new RegExp(`${key}：\\$\\{${key}\\\}([\\n]?)`, 'g');
-        if (!value) {
-            result = result.replace(regex, '');
-        }
-        else {
-            result = result.replace(`$\{${key}\}`, value);
+    const formatLines = result.split('\n');
+    const validLines = [];
+    formatLines.forEach((line) => {
+        let isValid = true;
+        let processedLine = line;
+        const varMatches = line.match(/\$\{([^}]+)\}/g) || [];
+        varMatches.forEach((varMatch) => {
+            const varName = varMatch.replace(/\$\{|\}/g, '');
+            const value = parseData.stat[varName];
+            if (value === undefined || value === null || value === '' || value === 0 || value === '00:00') {
+                isValid = false;
+            }
+            else {
+                processedLine = processedLine.replace(varMatch, String(value));
+            }
+        });
+        if (isValid && processedLine.trim() !== '') {
+            validLines.push(processedLine);
         }
     });
-    result = result.replace(/\n+/g, '\n').trim();
+    result = validLines.join('\n').trim();
     return result;
 }
 function clearAllCache() {
@@ -431,24 +456,16 @@ function apply(ctx, config) {
             return { data: null, msg: '该平台暂未配置解析接口' };
         }
         try {
-            const res = await http.get(apiUrl, { params: { url: realUrl } });
-            let parseResult = null;
-            if (platform === 'bilibili') {
-                const xgData = parseXingzhigeData(res.data, platform);
-                parseResult = parseData(xgData, config.maxDescLength, platform);
-            }
-            else {
-                if ((res.data.code === 200 || res.data.code === 0) && res.data.data) {
-                    parseResult = parseData(res.data.data, config.maxDescLength, platform);
-                }
-            }
-            if (parseResult) {
-                return { data: parseResult, msg: `${platform}解析成功` };
-            }
-            else {
-                logger.error(`解析返回数据无效: ${platform}, URL: ${url}`);
-                return { data: null, msg: '解析失败，返回数据无效' };
+            const res = await http.get(apiUrl, {
+                params: { url: realUrl },
+                timeout: config.timeout
+            });
+            if (res.data.code !== 200 && res.data.code !== 0) {
+                logger.error(`API返回错误: ${platform}, URL: ${url}, 错误: ${res.data.msg || '未知错误'}`);
+                return { data: null, msg: res.data.msg || '解析失败' };
             }
+            const parseResult = parseData(res.data, config.maxDescLength, platform);
+            return { data: parseResult, msg: `${platform}解析成功` };
         }
         catch (error) {
             logger.error(`解析请求失败: ${platform}, URL: ${url}, 错误: ${getErrorMessage(error)}`);

package/package.json

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