优化 Chromium
This commit is contained in:
parent
70cc336360
commit
c815d50be8
|
@ -10,7 +10,7 @@ chromiumPath:
|
||||||
puppeteerWS:
|
puppeteerWS:
|
||||||
|
|
||||||
# headless
|
# headless
|
||||||
headless: 'new'
|
headless: "new"
|
||||||
|
|
||||||
# puppeteer启动args,注意args的--前缀
|
# puppeteer启动args,注意args的--前缀
|
||||||
args:
|
args:
|
||||||
|
|
|
@ -1,23 +1,20 @@
|
||||||
import Renderer from '../../../lib/renderer/Renderer.js'
|
import Renderer from "../../../lib/renderer/Renderer.js"
|
||||||
import os from 'node:os'
|
import os from "node:os"
|
||||||
import lodash from 'lodash'
|
import lodash from "lodash"
|
||||||
import puppeteer from 'puppeteer'
|
import puppeteer from "puppeteer"
|
||||||
// 暂时保留对原config的兼容
|
// 暂时保留对原config的兼容
|
||||||
import cfg from '../../../lib/config/config.js'
|
import cfg from "../../../lib/config/config.js"
|
||||||
import { Data } from '#miao'
|
|
||||||
|
|
||||||
const _path = process.cwd()
|
const _path = process.cwd()
|
||||||
// mac地址
|
// mac地址
|
||||||
let mac = ''
|
let mac = ""
|
||||||
// 超时计时器
|
|
||||||
let overtimeList = []
|
|
||||||
|
|
||||||
export default class Puppeteer extends Renderer {
|
export default class Puppeteer extends Renderer {
|
||||||
constructor(config) {
|
constructor(config) {
|
||||||
super({
|
super({
|
||||||
id: 'puppeteer',
|
id: "puppeteer",
|
||||||
type: 'image',
|
type: "image",
|
||||||
render: 'screenshot'
|
render: "screenshot"
|
||||||
})
|
})
|
||||||
this.browser = false
|
this.browser = false
|
||||||
this.lock = false
|
this.lock = false
|
||||||
|
@ -27,22 +24,20 @@ export default class Puppeteer extends Renderer {
|
||||||
/** 截图次数 */
|
/** 截图次数 */
|
||||||
this.renderNum = 0
|
this.renderNum = 0
|
||||||
this.config = {
|
this.config = {
|
||||||
headless: Data.def(config.headless, true),
|
headless: config.headless || "new",
|
||||||
args: Data.def(config.args, [
|
args: config.args || [
|
||||||
'--disable-gpu',
|
"--disable-gpu",
|
||||||
'--disable-setuid-sandbox',
|
"--disable-setuid-sandbox",
|
||||||
'--no-sandbox',
|
"--no-sandbox",
|
||||||
'--no-zygote'
|
"--no-zygote"
|
||||||
])
|
]
|
||||||
}
|
}
|
||||||
if (config.chromiumPath || cfg?.bot?.chromium_path) {
|
if (config.chromiumPath || cfg?.bot?.chromium_path)
|
||||||
/** chromium其他路径 */
|
/** chromium其他路径 */
|
||||||
this.config.executablePath = config.chromiumPath || cfg?.bot?.chromium_path
|
this.config.executablePath = config.chromiumPath || cfg?.bot?.chromium_path
|
||||||
}
|
if (config.puppeteerWS || cfg?.bot?.puppeteer_ws)
|
||||||
if (config.puppeteerWS || cfg?.bot?.puppeteer_ws) {
|
|
||||||
/** chromium其他路径 */
|
/** chromium其他路径 */
|
||||||
this.config.wsEndpoint = config.puppeteerWS || cfg?.bot?.puppeteer_ws
|
this.config.wsEndpoint = config.puppeteerWS || cfg?.bot?.puppeteer_ws
|
||||||
}
|
|
||||||
/** puppeteer超时超时时间 */
|
/** puppeteer超时超时时间 */
|
||||||
this.puppeteerTimeout = config.puppeteerTimeout || cfg?.bot?.puppeteer_timeout || 0
|
this.puppeteerTimeout = config.puppeteerTimeout || cfg?.bot?.puppeteer_timeout || 0
|
||||||
}
|
}
|
||||||
|
@ -55,7 +50,7 @@ export default class Puppeteer extends Renderer {
|
||||||
if (this.lock) return false
|
if (this.lock) return false
|
||||||
this.lock = true
|
this.lock = true
|
||||||
|
|
||||||
logger.info('puppeteer Chromium 启动中...')
|
logger.info("puppeteer Chromium 启动中...")
|
||||||
|
|
||||||
let connectFlag = false
|
let connectFlag = false
|
||||||
try {
|
try {
|
||||||
|
@ -67,35 +62,32 @@ export default class Puppeteer extends Renderer {
|
||||||
// 是否有browser实例
|
// 是否有browser实例
|
||||||
const browserUrl = (await redis.get(this.browserMacKey)) || this.config.wsEndpoint
|
const browserUrl = (await redis.get(this.browserMacKey)) || this.config.wsEndpoint
|
||||||
if (browserUrl) {
|
if (browserUrl) {
|
||||||
logger.info(`puppeteer Chromium from ${browserUrl}`)
|
try {
|
||||||
const browserWSEndpoint = await puppeteer.connect({ browserWSEndpoint: browserUrl }).catch(() => {
|
const browserWSEndpoint = await puppeteer.connect({ browserWSEndpoint: browserUrl })
|
||||||
logger.error('puppeteer Chromium 缓存的实例已关闭')
|
|
||||||
redis.del(this.browserMacKey)
|
|
||||||
})
|
|
||||||
// 如果有实例,直接使用
|
// 如果有实例,直接使用
|
||||||
if (browserWSEndpoint) {
|
if (browserWSEndpoint) {
|
||||||
this.browser = browserWSEndpoint
|
this.browser = browserWSEndpoint
|
||||||
if (this.browser) {
|
|
||||||
connectFlag = true
|
connectFlag = true
|
||||||
}
|
}
|
||||||
|
logger.info(`puppeteer Chromium 连接成功 ${browserUrl}`)
|
||||||
|
} catch (err) {
|
||||||
|
await redis.del(this.browserMacKey)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (err) {}
|
||||||
logger.info('puppeteer Chromium 不存在已有实例')
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!this.browser || !connectFlag) {
|
if (!this.browser || !connectFlag) {
|
||||||
// 如果没有实例,初始化puppeteer
|
// 如果没有实例,初始化puppeteer
|
||||||
this.browser = await puppeteer.launch(this.config).catch((err, trace) => {
|
this.browser = await puppeteer.launch(this.config).catch((err, trace) => {
|
||||||
let errMsg = err.toString() + (trace ? trace.toString() : '')
|
let errMsg = err.toString() + (trace ? trace.toString() : "")
|
||||||
if (typeof err == 'object') {
|
if (typeof err == "object") {
|
||||||
logger.error(JSON.stringify(err))
|
logger.error(JSON.stringify(err))
|
||||||
} else {
|
} else {
|
||||||
logger.error(err.toString())
|
logger.error(err.toString())
|
||||||
if (errMsg.includes('Could not find Chromium')) {
|
if (errMsg.includes("Could not find Chromium")) {
|
||||||
logger.error('没有正确安装 Chromium,可以尝试执行安装命令:node node_modules/puppeteer/install.js')
|
logger.error("没有正确安装 Chromium,可以尝试执行安装命令:node node_modules/puppeteer/install.js")
|
||||||
} else if (errMsg.includes('cannot open shared object file')) {
|
} else if (errMsg.includes("cannot open shared object file")) {
|
||||||
logger.error('没有正确安装 Chromium 运行库')
|
logger.error("没有正确安装 Chromium 运行库")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
logger.error(err, trace)
|
logger.error(err, trace)
|
||||||
|
@ -105,24 +97,26 @@ export default class Puppeteer extends Renderer {
|
||||||
this.lock = false
|
this.lock = false
|
||||||
|
|
||||||
if (!this.browser) {
|
if (!this.browser) {
|
||||||
logger.error('puppeteer Chromium 启动失败')
|
logger.error("puppeteer Chromium 启动失败")
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
if (connectFlag) {
|
if (!connectFlag) {
|
||||||
logger.info('puppeteer Chromium 已连接启动的实例')
|
logger.info(`puppeteer Chromium 启动成功 ${this.browser.wsEndpoint()}`)
|
||||||
} else {
|
if (this.browserMacKey) {
|
||||||
logger.info(`[Chromium] ${this.browser.wsEndpoint()}`)
|
|
||||||
if (process.env.pm_id && this.browserMacKey) {
|
|
||||||
// 缓存一下实例30天
|
// 缓存一下实例30天
|
||||||
const expireTime = 60 * 60 * 24 * 30
|
const expireTime = 60 * 60 * 24 * 30
|
||||||
await redis.set(this.browserMacKey, this.browser.wsEndpoint(), { EX: expireTime })
|
await redis.set(this.browserMacKey, this.browser.wsEndpoint(), { EX: expireTime })
|
||||||
}
|
}
|
||||||
logger.info('puppeteer Chromium 启动成功')
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 监听Chromium实例是否断开 */
|
/** 监听Chromium实例是否断开 */
|
||||||
this.browser.on('disconnected', () => {
|
this.browser.on("disconnected", async () => {
|
||||||
logger.error('Chromium 实例关闭或崩溃!')
|
logger.info("puppeteer Chromium 实例关闭")
|
||||||
|
try {
|
||||||
|
await this.browser.close()
|
||||||
|
} catch (err) {
|
||||||
|
logger.error("puppeteer Chromium 关闭错误", err)
|
||||||
|
}
|
||||||
this.browser = false
|
this.browser = false
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -131,7 +125,7 @@ export default class Puppeteer extends Renderer {
|
||||||
|
|
||||||
// 获取Mac地址
|
// 获取Mac地址
|
||||||
getMac() {
|
getMac() {
|
||||||
let mac = '00:00:00:00:00:00'
|
let mac = "00:00:00:00:00:00"
|
||||||
try {
|
try {
|
||||||
const network = os.networkInterfaces()
|
const network = os.networkInterfaces()
|
||||||
let macFlag = false
|
let macFlag = false
|
||||||
|
@ -149,7 +143,7 @@ export default class Puppeteer extends Renderer {
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
}
|
}
|
||||||
mac = mac.replace(/:/g, '')
|
mac = mac.replace(/:/g, "")
|
||||||
return mac
|
return mac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -169,17 +163,14 @@ export default class Puppeteer extends Renderer {
|
||||||
* @return img 不做segment包裹
|
* @return img 不做segment包裹
|
||||||
*/
|
*/
|
||||||
async screenshot(name, data = {}) {
|
async screenshot(name, data = {}) {
|
||||||
if (!await this.browserInit()) {
|
if (!await this.browserInit())
|
||||||
return false
|
return false
|
||||||
}
|
|
||||||
const pageHeight = data.multiPageHeight || 4000
|
const pageHeight = data.multiPageHeight || 4000
|
||||||
|
|
||||||
let savePath = this.dealTpl(name, data)
|
let savePath = this.dealTpl(name, data)
|
||||||
if (!savePath) {
|
if (!savePath) return false
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
let buff = ''
|
let buff = ""
|
||||||
let start = Date.now()
|
let start = Date.now()
|
||||||
|
|
||||||
let ret = []
|
let ret = []
|
||||||
|
@ -187,17 +178,13 @@ export default class Puppeteer extends Renderer {
|
||||||
|
|
||||||
const puppeteerTimeout = this.puppeteerTimeout
|
const puppeteerTimeout = this.puppeteerTimeout
|
||||||
let overtime
|
let overtime
|
||||||
let overtimeFlag = false
|
|
||||||
if (puppeteerTimeout > 0) {
|
if (puppeteerTimeout > 0) {
|
||||||
// TODO 截图超时处理
|
// TODO 截图超时处理
|
||||||
overtime = setTimeout(() => {
|
overtime = setTimeout(() => {
|
||||||
if (!overtimeFlag) {
|
if (this.shoting.length) {
|
||||||
logger.error(`[图片生成][${name}] 截图超时,当前等待队列:${this.shoting.join(',')}`)
|
logger.error(`[图片生成][${name}] 截图超时,当前等待队列:${this.shoting.join(",")}`)
|
||||||
this.restart(true)
|
this.restart(true)
|
||||||
this.shoting = []
|
this.shoting = []
|
||||||
overtimeList.forEach(item => {
|
|
||||||
clearTimeout(item)
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
}, puppeteerTimeout)
|
}, puppeteerTimeout)
|
||||||
}
|
}
|
||||||
|
@ -205,8 +192,8 @@ export default class Puppeteer extends Renderer {
|
||||||
try {
|
try {
|
||||||
const page = await this.browser.newPage()
|
const page = await this.browser.newPage()
|
||||||
let pageGotoParams = lodash.extend({ timeout: 120000 }, data.pageGotoParams || {})
|
let pageGotoParams = lodash.extend({ timeout: 120000 }, data.pageGotoParams || {})
|
||||||
await page.goto(`file://${_path}${lodash.trim(savePath, '.')}`, pageGotoParams)
|
await page.goto(`file://${_path}${lodash.trim(savePath, ".")}`, pageGotoParams)
|
||||||
let body = await page.$('#container') || await page.$('body')
|
let body = await page.$("#container") || await page.$("body")
|
||||||
|
|
||||||
// 计算页面高度
|
// 计算页面高度
|
||||||
const boundingBox = await body.boundingBox()
|
const boundingBox = await body.boundingBox()
|
||||||
|
@ -214,27 +201,27 @@ export default class Puppeteer extends Renderer {
|
||||||
let num = 1
|
let num = 1
|
||||||
|
|
||||||
let randData = {
|
let randData = {
|
||||||
type: data.imgType || 'jpeg',
|
type: data.imgType || "jpeg",
|
||||||
omitBackground: data.omitBackground || false,
|
omitBackground: data.omitBackground || false,
|
||||||
quality: data.quality || 90,
|
quality: data.quality || 90,
|
||||||
path: data.path || ''
|
path: data.path || ""
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data.multiPage) {
|
if (data.multiPage) {
|
||||||
randData.type = 'jpeg'
|
randData.type = "jpeg"
|
||||||
num = Math.round(boundingBox.height / pageHeight) || 1
|
num = Math.round(boundingBox.height / pageHeight) || 1
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data.imgType === 'png') {
|
if (data.imgType === "png") {
|
||||||
delete randData.quality
|
delete randData.quality
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!data.multiPage) {
|
if (!data.multiPage) {
|
||||||
buff = await body.screenshot(randData)
|
buff = await body.screenshot(randData)
|
||||||
/** 计算图片大小 */
|
|
||||||
const kb = (buff.length / 1024).toFixed(2) + 'KB'
|
|
||||||
logger.mark(`[图片生成][${name}][${this.renderNum}次] ${kb} ${logger.green(`${Date.now() - start}ms`)}`)
|
|
||||||
this.renderNum++
|
this.renderNum++
|
||||||
|
/** 计算图片大小 */
|
||||||
|
const kb = (buff.length / 1024).toFixed(2) + "KB"
|
||||||
|
logger.mark(`[图片生成][${name}][${this.renderNum}次] ${kb} ${logger.green(`${Date.now() - start}ms`)}`)
|
||||||
ret.push(buff)
|
ret.push(buff)
|
||||||
} else {
|
} else {
|
||||||
// 分片截图
|
// 分片截图
|
||||||
|
@ -260,12 +247,12 @@ export default class Puppeteer extends Renderer {
|
||||||
buff = await page.screenshot(randData)
|
buff = await page.screenshot(randData)
|
||||||
}
|
}
|
||||||
if (num > 2) {
|
if (num > 2) {
|
||||||
await Data.sleep(200)
|
await new Promise(resolve => setTimeout(resolve, 200))
|
||||||
}
|
}
|
||||||
this.renderNum++
|
this.renderNum++
|
||||||
|
|
||||||
/** 计算图片大小 */
|
/** 计算图片大小 */
|
||||||
const kb = (buff.length / 1024).toFixed(2) + 'KB'
|
const kb = (buff.length / 1024).toFixed(2) + "KB"
|
||||||
logger.mark(`[图片生成][${name}][${i}/${num}] ${kb}`)
|
logger.mark(`[图片生成][${name}][${i}/${num}] ${kb}`)
|
||||||
ret.push(buff)
|
ret.push(buff)
|
||||||
}
|
}
|
||||||
|
@ -273,22 +260,16 @@ export default class Puppeteer extends Renderer {
|
||||||
logger.mark(`[图片生成][${name}] 处理完成`)
|
logger.mark(`[图片生成][${name}] 处理完成`)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
page.close().catch((err) => logger.error(err))
|
page.close().catch(err => logger.error(err))
|
||||||
} catch (error) {
|
} catch (err) {
|
||||||
logger.error(`[图片生成][${name}] 图片生成失败:${error}`)
|
logger.error(`[图片生成][${name}] 图片生成失败`, err)
|
||||||
/** 关闭浏览器 */
|
/** 关闭浏览器 */
|
||||||
if (this.browser) {
|
this.restart(true)
|
||||||
await this.browser.close().catch((err) => logger.error(err))
|
if (overtime) clearTimeout(overtime)
|
||||||
}
|
|
||||||
this.browser = false
|
|
||||||
ret = []
|
ret = []
|
||||||
return false
|
return false
|
||||||
} finally {
|
} finally {
|
||||||
if (overtime) {
|
if (overtime) clearTimeout(overtime)
|
||||||
overtimeFlag = true
|
|
||||||
clearTimeout(overtime)
|
|
||||||
overtimeList = []
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
this.shoting.pop()
|
this.shoting.pop()
|
||||||
|
@ -298,24 +279,23 @@ export default class Puppeteer extends Renderer {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
this.restart(false)
|
this.restart()
|
||||||
|
|
||||||
return data.multiPage ? ret : ret[0]
|
return data.multiPage ? ret : ret[0]
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 重启 */
|
/** 重启 */
|
||||||
restart(force = false) {
|
restart(force = false) {
|
||||||
/** 截图超过重启数时,自动关闭重启浏览器,避免生成速度越来越慢 */
|
/** 截图超过重启数时,自动关闭重启浏览器,避免生成速度越来越慢 */
|
||||||
if (this.renderNum % this.restartNum === 0 || force) {
|
if (!this.browser) return
|
||||||
if (this.shoting.length <= 0 || force) {
|
if (!force) if (this.renderNum % this.restartNum !== 0 || this.shoting.length > 0) return
|
||||||
setTimeout(async () => {
|
setTimeout(async () => {
|
||||||
if (this.browser) {
|
logger.info(`puppeteer Chromium ${force ? "强制" : ""}关闭重启...`)
|
||||||
await this.browser.close().catch((err) => logger.error(err))
|
try {
|
||||||
|
await this.browser.close()
|
||||||
|
} catch (err) {
|
||||||
|
logger.error("puppeteer Chromium 关闭错误", err)
|
||||||
}
|
}
|
||||||
this.browser = false
|
this.browser = false
|
||||||
logger.info(`puppeteer Chromium ${force ? '强制' : ''}关闭重启...`)
|
|
||||||
}, 100)
|
}, 100)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue