@aochuang/client-sdk 1.0.321 → 1.0.323

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/client-sdk",
-  "version": "1.0.321",
+  "version": "1.0.323",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/services/client-chat/client-chat-wechat/client-chat-concats.js

@@ -150,10 +150,6 @@ export default class ClientChatContacts {
 	friendMap = {}
 	
 	roomMap = {}
-
-	_cacheFriendGroupCountMap = {}
-
-	_cacheRoomGroupCountMap = {}
 	
 	loadContactsRoomGroupDataMethod = null
 	
@@ -730,6 +726,19 @@ export default class ClientChatContacts {
 			this.onLoadFriendGroupData && this.onLoadFriendGroupData()
 			return rs
 		})
+		if (!this.data.cacheFriendGroupCountMap) {
+			this.data.cacheFriendGroupCountMap = Vue.observable({})
+		}
+		Vue.set(this.data.cacheFriendGroupCountMap, 'all', this._cacheLoadFriendGroupPromise.then(rs => {
+			return {
+				data: (rs.data || []).map(v => {
+					return {
+						id: v.id,
+						num: v.num
+					}
+				})
+			}
+		}))
 		return this._cacheLoadFriendGroupPromise
 	}
 	
@@ -750,27 +759,24 @@ export default class ClientChatContacts {
 		}, params)
 		const cacheKey = wechatAccountId || 'all'
 		if (!this.data.cacheFriendGroupCountMap) {
-			this.data.cacheFriendGroupCountMap = {}
+			this.data.cacheFriendGroupCountMap = Vue.observable({})
 		}
-		if (!this._cacheFriendGroupCountMap) {
-			this._cacheFriendGroupCountMap = {}
-		}
-		if (!this._cacheFriendGroupCountMap[cacheKey]) {
+		if (!this.data.cacheFriendGroupCountMap[cacheKey]) {
 			const groupIds =  (this.data.friendGroupData || []).map(v => v.id)
 			groupIds.forEach(id => {
 				Vue.set(this.data.refreshFriendGroupCountLoadingMap, id, true)
 			})
-			Vue.set(this.data.cacheFriendGroupCountMap, cacheKey, true)
-			this._cacheFriendGroupCountMap[cacheKey] = this.getContactsFriendGroupCountMethod(Object.assign({}, nextParams, {
+			Vue.set(this.data.cacheFriendGroupCountMap, cacheKey, this.getContactsFriendGroupCountMethod(Object.assign({}, nextParams, {
 				wechatAccountIds: wechatAccountId ? [wechatAccountId] : null,
 				groupIds
 			})).finally(() => {
 				groupIds.forEach(id => {
 					Vue.set(this.data.refreshFriendGroupCountLoadingMap, id, false)
 				})
-			})
+			}))
+			
 		} 
-		this._cacheFriendGroupCountMap[cacheKey].then(rs => {
+		this.data.cacheFriendGroupCountMap[cacheKey].then(rs => {
 			if (!rs || !rs.data || !rs.data.length) {
 				return
 			}
@@ -780,7 +786,7 @@ export default class ClientChatContacts {
 				})
 			})
 		})
-		return this._cacheFriendGroupCountMap[cacheKey]
+		return this.data.cacheFriendGroupCountMap[cacheKey]
 	}
 
 	// 标记所有好友分组修改
@@ -789,10 +795,6 @@ export default class ClientChatContacts {
 		if (!this.data.cacheFriendGroupCountMap) {
 			return
 		}
-		if (this._cacheFriendGroupCountMap) {
-			delete this._cacheFriendGroupCountMap[wechatAccountId]
-			delete this._cacheFriendGroupCountMap.all
-		}
 		Vue.delete(this.data.cacheFriendGroupCountMap, wechatAccountId)
 		Vue.delete(this.data.cacheFriendGroupCountMap, 'all')
 	}
@@ -806,6 +808,19 @@ export default class ClientChatContacts {
 			this.onLoadRoomGroupData && this.onLoadRoomGroupData()
 			return rs
 		})
+		if (!this.data.cacheRoomGroupCountMap) {
+			this.data.cacheRoomGroupCountMap = Vue.observable({})
+		}
+		Vue.set(this.data.cacheRoomGroupCountMap, 'all', this._cacheLoadRoomGroupPromise.then(rs => {
+			return {
+				data: (rs.data || []).map(v => {
+					return {
+						id: v.id,
+						num: v.num
+					}
+				})
+			}
+		}))
 		return this._cacheLoadRoomGroupPromise
 	}
 	
@@ -821,28 +836,24 @@ export default class ClientChatContacts {
 			wechatAccountId: null
 		}, params)
 		if (!this.data.cacheRoomGroupCountMap) {
-			this.data.cacheRoomGroupCountMap = {}
-		}
-		if (!this._cacheRoomGroupCountMap) {
-			this._cacheRoomGroupCountMap = {}
+			this.data.cacheRoomGroupCountMap = Vue.observable({})
 		}
 		const cacheKey = wechatAccountId || 'all'
-		if (!this._cacheRoomGroupCountMap[cacheKey] || refresh === true) {
+		if (!this.data.cacheRoomGroupCountMap[cacheKey] || refresh === true) {
 			const groupIds =  (this.data.roomGroupData || []).map(v => v.id)
 			groupIds.forEach(id => {
 				Vue.set(this.data.refreshRoomGroupCountLoadingMap, id, true)
 			})
-			Vue.set(this.data.cacheRoomGroupCountMap, cacheKey, true)
-			this._cacheRoomGroupCountMap[cacheKey] = this.getContactsRoomGroupCountMethod(Object.assign({}, nextParams, {
+			Vue.set(this.data.cacheRoomGroupCountMap, cacheKey, this.getContactsRoomGroupCountMethod(Object.assign({}, nextParams, {
 				wechatAccountIds: wechatAccountId ? [wechatAccountId] : null,
 				groupIds
 			})).finally(() => {
 				groupIds.forEach(id => {
 					Vue.set(this.data.refreshRoomGroupCountLoadingMap, id, false)
 				})
-			})
+			}))
 		}
-		this._cacheRoomGroupCountMap[cacheKey].then(rs => {
+		this.data.cacheRoomGroupCountMap[cacheKey].then(rs => {
 			if (!rs || !rs.data || !rs.data.length) {
 				return
 			}
@@ -852,17 +863,13 @@ export default class ClientChatContacts {
 				})
 			})
 		})
-		return this._cacheRoomGroupCountMap[cacheKey]
+		return this.data.cacheRoomGroupCountMap[cacheKey]
 	}
 
 	clearAllRoomGroupCountCache (wechatAccountId) {
 		if (!this.data.cacheRoomGroupCountMap) {
 			return
 		}
-		if (this._cacheRoomGroupCountMap) {
-			delete this._cacheRoomGroupCountMap[wechatAccountId]
-			delete this._cacheRoomGroupCountMap.all
-		}
 		Vue.delete(this.data.cacheRoomGroupCountMap, wechatAccountId)
 		Vue.delete(this.data.cacheRoomGroupCountMap, 'all')
 	}
@@ -1090,8 +1097,6 @@ export default class ClientChatContacts {
 		this.data.refreshFriendGroupCountLoadingMap = {}
 		this.data.cacheFriendGroupCountMap = null
 		this.data.cacheRoomGroupCountMap = null
-		this._cacheFriendGroupCountMap = null
-		this._cacheRoomGroupCountMap = null
 		if (this.cancelConnectRequest) {
 			this.cancelConnectRequest()
 			this.cancelConnectRequest = null

package/services/client-chat/client-chat-wechat/client-chat-message.js

@@ -3,6 +3,7 @@ import Event from '../../../utils/event.js'
 import { unique } from '../../../utils/string.js'
 import { formatDate } from '../../../utils/date.js'
 import { createPromise } from '../../../utils/util'
+import { isAutoReadMessage, shouldIgnoreSessionByMessage, isDeletedMsg, isBlockedMsg } from './utils.js'
 import { encodeHtmlEntities } from '@aochuang/common/utils/string.js'
 
 export default class ClientChatMessage {
@@ -140,9 +141,13 @@ export default class ClientChatMessage {
 			}
 		}
 		if (fireEvent !== false) {
-			this.event && this.event.emit('add-message', {
-				data
-			})
+			// 如果消息包含这种情况，就不能往外发送add-message事件
+			// 因为例如群发的消息，他没有会话，导致前端在处理来了新消息通知铃声提醒，获取会话一直获取不到，然后会总是发送请求
+			if (!isAutoReadMessage(data) && !shouldIgnoreSessionByMessage(data) && !isDeletedMsg(data) && !isBlockedMsg(data)) {
+				this.event && this.event.emit('add-message', {
+					data
+				})	
+			}
 			this.onAddMessageSuccess && this.onAddMessageSuccess({
 				data
 			})

package/services/client-chat/client-chat-wechat/client-chat.js

@@ -9,6 +9,7 @@ import { createSessionId } from '../../../utils/string.js'
 import Event from '../../../utils/event.js'
 import { createSerialQueue } from '../../../utils/queue'
 import ClientChatSessionManage from './client-chat-session-manage.js'
+import { shouldIgnoreSessionByMessage, isAutoReadMessage, isDeletedMsg, isBlockedMsg } from './utils.js'
 
 const CONNECT_STATUS = {
 	Normal: 'normal',
@@ -16,36 +17,6 @@ const CONNECT_STATUS = {
 	Complete: 'complete'
 }
 
-function shouldIgnoreSessionByMessage (data) {
-	// 群发消息的不处理会话
-	// public enum MsgSubTypeEnum {
-	// 	/*0：普通的聊天*/
-	// 	COMMON,
-	// 	/*1：分配记录消息*/
-	// 	ALLOT_MSG,
-	// 	/*2：批量发送*/
-	// 	BATCH_SEND,
-	// 	/*3：通过好友恢复*/
-	// 	ACCEPT_REPLY,
-	// 	/*4：自动回复*/
-	// 	AUTO_REPLY,
-	// 	// 5：入群欢迎语
-	// 	CHATROOM_WELCOME,
-	// 	//6：指定时间段内自动回复消息
-	// 	AUTO_REPLY_INTIME,
-	// 	//7：群自动回复
-	// 	CHATROOM_REPLY
-	// }
-	if (data.msgSubType === 2) {
-		return true
-	}
-	return data && data.msgType === 10000 && data.content && ['消息已发出，但被对方拒收了', '请先发送朋友验证请求，对方验证通过后，才能聊天'].some(v => data.content.indexOf(v) >= 0)
-}
-
-function isAutoReadMessage (data) {
-	return !!(data && data.id && data.id.indexOf('AUTO-READ-') === 0)
-}
-
 function getAtMessageContent (data) {
 	if (!data || data.isSend || !data.content) {
 		return null
@@ -419,7 +390,7 @@ class ClientChat {
 					return this.handleAutoReadMessageSession(sessionId)
 				}
 				// 如果消息包含这种情况，就不加入会话列表
-				if (shouldIgnoreSessionByMessage(data)) {
+				if (shouldIgnoreSessionByMessage(data) || isDeletedMsg(data) || isBlockedMsg(data)) {
 					return
 				}
 				const localSession = this.session.findSession(({ session }) => session.conversationId === sessionId)
@@ -554,7 +525,7 @@ class ClientChat {
 					return this.handleAutoReadMessageSession(sessionId)
 				}
 				// 如果消息包含这种情况，就不加入会话列表
-				if (shouldIgnoreSessionByMessage(data)) {
+				if (shouldIgnoreSessionByMessage(data) || isDeletedMsg(data) || isBlockedMsg(data)) {
 					return
 				}
 				// 更新会话未读消息数量

package/services/client-chat/client-chat-wechat/utils.js

@@ -20,6 +20,44 @@ export function createSessionId (accountId, targetId) {
 	return shajs('sha1').update(`${accountId}${targetId}`).digest('hex')
 }
 
+export function isDeletedMsg (data) {
+	return data && data.deletedMsg === true
+}
+
+export function isBlockedMsg (data) {
+	return data && data.blockedMsg === true
+}
+
+export function shouldIgnoreSessionByMessage (data) {
+	// 群发消息的不处理会话
+	// public enum MsgSubTypeEnum {
+	// 	/*0：普通的聊天*/
+	// 	COMMON,
+	// 	/*1：分配记录消息*/
+	// 	ALLOT_MSG,
+	// 	/*2：批量发送*/
+	// 	BATCH_SEND,
+	// 	/*3：通过好友恢复*/
+	// 	ACCEPT_REPLY,
+	// 	/*4：自动回复*/
+	// 	AUTO_REPLY,
+	// 	// 5：入群欢迎语
+	// 	CHATROOM_WELCOME,
+	// 	//6：指定时间段内自动回复消息
+	// 	AUTO_REPLY_INTIME,
+	// 	//7：群自动回复
+	// 	CHATROOM_REPLY
+	// }
+	if (data.msgSubType === 2) {
+		return true
+	}
+	return data && data.msgType === 10000 && data.content && ['消息已发出，但被对方拒收了', '请先发送朋友验证请求，对方验证通过后，才能聊天'].some(v => data.content.indexOf(v) >= 0)
+}
+
+export function isAutoReadMessage (data) {
+	return !!(data && data.id && data.id.indexOf('AUTO-READ-') === 0)
+}
+
 /**
  * 根据消息创建会话
  * 有两种情况，一种是从客户发过来的消息，另一种是客服发送的消息