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

package/lib/index.d.ts

@@ -81,12 +81,7 @@ export declare enum ErrorCode {
     NO_IMAGE_FOUND = 3004,
     MESSAGE_SEND_FAILED = 4000,
     MESSAGE_SEND_TIMEOUT = 4001,
-    FORWARD_MESSAGE_FAILED = 4002,
-    DOUYIN_PARSE_FAILED = 5001,
-    XIAOHONGSHU_PARSE_FAILED = 5002,
-    BILIBILI_PARSE_FAILED = 5003,
-    KUAISHOU_PARSE_FAILED = 5004,
-    WEIBO_PARSE_FAILED = 5005
+    FORWARD_MESSAGE_FAILED = 4002
 }
 export declare const ErrorMessageMap: Record<ErrorCode, string>;
 export declare function apply(ctx: Context, config: any): void;

package/lib/index.js

@@ -76,11 +76,6 @@ var ErrorCode;
     ErrorCode[ErrorCode["MESSAGE_SEND_FAILED"] = 4000] = "MESSAGE_SEND_FAILED";
     ErrorCode[ErrorCode["MESSAGE_SEND_TIMEOUT"] = 4001] = "MESSAGE_SEND_TIMEOUT";
     ErrorCode[ErrorCode["FORWARD_MESSAGE_FAILED"] = 4002] = "FORWARD_MESSAGE_FAILED";
-    ErrorCode[ErrorCode["DOUYIN_PARSE_FAILED"] = 5001] = "DOUYIN_PARSE_FAILED";
-    ErrorCode[ErrorCode["XIAOHONGSHU_PARSE_FAILED"] = 5002] = "XIAOHONGSHU_PARSE_FAILED";
-    ErrorCode[ErrorCode["BILIBILI_PARSE_FAILED"] = 5003] = "BILIBILI_PARSE_FAILED";
-    ErrorCode[ErrorCode["KUAISHOU_PARSE_FAILED"] = 5004] = "KUAISHOU_PARSE_FAILED";
-    ErrorCode[ErrorCode["WEIBO_PARSE_FAILED"] = 5005] = "WEIBO_PARSE_FAILED";
 })(ErrorCode || (exports.ErrorCode = ErrorCode = {}));
 exports.ErrorMessageMap = {
     [ErrorCode.SUCCESS]: '操作成功',
@@ -103,11 +98,6 @@ exports.ErrorMessageMap = {
     [ErrorCode.MESSAGE_SEND_FAILED]: '消息发送失败',
     [ErrorCode.MESSAGE_SEND_TIMEOUT]: '消息发送超时',
     [ErrorCode.FORWARD_MESSAGE_FAILED]: '合并转发失败',
-    [ErrorCode.DOUYIN_PARSE_FAILED]: '抖音链接解析失败',
-    [ErrorCode.XIAOHONGSHU_PARSE_FAILED]: '小红书链接解析失败',
-    [ErrorCode.BILIBILI_PARSE_FAILED]: 'B站链接解析失败',
-    [ErrorCode.KUAISHOU_PARSE_FAILED]: '快手链接解析失败',
-    [ErrorCode.WEIBO_PARSE_FAILED]: '微博链接解析失败',
 };
 const processed = new Map();
 const linkBuffer = new Map();
@@ -134,17 +124,6 @@ const API_CONFIG = {
     pipixia: 'https://api.bugpk.com/api/ppx',
     zuiyou: 'https://api.bugpk.com/api/zuiyou'
 };
-const PLATFORM_ERROR_CODE_MAP = {
-    douyin: ErrorCode.DOUYIN_PARSE_FAILED,
-    xiaohongshu: ErrorCode.XIAOHONGSHU_PARSE_FAILED,
-    bilibili: ErrorCode.BILIBILI_PARSE_FAILED,
-    kuaishou: ErrorCode.KUAISHOU_PARSE_FAILED,
-    weibo: ErrorCode.WEIBO_PARSE_FAILED,
-    toutiao: ErrorCode.API_RETURN_ERROR,
-    pipigx: ErrorCode.API_RETURN_ERROR,
-    pipixia: ErrorCode.API_RETURN_ERROR,
-    zuiyou: ErrorCode.API_RETURN_ERROR
-};
 const VARIABLE_MAPPING = {
     '标题': ['title', 'Title', 'TITLE'],
     '作者': ['author.name', 'author', 'name', 'Author', 'Name', 'owner.name'],
@@ -406,117 +385,55 @@ function findValueInObject(obj, keys) {
     }
     return undefined;
 }
-function parseData(rawResponse, maxDescLength, platform) {
-    let data = rawResponse;
-    if (platform === 'bilibili' && rawResponse.data) {
-        data = rawResponse.data;
-    }
-    else if (platform === 'douyin' && rawResponse.data) {
-        data = rawResponse.data;
-    }
-    else if (data.data) {
-        data = data.data;
-    }
+function parseData(rawResponse, maxDescLength) {
+    const data = rawResponse.data || rawResponse;
     const stat = {};
     Object.entries(VARIABLE_MAPPING).forEach(([varName, keys]) => {
-        const value = findValueInObject(data, keys);
-        if (value !== undefined) {
+        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;
-        }
     });
     let type = 'video';
-    if (platform === 'douyin' && data.jx && data.jx.type) {
+    if (data.jx?.type)
         type = data.jx.type;
-    }
-    else if (data.type) {
+    else if (data.type)
         type = data.type;
-    }
     let title = '无标题';
-    if (platform === 'bilibili' && data.video && data.video.title) {
-        title = data.video.title;
-    }
-    else if (platform === 'douyin' && data.item && data.item.title) {
-        title = data.item.title;
-    }
-    else {
-        title = findValueInObject(data, ['title']) || '无标题';
-    }
+    title = data.video?.title || data.item?.title || data.title || findValueInObject(data, VARIABLE_MAPPING['标题']) || '无标题';
     let author = '未知作者';
-    if (platform === 'bilibili' && data.owner && data.owner.name) {
-        author = data.owner.name;
-    }
-    else if (platform === 'douyin' && data.author && data.author.name) {
-        author = data.author.name;
-    }
-    else {
-        author = findValueInObject(data, ['author.name', 'author', 'name', 'auther']) || '未知作者';
-    }
+    author = data.owner?.name || data.author?.name || findValueInObject(data, VARIABLE_MAPPING['作者']) || '未知作者';
     let desc = title;
-    if (platform === 'bilibili' && data.video && data.video.desc) {
-        desc = data.video.desc;
-    }
-    else if (platform === 'douyin') {
-        desc = title;
-    }
-    else {
-        desc = findValueInObject(data, ['desc', 'description', 'content']) || title;
-    }
+    desc = data.video?.desc || data.desc || data.content || findValueInObject(data, VARIABLE_MAPPING['简介']) || title;
     desc = desc.toString().slice(0, maxDescLength);
     let cover = '';
-    if (platform === 'bilibili' && data.video && data.video.fm) {
-        cover = data.video.fm;
-    }
-    else if (platform === 'douyin' && data.item && data.item.cover) {
-        cover = data.item.cover;
-    }
-    else {
-        cover = findValueInObject(data, ['cover', 'imgurl', 'pic', 'thumbnail']) || '';
-    }
+    cover = data.video?.fm || data.item?.cover || data.cover || data.imgurl || data.pic || findValueInObject(data, ['cover', 'imgurl', 'pic']) || '';
     let images = [];
-    if (platform === 'douyin' && data.item && data.item.images) {
-        images = data.item.images;
-    }
-    else {
-        images = findValueInObject(data, ['imgurl', 'images', 'pics']) || [];
-    }
+    images = data.item?.images || data.images || data.pics || findValueInObject(data, ['images', 'pics', 'imgurl']) || [];
     if (!Array.isArray(images))
         images = [images];
     let video = '';
-    if (platform === 'bilibili' && data.video && data.video.url) {
-        video = data.video.url;
-    }
-    else if (platform === 'douyin' && data.item && data.item.url) {
-        video = data.item.url;
-    }
-    else {
-        const videoUrls = [
-            findValueInObject(data, ['url']),
-            findValueInObject(data, ['download_url']),
-            findValueInObject(data, ['video_backup']),
-            findValueInObject(data, ['playUrl']),
-            findValueInObject(data, ['video_url'])
-        ];
-        if (Array.isArray(videoUrls[2])) {
-            video = videoUrls[2][0]?.url || '';
-        }
-        else {
-            for (const url of videoUrls) {
-                if (url && typeof url === 'string' && url.trim() !== '') {
-                    video = url;
-                    break;
-                }
-            }
-        }
-    }
-    const durationValue = findValueInObject(data, ['duration']);
+    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['视频时长']);
     const duration = typeof durationValue === 'number' ? durationValue : parseInt(durationValue) || 0;
     const durationFormatted = formatDuration(durationValue || 0);
     const live_photo = data.live_photo || [];
-    const music = findValueInObject(data, ['music', 'muisic']) || '';
-    const h_w = platform === 'douyin' && data.item && data.item.h_w ? data.item.h_w : [];
+    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 || '';
+    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;
@@ -546,11 +463,8 @@ function parseData(rawResponse, maxDescLength, platform) {
         comments_count
     };
 }
-function generateFormattedText(platform, parseData, config) {
+function generateFormattedText(parseData, config) {
     let format = config.unifiedMessageFormat;
-    if (platform !== 'bilibili') {
-        format = format.replace(/投币：\$\{投币数\}\n?/g, '');
-    }
     let result = format;
     const formatLines = result.split('\n');
     const validLines = [];
@@ -616,7 +530,7 @@ 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/120.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' }
     });
     async function parseWithRetry(url, platform, retryTimes) {
         let lastError = null;
@@ -657,28 +571,16 @@ function apply(ctx, config) {
         }
         try {
             const resData = await parseWithRetry(realUrl, platform, config.retryTimes);
-            let isSuccess = false;
-            if (platform === 'bilibili' || platform === 'douyin') {
-                isSuccess = resData.code === 0 || (resData.msg && (resData.msg.includes('解析成功') || resData.msg === 'video'));
-            }
-            else {
-                isSuccess = resData.code === 200 || resData.code === 0 ||
-                    (resData.msg && resData.msg.includes('解析成功'));
-            }
+            const isSuccess = resData.code === 0 || resData.code === 200 || (resData.msg && resData.msg.includes('解析成功')) || !!resData.data;
             if (!isSuccess) {
                 const apiErrorMsg = resData.msg || '解析失败';
-                const platformCode = PLATFORM_ERROR_CODE_MAP[platform] || ErrorCode.API_RETURN_ERROR;
-                let detailedMsg = apiErrorMsg;
-                if (apiErrorMsg.includes('无法识别解析类型') || apiErrorMsg.includes('未找到有效内容')) {
-                    detailedMsg = `链接格式不支持或内容已失效：${apiErrorMsg}`;
-                }
-                const code = platformCode;
-                const msg = getErrorInfo(code, detailedMsg);
-                logger.error(`[${code}] API返回错误: ${platform}, URL: ${url}, 错误: ${apiErrorMsg}`);
+                const code = ErrorCode.API_RETURN_ERROR;
+                const msg = getErrorInfo(code, apiErrorMsg);
+                logger.error(`[${code}] API返回错误: ${url}, 错误: ${apiErrorMsg}`);
                 return { data: null, code, msg };
             }
             try {
-                const parseResult = parseData(resData, config.maxDescLength, platform);
+                const parseResult = parseData(resData, config.maxDescLength);
                 const hasValidContent = parseResult.video ||
                     (parseResult.images && parseResult.images.length > 0) ||
                     (parseResult.live_photo && parseResult.live_photo.length > 0) ||
@@ -686,11 +588,11 @@ function apply(ctx, config) {
                     parseResult.type === '图集';
                 if (!hasValidContent) {
                     const code = ErrorCode.NO_VIDEO_FOUND;
-                    const msg = getErrorInfo(code, '链接有效但未找到视频/图片内容（可能是直播、私密内容或已删除）');
-                    logger.warn(`[${code}] 解析成功但无有效内容: ${platform}, URL: ${url}`);
+                    const msg = getErrorInfo(code, '链接有效但未找到视频/图片内容');
+                    logger.warn(`[${code}] 解析成功但无有效内容: ${url}`);
                     return { data: null, code, msg };
                 }
-                logger.info(`[${ErrorCode.SUCCESS}] ${platform}解析成功: ${url}`);
+                logger.info(`[${ErrorCode.SUCCESS}] 解析成功: ${url}`);
                 return {
                     data: parseResult,
                     code: ErrorCode.SUCCESS,
@@ -701,7 +603,7 @@ function apply(ctx, config) {
                 const errorMsg = getErrorMessage(parseError);
                 const code = ErrorCode.API_DATA_PARSE_FAILED;
                 const msg = getErrorInfo(code, errorMsg);
-                logger.error(`[${code}] 解析数据失败: ${platform}, URL: ${url}, 错误: ${errorMsg}`);
+                logger.error(`[${code}] 解析数据失败: ${url}, 错误: ${errorMsg}`);
                 return { data: null, code, msg };
             }
         }
@@ -718,7 +620,7 @@ function apply(ctx, config) {
                 code = ErrorCode.NETWORK_ERROR;
             }
             const msg = getErrorInfo(code, errorMsg);
-            logger.error(`[${code}] 解析请求失败: ${platform}, URL: ${url}, 错误: ${errorMsg}`);
+            logger.error(`[${code}] 解析请求失败: ${url}, 错误: ${errorMsg}`);
             return { data: null, code, msg };
         }
     }
@@ -735,8 +637,7 @@ function apply(ctx, config) {
         if (!result.data)
             return { data: null, code: result.code, msg: result.msg };
         const parseData = result.data;
-        const platform = getPlatformType(url);
-        const text = generateFormattedText(platform, parseData, config);
+        const text = generateFormattedText(parseData, config);
         return {
             data: {
                 text,
@@ -932,8 +833,7 @@ function apply(ctx, config) {
                                     const filename = crypto_1.default.createHash('md5').update(item.video).digest('hex');
                                     const downloadResult = await downloadVideo(item.video, filename, config.userAgent, config.maxVideoSize, config.downloadThreads);
                                     if (downloadResult.code !== ErrorCode.SUCCESS) {
-                                        const errorMsg = getErrorInfo(downloadResult.code);
-                                        await sendTimeout(session, koishi_1.h.text(`${errorMsg}\n链接：${item.video}`));
+                                        await sendTimeout(session, koishi_1.h.text(`${getErrorInfo(downloadResult.code)}\n链接：${item.video}`));
                                         continue;
                                     }
                                     else {

package/package.json

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