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

package/lib/index.js

@@ -394,73 +394,55 @@ function parseData(rawResponse, maxDescLength) {
     const stat = {};
     Object.entries(VARIABLE_MAPPING).forEach(([varName, keys]) => {
         const value = findValueInObject(data, keys) || findValueInObject(rootData, keys);
-        if (value !== undefined)
-            stat[varName] = value;
+        stat[varName] = value;
     });
     let type = 'video';
     if (data.jx?.type)
         type = data.jx.type;
     else if (data.type)
         type = data.type;
-    else if (data.images && data.images.length > 0)
-        type = 'image';
-    else if (data.pics && data.pics.length > 0)
-        type = '图集';
-    const title = findValueInObject(data, VARIABLE_MAPPING['标题']) || findValueInObject(rootData, VARIABLE_MAPPING['标题']) || '无标题';
-    const author = findValueInObject(data, VARIABLE_MAPPING['作者']) || findValueInObject(rootData, VARIABLE_MAPPING['作者']) || '未知作者';
-    let desc = findValueInObject(data, VARIABLE_MAPPING['简介']) || findValueInObject(rootData, 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);
-    const cover = findValueInObject(data, ['cover', 'imgurl', 'pic', 'thumbnail', 'cover_url']) || findValueInObject(rootData, ['cover', 'imgurl', 'pic', 'thumbnail', 'cover_url']) || '';
+    const cover = data.cover ?? data.imgurl ?? data.pic ?? data.thumbnail ?? data.cover_url ?? '';
     let images = [];
-    const imgList = findValueInObject(data, ['images', 'pics', 'pic_urls', 'image_list']) || findValueInObject(rootData, ['images', 'pics', 'pic_urls', 'image_list']) || [];
-    if (Array.isArray(imgList))
-        images = imgList.filter(img => img && typeof img === 'string');
-    else if (imgList && typeof imgList === 'string')
-        images = [imgList];
+    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 = '';
-    const videoUrls = [
-        findValueInObject(data, ['url', 'video_url', 'download_url', 'playUrl', 'mp4_url']),
-        findValueInObject(rootData, ['url', 'video_url', 'download_url', 'playUrl', 'mp4_url']),
-        data.video?.url,
-        data.item?.url,
-        rootData.video?.url,
-        rootData.item?.url
-    ];
-    for (const url of videoUrls) {
-        if (url && typeof url === 'string' && url.startsWith('http')) {
-            video = url;
-            break;
-        }
-    }
-    const durationValue = findValueInObject(data, VARIABLE_MAPPING['视频时长']) || findValueInObject(rootData, 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 || rootData.live_photo || [];
-    const music = findValueInObject(data, VARIABLE_MAPPING['音乐名']) || findValueInObject(rootData, VARIABLE_MAPPING['音乐名']) || '';
-    const h_w = data.item?.h_w || rootData.item?.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 || rootData.download_url || video;
-    const play_count = stat['播放数'] || '';
-    const reposts_count = stat['转发数'] || 0;
-    const attitudes_count = stat['点赞数'] || 0;
-    const comments_count = stat['评论数'] || 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 || rootData.jx || null,
+        jx: data.jx ?? null,
         quality_urls,
         default_quality,
         download_url,
@@ -474,37 +456,15 @@ function generateFormattedText(parseData, config) {
     let format = config.unifiedMessageFormat;
     if (!format)
         format = '标题：${标题}\n作者：${作者}\n简介：${简介}';
-    const formatLines = format.split('\n');
-    const validLines = [];
-    formatLines.forEach((line) => {
-        if (!line.trim())
-            return;
-        let isValid = true;
-        let processedLine = line;
-        const varMatches = line.match(/\$\{([^}]+)\}/g) || [];
-        if (varMatches.length === 0) {
-            validLines.push(line);
-            return;
-        }
-        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);
-        }
+    let result = format;
+    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));
     });
-    let 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();
@@ -611,11 +571,7 @@ 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, '链接有效但未获取到有效视频/图片内容，可能是私密/需要登录/已删除内容');

package/package.json

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