koishi-plugin-video-parser-all 1.4.6 → 1.4.8

package/lib/index.js

@@ -543,8 +543,8 @@ function parseApiResponse(raw, maxDescLen, fieldMapping) {
         uid = String(mapField('uid', () => data.uid || data.userID || data.author_id || ''));
         avatar = mapField('avatar', () => data.avatar || '');
     }
-    const title = mapField('title', () => data.title || '');
-    const desc = mapField('desc', () => data.desc || data.description || '').slice(0, maxDescLen).trim();
+    let title = mapField('title', () => data.title || '');
+    let desc = mapField('desc', () => data.desc || data.description || '').slice(0, maxDescLen).trim();
     const coverRaw = mapField('cover', () => data.cover || '');
     const cover = coverRaw ? (String(coverRaw).startsWith('http') ? String(coverRaw) : 'https:' + coverRaw) : '';
     let video = '';
@@ -620,7 +620,30 @@ function parseApiResponse(raw, maxDescLen, fieldMapping) {
     else if (extra.create_time) {
         publishTime = Number(extra.create_time) * 1000;
     }
-    return { type, title, desc, author, uid, avatar, cover, video, videos, images, live_photo, music, like, comment, collect, share, play, duration, publishTime };
+    const author_followers = parseCount(mapField('author_followers', () => extra.author_extra?.follower_count ?? data.author_extra?.follower_count ?? 0));
+    const author_signature = String(mapField('author_signature', () => extra.author_extra?.signature ?? data.author_extra?.signature ?? ''));
+    const admire = parseCount(mapField('admire', () => extra.statistics?.admire_count ?? data.statistics?.admire_count ?? 0));
+    let hashtags = '';
+    const tagsArray = mapField('hashtags', () => extra.hashtags ?? data.hashtags);
+    if (Array.isArray(tagsArray) && tagsArray.length > 0) {
+        const tagNames = tagsArray.map((t) => t?.name ? t.name : '').filter(Boolean);
+        hashtags = tagNames.map(name => `#${name}`).join(' ');
+        if (tagNames.length > 0 && desc) {
+            const escapedTags = tagNames.map((t) => t.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
+            const tagRegex = new RegExp(`[#＃](${escapedTags.join('|')})\\b`, 'gi');
+            desc = desc.replace(tagRegex, '').replace(/\s{2,}/g, ' ').trim();
+        }
+    }
+    title = title.replace(/\[话题\]/g, '');
+    desc = desc.replace(/\[话题\]/g, '');
+    if (title && desc && title.trim() === desc.trim()) {
+        desc = '';
+    }
+    if (title.trim().startsWith('#'))
+        title = '';
+    if (desc.trim().startsWith('#'))
+        desc = '';
+    return { type, title, desc, author, uid, avatar, cover, video, videos, images, live_photo, music, like, comment, collect, share, play, duration, publishTime, author_followers, author_signature, admire, hashtags };
 }
 const formatVarRegex = /\$\{([^}]+)\}/g;
 function generateFormattedText(p, format) {
@@ -628,6 +651,8 @@ function generateFormattedText(p, format) {
     const vars = {
         '标题': p.title,
         '作者': p.author,
+        '作者名称': p.author,
+        'author-name': p.author,
         '简介': p.desc,
         '视频时长': p.duration > 0 ? formatDuration(p.duration) : '',
         '点赞数': String(p.like),
@@ -638,10 +663,22 @@ function generateFormattedText(p, format) {
         '发布时间': p.publishTime ? formatPublishTime(p.publishTime) : '',
         '图片数量': String(imageCount),
         '作者ID': p.uid,
+        'author-id': p.uid,
         '视频链接': p.video,
         '音乐标题': p.music.title || '',
+        'music-title': p.music.title || '',
         '音乐作者': p.music.author || '',
+        'music-author': p.music.author || '',
         '音乐封面': p.music.cover || '',
+        'author-avatar': p.avatar,
+        '作者粉丝数': String(p.author_followers),
+        'author-followers': String(p.author_followers),
+        '作者签名': p.author_signature,
+        'author-signature': p.author_signature,
+        '赞赏数': String(p.admire),
+        'admire-count': String(p.admire),
+        '话题标签': p.hashtags,
+        'hashtags': p.hashtags,
     };
     const varReplacements = Object.entries(vars).map(([key, val]) => ({
         regex: new RegExp(`\\$\\{${key}\\}`, 'g'),
@@ -806,7 +843,7 @@ function apply(ctx, config) {
         return {};
     }
     const extRegexCache = {};
-    async function downloadFile(url, timeout, maxSize, filePrefix, fileExts) {
+    async function downloadFile(url, timeout, maxSize, filePrefix, fileExts, onProgress) {
         if (!url)
             throw new Error('链接为空');
         await promises_1.default.mkdir(cacheDir, { recursive: true });
@@ -817,23 +854,21 @@ function apply(ctx, config) {
         const fileName = `${filePrefix}_${Date.now()}_${(0, crypto_1.randomBytes)(4).toString('hex')}.${ext}`;
         const filePath = path_1.default.resolve(cacheDir, fileName);
         if (downloadEngine === 'downloads' && ctx.downloads) {
-            try {
-                const dest = await ctx.downloads.download(url, path_1.default.join(cacheDir, fileName), {
-                    headers: { 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36' },
-                    timeout
-                });
-                const stat = await promises_1.default.stat(dest);
-                if (maxSize > 0 && stat.size > maxSize * 1024 * 1024) {
-                    await promises_1.default.unlink(dest).catch(() => { });
-                    throw new Error(`文件过大(${Math.round(stat.size / 1024 / 1024)}MB)，超过限制(${maxSize}MB)`);
-                }
-                return dest;
-            }
-            catch (e) {
-                debugLog('ERROR', `downloads 服务下载失败，回退内置下载: ${getErrorMessage(e)}`);
+            logger.info(`开始下载: ${url}`);
+            const dest = await ctx.downloads.download(url, path_1.default.join(cacheDir, fileName), {
+                headers: { 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36' },
+                timeout
+            });
+            const stat = await promises_1.default.stat(dest);
+            const sizeMB = (stat.size / (1024 * 1024)).toFixed(2);
+            logger.info(`下载完成: ${dest} (${sizeMB} MB)`);
+            if (maxSize > 0 && stat.size > maxSize * 1024 * 1024) {
+                await promises_1.default.unlink(dest).catch(() => { });
+                throw new Error(`文件过大(${Math.round(stat.size / 1024 / 1024)}MB)，超过限制(${maxSize}MB)`);
             }
+            return dest;
         }
-        else if (downloadEngine === 'aria2' && ctx.aria2) {
+        if (downloadEngine === 'aria2' && ctx.aria2) {
             try {
                 const gid = await ctx.aria2.addUri([url], {
                     dir: cacheDir,
@@ -848,20 +883,31 @@ function apply(ctx, config) {
                     header: [`User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36`, `Referer: https://www.baidu.com/`]
                 });
                 let completed = false;
-                const ariaStartTime = Date.now();
+                const startTime = Date.now();
+                let lastProgressTime = 0;
                 while (!completed) {
-                    if (Date.now() - ariaStartTime > timeout) {
+                    if (Date.now() - startTime > timeout) {
                         await ctx.aria2.remove(gid).catch(() => { });
                         throw new Error('aria2下载超时');
                     }
                     const status = await ctx.aria2.tellStatus(gid);
                     if (status.status === 'complete') {
                         completed = true;
+                        if (onProgress)
+                            onProgress(100, '');
                     }
                     else if (status.status === 'error' || status.status === 'removed') {
                         throw new Error('aria2下载失败');
                     }
                     else {
+                        if (onProgress && Date.now() - lastProgressTime > 500) {
+                            lastProgressTime = Date.now();
+                            const total = parseInt(status.totalLength) || 0;
+                            const completed = parseInt(status.completedLength) || 0;
+                            const percent = total > 0 ? Math.round((completed / total) * 100) : 0;
+                            const speed = formatSpeed(parseInt(status.downloadSpeed) || 0);
+                            onProgress(percent, speed);
+                        }
                         await delay(1000);
                     }
                 }
@@ -901,8 +947,20 @@ function apply(ctx, config) {
             await promises_1.default.unlink(filePath).catch(() => { });
             throw new Error(`文件过大(${Math.round(contentLength / 1024 / 1024)}MB)，超过限制(${maxSize}MB)`);
         }
+        let downloaded = 0;
+        let lastProgressTime = 0;
+        response.data.on('data', (chunk) => {
+            downloaded += chunk.length;
+            if (onProgress && contentLength > 0 && Date.now() - lastProgressTime > 500) {
+                lastProgressTime = Date.now();
+                const percent = Math.round((downloaded / contentLength) * 100);
+                onProgress(percent, '');
+            }
+        });
         try {
             await (0, promises_2.pipeline)(response.data, writer);
+            if (onProgress)
+                onProgress(100, '');
             return filePath;
         }
         catch (e) {
@@ -910,6 +968,18 @@ function apply(ctx, config) {
             throw new Error(`写入文件失败: ${getErrorMessage(e)}`);
         }
     }
+    function formatSpeed(bytesPerSec) {
+        if (bytesPerSec <= 0)
+            return '';
+        const units = ['B/s', 'KB/s', 'MB/s', 'GB/s'];
+        let i = 0;
+        let speed = bytesPerSec;
+        while (speed >= 1024 && i < units.length - 1) {
+            speed /= 1024;
+            i++;
+        }
+        return `${speed.toFixed(1)}${units[i]}`;
+    }
     async function sendMedia(session, url, type, forceDownload, showFile) {
         if (!url)
             return;
@@ -923,9 +993,13 @@ function apply(ctx, config) {
             };
             const prefixMap = { image: 'img', video: 'video', audio: 'music' };
             const sendFunc = type === 'audio' ? koishi_1.h.audio : type === 'video' ? koishi_1.h.video : koishi_1.h.image;
+            const onProgress = forceDownload ? (percent, speed) => {
+                const text = `下载进度: ${percent}%` + (speed ? ` (${speed})` : '');
+                logger.info(text);
+            } : undefined;
             if (forceDownload) {
                 try {
-                    const localPath = await downloadFile(url, mediaDownloadTimeout, maxMediaSize, prefixMap[type], extMap[type]);
+                    const localPath = await downloadFile(url, mediaDownloadTimeout, maxMediaSize, prefixMap[type], extMap[type], onProgress);
                     try {
                         await sendWithTimeout(session, sendFunc(`file://${localPath}`));
                     }
@@ -1033,7 +1107,7 @@ function apply(ctx, config) {
                 const text = item.text;
                 if (text && config.showImageText)
                     forwardMessages.push(buildForwardNode(session, text, botName));
-                if (p.cover && config.showCoverImage && p.type !== 'live_photo' && !(p.type === 'live' && (p.live_photo?.length || p.images?.length))) {
+                if (p.cover && config.showCoverImage && p.type !== 'live_photo' && p.type !== 'image' && !(p.type === 'live' && (p.live_photo?.length || p.images?.length))) {
                     forwardMessages.push(buildForwardNode(session, koishi_1.h.image(p.cover), botName));
                 }
                 if (config.showMusicCover && p.music.cover) {
@@ -1071,7 +1145,7 @@ function apply(ctx, config) {
                     await sendWithTimeout(session, text);
                     await delay(300);
                 }
-                if (p.cover && config.showCoverImage && p.type !== 'live_photo' && !(p.type === 'live' && (p.live_photo?.length || p.images?.length))) {
+                if (p.cover && config.showCoverImage && p.type !== 'live_photo' && p.type !== 'image' && !(p.type === 'live' && (p.live_photo?.length || p.images?.length))) {
                     await sendMedia(session, p.cover, 'image', config.forceDownloadImage, config.showImageFile).catch(() => { });
                     await delay(300);
                 }

package/package.json

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