koishi-plugin-share-links-analysis 0.5.1 → 0.5.2

package/lib/index.js

@@ -35,7 +35,8 @@ exports.Config = koishi_1.Schema.intersect([
             koishi_1.Schema.const("plain").description("普通发送"),
             koishi_1.Schema.const("forward").description("合并转发"),
             koishi_1.Schema.const("mixed").description("混合发送"),
-        ]).default("mixed").description("发送模式"),
+        ]).default("forward").description("发送模式"),
+        sendFiles: koishi_1.Schema.boolean().default(true).description("是否发送文件（视频等）"),
     }).description("基础设置"),
     koishi_1.Schema.object({
         format: koishi_1.Schema.string().role('textarea').default(`{title}
@@ -45,8 +46,7 @@ exports.Config = koishi_1.Schema.intersect([
 ----------
 {mainbody}
 ----------
-{sourceUrl}
-{video}`).description('图文/视频输出格式。<br/>可用占位符: `{title}`, `{cover}`, `{authorName}`, `{mainbody}`, `{stats}`, `{sourceUrl}`, `{video}`, `{videoUrl}`'),
+{sourceUrl}`).description('图文/视频输出格式。<br/>可用占位符: `{title}`, `{cover}`, `{authorName}`, `{mainbody}`, `{stats}`, `{sourceUrl}`'),
     }).description("格式化模板"),
     koishi_1.Schema.object({
         parseLimit: koishi_1.Schema.number().default(3).description("单对话多链接解析上限"),

package/lib/parsers/bilibili.js

@@ -174,15 +174,18 @@ async function process(ctx, config, link, session) {
         const liked = (0, utils_1.numeral)(data.stat.like, config);
         const coin = (0, utils_1.numeral)(data.stat.coin, config);
         const favorite = (0, utils_1.numeral)(data.stat.favorite, config);
-        const statsString = `播放: ${play} | 弹幕: ${danmaku}
-  点赞: ${liked} | 硬币: ${coin} | 收藏: ${favorite}`;
+        const statsString = `播放: ${play} | 弹幕: ${danmaku}\n点赞: ${liked} | 硬币: ${coin} | 收藏: ${favorite}`;
+        let files = [];
+        if (videoUrl) {
+            files = [{ type: "video", url: videoUrl }];
+        }
         return {
             platform: 'bilibili',
             title: data.title,
             authorName: data.owner.name,
             mainbody: (0, utils_1.escapeHtml)(data.desc),
             coverUrl: data.pic,
-            videoUrl: videoUrl,
+            files: files,
             sourceUrl: `https://www.bilibili.com/video/${data.bvid}`,
             stats: statsString,
         };

package/lib/parsers/twitter.js

@@ -104,6 +104,13 @@ async function process(ctx, config, link, session) {
         }
         const image = media?.images ? media?.images.map(img => koishi_1.h.image(img).toString()).join('\n') : '';
         const mainbody = (0, utils_1.escapeHtml)(tweet_text) + image;
+        const videos = media?.videos;
+        let files = [];
+        if (videos) {
+            for (const video of videos) {
+                files.push({ type: "video", url: video.url });
+            }
+        }
         return {
             platform: 'twitter',
             title: `@${tweetData.user_screen_name} 的推文`,
@@ -111,7 +118,7 @@ async function process(ctx, config, link, session) {
             mainbody: mainbody,
             sourceUrl: link.url,
             stats: statsString,
-            videoUrl: media?.videos[0]?.url, // 取第一个视频
+            files: files,
             coverUrl: media?.videos[0]?.preview_url,
         };
     }

package/lib/parsers/xiaohongshu.js

@@ -263,13 +263,17 @@ async function process(ctx, config, link, session) {
         const statsString = `点赞: ${liked} | 收藏: ${collected} | 评论: ${comment}`;
         const image = images ? images.map(img => koishi_1.h.image(img).toString()).join('\n') : '';
         const mainbody = (0, utils_1.escapeHtml)(noteData.desc.trim()) + image;
+        let files = [];
+        if (videoUrl) {
+            files = [{ type: "video", url: videoUrl }];
+        }
         return {
             platform: 'xiaohongshu',
             title: noteData.title,
             authorName: noteData.user.nickname,
             mainbody: mainbody,
             coverUrl: coverUrl,
-            videoUrl: videoUrl,
+            files: files,
             sourceUrl: urlToFetch,
             stats: statsString,
         };

package/lib/types.d.ts

@@ -10,10 +10,14 @@ export interface ParsedInfo {
     authorName: string;
     mainbody?: string;
     coverUrl?: string;
-    videoUrl?: string | null;
+    files: FileInfo[];
     sourceUrl: string;
     stats: string;
 }
+export interface FileInfo {
+    type: 'video' | 'audio' | 'generic';
+    url: string;
+}
 export interface PluginConfig {
     Video_ClarityPriority: '1' | '2';
     Max_size: number;
@@ -21,6 +25,7 @@ export interface PluginConfig {
     Min_Interval: number;
     waitTip_Switch: false | string;
     useForward: 'plain' | 'forward' | 'mixed';
+    sendFiles: boolean;
     format: string;
     parseLimit: number;
     useNumeral: boolean;

package/lib/utils.js

@@ -275,7 +275,6 @@ async function sendResult_plain(session, config, result, logger) {
     const localDownloadDir = config.localDownloadDir;
     const onebotReadDir = config.onebotReadDir;
     let mediaCoverUrl = result.coverUrl;
-    let mediaVideoUrl = result.videoUrl || null;
     let mediaMainbody = result.mainbody;
     let proxy = undefined;
     if (config.proxy_settings[result.platform]) {
@@ -294,41 +293,6 @@ async function sendResult_plain(session, config, result, logger) {
             mediaCoverUrl = '';
         }
     }
-    // --- 视频：先检查大小 ---
-    let videoExceedsLimit = false;
-    if (result.videoUrl) {
-        const sizeBytes = await getFileSize(result.videoUrl, proxy, config.userAgent, logger);
-        const maxBytes = config.Max_size !== undefined ? config.Max_size * 1024 * 1024 : undefined;
-        // 日志用 MB（保留 2 位小数）
-        const formatMB = (bytes) => (bytes / (1024 * 1024)).toFixed(2);
-        if (sizeBytes === null) {
-            logger.warn(`无法获取视频大小: ${result.videoUrl}，默认允许下载`);
-        }
-        else {
-            const sizeMB = formatMB(sizeBytes);
-            if (maxBytes !== undefined && sizeBytes > maxBytes) {
-                videoExceedsLimit = true;
-                mediaVideoUrl = null;
-                const maxMB = config.Max_size.toFixed(2);
-                if (config.logLevel !== 'none') {
-                    logger.info(`视频大小超限 (${sizeMB} MB > ${maxMB} MB): ${result.videoUrl}`);
-                }
-            }
-            else {
-                // 大小合规，执行下载
-                try {
-                    mediaVideoUrl = await downloadAndMapUrl(result.videoUrl, proxy, config.userAgent, localDownloadDir, onebotReadDir, logger);
-                    if (config.logLevel === 'full') {
-                        logger.info(`视频已下载 (${sizeMB} MB): ${mediaVideoUrl}`);
-                    }
-                }
-                catch (e) {
-                    logger.warn(`视频下载失败: ${result.videoUrl}`, e);
-                    mediaVideoUrl = null;
-                }
-            }
-        }
-    }
     // --- 下载 mainbody 中的图片 ---
     if (result.mainbody) {
         const imgMatches = [...result.mainbody.matchAll(/<img\s[^>]*src\s*=\s*["']?([^"'>\s]+)["']?/gi)];
@@ -359,34 +323,72 @@ async function sendResult_plain(session, config, result, logger) {
     message = message.replace(/{sourceUrl}/g, escapeHtml(result.sourceUrl || ''));
     message = message.replace(/{cover}/g, mediaCoverUrl ? koishi_1.h.image(mediaCoverUrl).toString() : '');
     message = message.replace(/{stats}/g, escapeHtml(result.stats || ''));
-    // 处理视频相关占位符
-    if (result.videoUrl) {
-        message = message.replace(/{videoUrl}/g, escapeHtml(result.videoUrl));
-        if (videoExceedsLimit) {
-            const tip = escapeHtml(config.Max_size_tip);
-            message = message.replace(/{video}/g, tip);
-        }
-        else if (mediaVideoUrl) {
-            message = message.replace(/{video}/g, koishi_1.h.video(mediaVideoUrl).toString());
-        }
-        else {
-            message = message.replace(/{video}/g, '');
-        }
-        if (config.logLevel === 'link_only') {
-            logger.info(`视频直链 (${result.platform}): ${result.videoUrl}`);
-        }
-    }
-    else {
-        message = message.replace(/{video}/g, '');
-        message = message.replace(/{videoUrl}/g, '');
-    }
+    // 清理空行
     const cleanMessage = message.split('\n').filter(line => line.trim() !== '' || line.includes('<')).join('\n');
     if (config.logLevel === 'full') {
         logger.info(`解析结果: \n ${JSON.stringify(result, null, 2)}`);
     }
+    const sendPromises = [];
+    // 发送主消息
     if (cleanMessage) {
-        await session.send(koishi_1.h.quote(session.messageId) + cleanMessage);
+        sendPromises.push(session.send(koishi_1.h.quote(session.messageId) + cleanMessage));
+    }
+    // --- 发送 files 中的所有媒体（video/audio/generic）---
+    if (config.sendFiles && Array.isArray(result.files)) {
+        for (const file of result.files) {
+            const { type, url: remoteUrl } = file;
+            if (!['video', 'audio', 'generic'].includes(type))
+                continue;
+            let shouldSend = true;
+            if (config.Max_size !== undefined) {
+                const sizeBytes = await getFileSize(remoteUrl, proxy, config.userAgent, logger);
+                const maxBytes = config.Max_size * 1024 * 1024;
+                if (sizeBytes !== null && sizeBytes > maxBytes) {
+                    shouldSend = false;
+                    if (config.logLevel !== 'none') {
+                        const sizeMB = (sizeBytes / (1024 * 1024)).toFixed(2);
+                        const maxMB = config.Max_size.toFixed(2);
+                        sendPromises.push(session.send(`文件大小超限 (${sizeMB} MB > ${maxMB} MB)`));
+                        logger.info(`文件大小超限 (${sizeMB} MB > ${maxMB} MB)，跳过: ${remoteUrl}`);
+                    }
+                }
+            }
+            if (shouldSend) {
+                try {
+                    const localUrl = await downloadAndMapUrl(remoteUrl, proxy, config.userAgent, localDownloadDir, onebotReadDir, logger);
+                    if (!localUrl)
+                        continue;
+                    let element = null;
+                    if (type === 'video') {
+                        element = koishi_1.h.video(localUrl).toString();
+                    }
+                    else if (type === 'audio') {
+                        element = koishi_1.h.audio(localUrl).toString();
+                    }
+                    else if (type === 'generic') {
+                        // 注意：标准 OneBot v11 不支持 file，部分实现支持
+                        // 若你环境不支持，可改用文本链接：element = escapeHtml(remoteUrl);
+                        element = koishi_1.h.file(localUrl).toString();
+                    }
+                    if (element) {
+                        sendPromises.push(session.send(element));
+                        if (config.logLevel === 'link_only') {
+                            logger.info(`${type} 直链 (${result.platform}): ${remoteUrl}`);
+                        }
+                        if (config.logLevel === 'full') {
+                            const size = await getFileSize(remoteUrl, proxy, config.userAgent, logger);
+                            const sizeMB = size ? (size / (1024 * 1024)).toFixed(2) : 'unknown';
+                            logger.info(`${type} 已发送 (${sizeMB} MB): ${localUrl}`);
+                        }
+                    }
+                }
+                catch (e) {
+                    logger.warn(`${type} 下载/发送失败: ${remoteUrl}`, e);
+                }
+            }
+        }
     }
+    await Promise.all(sendPromises);
 }
 async function sendResult_forward(session, config, result, logger, mixed_sending = false) {
     if (config.logLevel === 'full') {
@@ -395,7 +397,6 @@ async function sendResult_forward(session, config, result, logger, mixed_sending
     const localDownloadDir = config.localDownloadDir;
     const onebotReadDir = config.onebotReadDir;
     let mediaCoverUrl = result.coverUrl;
-    let mediaVideoUrl = result.videoUrl || null;
     let mediaMainbody = result.mainbody;
     let proxy = undefined;
     if (config.proxy_settings[result.platform]) {
@@ -412,39 +413,6 @@ async function sendResult_forward(session, config, result, logger, mixed_sending
             mediaCoverUrl = '';
         }
     }
-    // --- 视频大小检查 + 下载 ---
-    let videoExceedsLimit = false;
-    if (result.videoUrl) {
-        const sizeBytes = await getFileSize(result.videoUrl, proxy, config.userAgent, logger);
-        const maxBytes = config.Max_size !== undefined ? config.Max_size * 1024 * 1024 : undefined;
-        const formatMB = (bytes) => (bytes / (1024 * 1024)).toFixed(2);
-        if (sizeBytes === null) {
-            logger.warn(`无法获取视频大小: ${result.videoUrl}，默认允许下载`);
-        }
-        else {
-            const sizeMB = formatMB(sizeBytes);
-            if (maxBytes !== undefined && sizeBytes > maxBytes) {
-                videoExceedsLimit = true;
-                mediaVideoUrl = null;
-                const maxMB = config.Max_size.toFixed(2);
-                if (config.logLevel !== 'none') {
-                    logger.info(`视频大小超限 (${sizeMB} MB > ${maxMB} MB): ${result.videoUrl}`);
-                }
-            }
-            else {
-                try {
-                    mediaVideoUrl = await downloadAndMapUrl(result.videoUrl, proxy, config.userAgent, localDownloadDir, onebotReadDir, logger);
-                    if (config.logLevel === 'full') {
-                        logger.info(`视频已下载 (${sizeMB} MB): ${mediaVideoUrl}`);
-                    }
-                }
-                catch (e) {
-                    logger.warn('视频下载失败', e);
-                    mediaVideoUrl = null;
-                }
-            }
-        }
-    }
     // --- mainbody 图片 ---
     if (result.mainbody) {
         const imgUrls = [...result.mainbody.matchAll(/<img\s[^>]*src\s*=\s*["']?([^"'>\s]+)["']?/gi)].map(m => m[1]);
@@ -463,98 +431,130 @@ async function sendResult_forward(session, config, result, logger, mixed_sending
             mediaMainbody = mediaMainbody.replace(new RegExp(escaped, 'g'), local);
         }
     }
-    // === 构建消息模板 ===
+    // === 主消息（不含媒体文件）===
     let message = config.format;
     message = message.replace(/{title}/g, escapeHtml(result.title || ''));
     message = message.replace(/{authorName}/g, escapeHtml(result.authorName || ''));
+    message = message.replace(/{mainbody}/g, mediaMainbody ?? '');
     message = message.replace(/{sourceUrl}/g, escapeHtml(result.sourceUrl || ''));
+    message = message.replace(/{cover}/g, mediaCoverUrl ? koishi_1.h.image(mediaCoverUrl).toString() : '');
     message = message.replace(/{stats}/g, escapeHtml(result.stats || ''));
-    // 处理 {videoUrl} 和 {video} 占位符逻辑（用于后续判断）
-    if (result.videoUrl) {
-        message = message.replace(/{videoUrl}/g, escapeHtml(result.videoUrl));
-        if (videoExceedsLimit) {
-            const tip = escapeHtml(config.Max_size_tip);
-            message = message.replace(/{video}/g, tip);
-        }
-        // 注意：这里不替换 {video} 为实际视频，留到转发节点构建时处理
-    }
-    const hasVideoInTemplate = message.includes('{video}');
-    const mediaMap = {};
-    if (mediaCoverUrl) {
-        mediaMap['{cover}'] = [{ type: 'image', data: { file: mediaCoverUrl } }];
-    }
-    else {
-        mediaMap['{cover}'] = [];
-    }
     const lines = message.split('\n').filter(line => line.trim() !== '');
-    const nonVideoSegments = [];
+    const mainSegments = [];
     for (let i = 0; i < lines.length; i++) {
         const line = lines[i];
         const isLastLine = i === lines.length - 1;
-        const tokens = line.split(/(\{cover\}|\{video\})/g);
+        const tokens = line.split(/(\{cover\})/g);
         const currentLineSegments = [];
         let hasTextContent = false;
         for (const token of tokens) {
             if (token === '{cover}') {
-                currentLineSegments.push(...mediaMap[token]);
+                if (mediaCoverUrl) {
+                    currentLineSegments.push({ type: 'image', data: { file: mediaCoverUrl } });
+                }
             }
             else if (token === '{mainbody}') {
                 const parsed = parseHtmlToSegments(mediaMainbody || '');
                 currentLineSegments.push(...parsed);
                 hasTextContent = parsed.some(seg => seg.type === 'text');
             }
-            else if (token === '{video}') {
-                // 超限时替换为提示文本；否则留空（由转发节点处理）
-                if (videoExceedsLimit) {
-                    const tip = config.Max_size_tip;
-                    currentLineSegments.push({ type: 'text', data: { text: tip } });
-                    hasTextContent = true;
-                }
-                // 否则不插入内容（视频将作为独立节点）
-            }
             else if (token.trim() !== '') {
                 currentLineSegments.push({ type: 'text', data: { text: token } });
                 hasTextContent = true;
             }
         }
         if (currentLineSegments.length > 0) {
-            nonVideoSegments.push(...currentLineSegments);
+            mainSegments.push(...currentLineSegments);
         }
         if (!isLastLine && hasTextContent) {
-            nonVideoSegments.push({ type: 'text', data: { text: '\n' } });
+            mainSegments.push({ type: 'text', data: { text: '\n' } });
         }
     }
     const forwardNodes = [];
-    if (nonVideoSegments.length > 0) {
+    if (mainSegments.length > 0) {
         forwardNodes.push({
             type: 'node',
             data: {
                 user_id: session.selfId,
                 nickname: '分享助手',
-                content: nonVideoSegments
+                content: mainSegments
             }
         });
     }
-    let videoElement;
-    if (hasVideoInTemplate && result.videoUrl && !videoExceedsLimit && mediaVideoUrl) {
-        if (!mixed_sending) {
-            forwardNodes.push({
-                type: 'node',
-                data: {
-                    user_id: session.selfId,
-                    nickname: '分享助手',
-                    content: [{ type: 'video', data: { file: mediaVideoUrl } }]
+    // --- 处理 files 中的所有媒体 ---
+    const extraSendPromises = [];
+    if (config.sendFiles && Array.isArray(result.files)) {
+        for (const file of result.files) {
+            const { type, url: remoteUrl } = file;
+            if (!['video', 'audio', 'generic'].includes(type))
+                continue;
+            let shouldInclude = true;
+            if (config.Max_size !== undefined) {
+                const sizeBytes = await getFileSize(remoteUrl, proxy, config.userAgent, logger);
+                const maxBytes = config.Max_size * 1024 * 1024;
+                if (sizeBytes !== null && sizeBytes > maxBytes) {
+                    shouldInclude = false;
+                    if (config.logLevel !== 'none') {
+                        const sizeMB = (sizeBytes / (1024 * 1024)).toFixed(2);
+                        const maxMB = config.Max_size.toFixed(2);
+                        extraSendPromises.push(session.send(`文件大小超限 (${sizeMB} MB > ${maxMB} MB)`));
+                        logger.info(`文件大小超限 (${sizeMB} MB > ${maxMB} MB)，跳过: ${remoteUrl}`);
+                    }
                 }
-            });
-        }
-        else {
-            videoElement = koishi_1.h.video(mediaVideoUrl).toString();
-        }
-        if (config.logLevel === 'link_only') {
-            logger.info(`视频直链 (${result.platform}): ${result.videoUrl}`);
+            }
+            if (shouldInclude) {
+                try {
+                    const localUrl = await downloadAndMapUrl(remoteUrl, proxy, config.userAgent, localDownloadDir, onebotReadDir, logger);
+                    if (!localUrl)
+                        continue;
+                    if (!mixed_sending) {
+                        // 作为转发节点发送
+                        let segment = null;
+                        if (type === 'video') {
+                            segment = { type: 'video', data: { file: localUrl } };
+                        }
+                        else if (type === 'audio') {
+                            segment = { type: 'audio', data: { file: localUrl } };
+                        }
+                        else if (type === 'generic') {
+                            // 注意：标准 OneBot 转发节点不支持 file，这里降级为文本链接
+                            segment = { type: 'text', data: { text: `📄 文件: ${remoteUrl}` } };
+                        }
+                        if (segment) {
+                            forwardNodes.push({
+                                type: 'node',
+                                data: {
+                                    user_id: session.selfId,
+                                    nickname: '分享助手',
+                                    content: [segment]
+                                }
+                            });
+                        }
+                    }
+                    else {
+                        // 混合模式：独立发送
+                        let element = null;
+                        if (type === 'video')
+                            element = koishi_1.h.video(localUrl).toString();
+                        else if (type === 'audio')
+                            element = koishi_1.h.audio(localUrl).toString();
+                        else if (type === 'generic')
+                            element = koishi_1.h.file(localUrl).toString();
+                        if (element) {
+                            extraSendPromises.push(session.send(element));
+                        }
+                    }
+                    if (config.logLevel === 'link_only') {
+                        logger.info(`${type} 直链 (${result.platform}): ${remoteUrl}`);
+                    }
+                }
+                catch (e) {
+                    logger.warn(`${type} 下载失败: ${remoteUrl}`, e);
+                }
+            }
         }
     }
-    if (forwardNodes.length === 0)
+    if (forwardNodes.length === 0 && extraSendPromises.length === 0)
         return;
     if (config.logLevel === 'full') {
         logger.info(`解析结果: \n ${JSON.stringify(result, null, 2)}`);
@@ -562,16 +562,18 @@ async function sendResult_forward(session, config, result, logger, mixed_sending
     if (!(session.onebot && session.onebot._request))
         throw new Error("Onebot is not defined");
     const promises = [];
-    promises.push(session.onebot._request('send_group_forward_msg', {
-        group_id: session.guildId,
-        messages: forwardNodes,
-        news: [{ text: mediaMainbody || '-' }, { text: '点击查看详情 | Powered by furryaxw' }],
-        prompt: result.title || '',
-        summary: '分享解析',
-        source: result.title || ''
-    }));
-    if (mixed_sending && videoElement) {
-        promises.push(session.send(videoElement));
+    if (forwardNodes.length > 0) {
+        promises.push(session.onebot._request('send_group_forward_msg', {
+            group_id: session.guildId,
+            messages: forwardNodes,
+            news: [{ text: mediaMainbody || '-' }, { text: '点击查看详情 | Powered by furryaxw' }],
+            prompt: result.title || '',
+            summary: '分享解析',
+            source: result.title || ''
+        }));
+    }
+    if (mixed_sending && extraSendPromises.length > 0) {
+        promises.push(...extraSendPromises);
     }
     await Promise.all(promises);
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "koishi-plugin-share-links-analysis",
   "description": "自用插件",
   "license": "MIT",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [