@anyul/koishi-plugin-rss 5.2.1 → 5.2.3

package/lib/core/renderer.js

@@ -33,12 +33,31 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.calculateContentHeight = calculateContentHeight;
 exports.preprocessHtmlImages = preprocessHtmlImages;
 exports.renderHtml2Image = renderHtml2Image;
 const koishi_1 = require("koishi");
 const cheerio = __importStar(require("cheerio"));
 const logger_1 = require("../utils/logger");
 const media_1 = require("../utils/media");
+function calculateContentHeight(metrics) {
+    const intrinsicHeight = Math.ceil(Math.max(metrics.contentRangeHeight, metrics.maxElementBottom, 0)
+        + metrics.paddingTop
+        + metrics.paddingBottom
+        + metrics.marginTop
+        + metrics.marginBottom);
+    const domMeasuredHeight = Math.max(metrics.bodyScrollHeight, metrics.bodyOffsetHeight, metrics.documentScrollHeight, 0);
+    if (intrinsicHeight > 0) {
+        if (domMeasuredHeight > intrinsicHeight && domMeasuredHeight - intrinsicHeight <= 64) {
+            return Math.max(domMeasuredHeight, 100);
+        }
+        return Math.max(intrinsicHeight, 100);
+    }
+    if (metrics.viewportHeight > 0 && domMeasuredHeight >= metrics.viewportHeight) {
+        return 100;
+    }
+    return Math.max(domMeasuredHeight, 100);
+}
 // 预处理 HTML：下载所有图片并替换为 data URL，避免 Puppeteer 截图时加载外部图片超时
 async function preprocessHtmlImages(ctx, config, $http, htmlContent, arg) {
     const $ = cheerio.load(htmlContent);
@@ -121,20 +140,22 @@ async function renderHtml2Image(ctx, config, $http, htmlContent, arg) {
     let page = await ctx.puppeteer.page();
     try {
         (0, logger_1.debug)(config, htmlContent, 'htmlContent', 'details');
+        const initialViewportHeight = 2000;
         // 预处理：下载所有图片并替换为 data URL，避免加载外部图片超时
         htmlContent = await preprocessHtmlImages(ctx, config, $http, htmlContent, arg);
         // 设置 deviceScaleFactor 以控制截图清晰度（必须在 setContent 之前）
         // 保持 viewport 宽度与 bodyWidth 匹配，避免排版错乱
-        const bodyWidth = config.template.bodyWidth || 600;
-        const bodyPadding = config.template.bodyPadding || 20;
+        // 优先使用 arg 参数，其次使用全局配置
+        const bodyWidth = arg?.bodyWidth ?? config.template.bodyWidth ?? 600;
+        const bodyPadding = arg?.bodyPadding ?? config.template.bodyPadding ?? 20;
         const viewportWidth = bodyWidth + bodyPadding * 2 + 100; // 预留额外空间
         // 先用较大的初始 viewport 加载页面（高度设大一些确保内容能完整渲染）
         await page.setViewport({
             width: viewportWidth,
-            height: 10000,
+            height: initialViewportHeight,
             deviceScaleFactor: config.template.deviceScaleFactor
         });
-        (0, logger_1.debug)(config, `设置截图清晰度: ${config.template.deviceScaleFactor}x, 初始 viewport: ${viewportWidth}x10000`, 'deviceScaleFactor', 'info');
+        (0, logger_1.debug)(config, `设置截图清晰度: ${config.template.deviceScaleFactor}x, 初始 viewport: ${viewportWidth}x${initialViewportHeight}`, 'deviceScaleFactor', 'info');
         // 拦截视频请求，避免加载视频导致超时
         await page.setRequestInterception(true);
         page.on('request', (req) => {
@@ -148,12 +169,76 @@ async function renderHtml2Image(ctx, config, $http, htmlContent, arg) {
         });
         // 使用 domcontentloaded 避免等待视频等慢速资源
         await page.setContent(htmlContent, { waitUntil: 'domcontentloaded', timeout: 15000 });
-        // 获取实际内容高度，根据内容高度动态调整 viewport
-        const actualHeight = await page.evaluate(() => {
-            return Math.max(document.body.offsetHeight, document.documentElement.scrollHeight, document.body.scrollHeight);
-        });
-        // 设置最小高度为 100，避免空内容时截图失败
+        // 等待一小段时间让 CSS 和内容完全渲染
+        await new Promise(resolve => setTimeout(resolve, 500));
+        // 获取实际内容尺寸，根据渲染内容边界动态调整 viewport
+        let contentMetrics = {
+            bodyScrollHeight: 0,
+            bodyOffsetHeight: 0,
+            documentScrollHeight: 0,
+            contentRangeHeight: 0,
+            maxElementBottom: 0,
+            paddingTop: 0,
+            paddingBottom: 0,
+            marginTop: 0,
+            marginBottom: 0,
+            marginLeft: 0,
+            bodyWidth: 0,
+            viewportHeight: initialViewportHeight,
+        };
+        try {
+            contentMetrics = await page.evaluate(() => {
+                const body = document.body;
+                const documentElement = document.documentElement;
+                if (!body || !documentElement) {
+                    return {
+                        bodyScrollHeight: 0,
+                        bodyOffsetHeight: 0,
+                        documentScrollHeight: 0,
+                        contentRangeHeight: 0,
+                        maxElementBottom: 0,
+                        paddingTop: 0,
+                        paddingBottom: 0,
+                        marginTop: 0,
+                        marginBottom: 0,
+                        marginLeft: 0,
+                        bodyWidth: 0,
+                        viewportHeight: window.innerHeight || 0,
+                    };
+                }
+                const computedStyle = document.defaultView?.getComputedStyle(body);
+                const bodyRect = body.getBoundingClientRect();
+                const range = document.createRange();
+                range.selectNodeContents(body);
+                const rangeRect = range.getBoundingClientRect();
+                const maxElementBottom = Array.from(body.querySelectorAll('*')).reduce((max, element) => {
+                    const rect = element.getBoundingClientRect();
+                    return Math.max(max, rect.bottom - bodyRect.top);
+                }, 0);
+                return {
+                    bodyScrollHeight: body.scrollHeight || 0,
+                    bodyOffsetHeight: body.offsetHeight || 0,
+                    documentScrollHeight: documentElement.scrollHeight || 0,
+                    contentRangeHeight: Math.ceil(rangeRect.height || 0),
+                    maxElementBottom: Math.ceil(maxElementBottom),
+                    paddingTop: parseFloat(computedStyle?.paddingTop || '0') || 0,
+                    paddingBottom: parseFloat(computedStyle?.paddingBottom || '0') || 0,
+                    marginTop: parseFloat(computedStyle?.marginTop || '0') || 0,
+                    marginBottom: parseFloat(computedStyle?.marginBottom || '0') || 0,
+                    marginLeft: parseFloat(computedStyle?.marginLeft || '0') || 0,
+                    bodyWidth: Math.ceil(body.offsetWidth || bodyRect.width || 0),
+                    viewportHeight: window.innerHeight || 0,
+                };
+            });
+        }
+        catch (e) {
+            (0, logger_1.debug)(config, `获取内容尺寸失败: ${e}`, 'height error', 'error');
+        }
+        const actualHeight = calculateContentHeight(contentMetrics);
         const viewportHeight = Math.max(actualHeight, 100);
+        const clipWidth = Math.max(contentMetrics.bodyWidth || bodyWidth, 1);
+        const clipX = Math.max(Math.floor(contentMetrics.marginLeft), 0);
+        const clipY = Math.max(Math.floor(contentMetrics.marginTop), 0);
         await page.setViewport({
             width: viewportWidth,
             height: viewportHeight,
@@ -179,12 +264,15 @@ async function renderHtml2Image(ctx, config, $http, htmlContent, arg) {
             }
             return koishi_1.h.image(image, 'image/png');
         }
-        let [height, width, x, y] = await page.evaluate(() => [
-            document.body.offsetHeight,
-            document.body.offsetWidth,
-            parseInt(document.defaultView.getComputedStyle(document.body).marginLeft) || 0,
-            parseInt(document.defaultView.getComputedStyle(document.body).marginTop) || 0
-        ]);
+        let height = actualHeight;
+        let width = clipWidth;
+        let x = clipX;
+        let y = clipY;
+        // 保守处理：如果高度异常，使用更小的值
+        if (height > 5000) {
+            (0, logger_1.debug)(config, `检测到异常高度 ${height}，进行裁剪`, 'height warn', 'info');
+            height = Math.min(height, 2000);
+        }
         let size = 10000;
         (0, logger_1.debug)(config, [height, width, x, y], 'pptr img size', 'details');
         const split = Math.ceil(height / size);
@@ -208,7 +296,8 @@ async function renderHtml2Image(ctx, config, $http, htmlContent, arg) {
         }
         (0, logger_1.debug)(config, { height, width, split }, 'split img', 'details');
         const reduceY = (index) => Math.floor(height / split * index);
-        const reduceHeight = (index) => Math.floor(height / split);
+        // 最后一份使用完整高度减去前面所有份的高度，确保覆盖全部内容
+        const reduceHeight = (index) => index === split - 1 ? height - reduceY(index) : Math.floor(height / split);
         let imgData = await Promise.all(Array.from({ length: split }, async (v, i) => await page.screenshot({
             type: "png",
             clip: {