wechaty-web-panel 1.0.0 → 1.0.3-beta.0

package/.idea/workspace.xml

@@ -2,18 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="2e980355-75b9-47a9-b344-f25eda9493b2" name="Default Changelist" comment="feat(模块): 添加了个很棒的功能&#10;fix(模块): 修复了一些 bug&#10;docs(模块): 更新了一下文档&#10;UI(模块): 修改了一下样式&#10;chore(模块): 对脚手架做了些更改&#10;locale(模块): 为国际化做了微小的贡献">
-      <change afterPath="$PROJECT_DIR$/.npmrc" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/common/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/handlers/on-login.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/handlers/on-login.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/handlers/on-message.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/handlers/on-message.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/lib/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/lib/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/proxy/api.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/proxy/api.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/proxy/mqtt.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/proxy/mqtt.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/service/event-dispatch-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/service/event-dispatch-service.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/service/room-async-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/service/room-async-service.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/test/index.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -46,7 +36,7 @@
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/test" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.selected.package.eslint" value="(autodetect)" />
     <property name="nodejs_package_manager_path" value="npm" />
@@ -57,11 +47,11 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$" />
       <recent name="$PROJECT_DIR$/test" />
+      <recent name="$PROJECT_DIR$/src/puppeteer-paint" />
+      <recent name="$PROJECT_DIR$" />
       <recent name="$PROJECT_DIR$/koa/bash" />
       <recent name="$PROJECT_DIR$/koa/pubilc/static" />
-      <recent name="$PROJECT_DIR$/koa/pubilc/static/img" />
     </key>
   </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
@@ -107,7 +97,15 @@
       <workItem from="1642212984216" duration="11645000" />
       <workItem from="1642384832300" duration="994000" />
       <workItem from="1642386021423" duration="4268000" />
-      <workItem from="1642647009185" duration="3767000" />
+      <workItem from="1642647009185" duration="3937000" />
+      <workItem from="1642657426395" duration="780000" />
+      <workItem from="1642678719784" duration="603000" />
+      <workItem from="1643094529038" duration="490000" />
+      <workItem from="1644319873832" duration="1868000" />
+      <workItem from="1645362804718" duration="427000" />
+      <workItem from="1645411323461" duration="15523000" />
+      <workItem from="1645440841278" duration="516000" />
+      <workItem from="1645757384419" duration="1249000" />
     </task>
     <servers />
   </component>
@@ -126,4 +124,8 @@
     </option>
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
+  <component name="XSLT-Support.FileAssociations.UIState">
+    <expand />
+    <select />
+  </component>
 </project>

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## 更新日志
 
+### V1.0.2(2022-02-21)
+
+1、去除canvas依赖，使用puppeteer生成图片
+
+### V1.0.1(2022-02-08)
+
+1、修复参数取值问题
+
 ### V1.0.1(2022-01-20)
 
 1、升级Wechaty版本到1.x版本，优化部分功能，保持多协议展示形式

package/README.md

@@ -118,7 +118,7 @@ $ npm install wechaty-web-panel@latest wechaty@latest --save
 如果安装长时间没有反应，可以尝试
 
 ```
-npm install wechaty-web-panel@latest wechaty@latest --save --canvas_binary_host_mirror=https://npm.taobao.org/mirrors/node-canvas-prebuilt/
+npm install wechaty-web-panel@latest wechaty@latest --save
 ```
 
 ### Step 2: 创建机器人并配置插件的`apiKey`和`apiSecret`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-web-panel",
-  "version": "1.0.0",
+  "version": "1.0.3-beta.0",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -36,32 +36,24 @@
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.4",
     "prettier": "^2.0.5",
-    "wechaty": "^1.11.42",
+    "wechaty": "^1.13.12",
     "wechaty-puppet-wechat": "^1.11.12"
   },
   "readme": "README.md",
   "dependencies": {
     "ix": "^4.5.2",
-    "mcanvas": "^2.0.8",
     "mqtt": "^4.2.6",
     "mustache": "^4.2.0",
     "nedb": "^1.8.0",
     "node-schedule": "^1.3.2",
+    "puppeteer": "^13.3.2",
     "qrcode-terminal": "^0.12.0",
     "superagent": "^5.2.2",
     "tencentcloud-sdk-nodejs": "^4.0.30"
   },
-  "peerDependencies": {
-    "wechaty": "^1.11.42",
-    "wechaty-puppet-wechat": "^1.11.12"
-  },
   "publishConfig": {
     "registry": " https://registry.npmjs.org/"
   },
-  "engines": {
-    "node": ">=16.0",
-    "npm": ">=8.1"
-  },
-  "_id": "wechaty-web-panel@1.0.0",
-  "_commitid": "754bf1b"
+  "_id": "wechaty-web-panel@1.0.3-beta.0",
+  "_commitid": "6714817"
 }

package/src/common/index.js

@@ -42,9 +42,14 @@ async function updateContactInfo(that) {
     const contactList = await that.Contact.findAll()
     let res = []
     const notids = ['filehelper', 'fmessage']
-    let realContact = hasWeixin ? contactList.filter((item) => item._payload.type == 1 && item._payload.friend && !notids.includes(item._payload.id)) : contactList
+    let realContact = hasWeixin
+      ? contactList.filter((item) => {
+          const payload = item.payload || item._payload
+          return payload.type === 1 && payload.friend && !notids.includes(payload.id)
+        })
+      : contactList
     for (let i of realContact) {
-      let contact = i._payload
+      let contact = i.payload || i._payload
       let obj = {
         robotId: hasWeixin ? contactSelf.weixin : MD5(contactSelf.name),
         contactId: hasWeixin ? contact.id : MD5(contactSelf.name + contact.name + contact.alias + contact.province + contact.city + contact.gender),
@@ -92,7 +97,7 @@ async function updateRoomInfo(that) {
     const roomList = await that.Room.findAll()
     let res = []
     for (let i of roomList) {
-      let room = i._payload
+      let room = i.payload || i._payload
       let obj = {
         robotId: hasWeixin ? contactSelf.weixin : MD5(contactSelf.name),
         roomId: MD5(room.topic),

package/src/handlers/on-login.js

@@ -2,7 +2,6 @@ const { delay, MD5 } = require('../lib')
 const { getConfig, sendRobotInfo, sendError, putqn, setQrCode, updatePanelVersion } = require('../proxy/aibotk')
 const { addUser } = require('../common/userDb')
 const { initAllSchedule } = require('../task')
-var pjson = require('../../package.json')
 const { initMqtt } = require('../proxy/mqtt')
 const { allConfig } = require('../common/configDb')
 
@@ -19,9 +18,10 @@ async function onLogin(user) {
     await getConfig() // 获取配置文件
     const config = await allConfig()
     const { userId } = config.userInfo
+    const payload = user.payload || user._payload
     const userInfo = {
-      ...user._payload,
-      robotId: user._payload.weixin || MD5(user.name()),
+      ...payload,
+      robotId: payload.weixin || MD5(user.name()),
     }
     await addUser(userInfo) // 全局存储登录用户信息
     const file = await user.avatar()

package/src/lib/index.js

@@ -1,7 +1,6 @@
 const Crypto = require('crypto')
 const schedule = require('node-schedule')
 const fs = require('fs')
-const { MCanvas, MImage } = require('mcanvas')
 const { addRoom, getRoom } = require('../common/roomAvatarDb')
 
 /**
@@ -416,7 +415,7 @@ function filterContacts(contacts, query) {
   let { name, alias, friend, type, gender, province, city, address } = query
   return contacts.filter((item) => {
     let arr = []
-    let { _payload: payload } = item
+    let payload = item.payload || item._payload
     if (friend) {
       let bool = Number(friend) === 1 ? true : false
       arr.push(bool === payload.friend)
@@ -440,7 +439,7 @@ function formatContacts(data) {
   let arr = data.map(function (item) {
     // const file = await item.avatar()
     // let avatar = await file.toBase64(file.name, true);
-    let payload = item._payload
+    let payload = item.payload || item._payload
     return {
       id: payload.id,
       name: payload.name,
@@ -517,11 +516,10 @@ async function getRoomAvatarList(room, name) {
     let res = []
     console.log('正在努力获取群成员信息...')
     for (let i of members) {
-      let member = i._payload
+      let member = i.payload || i._payload
       try {
         const avatar = await i.avatar()
         if (avatar._mediaType && avatar._name) {
-          console.log(avatar)
           const base64 = member.weixin ? member.avatar : await avatar.toDataURL()
           let obj = {
             img: base64,
@@ -584,226 +582,6 @@ async function getRoomAvatar(roomObj, roomName, name) {
     console.log('getRoomAvatar error', e)
   }
 }
-
-/**
- * 头像处理
- * @param {*}} list
- * @param {*} size
- */
-async function cropImg(list, size = 74) {
-  try {
-    const arr = []
-    if (list.length >= 100) {
-      console.log('群成员数量超过100，生成群合影速度可能比较慢，请耐心等待')
-    }
-    for (const i of list) {
-      try {
-        if (i.img) {
-          const im = new MImage(i.img)
-          im.compress({
-            quality: 1,
-            width: size,
-            height: size,
-          }).crop({
-            radius: size,
-          })
-          const bas64 = await im.draw({ type: 'png' })
-          arr.push({ img: bas64 })
-        }
-      } catch (error) {
-        console.log('处理头像失败', error)
-        continue
-      }
-    }
-    return arr
-  } catch (error) {
-    console.log('cropImg error', error)
-  }
-}
-
-/**
- *
- * @param {*} t 头像数组
- * @param {*} param1
- */
-function __beforePatternCircle(t, { size = 120, space = 24, circleSpace = 24, centerSizeMargin = 0 }) {
-  let i, r, n, s, o, c, l, p, u, g, m, d, h, f, v, b, w, y, C, _, k, I, x, S, j, q, D, z, P
-  for (u in ((i = size), (r = space), (n = circleSpace), (s = centerSizeMargin), (o = 1), (c = 0), (l = []), (p = r), t)) {
-    if (u > 0 && ((g = i / 2), (m = (i + n) * o), (m += s), (d = (2 * Math.PI * m) / (2 * g + r)), (d = Math.floor(d)), u > 0 && c === d - 1 ? (o++, (c = 0), l.push(d)) : c++, (h = t.length - 1 + ''), u === h && ((f = c), (v = c * i), c < d))) {
-      for (C in ((b = 0), (w = 0), (y = []), l)) {
-        C < l.length &&
-          ((_ = l[C] * r),
-          _ >= i + r &&
-            ((b += _),
-            (w += l[C]),
-            y.push({
-              level: C,
-              spaceUnit: _,
-            })))
-      }
-      v <= b && ((k = w + f === 0 ? 0 : (b - v) / (w + f)), (p = k))
-    }
-  }
-  for (j in ((I = 1), (x = 0), (S = 0), t)) j > 0 && ((q = i / 2), (D = (i + n) * I), (D += s), (z = (2 * Math.PI * D) / (2 * q + p)), (z = Math.floor(z)), t.length - j < z && ((P = t.length - 1 + ''), j === P && (S = 360 / (x + 1))), j > 0 && x === z - 1 ? (I++, (x = 0)) : x++)
-  return {
-    newSpace: p,
-    newRate: S,
-    lastCircleNumber: I,
-  }
-}
-
-function patternCircle(mc, t, info, i) {
-  let r, n, s, g, d, h, f, v, b, w, y, C, _, k, I, x, S, j, q
-  r = i.x
-  n = i.y
-  const o = i.centerSize || i.size
-  s = i.space
-  const c = o > i.size ? (o - i.size) / 2 : 0
-  const l = i.backWid
-  const p = i.backHei
-  const u = l / 2 // x中间坐标
-  g = p / 2 // y中间坐标
-  g = i.marginBottom ? p - i.marginBottom : g
-  r = u - i.size / 2
-  n = g - i.size / 2
-  const m = s
-  for (w in ((d = info), (s = d.newSpace), (h = d.newRate), (f = d.lastCircleNumber), (v = 1), (b = 0), t)) {
-    w > 0 &&
-      ((y = i.size / 2),
-      (C = (i.size + m) * v),
-      (C += c),
-      (_ = (2 * Math.PI * C) / (2 * y + s)),
-      (_ = Math.floor(_)),
-      (k = 360 / _),
-      f === v && (k = h),
-      (I = ((2 * Math.PI) / 360) * k * b),
-      (x = u + Math.sin(I + (2 * Math.PI * 270) / 360) * C),
-      (S = g - Math.cos(I + (2 * Math.PI * 270) / 360) * C),
-      (r = x - y),
-      (n = S - y),
-      w > 0 && b === _ - 1 ? (v++, (b = 0)) : b++),
-      (j = i.size),
-      parseInt(w) === 0 && ((j = o), (r = u - o / 2), (n = g - o / 2)),
-      (q = t[w].img)
-    mc.add(q, {
-      width: j,
-      pos: {
-        x: r,
-        y: n,
-        scale: 1,
-      },
-    })
-  }
-  return mc
-}
-
-/**
- * 绘制标题
- * @param {*} mc
- * @param {*} title
- * @param {*} titleInfo
- */
-
-function drawTitle(mc, title, titleInfo) {
-  mc.text(title, {
-    align: 'center',
-    width: '100%',
-    normalStyle: {
-      color: titleInfo.color,
-      lineHeight: titleInfo.fontSize,
-      font: `${titleInfo.fontSize}px Microsoft YaHei,sans-serif`,
-    },
-    pos: {
-      x: 0,
-      y: titleInfo.top,
-    },
-  })
-}
-
-async function generateRoomImg(list, options) {
-  try {
-    const { sizeInfo, titleInfo, background, roomName } = options
-    console.log('群合影生成中...')
-    list = await cropImg(list, sizeInfo.size)
-    const initOptions = {
-      title: titleInfo.title || roomName,
-      centerSize: sizeInfo.centerSize,
-      space: sizeInfo.space,
-      circleSpace: sizeInfo.space,
-      size: sizeInfo.size,
-      x: 0,
-      y: 0,
-      backWid: sizeInfo.width,
-      backHei: sizeInfo.height,
-      marginBottom: sizeInfo.bottom, // 距离底部高度
-    }
-    const mc = new MCanvas({
-      width: initOptions.backWid,
-      height: initOptions.backHei,
-      backgroundColor: '#ffffff',
-    })
-    mc.background(background, {
-      type: 'contain',
-    })
-    const info = __beforePatternCircle(list, initOptions)
-    patternCircle(mc, list, info, initOptions)
-    drawTitle(mc, initOptions.title, titleInfo)
-    const base64 = await mc.draw({ type: 'jpg', quality: 1 })
-    console.log('群合影生成成功！')
-    // var base64Data = base64.replace(/^data:image\/\w+;base64,/, '')
-    // var dataBuffer = Buffer.from(base64Data, 'base64')
-    // fs.writeFile('image.jpg', dataBuffer, function (err) {
-    //   if (err) {
-    //     console.log(err)
-    //   } else {
-    //     console.log('保存成功！')
-    //   }
-    // })
-    return base64
-  } catch (e) {
-    console.log('群合影生成失败', e)
-  }
-}
-
-async function generateAvatar(avatar, coverImg = 'http://image.xkboke.com/hat.png') {
-  try {
-    let mc = new MCanvas({
-      width: 880,
-      height: 880,
-      backgroundColor: '#ffffff',
-    })
-    mc.add(avatar, {
-      width: 860,
-      pos: {
-        x: 10,
-        y: 10,
-        scale: 1,
-      },
-    })
-    mc.add(coverImg, {
-      width: 880,
-      pos: {
-        x: 0,
-        y: 0,
-        scale: 1,
-      },
-    })
-    const base64 = await mc.draw({ type: 'jpg', quality: 1 })
-    // var base64Data = base64.replace(/^data:image\/\w+;base64,/, '')
-    // var dataBuffer = Buffer.from(base64Data, 'base64')
-    // fs.writeFile('avatar.jpg', dataBuffer, function (err) {
-    //   if (err) {
-    //     console.log(err)
-    //   } else {
-    //     console.log('保存成功！')
-    //   }
-    // })
-    return base64
-  } catch (e) {
-    console.log('头像生成失败', e)
-  }
-}
-
 module.exports = {
   Base64Encode,
   Base64Decode,
@@ -829,7 +607,5 @@ module.exports = {
   getAllSchedule,
   groupArray,
   getRoomAvatarList,
-  generateRoomImg,
   getRoomAvatar,
-  generateAvatar,
 }

package/src/puppeteer-paint/drawHelp.js

@@ -0,0 +1,237 @@
+/**
+ * 生成群合影
+ * @param list
+ * @param options
+ * @returns {Promise<unknown>}
+ */
+async function generateRoomImg({ list, options }) {
+  /**
+   *
+   * @param {*} t 头像数组
+   * @param {*} param1
+   */
+  const __beforePatternCircle = function (t, { size = 120, space = 24, circleSpace = 24, centerSizeMargin = 0 }) {
+    let i, r, n, s, o, c, l, p, u, g, m, d, h, f, v, b, w, y, C, _, k, I, x, S, j, q, D, z, P
+    for (u in ((i = size), (r = space), (n = circleSpace), (s = centerSizeMargin), (o = 1), (c = 0), (l = []), (p = r), t)) {
+      if (u > 0 && ((g = i / 2), (m = (i + n) * o), (m += s), (d = (2 * Math.PI * m) / (2 * g + r)), (d = Math.floor(d)), u > 0 && c === d - 1 ? (o++, (c = 0), l.push(d)) : c++, (h = t.length - 1 + ''), u === h && ((f = c), (v = c * i), c < d))) {
+        for (C in ((b = 0), (w = 0), (y = []), l)) {
+          C < l.length &&
+            ((_ = l[C] * r),
+            _ >= i + r &&
+              ((b += _),
+              (w += l[C]),
+              y.push({
+                level: C,
+                spaceUnit: _,
+              })))
+        }
+        v <= b && ((k = w + f === 0 ? 0 : (b - v) / (w + f)), (p = k))
+      }
+    }
+    for (j in ((I = 1), (x = 0), (S = 0), t)) j > 0 && ((q = i / 2), (D = (i + n) * I), (D += s), (z = (2 * Math.PI * D) / (2 * q + p)), (z = Math.floor(z)), t.length - j < z && ((P = t.length - 1 + ''), j === P && (S = 360 / (x + 1))), j > 0 && x === z - 1 ? (I++, (x = 0)) : x++)
+    return {
+      newSpace: p,
+      newRate: S,
+      lastCircleNumber: I,
+    }
+  }
+
+  const patternCircle = function (mc, t, info, i) {
+    let r, n, s, g, d, h, f, v, b, w, y, C, _, k, I, x, S, j, q
+    r = i.x
+    n = i.y
+    const o = i.centerSize || i.size
+    s = i.space
+    const c = o > i.size ? (o - i.size) / 2 : 0
+    const l = i.backWid
+    const p = i.backHei
+    const u = l / 2 // x中间坐标
+    g = p / 2 // y中间坐标
+    g = i.marginBottom ? p - i.marginBottom : g
+    r = u - i.size / 2
+    n = g - i.size / 2
+    const m = s
+    for (w in ((d = info), (s = d.newSpace), (h = d.newRate), (f = d.lastCircleNumber), (v = 1), (b = 0), t)) {
+      w > 0 &&
+        ((y = i.size / 2),
+        (C = (i.size + m) * v),
+        (C += c),
+        (_ = (2 * Math.PI * C) / (2 * y + s)),
+        (_ = Math.floor(_)),
+        (k = 360 / _),
+        f === v && (k = h),
+        (I = ((2 * Math.PI) / 360) * k * b),
+        (x = u + Math.sin(I + (2 * Math.PI * 270) / 360) * C),
+        (S = g - Math.cos(I + (2 * Math.PI * 270) / 360) * C),
+        (r = x - y),
+        (n = S - y),
+        w > 0 && b === _ - 1 ? (v++, (b = 0)) : b++),
+        (j = i.size),
+        parseInt(w) === 0 && ((j = o), (r = u - o / 2), (n = g - o / 2)),
+        (q = t[w].img)
+      mc.add(q, {
+        width: j,
+        pos: {
+          x: r,
+          y: n,
+          scale: 1,
+        },
+      })
+    }
+    return mc
+  }
+
+  /**
+   * 绘制标题
+   * @param {*} mc
+   * @param {*} title
+   * @param {*} titleInfo
+   */
+
+  const drawTitle = function (mc, title, titleInfo) {
+    mc.text(title, {
+      align: 'center',
+      width: '100%',
+      normalStyle: {
+        color: titleInfo.color,
+        lineHeight: titleInfo.fontSize,
+        font: `${titleInfo.fontSize}px Microsoft YaHei,sans-serif`,
+      },
+      pos: {
+        x: 0,
+        y: titleInfo.top,
+      },
+    })
+  }
+  /**
+   * 头像处理
+   * @param {*}} list
+   * @param {*} size
+   */
+  const cropImg = async function (list, size = 74, MImage) {
+    try {
+      const arr = []
+      if (list.length >= 100) {
+        console.log('群成员数量超过100，生成群合影速度可能比较慢，请耐心等待')
+      }
+      for (const i of list) {
+        try {
+          if (i.img) {
+            const im = new MImage(i.img)
+            im.compress({
+              quality: 1,
+              width: size,
+              height: size,
+            }).crop({
+              radius: size,
+            })
+            const bas64 = await im.draw({ type: 'png' })
+            arr.push({ img: bas64 })
+          }
+        } catch (error) {
+          console.log('处理头像失败', error)
+          continue
+        }
+      }
+      return arr
+    } catch (error) {
+      console.log('cropImg error', error)
+    }
+  }
+
+  return new Promise(async (resolve, reject) => {
+    let MCanvas = window.MCanvas.MCanvas
+    let MImage = window.MCanvas.MImage
+    try {
+      const { sizeInfo, titleInfo, background, roomName } = options
+      list = await cropImg(list, sizeInfo.size, MImage)
+      const initOptions = {
+        title: titleInfo.title || roomName,
+        centerSize: sizeInfo.centerSize,
+        space: sizeInfo.space,
+        circleSpace: sizeInfo.space,
+        size: sizeInfo.size,
+        x: 0,
+        y: 0,
+        backWid: sizeInfo.width,
+        backHei: sizeInfo.height,
+        marginBottom: sizeInfo.bottom, // 距离底部高度
+      }
+      const mc = new MCanvas({
+        width: initOptions.backWid,
+        height: initOptions.backHei,
+        backgroundColor: '#ffffff',
+      })
+      mc.background(background, {
+        type: 'contain',
+      })
+      const info = __beforePatternCircle(list, initOptions)
+      patternCircle(mc, list, info, initOptions)
+      drawTitle(mc, initOptions.title, titleInfo)
+      const base64 = await mc.draw({ type: 'jpg', quality: 1 })
+      console.log('群合影生成成功！')
+      // var base64Data = base64.replace(/^data:image\/\w+;base64,/, '')
+      // var dataBuffer = Buffer.from(base64Data, 'base64')
+      // fs.writeFile('image.jpg', dataBuffer, function (err) {
+      //   if (err) {
+      //     console.log(err)
+      //   } else {
+      //     console.log('保存成功！')
+      //   }
+      // })
+      resolve(base64)
+    } catch (e) {
+      console.log('群合影生成失败', e)
+      reject(`群合影生成失败:${e}`)
+    }
+  })
+}
+
+async function generateAvatar({ avatar, coverImg }) {
+  coverImg = coverImg || 'http://image.xkboke.com/hat.png'
+  return new Promise(async (resolve, reject) => {
+    try {
+      let MCanvas = window.MCanvas.MCanvas
+      let mc = new MCanvas({
+        width: 880,
+        height: 880,
+        backgroundColor: '#ffffff',
+      })
+      mc.add(avatar, {
+        width: 860,
+        pos: {
+          x: 10,
+          y: 10,
+          scale: 1,
+        },
+      })
+      mc.add(coverImg, {
+        width: 880,
+        pos: {
+          x: 0,
+          y: 0,
+          scale: 1,
+        },
+      })
+      const base64 = await mc.draw({ type: 'jpg', quality: 1 })
+      // var base64Data = base64.replace(/^data:image\/\w+;base64,/, '')
+      // var dataBuffer = Buffer.from(base64Data, 'base64')
+      // fs.writeFile('avatar.jpg', dataBuffer, function (err) {
+      //   if (err) {
+      //     console.log(err)
+      //   } else {
+      //     console.log('保存成功！')
+      //   }
+      // })
+      resolve(base64)
+    } catch (e) {
+      console.log('头像生成失败', e)
+      reject(`头像生成失败:${e}`)
+    }
+  })
+}
+
+module.exports = {
+  generateAvatar,
+  generateRoomImg,
+}

package/src/puppeteer-paint/index.js

@@ -0,0 +1,37 @@
+const puppeteer = require('puppeteer')
+const mainConfig = require('./mainConfig')
+class BrowserManage {
+  browserDestructionTimeout //清理浏览器实例
+  browserInstance //浏览器实例
+  browserState = 'closed' //浏览器状态
+  /**
+   * 用于长时间未进行操作时关闭浏览器实例
+   */
+  scheduleBrowserForDestruction() {
+    clearTimeout(this.browserDestructionTimeout)
+    this.browserDestructionTimeout = setTimeout(async () => {
+      if (this.browserInstance) {
+        this.browserState = 'closed'
+        await this.browserInstance.close() //关闭浏览器实例
+      }
+    }, 5000)
+  }
+  /**
+   * 用于长时间未进行操作时关闭浏览器实例
+   */
+  async getBrowser() {
+    return new Promise(async (resolve, reject) => {
+      if (this.browserState === 'closed') {
+        this.browserInstance = await puppeteer.launch(mainConfig.config.puppeteer) //开启浏览器实例
+        this.browserState = 'open'
+        resolve(this.browserInstance)
+      }
+      if (this.browserState === 'open') {
+        if (this.browserInstance) {
+          resolve(this.browserInstance)
+        }
+      }
+    })
+  }
+}
+module.exports = new BrowserManage()

package/src/puppeteer-paint/lanuch.js

@@ -0,0 +1,38 @@
+const browserManage = require('./index')
+const drawHelpers = require('./drawHelp')
+
+const generateRoomImg = async function (passedOptions) {
+  const browser = await browserManage.getBrowser()
+  const page = (await browser.pages())[0]
+  // 添加 mcanvas cdn地址
+  let filePath = 'http://image.xkboke.com/pubilc/cdn/mcanvas.js'
+  await page.addScriptTag({
+    url: filePath,
+  })
+  page.on('console', (msg) => console.log(msg.type(), msg.text())) //监听页面console事件
+  const base64 = await page.evaluate(drawHelpers.generateRoomImg, passedOptions)
+  browserManage.scheduleBrowserForDestruction()
+  // await FileBox.fromBase64(base64).toFile('./test.png')
+  // const buffer = Buffer.from(base64, 'base64')
+  return base64 //返回Base64 编码的图片
+}
+
+const generateAvatar = async function (passedOptions) {
+  const browser = await browserManage.getBrowser()
+  const page = (await browser.pages())[0]
+  // 添加 mcanvas cdn地址
+  let filePath = 'http://image.xkboke.com/pubilc/cdn/mcanvas.js'
+  await page.addScriptTag({
+    url: filePath,
+  })
+  page.on('console', (msg) => console.log(msg.type(), msg.text())) //监听页面console事件
+  const base64 = await page.evaluate(drawHelpers.generateAvatar, passedOptions)
+  browserManage.scheduleBrowserForDestruction()
+  // await FileBox.fromBase64(base64).toFile('./test.png')
+  return base64 //返回Base64 编码的图片
+}
+
+module.exports = {
+  generateAvatar,
+  generateRoomImg,
+}

package/src/puppeteer-paint/mainConfig.js

@@ -0,0 +1,8 @@
+module.exports = {
+  config: {
+    puppeteer: {
+      headless: true,
+      args: ['--no-sandbox', '--disable-setuid-sandbox'],
+    },
+  },
+}

package/src/service/event-dispatch-service.js

@@ -1,6 +1,7 @@
 const api = require('../proxy/api')
-const { getConfig, asyncData, getRoomPhotoConfig, drawRoomPhoto, getMeiNv } = require('../proxy/aibotk')
-const { getConstellation, msgArr, getAllSchedule, generateRoomImg, getRoomAvatar, generateAvatar } = require('../lib')
+const { getConfig, getRoomPhotoConfig, getMeiNv } = require('../proxy/aibotk')
+const { getConstellation, msgArr, getAllSchedule, getRoomAvatar } = require('../lib')
+const { generateAvatar, generateRoomImg } = require('../puppeteer-paint/lanuch')
 const { initTaskLocalSchedule } = require('../task/index')
 const { updateContactAndRoom, updateContactOnly, updateRoomOnly } = require('../common/index')
 const { chatTencent } = require('../proxy/tencent')
@@ -51,7 +52,7 @@ async function dispatchEventContent(that, eName, msg, name, id, avatar, room) {
         if (avatar.mimeType) {
           // 如果图片类型正确再进行头像处理
           let base64Text = await avatar.toDataURL()
-          url = await generateAvatar(base64Text)
+          url = await generateAvatar({ avatar: base64Text })
           type = 3
         } else {
           content = '你的头像属于高维世界产物，小助手能力不足，无法解析，待我修炼后为你提供服务'
@@ -80,7 +81,7 @@ async function dispatchEventContent(that, eName, msg, name, id, avatar, room) {
         } else if (config.authList.length) {
           if (config.authList.includes(name)) {
             memberList = await getRoomAvatar(room, roomName, name)
-            const baseImg = await generateRoomImg(memberList, config)
+            const baseImg = await generateRoomImg({ list: memberList, options: config })
             type = 3
             url = baseImg
           } else {
@@ -88,7 +89,7 @@ async function dispatchEventContent(that, eName, msg, name, id, avatar, room) {
           }
         } else {
           memberList = await getRoomAvatar(room, roomName, name)
-          const baseImg = await generateRoomImg(memberList, config)
+          const baseImg = await generateRoomImg({ list: memberList, options: config })
           type = 3
           url = baseImg
         }

package/src/service/msg-filters.js

@@ -1,6 +1,7 @@
 const dispatch = require('./event-dispatch-service')
 const { setSchedule, updateSchedule } = require('../proxy/aibotk')
-const { contentDistinguish, setLocalSchedule, isRealDate, generateAvatar } = require('../lib')
+const { contentDistinguish, setLocalSchedule, isRealDate } = require('../lib')
+const { generateAvatar } = require('../puppeteer-paint/lanuch')
 const { addRoom } = require('../common/index')
 
 function emptyMsg() {

package/src/service/room-async-service.js

@@ -1,9 +1,6 @@
-const { log } = require('wechaty')
-const { Message } = require('wechaty').types
 const Mustache = require('mustache')
 
 function roomTalker(options) {
-  log.verbose('WechatyPluginContrib', 'roomTalker(%s)', JSON.stringify(options))
   if (!options) {
     return () => undefined
   }
@@ -12,7 +9,6 @@ function roomTalker(options) {
   }
   const optionList = options
   return async function talkRoom(room, contact, mustacheView) {
-    log.verbose('WechatyPluginContrib', 'roomTalker() talkRoom(%s, %s, %s)', room, contact || '', mustacheView ? JSON.stringify(mustacheView) : '')
     for (const option of optionList) {
       let msg
       if (option instanceof Function) {
@@ -47,18 +43,13 @@ function roomTalker(options) {
 }
 
 function messageMapper(mapperOptions, one) {
-  log.verbose('WechatyPluginContrib', 'messageMapper(%s)', typeof mapperOptions === 'function' ? 'function' : JSON.stringify(mapperOptions))
-
   return async function mapMessage(message) {
-    log.verbose('WechatyPluginContrib', 'mapMessage(%s)', message)
-
     return normalizeMappedMessageList(mapperOptions, message, one)
   }
 }
 
 async function normalizeMappedMessageList(options, message, one) {
   try {
-    log.verbose('WechatyPluginContrib', 'normalizeMappedMessageList(%s, %s)', JSON.stringify(options), message)
     const msgList = []
     let optionList
     if (Array.isArray(options)) {
@@ -88,8 +79,6 @@ async function normalizeMappedMessageList(options, message, one) {
 }
 
 function messageMatcher(matcherOptions) {
-  log.verbose('WechatyPluginContrib', 'messageMatcher(%s)', JSON.stringify(matcherOptions))
-
   if (!matcherOptions) {
     return () => Promise.resolve(false)
   }
@@ -102,7 +91,6 @@ function messageMatcher(matcherOptions) {
 
   return async function matchMessage(message) {
     try {
-      log.verbose('WechatyPluginContrib', 'messageMatcher() matchMessage(%s)', message)
       const room = message.room()
       const roomTopic = await room.topic()
       const talker = message.talker()
@@ -185,7 +173,7 @@ const bidirectionalMapper = async (message) => {
   try {
     const abbrRoomTopicForDevelopersHome = abbrRoomTopicByRegex(/\s*([^\s]*\s*[^\s]+)$/)
     // Drop all messages if not Text
-    if (message.type() !== Message.Text) {
+    if (message.type() !== 7) {
       return
     }
 
@@ -219,7 +207,7 @@ const unidirectionalMapper = async (message, one) => {
     const room = message.room()
     const topic = await room.topic()
     switch (message.type()) {
-      case Message.Text:
+      case 7:
         messageList.push(`${prefix}: ${message.text()}`)
         break
 
@@ -245,14 +233,11 @@ const unidirectionalMapper = async (message, one) => {
 }
 
 const isMatchConfig = (config) => {
-  log.verbose('WechatyPluginContrib', 'ManyToManyRoomConnector() isMatchConfig(%s)', JSON.stringify(config))
-
   const matchWhitelist = messageMatcher(config.whitelist)
   const matchBlacklist = messageMatcher(config.blacklist)
 
   return async function isMatch(message) {
     try {
-      log.verbose('WechatyPluginContrib', 'ManyToManyRoomConnector() isMatchConfig() isMatch(%s)', message.toString())
       if (message.self()) {
         return
       }
@@ -292,7 +277,6 @@ const isMatchConfig = (config) => {
  */
 async function manyToMany(that, config, msg) {
   try {
-    log.verbose('WechatyPluginContrib', 'ManyToManyRoomConnector(%s)', JSON.stringify(config))
     const isMatch = isMatchConfig(config)
     const mapMessage = messageMapper(config.map)
     const matchAndForward = async (message, roomList) => {
@@ -339,7 +323,6 @@ async function manyToMany(that, config, msg) {
 
 async function manyToOne(that, config, msg) {
   try {
-    log.verbose('WechatyPluginContrib', 'ManyToOneRoomConnector(%s)', JSON.stringify(config))
     const isMatch = isMatchConfig(config)
     const mapMessage = messageMapper(config.map)
     const matchAndForward = async (message, room) => {
@@ -352,7 +335,7 @@ async function manyToOne(that, config, msg) {
         const talkRoom = roomTalker(msgList)
         await talkRoom(room)
       } catch (e) {
-        log.error('WechatyPluginContrib', 'ManyToOneRoomConnector() filterThenToManyRoom(%s, %s) rejection: %s', message, room, e)
+        console.log('WechatyPluginContrib, ManyToOneRoomConnector() filterThenToManyRoom(%s, %s) rejection: %s')
       }
     }
     let oneRoom = ''
@@ -374,7 +357,6 @@ async function manyToOne(that, config, msg) {
  */
 async function oneToMany(that, config, msg) {
   try {
-    log.verbose('WechatyPluginContrib', 'OneToManyRoomConnector(%s)', JSON.stringify(config))
     const isMatch = isMatchConfig(config)
     const mapMessage = messageMapper(config.map, config.one)
     const matchAndForward = async (message, roomList) => {
@@ -393,7 +375,7 @@ async function oneToMany(that, config, msg) {
           }
         }
       } catch (e) {
-        log.error('WechatyPluginContrib', 'OneToManyRoomConnector() filterThenToManyRoom(%s, %s) rejection: %s', message, roomList.join(','), e)
+        console.log('WechatyPluginContrib', 'OneToManyRoomConnector() filterThenToManyRoom(%s, %s) rejection: %s')
       }
     }
     let manyRoomList = []
@@ -422,7 +404,7 @@ async function dispatchAsync(that, msg, list) {
     const type = msg.type()
     const content = msg.text()
     const mentionSelf = content.includes(`@${userSelfName}`)
-    if (that.Message.Text === type && mentionSelf) {
+    if (7 === type && mentionSelf) {
       // 如果内容中有提及机器人的内容，不进行转发
       return
     }
@@ -431,7 +413,7 @@ async function dispatchAsync(that, msg, list) {
       config.blacklist = [async () => true]
       if (config.forward === 1) {
         config.map = bidirectionalMapper
-        config.whitelist = [async (message) => message.type() === Message.Text]
+        config.whitelist = [async (message) => message.type() === 7]
       } else if (config.forward === 2) {
         config.blacklist = []
         config.map = unidirectionalMapper