wechaty-web-panel 1.0.3-beta.2 → 1.0.4

package/.idea/workspace.xml

@@ -2,7 +2,7 @@
 <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$/src/service/event-dispatch-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/service/event-dispatch-service.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/proxy/tencent-open.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/proxy/tencent-open.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -53,6 +53,16 @@
       <recent name="$PROJECT_DIR$/koa/pubilc/static" />
     </key>
   </component>
+  <component name="RunManager">
+    <configuration name="index.template.js" type="NodeJSConfigurationType" temporary="true" nameIsGenerated="true" path-to-js-file="$PROJECT_DIR$/test/index.template.js" working-dir="$PROJECT_DIR$/test">
+      <method v="2" />
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Node.js.index.template.js" />
+      </list>
+    </recent_temporary>
+  </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration">
     <configuration />
@@ -115,7 +125,12 @@
       <workItem from="1653468787592" duration="419000" />
       <workItem from="1655173951557" duration="1402000" />
       <workItem from="1655186504356" duration="87000" />
-      <workItem from="1655186988658" duration="163000" />
+      <workItem from="1655186988658" duration="336000" />
+      <workItem from="1655188201258" duration="26000" />
+      <workItem from="1655357894259" duration="3028000" />
+      <workItem from="1656644469354" duration="82000" />
+      <workItem from="1657611185486" duration="30768000" />
+      <workItem from="1657730101683" duration="5386000" />
     </task>
     <servers />
   </component>

package/CHANGELOG.md

@@ -1,4 +1,9 @@
 ## 更新日志
+### V1.0.3(2022-07-13)
+
+1、添加微信开发对话平台
+2、添加新闻分类事件
+3、
 
 ### V1.0.2(2022-02-21)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-web-panel",
-  "version": "1.0.3-beta.2",
+  "version": "1.0.4",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -36,12 +36,18 @@
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.4",
     "prettier": "^2.0.5",
-    "wechaty": "^1.13.12",
-    "wechaty-puppet-wechat": "^1.11.12"
+    "wechaty": "^1.20.2",
+    "wechaty-puppet-wechat": "^1.18.4"
   },
   "readme": "README.md",
+  "engines": {
+    "node": ">=16",
+    "npm": ">=7"
+  },
   "dependencies": {
+    "axios": "^0.27.2",
     "ix": "^4.5.2",
+    "jsonwebtoken": "^8.5.1",
     "mqtt": "^4.2.6",
     "mustache": "^4.2.0",
     "nedb": "^1.8.0",
@@ -54,6 +60,6 @@
   "publishConfig": {
     "registry": " https://registry.npmjs.org/"
   },
-  "_id": "wechaty-web-panel@1.0.3-beta.2",
-  "_commitid": "e63a5b5"
+  "_id": "wechaty-web-panel@1.0.4",
+  "_commitid": "e9091a0"
 }

package/src/common/index.js

@@ -1,9 +1,10 @@
 const { getNews, getTXweather, getSweetWord } = require('../proxy/api')
-const { sendFriend, sendRoom, asyncData, getOne } = require('../proxy/aibotk')
+const { sendFriend, sendRoom, asyncData, getOne, getMaterial } = require('../proxy/aibotk')
 const { getUser } = require('../common/userDb')
 const { formatDate, getDay, MD5, groupArray, delay } = require('../lib')
 const { UrlLink, MiniProgram } = require('wechaty')
 const { FileBox } = require('file-box')
+const { allConfig } = require('../common/configDb')
 /**
  * 获取每日新闻内容
  * @param {*} sortId 新闻资讯分类Id
@@ -156,6 +157,12 @@ async function addRoomWelcomeSay(room, roomName, contactName, msg) {
  * @param {*} isRoom
  */
 async function roomSay(room, contact, msg) {
+  console.log('msg', msg)
+  const config = await allConfig()
+  const { role } = config.userInfo
+  if (msg.id && role === 'vip') {
+    msg = await getMaterial(msg.id)
+  }
   try {
     if (msg.type === 1 && msg.content) {
       // 文字
@@ -208,6 +215,12 @@ async function roomSay(room, contact, msg) {
  *  type 1 文字 2 图片url 3 图片base64 4 url链接 5 小程序  6 名片
  */
 async function contactSay(contact, msg, isRoom = false) {
+  console.log('msg', msg)
+  const config = await allConfig()
+  const { role } = config.userInfo
+  if (msg.id && role === 'vip') {
+    msg = await getMaterial(msg.id)
+  }
   try {
     if (msg.type === 1 && msg.content) {
       // 文字

package/src/handlers/on-friend.js

@@ -15,7 +15,7 @@ async function onFriend(friendship) {
     console.log(logMsg)
     if (config.autoAcceptFriend) {
       switch (friendship.type()) {
-        case Friendship.Type.Receive:
+        case 2:
           if (config.acceptFriendKeyWords.length === 0) {
             console.log('无认证关键词,10秒后将会自动通过好友请求')
             await delay(10000)
@@ -28,10 +28,18 @@ async function onFriend(friendship) {
             console.log('未触发任何关键词，好友自动添加失败')
           }
           break
-        case Friendship.Type.Confirm:
+        case 1:
           logMsg = '已确认添加好友：' + name
           console.log(logMsg)
           break
+        case 0:
+          logMsg = '未知错误' + name
+          console.log(logMsg)
+          break
+        case 3:
+          logMsg = '开启了验证' + name
+          console.log(logMsg)
+          break
       }
     } else {
       console.log('未开启自动添加好友功能，忽略好友添加')

package/src/lib/index.js

@@ -233,6 +233,43 @@ function getConstellation(astro) {
   }
 }
 
+/**
+ * 获取新闻的英文
+ * @param {*} msg
+ */
+function getNewsType(msg) {
+  const NewsMap = {
+    '社会': 5,
+    '国内': 7,
+    '国际': 8,
+    '娱乐': 10,
+    '美女图片': 11,
+    '体育': 12,
+    '科技': 13,
+    '奇闻异事': 41,
+    '健康知识': 17,
+    '旅游': 18,
+    '汉服': 38,
+    '房产': 37,
+    '科学探索': 36,
+    '汽车': 35,
+    '互联网': 34,
+    '动漫': 33,
+    '财经': 32,
+    '游戏': 32,
+    'CBA': 30,
+    '人工智能': 29,
+    '区块链': 28,
+    '军事': 27,
+    '足球': 26,
+    '创业': 24,
+    '移动互联': 23,
+    'IT': 22,
+    'VR科技': 21
+  }
+  return NewsMap[msg] || 7
+}
+
 /**
  * 返回指定范围的随机整数
  * @param {*} min
@@ -608,4 +645,5 @@ module.exports = {
   groupArray,
   getRoomAvatarList,
   getRoomAvatar,
+  getNewsType
 }

package/src/proxy/aibotk.js

@@ -55,7 +55,7 @@ async function getConfig() {
     }
     let content = await aiBotReq(option)
     const config = JSON.parse(content.data.config)
-    let cres = await updateConfig(config)
+    let cres = await updateConfig({ puppetType: 'wechaty-puppet-wechat', ...config })
     return cres
   } catch (e) {
     console.log('获取配置文件失败:' + e)
@@ -372,6 +372,27 @@ async function getMqttConfig() {
   }
 }
 
+/**
+ * 获取实时素材
+ * @param {*} version
+ */
+async function getMaterial(id) {
+  try {
+    let option = {
+      method: 'GET',
+      url: '/wechat/material',
+      params: {
+        id,
+      },
+    }
+    let content = await aiBotReq(option)
+    console.log('素材', content.data)
+    return content.data
+  } catch (error) {
+    console.log('获取mqtt配置错误', error)
+  }
+}
+
 module.exports = {
   getConfig,
   getScheduleList,
@@ -391,4 +412,5 @@ module.exports = {
   getMqttConfig,
   getMeiNv,
   getOne,
+  getMaterial,
 }

package/src/proxy/tencent-open.js

@@ -0,0 +1,222 @@
+const jwt = require('jsonwebtoken')
+const { allConfig } = require('../common/configDb')
+const axios = require('axios')
+
+async function getSignature(id, encodingAESKey) {
+  const token = jwt.sign(
+    {
+      userid: id,
+    },
+    encodingAESKey,
+    { algorithm: 'HS256' }
+  )
+  return token
+}
+
+function checkType(answer) {
+  var i = ''
+  i = '[object Object]' === Object.prototype.toString.call(answer) ? JSON.stringify(answer) : answer
+  var s = 'text'
+  return (
+    /{\s*"miniprogrampage"\s*:/.test(i)
+      ? (s = 'miniprogrampage')
+      : /{\s*"image"\s*:/.test(i)
+      ? (s = 'image')
+      : /{\s*"file"\s*:/.test(i)
+      ? (s = 'file')
+      : /{\s*"mpnews"\s*:/.test(i)
+      ? (s = 'mpnews')
+      : /{\s*"news"\s*:/.test(i)
+      ? (s = 'news')
+      : /{\s*"video"\s*:/.test(i)
+      ? (s = 'video')
+      : /{\s*"voice"\s*:/.test(i)
+      ? (s = 'voice')
+      : /{\s*"callback"\s*:/.test(i)
+      ? (s = 'callback')
+      : /weather_ans_detail/.test(i)
+      ? (s = 'weather')
+      : /{\s*"json"\s*:/.test(i)
+      ? (s = 'json')
+      : /^\[({.*:.*})*\]$/.test(i) && (s = 'nndialog'),
+    s
+  )
+}
+
+/**
+ * 判断是不是多个回复
+ * @param answer
+ * @returns {boolean}
+ */
+function isMultiple(answer) {
+  return /{\s*"multimsg"\s*:/.test(answer)
+}
+
+/**
+ * 对多重回复的处理
+ * @param answer
+ */
+function getMultiList(answer) {
+  const multiList = JSON.parse(answer).multimsg
+  const res = multiList.map(function (item, index) {
+    if ('[object Object]' === Object.prototype.toString.call(item)) {
+      return JSON.stringify(item)
+    } else {
+      return item
+    }
+  })
+  return res
+}
+
+/**
+ * 格式化开放平台回复内容
+ * @param answer
+ * @param options
+ * @param userInfo
+ * @returns {*[]}
+ */
+function getFormatReply(answer, options = [], userInfo, puppetType) {
+  const answerType = checkType(answer)
+  if (answerType !== 'text') {
+    answer = JSON.parse(answer)
+  }
+  let replys = []
+  let reply = {}
+  switch (answerType) {
+    case 'text':
+      reply = {
+        type: 1,
+        content: answer,
+      }
+      if (options && options.length) {
+        options.forEach((item) => {
+          reply.content = reply.content + '(请输入完整的文字和序号，可以拷贝)\n' + item.title
+        })
+      }
+      replys = [reply]
+      break
+    case 'image':
+      if (Array.isArray(answer.image)) {
+        replys = answer.image.map((item) => {
+          return {
+            type: 2,
+            url: item.image.url,
+          }
+        })
+        break
+      } else {
+        replys = [{ type: 2, url: answer.image.url }]
+        break
+      }
+    case 'video':
+      if (answer.video && (answer.video.url || answer.video.cover_url)) {
+        replys = [{ type: 2, url: answer.video.url ? answer.video.url : answer.video.cover_url }]
+        break
+      }
+      break
+    case 'news':
+      if (puppetType === 'wechaty-puppet-wechat') {
+        replys = [
+          { type: 1, content: `【标题】${answer.news.articles[0].title}\n【描述】${answer.news.articles[0].description}\n【访问地址】${answer.news.articles[0].url}\n 【缩略图】正在路上...` },
+          { type: 2, url: answer.news.articles[0].picurl },
+        ]
+      } else {
+        replys = [{ type: 4, url: answer.news.articles[0].url, title: answer.news.articles[0].title, thumbnailUrl: answer.news.articles[0].picurl, description: answer.news.articles[0].description }]
+      }
+      break
+    case 'mpnews':
+      replys = [
+        { type: 1, content: `【标题】${answer.mpnews.title}\n【内容】${answer.mpnews.digest}\n【缩略图】正在路上...` },
+        { type: 2, url: answer.mpnews.imgurl },
+      ]
+      break
+    case 'voice':
+      if (answer.voice && answer.voice.url) {
+        replys = [{ type: 2, url: answer.voice.url }]
+        break
+      }
+      break
+    case 'json':
+      if (answer.json) {
+        replys = [{ type: 1, content: JSON.stringify(answer.json) }]
+        break
+      }
+      break
+    case 'miniprogrampage':
+      if (puppetType === 'wechaty-puppet-wechat') {
+        replys = [{ type: 1, content: '收到了一个小程序，但是小秘书还没学会展示😭，等等我回去再修炼五百年💪' }]
+      } else {
+        replys = [{ type: 5, appid: answer.miniprogrampage.appid, title: answer.miniprogrampage.title, pagePath: answer.miniprogrampage.pagepath, description: answer.miniprogrampage.title, thumbUrl: answer.miniprogrampage.thumb_url, thumbKey: undefined, username: userInfo.name }]
+      }
+      break
+    default:
+      break
+  }
+  return replys
+}
+
+async function getTencentOpenReply({ msg, id, userInfo }) {
+  const config = await allConfig()
+  try {
+    const signature = await getSignature(id, config.tencentAESKey)
+    const data = {
+      signature,
+      query: msg,
+    }
+    const res = await axios.post(`https://openai.weixin.qq.com/openapi/aibot/eTZV8kYIvKnmvQJgXsy7e7f3WDWeGf`, data, {})
+    const resData = res.data
+    if (!resData.errcode) {
+      let answer = resData.answer // 存放回答
+      if (resData.answer_type === 'text') {
+        if (isMultiple(answer)) {
+          const multiList = getMultiList(answer)
+          const replys = []
+          multiList.forEach((item) => {
+            item = item.replace(/<\/?.+?\/?>/g, '')
+            console.log('item', item)
+            const reply = getFormatReply(item, resData.options || [], userInfo, config.puppetType)
+            console.log('reply', reply)
+            replys.push(...reply)
+          })
+          return replys
+        } else {
+          const replys = getFormatReply(answer, resData.options, userInfo, config.puppetType)
+          return replys
+        }
+      } else if (resData.answer_type === 'music') {
+        // web 端协议以文字和图片的形式发送
+        if (config.puppetType === 'wechaty-puppet-wechat') {
+          const music = resData.msg[0]
+          const musicContent = `【歌名】：《${music && music.song_name}》\n【歌手】：${music && music.singer_name}\n【听歌地址】：${music && music.music_url}`
+          const musicPic = music && music.pic_url
+          return [
+            {
+              type: 1,
+              content: resData.answer + '\n\n' + musicContent,
+            },
+            {
+              type: 2,
+              url: musicPic,
+            },
+          ]
+        } else {
+          // 其他协议可以发链接的用H5卡片发送
+          const music = resData.msg[0]
+          return [
+            {
+              type: 1,
+              content: resData.answer,
+            },
+            { type: 4, url: music.music_url, title: music.song_name, thumbnailUrl: music.pic_url, description: music.singer_name },
+          ]
+        }
+      }
+    }
+  } catch (e) {
+    console.log('error', e)
+  }
+}
+
+module.exports = {
+  getTencentOpenReply,
+}

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

@@ -1,10 +1,11 @@
 const api = require('../proxy/api')
 const { getConfig, getRoomPhotoConfig, getMeiNv } = require('../proxy/aibotk')
-const { getConstellation, msgArr, getAllSchedule, getRoomAvatar } = require('../lib')
+const { getConstellation, msgArr, getAllSchedule, getRoomAvatar, getNewsType } = 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 { getTencentOpenReply } = require('../proxy/tencent-open')
 /**
  * 根据事件名称分配不同的api处理，并获取返回内容
  * @param {string} eName 事件名称
@@ -33,6 +34,10 @@ async function dispatchEventContent(that, eName, msg, name, id, avatar, room) {
         let xing = getConstellation(msg)
         content = await api.getStar(xing)
         break
+      case 'news':
+        let newsId = getNewsType(msg)
+        content = await api.getNews(newsId)
+        break
       case 'xing':
         content = await api.getXing(msg)
         break
@@ -134,25 +139,38 @@ async function dispatchEventContent(that, eName, msg, name, id, avatar, room) {
  */
 async function dispatchAiBot(bot, msg, name, id) {
   try {
-    let res
+    let res, replys
     switch (bot) {
       case 0:
+        // 天行机器人
         res = await api.getResByTX(msg, id)
+        replys = [{ type: 1, res }]
         break
       case 1:
+        // 天行图灵机器人
         res = await api.getResByTXTL(msg, id)
+        replys = [{ type: 1, res }]
         break
       case 2:
+        // 图灵机器人
         res = await api.getResByTL(msg, id)
+        replys = [{ type: 1, res }]
         break
       case 3:
+        // 微信闲聊
         res = await chatTencent(msg, id)
+        replys = [{ type: 1, res }]
+        break
+      case 5:
+        // 微信开放对话平台
+        res = await getTencentOpenReply({ msg, id, userInfo: { name } })
+        replys = res
         break
       default:
-        res = ''
+        replys = [{ type: 1, content: '' }]
         break
     }
-    return res
+    return replys
   } catch (e) {
     console.log('机器人接口信息获取失败', e)
     return ''

package/src/service/msg-filters.js

@@ -176,17 +176,13 @@ async function keywordsMsg({ msg, config }) {
 async function robotMsg({ msg, name, id, config }) {
   try {
     let msgArr = [] // 返回的消息列表
-    let obj = { type: 1, content: '', url: '' } // 消息主体
     if (config.autoReply) {
       console.log('开启了机器人自动回复功能')
-      obj.type = 1
-      obj.content = await dispatch.dispatchAiBot(config.defaultBot, msg, name, id)
+      msgArr = await dispatch.dispatchAiBot(config.defaultBot, msg, name, id)
     } else {
       console.log('没有开启机器人自动回复功能')
-      obj.type = 1
-      obj.content = ''
+      msgArr = [{ type: 1, content: '', url: '' }]
     }
-    msgArr.push(obj)
     return msgArr
   } catch (e) {
     console.log('robotMsg error:', e)