Lexcubia
/
Miao-Yunzai
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

与上游同步修改

This commit is contained in:
Ayakura Yuki 2023-09-06 14:48:25 +08:00
parent 730b58ed08
commit 0c737301e8
2 changed files with 49 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.puppeteerrc.cjs
View File

@ -1,5 +1,5 @@
const os = require('os') const os = require('os')
const { existsSync, realpathSync } = require('fs') const { existsSync } = require('fs')
const { execSync } = require('child_process') const { execSync } = require('child_process')
const arch = os.arch() const arch = os.arch()
@ -9,15 +9,14 @@ let executablePath
// linux / android // linux / android
if (process.platform === 'linux' || process.platform === 'android') { if (process.platform === 'linux' || process.platform === 'android') {
for (const item of [ for (const item of [
'chromium', "chromium",
'chromium-browser', "chromium-browser",
'chrome', "chrome",
'chrome-browser',
]) { ]) {
try { try {
const chromiumPath = execSync(`command -v ${item}`).toString().trim() const chromiumPath = execSync(`command -v ${item}`).toString().trim()
if (chromiumPath && existsSync(chromiumPath)) { if (chromiumPath && existsSync(chromiumPath)) {
executablePath = realpathSync(chromiumPath) executablePath = chromiumPath
break break
} }
} catch (err) { } catch (err) {
@ -41,11 +40,11 @@ if (process.platform === 'darwin') {
// windows 或其他 // windows 或其他
if (!executablePath) { if (!executablePath) {
for (const item of [ for (const item of [
'C:/Program Files/Google/Chrome/Application/chrome.exe',
'C:/Program Files (x86)/Microsoft/Edge/Application/msedge.exe',
'/usr/bin/chromium', '/usr/bin/chromium',
'/usr/bin/chromium-browser', '/usr/bin/chromium-browser',
'/snap/bin/chromium', '/usr/bin/chrome',
'C:/Program Files/Google/Chrome/Application/chrome.exe',
'C:/Program Files (x86)/Microsoft/Edge/Application/msedge.exe',
]) { ]) {
if (existsSync(item)) { if (existsSync(item)) {
executablePath = item executablePath = item

84
renderers/puppeteer/lib/puppeteer.js
View File

@ -23,7 +23,7 @@ export default class PuppeteerRenderer {
/** 截图次数 */ /** 截图次数 */
this.renderNum = 0 this.renderNum = 0
this.config = { this.config = {
headless: Data.def(config.headless, true), headless: Data.def(config.headless, 'new'),
args: Data.def(config.args, [ args: Data.def(config.args, [
'--disable-gpu', '--disable-gpu',
'--disable-setuid-sandbox', '--disable-setuid-sandbox',
@ -61,11 +61,15 @@ export default class PuppeteerRenderer {
* 初始化chromium * 初始化chromium
*/ */
async browserInit () { async browserInit () {
if (this.browser) return this.browser if (this.browser) {
if (this.lock) return false return this.browser
}
if (this.lock) {
return false
}
this.lock = true this.lock = true
logger.mark('puppeteer Chromium 启动中...') logger.info('puppeteer Chromium 启动中...')
let connectFlag = false let connectFlag = false
try { try {
@ -77,7 +81,7 @@ export default class PuppeteerRenderer {
// 是否有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.mark(`puppeteer Chromium from ${browserUrl}`) logger.info(`puppeteer Chromium from ${browserUrl}`)
const browserWSEndpoint = await puppeteer.connect({ browserWSEndpoint: browserUrl }).catch((err) => { const browserWSEndpoint = await puppeteer.connect({ browserWSEndpoint: browserUrl }).catch((err) => {
logger.error('puppeteer Chromium 缓存的实例已关闭') logger.error('puppeteer Chromium 缓存的实例已关闭')
redis.del(this.browserMacKey) redis.del(this.browserMacKey)
@ -91,7 +95,7 @@ export default class PuppeteerRenderer {
} }
} }
} catch (e) { } catch (e) {
logger.mark('puppeteer Chromium 不存在已有实例') logger.info('puppeteer Chromium 不存在已有实例')
} }
if (!this.browser || !connectFlag) { if (!this.browser || !connectFlag) {
@ -103,12 +107,12 @@ export default class PuppeteerRenderer {
} 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('libatk-bridge')) { } else if (errMsg.includes('cannot open shared object file')) {
logger.error('没有正确安装Chromium，可尝试执行 sudo yum install -y chromium') logger.error('没有正确安装 Chromium 运行库')
} }
} }
console.log(err, trace) logger.error(err, trace)
}) })
} }
@ -119,20 +123,20 @@ export default class PuppeteerRenderer {
return false return false
} }
if (connectFlag) { if (connectFlag) {
logger.mark('puppeteer Chromium 已连接启动的实例') logger.info('puppeteer Chromium 已连接启动的实例')
} else { } else {
console.log('chromium', this.browser.wsEndpoint()) logger.info(`[Chromium] ${this.browser.wsEndpoint()}`)
if (process.env.pm_id && this.browserMacKey) { 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.mark('puppeteer Chromium 启动成功') logger.info('puppeteer Chromium 启动成功')
} }
/** 监听Chromium实例是否断开 */ /** 监听Chromium实例是否断开 */
this.browser.on('disconnected', (e) => { this.browser.on('disconnected', (e) => {
logger.error('Chromium实例关闭或崩溃！') logger.error('Chromium 实例关闭或崩溃！')
this.browser = false this.browser = false
}) })
@ -140,29 +144,19 @@ export default class PuppeteerRenderer {
} }
// 获取Mac地址 // 获取Mac地址
async getMac () { getMac () {
// 获取Mac地址 const 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 osMac for (const a in network) {
// 判断系统 for (const i of network[a]) {
if (os.platform() === 'win32') { if (i.mac && i.mac != mac) {
// windows下获取mac地址 return i.mac
let osMacList = Object.keys(network).map(key => network[key]).flat() }
osMacList = osMacList.filter(item => item.family === 'IPv4' && item.mac !== mac) }
osMac = osMacList[0].mac
} else if (os.platform() === 'linux') {
// linux下获取mac地址
osMac = network.enp6s18.filter(item => item.family === 'IPv4' && item.mac !== mac)[0].mac
}
if (osMac) {
mac = String(osMac)
} }
} catch (e) { } catch (e) {
console.log('获取Mac地址失败', e.toString())
} }
mac = mac.replace(/:/g, '')
return mac return mac
} }
@ -187,7 +181,9 @@ export default class PuppeteerRenderer {
const pageHeight = data.multiPageHeight || 4000 const pageHeight = data.multiPageHeight || 4000
let savePath = this.dealTpl(name, data) let savePath = this.dealTpl(name, data)
if (!savePath) return false if (!savePath) {
return false
}
let buff = '' let buff = ''
let start = Date.now() let start = Date.now()
@ -225,7 +221,7 @@ export default class PuppeteerRenderer {
if (!data.multiPage) { if (!data.multiPage) {
buff = await body.screenshot(randData) buff = await body.screenshot(randData)
/** 计算图片大小 */ /** 计算图片大小 */
const kb = (buff.length / 1024).toFixed(2) + 'kb' const kb = (buff.length / 1024).toFixed(2) + 'KB'
logger.mark(`[图片生成][${name}][${this.renderNum}次] ${kb} ${logger.green(`${Date.now() - start}ms`)}`) logger.mark(`[图片生成][${name}][${this.renderNum}次] ${kb} ${logger.green(`${Date.now() - start}ms`)}`)
this.renderNum++ this.renderNum++
ret.push(buff) ret.push(buff)
@ -252,11 +248,13 @@ export default class PuppeteerRenderer {
} else { } else {
buff = await page.screenshot(randData) buff = await page.screenshot(randData)
} }
if (num > 2) await Data.sleep(200) if (num > 2) {
await Data.sleep(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)
} }
@ -265,9 +263,8 @@ export default class PuppeteerRenderer {
} }
} }
page.close().catch((err) => logger.error(err)) page.close().catch((err) => logger.error(err))
} catch (error) { } catch (error) {
logger.error(`图片生成失败:${name}:${error}`) logger.error(`[图片生成][${name}] 图片生成失败：${error}`)
/** 关闭浏览器 */ /** 关闭浏览器 */
if (this.browser) { if (this.browser) {
await this.browser.close().catch((err) => logger.error(err)) await this.browser.close().catch((err) => logger.error(err))
@ -280,7 +277,7 @@ export default class PuppeteerRenderer {
this.shoting.pop() this.shoting.pop()
if (ret.length === 0 || !ret[0]) { if (ret.length === 0 || !ret[0]) {
logger.error(`图片生成为空:${name}`) logger.error(`[图片生成][${name}] 图片生成为空`)
return false return false
} }
@ -323,7 +320,9 @@ export default class PuppeteerRenderer {
/** 监听配置文件 */ /** 监听配置文件 */
watch (tplFile) { watch (tplFile) {
if (this.watcher[tplFile]) return if (this.watcher[tplFile]) {
return
}
const watcher = chokidar.watch(tplFile) const watcher = chokidar.watch(tplFile)
watcher.on('change', path => { watcher.on('change', path => {
@ -344,10 +343,9 @@ export default class PuppeteerRenderer {
await this.browser.close().catch((err) => logger.error(err)) await this.browser.close().catch((err) => logger.error(err))
} }
this.browser = false this.browser = false
logger.mark('puppeteer 关闭重启...') logger.info('puppeteer Chromium 关闭重启...')
}, 100) }, 100)
} }
} }
} }
} }