细节优化

lib/puppeteer/puppeteer.js

@@ -7,17 +7,15 @@ import Renderer from "../renderer/loader.js"
  */
 const renderer = Renderer.getRenderer()
 renderer.screenshot = async (name, data) => {
-    let img = await renderer.render(name, data)
-    return img ? segment.image(img) : img
+  const img = await renderer.render(name, data)
+  return img ? segment.image(img) : img
 }
 renderer.screenshots = async (name, data) => {
-    data.multiPage = true
-    let imgs = await renderer.render(name, data) || []
-    let ret = []
-    for (let img of imgs) {
-        ret.push(img ? segment.image(img) : img)
-    }
-    return ret.length > 0 ? ret : false
+  data.multiPage = true
+  const imgs = await renderer.render(name, data) || []
+  const ret = []
+  for (const img of imgs)
+    ret.push(img ? segment.image(img) : img)
+  return ret.length > 0 ? ret : false
 }
-
 export default renderer

renderers/puppeteer/config_default.yaml

@@ -21,3 +21,8 @@ args:
 
 # puppeteer截图超时时间
 puppeteerTimeout:
+
+# 页面goto时的参数
+pageGotoParams:
+  timeout: 120000
+  waitUntil: networkidle2

renderers/puppeteer/lib/puppeteer.js

@@ -40,6 +40,10 @@ export default class Puppeteer extends Renderer {
       this.config.wsEndpoint = config.puppeteerWS || cfg?.bot?.puppeteer_ws
     /** puppeteer超时超时时间 */
     this.puppeteerTimeout = config.puppeteerTimeout || cfg?.bot?.puppeteer_timeout || 0
+    this.pageGotoParams = config.pageGotoParams || {
+      timeout: 120000,
+      waitUntil: "networkidle2",
+    }
   }
 
   /**
@@ -159,11 +163,11 @@ export default class Puppeteer extends Renderer {
       return false
     const pageHeight = data.multiPageHeight || 4000
 
-    let savePath = this.dealTpl(name, data)
+    const savePath = this.dealTpl(name, data)
     if (!savePath) return false
 
     let buff = ""
-    let start = Date.now()
+    const start = Date.now()
 
     let ret = []
     this.shoting.push(name)
@@ -183,30 +187,29 @@ export default class Puppeteer extends Renderer {
 
     try {
       const page = await this.browser.newPage()
-      let pageGotoParams = lodash.extend({ timeout: 120000 }, data.pageGotoParams || {})
+      const pageGotoParams = lodash.extend(this.pageGotoParams, data.pageGotoParams || {})
       await page.goto(`file://${_path}${lodash.trim(savePath, ".")}`, pageGotoParams)
-      let body = await page.$("#container") || await page.$("body")
+      const body = await page.$("#container") || await page.$("body")
 
       // 计算页面高度
       const boundingBox = await body.boundingBox()
       // 分页数
       let num = 1
 
-      let randData = {
+      const randData = {
         type: data.imgType || "jpeg",
         omitBackground: data.omitBackground || false,
         quality: data.quality || 90,
-        path: data.path || ""
+        path: data.path || "",
       }
 
       if (data.multiPage) {
         randData.type = "jpeg"
         num = Math.round(boundingBox.height / pageHeight) || 1
       }
 
-      if (data.imgType === "png") {
+      if (data.imgType === "png")
         delete randData.quality
-      }
 
       if (!data.multiPage) {
         buff = await body.screenshot(randData)