@aochuang/client-sdk 1.0.294 → 1.0.296

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/services/client-chat/client-chat-wechat/client-chat-account.js +1 -1
  3. package/services/client-chat/client-chat-wechat/client-chat-socket.js +9 -1
  4. package/services/client-chat/client-chat-wechat/client-chat.js +16 -16
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aochuang/client-sdk",
3
- "version": "1.0.294",
3
+ "version": "1.0.296",
4
4
  "description": "",
5
5
  "scripts": {
6
6
  "test": "echo \"Error: no test specified\" && exit 1"
package/services/client-chat/client-chat-wechat/client-chat-account.js CHANGED
@@ -221,7 +221,7 @@ export default class ClientChatAccount {
221
221
  muteNum: rs.data[0].muteUnread || 0
222
222
  })
223
223
  } else {
224
- this.data.accountUnreadMessageNumData.push(index, 1, {
224
+ this.data.accountUnreadMessageNumData.push({
225
225
  id: wechatAccountId,
226
226
  num: rs.data[0].unread || 0,
227
227
  muteNum: rs.data[0].muteUnread || 0
package/services/client-chat/client-chat-wechat/client-chat-socket.js CHANGED
@@ -42,9 +42,17 @@ export default class Websocket {
42
42
  this.socket = options.socket
43
43
  this.socket.log.onBeforeAdd(({ data }) => {
44
44
  // 收消息需要拦截一些，因为下面有了
45
- if (data && ['socket:sendMessage', 'socket:receiveMessage'].includes(data.group)) {
45
+ if (data && ['socket:sendMessage'].includes(data.group)) {
46
46
  return false
47
47
  }
48
+ if (data && ['socket:receiveMessage'].includes(data.group)) {
49
+ if (!data.content || !data.content.message || !data.content.message.cmdType) {
50
+ return false
51
+ }
52
+ if (data.content.message.cmdType === 'CmdNewMessage') {
53
+ return false
54
+ }
55
+ }
48
56
  })
49
57
  this.socket.event.on('onCmdNewMessage', (evt) => {
50
58
  if (!options.checkSocketEventNotifyMethod || options.checkSocketEventNotifyMethod(evt) !== false) {
package/services/client-chat/client-chat-wechat/client-chat.js CHANGED
@@ -153,22 +153,22 @@ class ClientChat {
153
153
  this.sessionUnread.updateSession(session.conversationId, session)
154
154
  }
155
155
  // 更新账号未读消息数量
156
- this.account.updateAccountUnreadMessageNum(session.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
157
- const beforeUnreadMsgCount = changeProps.unreadMsgCount.before || 0
158
- const afterUnreadMsgCount = changeProps.unreadMsgCount.after || 0
159
- const nextUnreadMessageNum = Math.max(0, (unreadMesasgeNum || 0) - beforeUnreadMsgCount) + afterUnreadMsgCount
160
- if (session.mute) {
161
- return {
162
- num: nextUnreadMessageNum,
163
- muteNum: Math.max(0, (unreadMessageMuteNum || 0) - beforeUnreadMsgCount) + afterUnreadMsgCount
164
- }
165
- } else {
166
- return {
167
- num: nextUnreadMessageNum,
168
- muteNum: unreadMessageMuteNum || 0
169
- }
170
- }
171
- })
156
+ // this.account.updateAccountUnreadMessageNum(session.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
157
+ // const beforeUnreadMsgCount = changeProps.unreadMsgCount.before || 0
158
+ // const afterUnreadMsgCount = changeProps.unreadMsgCount.after || 0
159
+ // const nextUnreadMessageNum = Math.max(0, (unreadMesasgeNum || 0) - beforeUnreadMsgCount) + afterUnreadMsgCount
160
+ // if (session.mute) {
161
+ // return {
162
+ // num: nextUnreadMessageNum,
163
+ // muteNum: Math.max(0, (unreadMessageMuteNum || 0) - beforeUnreadMsgCount) + afterUnreadMsgCount
164
+ // }
165
+ // } else {
166
+ // return {
167
+ // num: nextUnreadMessageNum,
168
+ // muteNum: unreadMessageMuteNum || 0
169
+ // }
170
+ // }
171
+ // })
172
172
  }
173
173
  const sessionInstances = this.sessionManage.getSessionInstacesBySessionId(session.conversationId)
174
174
  sessionInstances.forEach(sessionInstance => {