koishi-plugin-video-parser-all 1.4.7 → 1.4.9

package/lib/index.d.ts

@@ -1,12 +1,4 @@
 import { Context, Schema } from 'koishi';
-declare module 'koishi' {
-    interface Context {
-        downloads?: {
-            download(url: string, dest: string, options?: Record<string, unknown>): Promise<string>;
-        };
-        aria2?: any;
-    }
-}
 export declare const name = "video-parser-all";
 export declare const Config: Schema<{
     enable?: boolean | null | undefined;
@@ -45,10 +37,17 @@ export declare const Config: Schema<{
 } & {
     showImageText?: boolean | null | undefined;
     showCoverImage?: boolean | null | undefined;
+    showCoverFile?: boolean | null | undefined;
+    showImageFileNew?: boolean | null | undefined;
+    showAuthorAvatar?: boolean | null | undefined;
+    showAuthorAvatarFile?: boolean | null | undefined;
+    showAuthorAvatarText?: boolean | null | undefined;
+    authorAvatarText?: string | null | undefined;
     showMusicCover?: boolean | null | undefined;
-    showImageFile?: boolean | null | undefined;
     showVideoFile?: boolean | null | undefined;
-    forceDownloadImage?: boolean | null | undefined;
+    forceDownloadCover?: boolean | null | undefined;
+    forceDownloadImageNew?: boolean | null | undefined;
+    forceDownloadAuthorAvatar?: boolean | null | undefined;
     forceDownloadVideo?: boolean | null | undefined;
 } & {
     showMusicVoice?: boolean | null | undefined;
@@ -190,10 +189,17 @@ export declare const Config: Schema<{
 } & {
     showImageText: boolean;
     showCoverImage: boolean;
+    showCoverFile: boolean;
+    showImageFileNew: boolean;
+    showAuthorAvatar: boolean;
+    showAuthorAvatarFile: boolean;
+    showAuthorAvatarText: boolean;
+    authorAvatarText: string;
     showMusicCover: boolean;
-    showImageFile: boolean;
     showVideoFile: boolean;
-    forceDownloadImage: boolean;
+    forceDownloadCover: boolean;
+    forceDownloadImageNew: boolean;
+    forceDownloadAuthorAvatar: boolean;
     forceDownloadVideo: boolean;
 } & {
     showMusicVoice: boolean;
@@ -318,6 +324,3 @@ export declare const Config: Schema<{
     parseErrorItemFormat: string;
 }>;
 export declare function apply(ctx: Context, config: any): void;
-export declare namespace apply {
-    var inject: string[];
-}

package/lib/index.js

@@ -103,15 +103,22 @@ exports.Config = koishi_1.Schema.intersect([
         }).description('各平台解析开关'),
     }).description('基本设置'),
     koishi_1.Schema.object({
-        unifiedMessageFormat: koishi_1.Schema.string().role('textarea').default('标题：${标题}\n作者：${作者}\n简介：${简介}\n音乐标题：${音乐标题}\n音乐作者：${音乐作者}\n点赞：${点赞数}\n收藏：${收藏数}\n转发：${转发数}\n播放：${播放数}\n评论：${评论数}\n图片数量：${图片数量}').description('文字格式，支持变量，空行自动隐藏'),
+        unifiedMessageFormat: koishi_1.Schema.string().role('textarea').default('标题：${标题}\n作者：${作者}\n简介：${简介}\n音乐标题：${音乐标题}\n音乐作者：${音乐作者}\n点赞：${点赞数}\n收藏：${收藏数}\n转发：${转发数}\n播放：${播放数}\n评论：${评论数}\n图片数量：${图片数量}').description('文字格式，支持变量：${标题} ${作者} ${author-name} ${简介} ${视频时长} ${点赞数} ${收藏数} ${转发数} ${播放数} ${评论数} ${发布时间} ${图片数量} ${作者ID} ${author-id} ${音乐标题} ${music-title} ${音乐作者} ${music-author}，空行自动隐藏'),
     }).description('消息格式'),
     koishi_1.Schema.object({
         showImageText: koishi_1.Schema.boolean().default(true).description('发送文字内容'),
         showCoverImage: koishi_1.Schema.boolean().default(true).description('发送封面图片'),
+        showCoverFile: koishi_1.Schema.boolean().default(true).description('封面是否以图片形式发送（关闭则只发送链接）'),
+        showImageFileNew: koishi_1.Schema.boolean().default(true).description('图片是否以图片形式发送（关闭则只发送链接）'),
+        showAuthorAvatar: koishi_1.Schema.boolean().default(true).description('发送作者头像图片'),
+        showAuthorAvatarFile: koishi_1.Schema.boolean().default(true).description('作者头像图片是否以图片形式发送（关闭则只发送链接）'),
+        showAuthorAvatarText: koishi_1.Schema.boolean().default(true).description('发送作者头像前显示文字提示'),
+        authorAvatarText: koishi_1.Schema.string().default('作者头像：').description('作者头像前显示的文字'),
         showMusicCover: koishi_1.Schema.boolean().default(true).description('发送音乐封面图片'),
-        showImageFile: koishi_1.Schema.boolean().default(true).description('封面/图片是否以图片形式发送（关闭则只发送链接）'),
         showVideoFile: koishi_1.Schema.boolean().default(true).description('视频是否以视频形式发送（关闭则只发送链接）'),
-        forceDownloadImage: koishi_1.Schema.boolean().default(false).description('强制下载封面/图片'),
+        forceDownloadCover: koishi_1.Schema.boolean().default(false).description('强制下载封面'),
+        forceDownloadImageNew: koishi_1.Schema.boolean().default(false).description('强制下载图片'),
+        forceDownloadAuthorAvatar: koishi_1.Schema.boolean().default(false).description('强制下载作者头像'),
         forceDownloadVideo: koishi_1.Schema.boolean().default(false).description('强制下载视频'),
     }).description('媒体发送'),
     koishi_1.Schema.object({
@@ -543,8 +550,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 +627,19 @@ 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));
+    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 };
 }
 const formatVarRegex = /\$\{([^}]+)\}/g;
 function generateFormattedText(p, format) {
@@ -628,6 +647,7 @@ function generateFormattedText(p, format) {
     const vars = {
         '标题': p.title,
         '作者': p.author,
+        'author-name': p.author,
         '简介': p.desc,
         '视频时长': p.duration > 0 ? formatDuration(p.duration) : '',
         '点赞数': String(p.like),
@@ -638,10 +658,11 @@ function generateFormattedText(p, format) {
         '发布时间': p.publishTime ? formatPublishTime(p.publishTime) : '',
         '图片数量': String(imageCount),
         '作者ID': p.uid,
-        '视频链接': p.video,
+        'author-id': p.uid,
         '音乐标题': p.music.title || '',
+        'music-title': p.music.title || '',
         '音乐作者': p.music.author || '',
-        '音乐封面': p.music.cover || '',
+        'music-author': p.music.author || '',
     };
     const varReplacements = Object.entries(vars).map(([key, val]) => ({
         regex: new RegExp(`\\$\\{${key}\\}`, 'g'),
@@ -736,9 +757,14 @@ function apply(ctx, config) {
     const mediaDownloadTimeout = config.mediaDownloadTimeout ?? 120000;
     const maxMediaSize = config.maxMediaSize ?? 0;
     const downloadEngine = config.downloadEngine || 'internal';
-    if (downloadEngine === 'aria2' && !ctx.aria2) {
+    const aria2Service = ctx.get('aria2');
+    const downloadsService = ctx.get('downloads');
+    if (downloadEngine === 'aria2' && !aria2Service) {
         logger.warn('选择了 aria2 下载引擎，但未检测到 koishi-plugin-aria2-plus 服务，将回退到内置下载');
     }
+    if (downloadEngine === 'downloads' && !downloadsService) {
+        logger.warn('选择了 downloads 下载引擎，但未检测到 koishi-plugin-downloads 服务，将回退到内置下载');
+    }
     function getPlatformConfig(type) {
         if (type.startsWith('custom_')) {
             const name = type.slice(7);
@@ -806,7 +832,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 });
@@ -816,26 +842,24 @@ function apply(ctx, config) {
         }) || fileExts[0];
         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)}`);
+        if (downloadEngine === 'downloads' && downloadsService) {
+            logger.info(`开始下载: ${url}`);
+            const dest = await downloadsService.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' && aria2Service) {
             try {
-                const gid = await ctx.aria2.addUri([url], {
+                const gid = await aria2Service.addUri([url], {
                     dir: cacheDir,
                     out: fileName,
                     split: 4,
@@ -848,20 +872,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) {
-                        await ctx.aria2.remove(gid).catch(() => { });
+                    if (Date.now() - startTime > timeout) {
+                        await aria2Service.remove(gid).catch(() => { });
                         throw new Error('aria2下载超时');
                     }
-                    const status = await ctx.aria2.tellStatus(gid);
+                    const status = await aria2Service.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 +936,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 +957,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 +982,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 +1096,12 @@ 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 (config.showAuthorAvatar && p.avatar) {
+                    if (config.showAuthorAvatarText)
+                        forwardMessages.push(buildForwardNode(session, config.authorAvatarText || '作者头像：', botName));
+                    forwardMessages.push(buildForwardNode(session, koishi_1.h.image(p.avatar), botName));
+                }
+                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,12 +1139,18 @@ 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))) {
-                    await sendMedia(session, p.cover, 'image', config.forceDownloadImage, config.showImageFile).catch(() => { });
+                if (config.showAuthorAvatar && p.avatar) {
+                    if (config.showAuthorAvatarText)
+                        await sendWithTimeout(session, config.authorAvatarText || '作者头像：');
+                    await sendMedia(session, p.avatar, 'image', config.forceDownloadAuthorAvatar, config.showAuthorAvatarFile).catch(() => { });
+                    await delay(300);
+                }
+                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.forceDownloadCover, config.showCoverFile).catch(() => { });
                     await delay(300);
                 }
                 if (config.showMusicCover && p.music.cover) {
-                    await sendMedia(session, p.music.cover, 'image', config.forceDownloadImage, config.showImageFile).catch(() => { });
+                    await sendMedia(session, p.music.cover, 'image', false, true).catch(() => { });
                     await delay(300);
                 }
                 if (p.video && (p.type === 'video' || (p.type === 'live' && !p.live_photo?.length && !p.images?.length))) {
@@ -1086,7 +1160,7 @@ function apply(ctx, config) {
                 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) {
-                        await sendMedia(session, imgUrl, 'image', config.forceDownloadImage, config.showImageFile).catch(() => { });
+                        await sendMedia(session, imgUrl, 'image', config.forceDownloadImageNew, config.showImageFileNew).catch(() => { });
                         await delay(200);
                     }
                 }
@@ -1342,4 +1416,3 @@ function apply(ctx, config) {
     });
     debugLog('INFO', '插件初始化完成');
 }
-apply.inject = ['aria2', 'downloads'];

package/package.json

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

package/readme.md

@@ -39,11 +39,20 @@ This is a **multi-platform video/image parsing plugin** developed for the Koishi
 |--------|------|--------|------|
 | `showImageText` | boolean | true | 发送文字内容 |
 | `showCoverImage` | boolean | true | 发送封面图片 |
-| `showMusicCover` | boolean | true | 发送音乐封面 |
-| `showImageFile` | boolean | true | 封面/图片是否以图片形式发送（关闭则只发送链接） |
+| `showCoverFile` | boolean | true | 封面是否以图片形式发送（关闭则只发送链接） |
+| `showImageFileNew` | boolean | true | 图片是否以图片形式发送（关闭则只发送链接） |
+| `showAuthorAvatar` | boolean | true | 发送作者头像图片 |
+| `showAuthorAvatarFile` | boolean | true | 作者头像图片是否以图片形式发送（关闭则只发送链接） |
+| `showMusicCover` | boolean | true | 发送音乐封面图片 |
 | `showVideoFile` | boolean | true | 视频是否以视频形式发送（关闭则只发送链接） |
-| `forceDownloadImage` | boolean | false | 强制下载封面/图片 |
+| `forceDownloadCover` | boolean | false | 强制下载封面 |
+| `forceDownloadImageNew` | boolean | false | 强制下载图片 |
+| `forceDownloadAuthorAvatar` | boolean | false | 强制下载作者头像 |
 | `forceDownloadVideo` | boolean | false | 强制下载视频 |
+| `forceDownloadAuthorAvatar` | boolean | false | 强制下载作者头像 |
+| `forceDownloadVideo` | boolean | false | 强制下载视频 |
+| `showAuthorAvatarText` | boolean | true | 发送作者头像前显示文字提示 |
+| `authorAvatarText` | string | 作者头像： | 作者头像前显示的文字 |
 
 ### 音乐语音（需 silk 和 ffmpeg）
 | 配置项 | 类型 | 默认值 | 说明 |
@@ -109,7 +118,7 @@ This is a **multi-platform video/image parsing plugin** developed for the Koishi
 | 变量名 | 说明 |
 |--------|------|
 | `${标题}` | 视频/图集标题 |
-| `${作者}` | 作者名称 |
+| `${作者}` 或 `${author-name}` | 作者名称 |
 | `${简介}` | 内容简介 |
 | `${视频时长}` | 视频时长（时:分:秒） |
 | `${点赞数}` | 点赞数量 |
@@ -119,10 +128,9 @@ This is a **multi-platform video/image parsing plugin** developed for the Koishi
 | `${评论数}` | 评论数量 |
 | `${发布时间}` | 发布时间（格式化） |
 | `${图片数量}` | 图集/实况图片数量 |
-| `${作者ID}` | 作者唯一标识ID |
-| `${视频链接}` | 视频原始链接 |
-| `${音乐标题}` | 音乐标题 |
-| `${音乐作者}` | 音乐作者 |
+| `${作者ID}` 或 `${author-id}` | 作者唯一标识ID |
+| `${音乐标题}` 或 `${music-title}` | 音乐标题 |
+| `${音乐作者}` 或 `${music-author}` | 音乐作者 |
 
 ## 依赖说明 (Dependencies)
 ### 音乐语音（可选）
@@ -166,7 +174,7 @@ This is a **multi-platform video/image parsing plugin** developed for the Koishi
 | 皮皮搞笑 | `h5.pipigx.com/pp/post/`, `ippzone.com` | 短视频 |
 | 皮皮虾 | `pipix.com`, `pipixia.com` | 短视频 |
 | 最右 | `share.xiaochuankeji.cn/hybrid/share/post`, `izuiyou.com` | 短视频 |
-| 🔧 自定义平台 | 通过 `customPlatforms` 配置添加 | 取决于提供的 API |
+| 自定义平台 | 通过 `customPlatforms` 配置添加 | 取决于提供的 API |
 
 ## 项目贡献者 (Contributors)
 
@@ -179,6 +187,7 @@ This is a **multi-platform video/image parsing plugin** developed for the Koishi
 | dzt2008 + Apricityx | 提交Bug-会对非支持视频平台URL进行误解析-已修复 |
 | JH-Ahua | BugPk-Api 支持 |
 | shangxue | 灵感来源 |
+| linyves | 提交Bug-小红书图集重复发送封面-已修复<br>提交Bug-话题显示异常 #**[话题]#-已修复<br>提交建议-Live Photo 全部按普通图片处理-已采纳<br>提交Bug-解析后会把作者头像一起发送-已修复 |
 
 （欢迎通过 Issues 或 PR 加入贡献者列表）