koishi-plugin-video-parser-all 1.2.2 → 1.2.5

package/lib/index.js

@@ -11,8 +11,35 @@ 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 LruCacheModule = require('lru-cache');
-const LRUCache = LruCacheModule.LRUCache || LruCacheModule;
+const crypto_1 = require("crypto");
+class SimpleLRUCache {
+    constructor(max, ttlMs) {
+        this.max = max;
+        this.ttlMs = ttlMs;
+        this.map = new Map();
+    }
+    get(key) {
+        const entry = this.map.get(key);
+        if (!entry)
+            return undefined;
+        if (Date.now() > entry.expireAt) {
+            this.map.delete(key);
+            return undefined;
+        }
+        return entry.value;
+    }
+    set(key, value) {
+        this.map.delete(key);
+        while (this.map.size >= this.max) {
+            const k = this.map.keys().next().value;
+            if (k === undefined)
+                break;
+            this.map.delete(k);
+        }
+        this.map.set(key, { value, expireAt: Date.now() + this.ttlMs });
+    }
+    clear() { this.map.clear(); }
+}
 exports.name = 'video-parser-all';
 exports.Config = koishi_1.Schema.intersect([
     koishi_1.Schema.object({
@@ -22,7 +49,7 @@ exports.Config = koishi_1.Schema.intersect([
         debug: koishi_1.Schema.boolean().default(false).description('开启调试模式，在控制台输出详细日志'),
     }).description('基础设置'),
     koishi_1.Schema.object({
-        unifiedMessageFormat: koishi_1.Schema.string().role('textarea').default(`标题：${'标题'}\n作者：${'作者'}\n简介：${'简介'}\n点赞：${'点赞数'}\n收藏：${'收藏数'}\n转发：${'转发数'}\n播放：${'播放数'}\n评论：${'评论数'}\n图片数量：${'图片数量'}`).description('统一消息格式，可用变量：${标题} ${作者} ${简介} ${点赞数} ${收藏数} ${转发数} ${播放数} ${评论数} ${视频时长} ${发布时间} ${图片数量} ${作者ID} ${封面}'),
+        unifiedMessageFormat: koishi_1.Schema.string().role('textarea').default('标题：${标题}\n作者：${作者}\n简介：${简介}\n点赞：${点赞数}\n收藏：${收藏数}\n转发：${转发数}\n播放：${播放数}\n评论：${评论数}\n图片数量：${图片数量}').description('统一消息格式，可用变量：${标题} ${作者} ${简介} ${点赞数} ${收藏数} ${转发数} ${播放数} ${评论数} ${视频时长} ${发布时间} ${图片数量} ${作者ID} ${封面}'),
     }).description('消息格式设置'),
     koishi_1.Schema.object({
         showImageText: koishi_1.Schema.boolean().default(true).description('是否发送解析后的文字内容'),
@@ -121,44 +148,40 @@ function debugLog(level, ...args) {
     }).join(' ')}`;
     logger.info(message);
 }
-const urlCache = new LRUCache({
-    max: 500,
-    ttl: 10 * 60 * 1000,
-    updateAgeOnGet: false,
-});
+const urlCache = new SimpleLRUCache(500, 10 * 60 * 1000);
+const LINK_RULES = [
+    { pattern: /https?:\/\/(?:www\.)?bilibili\.com\/video\/([ab]v[0-9a-zA-Z_-]+)/gi, type: 'bilibili' },
+    { pattern: /https?:\/\/b23\.tv\/[0-9a-zA-Z_-]{5,}/gi, type: 'bilibili' },
+    { pattern: /https?:\/\/bili\d+\.cn\/[0-9a-zA-Z_-]{5,}/gi, type: 'bilibili' },
+    { pattern: /https?:\/\/(?:www\.)?douyin\.com\/video\/\d{10,}/gi, type: 'douyin' },
+    { pattern: /https?:\/\/v\.douyin\.com\/[0-9a-zA-Z_-]{8,}/gi, type: 'douyin' },
+    { pattern: /https?:\/\/(?:www\.)?kuaishou\.com\/short-video\/[0-9a-zA-Z_-]{10,}/gi, type: 'kuaishou' },
+    { pattern: /https?:\/\/v\.kuaishou\.com\/[0-9a-zA-Z_-]{8,}/gi, type: 'kuaishou' },
+    { pattern: /https?:\/\/(?:www\.)?xiaohongshu\.com\/discovery\/item\/[0-9a-zA-Z_-]{10,}/gi, type: 'xiaohongshu' },
+    { pattern: /https?:\/\/xhslink\.com\/[0-9a-zA-Z_-]{8,}/gi, type: 'xiaohongshu' },
+    { pattern: /https?:\/\/weibo\.com\/\d+\/[0-9a-zA-Z_-]{10,}/gi, type: 'weibo' },
+    { pattern: /https?:\/\/video\.weibo\.com\/show\?fid=[0-9a-zA-Z_-]{10,}/gi, type: 'weibo' },
+    { pattern: /https?:\/\/(?:www\.)?ixigua\.com\/\d{10,}/gi, type: 'xigua' },
+    { pattern: /https?:\/\/(?:www\.)?youtube\.com\/watch\?v=[a-zA-Z0-9_-]{11}/gi, type: 'youtube' },
+    { pattern: /https?:\/\/youtu\.be\/[a-zA-Z0-9_-]{11}/gi, type: 'youtube' },
+    { pattern: /https?:\/\/(?:www\.)?tiktok\.com\/@[\w.]+\/video\/\d{10,}/gi, type: 'tiktok' },
+    { pattern: /https?:\/\/vm\.tiktok\.com\/[0-9a-zA-Z_-]{8,}/gi, type: 'tiktok' },
+    { pattern: /https?:\/\/(?:www\.)?acfun\.cn\/v\/ac\d{10,}/gi, type: 'acfun' },
+    { pattern: /https?:\/\/(?:www\.)?zhihu\.com\/video\/\d{10,}/gi, type: 'zhihu' },
+    { pattern: /https?:\/\/weishi\.qq\.com\/weishi\/feed\/[0-9a-zA-Z_-]{10,}/gi, type: 'weishi' },
+    { pattern: /https?:\/\/(?:www\.)?huya\.com\/video\/[0-9a-zA-Z_-]{10,}/gi, type: 'huya' },
+    { pattern: /https?:\/\/haokan\.baidu\.com\/v\?vid=[0-9a-zA-Z_-]{10,}/gi, type: 'haokan' },
+    { pattern: /https?:\/\/(?:www\.)?meipai\.com\/media\/\d{10,}/gi, type: 'meipai' },
+    { pattern: /https?:\/\/twitter\.com\/\w+\/status\/\d{10,}/gi, type: 'twitter' },
+    { pattern: /https?:\/\/x\.com\/\w+\/status\/\d{10,}/gi, type: 'twitter' },
+    { pattern: /https?:\/\/(?:www\.)?instagram\.com\/p\/[0-9a-zA-Z_-]{10,}/gi, type: 'instagram' },
+    { pattern: /https?:\/\/(?:www\.)?doubao\.com\/video\/\d{10,}/gi, type: 'doubao' },
+];
 function linkTypeParser(content) {
     content = content.replace(/\\\//g, '/');
-    const rules = [
-        { pattern: /https?:\/\/(?:www\.)?bilibili\.com\/video\/([ab]v[0-9a-zA-Z_-]+)/gi, type: 'bilibili' },
-        { pattern: /https?:\/\/b23\.tv\/[0-9a-zA-Z_-]{5,}/gi, type: 'bilibili' },
-        { pattern: /https?:\/\/bili\d+\.cn\/[0-9a-zA-Z_-]{5,}/gi, type: 'bilibili' },
-        { pattern: /https?:\/\/(?:www\.)?douyin\.com\/video\/\d{10,}/gi, type: 'douyin' },
-        { pattern: /https?:\/\/v\.douyin\.com\/[0-9a-zA-Z_-]{8,}/gi, type: 'douyin' },
-        { pattern: /https?:\/\/(?:www\.)?kuaishou\.com\/short-video\/[0-9a-zA-Z_-]{10,}/gi, type: 'kuaishou' },
-        { pattern: /https?:\/\/v\.kuaishou\.com\/[0-9a-zA-Z_-]{8,}/gi, type: 'kuaishou' },
-        { pattern: /https?:\/\/(?:www\.)?xiaohongshu\.com\/discovery\/item\/[0-9a-zA-Z_-]{10,}/gi, type: 'xiaohongshu' },
-        { pattern: /https?:\/\/xhslink\.com\/[0-9a-zA-Z_-]{8,}/gi, type: 'xiaohongshu' },
-        { pattern: /https?:\/\/weibo\.com\/\d+\/[0-9a-zA-Z_-]{10,}/gi, type: 'weibo' },
-        { pattern: /https?:\/\/video\.weibo\.com\/show\?fid=[0-9a-zA-Z_-]{10,}/gi, type: 'weibo' },
-        { pattern: /https?:\/\/(?:www\.)?ixigua\.com\/\d{10,}/gi, type: 'xigua' },
-        { pattern: /https?:\/\/(?:www\.)?youtube\.com\/watch\?v=[a-zA-Z0-9_-]{11}/gi, type: 'youtube' },
-        { pattern: /https?:\/\/youtu\.be\/[a-zA-Z0-9_-]{11}/gi, type: 'youtube' },
-        { pattern: /https?:\/\/(?:www\.)?tiktok\.com\/@[\w.]+\/video\/\d{10,}/gi, type: 'tiktok' },
-        { pattern: /https?:\/\/vm\.tiktok\.com\/[0-9a-zA-Z_-]{8,}/gi, type: 'tiktok' },
-        { pattern: /https?:\/\/(?:www\.)?acfun\.cn\/v\/ac\d{10,}/gi, type: 'acfun' },
-        { pattern: /https?:\/\/(?:www\.)?zhihu\.com\/video\/\d{10,}/gi, type: 'zhihu' },
-        { pattern: /https?:\/\/weishi\.qq\.com\/weishi\/feed\/[0-9a-zA-Z_-]{10,}/gi, type: 'weishi' },
-        { pattern: /https?:\/\/(?:www\.)?huya\.com\/video\/[0-9a-zA-Z_-]{10,}/gi, type: 'huya' },
-        { pattern: /https?:\/\/haokan\.baidu\.com\/v\?vid=[0-9a-zA-Z_-]{10,}/gi, type: 'haokan' },
-        { pattern: /https?:\/\/(?:www\.)?meipai\.com\/media\/\d{10,}/gi, type: 'meipai' },
-        { pattern: /https?:\/\/twitter\.com\/\w+\/status\/\d{10,}/gi, type: 'twitter' },
-        { pattern: /https?:\/\/x\.com\/\w+\/status\/\d{10,}/gi, type: 'twitter' },
-        { pattern: /https?:\/\/(?:www\.)?instagram\.com\/p\/[0-9a-zA-Z_-]{10,}/gi, type: 'instagram' },
-        { pattern: /https?:\/\/(?:www\.)?doubao\.com\/video\/\d{10,}/gi, type: 'doubao' },
-    ];
     const matches = [];
     const seen = new Set();
-    for (const rule of rules) {
+    for (const rule of LINK_RULES) {
         let match;
         rule.pattern.lastIndex = 0;
         while ((match = rule.pattern.exec(content)) !== null) {
@@ -372,6 +395,7 @@ function parseApiResponse(raw, maxDescLen) {
         duration, publishTime
     };
 }
+const formatVarRegex = /\$\{([^}]+)\}/g;
 function generateFormattedText(p, format) {
     const imageCount = p.images.length || p.live_photo.length;
     const vars = {
@@ -390,14 +414,18 @@ function generateFormattedText(p, format) {
         '封面': p.cover,
         '视频链接': p.video,
     };
+    const varReplacements = Object.entries(vars).map(([key, val]) => ({
+        regex: new RegExp(`\\$\\{${key}\\}`, 'g'),
+        value: val,
+    }));
     const lines = format.split('\n');
     const resultLines = [];
     for (const line of lines) {
-        const varMatches = line.match(/\$\{([^}]+)\}/g);
+        const varMatches = line.match(formatVarRegex);
         if (varMatches) {
             let allEmpty = true;
             for (const match of varMatches) {
-                const varName = match.replace(/\$\{|\}/g, '');
+                const varName = match.slice(2, -1);
                 const val = vars[varName];
                 if (val && val !== '0') {
                     allEmpty = false;
@@ -408,8 +436,8 @@ function generateFormattedText(p, format) {
                 continue;
         }
         let newLine = line;
-        for (const [key, value] of Object.entries(vars)) {
-            newLine = newLine.replace(new RegExp(`\\$\\{${key}\\}`, 'g'), value);
+        for (const { regex, value } of varReplacements) {
+            newLine = newLine.replace(regex, value);
         }
         resultLines.push(newLine);
     }
@@ -434,15 +462,14 @@ function buildForwardNode(session, content, botName) {
 function getErrorMessage(error) {
     if (error instanceof Error)
         return error.message;
+    if (error && typeof error === 'object' && 'message' in error)
+        return String(error.message);
     return String(error);
 }
 function apply(ctx, config) {
     debugEnabled = config.debug || false;
     debugLog('INFO', '插件初始化开始');
-    const dedupCache = new LRUCache({
-        max: 1000,
-        ttl: config.deduplicationInterval * 1000,
-    });
+    const dedupCache = new SimpleLRUCache(1000, config.deduplicationInterval * 1000);
     const texts = {
         waitingTipText: config.waitingTipText || '正在解析视频，请稍候...',
         unsupportedPlatformText: config.unsupportedPlatformText || '不支持该平台链接',
@@ -506,7 +533,7 @@ function apply(ctx, config) {
             throw new Error('视频链接为空');
         const tempDir = config.tempDir || './temp_videos';
         await promises_1.default.mkdir(tempDir, { recursive: true });
-        const fileName = `video_${Date.now()}_${Math.random().toString(36).substring(2, 8)}.mp4`;
+        const fileName = `video_${Date.now()}_${(0, crypto_1.randomBytes)(4).toString('hex')}.mp4`;
         const filePath = path_1.default.resolve(tempDir, fileName);
         debugLog('INFO', `开始下载视频: ${videoUrl.substring(0, 100)}...`);
         debugLog('INFO', `临时文件路径: ${filePath}`);
@@ -522,6 +549,7 @@ function apply(ctx, config) {
                     'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36',
                     'Referer': 'https://www.bilibili.com/',
                 },
+                maxRedirects: 5,
                 validateStatus: (status) => status >= 200 && status < 300,
             });
         }
@@ -530,7 +558,7 @@ function apply(ctx, config) {
             await promises_1.default.unlink(filePath).catch(() => { });
             throw new Error(`下载视频失败: ${getErrorMessage(e)}`);
         }
-        const maxSizeBytes = (config.maxVideoSize || 0) * 1024 * 1024;
+        const maxSizeBytes = (config.maxVideoSize ?? 0) * 1024 * 1024;
         const contentLength = Number(response.headers['content-length'] || 0);
         if (maxSizeBytes > 0 && contentLength > maxSizeBytes) {
             writer.destroy();
@@ -904,7 +932,7 @@ function apply(ctx, config) {
         dedupCache.clear();
         debugLog('INFO', '插件已卸载，资源已清理');
     });
-    process.on('exit', async () => {
+    process.on('beforeExit', async () => {
         try {
             const tempDir = config.tempDir || './temp_videos';
             const files = await promises_1.default.readdir(tempDir);

package/package.json

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

package/readme.md

@@ -141,6 +141,7 @@ This is a **multi-platform video/image parsing plugin** developed for the Koishi
 | 贡献者 (Contributor) | 贡献内容 (Contribution) |
 |----------------------|-------------------------|
 | Minecraft-1314 | 插件完整开发 (Complete plugin development) |
+| ShiraiKuroko003 | 修复消息格式设置问题并且PR-1.2.5版本已修复 |
 | JH-Ahua | BugPk-Api 支持 |
 | shangxue | 灵感来源 |