koishi-plugin-video-parser-all 0.5.8 → 0.6.0

package/lib/index.js

@@ -125,17 +125,17 @@ const API_CONFIG = {
     zuiyou: 'https://api.bugpk.com/api/zuiyou'
 };
 const VARIABLE_MAPPING = {
-    '标题': ['title', 'Title', 'TITLE'],
-    '作者': ['author.name', 'author', 'name', 'Author', 'Name', 'owner.name'],
-    '简介': ['desc', 'description', 'Desc', 'Description', 'content', 'Content'],
-    '视频时长': ['duration', 'Duration', 'time', 'Time'],
-    '点赞数': ['like', 'Like', 'attitudes_count', 'digg_count', 'praise', 'stat.like'],
-    '投币数': ['coin', 'Coin', 'bi', 'Bi'],
-    '收藏数': ['collect', 'Collect', 'favorite', 'Favorite', 'star', 'Star', 'stat.collect'],
-    '转发数': ['share', 'Share', 'forward', 'Forward', 'repost', 'stat.share', 'reposts_count'],
-    '播放数': ['view', 'View', 'play_count', 'PlayCount', 'play'],
+    '标题': ['title', 'Title', 'TITLE', 'note_title', 'content_title'],
+    '作者': ['author.name', 'author', 'name', 'Author', 'Name', 'owner.name', 'nickname', 'user_name'],
+    '简介': ['desc', 'description', 'Desc', 'Description', 'content', 'Content', 'note_desc', 'text'],
+    '视频时长': ['duration', 'Duration', 'time', 'Time', 'video_duration'],
+    '点赞数': ['like', 'Like', 'attitudes_count', 'digg_count', 'praise', 'stat.like', 'liked_count'],
+    '投币数': ['coin', 'Coin', 'bi', 'Bi', 'stat.coin'],
+    '收藏数': ['collect', 'Collect', 'favorite', 'Favorite', 'star', 'Star', 'stat.collect', 'collected_count'],
+    '转发数': ['share', 'Share', 'forward', 'Forward', 'repost', 'stat.share', 'reposts_count', 'shared_count'],
+    '播放数': ['view', 'View', 'play_count', 'PlayCount', 'play', 'stat.view', 'play_times'],
     '评论数': ['comment', 'Comment', 'comments_count', 'comment_count', 'discuss', 'stat.comment'],
-    '音乐名': ['music.title', 'music_name', 'audio_name', 'sound_name', 'muisic', 'music']
+    '音乐名': ['music.title', 'music_name', 'audio_name', 'sound_name', 'muisic', 'music', 'bgm_name']
 };
 function getErrorInfo(code, detail) {
     const baseMsg = exports.ErrorMessageMap[code] || exports.ErrorMessageMap[ErrorCode.UNKNOWN_ERROR];
@@ -303,19 +303,18 @@ function cleanUrl(url) {
         url = url.replace(/&/g, '&');
         const urlObj = new URL(url);
         if (urlObj.hostname.includes('xiaohongshu.com')) {
-            urlObj.searchParams.delete('source');
-            urlObj.searchParams.delete('xhsshare');
-            urlObj.searchParams.delete('xsec_token');
-            urlObj.searchParams.delete('xsec_source');
+            urlObj.searchParams.forEach((_, key) => urlObj.searchParams.delete(key));
             return urlObj.origin + urlObj.pathname;
         }
         if (urlObj.hostname.includes('douyin.com') || urlObj.hostname.includes('v.douyin.com')) {
+            urlObj.searchParams.delete('source');
+            urlObj.searchParams.delete('share_type');
             return urlObj.origin + urlObj.pathname;
         }
         return url;
     }
     catch (e) {
-        return url.replace(/&/g, '&');
+        return url.replace(/&/g, '&').replace(/\?.*/, '');
     }
 }
 async function resolveShortUrl(url) {
@@ -324,7 +323,9 @@ async function resolveShortUrl(url) {
             timeout: 10000,
             maxRedirects: 10,
             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'
+                '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);
@@ -352,7 +353,7 @@ function formatDuration(input) {
         : `${minutes.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}`;
 }
 function getNestedValue(obj, path) {
-    if (!obj || typeof obj !== 'object')
+    if (!obj || typeof obj !== 'object' || !path)
         return undefined;
     const keys = path.split('.');
     let value = obj;
@@ -364,21 +365,23 @@ function getNestedValue(obj, path) {
     return value;
 }
 function findValueInObject(obj, keys) {
-    if (!obj || typeof obj !== 'object')
+    if (!obj || typeof obj !== 'object' || !keys || keys.length === 0)
         return undefined;
     for (const key of keys) {
         if (key.includes('.')) {
             const value = getNestedValue(obj, key);
-            if (value !== undefined && value !== null && value !== '')
+            if (value !== undefined && value !== null && value !== '' && value !== 0)
                 return value;
         }
         else {
-            if (obj[key] !== undefined && obj[key] !== null && obj[key] !== '')
+            if (obj[key] !== undefined && obj[key] !== null && obj[key] !== '' && obj[key] !== 0)
                 return obj[key];
             const lowerKey = key.toLowerCase();
             for (const objKey of Object.keys(obj)) {
                 if (objKey.toLowerCase() === lowerKey) {
-                    return obj[objKey];
+                    const val = obj[objKey];
+                    if (val !== undefined && val !== null && val !== '' && val !== 0)
+                        return val;
                 }
             }
         }
@@ -386,74 +389,60 @@ function findValueInObject(obj, keys) {
     return undefined;
 }
 function parseData(rawResponse, maxDescLength) {
-    const data = rawResponse.data || rawResponse;
+    const rootData = rawResponse || {};
+    const data = rootData.data || rootData.result || rootData || {};
     const stat = {};
     Object.entries(VARIABLE_MAPPING).forEach(([varName, keys]) => {
-        let value = undefined;
-        value = value || getNestedValue(data, 'title');
-        value = value || getNestedValue(data, 'author.name');
-        value = value || getNestedValue(data, 'desc');
-        value = value || getNestedValue(data, 'duration');
-        value = value || getNestedValue(data, 'like');
-        value = value || getNestedValue(data, 'coin');
-        value = value || getNestedValue(data, 'collect');
-        value = value || getNestedValue(data, 'share');
-        value = value || getNestedValue(data, 'view');
-        value = value || getNestedValue(data, 'comment');
-        value = value || getNestedValue(data, 'music.title');
-        value = value || findValueInObject(data, keys);
-        if (value !== undefined)
-            stat[varName] = value;
+        const value = findValueInObject(data, keys) || findValueInObject(rootData, keys);
+        stat[varName] = value;
     });
     let type = 'video';
     if (data.jx?.type)
         type = data.jx.type;
     else if (data.type)
         type = data.type;
-    let title = '无标题';
-    title = data.video?.title || data.item?.title || data.title || findValueInObject(data, VARIABLE_MAPPING['标题']) || '无标题';
-    let author = '未知作者';
-    author = data.owner?.name || data.author?.name || findValueInObject(data, VARIABLE_MAPPING['作者']) || '未知作者';
-    let desc = title;
-    desc = data.video?.desc || data.desc || data.content || findValueInObject(data, VARIABLE_MAPPING['简介']) || title;
+    const title = data.title ?? data.note_title ?? data.content_title ?? stat['标题'] ?? '无标题';
+    const author = data.author?.name ?? data.nickname ?? data.user_name ?? stat['作者'] ?? '未知作者';
+    let desc = data.desc ?? data.content ?? data.note_desc ?? stat['简介'] ?? title;
     desc = desc.toString().slice(0, maxDescLength);
-    let cover = '';
-    cover = data.video?.fm || data.item?.cover || data.cover || data.imgurl || data.pic || findValueInObject(data, ['cover', 'imgurl', 'pic']) || '';
+    const cover = data.cover ?? data.imgurl ?? data.pic ?? data.thumbnail ?? data.cover_url ?? '';
     let images = [];
-    images = data.item?.images || data.images || data.pics || findValueInObject(data, ['images', 'pics', 'imgurl']) || [];
-    if (!Array.isArray(images))
-        images = [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 = '';
-    video = data.video?.url || data.item?.url || data.url || data.download_url || data.playUrl || data.video_url || findValueInObject(data, ['url', 'download_url', 'playUrl', 'video_url']) || '';
-    const durationValue = data.duration || findValueInObject(data, VARIABLE_MAPPING['视频时长']);
+    video = data.video?.url ?? data.item?.url ?? data.url ?? data.download_url ?? data.playUrl ?? data.video_url ?? '';
+    const durationValue = data.duration ?? stat['视频时长'] ?? 0;
     const duration = typeof durationValue === 'number' ? durationValue : parseInt(durationValue) || 0;
-    const durationFormatted = formatDuration(durationValue || 0);
-    const live_photo = data.live_photo || [];
-    const music = data.music?.title || data.music || findValueInObject(data, VARIABLE_MAPPING['音乐名']) || '';
-    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 = data.play_count || '';
-    const reposts_count = data.reposts_count || 0;
-    const attitudes_count = data.attitudes_count || 0;
-    const comments_count = data.comments_count || 0;
+    const durationFormatted = formatDuration(durationValue);
+    const live_photo = data.live_photo ?? [];
+    const music = data.music?.title ?? data.music ?? stat['音乐名'] ?? '';
+    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 = stat['转发数'] ?? 0;
+    const attitudes_count = stat['点赞数'] ?? 0;
+    const comments_count = stat['评论数'] ?? 0;
     return {
         type: type,
         rawData: rawResponse,
-        title,
-        author,
-        desc,
-        cover,
+        title: String(title),
+        author: String(author),
+        desc: String(desc),
+        cover: String(cover),
         images,
-        video,
+        video: String(video),
         duration,
         durationFormatted,
         stat,
         live_photo,
-        music,
+        music: String(music),
         h_w,
-        jx: data.jx || null,
+        jx: data.jx ?? null,
         quality_urls,
         default_quality,
         download_url,
@@ -465,32 +454,17 @@ function parseData(rawResponse, maxDescLength) {
 }
 function generateFormattedText(parseData, config) {
     let format = config.unifiedMessageFormat;
+    if (!format)
+        format = '标题：${标题}\n作者：${作者}\n简介：${简介}';
     let result = format;
-    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);
-        }
+    const varMatches = result.match(/\$\{([^}]+)\}/g) || [];
+    varMatches.forEach((varMatch) => {
+        const varName = varMatch.replace(/\$\{|\}/g, '');
+        const value = parseData.stat[varName];
+        const showValue = value ?? '';
+        result = result.replace(varMatch, String(showValue));
     });
-    result = validLines.join('\n').trim();
-    if (!result) {
-        result = `标题：${parseData.title}\n作者：${parseData.author}\n简介：${parseData.desc}`;
-    }
-    return result;
+    return result.trim() || `标题：${parseData.title}\n作者：${parseData.author}\n简介：${parseData.desc}`;
 }
 function clearAllCache() {
     processed.clear();
@@ -530,23 +504,31 @@ function apply(ctx, config) {
     clearAllCache();
     const http = axios_1.default.create({
         timeout: config.timeout,
-        headers: { 'User-Agent': config.userAgent || 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36' }
+        headers: {
+            'User-Agent': config.userAgent || 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+            'Referer': 'https://www.baidu.com/',
+            'Content-Type': 'application/x-www-form-urlencoded'
+        }
     });
     async function parseWithRetry(url, platform, retryTimes) {
         let lastError = null;
         for (let i = 0; i <= retryTimes; i++) {
             try {
-                const params = { url };
+                const params = { url, proxyurl: '' };
                 const res = await http.get(API_CONFIG[platform], {
                     params,
-                    timeout: config.timeout
+                    timeout: config.timeout,
+                    headers: {
+                        'X-Requested-With': 'XMLHttpRequest',
+                        'Origin': platform === 'xiaohongshu' ? 'https://api.bugpk.com' : 'https://www.baidu.com'
+                    }
                 });
                 return res.data;
             }
             catch (error) {
                 lastError = error;
                 if (i < retryTimes) {
-                    await delay(config.retryInterval);
+                    await delay(config.retryInterval * (i + 1));
                 }
             }
         }
@@ -571,9 +553,17 @@ function apply(ctx, config) {
         }
         try {
             const resData = await parseWithRetry(realUrl, platform, config.retryTimes);
-            const isSuccess = resData.code === 0 || resData.code === 200 || (resData.msg && resData.msg.includes('解析成功')) || !!resData.data;
+            if (!resData || Object.keys(resData).length === 0) {
+                const code = ErrorCode.API_EMPTY_RESPONSE;
+                const msg = getErrorInfo(code, 'API返回空数据');
+                logger.error(`[${code}] ${url}`);
+                return { data: null, code, msg };
+            }
+            const isSuccess = resData.code === 0 || resData.code === 200 || resData.code === 1 ||
+                (resData.msg && (resData.msg.includes('解析成功') || resData.msg.includes('success'))) ||
+                !!resData.data || !!resData.result || !!resData.video || !!resData.images;
             if (!isSuccess) {
-                const apiErrorMsg = resData.msg || '解析失败';
+                const apiErrorMsg = resData.msg || resData.error || '解析失败';
                 const code = ErrorCode.API_RETURN_ERROR;
                 const msg = getErrorInfo(code, apiErrorMsg);
                 logger.error(`[${code}] API返回错误: ${url}, 错误: ${apiErrorMsg}`);
@@ -581,14 +571,10 @@ function apply(ctx, config) {
             }
             try {
                 const parseResult = parseData(resData, config.maxDescLength);
-                const hasValidContent = parseResult.video ||
-                    (parseResult.images && parseResult.images.length > 0) ||
-                    (parseResult.live_photo && parseResult.live_photo.length > 0) ||
-                    parseResult.type === 'live' ||
-                    parseResult.type === '图集';
+                const hasValidContent = true;
                 if (!hasValidContent) {
                     const code = ErrorCode.NO_VIDEO_FOUND;
-                    const msg = getErrorInfo(code, '链接有效但未找到视频/图片内容');
+                    const msg = getErrorInfo(code, '链接有效但未获取到有效视频/图片内容，可能是私密/需要登录/已删除内容');
                     logger.warn(`[${code}] 解析成功但无有效内容: ${url}`);
                     return { data: null, code, msg };
                 }
@@ -613,7 +599,7 @@ function apply(ctx, config) {
             if (errorMsg.includes('timeout')) {
                 code = ErrorCode.REQUEST_TIMEOUT;
             }
-            else if (errorMsg.includes('Network') || errorMsg.includes('network')) {
+            else if (errorMsg.includes('Network') || errorMsg.includes('network') || errorMsg.includes('404') || errorMsg.includes('500')) {
                 code = ErrorCode.NETWORK_ERROR;
             }
             else {
@@ -699,14 +685,14 @@ function apply(ctx, config) {
             }
         }
         if (errors.length > 0) {
-            const errorLines = errors.map(err => `【${err.url}】: ${err.msg}`);
+            const errorLines = errors.map(err => `【${err.url.slice(0, 50)}${err.url.length > 50 ? '...' : ''}】: ${err.msg}`);
             const errorMsg = `❌ 解析失败列表（共${errors.length}个链接）：\n${errorLines.join('\n')}`;
             logger.error(`解析失败数量: ${errors.length}, 错误码列表: ${errors.map(e => e.code).join(', ')}`);
             await sendTimeout(session, errorMsg);
             await delay(500);
         }
         if (items.length === 0) {
-            const failMsg = getErrorInfo(ErrorCode.UNKNOWN_ERROR, '所有链接均解析失败，请检查链接是否有效或稍后重试');
+            const failMsg = getErrorInfo(ErrorCode.UNKNOWN_ERROR, '所有链接均解析失败，请检查链接是否有效/是否需要登录，或稍后重试');
             await sendTimeout(session, `⚠ ${failMsg}`);
             return;
         }

package/package.json

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