From e804ff82b3d03e75ecbdd9ed2145d5f27d179ada Mon Sep 17 00:00:00 2001
From: yeyang <746659424@qq.com>
Date: Sat, 29 Apr 2023 22:11:15 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E7=A7=BB=E9=99=A4puppeteer?=
 =?UTF-8?q?=E6=89=A9=E5=B1=95=E4=BE=9D=E8=B5=96=EF=BC=8C=E5=B0=9D=E8=AF=95?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=96=B0=E6=97=A0=E5=A4=B4=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md               | 12 +++++++-----
 lib/puppeteer/puppeteer.js | 25 +++++++++++++------------
 package.json               |  2 --
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a44124..0762207 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,13 @@
-# 1.2.6
+# 1.2.7
+
+* 删除依赖`puppeteer-extra``puppeteer-extra-plugin-stealth`
+* 并使用Puppeteer新无头模式，如**Chrome版本过低**可能无法使用
+
+
+# 1.2.1 ~ 1.2.6
 
 * 新增`jimp`依赖用于生成点赞回复图片
 * 新增`#设置机型`ⁿᵉʷ
-
-
-# # 1.2.1 ~ 1.2.5 
-
 * 新增`#椰奶监控`ⁿᵉʷ
 * 新增`#(制服|写真|cos|正片|场照)acg`ⁿᵉʷ
 * 修改**搜图搜番**正则防止误触发
diff --git a/lib/puppeteer/puppeteer.js b/lib/puppeteer/puppeteer.js
index c8f77d1..e043fed 100644
--- a/lib/puppeteer/puppeteer.js
+++ b/lib/puppeteer/puppeteer.js
@@ -1,20 +1,21 @@
 import _ from 'lodash'
 import devices from './devices.js'
 import render from './render.js'
-let puppeteer = null
-let StealthPlugin = null
-try {
-  puppeteer = (await import('puppeteer-extra')).default
-  StealthPlugin = (await import('puppeteer-extra-plugin-stealth')).default
-  puppeteer.use(StealthPlugin())
-} catch {}
+import puppeteer from 'puppeteer'
+// let puppeteer = null
+// let StealthPlugin = null
+// try {
+//   puppeteer = (await import('puppeteer-extra')).default
+//   StealthPlugin = (await import('puppeteer-extra-plugin-stealth')).default
+//   puppeteer.use(StealthPlugin())
+// } catch {}
 
 class NewPuppeteer {
   constructor () {
     this.browser = false
     this.config = {
       args: ['--no-sandbox'],
-      headless: true
+      headless: 'new'
     }
     this.lock = false
     this.shoting = []
@@ -125,10 +126,10 @@ class NewPuppeteer {
   async launch () {
     if (this.browser) return this.browser
     logger.mark('[Yenai-Plugin]Puppeteer launching')
-    if (!puppeteer) {
-      logger.error(`[Yenai-Plugin][Puppeteer]缺少依赖项，请执行 ${logger.red('pnpm add puppeteer-extra puppeteer-extra-plugin-stealth -w')}`)
-      return false
-    }
+    // if (!puppeteer) {
+    //   logger.error(`[Yenai-Plugin][Puppeteer]缺少依赖项，请执行 ${logger.red('pnpm add puppeteer-extra puppeteer-extra-plugin-stealth -w')}`)
+    //   return false
+    // }
     this.browser = await puppeteer.launch(this.config).catch((err) => {
       logger.error(err.toString())
       if (String(err).includes('correct Chromium')) {
diff --git a/package.json b/package.json
index 46d522d..8107e72 100644
--- a/package.json
+++ b/package.json
@@ -21,8 +21,6 @@
   "dependencies": {
     "cheerio": "1.0.0-rc.12",
     "jimp": "^0.22.7",
-    "puppeteer-extra": "^3.3.6",
-    "puppeteer-extra-plugin-stealth": "^2.11.2",
     "systeminformation": "^5.17.1"
   },
   "devDependencies": {