Upload screenshotService.js

backend/src/services/screenshotService.js

@@ -198,16 +198,24 @@ class ScreenshotService {
         // 优化页面设置
         await page.setRequestInterception(true);
         page.on('request', (request) => {
-          // 阻止不必要的资源加载
+          // 优化的资源拦截逻辑，确保SVG相关资源能够正确加载
           const resourceType = request.resourceType();
-          if (resourceType === 'media' || resourceType === 'font') {
-            // 允许字体资源加载
+          const url = request.url();
+          
+          // 允许SVG相关资源和基本资源
+          if (resourceType === 'document' || 
+              resourceType === 'stylesheet' || 
+              resourceType === 'script' || 
+              resourceType === 'font' ||
+              url.includes('svg') ||
+              url.includes('data:image/svg') ||
+              resourceType === 'image') {
             request.continue();
-          } else if (resourceType === 'stylesheet' || resourceType === 'script' || resourceType === 'image') {
-            // 允许基本资源
+          } else if (resourceType === 'media' && !url.includes('ads')) {
+            // 允许非广告媒体资源
             request.continue();
           } else {
-            // 阻止其他资源
+            // 阻止其他不必要的资源
             request.abort();
           }
         });
@@ -690,21 +698,55 @@ class ScreenshotService {
         return document.fonts ? document.fonts.ready : Promise.resolve();
       });
 
-      // 减少等待时间
-      await page.waitForTimeout(200);
+      // 等待SVG元素完全加载和渲染
+      await page.evaluate(() => {
+        return new Promise(resolve => {
+          const svgs = document.querySelectorAll('svg');
+          if (svgs.length === 0) {
+            resolve();
+            return;
+          }
+          
+          let loadedCount = 0;
+          const checkComplete = () => {
+            loadedCount++;
+            if (loadedCount === svgs.length) resolve();
+          };
+          
+          svgs.forEach(svg => {
+            if (svg.complete || svg.readyState === 'complete') {
+              checkComplete();
+            } else {
+              svg.addEventListener('load', checkComplete);
+              svg.addEventListener('error', checkComplete); // 处理加载错误
+            }
+          });
+          
+          // 如果所有SVG都已完成，立即resolve
+          if (loadedCount === svgs.length) resolve();
+          
+          // 超时保护，确保不会无限等待
+          setTimeout(resolve, 3000);
+        });
+      });
+
+      // 额外等待时间确保渲染完成
+      await page.waitForTimeout(500);
       
       // 优化内存使用
       if (global.gc && Math.random() < 0.1) { // 随机触发GC，避免每次都执行
         global.gc();
       }
 
-      // 截图选项
+      // 优化的截图选项，提高矢量图形质量
       const screenshotOptions = {
         type: format,
-        quality: format === 'jpeg' ? quality : undefined,
+        quality: format === 'jpeg' ? Math.max(quality, 90) : undefined, // 提高JPEG质量
         fullPage: false,
         omitBackground: format === 'png', // PNG格式可以透明背景
-        clip: { x: 0, y: 0, width, height }
+        clip: { x: 0, y: 0, width, height },
+        // 添加设备像素比以提高清晰度，特别是对矢量图形
+        deviceScaleFactor: 2
       };
 
       const screenshot = await page.screenshot(screenshotOptions);