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

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('相同链接解析间隔（秒），防止重复解析'),
+    imageParseFormat: koishi_1.Schema.string().role('textarea').default('${标题} ${tab} ${UP主}\n${简介}\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('API 请求失败重试次数'),
+    retryInterval: koishi_1.Schema.number().default(2000).min(500).description('重试间隔（毫秒）'),
+    apiUrl: koishi_1.Schema.string().default('https://api.bugpk.com/api/short_videos').description('视频解析接口地址'),
+    videoSendTimeout: koishi_1.Schema.number().default(30000).description('视频消息发送超时时间（毫秒），解决发送视频超时问题')
 });
 if (!worker_threads_1.isMainThread) {
     const { url, filePath } = worker_threads_1.workerData;
@@ -236,9 +248,20 @@ 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 { }
+        catch (e) {
+            ctx.logger.warn(`撤回提示消息失败: ${e.message}`);
+        }
+    }
+    async function sendWithTimeout(session, content, timeout) {
+        return Promise.race([
+            session.send(content),
+            new Promise((_, reject) => setTimeout(() => reject(new Error('消息发送超时')), timeout))
+        ]).catch((e) => {
+            ctx.logger.warn(`消息发送超时: ${e.message}`);
+            return null;
+        });
     }
     async function flush(session) {
         const key = `${session.platform}:${session.userId}:${session.channelId}`;
@@ -255,7 +278,7 @@ function apply(ctx, config) {
                 results.push(r);
         }
         if (results.length === 0) {
-            await session.send('视频解析失败');
+            await sendWithTimeout(session, '视频解析失败', config.videoSendTimeout);
             return;
         }
         if (config.enableForward && session.platform === 'onebot') {
@@ -271,21 +294,24 @@ function apply(ctx, config) {
                         ...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);
+                    await sendWithTimeout(session, r.textContent, config.videoSendTimeout);
                 if (r.videoContent)
-                    await session.send(r.videoContent);
+                    await sendWithTimeout(session, r.videoContent, config.videoSendTimeout);
+            }
+            catch (e) {
+                if (!config.ignoreSendError)
+                    ctx.logger.error(`发送消息失败: ${e.message}`);
             }
-            catch { }
         }
     }
     ctx.on('message', async (session) => {
@@ -308,8 +334,10 @@ function apply(ctx, config) {
         }
         let tipId;
         if (config.showWaitingTip) {
-            const m = await session.send(config.waitingTipText).catch(() => null);
-            tipId = m?.messageId || m?.id || m;
+            const m = await sendWithTimeout(session, config.waitingTipText, config.videoSendTimeout);
+            if (m) {
+                tipId = m?.messageId || m?.id || m;
+            }
         }
         linkBuffer.set(key, {
             urls,
@@ -321,5 +349,24 @@ function apply(ctx, config) {
         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)) {
+            const files = fs_1.default.readdirSync(tempDir);
+            const now = Date.now();
+            files.forEach(file => {
+                const filePath = path_1.default.join(tempDir, file);
+                try {
+                    const stats = fs_1.default.statSync(filePath);
+                    if (now - stats.mtimeMs > 3600000) {
+                        fs_1.default.unlinkSync(filePath);
+                    }
+                }
+                catch (e) {
+                    ctx.logger.error(`清理临时文件失败: ${e.message}`);
+                }
+            });
+        }
+    }, 1800000);
+    ctx.logger.info('视频解析插件已加载完成');
 }

package/package.json

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