@aochuang/client-sdk 1.0.378 → 1.0.379-wework

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

@@ -5,7 +5,6 @@ import ClientChatContacts from './client-chat-concats.js'
 import ClientChatAccount from './client-chat-account.js'
 import ClientChatSocket from './client-chat-socket.js'
 import { createSessionId } from './utils.js'
-import { createPollRequest } from '../../../utils/util.js'
 import Event from '../../../utils/event.js'
 
 const CONNECT_STATUS = {
@@ -22,8 +21,6 @@ class ClientChat {
 		return this.data.connectStatus === CONNECT_STATUS.Loading
 	}
 	
-	_sessionPollRequestMap = {}
-	
 	constructor (options) {
 
 		options = Object.assign({
@@ -32,6 +29,7 @@ class ClientChat {
 			getLoginUserIdMethod: null,
 			getLoginUserTokenMethod: null,
 			loadAccountDataMethod: null,
+			getLoginAccountIdMethod: null, // 因为1.0有帮聊逻辑，帮聊消息以及通讯录的accountId不是登录用户的accountId，会导致找到的会话出现问题，所以这里提供一个方法让外部传入
 			loadSessionDataMethod: null,
 			updateSessionReadMethod: null,
 			getSessionMethod: null,
@@ -39,6 +37,7 @@ class ClientChat {
 			getAccountUnreadMessageNumMethod: null,
 			updateAccountMessageReadMethod: null,
 			deleteAccountSessionMethod: null,
+			getAccountGreetingUnreadMsgCountMethod: null,
 			loadContactsRoomGroupDataMethod: null,
 			loadContactsFriendGroupDataMethod: null,
 			loadContactsFriendDataMethod: null,
@@ -50,6 +49,7 @@ class ClientChat {
 			getContactsRoomMethod: null, 
 			loadFriendMessageDataMethod: null, 
 			loadRoomMessageDataMethod: null,
+			checkMessageSendResultMethod: null,
 			onOverwriteFriendInfoChange: null // 为了兼容1.0拉取会话逻辑加的，1.0暂时不支持根据taskId拉取
 		}, options)
 		if (!options.loadFriendMessageDataMethod) {
@@ -57,8 +57,9 @@ class ClientChat {
 		} 
 		if (!options.loadRoomMessageDataMethod) {
 			throw new Error('loadRoomMessageDataMethod不能为空')
-		} 
+		}
 		this.onOverwriteFriendInfoChange = options.onOverwriteFriendInfoChange
+		this.getLoginAccountIdMethod = options.getLoginAccountIdMethod
 		this.event = new Event({
 			checkOnMethod: (name) => {
 				if (name === 'ready') {
@@ -75,6 +76,14 @@ class ClientChat {
 			getSessionMethod: options.getSessionMethod,
 			loadSessionDataMethod: options.loadSessionDataMethod, 
 			deleteSessionMethod: options.deleteSessionMethod,
+			onAddSession: ({ session, unreadDelta }) => {
+				if (!unreadDelta) {
+					return
+				}
+				this.account.updateAccountUnreadMessageNum(session.qwAccountId, ({ unreadMesasgeNum }) => {
+					return (unreadMesasgeNum || 0) + unreadDelta
+				})
+			},
 			onSessionReadChange: ({ session, oldUnreadMsgCount }) => {
 				this.account.updateAccountUnreadMessageNum(session.qwAccountId, ({ unreadMesasgeNum }) => {
 					return Math.max(0, unreadMesasgeNum - oldUnreadMsgCount)
@@ -85,54 +94,70 @@ class ClientChat {
 			groupField: 'contactId',
 			sortField: 'sendTime',
 			clientChat: this,
-			onAddMessageSuccess: ({ data }) => {
-				let sessionId = createSessionId(data.corpId, data.qwAccountId, data.contactId)
+			checkMessageSendResultMethod: options.checkMessageSendResultMethod,
+			onAddMessageSuccess: ({ data, isBeforeLastMessage }) => {
+				const accountId = options.getLoginAccountIdMethod ? options.getLoginAccountIdMethod() : data.qwAccountId
+				let sessionId = createSessionId(accountId, data.contactId)
 				// 更新会话
 				if (!sessionId) {
 					return
 				}
+				if (isBeforeLastMessage) {
+					return
+				}
 				const localSession = this.session.getSessionByLocal(sessionId)
 				if (!localSession) {
-					if (this._sessionPollRequestMap[sessionId]) {
-						this._sessionPollRequestMap[sessionId].stop()
-					}
-					this._sessionPollRequestMap[sessionId] = createPollRequest(({ done, fail }) => {
-						return this.session.getSession(sessionId).then(done)
-					})
-					this._sessionPollRequestMap[sessionId].start().then((rs) => {
-						// 更新账号未读消息数量
-						this.account.updateAccountUnreadMessageNum(rs.data.qwAccountId, ({ unreadMesasgeNum }) => {
-							return unreadMesasgeNum += (rs.data.unreadMsgCount || 0)
-						})
-					}).finally(() => {
-						delete this._sessionPollRequestMap[sessionId]
-					})
+					return this.session.getSession(sessionId, (rs, context) => {
+						if (rs && rs.data) {
+							const isAfterServerMessage = data.sendTime > context.baseLastMsgTime
+							const isNewerMessage = data.sendTime > (rs.data.lastMsgTime || 0)
+							if (isNewerMessage) {
+								rs.data.lastMsgContent = data.content
+								rs.data.lastMsgType = data.msgType
+								rs.data.lastMsgTime = data.sendTime
+								rs.data.lastMsgId = data.id
+								rs.data.lastUpdateTime = data.updateDate
+							}
+							const isCurrentSession = this.session.currentSession && this.session.currentSession.id === sessionId
+							// 服务端返回的会话还没有包含当前消息时，本地补充会话未读数
+							if (!data.isSend && isAfterServerMessage) {
+								rs.data.unreadMsgCount = isCurrentSession ? 0 : (rs.data.unreadMsgCount || 0) + 1
+							}
+							// 账号未读只累计本次轮询期间新增的消息，避免重复累计服务端已有的未读数
+							if (!data.isSend && !(isAfterServerMessage && isCurrentSession)) {
+								context.accountUnreadDelta += 1
+							}
+						}
+						return rs
+					}).catch(() => {})
 				} else {
 					this.session.updateSession(sessionId, ({ session }) => {
-						let unreadMsgCount = session.unreadMsgCount
-						if (!data.isSend) {
-							unreadMsgCount = unreadMsgCount + 1
-						}
-						// 如果是当前会话，那么未读消息需要设置为0
-						if (this.session.currentSession && this.session.currentSession.id === sessionId) {
-							unreadMsgCount = 0
-							// 标记已读，并且设置未读数量为0
-							this.session.setSessionRead(sessionId)
-						} else {
-							// 更新账号未读消息数量
-							this.account.updateAccountUnreadMessageNum(session.qwAccountId, ({ unreadMesasgeNum }) => {
-								return unreadMesasgeNum += 1
-							})
+						const isNewerMessage = data.sendTime > (session.lastMsgTime || 0)
+						if (!isNewerMessage) {
+							return {}
 						}
-						const nextSessin = {
+						const nextSession = {
 							lastMsgContent: data.content,
 							lastMsgType: data.msgType,
 							lastMsgTime: data.sendTime,
 							lastMsgId: data.id,
 							lastUpdateTime: data.updateDate,
-							unreadMsgCount
+							unreadMsgCount: session.unreadMsgCount || 0
+						}
+						if (!data.isSend) {
+							if (this.session.currentSession && this.session.currentSession.id === sessionId) {
+								// 标记已读
+								nextSession.unreadMsgCount = 0
+								this.session.setSessionRead(sessionId)
+							} else {
+								nextSession.unreadMsgCount += 1
+								// 更新账号未读消息数量
+								this.account.updateAccountUnreadMessageNum(session.qwAccountId, ({ unreadMesasgeNum }) => {
+									return (unreadMesasgeNum || 0) + 1
+								})
+							}
 						}
-						return nextSessin
+						return nextSession
 					})
 				}
 			},
@@ -144,7 +169,7 @@ class ClientChat {
 			groupField: 'contactId',
 			sortField: 'sendTime',
 			clientChat: this,
-			// checkMessageSendResultMethod: options.checkMessageSendResultMethod,
+			checkMessageSendResultMethod: options.checkMessageSendResultMethod,
 			// loadLossMessageDataMethod: options.loadLossFriendMessageDataMethod,
 			queryMethod: (params) => {
 				return options.loadFriendMessageDataMethod(params)
@@ -154,55 +179,71 @@ class ClientChat {
 			groupField: 'roomId',
 			sortField: 'sendTime',
 			clientChat: this,
-			onAddMessageSuccess: ({ data }) => {
-				let sessionId = createSessionId(data.corpId, data.qwAccountId, data.roomId)
+			checkMessageSendResultMethod: options.checkMessageSendResultMethod,
+			onAddMessageSuccess: ({ data, isBeforeLastMessage }) => {
+				const accountId = options.getLoginAccountIdMethod ? options.getLoginAccountIdMethod() : data.qwAccountId
+				let sessionId = createSessionId(accountId, data.roomId)
 				// 更新会话
 				if (!sessionId) {
 					return
 				}
+				if (isBeforeLastMessage) {
+					return
+				}
 				// 更新会话未读消息数量
 				const localSession = this.session.getSessionByLocal(sessionId)
 				if (!localSession) {
-					if (this._sessionPollRequestMap[sessionId]) {
-						this._sessionPollRequestMap[sessionId].stop()
-					}
-					this._sessionPollRequestMap[sessionId] = createPollRequest(({ done, fail }) => {
-						return this.session.getSession(sessionId).then(done)
-					})
-					this._sessionPollRequestMap[sessionId].start().then((rs) => {
-						// 更新账号未读消息数量
-						this.account.updateAccountUnreadMessageNum(rs.data.qwAccountId, ({ unreadMesasgeNum }) => {
-							return unreadMesasgeNum += (rs.data.unreadMsgCount || 0)
-						})
-					}).finally(() => {
-						delete this._sessionPollRequestMap[sessionId]
-					})
+					return this.session.getSession(sessionId, (rs, context) => {
+						if (rs && rs.data) {
+							const isAfterServerMessage = data.sendTime > context.baseLastMsgTime
+							const isNewerMessage = data.sendTime > (rs.data.lastMsgTime || 0)
+							if (isNewerMessage) {
+								rs.data.lastMsgContent = data.content
+								rs.data.lastMsgType = data.msgType
+								rs.data.lastMsgTime = data.sendTime
+								rs.data.lastMsgId = data.id
+								rs.data.lastUpdateTime = data.updateDate
+							}
+							const isCurrentSession = this.session.currentSession && this.session.currentSession.id === sessionId
+							// 服务端返回的会话还没有包含当前消息时，本地补充会话未读数
+							if (!data.isSend && isAfterServerMessage) {
+								rs.data.unreadMsgCount = isCurrentSession ? 0 : (rs.data.unreadMsgCount || 0) + 1
+							}
+							// 账号未读只累计本次轮询期间新增的消息，避免重复累计服务端已有的未读数
+							if (!data.isSend && !(isAfterServerMessage && isCurrentSession)) {
+								context.accountUnreadDelta += 1
+							}
+						}
+						return rs
+					}).catch(() => {})
 				} else {
 					this.session.updateSession(sessionId, ({ session }) => {
-						let unreadMsgCount = session.unreadMsgCount
-						if (!data.isSend) {
-							unreadMsgCount = unreadMsgCount + 1
-						}
-						// 如果是当前会话，那么未读消息需要设置为0
-						if (this.session.currentSession && this.session.currentSession.id === sessionId) {
-							unreadMsgCount = 0
-							// 标记已读，并且设置未读数量为0
-							this.session.setSessionRead(sessionId)
-						} else {
-							// 更新账号未读消息数量
-							this.account.updateAccountUnreadMessageNum(session.qwAccountId, ({ unreadMesasgeNum }) => {
-								return unreadMesasgeNum += 1
-							})
+						const isNewerMessage = data.sendTime > (session.lastMsgTime || 0)
+						if (!isNewerMessage) {
+							return {}
 						}
-						const nextSessin = {
+						const nextSession = {
 							lastMsgContent: data.content,
 							lastMsgType: data.msgType,
 							lastMsgTime: data.sendTime,
 							lastMsgId: data.id,
 							lastUpdateTime: data.updateDate,
-							unreadMsgCount
+							unreadMsgCount: session.unreadMsgCount || 0
+						}
+						if (!data.isSend) {
+							if (this.session.currentSession && this.session.currentSession.id === sessionId) {
+								// 标记已读
+								nextSession.unreadMsgCount = 0
+								this.session.setSessionRead(sessionId)
+							} else {
+								nextSession.unreadMsgCount += 1
+								// 更新账号未读消息数量
+								this.account.updateAccountUnreadMessageNum(session.qwAccountId, ({ unreadMesasgeNum }) => {
+									return (unreadMesasgeNum || 0) + 1
+								})
+							}
 						}
-						return nextSessin
+						return nextSession
 					})
 				}
 			},
@@ -214,7 +255,7 @@ class ClientChat {
 			groupField: 'roomId',
 			sortField: 'sendTime',
 			clientChat: this,
-			// checkMessageSendResultMethod: options.checkMessageSendResultMethod,
+			checkMessageSendResultMethod: options.checkMessageSendResultMethod,
 			// loadLossMessageDataMethod: options.loadLossRoomMessageDataMethod,
 			queryMethod: (params) => {
 				return options.loadRoomMessageDataMethod(params)
@@ -237,12 +278,18 @@ class ClientChat {
 			loadAccountDataMethod: options.loadAccountDataMethod,
 			getAccountUnreadMessageNumMethod: options.getAccountUnreadMessageNumMethod,
 			updateAccountMessageReadMethod: options.updateAccountMessageReadMethod,
+			getAccountGreetingUnreadMsgCountMethod: options.getAccountGreetingUnreadMsgCountMethod,
 			onAccountAdded: ({ account }) => {
 				return this.account.refreshAccountUnreadMessageNum({
 					qwAccountId: account.id,
 					corpId: account.corpId
 				})
 			},
+			onAccountLoaded: () => {
+				if (options.getAccountGreetingUnreadMsgCountMethod) {
+					this.account.refreshAllAccountGreetingUnreadMsgCount().catch(() => {})
+				}
+			},
 			onCurrentAccountChange: ({ currentAccount }) => {
 				this.contacts.refreshAllFriendGroupCount({
 					qwAccountId: currentAccount ? currentAccount.id : null
@@ -258,6 +305,96 @@ class ClientChat {
 		})
 		this.socket = new ClientChatSocket({
 			socket: options.socket,
+			onCmdQwContactRequestChanged: ({ data } = {}) => {
+				// {
+				// 	"cmdType": CmdQwContactRequestChanged
+				// 	"seq": 123,
+				// 	"cmdType": "CmdQwContactRequestChanged",
+				// 	"changeType": 1,
+				// 	"record": { ...QwContactRequestRecordDto... 
+				// }
+				// changeType：1 = 新增、2 = 状态变化（值来自 ChangeTypeEnum，序列化为数字）
+				// 触发时机：新同步到一条好友请求 → changeType=1；之后每次状态流转（1/2/3/4）→ changeType=2
+				// 推送目标：该记录 accountId 对应的客服端。若该请求未分配客服（设备无保管者）则不推送，前端不能依赖推送判断「没有新的好友请求」
+				// 新增和状态流转都会影响待处理数量，刷新对应账号的好友请求数
+				this.refreshGreetingUnreadMsgCountByPush(data)
+				this.event.emit('contactRequestChanged', { data })
+			},
+			onCmdQwAcceptContactRequest: ({ data } = {}) => {
+				// CmdQwAcceptContactRequest 请求字段不变（qwAccountId、remoteId），错误提示文案不变。但点击通过后状态立即变为 1（请求中），需等设备回执：超时→2、失败→3、成功→4。原来把「通过成功」判断为 2 的逻辑必须改成 4
+				this.refreshGreetingUnreadMsgCountByPush(data)
+			},
+			onCmdQwContactInfoChanged: ({ data }) => {
+				const contacts = data && (Array.isArray(data.contacts)
+					? data.contacts
+					: (data.contactId ? [data] : []))
+				if (!contacts || !contacts.length) {
+					this.markAccountsModified(data && data.qwAccountIds)
+					return
+				}
+				const tasks = []
+				const removedTasks = []
+				contacts.forEach(contact => {
+					if (!contact) {
+						return
+					}
+					const changeType = Number(contact.changeType)
+					if (changeType === 1) {
+						tasks.push(this.handleQwContactAdded(contact, data))
+					} else if (changeType === 2) {
+						tasks.push(this.handleQwContactUpdated(contact))
+					} else if (changeType === 3) {
+						removedTasks.push(this.handleQwContactRemoved(contact, data))
+					}
+				})
+				return Promise.all(tasks.concat(removedTasks)).then(results => {
+					const accountUnreadCountMap = {}
+					removedTasks.forEach((task, index) => {
+						const result = results[tasks.length + index]
+						if (!result || !result.accountId || !result.unreadCount) {
+							return
+						}
+						accountUnreadCountMap[result.accountId] = (accountUnreadCountMap[result.accountId] || 0) + result.unreadCount
+					})
+					return Promise.all(Object.keys(accountUnreadCountMap).map(accountId => {
+						const removedUnreadCount = accountUnreadCountMap[accountId]
+						return this.account.updateAccountUnreadMessageNum(accountId, ({ unreadMesasgeNum }) => {
+							return Math.max(0, unreadMesasgeNum - removedUnreadCount)
+						}).catch(error => {
+							console.warn('[client-chat] update account unread count failed', error)
+						})
+					}))
+				})
+			},
+			onCmdQwRoomInfoChanged: ({ data }) => {
+				const rooms = data && (Array.isArray(data.rooms)
+					? data.rooms
+					: (data.roomId ? [data] : []))
+				if (!rooms || !rooms.length) {
+					this.markAccountsModified(data && data.qwAccountIds)
+					return
+				}
+				const tasks = []
+				const removedTasks = []
+				rooms.forEach(room => {
+					if (!room) {
+						return
+					}
+					const changeType = Number(room.changeType)
+					if (changeType === 1) {
+						tasks.push(this.handleQwRoomAdded(room, data))
+					} else if (changeType === 2) {
+						tasks.push(this.handleQwRoomUpdated(room))
+					} else if (changeType === 3) {
+						removedTasks.push(this.handleQwRoomRemoved(room, data))
+					}
+				})
+				return Promise.all(tasks.concat(removedTasks)).then(results => {
+					return this.updateRemovedSessionUnreadCounts(
+						results.slice(tasks.length)
+					)
+				})
+			},
 			// 接受新消息
 			onCmdQwNewMessage: ({ data }) => {
 				// 插入消息
@@ -279,19 +416,207 @@ class ClientChat {
 				})
 			},
 			onHeartbeatSuccess: ({ data }) => {
-				if (!data.wq) {
-					return
-				}
-				const onlineMap = data.wq || {}
+				const onlineMap = data || {}
 				Object.keys(onlineMap).forEach(k => {
 					this.account.updateAccount(k, {
 						alive: onlineMap[k]
-					})
+					}) 
 				})
 			}
 		})
 	}
+
+	getQwAccountCorpId (qwAccountId, corpId) {
+		if (corpId || !qwAccountId || !this.account) {
+			return corpId
+		}
+		const account = this.account.getAccountData().find(item => item.id === qwAccountId)
+		return account && account.corpId
+	}
+
+	markAccountsModified (qwAccountIds) {
+		if (!Array.isArray(qwAccountIds) || !qwAccountIds.length) {
+			return
+		}
+		this.session.markModify(qwAccountIds)
+		this.contacts.markModify(qwAccountIds)
+	}
+
+	/**
+	 * 根据好友请求相关推送刷新待处理好友请求数量
+	 * 推送里能拿到账号id就只刷该账号，否则刷全部
+	*/
+	refreshGreetingUnreadMsgCountByPush (data) {
+		if (!this.account || !this.account.getAccountGreetingUnreadMsgCountMethod) {
+			return
+		}
+		const record = (data && data.record) || data || {}
+		const qwAccountId = record.qwAccountId || record.accountId || (data && data.qwAccountId)
+		const params = qwAccountId && this.account.accountMap[qwAccountId] ? { qwAccountIds: [qwAccountId] } : undefined
+		this.account.getAccountGreetingUnreadMsgCount(params).catch(() => {})
+	}
+
+	updateRemovedSessionUnreadCounts (results) {
+		const accountUnreadCountMap = {}
+		;(results || []).forEach(result => {
+			if (!result || !result.accountId || !result.unreadCount) {
+				return
+			}
+			accountUnreadCountMap[result.accountId] = (accountUnreadCountMap[result.accountId] || 0) + result.unreadCount
+		})
+		return Promise.all(Object.keys(accountUnreadCountMap).map(accountId => {
+			const removedUnreadCount = accountUnreadCountMap[accountId]
+			return this.account.updateAccountUnreadMessageNum(accountId, ({ unreadMesasgeNum }) => {
+				return Math.max(0, unreadMesasgeNum - removedUnreadCount)
+			}).catch(error => {
+				console.warn('[client-chat] update account unread count failed', error)
+			})
+		}))
+	}
+
+	handleQwContactAdded (contact, eventData) {
+		const qwAccountId = contact.qwAccountId || (eventData && eventData.qwAccountId)
+		const corpId = this.getQwAccountCorpId(
+			qwAccountId,
+			contact.corpId || (eventData && eventData.corpId)
+		)
+		const contactId = contact.contactId
+		const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : qwAccountId
+		const sessionId = createSessionId(accountId, contactId)
+		if (!sessionId) {
+			return Promise.resolve()
+		}
+		const localSession = this.session.getSessionByLocal(sessionId)
+		const oldUnread = localSession ? (localSession.unreadMsgCount || 0) : 0
+		return this.session.refreshSession(sessionId).then(rs => {
+			const serverSession = rs && rs.data
+			const newUnread = serverSession ? (serverSession.unreadMsgCount || 0) : 0
+			const accountId = (serverSession && serverSession.qwAccountId) || qwAccountId
+			const unreadDiff = newUnread - oldUnread
+			if (accountId && unreadDiff) {
+				return this.account.updateAccountUnreadMessageNum(accountId, ({ unreadMesasgeNum }) => {
+					return Math.max(0, unreadMesasgeNum + unreadDiff)
+				})
+			}
+		}).catch(error => {
+			console.warn('[client-chat] refresh added contact session failed', error)
+		})
+	}
+
+	handleQwContactUpdated (contact) {
+		if (!contact.contactId) {
+			return Promise.resolve()
+		}
+		return this.contacts.refreshFriend(contact.contactId).catch(error => {
+			console.warn('[client-chat] refresh contact failed', error)
+		})
+	}
+
+	handleQwContactRemoved (contact, eventData) {
+		if (!contact.contactId) {
+			return Promise.resolve()
+		}
+		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 qwAccountId = contact.qwAccountId || (eventData && eventData.qwAccountId)
+			const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : qwAccountId
+			const sessionId = createSessionId(
+				accountId,
+				contact.contactId
+			)
+			session = sessionId && this.session.getSessionByLocal(sessionId)
+		}
+		if (!session) {
+			return Promise.resolve()
+		}
+		if (this.session.currentSession && this.session.currentSession.id === session.id) {
+			this.session.setCurrentSession(null)
+		}
+		const accountId = session.qwAccountId || contact.qwAccountId
+		const unreadCount = session.unreadMsgCount || 0
+		this.session.removeSession(session.id)
+		return Promise.resolve({
+			accountId,
+			unreadCount
+		})
+	}
 	
+	handleQwRoomAdded (room, eventData) {
+		if (!room.roomId) {
+			return Promise.resolve()
+		}
+		const qwAccountId = room.qwAccountId || (eventData && eventData.qwAccountId)
+		const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : qwAccountId
+		const sessionId = createSessionId(accountId, room.roomId)
+		const localSession = sessionId && this.session.getSessionByLocal(sessionId)
+		const oldUnread = localSession ? (localSession.unreadMsgCount || 0) : 0
+		const tasks = [this.contacts.refreshRoom(room.roomId).catch(error => {
+			console.warn('[client-chat] refresh added room failed', error)
+		})]
+		if (sessionId) {
+			tasks.push(this.session.refreshSession(sessionId).then(rs => {
+				const serverSession = rs && rs.data
+				const unreadDiff = (serverSession ? (serverSession.unreadMsgCount || 0) : 0) - oldUnread
+				const changedAccountId = (serverSession && serverSession.qwAccountId) || qwAccountId
+				if (changedAccountId && unreadDiff) {
+					return this.account.updateAccountUnreadMessageNum(changedAccountId, ({ unreadMesasgeNum }) => {
+						return Math.max(0, unreadMesasgeNum + unreadDiff)
+					})
+				}
+			}).catch(error => {
+				console.warn('[client-chat] refresh added room session failed', error)
+			}))
+		}
+		return Promise.all(tasks)
+	}
+
+	handleQwRoomUpdated (room) {
+		if (!room.roomId) {
+			return Promise.resolve()
+		}
+		return this.contacts.refreshRoom(room.roomId).catch(error => {
+			console.warn('[client-chat] refresh room failed', error)
+		})
+	}
+
+	handleQwRoomRemoved (room, eventData) {
+		if (!room.roomId) {
+			return Promise.resolve()
+		}
+		this.contacts.removeRoom(room.roomId)
+		this.event.emit('roomRemoved', {
+			roomId: room.roomId
+		})
+		const qwAccountId = room.qwAccountId || (eventData && eventData.qwAccountId)
+		let session = this.session.findSession(({ session }) => {
+			return String(session.type) === '1' &&
+				session.targetId === room.roomId &&
+				(!qwAccountId || session.qwAccountId === qwAccountId)
+		})
+		if (!session) {
+			const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : qwAccountId
+			const sessionId = createSessionId(accountId, room.roomId)
+			session = sessionId && this.session.getSessionByLocal(sessionId)
+		}
+		if (!session) {
+			return Promise.resolve()
+		}
+		if (this.session.currentSession && this.session.currentSession.id === session.id) {
+			this.session.setCurrentSession(null)
+		}
+		const unreadCount = session.unreadMsgCount || 0
+		this.session.removeSession(session.id)
+		return Promise.resolve({
+			accountId: session.qwAccountId || qwAccountId,
+			unreadCount
+		})
+	}
+
 	connect () {
 		if (this.data.connectStatus === CONNECT_STATUS.Complete) {
 			return Promise.resolve()
@@ -311,12 +636,7 @@ class ClientChat {
 	
 	disconnect () {
 		this.data.connectStatus = CONNECT_STATUS.Normal
-		if (this._sessionPollRequestMap) {
-			Object.keys(this._sessionPollRequestMap).forEach(key => {
-				this._sessionPollRequestMap[key].stop()
-			})
-			this._sessionPollRequestMap = {}
-		}
+		this.session.stopGetSessionPollRequests()
 		this.contacts.reset()
 		this.account.reset()
 		this.friendMessage.reset()
@@ -328,4 +648,4 @@ class ClientChat {
 	}
 }
 
-export default ClientChat
+export default ClientChat

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

@@ -13,11 +13,11 @@ export function isUni () {
  * @param accountId - 客服id
  * @param targetId - wechatFriendId | wechatChatroomId
 */
-export function createSessionId (corpId, accountId, targetId) {
-	if (!corpId || !accountId || !targetId) {
+export function createSessionId (accountId, targetId) {
+	if (!accountId || !targetId) {
 		return
 	}
-	return shajs('sha1').update(`${corpId}${accountId}${targetId}`).digest('hex')
+	return shajs('sha1').update(`${accountId}${targetId}`).digest('hex')
 }
 
 /**
@@ -54,7 +54,7 @@ export function createSessionId (corpId, accountId, targetId) {
  *	     "msgSvrId": "4319123759514541049",
  *	     "msgType": 1,
  *	     "origin": "0",
- *	     "sendStatus": 0,
+ *	     "status": 0,
  *	     "tenantId": "1761952223049924608",
  *	     "wechatAccountId": "ad9d9ae2a8be4f27311312cdd4af3549dc8427ef",
  *	     "wechatFriendId": "2089efcc7f8f40b00b7f05fa4c6dfd3bb642774d",
@@ -79,4 +79,4 @@ export function createSessionData (message) {
 		wechatAccountId: message.wechatAccountId
 	}
 	return nextSession
-}
+}