koishi-plugin-video-parser-all 0.2.0 → 0.2.2

package/lib/index.d.ts

@@ -21,6 +21,7 @@ export interface Config {
     retryTimes: number;
     retryInterval: number;
     apiUrl: string;
+    videoSendTimeout: number;
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -14,27 +14,39 @@ const promises_1 = require("stream/promises");
 const worker_threads_1 = require("worker_threads");
 exports.name = 'video-parser-all';
 exports.Config = koishi_1.Schema.object({
-    enable: koishi_1.Schema.boolean().default(true),
-    showWaitingTip: koishi_1.Schema.boolean().default(true),
-    // 修复：boolean.default → Schema.boolean().default
-    revokeWaitingTip: koishi_1.Schema.boolean().default(true),
-    waitingTipText: koishi_1.Schema.string().default('正在解析视频…'),
-    sameLinkInterval: koishi_1.Schema.number().default(180),
-    imageParseFormat: koishi_1.Schema.string().role('textarea').default('${标题} ${tab} ${UP主}\n${简介}\n${~~~}\n${封面}'),
+    enable: koishi_1.Schema.boolean().default(true).description('启用插件'),
+    showWaitingTip: koishi_1.Schema.boolean().default(true).description('解析时显示等待提示'),
+    revokeWaitingTip: koishi_1.Schema.boolean().default(true).description('解析完成后撤回等待提示'),
+    waitingTipText: koishi_1.Schema.string().default('正在解析视频，请稍候...').description('等待提示文本'),
+    sameLinkInterval: koishi_1.Schema.number().default(180).description('相同链接解析间隔（秒）'),
+    // 修复：给${~~~}加转义符 \${~~~} 避免TS解析错误
+    imageParseFormat: koishi_1.Schema.string().role('textarea').default('${标题}\n${~~~}\n${UP主}\n${~~~}\n${封面}').description(`解析结果格式
+支持变量：\${标题} \${UP主} \${简介} \${点赞} \${投币} \${收藏} \${转发} \${观看} \${弹幕} \${tab} \${~~~} \${封面}`),
     returnContent: koishi_1.Schema.object({
-        showImageText: koishi_1.Schema.boolean().default(true),
-        showVideoUrl: koishi_1.Schema.boolean().default(false),
-        showVideoFile: koishi_1.Schema.boolean().default(true),
-    }),
-    maxDescLength: koishi_1.Schema.number().default(200),
-    timeout: koishi_1.Schema.number().default(15000),
-    ignoreSendError: koishi_1.Schema.boolean().default(true),
-    enableForward: koishi_1.Schema.boolean().default(false),
-    downloadVideoBeforeSend: koishi_1.Schema.boolean().default(false),
-    messageBufferDelay: koishi_1.Schema.number().default(1).min(0),
-    retryTimes: koishi_1.Schema.number().default(3).min(0),
-    retryInterval: koishi_1.Schema.number().default(2000).min(500),
-    apiUrl: koishi_1.Schema.string().default('https://api.bugpk.com/api/short_videos'),
+        showImageText: koishi_1.Schema.boolean().default(true).description('显示文本与封面'),
+        showVideoUrl: koishi_1.Schema.boolean().default(false).description('显示无水印链接'),
+        showVideoFile: koishi_1.Schema.boolean().default(true).description('发送视频消息'),
+    }).description('返回内容设置'),
+    maxDescLength: koishi_1.Schema.number().default(200).description('简介最大长度'),
+    timeout: koishi_1.Schema.number().default(15000).description('API请求超时（毫秒）'),
+    ignoreSendError: koishi_1.Schema.boolean().default(true).description('忽略消息发送错误'),
+    enableForward: koishi_1.Schema.boolean().default(false).description('启用合并转发（仅OneBot）'),
+    downloadVideoBeforeSend: koishi_1.Schema.boolean().default(false).description('发送前先下载视频（仅OneBot）'),
+    messageBufferDelay: koishi_1.Schema.number().default(1).min(0).description('消息缓冲延迟（秒）'),
+    retryTimes: koishi_1.Schema.number().default(3).min(0).description('接口重试次数'),
+    retryInterval: koishi_1.Schema.number().default(2000).min(500).description('重试间隔（毫秒）'),
+    apiUrl: koishi_1.Schema.string().default('https://api.bugpk.com/api/short_videos').description(`本插件使用 BugPk-Api 公共接口
+解析失败可能原因：
+1. 视频为私密/付费/下架/限制
+2. 接口限流或维护
+3. 网络波动请求超时
+4. 平台链接格式更新
+注意事项：
+1. 勿频繁解析相同链接
+2. 仅支持抖音/快手/B站公开视频
+3. 公共接口不保证100%成功
+4. 失败可检查链接或稍后重试`),
+    videoSendTimeout: koishi_1.Schema.number().default(60000).description('视频发送超时（毫秒）'),
 });
 if (!worker_threads_1.isMainThread) {
     const { url, filePath } = worker_threads_1.workerData;
@@ -64,28 +76,28 @@ if (!worker_threads_1.isMainThread) {
 const processed = new Map();
 const linkBuffer = new Map();
 const PLATFORM_KEYWORDS = {
-    bilibili: ['bilibili', 'b23', 'B站'],
-    kuaishou: ['kuaishou', '快手', 'v.kuaishou.com'],
-    douyin: ['douyin', '抖音', 'v.douyin.com']
+    bilibili: ['bilibili', 'b23', 'B站', 'www.bilibili.com', 'm.bilibili.com'],
+    kuaishou: ['kuaishou', '快手', 'v.kuaishou.com', 'www.kuaishou.com', 'kwimgs.com'],
+    douyin: ['douyin', '抖音', 'v.douyin.com', 'www.douyin.com', '365yg.com', 'douyinpic.com']
 };
 function extractUrl(content) {
     const urlMatches = content.match(/https?:\/\/[^\s]+/gi) || [];
     return urlMatches.filter(url => {
         const lower = url.toLowerCase();
-        return Object.values(PLATFORM_KEYWORDS).some(g => g.some(k => lower.includes(k.toLowerCase())));
+        return Object.values(PLATFORM_KEYWORDS).some(g => g.some(k => lower.includes(k)));
     });
 }
 function hasPlatformKeyword(content) {
     const lower = content.toLowerCase();
-    return Object.values(PLATFORM_KEYWORDS).some(g => g.some(k => lower.includes(k.toLowerCase())));
+    return Object.values(PLATFORM_KEYWORDS).some(g => g.some(k => lower.includes(k)));
 }
 function getPlatformType(url) {
     const lower = url.toLowerCase();
-    if (PLATFORM_KEYWORDS.douyin.some(k => lower.includes(k.toLowerCase())))
+    if (PLATFORM_KEYWORDS.douyin.some(k => lower.includes(k)))
         return 'douyin';
-    if (PLATFORM_KEYWORDS.kuaishou.some(k => lower.includes(k.toLowerCase())))
+    if (PLATFORM_KEYWORDS.kuaishou.some(k => lower.includes(k)))
         return 'kuaishou';
-    if (PLATFORM_KEYWORDS.bilibili.some(k => lower.includes(k.toLowerCase())))
+    if (PLATFORM_KEYWORDS.bilibili.some(k => lower.includes(k)))
         return 'bilibili';
     return null;
 }
@@ -105,7 +117,7 @@ async function downloadVideoWithThreads(url, filename) {
         worker.on('error', reject);
         worker.on('exit', (code) => {
             if (code !== 0)
-                reject(new Error('worker exit'));
+                reject(new Error('视频下载线程异常'));
         });
     });
 }
@@ -148,6 +160,7 @@ function clearAllCache() {
             catch { }
         });
     }
+    return true;
 }
 const delay = (ms) => new Promise(r => setTimeout(r, ms));
 function apply(ctx, config) {
@@ -163,30 +176,37 @@ function apply(ctx, config) {
     async function parse(url) {
         const platform = getPlatformType(url);
         if (!platform)
-            return { data: null };
+            return { data: null, msg: '不支持该平台链接' };
         for (let i = 0; i <= config.retryTimes; i++) {
             try {
                 const res = await http.get(config.apiUrl, { params: { url } });
                 const isSuccess = (res.data.code === 200 || res.data.code === 0) && res.data.data;
                 if (isSuccess) {
-                    return { data: parseData(res.data.data, config.maxDescLength) };
+                    return { data: parseData(res.data.data, config.maxDescLength), msg: '解析成功' };
+                }
+                else {
+                    return { data: null, msg: res.data.msg || '解析失败' };
                 }
             }
-            catch (e) { }
-            if (i < config.retryTimes)
+            catch (e) {
+                if (i === config.retryTimes)
+                    return { data: null, msg: '接口请求超时' };
                 await delay(config.retryInterval);
+            }
         }
-        return { data: null };
+        return { data: null, msg: '解析失败' };
     }
     async function processSingleUrl(session, url) {
         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 null;
+        if (processed.get(hash) && now - processed.get(hash) < config.sameLinkInterval * 1000) {
+            return { data: null, msg: '请勿重复解析' };
+        }
         processed.set(hash, now);
         const parseResult = await parse(url);
-        if (!parseResult.data || !parseResult.data.video)
-            return null;
+        if (!parseResult.data || !parseResult.data.video) {
+            return { data: null, msg: parseResult.msg };
+        }
         let text = config.imageParseFormat
             .replace(/\${标题}/g, parseResult.data.title)
             .replace(/\${UP主}/g, parseResult.data.author)
@@ -225,9 +245,15 @@ function apply(ctx, config) {
             }
         }
         if (config.returnContent.showVideoUrl && parseResult.data.video) {
-            contentParts.push(`🔗 无水印链接：${parseResult.data.video}`);
+            contentParts.push(`🔗 无水印视频：${parseResult.data.video}`);
         }
-        return { textContent: contentParts.join('\n'), videoContent };
+        return {
+            data: {
+                textContent: contentParts.join('\n'),
+                videoContent
+            },
+            msg: '解析成功'
+        };
     }
     async function revokeTip(session, key) {
         if (!config.revokeWaitingTip || session.platform !== 'onebot')
@@ -236,28 +262,44 @@ function apply(ctx, config) {
         if (!buf?.tipMsgId)
             return;
         try {
-            await session.bot.deleteMessage(session.channelId, buf.tipMsgId);
+            await session.bot.deleteMessage(session.channelId, buf.tipMsgId.toString());
         }
         catch { }
     }
-    async function flush(session) {
+    async function sendWithTimeout(session, content, timeout) {
+        return Promise.race([
+            session.send(content),
+            new Promise((_, reject) => setTimeout(() => reject(new Error('发送超时')), timeout))
+        ]).catch(() => null);
+    }
+    async function flush(session, manualUrls) {
         const key = `${session.platform}:${session.userId}:${session.channelId}`;
-        const buf = linkBuffer.get(key);
-        if (!buf)
-            return;
-        clearTimeout(buf.timer);
-        linkBuffer.delete(key);
-        await revokeTip(session, key);
+        let buf = linkBuffer.get(key);
+        let urls = manualUrls || buf?.urls || [];
+        if (buf) {
+            clearTimeout(buf.timer);
+            linkBuffer.delete(key);
+            await revokeTip(session, key);
+        }
         const results = [];
-        for (const u of buf.urls) {
+        const errorMsgs = [];
+        for (const u of urls) {
             const r = await processSingleUrl(session, u);
-            if (r)
-                results.push(r);
+            if (r.data) {
+                results.push(r.data);
+            }
+            else {
+                errorMsgs.push(`【${u.slice(0, 22)}...】：${r.msg}`);
+            }
         }
         if (results.length === 0) {
-            await session.send('视频解析失败');
+            await sendWithTimeout(session, `❌ 全部解析失败\n${errorMsgs.join('\n')}`, config.videoSendTimeout);
             return;
         }
+        if (errorMsgs.length > 0) {
+            await sendWithTimeout(session, `⚠️ 部分解析失败\n${errorMsgs.join('\n')}`, config.videoSendTimeout);
+            await delay(600);
+        }
         if (config.enableForward && session.platform === 'onebot') {
             try {
                 const forwardMessages = results.map(result => {
@@ -267,25 +309,31 @@ function apply(ctx, config) {
                     if (result.videoContent)
                         content.push(result.videoContent);
                     return (0, koishi_1.h)('message', [
-                        (0, koishi_1.h)('author', { id: session.selfId, name: '解析机器人' }),
+                        (0, koishi_1.h)('author', { id: session.selfId, name: '视频解析' }),
                         ...content
                     ]);
                 });
-                await session.send((0, koishi_1.h)('message', { forward: true }, forwardMessages));
+                await sendWithTimeout(session, (0, koishi_1.h)('message', { forward: true }, forwardMessages), config.videoSendTimeout);
                 return;
             }
             catch (e) {
-                await session.send('合并转发失败，将分开发送');
+                await sendWithTimeout(session, '合并转发失败，将分开发送', config.videoSendTimeout);
             }
         }
         for (const r of results) {
             try {
                 if (r.textContent)
-                    await session.send(r.textContent);
-                if (r.videoContent)
-                    await session.send(r.videoContent);
+                    await sendWithTimeout(session, r.textContent, config.videoSendTimeout);
+                if (r.videoContent) {
+                    await delay(600);
+                    await sendWithTimeout(session, r.videoContent, config.videoSendTimeout);
+                }
+                await delay(1000);
+            }
+            catch (e) {
+                if (!config.ignoreSendError)
+                    ctx.logger.error('发送失败');
             }
-            catch { }
         }
     }
     ctx.on('message', async (session) => {
@@ -300,26 +348,59 @@ function apply(ctx, config) {
         const key = `${session.platform}:${session.userId}:${session.channelId}`;
         if (linkBuffer.has(key)) {
             const b = linkBuffer.get(key);
-            b.urls.push(...urls);
-            clearTimeout(b.timer);
-            b.timer = setTimeout(() => flush(session), Math.max(0, config.messageBufferDelay * 1000));
-            linkBuffer.set(key, b);
+            const newUrls = urls.filter(u => !b.urls.includes(u));
+            if (newUrls.length > 0) {
+                b.urls.push(...newUrls);
+                clearTimeout(b.timer);
+                b.timer = setTimeout(() => flush(session), config.messageBufferDelay * 1000);
+                linkBuffer.set(key, b);
+            }
             return;
         }
         let tipId;
         if (config.showWaitingTip) {
-            const m = await session.send(config.waitingTipText).catch(() => null);
+            const m = await sendWithTimeout(session, config.waitingTipText, config.videoSendTimeout);
             tipId = m?.messageId || m?.id || m;
         }
         linkBuffer.set(key, {
             urls,
-            timer: setTimeout(() => flush(session), Math.max(0, config.messageBufferDelay * 1000)),
+            timer: setTimeout(() => flush(session), config.messageBufferDelay * 1000),
             tipMsgId: tipId
         });
     });
+    ctx.command('解析视频 <url>', '手动解析视频链接')
+        .action(async ({ session }, url) => {
+        if (!url)
+            return '请输入视频链接';
+        const urls = extractUrl(url);
+        if (urls.length === 0)
+            return '不支持该链接';
+        await flush(session, urls);
+    });
+    ctx.command('清除解析缓存', '清空解析缓存与临时文件')
+        .action(() => {
+        clearAllCache();
+        return '✅ 解析缓存已清空';
+    });
     setInterval(() => {
         const now = Date.now();
         processed.forEach((t, h) => now - t > 86400000 && processed.delete(h));
     }, 3600000);
-    ctx.logger.info('视频解析已加载');
+    setInterval(() => {
+        const tempDir = path_1.default.join(process.cwd(), 'temp_videos');
+        if (!fs_1.default.existsSync(tempDir))
+            return;
+        const files = fs_1.default.readdirSync(tempDir);
+        const now = Date.now();
+        files.forEach(file => {
+            try {
+                const st = fs_1.default.statSync(path_1.default.join(tempDir, file));
+                if (now - st.mtimeMs > 3600000)
+                    fs_1.default.unlinkSync(path_1.default.join(tempDir, file));
+            }
+            catch { }
+        });
+    }, 1800000);
+    process.on('exit', clearAllCache);
+    ctx.logger.info('视频解析插件已加载');
 }

package/package.json

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