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

package/lib/index.d.ts

@@ -18,22 +18,9 @@ export interface Config {
     enableForward: boolean;
     downloadVideoBeforeSend: boolean;
     messageBufferDelay: number;
-    commonApi: string;
-    douyin: {
-        mode: 'common' | 'own' | 'custom';
-        ownApi: string;
-        customApi: string;
-    };
-    kuaishou: {
-        mode: 'common' | 'own' | 'custom';
-        ownApi: string;
-        customApi: string;
-    };
-    bilibili: {
-        mode: 'common' | 'own' | 'custom';
-        ownApi: string;
-        customApi: string;
-    };
+    retryTimes: number;
+    retryInterval: number;
+    apiUrl: string;
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -14,59 +14,36 @@ 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).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('相同链接重复间隔秒'),
-    imageParseFormat: koishi_1.Schema.string()
-        .role('textarea')
-        .default('${标题} ${tab} ${UP主}\n${简介}\n${~~~}\n${封面}')
-        .description('图文格式：${标题} ${UP主} ${简介} ${点赞} ${投币} ${收藏} ${转发} ${观看} ${弹幕} ${tab} ${~~~} ${封面}'),
+    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${封面}'),
     returnContent: koishi_1.Schema.object({
-        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('请求超时毫秒'),
-    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('消息缓冲延迟秒（可设为0）'),
-    commonApi: koishi_1.Schema.string().default('https://api.bugpk.com/api/short_videos').description('通用解析API'),
-    douyin: koishi_1.Schema.object({
-        mode: koishi_1.Schema.union([
-            koishi_1.Schema.const('common').description('使用通用API'),
-            koishi_1.Schema.const('own').description('使用平台专属API'),
-            koishi_1.Schema.const('custom').description('使用自定义API'),
-        ]).default('common').description('抖音解析模式'),
-        ownApi: koishi_1.Schema.string().default('https://api.bugpk.com/api/douyin').description('抖音专属API'),
-        customApi: koishi_1.Schema.string().description('抖音自定义API'),
-    }).description('抖音配置'),
-    kuaishou: koishi_1.Schema.object({
-        mode: koishi_1.Schema.union([
-            koishi_1.Schema.const('common').description('使用通用API'),
-            koishi_1.Schema.const('own').description('使用平台专属API'),
-            koishi_1.Schema.const('custom').description('使用自定义API'),
-        ]).default('common').description('快手解析模式'),
-        ownApi: koishi_1.Schema.string().default('https://api.bugpk.com/api/ksjx').description('快手专属API'),
-        customApi: koishi_1.Schema.string().description('快手自定义API'),
-    }).description('快手配置'),
-    bilibili: koishi_1.Schema.object({
-        mode: koishi_1.Schema.union([
-            koishi_1.Schema.const('common').description('使用通用API'),
-            koishi_1.Schema.const('own').description('使用平台专属API'),
-            koishi_1.Schema.const('custom').description('使用自定义API'),
-        ]).default('common').description('B站解析模式'),
-        ownApi: koishi_1.Schema.string().default('https://api.bugpk.com/api/bilibili').description('B站专属API'),
-        customApi: koishi_1.Schema.string().description('B站自定义API'),
-    }).description('B站配置'),
+        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'),
 });
 if (!worker_threads_1.isMainThread) {
     const { url, filePath } = worker_threads_1.workerData;
     (async () => {
         try {
+            if (url.endsWith('.m4a') || url.endsWith('.mp3')) {
+                worker_threads_1.parentPort?.postMessage({ success: false, error: '不支持音频' });
+                return;
+            }
             const response = await (0, axios_1.default)({
                 url,
                 method: 'GET',
@@ -80,10 +57,7 @@ if (!worker_threads_1.isMainThread) {
             worker_threads_1.parentPort?.postMessage({ success: true, filePath });
         }
         catch (error) {
-            worker_threads_1.parentPort?.postMessage({
-                success: false,
-                error: error.message
-            });
+            worker_threads_1.parentPort?.postMessage({ success: false, error: error.message });
         }
     })();
 }
@@ -91,8 +65,8 @@ const processed = new Map();
 const linkBuffer = new Map();
 const PLATFORM_KEYWORDS = {
     bilibili: ['bilibili', 'b23', 'B站'],
-    kuaishou: ['kuaishou', '快手'],
-    douyin: ['douyin', '抖音']
+    kuaishou: ['kuaishou', '快手', 'v.kuaishou.com'],
+    douyin: ['douyin', '抖音', 'v.douyin.com']
 };
 function extractUrl(content) {
     const urlMatches = content.match(/https?:\/\/[^\s]+/gi) || [];
@@ -121,30 +95,23 @@ async function downloadVideoWithThreads(url, filename) {
         if (!fs_1.default.existsSync(dir))
             fs_1.default.mkdirSync(dir, { recursive: true });
         const filePath = path_1.default.join(dir, `${filename}.mp4`);
-        const worker = new worker_threads_1.Worker(__filename, {
-            workerData: { url, filePath }
-        });
+        const worker = new worker_threads_1.Worker(__filename, { workerData: { url, filePath } });
         worker.on('message', (result) => {
-            if (result.success) {
+            if (result.success)
                 resolve(result.filePath);
-            }
-            else {
+            else
                 reject(new Error(result.error));
-            }
-        });
-        worker.on('error', (error) => {
-            reject(error);
         });
+        worker.on('error', reject);
         worker.on('exit', (code) => {
-            if (code !== 0) {
-                reject(new Error(`下载线程退出，代码: ${code}`));
-            }
+            if (code !== 0)
+                reject(new Error('worker exit'));
         });
     });
 }
-function parseData(data, platform, maxDescLength) {
-    let title = data.title || '无标题';
-    let author = data.auther?.name || data.user?.name || data.auther || data.author || '未知作者';
+function parseData(data, maxDescLength) {
+    let title = data.title || data.desc || '无标题';
+    let author = data.author || data.auther || data.user?.name || '未知作者';
     let desc = data.desc || data.description || title || '无简介';
     desc = desc.slice(0, maxDescLength);
     let digg = data.like || data.digg || 0;
@@ -155,34 +122,34 @@ function parseData(data, platform, maxDescLength) {
     let danmaku = data.danmaku || data.comment || 0;
     let cover = data.cover || data.imgurl || data.pic || '';
     let video = '';
-    if (data.url)
+    if (data.videos && Array.isArray(data.videos) && data.videos.length > 0 && data.videos[0].url) {
+        video = data.videos[0].url;
+    }
+    else if (data.url) {
         video = data.url;
-    else if (data.video_url)
-        video = data.video_url;
-    else if (data.videos && Array.isArray(data.videos) && data.videos.length > 0) {
-        video = data.videos[0].url || '';
     }
-    else if (data.play)
-        video = data.play;
-    else if (data.hd_url)
-        video = data.hd_url;
+    else if (data.video_backup && Array.isArray(data.video_backup) && data.video_backup[0]?.url) {
+        video = data.video_backup[0].url;
+    }
+    if (video.endsWith('.m4a') || video.endsWith('.mp3'))
+        video = '';
     return { title, author, desc, digg, coin, collect, share, play, danmaku, cover, video };
 }
 function clearAllCache() {
     processed.clear();
-    linkBuffer.forEach(buffer => clearTimeout(buffer.timer));
+    linkBuffer.forEach(b => clearTimeout(b.timer));
     linkBuffer.clear();
     const tempDir = path_1.default.join(process.cwd(), 'temp_videos');
     if (fs_1.default.existsSync(tempDir)) {
-        fs_1.default.readdirSync(tempDir).forEach(file => {
+        fs_1.default.readdirSync(tempDir).forEach(f => {
             try {
-                const filePath = path_1.default.join(tempDir, file);
-                fs_1.default.unlinkSync(filePath);
+                fs_1.default.unlinkSync(path_1.default.join(tempDir, f));
             }
-            catch (e) { }
+            catch { }
         });
     }
 }
+const delay = (ms) => new Promise(r => setTimeout(r, ms));
 function apply(ctx, config) {
     if (!worker_threads_1.isMainThread)
         return;
@@ -193,47 +160,32 @@ function apply(ctx, config) {
             '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'
         }
     });
-    function getApi(platform) {
-        const conf = config[platform];
-        if (conf.mode === 'custom' && conf.customApi)
-            return conf.customApi;
-        if (conf.mode === 'own')
-            return conf.ownApi;
-        return config.commonApi;
-    }
     async function parse(url) {
         const platform = getPlatformType(url);
         if (!platform)
-            return { data: null, platform: null };
-        const api = getApi(platform);
-        if (!api)
-            return { data: null, platform: null };
-        try {
-            const res = await http.get(api, { params: { url } });
-            if ((res.data.code === 200 || res.data.code === 0) && res.data.data) {
-                return {
-                    data: parseData(res.data.data, platform, config.maxDescLength),
-                    platform
-                };
-            }
-            else {
-                ctx.logger.error(`API返回非成功状态: ${JSON.stringify(res.data)}`);
+            return { data: null };
+        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) };
+                }
             }
+            catch (e) { }
+            if (i < config.retryTimes)
+                await delay(config.retryInterval);
         }
-        catch (e) {
-            ctx.logger.error(`解析失败: ${e.message}`);
-        }
-        return { data: null, platform: null };
+        return { data: null };
     }
     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) {
+        if (processed.get(hash) && now - processed.get(hash) < config.sameLinkInterval * 1000)
             return null;
-        }
         processed.set(hash, now);
         const parseResult = await parse(url);
-        if (!parseResult.data)
+        if (!parseResult.data || !parseResult.data.video)
             return null;
         let text = config.imageParseFormat
             .replace(/\${标题}/g, parseResult.data.title)
@@ -245,28 +197,26 @@ function apply(ctx, config) {
             .replace(/\${转发}/g, String(parseResult.data.share))
             .replace(/\${观看}/g, String(parseResult.data.play))
             .replace(/\${弹幕}/g, String(parseResult.data.danmaku))
-            .replace(/\${tab}/g, '\t')
-            .replace(/\${~~~}/g, '\n');
+            .replace(/\${tab}/g, '\t').replace(/\${~~~}/g, '\n');
         const contentParts = [];
         if (config.returnContent.showImageText) {
-            const [beforeCover, afterCover] = text.split('${封面}');
-            if (beforeCover && beforeCover.trim())
-                contentParts.push(beforeCover.trim());
+            const [b, a] = text.split('${封面}');
+            if (b?.trim())
+                contentParts.push(b.trim());
             if (parseResult.data.cover)
                 contentParts.push(koishi_1.h.image(parseResult.data.cover));
-            if (afterCover && afterCover.trim())
-                contentParts.push(afterCover.trim());
+            if (a?.trim())
+                contentParts.push(a.trim());
         }
         let videoContent = '';
         if (config.returnContent.showVideoFile && parseResult.data.video) {
             if (config.downloadVideoBeforeSend && session.platform === 'onebot') {
                 try {
-                    const filename = crypto_1.default.createHash('md5').update(parseResult.data.video).digest('hex');
-                    const filePath = await downloadVideoWithThreads(parseResult.data.video, filename);
-                    videoContent = koishi_1.h.file(filePath);
+                    const name = crypto_1.default.createHash('md5').update(parseResult.data.video).digest('hex');
+                    const fp = await downloadVideoWithThreads(parseResult.data.video, name);
+                    videoContent = koishi_1.h.file(fp);
                 }
                 catch (e) {
-                    ctx.logger.error(`下载视频失败: ${e.message}`);
                     videoContent = koishi_1.h.video(parseResult.data.video);
                 }
             }
@@ -277,153 +227,99 @@ function apply(ctx, config) {
         if (config.returnContent.showVideoUrl && parseResult.data.video) {
             contentParts.push(`🔗 无水印链接：${parseResult.data.video}`);
         }
-        return {
-            textContent: contentParts.join('\n'),
-            videoContent,
-            rawData: parseResult.data
-        };
+        return { textContent: contentParts.join('\n'), videoContent };
     }
-    async function revokeWaitingTip(session, sessionKey) {
+    async function revokeTip(session, key) {
         if (!config.revokeWaitingTip || session.platform !== 'onebot')
             return;
-        const bufferData = linkBuffer.get(sessionKey);
-        if (!bufferData?.tipMsgId)
+        const buf = linkBuffer.get(key);
+        if (!buf?.tipMsgId)
             return;
         try {
-            await session.bot.deleteMessage(session.channelId, bufferData.tipMsgId);
-        }
-        catch (e) {
-            ctx.logger.debug(`撤回等待提示失败: ${e.message}`);
+            await session.bot.deleteMessage(session.channelId, buf.tipMsgId);
         }
+        catch { }
     }
-    async function flushBuffer(session) {
-        const sessionKey = `${session.platform}:${session.userId}:${session.channelId}`;
-        const bufferData = linkBuffer.get(sessionKey);
-        if (!bufferData)
+    async function flush(session) {
+        const key = `${session.platform}:${session.userId}:${session.channelId}`;
+        const buf = linkBuffer.get(key);
+        if (!buf)
             return;
-        clearTimeout(bufferData.timer);
-        linkBuffer.delete(sessionKey);
-        await revokeWaitingTip(session, sessionKey);
+        clearTimeout(buf.timer);
+        linkBuffer.delete(key);
+        await revokeTip(session, key);
         const results = [];
-        for (const url of bufferData.urls) {
-            const result = await processSingleUrl(session, url);
-            if (result)
-                results.push(result);
+        for (const u of buf.urls) {
+            const r = await processSingleUrl(session, u);
+            if (r)
+                results.push(r);
         }
         if (results.length === 0) {
-            await session.send('视频解析失败，请稍后重试');
+            await session.send('视频解析失败');
             return;
         }
         if (config.enableForward && session.platform === 'onebot') {
             try {
-                const forwardMsg = (0, koishi_1.h)('message', {
-                    type: 'forward',
-                    data: {
-                        messages: results.map(result => {
-                            const content = [];
-                            if (result.textContent)
-                                content.push(result.textContent);
-                            if (result.videoContent)
-                                content.push(result.videoContent);
-                            return {
-                                type: 'node',
-                                data: {
-                                    name: '视频解析机器人',
-                                    uin: session.selfId,
-                                    content: content
-                                }
-                            };
-                        })
-                    }
+                const forwardMessages = results.map(result => {
+                    const content = [];
+                    if (result.textContent)
+                        content.push(result.textContent);
+                    if (result.videoContent)
+                        content.push(result.videoContent);
+                    return (0, koishi_1.h)('message', [
+                        (0, koishi_1.h)('author', { id: session.selfId, name: '解析机器人' }),
+                        ...content
+                    ]);
                 });
-                await session.send(forwardMsg);
+                await session.send((0, koishi_1.h)('message', { forward: true }, forwardMessages));
                 return;
             }
             catch (e) {
-                ctx.logger.error(`合并转发失败: ${e.message}`);
                 await session.send('合并转发失败，将分开发送');
             }
         }
-        for (const result of results) {
+        for (const r of results) {
             try {
-                if (result.textContent)
-                    await session.send(result.textContent);
-                if (result.videoContent)
-                    await session.send(result.videoContent);
-            }
-            catch (e) {
-                if (!config.ignoreSendError) {
-                    ctx.logger.warn(`发送消息失败: ${e.message}`);
-                }
+                if (r.textContent)
+                    await session.send(r.textContent);
+                if (r.videoContent)
+                    await session.send(r.videoContent);
             }
+            catch { }
         }
     }
     ctx.on('message', async (session) => {
-        try {
-            if (!config.enable)
-                return;
-            const content = session.content.trim();
-            if (!hasPlatformKeyword(content))
-                return;
-            const urls = extractUrl(content);
-            if (urls.length === 0)
-                return;
-            const sessionKey = `${session.platform}:${session.userId}:${session.channelId}`;
-            if (linkBuffer.has(sessionKey)) {
-                const existing = linkBuffer.get(sessionKey);
-                existing.urls.push(...urls);
-                clearTimeout(existing.timer);
-                existing.timer = setTimeout(() => flushBuffer(session), Math.max(0, config.messageBufferDelay * 1000));
-                linkBuffer.set(sessionKey, existing);
-                return;
-            }
-            let tipMsgId;
-            if (config.showWaitingTip) {
-                const tipText = config.waitingTipText;
-                const tipMsg = await session.send(tipText).catch(e => {
-                    if (!config.ignoreSendError)
-                        ctx.logger.warn(`发送等待提示失败: ${e.message}`);
-                    return null;
-                });
-                tipMsgId = tipMsg?.messageId || tipMsg?.id || tipMsg;
-            }
-            linkBuffer.set(sessionKey, {
-                urls,
-                timer: setTimeout(() => flushBuffer(session), Math.max(0, config.messageBufferDelay * 1000)),
-                tipMsgId
-            });
+        if (!config.enable)
+            return;
+        const content = session.content.trim();
+        if (!hasPlatformKeyword(content))
+            return;
+        const urls = extractUrl(content);
+        if (urls.length === 0)
+            return;
+        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);
+            return;
         }
-        catch (e) {
-            ctx.logger.error(`消息处理异常: ${e.message}`);
-            const sessionKey = `${session.platform}:${session.userId}:${session.channelId}`;
-            if (linkBuffer.has(sessionKey)) {
-                clearTimeout(linkBuffer.get(sessionKey).timer);
-                linkBuffer.delete(sessionKey);
-            }
+        let tipId;
+        if (config.showWaitingTip) {
+            const m = await session.send(config.waitingTipText).catch(() => null);
+            tipId = m?.messageId || m?.id || m;
         }
+        linkBuffer.set(key, {
+            urls,
+            timer: setTimeout(() => flush(session), Math.max(0, config.messageBufferDelay * 1000)),
+            tipMsgId: tipId
+        });
     });
     setInterval(() => {
         const now = Date.now();
-        processed.forEach((timestamp, hash) => {
-            if (now - timestamp > 86400000) {
-                processed.delete(hash);
-            }
-        });
-        const tempDir = path_1.default.join(process.cwd(), 'temp_videos');
-        if (fs_1.default.existsSync(tempDir)) {
-            fs_1.default.readdirSync(tempDir).forEach(file => {
-                try {
-                    const filePath = path_1.default.join(tempDir, file);
-                    const stat = fs_1.default.statSync(filePath);
-                    if (now - stat.ctimeMs > 3600000) {
-                        fs_1.default.unlinkSync(filePath);
-                    }
-                }
-                catch (e) {
-                    ctx.logger.error(`清理临时文件失败: ${e.message}`);
-                }
-            });
-        }
+        processed.forEach((t, h) => now - t > 86400000 && processed.delete(h));
     }, 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.9",
+  "version": "0.2.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [