koishi-plugin-video-parser-all 1.0.4 → 1.0.6

package/lib/index.d.ts

@@ -15,7 +15,6 @@ export declare const Config: Schema<{
     tempDir?: string | null | undefined;
     maxVideoSize?: number | null | undefined;
     forceDownloadVideo?: boolean | null | undefined;
-    videoLoadWaitTime?: number | null | undefined;
 } & {
     timeout?: number | null | undefined;
     videoSendTimeout?: number | null | undefined;
@@ -47,7 +46,6 @@ export declare const Config: Schema<{
     tempDir: string;
     maxVideoSize: number;
     forceDownloadVideo: boolean;
-    videoLoadWaitTime: number;
 } & {
     timeout: number;
     videoSendTimeout: number;

package/lib/index.js

@@ -31,7 +31,6 @@ exports.Config = koishi_1.Schema.intersect([
         tempDir: koishi_1.Schema.string().default('./temp_videos').description('临时视频存储目录'),
         maxVideoSize: koishi_1.Schema.number().min(0).step(1).default(0).description('最大下载视频大小（MB），0 为不限制大小'),
         forceDownloadVideo: koishi_1.Schema.boolean().default(false).description('强制下载视频后发送'),
-        videoLoadWaitTime: koishi_1.Schema.number().min(0).step(1).default(180000).description('视频链接加载等待时间（毫秒），获取到视频链接后等待指定时间再发送，0为不等待'),
     }).description('内容显示设置'),
     koishi_1.Schema.object({
         timeout: koishi_1.Schema.number().min(0).step(1).default(180000).description('API 请求超时（毫秒）'),
@@ -517,21 +516,6 @@ function getErrorMessage(error) {
         return error.message;
     return String(error);
 }
-function isSpecialPlatformVideo(url) {
-    const specialHosts = [
-        'bilibili.com',
-        'akamaized.net',
-        'hdslb.com',
-        'xiaohongshu.com',
-        'xhslink.com',
-        'zhihu.com',
-        'weibo.com',
-        'sinaimg.cn',
-        'ixigua.com',
-        'toutiao.com',
-    ];
-    return specialHosts.some(host => url.includes(host));
-}
 function apply(ctx, config) {
     debugEnabled = config.debug || false;
     debugLog('INFO', '插件初始化开始');
@@ -658,39 +642,49 @@ function apply(ctx, config) {
     async function sendVideoFile(session, videoUrl) {
         if (!videoUrl)
             throw new Error('视频链接为空');
-        if (config.videoLoadWaitTime > 0) {
-            await delay(config.videoLoadWaitTime);
-        }
-        await sendWithTimeout(session, `视频链接：${videoUrl}`).catch(() => { });
         if (!config.showVideoFile) {
-            return null;
+            return await sendWithTimeout(session, `视频链接：${videoUrl}`);
         }
-        if (!config.forceDownloadVideo) {
+        const sendLinkAsFallback = async () => {
+            await sendWithTimeout(session, `视频链接：${videoUrl}`).catch(() => { });
+        };
+        const tryDownloadAndSend = async () => {
+            let tempFilePath = null;
             try {
-                debugLog('INFO', `尝试直接发送视频URL: ${videoUrl.substring(0, 100)}...`);
-                const result = await sendWithTimeout(session, koishi_1.h.video(videoUrl));
-                if (result) {
-                    debugLog('INFO', '直接发送视频URL成功');
-                    return result;
+                tempFilePath = await downloadVideoFile(videoUrl, config.tempDir || './temp_videos', config.videoDownloadTimeout || 120000, config.maxVideoSize || 0);
+                const localFile = `file://${tempFilePath}`;
+                debugLog('INFO', `发送本地视频文件: ${localFile}`);
+                return await sendWithTimeout(session, koishi_1.h.video(localFile));
+            }
+            finally {
+                if (tempFilePath) {
+                    promises_1.default.unlink(tempFilePath).catch(e => debugLog('WARN', `删除临时文件失败: ${e}`));
                 }
             }
+        };
+        if (config.forceDownloadVideo) {
+            try {
+                return await tryDownloadAndSend();
+            }
             catch (err) {
-                debugLog('ERROR', `直接发送URL失败，开始下载视频: ${getErrorMessage(err)}`);
+                debugLog('ERROR', `下载并发送视频失败: ${getErrorMessage(err)}`);
+                await sendLinkAsFallback();
             }
         }
         else {
-            debugLog('INFO', `强制下载视频后发送: ${videoUrl.substring(0, 100)}...`);
-        }
-        let tempFilePath = null;
-        try {
-            tempFilePath = await downloadVideoFile(videoUrl, config.tempDir || './temp_videos', config.videoDownloadTimeout || 120000, config.maxVideoSize || 0);
-            const localFile = `file://${tempFilePath}`;
-            debugLog('INFO', `发送本地视频文件: ${localFile}`);
-            return await sendWithTimeout(session, koishi_1.h.video(localFile));
-        }
-        finally {
-            if (tempFilePath) {
-                promises_1.default.unlink(tempFilePath).catch(e => debugLog('WARN', `删除临时文件失败: ${e}`));
+            try {
+                debugLog('INFO', `尝试直接发送视频URL: ${videoUrl.substring(0, 100)}...`);
+                return await sendWithTimeout(session, koishi_1.h.video(videoUrl));
+            }
+            catch (err) {
+                debugLog('ERROR', `直接发送URL失败，尝试下载: ${getErrorMessage(err)}`);
+                try {
+                    return await tryDownloadAndSend();
+                }
+                catch (downloadErr) {
+                    debugLog('ERROR', `下载并发送视频也失败: ${getErrorMessage(downloadErr)}`);
+                    await sendLinkAsFallback();
+                }
             }
         }
     }
@@ -724,11 +718,28 @@ function apply(ctx, config) {
             debugLog('INFO', '没有成功解析的内容');
             return;
         }
+        // 先发送所有视频（单独发送，在合并转发之前）
+        for (const item of items) {
+            const p = item.parsed;
+            if (p.video && (p.type === 'video' || (p.type === 'live' && !p.live_photo?.length && !p.images?.length))) {
+                if (config.showVideoFile) {
+                    try {
+                        await sendVideoFile(session, p.video);
+                    }
+                    catch (e) {
+                        debugLog('ERROR', `视频发送失败: ${getErrorMessage(e)}`);
+                    }
+                }
+                else {
+                    await sendWithTimeout(session, `视频链接：${p.video}`);
+                }
+                await delay(500);
+            }
+        }
         const enableForward = config.enableForward && session.platform === 'onebot';
         const botName = config.botName || '视频解析机器人';
         if (enableForward) {
             const forwardMessages = [];
-            const videoItems = [];
             for (const item of items) {
                 const p = item.parsed;
                 const text = item.text;
@@ -744,10 +755,7 @@ function apply(ctx, config) {
                         forwardMessages.push(buildForwardNode(session, koishi_1.h.image(imgUrl), botName));
                     }
                 }
-                if (p.video && config.showVideoFile && (p.type === 'video' || (p.type === 'live' && !p.live_photo?.length && !p.images?.length))) {
-                    forwardMessages.push(buildForwardNode(session, `视频链接：${p.video}`, botName));
-                    videoItems.push(p);
-                }
+                // 视频已单独发送，合并转发中不再添加
             }
             if (forwardMessages.length) {
                 const forwardMsg = (0, koishi_1.h)('message', { forward: true }, forwardMessages.slice(0, 100));
@@ -763,17 +771,9 @@ function apply(ctx, config) {
                     }
                 }
             }
-            for (const p of videoItems) {
-                try {
-                    await sendVideoFile(session, p.video);
-                }
-                catch (err) {
-                    debugLog('ERROR', `视频发送失败: ${getErrorMessage(err)}`);
-                }
-                await delay(500);
-            }
         }
         else {
+            // 非合并转发，只发送文字、封面、图片（视频已在之前发过）
             for (const item of items) {
                 const p = item.parsed;
                 const text = item.text;
@@ -785,15 +785,6 @@ function apply(ctx, config) {
                     await sendWithTimeout(session, koishi_1.h.image(p.cover)).catch(() => { });
                     await delay(300);
                 }
-                if (p.video && (p.type === 'video' || (p.type === 'live' && !p.live_photo?.length && !p.images?.length))) {
-                    try {
-                        await sendVideoFile(session, p.video);
-                    }
-                    catch (err) {
-                        debugLog('ERROR', `视频发送失败: ${getErrorMessage(err)}`);
-                    }
-                    await delay(500);
-                }
                 if (p.type === 'image' || p.type === 'live_photo' || (p.type === 'live' && (p.live_photo?.length || p.images?.length))) {
                     const imageUrls = p.images?.length ? p.images : (p.live_photo?.map(lp => lp.image) ?? []);
                     for (const imgUrl of imageUrls) {

package/package.json

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

package/readme.md

@@ -63,7 +63,6 @@ This is a **multi-platform video/image parsing plugin** developed for the Koishi
 | `tempDir` | string | `./temp_videos` | 临时视频存储目录 |
 | `maxVideoSize` | number | 0 | 最大下载视频大小（MB），0 为不限制大小 |
 | `forceDownloadVideo` | boolean | false | 强制下载视频后发送 |
-| `videoLoadWaitTime` | number | 180000 | 视频链接加载等待时间（毫秒），获取到视频链接后等待指定时间再发送，0为不等待 |
 
 ### 网络与 API 设置
 | 配置项 | 类型 | 默认值 | 说明 |