From 252614eb5017f3236125f15cbb172ef6475864b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9F=8C=8C?= <Time.Rain.Star.Sky@Gmail.com>
Date: Wed, 20 Sep 2023 20:16:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/puppeteer/puppeteer.js           | 2 +-
 package.json                         | 6 +++---
 renderers/puppeteer/lib/puppeteer.js | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/puppeteer/puppeteer.js b/lib/puppeteer/puppeteer.js
index e21b510..11e06fc 100644
--- a/lib/puppeteer/puppeteer.js
+++ b/lib/puppeteer/puppeteer.js
@@ -5,7 +5,7 @@ import Renderer from '../renderer/loader.js'
  * 后期会逐步废弃
  * 只提供截图及分片截图功能
  */
-let renderer = Renderer.getRenderer('puppeteer')
+let renderer = Renderer.getRenderer()
 renderer.screenshot = async (name, data) => {
     let img = await renderer.render(name, data)
     return img ? segment.image(img) : img
diff --git a/package.json b/package.json
index 4c07914..864e746 100644
--- a/package.json
+++ b/package.json
@@ -32,11 +32,11 @@
     "node-xlsx": "^0.23.0",
     "oicq": "link:lib/modules/oicq",
     "pm2": "^5.3.0",
-    "puppeteer": "^21.2.1",
-    "redis": "^4.6.8",
+    "puppeteer": "^21.3.1",
+    "redis": "^4.6.9",
     "sequelize": "^6.33.0",
     "sqlite3": "^5.1.6",
-    "ws": "^8.14.1",
+    "ws": "^8.14.2",
     "yaml": "^2.3.2"
   },
   "devDependencies": {
diff --git a/renderers/puppeteer/lib/puppeteer.js b/renderers/puppeteer/lib/puppeteer.js
index f2c5d25..9635743 100644
--- a/renderers/puppeteer/lib/puppeteer.js
+++ b/renderers/puppeteer/lib/puppeteer.js
@@ -5,8 +5,8 @@ import puppeteer from 'puppeteer'
 // 暂时保留对原config的兼容
 import cfg from '../../../lib/config/config.js'
 import { Data } from '#miao'
-import path from 'path'
 
+const _path = process.cwd()
 // mac地址
 let mac = ''
 
@@ -176,7 +176,7 @@ export default class Puppeteer extends Renderer {
     try {
       const page = await this.browser.newPage()
       let pageGotoParams = lodash.extend({ timeout: 120000 }, data.pageGotoParams || {})
-      await page.goto('file://' + path.resolve(savePath), pageGotoParams)
+      await page.goto(`file://${_path}${lodash.trim(savePath, '.')}`, pageGotoParams)
       let body = await page.$('#container') || await page.$('body')
 
       // 计算页面高度