koishi-plugin-video-parser-all 0.9.4 → 0.9.5

package/lib/index.js

@@ -30,8 +30,8 @@ exports.Config = koishi_1.Schema.intersect([
     }).description('网络与 API 设置'),
     koishi_1.Schema.object({
         ignoreSendError: koishi_1.Schema.boolean().default(true).description('忽略消息发送失败，避免插件崩溃'),
-        retryTimes: koishi_1.Schema.number().min(0).default(3).description('API 请求重试次数'),
-        retryInterval: koishi_1.Schema.number().min(0).default(1000).description('重试间隔（毫秒）'),
+        retryTimes: koishi_1.Schema.number().min(0).default(3).description('API 请求重试次数（同时用于消息发送重试）'),
+        retryInterval: koishi_1.Schema.number().min(0).default(1000).description('重试间隔（毫秒，同时用于消息发送重试）'),
     }).description('错误与重试设置'),
     koishi_1.Schema.object({
         enableForward: koishi_1.Schema.boolean().default(false).description('启用合并转发（仅 OneBot 平台）'),
@@ -41,7 +41,7 @@ exports.Config = koishi_1.Schema.intersect([
         unsupportedPlatformText: koishi_1.Schema.string().default('不支持该平台链接').description('不支持的平台提示'),
         invalidLinkText: koishi_1.Schema.string().default('无效的视频链接').description('无效链接提示（parse 指令）'),
         parseErrorPrefix: koishi_1.Schema.string().default('❌ 解析失败：').description('解析失败消息前缀'),
-        parseErrorItemFormat: koishi_1.Schema.string().default('【${url}】: ${msg}').description('每条解析失败格式，可用变量：${url}（链接）、${msg}（错误信息）'),
+        parseErrorItemFormat: koishi_1.Schema.string().default('【${url}】: ${msg}').description('每条解析失败格式，可用 ${url} ${msg}'),
     }).description('界面文字设置'),
 ]);
 const logger = new koishi_1.Logger(exports.name);
@@ -368,28 +368,42 @@ function apply(ctx, config) {
         const text = generateFormattedText(result.data, config.unifiedMessageFormat);
         return { success: true, data: { text, parsed: result.data } };
     }
-    async function sendWithTimeout(session, content) {
-        if (config.videoSendTimeout <= 0) {
+    /**
+     * 发送消息（支持超时与重试），重试次数与间隔与API重试配置绑定
+     */
+    async function sendWithTimeout(session, content, customRetries) {
+        const maxRetries = customRetries ?? config.retryTimes ?? 3;
+        const retryDelay = config.retryInterval || 1000;
+        for (let attempt = 0; attempt <= maxRetries; attempt++) {
             try {
-                return await session.send(content);
+                if (config.videoSendTimeout <= 0) {
+                    // 无超时限制，直接发送
+                    return await session.send(content);
+                }
+                else {
+                    // 设置超时竞争
+                    return await Promise.race([
+                        session.send(content),
+                        new Promise((_, reject) => setTimeout(() => reject(new Error('发送超时')), config.videoSendTimeout))
+                    ]);
+                }
             }
             catch (err) {
-                if (!config.ignoreSendError)
-                    throw err;
-                return null;
+                const errMsg = getErrorMessage(err);
+                debugLog('ERROR', `第${attempt + 1}次发送失败: ${errMsg}`);
+                if (attempt < maxRetries) {
+                    debugLog('INFO', `等待 ${retryDelay}ms 后进行第 ${attempt + 2} 次重试`);
+                    await delay(retryDelay);
+                }
+                else {
+                    // 最后一次失败，根据配置决定是否抛出
+                    if (!config.ignoreSendError)
+                        throw err;
+                    return null;
+                }
             }
         }
-        try {
-            return await Promise.race([
-                session.send(content),
-                new Promise((_, reject) => setTimeout(() => reject(new Error('发送超时')), config.videoSendTimeout))
-            ]);
-        }
-        catch (err) {
-            if (!config.ignoreSendError)
-                throw err;
-            return null;
-        }
+        return null;
     }
     async function flush(session, urls) {
         const items = [];
@@ -407,7 +421,7 @@ function apply(ctx, config) {
             }
         }
         if (errors.length) {
-            await sendWithTimeout(session, `${texts.parseErrorPrefix}\n${errors.join('\n')}`).catch(() => { });
+            await sendWithTimeout(session, `${texts.parseErrorPrefix}\n${errors.join('\n')}`);
             await delay(500);
         }
         if (!items.length)
@@ -440,10 +454,7 @@ function apply(ctx, config) {
                     forwardMessages.push(buildForwardNode(session, videoMsg, botName));
                 }
                 else {
-                    try {
-                        await sendWithTimeout(session, videoMsg);
-                    }
-                    catch { }
+                    await sendWithTimeout(session, videoMsg).catch(() => { });
                     await delay(500);
                 }
             }
@@ -456,20 +467,20 @@ function apply(ctx, config) {
                 }
                 else {
                     for (const url of imageUrls) {
-                        try {
-                            await sendWithTimeout(session, koishi_1.h.image(url));
-                            await delay(200);
-                        }
-                        catch { }
+                        await sendWithTimeout(session, koishi_1.h.image(url)).catch(() => { });
+                        await delay(200);
                     }
                 }
             }
         }
         if (enableForward && forwardMessages.length) {
+            // 合并转发发送时也使用重试机制，失败后降级逐条发送
+            const forwardMsg = (0, koishi_1.h)('message', { forward: true }, forwardMessages.slice(0, 100));
             try {
-                await sendWithTimeout(session, (0, koishi_1.h)('message', { forward: true }, forwardMessages.slice(0, 100)));
+                await sendWithTimeout(session, forwardMsg, config.retryTimes); // 使用相同的重试次数
             }
             catch {
+                debugLog('ERROR', '合并转发发送最终失败，降级为逐条发送');
                 for (const node of forwardMessages) {
                     try {
                         await sendWithTimeout(session, node.data.content);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-video-parser-all",
   "description": "Koishi 全平台视频解析插件，支持抖音/快手/B站/微博/小红书/剪映/YouTube/TikTok等20+平台",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/readme.md

@@ -10,6 +10,7 @@
 - 🐛 内置Debug调试模式，可详细记录所有操作与API交互日志
 - 📤 支持OneBot平台消息合并转发，优化多图文展示体验
 - 💬 所有提示文案均可自定义，适配多语言场景
+- 🔁 消息发送支持自动重试，与API重试配置联动，增强稳定性
 
 ### English
 This is a **multi-platform video/image parsing plugin** developed for the Koishi bot framework, using a unified API interface to automatically recognize and parse short video/image links from 20+ mainstream platforms such as Douyin, Kuaishou, Bilibili, Xiaohongshu, Weibo, YouTube, TikTok, Jianying, AcFun, Zhihu, Huya and more. Core features:
@@ -19,6 +20,7 @@ This is a **multi-platform video/image parsing plugin** developed for the Koishi
 - 🐛 Built-in Debug mode, recording detailed operations and API interaction logs
 - 📤 Support OneBot message forwarding for better image/video display
 - 💬 All prompt texts are customizable for multilingual scenarios
+- 🔁 Message sending supports automatic retries, linked with API retry configuration for improved stability
 
 ## 项目仓库 (Repository)
 - GitHub: `https://github.com/Minecraft-1314/koishi-plugin-video-parser-all`
@@ -63,8 +65,8 @@ This is a **multi-platform video/image parsing plugin** developed for the Koishi
 | 配置项 | 类型 | 默认值 | 说明 |
 |--------|------|--------|------|
 | `ignoreSendError` | boolean | true | 是否忽略消息发送失败，避免插件崩溃 |
-| `retryTimes` | number | 3 | API 请求失败时的重试次数 |
-| `retryInterval` | number | 1000 | 重试间隔时间（毫秒） |
+| `retryTimes` | number | 3 | API 请求及消息发送失败时的重试次数 |
+| `retryInterval` | number | 1000 | API 请求及消息发送重试的间隔时间（毫秒） |
 
 ### 发送方式设置
 | 配置项 | 类型 | 默认值 | 说明 |