wechaty-web-panel 0.2.16 → 1.0.2

package/.idea/workspace.xml

@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-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 beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/proxy/api.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/proxy/api.js" afterDir="false" />
-    </list>
+    <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(模块): 为国际化做了微小的贡献" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -36,7 +33,7 @@
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/test" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/puppeteer-paint" />
     <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" />
@@ -47,11 +44,11 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/test" />
+      <recent name="$PROJECT_DIR$/src/puppeteer-paint" />
       <recent name="$PROJECT_DIR$" />
+      <recent name="$PROJECT_DIR$/test" />
       <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" />
@@ -78,7 +75,32 @@
       <workItem from="1634271782737" duration="2406000" />
       <workItem from="1634278985825" duration="1179000" />
       <workItem from="1634544457610" duration="4850000" />
-      <workItem from="1634642615016" duration="19790000" />
+      <workItem from="1634642615016" duration="19868000" />
+      <workItem from="1634781971524" duration="5097000" />
+      <workItem from="1636020036226" duration="4142000" />
+      <workItem from="1636700616248" duration="611000" />
+      <workItem from="1637723811654" duration="126000" />
+      <workItem from="1638588076329" duration="34000" />
+      <workItem from="1639099930278" duration="1299000" />
+      <workItem from="1639129806549" duration="77000" />
+      <workItem from="1639464210268" duration="219000" />
+      <workItem from="1639473278118" duration="72000" />
+      <workItem from="1639486141688" duration="66000" />
+      <workItem from="1639539045086" duration="75000" />
+      <workItem from="1639712956341" duration="178000" />
+      <workItem from="1640929149202" duration="6000" />
+      <workItem from="1641278400321" duration="13000" />
+      <workItem from="1641442984815" duration="5000" />
+      <workItem from="1642212984216" duration="11645000" />
+      <workItem from="1642384832300" duration="994000" />
+      <workItem from="1642386021423" duration="4268000" />
+      <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="14144000" />
     </task>
     <servers />
   </component>
@@ -97,4 +119,8 @@
     </option>
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
+  <component name="XSLT-Support.FileAssociations.UIState">
+    <expand />
+    <select />
+  </component>
 </project>

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## 更新日志
 
+### 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版本，优化部分功能，保持多协议展示形式
+
+### V0.2.17(2021-10-22)
+
+1、修复群和好友同步问题
+
 ### V0.2.16(2021-10-20)
 
 1、更新疫情的返回数据格式

package/README.md

@@ -107,6 +107,8 @@ Wechaty Web Panel 插件，让你的 wechaty 机器人快速接入 web 控制面
 
 ## 开始
 
+> 环境node > 16
+
 ### Step 1: 安装
 
 ```
@@ -116,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`
@@ -124,18 +126,23 @@ npm install wechaty-web-panel@latest wechaty@latest --save --canvas_binary_host_
 ```
 $ vim mybot.js
 
-const { Wechaty } = require('wechaty');
-const WechatyWebPanelPlugin = require('wechaty-web-panel');
+const {WechatyBuilder} = require('wechaty')
+const WechatyWebPanelPlugin = require('../src/index')
+
 const name = 'wechat-assistant'
-const bot = new Wechaty({
-  name, // generate xxxx.memory-card.json and save login data for the next login
-  puppet: 'wechaty-puppet-wechat',
-});
 
+const bot = WechatyBuilder.build({
+    name, // generate xxxx.memory-card.json and save login data for the next login
+    puppet: 'wechaty-puppet-wechat',
+})
 bot
-  .use(WechatyWebPanelPlugin({apiKey:'', apiSecret: ''}))
-  .start()
-  .catch((e) => console.error(e));
+    .use(WechatyWebPanelPlugin({
+        apiKey: '',
+        apiSecret: ''
+    }))
+    .start()
+    .catch((e) => console.error(e))
+
 
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-web-panel",
-  "version": "0.2.16",
+  "version": "1.0.2",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -36,32 +36,28 @@
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.4",
     "prettier": "^2.0.5",
-    "wechaty": "^0.68.1",
-    "wechaty-puppet-wechat": "^0.30.6"
+    "wechaty": "^1.13.12",
+    "wechaty-puppet-wechat": "^1.11.12"
   },
   "readme": "README.md",
   "dependencies": {
-    "cheerio": "^1.0.0-rc.3",
-    "mcanvas": "^2.0.8",
+    "ix": "^4.5.2",
     "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",
-    "wechaty-plugin-contrib": "^0.14.17"
-  },
-  "peerDependencies": {
-    "wechaty": "^0.68.1",
-    "wechaty-puppet-wechat": "^0.30.6"
+    "tencentcloud-sdk-nodejs": "^4.0.30"
   },
   "publishConfig": {
     "registry": " https://registry.npmjs.org/"
   },
   "engines": {
-    "node": ">=14.0",
-    "npm": ">=6.14"
+    "node": ">=16.0",
+    "npm": ">=8.1"
   },
-  "_id": "wechaty-web-panel@0.2.16",
-  "_commitid": "2a00bb2"
+  "_id": "wechaty-web-panel@1.0.2",
+  "_commitid": "7f308f9"
 }

package/src/common/index.js

@@ -2,8 +2,8 @@ const { getNews, getTXweather, getSweetWord } = require('../proxy/api')
 const { sendFriend, sendRoom, asyncData, getOne } = require('../proxy/aibotk')
 const { getUser } = require('../common/userDb')
 const { formatDate, getDay, MD5, groupArray, delay } = require('../lib')
-const { FileBox, UrlLink, MiniProgram } = require('wechaty')
-
+const { UrlLink, MiniProgram } = require('wechaty')
+const { FileBox } = require('file-box')
 /**
  * 获取每日新闻内容
  * @param {*} sortId 新闻资讯分类Id
@@ -12,7 +12,7 @@ const { FileBox, UrlLink, MiniProgram } = require('wechaty')
 async function getEveryDayRoomContent(sortId, endWord = '微信小助手') {
   let today = formatDate(new Date()) //获取今天的日期
   let news = await getNews(sortId)
-  let content = `${today}<br>${news}<br>————————${endWord}`
+  let content = `${today}\n${news}\n————————${endWord}`
   return content
 }
 
@@ -28,7 +28,7 @@ async function getEveryDayContent(date, city, endWord) {
   let today = formatDate(new Date()) //获取今天的日期
   let memorialDay = getDay(date) //获取纪念日天数
   let sweetWord = await getSweetWord() // 土味情话
-  let str = `${today}<br>我们在一起的第${memorialDay}天<br><br>元气满满的一天开始啦,要开心噢^_^<br><br>今日天气<br>${weather.weatherTips}<br>${weather.todayWeather}<br>每日一句:<br>${one}<br><br>情话对你说:<br>${sweetWord}<br><br>————————${endWord}`
+  let str = `${today}\n我们在一起的第${memorialDay}天\n\n元气满满的一天开始啦,要开心噢^_^\n\n今日天气\n${weather.weatherTips}\n${weather.todayWeather}\n每日一句:\n${one}\n\n情话对你说:\n${sweetWord}\n\n————————${endWord}`
   return str
 }
 
@@ -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),
@@ -75,7 +80,7 @@ async function updateContactInfo(that) {
  */
 async function updateFriendInfo(list, num) {
   const arr = groupArray(list, num)
-  for (let i = 1; i < arr.length; i++) {
+  for (let i = 0; i < arr.length; i++) {
     const item = arr[i]
     await sendFriend(item)
     await delay(500)
@@ -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),
@@ -117,7 +122,7 @@ async function updateRoomInfo(that) {
  */
 async function updateRoomsInfo(list, num) {
   const arr = groupArray(list, num)
-  for (let i = 1; i < arr.length; i++) {
+  for (let i = 0; i < arr.length; i++) {
     const item = arr[i]
     await sendRoom(item)
     await delay(500)
@@ -135,7 +140,7 @@ async function addRoomWelcomeSay(room, roomName, contactName, msg) {
   if (msg.type === 1 && msg.content !== '') {
     // 文字
     console.log('回复内容', msg.content)
-    await room.say(`${roomName}：欢迎新朋友 @${contactName}，<br>${msg.content}`)
+    await room.say(`${roomName}：欢迎新朋友 @${contactName}，\n${msg.content}`)
   } else if (msg.type === 2 && msg.url !== '') {
     // url文件
     let obj = FileBox.fromUrl(msg.url)

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/handlers/on-message.js

@@ -67,7 +67,7 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
     const contactName = contact.name()
     const roomName = await room.topic()
     const type = msg.type()
-    const userSelfName = that.userSelf().name()
+    const userSelfName = that.currentUser.name()
     let content = ''
     let replys = ''
     let contactId = contact.id || '111'

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 } = 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,10 +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.mimeType && member.name) {
+        if (avatar._mediaType && avatar._name) {
           const base64 = member.weixin ? member.avatar : await avatar.toDataURL()
           let obj = {
             img: base64,
@@ -541,7 +540,7 @@ async function getRoomAvatarList(room, name) {
     console.log('获取群成员信息完成...')
     return res
   } catch (e) {
-    console.log('getRoomAvatarList error', e)
+    console.log('获取群成员头像列表失败', e)
   }
 }
 
@@ -583,223 +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 = []
-    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,
@@ -825,7 +607,5 @@ module.exports = {
   getAllSchedule,
   groupArray,
   getRoomAvatarList,
-  generateRoomImg,
   getRoomAvatar,
-  generateAvatar,
 }

package/src/proxy/api.js

@@ -1,33 +1,8 @@
-const cheerio = require('cheerio')
 const { req, txReq } = require('./superagent')
 const { EMOHOST, TULING, ONE, MEINV } = require('./config')
 const { randomRange, MD5 } = require('../lib/index')
 const { allConfig } = require('../common/configDb')
 
-/**
- * 获取每日一句，暂时弃用，已改为api调用
- */
-async function getOne() {
-  try {
-    let option = {
-      spider: true,
-      method: 'GET',
-      url: ONE,
-      params: '',
-    }
-    let res = await req(option)
-    let $ = cheerio.load(res)
-    let todayOneList = $('#carousel-one .carousel-inner .item')
-    let todayOne = $(todayOneList[0])
-      .find('.fp-one-cita')
-      .text()
-      .replace(/(^\s*)|(\s*$)/g, '')
-    return todayOne
-  } catch (error) {
-    console.log('获取每日一句失败：', error)
-  }
-}
-
 /**
  * 天行图灵聊天机器人
  * @param {*} word 发送内容
@@ -150,7 +125,7 @@ async function getRubbishType(word) {
       } else if (content.newslist[0].type == 3) {
         type = '是其他(干)垃圾'
       }
-      let response = `${content.newslist[0].name}${type}<br>解释：${content.newslist[0].explain}<br>主要包括：${content.newslist[0].contain}<br>投放提示：${content.newslist[0].tip}`
+      let response = `${content.newslist[0].name}${type}\n解释：${content.newslist[0].explain}\n主要包括：${content.newslist[0].contain}\n投放提示：${content.newslist[0].tip}`
       return response
     } else {
       console.log('查询失败提示：', content.msg)
@@ -174,7 +149,7 @@ async function getSweetWord() {
     let content = await txReq(option)
     if (content.code === 200) {
       let sweet = content.newslist[0].content
-      let str = sweet.replace('\r\n', '<br>')
+      let str = sweet.replace('\r\n', '\n')
       return str
     } else {
       console.log('获取土情话接口失败', content.msg)
@@ -199,7 +174,7 @@ async function getTXweather(city) {
       let todayInfo = content.newslist[0]
       let obj = {
         weatherTips: todayInfo.tips,
-        todayWeather: `今天:${todayInfo.weather}<br>温度:${todayInfo.lowest}/${todayInfo.highest}<br>${todayInfo.wind} ${todayInfo.windspeed}<br><br>`,
+        todayWeather: `今天:${todayInfo.weather}\n温度:${todayInfo.lowest}/${todayInfo.highest}\n${todayInfo.wind} ${todayInfo.windspeed}\n\n`,
       }
       return obj
     } else {
@@ -225,12 +200,12 @@ async function getNews(id) {
     if (content.code === 200) {
       let newList = content.newslist
       let news = ''
-      let shortUrl = 'https://www.tianapi.com/weixin/news/?col=' + id
+      // let shortUrl = 'https://www.tianapi.com/weixin/news/?col=' + id
       for (let i in newList) {
         let num = parseInt(i) + 1
-        news = `${news}<br>${num}.${newList[i].title}`
+        news = `${news}\n${num}.${newList[i].title}`
       }
-      return `${news}<br>新闻详情查看：${shortUrl}<br>`
+      return `${news}\n`
     }
   } catch (error) {
     console.log('获取天行新闻失败', error)
@@ -250,7 +225,7 @@ async function getMingYan() {
     let content = await txReq(option)
     if (content.code === 200) {
       let newList = content.newslist
-      let news = `${newList[0].content}<br>——————————${newList[0].author}`
+      let news = `${newList[0].content}\n——————————${newList[0].author}`
       return news
     }
   } catch (error) {
@@ -274,7 +249,7 @@ async function getStar(astro) {
       let newList = content.newslist
       let news = ''
       for (let item of newList) {
-        news = `${news}${item.type}:${item.content}<br>`
+        news = `${news}${item.type}:${item.content}\n`
       }
       return news
     }
@@ -339,7 +314,7 @@ async function getLunar(date) {
     let content = await txReq(option)
     if (content.code === 200) {
       let item = content.newslist[0]
-      let news = `<br>阳历：${item.gregoriandate}<br>阴历：${item.lunardate}<br>节日：${item.lunar_festival}<br>适宜：${item.fitness}<br>不宜：${item.taboo}<br>神位：${item.shenwei}<br>胎神：${item.taishen}<br>冲煞：${item.chongsha}<br>岁煞：${item.suisha}`
+      let news = `\n阳历：${item.gregoriandate}\n阴历：${item.lunardate}\n节日：${item.lunar_festival}\n适宜：${item.fitness}\n不宜：${item.taboo}\n神位：${item.shenwei}\n胎神：${item.taishen}\n冲煞：${item.chongsha}\n岁煞：${item.suisha}`
       return news
     }
   } catch (error) {
@@ -360,7 +335,7 @@ async function getGoldReply() {
     let content = await txReq(option)
     if (content.code === 200) {
       let item = content.newslist[0]
-      let news = `标题："${item.title}"<br>回复：${item.content}`
+      let news = `标题："${item.title}"\n回复：${item.content}`
       return news
     }
   } catch (error) {
@@ -528,7 +503,9 @@ async function getNcov() {
     if (content.code === 200) {
       let newList = content.newslist[0].news
       const riskarea = content.newslist[0].riskarea
-      const reply = `【疫情新闻暂时下线，目前只返回风险地区】\n\n全国风险地区\n\n【高风险地区】:\n${(riskarea.high && riskarea.high.length && riskarea.high.join('\n')) || '暂无'}\n【中风险地区】:\n${(riskarea.mid && riskarea.mid.length && riskarea.mid.join('\n')) || '暂无'}\n\n——————————数据来源：天行数据`
+      const reply = `【疫情新闻暂时下线，目前只返回风险地区】\n\n全国风险地区\n\n【高风险地区】:\n${(riskarea.high && riskarea.high.length && riskarea.high.join('\n')) || '暂无'}\n【中风险地区】:\n${
+        (riskarea.mid && riskarea.mid.length && riskarea.mid.join('\n')) || '暂无'
+      }\n\n——————————数据来源：天行数据`
       // let news = ''
       // for (let i in newList) {
       //   let num = parseInt(i) + 1
@@ -560,7 +537,6 @@ async function getCname() {
   }
 }
 module.exports = {
-  getOne,
   getResByTXTL,
   getResByTX,
   getResByTL,

package/src/proxy/mqtt.js

@@ -53,7 +53,7 @@ async function initMqtt(that) {
               }
             } else if (content.target === 'Contact') {
               console.log(`收到联系人：${content.alias || content.name}发送消息请求： ${content.message.content || content.message.url}`)
-              let contact = (await that.Contact.find({ alias: content.alias })) || (await that.Contact.find({ name: content.name })) || (await that.Contact.find({ weixin: content.weixin })) // 获取你要发送的联系人
+              let contact = (await that.Contact.find({ name: content.name })) || (await that.Contact.find({ alias: content.alias })) || (await that.Contact.find({ weixin: content.weixin })) // 获取你要发送的联系人
               if (!contact) {
                 console.log(`查找不到联系人：${content.name || content.alias}，请检查联系人名称是否正确`)
                 return

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,10 +1,10 @@
 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')
-const { log } = require('wechaty')
 /**
  * 根据事件名称分配不同的api处理，并获取返回内容
  * @param {string} eName 事件名称
@@ -52,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 = '你的头像属于高维世界产物，小助手能力不足，无法解析，待我修炼后为你提供服务'
@@ -81,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 {
@@ -89,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,6 +1,50 @@
-const { Message, log } = require('wechaty')
+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
+  }
+  if (!Array.isArray(options)) {
+    options = [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) {
+        msg = await option(room, contact)
+      } else {
+        msg = option
+      }
 
-const { roomTalker } = require('wechaty-plugin-contrib/dist/src/talkers/mod')
+      if (!msg) {
+        continue
+      }
+
+      if (typeof msg === 'string') {
+        if (mustacheView) {
+          msg = Mustache.render(msg, mustacheView)
+        }
+        if (contact) {
+          await room.say(msg, contact)
+        } else {
+          await room.say(msg)
+        }
+      } else {
+        /**
+         *  FIXME(huan): https://github.com/microsoft/TypeScript/issues/14107
+         */
+        await room.say(msg)
+      }
+
+      await room.wechaty.sleep(1000)
+    }
+  }
+}
 
 function messageMapper(mapperOptions, one) {
   log.verbose('WechatyPluginContrib', 'messageMapper(%s)', typeof mapperOptions === 'function' ? 'function' : JSON.stringify(mapperOptions))
@@ -141,7 +185,7 @@ const bidirectionalMapper = async (message) => {
   try {
     const abbrRoomTopicForDevelopersHome = abbrRoomTopicByRegex(/\s*([^\s]*\s*[^\s]+)$/)
     // Drop all messages if not Text
-    if (message.type() !== Message.Type.Text) {
+    if (message.type() !== Message.Text) {
       return
     }
 
@@ -175,7 +219,7 @@ const unidirectionalMapper = async (message, one) => {
     const room = message.room()
     const topic = await room.topic()
     switch (message.type()) {
-      case Message.Type.Text:
+      case Message.Text:
         messageList.push(`${prefix}: ${message.text()}`)
         break
 
@@ -187,7 +231,7 @@ const unidirectionalMapper = async (message, one) => {
          * then we add a sender information for the destination rooms.
          */
         if (topic === one) {
-          const type = Message.Type[message.type()]
+          const type = Message[message.type()]
           messageList.unshift(`${prefix}: ${type}`)
         }
         break
@@ -374,11 +418,11 @@ async function oneToMany(that, config, msg) {
  */
 async function dispatchAsync(that, msg, list) {
   try {
-    const userSelfName = that.userSelf().name()
+    const userSelfName = that.currentUser.name()
     const type = msg.type()
     const content = msg.text()
     const mentionSelf = content.includes(`@${userSelfName}`)
-    if (that.Message.Type.Text === type && mentionSelf) {
+    if (that.Message.Text === type && mentionSelf) {
       // 如果内容中有提及机器人的内容，不进行转发
       return
     }
@@ -387,7 +431,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.Type.Text]
+        config.whitelist = [async (message) => message.type() === Message.Text]
       } else if (config.forward === 2) {
         config.blacklist = []
         config.map = unidirectionalMapper