@aochuang/client-sdk 1.0.332 → 1.0.334

package/package.json

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

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

@@ -92,6 +92,7 @@ class ClientChat {
 			checkMessageSendResultMethod: null,
 			loadLossRoomMessageDataMethod: null,
 			loadLossFriendMessageDataMethod: null,
+			shouldMarkCurrentSessionReadMethod: null,
 			onOverwriteFriendInfoChange: null // 为了兼容1.0拉取会话逻辑加的，1.0暂时不支持根据taskId拉取
 		}, options)
 		if (!options.loadFriendMessageDataMethod) {
@@ -101,6 +102,7 @@ class ClientChat {
 			throw new Error('loadRoomMessageDataMethod不能为空')
 		} 
 		this.onOverwriteFriendInfoChange = options.onOverwriteFriendInfoChange
+		this.shouldMarkCurrentSessionReadMethod = options.shouldMarkCurrentSessionReadMethod
 		this.event = new Event({
 			checkOnMethod: (name) => {
 				if (name === 'ready') {
@@ -461,7 +463,7 @@ class ClientChat {
 							unreadMsgCount: session.unreadMsgCount
 						}
 						if (!data.isSend) {
-							if (this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId) {
+							if (this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId && this.shouldMarkCurrentSessionRead(sessionId, data)) {
 								// 标记已读
 								this.session.setSessionRead(sessionId)
 							} else {
@@ -603,7 +605,7 @@ class ClientChat {
 							unreadMsgCount: session.unreadMsgCount
 						}
 						if (!data.isSend) {
-							if (this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId) {
+							if (this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId && this.shouldMarkCurrentSessionRead(sessionId, data)) {
 								// 标记已读
 								this.session.setSessionRead(sessionId)
 							} else {
@@ -1183,6 +1185,21 @@ class ClientChat {
 		this.event.off('ready')
 	}
 
+	setShouldMarkCurrentSessionReadMethod (method) {
+		this.shouldMarkCurrentSessionReadMethod = method
+	}
+
+	shouldMarkCurrentSessionRead (sessionId, data) {
+		if (typeof this.shouldMarkCurrentSessionReadMethod === 'function') {
+			return this.shouldMarkCurrentSessionReadMethod({
+				sessionId,
+				data,
+				currentSession: this.sessionManage.currentSession
+			}) !== false
+		}
+		return true
+	}
+
 	handleAutoReadMessageSession (sessionId) {
 		if (!sessionId) {
 			return

package/services/client-chat/client-chat-wework/client-chat-socket.js

@@ -15,6 +15,7 @@ export default class ClietChatSocket {
 			// 执行回调事件前的方法
 			beforeFireCallback: null, 
 			onCmdQwNewMessage: null,
+			onCmdQwContactInfoChanged: null,
 			onCmdSendMessageResult: null,
 			onCmdFriendInfoChanged: null,
 			onCmdDownloadVideoResult: null,
@@ -27,6 +28,7 @@ export default class ClietChatSocket {
 		}
 		this.socket = options.socket
 		this.socket.event.on('onCmdQwNewMessage', options.onCmdQwNewMessage)
+		this.socket.event.on('onCmdQwContactInfoChanged', options.onCmdQwContactInfoChanged)
 		this.socket.event.on('onHeartbeatCheck', ({ mergeParams }) => {
 			options.onHeartbeatCheck && options.onHeartbeatCheck({
 				mergeParams
@@ -62,4 +64,4 @@ export default class ClietChatSocket {
 	setUrl (url) {
 		this.socket.setUrl(url)
 	}
-}
+}

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

@@ -258,6 +258,58 @@ class ClientChat {
 		})
 		this.socket = new ClientChatSocket({
 			socket: options.socket,
+			onCmdQwContactInfoChanged: ({ data }) => {
+				if (!data) {
+					return
+				}
+				const contacts = Array.isArray(data.contacts)
+					? data.contacts
+					: (data.contactId ? [data] : [])
+				const removedSessionIds = {}
+				const accountUnreadCountMap = {}
+				let contactsModified = false
+				contacts.forEach(contact => {
+					if (!contact || Number(contact.changeType) !== 3 || !contact.contactId) {
+						return
+					}
+					contactsModified = true
+					this.contacts.removeFriend(contact.contactId)
+					let session = this.session.findSession(({ session }) => {
+						return String(session.type) === '0' &&
+							session.targetId === contact.contactId &&
+							(!contact.qwAccountId || session.qwAccountId === contact.qwAccountId)
+					})
+					if (!session) {
+						const sessionId = createSessionId(
+							contact.corpId || data.corpId,
+							contact.qwAccountId,
+							contact.contactId
+						)
+						session = sessionId && this.session.getSessionByLocal(sessionId)
+					}
+					if (!session || removedSessionIds[session.id]) {
+						return
+					}
+					removedSessionIds[session.id] = true
+					if (this.session.currentSession && this.session.currentSession.id === session.id) {
+						this.session.setCurrentSession(null)
+					}
+					const accountId = session.qwAccountId || contact.qwAccountId
+					if (accountId) {
+						accountUnreadCountMap[accountId] = (accountUnreadCountMap[accountId] || 0) + (session.unreadMsgCount || 0)
+					}
+					this.session.removeSession(session.id)
+				})
+				if (contactsModified) {
+					this.contacts.markModify()
+				}
+				return Promise.all(Object.keys(accountUnreadCountMap).map(accountId => {
+					const removedUnreadCount = accountUnreadCountMap[accountId]
+					return this.account.updateAccountUnreadMessageNum(accountId, ({ unreadMesasgeNum }) => {
+						return Math.max(0, unreadMesasgeNum - removedUnreadCount)
+					})
+				}))
+			},
 			// 接受新消息
 			onCmdQwNewMessage: ({ data }) => {
 				// 插入消息
@@ -328,4 +380,4 @@ class ClientChat {
 	}
 }
 
-export default ClientChat
+export default ClientChat