support external chromium instance (#72) (#75)

config/default_config/bot.yaml

@@ -11,6 +11,8 @@ ffprobe_path:
 
 # chromium其他路径
 chromium_path: 
+# puppeteer接口地址
+puppeteer_ws: 
   
 # 米游社接口代理地址，国际服用
 proxyAddress: 

renderers/puppeteer/config_default.yaml

@@ -5,6 +5,10 @@
 # chromiumPath: C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe
 chromiumPath:
 
+# puppeteer websocket 地址。连接单独存在的 chromium。
+# puppeteerWS: 'ws://browserless:3000'
+puppeteerWS:
+
 # headless
 headless: true
 

renderers/puppeteer/lib/puppeteer.js

@@ -35,6 +35,10 @@ export default class PuppeteerRenderer {
       /** chromium其他路径 */
       this.config.executablePath = config.chromiumPath || cfg?.bot?.chromium_path
     }
+    if (config.puppeteerWS || cfg?.bot?.puppeteer_ws) {
+      /** chromium其他路径 */
+      this.config.wsEndpoint = config.puppeteerWS || cfg?.bot?.puppeteer_ws
+    }
 
     this.html = {}
     this.watcher = {}
@@ -65,16 +69,15 @@ export default class PuppeteerRenderer {
 
     let connectFlag = false
     try {
-      // 如果是pm2启动，尝试连接已有实例
-      if (process.env.pm_id) {
       // 获取Mac地址
       if (!mac) {
         mac = await this.getMac()
         this.browserMacKey = `Yz:chromium:browserWSEndpoint:${mac}`
       }
       // 是否有browser实例
-        const browserUrl = await redis.get(this.browserMacKey)
+      const browserUrl = (await redis.get(this.browserMacKey)) || this.config.wsEndpoint
       if (browserUrl) {
+        logger.mark(`puppeteer Chromium from ${browserUrl}`)
         const browserWSEndpoint = await puppeteer.connect({ browserWSEndpoint: browserUrl }).catch((err) => {
           logger.error('puppeteer Chromium 缓存的实例已关闭')
           redis.del(this.browserMacKey)
@@ -87,9 +90,8 @@ export default class PuppeteerRenderer {
           }
         }
       }
-      }
     } catch (e) {
-      logger.error('puppeteer Chromium 尝试连接已有实例失败')
+      logger.mark('puppeteer Chromium 不存在已有实例')
     }
 
     if (!this.browser || !connectFlag) {