koishi-plugin-video-parser-all 0.1.1 → 0.1.2

package/lib/index.d.ts

@@ -8,6 +8,7 @@ export interface Config {
     imageParseFormat: string;
     showVideoUrl: boolean;
     maxDescLength: number;
+    bugpkUniversalApi: string;
     bugpkDouyinMainApi: string;
     bugpkDouyinBackupApi: string;
     bugpkKuaishouApi: string;

package/lib/index.js

@@ -18,13 +18,11 @@ exports.Config = koishi_1.Schema.object({
         .role('textarea')
         .default(`\${标题} \${tab} \${UP主}
 \${简介}
-点赞：\${点赞} \${tab} 投币：\${投币}
-收藏：\${收藏} \${tab} 转发：\${转发}
-观看：\${观看} \${tab} 弹幕：\${弹幕}
 \${~~~}
 \${封面}`),
     showVideoUrl: koishi_1.Schema.boolean().default(false),
     maxDescLength: koishi_1.Schema.number().default(200),
+    bugpkUniversalApi: koishi_1.Schema.string().default('https://api.bugpk.com/api/short_videos'),
     bugpkDouyinMainApi: koishi_1.Schema.string().default('https://api.bugpk.com/api/douyin'),
     bugpkDouyinBackupApi: koishi_1.Schema.string().default('https://api.bugpk.com/api/dyjx'),
     bugpkKuaishouApi: koishi_1.Schema.string().default('https://api.bugpk.com/api/ksjx'),
@@ -33,20 +31,103 @@ exports.Config = koishi_1.Schema.object({
     ignoreSendError: koishi_1.Schema.boolean().default(true).description('忽略消息发送失败的错误（避免日志刷屏）'),
 });
 const processed = new Map();
-// 新增：定义目标平台的正则匹配规则
-const PLATFORM_REGEX = {
-    douyin: /(douyin\.com|v\.douyin\.com|抖音)/i,
-    kuaishou: /(kuaishou\.com|kwaishou\.com|快手)/i,
-    bilibili: /(bilibili\.com|b23\.tv|哔哩哔哩|B站)/i
+const PLATFORM_KEYWORDS = {
+    bilibili: ['bilibili', 'b23', 'B站'],
+    kuaishou: ['kuaishou', '快手'],
+    douyin: ['douyin', '抖音']
 };
-// 新增：检查链接是否属于目标平台
-function isTargetPlatformUrl(url) {
-    return PLATFORM_REGEX.douyin.test(url) ||
-        PLATFORM_REGEX.kuaishou.test(url) ||
-        PLATFORM_REGEX.bilibili.test(url);
+function extractUrl(content) {
+    const urlMatch = content.match(/https?:\/\/[^\s]+/i);
+    return urlMatch ? urlMatch[0] : null;
+}
+function hasPlatformKeyword(content) {
+    const lowerContent = content.toLowerCase();
+    return Object.values(PLATFORM_KEYWORDS).some(keywords => keywords.some(keyword => {
+        const target = /[\u4e00-\u9fa5]/.test(keyword) ? keyword : keyword.toLowerCase();
+        return lowerContent.includes(target);
+    }));
+}
+function getPlatformType(url) {
+    const lowerUrl = url.toLowerCase();
+    if (PLATFORM_KEYWORDS.douyin.some(k => lowerUrl.includes(k.toLowerCase())))
+        return 'douyin';
+    if (PLATFORM_KEYWORDS.kuaishou.some(k => lowerUrl.includes(k.toLowerCase())))
+        return 'kuaishou';
+    if (PLATFORM_KEYWORDS.bilibili.some(k => lowerUrl.includes(k.toLowerCase())))
+        return 'bilibili';
+    return null;
+}
+function parseUniversalApiData(data) {
+    return {
+        title: data.title || '无标题',
+        author: data.author || '未知作者',
+        desc: data.title || '无简介',
+        digg: data.like || 0,
+        coin: 0,
+        collect: 0,
+        share: 0,
+        play: 0,
+        danmaku: 0,
+        cover: data.cover || '',
+        video: data.url || ''
+    };
+}
+function parseDouyin(data) {
+    const videoUrl = data.url || (data.live_photo?.[0]?.video || '');
+    return {
+        title: data.title || '无标题',
+        author: data.author?.name || '未知作者',
+        desc: data.desc || data.title || '无简介',
+        digg: 0, coin: 0, collect: 0, share: 0, play: 0, danmaku: 0,
+        cover: data.cover || '',
+        video: videoUrl
+    };
+}
+function parseKuaishou(data) {
+    return {
+        title: data.title || '无标题',
+        author: '未知作者',
+        desc: data.title || '无简介',
+        digg: 0, coin: 0, collect: 0, share: 0, play: 0, danmaku: 0,
+        cover: data.cover || '',
+        video: data.url || ''
+    };
+}
+function parseBilibili(data) {
+    const title = data.title || data.Title || '无标题';
+    const cover = data.cover || data.imgurl || data.cover_url || data.pic || '';
+    const author = data.user?.name || data.author || '未知UP主';
+    const desc = data.description || data.desc || title || '无简介';
+    let videoUrl = '';
+    if (data.url)
+        videoUrl = data.url;
+    else if (data.video_url)
+        videoUrl = data.video_url;
+    else if (data.videos && Array.isArray(data.videos) && data.videos.length > 0) {
+        videoUrl = data.videos.reduce((prev, curr) => {
+            return (prev.size || 0) > (curr.size || 0) ? prev : curr;
+        }).url || '';
+    }
+    else if (data.play)
+        videoUrl = data.play;
+    else if (data.durl && Array.isArray(data.durl))
+        videoUrl = data.durl[0]?.url || '';
+    const digg = data.like || data.digg || 0;
+    const coin = data.coin || 0;
+    const collect = data.favorite || data.collect || 0;
+    const share = data.share || 0;
+    const play = data.play || data.view || 0;
+    const danmaku = data.danmaku || data.comment || 0;
+    return {
+        title,
+        author,
+        desc,
+        digg, coin, collect, share, play, danmaku,
+        cover,
+        video: videoUrl
+    };
 }
 function apply(ctx, config) {
-    // 修复：移除axios不支持的retry配置，保留核心请求配置
     const request = axios_1.default.create({
         timeout: config.timeout,
         headers: {
@@ -55,50 +136,21 @@ function apply(ctx, config) {
             'Accept': 'application/json, text/plain, */*'
         }
     });
-    // 抖音解析
-    function parseDouyin(data) {
-        const videoUrl = data.url || (data.live_photo?.[0]?.video || '');
-        return {
-            title: data.title || '无标题',
-            author: data.author?.name || '未知作者',
-            desc: data.desc || data.title || '无简介',
-            digg: 0, coin: 0, collect: 0, share: 0, play: 0, danmaku: 0,
-            cover: data.cover || '',
-            video: videoUrl
-        };
-    }
-    // 快手解析
-    function parseKuaishou(data) {
-        return {
-            title: data.title || '无标题',
-            author: '未知作者',
-            desc: data.title || '无简介',
-            digg: 0, coin: 0, collect: 0, share: 0, play: 0, danmaku: 0,
-            cover: data.cover || '',
-            video: data.url || ''
-        };
-    }
-    // B站解析（增强：兼容更多返回格式）
-    function parseBilibili(data) {
-        const title = data.title || data.Title || '';
-        const cover = data.cover || data.imgurl || data.cover_url || '';
-        const author = data.user?.name || data.author || '未知UP主';
-        const desc = data.description || data.desc || title || '无简介';
-        const videoUrl = data.url || (data.videos?.length > 0 ? data.videos[0].url : data.video_url || '');
-        return {
-            title,
-            author,
-            desc,
-            digg: 0, coin: 0, collect: 0, share: 0, play: 0, danmaku: 0,
-            cover,
-            video: videoUrl
-        };
-    }
-    // 核心：只走专属接口，增强异常捕获
     async function parseVideo(url) {
         try {
-            // 抖音
-            if (PLATFORM_REGEX.douyin.test(url)) {
+            ctx.logger.debug(`优先调用通用API: ${config.bugpkUniversalApi}`);
+            const res = await request.get(config.bugpkUniversalApi, { params: { url } });
+            if (res.data.code === 200 && res.data.data) {
+                ctx.logger.debug('通用API解析成功');
+                return parseUniversalApiData(res.data.data);
+            }
+        }
+        catch (e) {
+            ctx.logger.debug(`通用API调用失败: ${e.message}，尝试平台专属API`);
+        }
+        try {
+            const platform = getPlatformType(url);
+            if (platform === 'douyin') {
                 try {
                     const res = await request.get(config.bugpkDouyinMainApi, { params: { url } });
                     if (res.data.code === 200 && res.data.data)
@@ -116,8 +168,7 @@ function apply(ctx, config) {
                     ctx.logger.debug(`抖音备用接口失败: ${e.message}`);
                 }
             }
-            // 快手
-            if (PLATFORM_REGEX.kuaishou.test(url)) {
+            if (platform === 'kuaishou') {
                 try {
                     const res = await request.get(config.bugpkKuaishouApi, { params: { url } });
                     if (res.data.code === 200 && res.data.data)
@@ -127,8 +178,7 @@ function apply(ctx, config) {
                     ctx.logger.debug(`快手接口失败: ${e.message}`);
                 }
             }
-            // B站
-            if (PLATFORM_REGEX.bilibili.test(url)) {
+            if (platform === 'bilibili') {
                 try {
                     const res = await request.get(config.bugpkBilibiliApi, { params: { url } });
                     if (res.data.code === 200 && res.data.data)
@@ -140,18 +190,16 @@ function apply(ctx, config) {
             }
         }
         catch (e) {
-            ctx.logger.error(`解析核心逻辑异常: ${e.message}`);
+            ctx.logger.error(`平台专属API解析异常: ${e.message}`);
         }
-        // 兜底返回（更友好的提示）
         return {
             title: '解析失败',
             author: '',
-            desc: '接口暂不可用或链接格式不支持，请稍后重试',
+            desc: '通用接口和平台专属接口均解析失败，请稍后重试',
             digg: 0, coin: 0, collect: 0, share: 0, play: 0, danmaku: 0,
             cover: '', video: ''
         };
     }
-    // 发送结果（核心修复：所有send操作加try/catch，避免中断）
     async function sendResult(session, data) {
         try {
             let text = config.imageParseFormat
@@ -167,37 +215,26 @@ function apply(ctx, config) {
                 .replace(/\${tab}/g, '\t')
                 .replace(/\${~~~}/g, '——————————————');
             const [beforeCover, afterCover] = text.split('\${封面}');
-            // 分段发送，每一步都加异常捕获
-            if (beforeCover && beforeCover.trim()) {
-                await session.send(beforeCover.trim()).catch(e => {
-                    if (!config.ignoreSendError)
-                        ctx.logger.warn(`发送文本失败: ${e.message}`);
-                });
-            }
-            if (data.cover) {
-                await session.send(koishi_1.h.image(data.cover)).catch(e => {
-                    if (!config.ignoreSendError)
-                        ctx.logger.warn(`发送封面失败: ${e.message}`);
-                });
-            }
-            if (afterCover && afterCover.trim()) {
-                await session.send(afterCover.trim()).catch(e => {
+            const msgParts = [];
+            if (beforeCover && beforeCover.trim())
+                msgParts.push(beforeCover.trim());
+            if (data.cover)
+                msgParts.push(koishi_1.h.image(data.cover));
+            if (afterCover && afterCover.trim())
+                msgParts.push(afterCover.trim());
+            if (data.video && config.showVideoUrl)
+                msgParts.push(`🔗 无水印链接：${data.video}`);
+            if (msgParts.length > 0) {
+                await session.send(msgParts.join('\n')).catch(e => {
                     if (!config.ignoreSendError)
-                        ctx.logger.warn(`发送文本失败: ${e.message}`);
+                        ctx.logger.warn(`发送合并消息失败: ${e.message}`);
                 });
             }
-            if (data.video) {
+            if (data.video && !config.showVideoUrl) {
                 try {
                     await session.send(koishi_1.h.video(data.video)).catch(e => {
-                        // 视频发送失败则回退为文本链接
-                        session.send(`📥 无水印视频链接：${data.video}`).catch(() => { });
+                        session.send(`📥 无水印视频：${data.video}`).catch(() => { });
                     });
-                    if (config.showVideoUrl) {
-                        await session.send(`🔗 无水印链接：${data.video}`).catch(e => {
-                            if (!config.ignoreSendError)
-                                ctx.logger.warn(`发送链接失败: ${e.message}`);
-                        });
-                    }
                 }
                 catch (e) {
                     await session.send(`📥 无水印视频：${data.video}`).catch(() => { });
@@ -209,34 +246,27 @@ function apply(ctx, config) {
                 ctx.logger.error(`发送结果异常: ${e.message}`);
         }
     }
-    // 消息监听（增强：加全局异常捕获 + 严格的平台链接校验）
     ctx.on('message', async (session) => {
         try {
             if (!config.enable)
                 return;
             const content = session.content.trim();
-            // 提取纯链接
-            const urlMatch = content.match(/https?:\/\/[^\s]+/);
-            if (!urlMatch)
+            if (!hasPlatformKeyword(content))
                 return;
-            const url = urlMatch[0];
-            // 核心优化：只处理目标平台的链接
-            if (!isTargetPlatformUrl(url))
+            const url = extractUrl(content);
+            if (!url)
                 return;
-            // 去重逻辑
             const hash = crypto_1.default.createHash('md5').update(url).digest('hex');
             const now = Date.now();
             if (processed.get(hash) && now - processed.get(hash) < config.sameLinkInterval * 1000)
                 return;
             processed.set(hash, now);
-            // 发送等待提示（加异常捕获）
             if (config.showWaitingTip) {
                 await session.send(config.waitingTipText).catch(e => {
                     if (!config.ignoreSendError)
                         ctx.logger.warn(`发送等待提示失败: ${e.message}`);
                 });
             }
-            // 解析并发送结果
             const data = await parseVideo(url);
             await sendResult(session, data);
         }
@@ -244,10 +274,9 @@ function apply(ctx, config) {
             ctx.logger.error(`消息处理异常: ${e.message}`);
         }
     });
-    // 定时清理缓存
     setInterval(() => {
         const now = Date.now();
         processed.forEach((t, k) => now - t > 86400000 && processed.delete(k));
     }, 3600000);
-    ctx.logger.info('✅ 视频解析插件（修复版）加载完成');
+    ctx.logger.info('视频解析插件加载完成');
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-video-parser-all",
   "description": "Koishi 视频解析插件，支持抖音/快手/B站链接解析，可自定义API和解析规则",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [