koishi-plugin-video-parser-all 1.0.2 → 1.0.3

package/lib/index.d.ts

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

package/lib/index.js

@@ -11,6 +11,7 @@ const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 const fs_1 = require("fs");
 const promises_2 = require("stream/promises");
+const lru_cache_1 = require("lru-cache");
 exports.name = 'video-parser-all';
 exports.Config = koishi_1.Schema.intersect([
     koishi_1.Schema.object({
@@ -25,24 +26,25 @@ exports.Config = koishi_1.Schema.intersect([
     koishi_1.Schema.object({
         showImageText: koishi_1.Schema.boolean().default(true).description('是否发送解析后的文字内容'),
         showVideoFile: koishi_1.Schema.boolean().default(true).description('是否发送视频文件（关闭则只发送视频链接）'),
-        maxDescLength: koishi_1.Schema.number().default(200).description('简介内容最大长度（字符），超出自动截断'),
-        videoDownloadTimeout: koishi_1.Schema.number().default(120000).description('视频下载超时（毫秒）'),
+        maxDescLength: koishi_1.Schema.number().min(0).step(1).default(200).description('简介内容最大长度（字符），超出自动截断'),
+        videoDownloadTimeout: koishi_1.Schema.number().min(0).step(1).default(120000).description('视频下载超时（毫秒）'),
         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(true).description('强制下载视频后发送（解决B站、小红书等平台URL无法直接发送的问题）'),
+        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).default(180000).description('API 请求超时（毫秒）'),
-        videoSendTimeout: koishi_1.Schema.number().min(0).default(60000).description('视频消息发送超时（毫秒，0 为不限制）'),
-        userAgent: koishi_1.Schema.string().default('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36').description('API 请求 UA'),
+        timeout: koishi_1.Schema.number().min(0).step(1).default(180000).description('API 请求超时（毫秒）'),
+        videoSendTimeout: koishi_1.Schema.number().min(0).step(1).default(60000).description('视频消息发送超时（毫秒，0 为不限制）'),
+        userAgent: koishi_1.Schema.string().default('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36').description('API 请求 UA'),
     }).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).step(1).default(3).description('API 请求及消息发送失败时的重试次数'),
+        retryInterval: koishi_1.Schema.number().min(0).step(1).default(1000).description('重试间隔（毫秒，同时用于消息发送重试）'),
     }).description('错误与重试设置'),
     koishi_1.Schema.object({
-        enableForward: koishi_1.Schema.boolean().default(false).description('启用合并转发（仅 OneBot 平台），视频会单独发送'),
+        enableForward: koishi_1.Schema.boolean().default(false).description('启用合并转发（仅 OneBot 平台）'),
     }).description('发送方式设置'),
     koishi_1.Schema.object({
         waitingTipText: koishi_1.Schema.string().default('正在解析视频，请稍候...').description('解析等待提示'),
@@ -58,14 +60,24 @@ function debugLog(level, ...args) {
     if (!debugEnabled)
         return;
     const timestamp = new Date().toISOString();
-    const message = `[${timestamp}] [${level}] ${args.map(a => typeof a === 'object' ? JSON.stringify(a, null, 2) : String(a)).join(' ')}`;
+    const message = `[${timestamp}] [${level}] ${args.map(a => {
+        if (typeof a === 'object') {
+            try {
+                return JSON.stringify(a, null, 2);
+            }
+            catch {
+                return String(a);
+            }
+        }
+        return String(a);
+    }).join(' ')}`;
     logger.info(message);
 }
 function linkTypeParser(content) {
     content = content.replace(/\\\//g, '/');
     const rules = [
         { pattern: /bilibili\.com\/video\/([ab]v[0-9a-zA-Z]+)/gi, type: 'bilibili', buildUrl: (id) => `https://www.bilibili.com/video/${id}` },
-        { pattern: /b23\.tv(?:\\)?\/([0-9a-zA-Z]+)/gi, type: 'bilibili', buildUrl: (id) => `https://b23.tv/${id}` },
+        { pattern: /b23\.tv\/([0-9a-zA-Z]+)/gi, type: 'bilibili', buildUrl: (id) => `https://b23.tv/${id}` },
         { pattern: /bili(?:22|23|33)\.cn\/([0-9a-zA-Z]+)/gi, type: 'bilibili', buildUrl: (id) => `https://bili23.cn/${id}` },
         { pattern: /bili2233\.cn\/([0-9a-zA-Z]+)/gi, type: 'bilibili', buildUrl: (id) => `https://bili2233.cn/${id}` },
         { pattern: /douyin\.com\/video\/(\d+)/gi, type: 'douyin', buildUrl: (id) => `https://www.douyin.com/video/${id}` },
@@ -108,17 +120,26 @@ function linkTypeParser(content) {
     return matches;
 }
 function extractUrl(content) {
-    const urlMatches = content.match(/https?:\/\/[^\s\"\'\>]+/gi) || [];
+    if (!content)
+        return [];
+    const urlMatches = content.match(/https?:\/\/[^\s<>"'(){}[\]]+/gi) || [];
     return urlMatches.filter(url => {
         try {
-            const hostname = new URL(url).hostname.toLowerCase();
-            if (hostname === 'multimedia.nt.qq.com.cn')
+            const urlObj = new URL(url);
+            const hostname = urlObj.hostname.toLowerCase();
+            if (hostname.includes('multimedia.nt.qq.com.cn') ||
+                hostname.includes('grouptalk.qq.com') ||
+                hostname.includes('qpic.cn') ||
+                hostname.includes('qlogo.cn')) {
                 return false;
+            }
             return true;
         }
         catch {
             return false;
         }
+    }).map(url => {
+        return url.replace(/[.,;:!?)]+$/, '');
     });
 }
 function extractAllUrlsFromMessage(session) {
@@ -138,10 +159,11 @@ function extractAllUrlsFromMessage(session) {
     if (session.elements) {
         for (const elem of session.elements) {
             if (elem.type === 'xml' && elem.data) {
-                const urlRegex = /https?:\/\/[^\s<>"']+/gi;
+                const urlRegex = /https?:\/\/[^\s<>"'(){}[\]]+/gi;
                 let match;
                 while ((match = urlRegex.exec(elem.data)) !== null) {
-                    urls.push(match[0]);
+                    const cleanUrl = match[0].replace(/[.,;:!?)]+$/, '');
+                    urls.push(cleanUrl);
                 }
             }
             else if (elem.type === 'json' && elem.data) {
@@ -152,9 +174,13 @@ function extractAllUrlsFromMessage(session) {
                             return;
                         for (const val of Object.values(obj)) {
                             if (typeof val === 'string') {
-                                const match = val.match(/https?:\/\/[^\s<>"']+/gi);
-                                if (match)
-                                    urls.push(...match);
+                                const match = val.match(/https?:\/\/[^\s<>"'(){}[\]]+/gi);
+                                if (match) {
+                                    match.forEach(url => {
+                                        const cleanUrl = url.replace(/[.,;:!?)]+$/, '');
+                                        urls.push(cleanUrl);
+                                    });
+                                }
                             }
                             else if (typeof val === 'object')
                                 extractFromObject(val);
@@ -162,7 +188,9 @@ function extractAllUrlsFromMessage(session) {
                     };
                     extractFromObject(json);
                 }
-                catch { }
+                catch (e) {
+                    debugLog('WARN', '解析JSON卡片失败:', e);
+                }
             }
         }
     }
@@ -172,14 +200,25 @@ function cleanUrl(url) {
     try {
         url = url.replace(/&amp;/g, '&');
         const urlObj = new URL(url);
+        if (urlObj.protocol === 'http:') {
+            urlObj.protocol = 'https:';
+        }
         if (urlObj.hostname.includes('douyin.com') || urlObj.hostname.includes('v.douyin.com')) {
-            urlObj.searchParams.delete('source');
-            urlObj.searchParams.delete('share_type');
+            ['source', 'share_type', 'share_token', 'timestamp', 'from', 'isappinstalled'].forEach(p => {
+                urlObj.searchParams.delete(p);
+            });
+            return urlObj.origin + urlObj.pathname;
+        }
+        if (urlObj.hostname.includes('bilibili.com') || urlObj.hostname.includes('b23.tv')) {
+            ['share_source', 'share_medium', 'share_plat', 'share_session_id', 'share_tag', 'timestamp'].forEach(p => {
+                urlObj.searchParams.delete(p);
+            });
             return urlObj.origin + urlObj.pathname;
         }
-        return url;
+        return urlObj.toString();
     }
     catch (e) {
+        debugLog('WARN', '清理URL失败:', e, '原始URL:', url);
         return url.replace(/&amp;/g, '&').replace(/\?.*/, '');
     }
 }
@@ -198,6 +237,7 @@ async function resolveShortUrl(url) {
         return cleanUrl(finalUrl);
     }
     catch (e) {
+        debugLog('WARN', '解析短链接失败:', e, '原始URL:', url);
         return cleanUrl(url);
     }
 }
@@ -209,7 +249,7 @@ function formatDuration(seconds) {
     const s = Math.floor(seconds % 60);
     if (h > 0)
         return `${h}:${m.toString().padStart(2, '0')}:${s.toString().padStart(2, '0')}`;
-    return `${m}:${s.toString().padStart(2, '0')}:${s.toString().padStart(2, '0')}`;
+    return `${m.toString().padStart(2, '0')}:${s.toString().padStart(2, '0')}`;
 }
 function formatPublishTime(ms) {
     if (!ms)
@@ -222,8 +262,13 @@ function pickBestQuality(videoBackup) {
     if (!Array.isArray(videoBackup))
         return [];
     return videoBackup
-        .map(v => ({ quality: v.quality || v.label, url: v.url, bit_rate: v.bit_rate || 0 }))
-        .sort((a, b) => (b.bit_rate || 0) - (a.bit_rate || 0));
+        .filter(v => v && v.url)
+        .map(v => ({
+        quality: v.quality || v.label || 'unknown',
+        url: v.url,
+        bit_rate: Number(v.bit_rate || 0)
+    }))
+        .sort((a, b) => b.bit_rate - a.bit_rate);
 }
 function parseApiResponse(raw, maxDescLen) {
     debugLog('DEBUG', '原始API返回数据:', raw);
@@ -253,24 +298,44 @@ function parseApiResponse(raw, maxDescLen) {
         avatar = data.avatar || '';
     }
     const title = data.title || '';
-    const desc = (data.desc || data.description || '').slice(0, maxDescLen);
+    const desc = (data.desc || data.description || '').slice(0, maxDescLen).trim();
     const cover = data.cover || '';
     let video = '';
     let videos = [];
     if (Array.isArray(data.video_backup) && data.video_backup.length) {
         const bestQ = pickBestQuality(data.video_backup);
         videos = bestQ;
-        video = bestQ[0]?.url || data.url || '';
+        video = bestQ[0]?.url || '';
     }
-    else if (Array.isArray(data.videos) && data.videos.length) {
-        video = data.videos[0]?.url || '';
-        videos = data.videos.map((v) => ({ quality: v.accept?.[0] || 'unknown', url: v.url }));
+    if (!video && Array.isArray(data.videos) && data.videos.length) {
+        const validVideos = data.videos.filter((v) => v && v.url);
+        if (validVideos.length) {
+            video = validVideos[0].url;
+            videos = validVideos.map((v) => ({
+                quality: v.accept?.[0] || 'unknown',
+                url: v.url
+            }));
+        }
     }
-    else {
-        video = data.url || '';
+    if (!video && data.url) {
+        video = data.url;
+    }
+    if (video && !video.startsWith('http')) {
+        video = 'https:' + video;
     }
-    const images = Array.isArray(data.images) ? data.images : [];
-    const live_photo = Array.isArray(data.live_photo) ? data.live_photo : [];
+    const images = Array.isArray(data.images)
+        ? data.images.filter((img) => img && typeof img === 'string').map((img) => {
+            if (!img.startsWith('http'))
+                return 'https:' + img;
+            return img;
+        })
+        : [];
+    const live_photo = Array.isArray(data.live_photo)
+        ? data.live_photo.filter((lp) => lp && lp.image).map((lp) => ({
+            image: lp.image.startsWith('http') ? lp.image : 'https:' + lp.image,
+            video: lp.video ? (lp.video.startsWith('http') ? lp.video : 'https:' + lp.video) : ''
+        }))
+        : [];
     const music = {
         title: data.music?.title || data.music?.name || '',
         author: data.music?.author || data.music?.artist || '',
@@ -301,6 +366,10 @@ function parseApiResponse(raw, maxDescLen) {
     else if (extra.create_time) {
         publishTime = extra.create_time * 1000;
     }
+    debugLog('DEBUG', '解析后的数据:', {
+        type, title, author, video: video.substring(0, 100) + '...',
+        images: images.length, live_photo: live_photo.length
+    });
     return {
         type, title, desc, author, uid, avatar, cover,
         video, videos, images, live_photo, music,
@@ -324,6 +393,7 @@ function generateFormattedText(p, format) {
         '图片数量': String(imageCount),
         '作者ID': p.uid,
         '封面': p.cover,
+        '视频链接': p.video,
     };
     const lines = format.split('\n');
     const resultLines = [];
@@ -359,24 +429,46 @@ function buildForwardNode(session, content, botName) {
         messageContent = [content];
     else
         messageContent = [koishi_1.h.text(String(content))];
-    return (0, koishi_1.h)('node', { user: { nickname: botName.substring(0, 15), user_id: session.selfId } }, messageContent);
+    return (0, koishi_1.h)('node', {
+        user: {
+            nickname: botName.substring(0, 15),
+            user_id: session.selfId
+        }
+    }, messageContent);
 }
-const urlCache = new Map();
-const CACHE_TTL = 10 * 60 * 1000;
+const urlCache = new lru_cache_1.LRUCache({
+    max: 500,
+    ttl: 10 * 60 * 1000,
+    updateAgeOnGet: false,
+});
 async function downloadVideoFile(videoUrl, tempDir, timeout, maxSizeMB) {
+    if (!videoUrl)
+        throw new Error('视频链接为空');
     await promises_1.default.mkdir(tempDir, { recursive: true });
     const fileName = `video_${Date.now()}_${Math.random().toString(36).substring(2, 8)}.mp4`;
-    const filePath = path_1.default.join(tempDir, fileName);
+    const filePath = path_1.default.resolve(tempDir, fileName);
+    debugLog('INFO', `开始下载视频: ${videoUrl.substring(0, 100)}...`);
+    debugLog('INFO', `临时文件路径: ${filePath}`);
     const writer = (0, fs_1.createWriteStream)(filePath);
-    const response = await (0, axios_1.default)({
-        method: 'GET',
-        url: videoUrl,
-        responseType: 'stream',
-        timeout: timeout,
-        headers: {
-            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36',
-        }
-    });
+    let response;
+    try {
+        response = await (0, axios_1.default)({
+            method: 'GET',
+            url: videoUrl,
+            responseType: 'stream',
+            timeout: timeout,
+            headers: {
+                'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36',
+                'Referer': 'https://www.baidu.com/',
+            },
+            validateStatus: (status) => status >= 200 && status < 300,
+        });
+    }
+    catch (e) {
+        writer.destroy();
+        await promises_1.default.unlink(filePath).catch(() => { });
+        throw new Error(`下载视频失败: ${getErrorMessage(e)}`);
+    }
     const maxSizeBytes = maxSizeMB * 1024 * 1024;
     const contentLength = Number(response.headers['content-length'] || 0);
     if (maxSizeMB > 0 && contentLength > maxSizeBytes) {
@@ -394,8 +486,15 @@ async function downloadVideoFile(videoUrl, tempDir, timeout, maxSizeMB) {
             throw new Error(`视频文件过大，超过限制(${maxSizeMB}MB)`);
         }
     });
-    await (0, promises_2.pipeline)(response.data, writer);
-    return filePath;
+    try {
+        await (0, promises_2.pipeline)(response.data, writer);
+        debugLog('INFO', `视频下载完成，大小: ${Math.round(downloadedSize / 1024 / 1024)}MB`);
+        return filePath;
+    }
+    catch (e) {
+        await promises_1.default.unlink(filePath).catch(() => { });
+        throw new Error(`写入视频文件失败: ${getErrorMessage(e)}`);
+    }
 }
 function getErrorMessage(error) {
     if (error instanceof Error)
@@ -411,10 +510,36 @@ function isSpecialPlatformVideo(url) {
         'xhslink.com',
         'zhihu.com',
         'weibo.com',
-        'sinaimg.cn'
+        'sinaimg.cn',
+        'ixigua.com',
+        'toutiao.com',
     ];
     return specialHosts.some(host => url.includes(host));
 }
+async function getShortUrl(url) {
+    if (!url)
+        return '';
+    try {
+        const urlObj = new URL(url);
+        if (urlObj.hostname.includes('bilibili.com')) {
+            const bvMatch = url.match(/\/video\/(bv[0-9a-zA-Z]+)/i);
+            if (bvMatch)
+                return `https://b23.tv/${bvMatch[1]}`;
+        }
+        if (urlObj.hostname.includes('douyin.com')) {
+            const idMatch = url.match(/\/video\/(\d+)/);
+            if (idMatch)
+                return `https://v.douyin.com/${idMatch[1].substring(0, 8)}/`;
+        }
+        if (urlObj.hostname.includes('xiaohongshu.com')) {
+            const idMatch = url.match(/\/item\/([0-9a-zA-Z]+)/);
+            if (idMatch)
+                return `https://xhslink.com/${idMatch[1].substring(0, 8)}`;
+        }
+    }
+    catch { }
+    return url;
+}
 function apply(ctx, config) {
     debugEnabled = config.debug || false;
     debugLog('INFO', '插件初始化开始');
@@ -428,7 +553,7 @@ function apply(ctx, config) {
     const http = axios_1.default.create({
         timeout: config.timeout,
         headers: {
-            'User-Agent': config.userAgent || 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36',
+            'User-Agent': config.userAgent,
             'Referer': 'https://www.baidu.com/',
             'Content-Type': 'application/x-www-form-urlencoded'
         }
@@ -448,13 +573,16 @@ function apply(ctx, config) {
                     params: { url },
                     timeout: config.timeout
                 });
-                debugLog('DEBUG', `API响应: ${JSON.stringify(res.data)}`);
+                debugLog('DEBUG', `API响应状态: ${res.status}`);
                 if (res.data && (res.data.code === 200 || res.data.code === 0)) {
                     const parsed = parseApiResponse(res.data, config.maxDescLength);
-                    urlCache.set(cacheKey, { data: parsed, expire: Date.now() + CACHE_TTL });
+                    urlCache.set(cacheKey, {
+                        data: parsed,
+                        expire: Date.now() + 10 * 60 * 1000
+                    });
                     return parsed;
                 }
-                throw new Error(res.data?.msg || '解析失败');
+                throw new Error(res.data?.msg || `API返回错误码: ${res.data?.code}`);
             }
             catch (error) {
                 lastError = error instanceof Error ? error : new Error(String(error));
@@ -472,7 +600,10 @@ function apply(ctx, config) {
         for (const candidate of [...new Set(candidates)]) {
             try {
                 const info = await fetchApi(candidate);
-                return { success: true, data: info };
+                if (info.video || info.images.length > 0) {
+                    return { success: true, data: info };
+                }
+                debugLog('WARN', `解析成功但无有效内容: ${candidate}`);
             }
             catch (error) {
                 debugLog('ERROR', `候选链接解析失败: ${candidate}`, getErrorMessage(error));
@@ -482,10 +613,19 @@ function apply(ctx, config) {
     }
     async function processSingleUrl(url) {
         const result = await parseUrl(url);
-        if (!result.success)
-            return result;
+        if (!result.success) {
+            return { success: false, msg: result.msg, url };
+        }
         const text = generateFormattedText(result.data, config.unifiedMessageFormat);
-        return { success: true, data: { text, parsed: result.data } };
+        const shortUrl = await getShortUrl(result.data.video);
+        return {
+            success: true,
+            data: {
+                text,
+                parsed: result.data,
+                shortUrl
+            }
+        };
     }
     async function sendWithTimeout(session, content, customRetries) {
         const maxRetries = customRetries ?? config.retryTimes ?? 3;
@@ -525,9 +665,18 @@ function apply(ctx, config) {
         }
         return null;
     }
-    async function sendVideoFile(session, videoUrl) {
+    async function sendVideoFile(session, videoUrl, shortUrl) {
         if (!videoUrl)
             throw new Error('视频链接为空');
+        if (config.videoLoadWaitTime > 0) {
+            await delay(config.videoLoadWaitTime);
+        }
+        if (shortUrl) {
+            await sendWithTimeout(session, `视频链接：${shortUrl}`).catch(() => { });
+        }
+        if (!config.showVideoFile) {
+            return null;
+        }
         const shouldForceDownload = config.forceDownloadVideo || isSpecialPlatformVideo(videoUrl);
         if (!shouldForceDownload) {
             try {
@@ -544,8 +693,8 @@ function apply(ctx, config) {
         let tempFilePath = null;
         try {
             tempFilePath = await downloadVideoFile(videoUrl, config.tempDir || './temp_videos', config.videoDownloadTimeout || 120000, config.maxVideoSize || 0);
-            const localFile = `file://${path_1.default.resolve(tempFilePath)}`;
-            debugLog('INFO', `视频下载完成，发送本地文件: ${localFile}`);
+            const localFile = `file://${tempFilePath}`;
+            debugLog('INFO', `发送本地视频文件: ${localFile}`);
             return await sendWithTimeout(session, koishi_1.h.video(localFile));
         }
         finally {
@@ -556,6 +705,7 @@ function apply(ctx, config) {
     }
     async function flush(session, urls) {
         const uniqueUrls = [...new Set(urls)];
+        debugLog('INFO', `开始解析 ${uniqueUrls.length} 个链接`);
         const items = [];
         const errors = [];
         const concurrency = 3;
@@ -583,16 +733,19 @@ function apply(ctx, config) {
             await sendWithTimeout(session, `${texts.parseErrorPrefix}\n${errors.join('\n')}`);
             await delay(500);
         }
-        if (!items.length)
+        if (!items.length) {
+            debugLog('INFO', '没有成功解析的内容');
             return;
+        }
         const enableForward = config.enableForward && session.platform === 'onebot';
         const botName = config.botName || '视频解析机器人';
-        const videoItems = [];
         if (enableForward) {
             const forwardMessages = [];
+            const videoItems = [];
             for (const item of items) {
                 const p = item.parsed;
                 const text = item.text;
+                const shortUrl = item.shortUrl;
                 if (text && config.showImageText) {
                     forwardMessages.push(buildForwardNode(session, text, botName));
                 }
@@ -606,12 +759,16 @@ function apply(ctx, config) {
                     }
                 }
                 if (p.video && config.showVideoFile && (p.type === 'video' || (p.type === 'live' && !p.live_photo?.length && !p.images?.length))) {
-                    videoItems.push(p);
+                    videoItems.push({ parsed: p, shortUrl });
+                    if (shortUrl) {
+                        forwardMessages.push(buildForwardNode(session, `视频链接：${shortUrl}`, botName));
+                    }
                 }
             }
             if (forwardMessages.length) {
                 const forwardMsg = (0, koishi_1.h)('message', { forward: true }, forwardMessages.slice(0, 100));
                 try {
+                    debugLog('INFO', `发送合并转发消息，包含 ${forwardMessages.length} 条内容`);
                     await sendWithTimeout(session, forwardMsg, config.retryTimes);
                 }
                 catch (err) {
@@ -622,13 +779,12 @@ function apply(ctx, config) {
                     }
                 }
             }
-            for (const p of videoItems) {
+            for (const item of videoItems) {
                 try {
-                    await sendVideoFile(session, p.video);
+                    await sendVideoFile(session, item.parsed.video, item.shortUrl);
                 }
                 catch (err) {
-                    debugLog('ERROR', `视频发送失败（降级发送链接）: ${getErrorMessage(err)}`);
-                    await sendWithTimeout(session, `视频链接：${p.video}`).catch(() => { });
+                    debugLog('ERROR', `视频发送失败: ${getErrorMessage(err)}`);
                 }
                 await delay(500);
             }
@@ -637,6 +793,7 @@ function apply(ctx, config) {
             for (const item of items) {
                 const p = item.parsed;
                 const text = item.text;
+                const shortUrl = item.shortUrl;
                 if (text && config.showImageText) {
                     await sendWithTimeout(session, text);
                     await delay(300);
@@ -645,13 +802,12 @@ function apply(ctx, config) {
                     await sendWithTimeout(session, koishi_1.h.image(p.cover)).catch(() => { });
                     await delay(300);
                 }
-                if (p.video && config.showVideoFile && (p.type === 'video' || (p.type === 'live' && !p.live_photo?.length && !p.images?.length))) {
+                if (p.video && (p.type === 'video' || (p.type === 'live' && !p.live_photo?.length && !p.images?.length))) {
                     try {
-                        await sendVideoFile(session, p.video);
+                        await sendVideoFile(session, p.video, shortUrl);
                     }
                     catch (err) {
-                        debugLog('ERROR', `视频发送失败（降级发送链接）: ${getErrorMessage(err)}`);
-                        await sendWithTimeout(session, `视频链接：${p.video}`).catch(() => { });
+                        debugLog('ERROR', `视频发送失败: ${getErrorMessage(err)}`);
                     }
                     await delay(500);
                 }
@@ -664,41 +820,78 @@ function apply(ctx, config) {
                 }
             }
         }
+        debugLog('INFO', '所有内容处理完成');
     }
     ctx.on('message', async (session) => {
         if (!config.enable)
             return;
-        // 修复：使用正确的小写subtype属性名
         if (session.subtype === 'file_upload')
             return;
         if (session.elements?.some(elem => elem.type === 'file' || elem.type === 'folder'))
             return;
+        if (session.selfId === session.userId)
+            return;
         const urls = extractAllUrlsFromMessage(session);
         if (!urls.length)
             return;
+        debugLog('INFO', `检测到 ${urls.length} 个链接，开始处理`);
         if (config.showWaitingTip) {
             try {
                 await sendWithTimeout(session, texts.waitingTipText);
             }
-            catch { }
+            catch (e) {
+                debugLog('WARN', '发送等待提示失败:', e);
+            }
         }
         await flush(session, urls);
     });
     ctx.command('parse <url>', '手动解析视频').action(async ({ session }, url) => {
+        if (!url) {
+            await sendWithTimeout(session, texts.invalidLinkText);
+            return;
+        }
         const us = extractUrl(url);
         if (!us.length) {
             await sendWithTimeout(session, texts.invalidLinkText);
             return;
         }
+        if (config.showWaitingTip) {
+            try {
+                await sendWithTimeout(session, texts.waitingTipText);
+            }
+            catch { }
+        }
         await flush(session, us);
     });
-    setInterval(() => {
-        const now = Date.now();
-        for (const [key, { expire }] of urlCache.entries()) {
-            if (expire <= now)
-                urlCache.delete(key);
+    const tempCleanupInterval = setInterval(async () => {
+        try {
+            const tempDir = config.tempDir || './temp_videos';
+            const files = await promises_1.default.readdir(tempDir);
+            const now = Date.now();
+            let deletedCount = 0;
+            for (const file of files) {
+                if (file.startsWith('video_') && file.endsWith('.mp4')) {
+                    const filePath = path_1.default.join(tempDir, file);
+                    const stats = await promises_1.default.stat(filePath);
+                    if (now - stats.mtimeMs > 3600000) {
+                        await promises_1.default.unlink(filePath).catch(() => { });
+                        deletedCount++;
+                    }
+                }
+            }
+            if (deletedCount > 0) {
+                debugLog('INFO', `清理了 ${deletedCount} 个过期临时视频文件`);
+            }
         }
-    }, 60000);
+        catch (e) {
+            debugLog('WARN', '清理临时文件失败:', e);
+        }
+    }, 3600000);
+    ctx.on('dispose', () => {
+        clearInterval(tempCleanupInterval);
+        urlCache.clear();
+        debugLog('INFO', '插件已卸载，资源已清理');
+    });
     process.on('exit', async () => {
         try {
             const tempDir = config.tempDir || './temp_videos';
@@ -708,6 +901,7 @@ function apply(ctx, config) {
                     await promises_1.default.unlink(path_1.default.join(tempDir, file)).catch(() => { });
                 }
             }
+            debugLog('INFO', '进程退出，已清理所有临时视频文件');
         }
         catch { }
     });

package/package.json

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

package/readme.md

@@ -11,7 +11,7 @@
 - 📤 支持OneBot平台消息合并转发，优化多图文展示体验
 - 💬 所有提示文案均可自定义，适配多语言场景
 - 🔁 消息发送支持自动重试，与API重试配置联动，增强稳定性
-- 🚀 内置内存缓存，避免短时间内重复解析同一链接；并发控制，防止资源耗尽
+- 🚀 内置LRU内存缓存，避免短时间内重复解析同一链接；并发控制，防止资源耗尽
 - ⚡ 智能视频发送策略：普通平台优先直接发送URL，特殊平台自动降级为本地文件发送
 - 🛡️ 可选视频大小限制，防止超大文件占满服务器磁盘；自动清理所有临时文件
 
@@ -24,7 +24,7 @@ This is a **multi-platform video/image parsing plugin** developed for the Koishi
 - 📤 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
-- 🚀 Built-in memory cache to avoid repeated parsing of the same URL; concurrency control to prevent resource exhaustion
+- 🚀 Built-in LRU memory cache to avoid repeated parsing of the same URL; concurrency control to prevent resource exhaustion
 - ⚡ Smart video sending strategy: priority to send URL directly for common platforms, auto downgrade to local file for special platforms
 - 🛡️ Optional video size limit to prevent oversized files from filling up server disk; automatic cleanup of all temporary files
 
@@ -63,13 +63,14 @@ This is a **multi-platform video/image parsing plugin** developed for the Koishi
 | `tempDir` | string | `./temp_videos` | 临时视频存储目录 |
 | `maxVideoSize` | number | 0 | 最大下载视频大小（MB），0 为不限制大小 |
 | `forceDownloadVideo` | boolean | true | 强制下载视频后发送（解决B站、小红书等平台URL无法直接发送的问题） |
+| `videoLoadWaitTime` | number | 180000 | 视频链接加载等待时间（毫秒），获取到视频链接后等待指定时间再发送，0为不等待 |
 
 ### 网络与 API 设置
 | 配置项 | 类型 | 默认值 | 说明 |
 |--------|------|--------|------|
 | `timeout` | number | 180000 | API 请求超时时间（毫秒） |
 | `videoSendTimeout` | number | 60000 | 视频消息发送超时时间（毫秒，0 为不限制） |
-| `userAgent` | string | `Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36` | API 请求使用的 User-Agent |
+| `userAgent` | string | `Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36` | API 请求使用的 User-Agent |
 
 ### 错误与重试设置
 | 配置项 | 类型 | 默认值 | 说明 |
@@ -110,6 +111,7 @@ This is a **multi-platform video/image parsing plugin** developed for the Koishi
 | `${图片数量}` | 图集/实况图片数量 | 图集/实况 |
 | `${作者ID}` | 作者唯一标识ID | 部分平台 |
 | `${封面}` | 封面图片地址 | 所有平台 |
+| `${视频链接}` | 视频原始链接 | 视频 |
 
 > 注：部分变量可能因平台API返回数据不同而显示为空，某行所有变量为空（或为"0"）时该行会自动隐藏。