@aochuang/client-sdk 1.0.343 → 1.0.345

package/package.json

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

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

@@ -203,7 +203,7 @@ export default class ClientChatAccount {
 	
 	refreshAccountUnreadMessageNum (params) {
 		const { wechatAccountId, ...nextParams } = params
-		this.getAccountUnreadMessageNumMethod(Object.assign({
+		return this.getAccountUnreadMessageNumMethod(Object.assign({
 			wechatAccountIds: [wechatAccountId]
 		}, nextParams)).then(rs => {
 			if (!rs || !rs.data || !rs.data.length) {

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

@@ -5,20 +5,39 @@ import { createPollRequest } from '../../../utils/util.js'
 
 const ALL_WECHAT_ACCOUNT_ID = 'all'
 
-const loopLoadAssignSessionData = (fetchFn, params) => {
+const ASSIGN_SESSION_LOG_PREFIX = '[client-chat][assign-session]'
+const ASSIGN_SESSION_MERGE_EXCLUDE_FIELDS = [
+	'conversationId',
+	'wechatAccountId',
+	'lastMsgTime',
+	'lastUpdateTime',
+	'stickyOnTop',
+	'mute',
+	'lastAtMsgContent'
+]
+
+const loopLoadAssignSessionData = (fetchFn, params, onPageLoaded) => {
 	let lastPs = null
 	let lastRs = null
 	let result = []
+	let page = 0
 	const loopFn = (params, total) => {
 	  const { taskId, size, ...nextParams } = params
+	  page += 1
 	  lastPs = fetchFn(Object.assign({}, nextParams, {
 		size,
 	    taskId,
 		total
 	  }))
 	  lastRs = lastPs.then(rs => {
-		result = result.concat(rs.data || [])
-	    if (rs.data.length < size) {
+		const pageData = rs.data || []
+		result = result.concat(pageData)
+		onPageLoaded && onPageLoaded({
+			page,
+			pageSize: pageData.length,
+			total: result.length
+		})
+	    if (pageData.length < size) {
 			return result
 	    } else {
 	      return loopFn(params, result.length)
@@ -188,7 +207,7 @@ export default class ClientChatSession {
 	 * @params { Object } data - 会话数据集合
 	 * @params { String } wechatAccountId - 如果传wechatAccountId那么后面addSession的时候如果传wechatAccountId那么才会更新lastUpdateTime或者lastMsgTime，本质的意思是只有通过reload和loadData才刷新lastUpdateTime或者lastMsgTime，避免这个时间乱套了
 	*/
-	setSessionData (data, wechatAccountId, reset = true) {
+	setSessionData (data, wechatAccountId, reset = true, context) {
 		if (reset) {
 			this.sessionMap = {}
 			this.data.sessionGroupData = {}
@@ -200,7 +219,7 @@ export default class ClientChatSession {
 				if (item.isDeleted) {
 					this.removeSession(item.conversationId)
 				} else {
-					this.addSession(item, wechatAccountId)
+					this.addSession(item, wechatAccountId, context)
 				}
 			})
 		}
@@ -388,7 +407,7 @@ export default class ClientChatSession {
 	 *		"wechatAccountId": "2a39a725814acf07502299ab2285fff8d44377f5"
 	 *	}
 	*/
-	addSession (data, wechatAccountId) {
+	addSession (data, wechatAccountId, context) {
 		if (!data || !data.conversationId) {
 			throw new Error('缺少必须参数conversationId')
 		}
@@ -404,11 +423,54 @@ export default class ClientChatSession {
 			return
 		}
 		let nextData = data
+		let assignMergeLog = null
 		// 如果会话已经存在，那么取已经存在的，以后有需要可以用data更新已经存在的会话，保持引用关系
 		if (this.sessionMap[data.conversationId]) {
 			nextData = this.sessionMap[data.conversationId]
+			const unreadBefore = nextData.unreadMsgCount || 0
+			const muteBefore = !!nextData.mute
+			const changedFields = []
+			Object.keys(data).forEach(key => {
+				if (ASSIGN_SESSION_MERGE_EXCLUDE_FIELDS.indexOf(key) >= 0 || nextData[key] === data[key]) {
+					return
+				}
+				changedFields.push(key)
+				Vue.set(nextData, key, data[key])
+			})
+			if (context && context.source === 'assign-task') {
+				assignMergeLog = {
+					taskId: context.taskId,
+					conversationId: data.conversationId,
+					wechatAccountId: data.wechatAccountId,
+					existed: true,
+					changedFields,
+					unreadBefore,
+					unreadFromServer: data.unreadMsgCount || 0,
+					unreadAfter: nextData.unreadMsgCount || 0,
+					muteBefore,
+					muteFromServer: !!data.mute,
+					muteAfter: !!nextData.mute,
+					preservedFields: ASSIGN_SESSION_MERGE_EXCLUDE_FIELDS.slice()
+				}
+			}
 		} else {
 			this.sessionMap[data.conversationId] = nextData
+			if (context && context.source === 'assign-task') {
+				assignMergeLog = {
+					taskId: context.taskId,
+					conversationId: data.conversationId,
+					wechatAccountId: data.wechatAccountId,
+					existed: false,
+					changedFields: [],
+					unreadBefore: null,
+					unreadFromServer: data.unreadMsgCount || 0,
+					unreadAfter: data.unreadMsgCount || 0,
+					muteBefore: null,
+					muteFromServer: !!data.mute,
+					muteAfter: !!data.mute,
+					preservedFields: []
+				}
+			}
 		}
 		const topField = nextData.stickyOnTop ? 0 : 1 // 置顶
 		if (wechatAccountId && wechatAccountId !== ALL_WECHAT_ACCOUNT_ID && nextData.wechatAccountId !== wechatAccountId) {
@@ -490,8 +552,11 @@ export default class ClientChatSession {
 			this.data.virtualSessionData.splice(virtualSessionIndex, 1)
 		}
 		this.onAddSession && this.onAddSession({
-			session: data
+			session: nextData
 		})
+		if (assignMergeLog) {
+			console.info(ASSIGN_SESSION_LOG_PREFIX, 'merge', assignMergeLog)
+		}
 	}
 	
 	removeSession (conversationId) {
@@ -625,7 +690,9 @@ export default class ClientChatSession {
 									return true
 								}
 							})
-							this.data.sessionGroupData[groupId][topField][oldSortFields.day][oldSortFields.milliseconds].splice(index, 1)
+							if (index >= 0) {
+								this.data.sessionGroupData[groupId][topField][oldSortFields.day][oldSortFields.milliseconds].splice(index, 1)
+							}
 						}
 					})
 				})
@@ -685,7 +752,9 @@ export default class ClientChatSession {
 									return true
 								}
 							})
-							this.data.sessionGroupData[groupId][topField][sortFields.day][sortFields.milliseconds].splice(index, 1)
+							if (index >= 0) {
+								this.data.sessionGroupData[groupId][topField][sortFields.day][sortFields.milliseconds].splice(index, 1)
+							}
 						}
 					})
 				})
@@ -830,14 +899,36 @@ export default class ClientChatSession {
 			total: 0 , // 已获取总数
 			size: 50 // 每次获取数量
 		}, params)
+		const taskId = params.taskId
+		console.info(ASSIGN_SESSION_LOG_PREFIX, 'load-start', {
+			taskId,
+			total: params.total,
+			size: params.size
+		})
 		this.data.loadAssignTaskSessioning = true
 		return loopLoadAssignSessionData((nextParams) => {
 			return this.loadAssignTaskSessionDataMethod(nextParams)
-		}, params).then(rs => {
+		}, params, pageInfo => {
+			console.info(ASSIGN_SESSION_LOG_PREFIX, 'page-loaded', Object.assign({ taskId }, pageInfo))
+		}).then(rs => {
 			if (rs && rs.length) {
-				this.setSessionData(rs, null, false)
+				this.setSessionData(rs, null, false, {
+					source: 'assign-task',
+					taskId
+				})
 			}
+			console.info(ASSIGN_SESSION_LOG_PREFIX, 'load-complete', {
+				taskId,
+				sessionCount: rs ? rs.length : 0,
+				wechatAccountIds: Array.from(new Set((rs || []).map(session => session.wechatAccountId)))
+			})
 			return rs
+		}).catch(error => {
+			console.error(ASSIGN_SESSION_LOG_PREFIX, 'load-error', {
+				taskId,
+				message: error && error.message ? error.message : String(error)
+			})
+			throw error
 		}).finally(() => {
 			this.data.loadAssignTaskSessioning = false
 		})

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

@@ -43,6 +43,136 @@ function appendLastAtMsgContent (lastAtMsgContent, atMessage) {
 	return messages.concat(atMessage)
 }
 
+const ASSIGN_SESSION_LOG_PREFIX = '[client-chat][assign-session]'
+
+function getAccountUnreadSnapshot (account, accountIds) {
+	const accountIdMap = accountIds && accountIds.reduce((result, accountId) => {
+		result[accountId] = true
+		return result
+	}, {})
+	return (account.accountUnreadMessageNumData || []).filter(item => {
+		return !accountIdMap || accountIdMap[item.id]
+	}).map(item => ({
+		wechatAccountId: item.id,
+		unread: item.num || 0,
+		muteUnread: item.muteNum || 0
+	}))
+}
+
+function getAssignAccountIds (sessions) {
+	return Object.keys((sessions || []).reduce((result, session) => {
+		if (session && session.wechatAccountId) {
+			result[session.wechatAccountId] = true
+		}
+		return result
+	}, {}))
+}
+
+function getSessionUnreadSnapshot (sessionInstance) {
+	return Object.keys(sessionInstance.sessionMap || {}).reduce((result, conversationId) => {
+		const session = sessionInstance.sessionMap[conversationId]
+		result[conversationId] = {
+			wechatAccountId: session.wechatAccountId,
+			unread: session.unreadMsgCount || 0,
+			mute: !!session.mute
+		}
+		return result
+	}, {})
+}
+
+function getAssignUnreadChanges (clientChat, sessions, sessionUnreadBefore, accountIdBeforeMap, taskId) {
+	const sessionMap = {}
+	const sessionData = sessions || []
+	sessionData.forEach(session => {
+		if (!session || !session.conversationId) {
+			return
+		}
+		if (sessionMap[session.conversationId]) {
+			console.warn(ASSIGN_SESSION_LOG_PREFIX, 'duplicate-session', {
+				taskId,
+				conversationId: session.conversationId,
+				wechatAccountId: session.wechatAccountId
+			})
+		}
+		sessionMap[session.conversationId] = session
+	})
+	const accountChangeMap = {}
+	Object.keys(sessionMap).forEach(conversationId => {
+		const serverSession = sessionMap[conversationId]
+		const localSession = clientChat.session.sessionMap[conversationId] || serverSession
+		const before = sessionUnreadBefore[conversationId]
+		const beforeUnread = before ? before.unread : 0
+		const beforeMute = before ? before.mute : false
+		const afterUnread = localSession.unreadMsgCount || 0
+		const afterMute = !!localSession.mute
+		const wechatAccountId = localSession.wechatAccountId
+		if (!accountChangeMap[wechatAccountId]) {
+			accountChangeMap[wechatAccountId] = {
+				wechatAccountId,
+				unreadDelta: 0,
+				muteDelta: 0,
+				isNewAccount: !accountIdBeforeMap[wechatAccountId],
+				sessionCount: 0
+			}
+		}
+		accountChangeMap[wechatAccountId].unreadDelta += afterUnread - beforeUnread
+		accountChangeMap[wechatAccountId].muteDelta += (afterMute ? afterUnread : 0) - (beforeMute ? beforeUnread : 0)
+		accountChangeMap[wechatAccountId].sessionCount += 1
+	})
+	return Object.keys(accountChangeMap).map(accountId => accountChangeMap[accountId])
+}
+
+function updateAssignAccountUnread (clientChat, changes, taskId, eventType) {
+	return Promise.all(changes.map(change => {
+		const accountUnreadBefore = getAccountUnreadSnapshot(clientChat.account, [change.wechatAccountId])[0] || {
+			wechatAccountId: change.wechatAccountId,
+			unread: 0,
+			muteUnread: 0
+		}
+		let promise
+		let strategy
+		if (change.isNewAccount) {
+			strategy = 'server-refresh'
+			promise = clientChat.account.refreshAccountUnreadMessageNum({
+				wechatAccountId: change.wechatAccountId
+			})
+		} else if (change.unreadDelta || change.muteDelta) {
+			strategy = 'delta'
+			promise = clientChat.account.updateAccountUnreadMessageNum(change.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => ({
+				num: Math.max(0, (unreadMesasgeNum || 0) + change.unreadDelta),
+				muteNum: Math.max(0, (unreadMessageMuteNum || 0) + change.muteDelta)
+			}))
+		} else {
+			strategy = 'no-change'
+			promise = Promise.resolve()
+		}
+		return promise.then(() => {
+			console.info(ASSIGN_SESSION_LOG_PREFIX, 'account-unread-updated', {
+				eventType,
+				taskId,
+				wechatAccountId: change.wechatAccountId,
+				sessionCount: change.sessionCount,
+				unreadDelta: change.unreadDelta,
+				muteDelta: change.muteDelta,
+				strategy,
+				before: accountUnreadBefore,
+				after: getAccountUnreadSnapshot(clientChat.account, [change.wechatAccountId])[0] || null
+			})
+		}).catch(error => {
+			console.error(ASSIGN_SESSION_LOG_PREFIX, 'account-unread-update-error', {
+				eventType,
+				taskId,
+				wechatAccountId: change.wechatAccountId,
+				unreadDelta: change.unreadDelta,
+				muteDelta: change.muteDelta,
+				strategy,
+				message: error && error.message ? error.message : String(error)
+			})
+			throw error
+		})
+	}))
+}
+
 class ClientChat {
 	data = Vue.observable({
 		connectStatus: CONNECT_STATUS.Normal
@@ -866,6 +996,16 @@ class ClientChat {
 			},
 			// 好友有变化，如分配的情况
 			onCmdFriendInfoChanged: ({ data }) => {
+				const assignAccountUnreadBefore = data.changeType === 4 ? getAccountUnreadSnapshot(this.account) : null
+				if (data.changeType === 4) {
+					console.info(ASSIGN_SESSION_LOG_PREFIX, 'socket-event', {
+						eventType: 'friend-info-changed',
+						taskId: data.taskId,
+						changeType: data.changeType,
+						itemCount: Array.isArray(data.friends) ? data.friends.length : 0,
+						accountUnreadBefore: assignAccountUnreadBefore
+					})
+				}
 				if (!this.socketFriendInfoChangedSerialQueue) {
 					this.socketFriendInfoChangedSerialQueue = createSerialQueue()
 				}
@@ -879,14 +1019,19 @@ class ClientChat {
 								accountIds: (this.account.accountData || []).map(v => v.id)
 							})
 						} else {
+							const sessionUnreadBefore = getSessionUnreadSnapshot(this.session)
+							const accountIdBeforeMap = Object.keys(this.account.accountMap || {}).reduce((result, accountId) => {
+								result[accountId] = true
+								return result
+							}, {})
 							// 增量拉取分配产生的会话
 							return this.session.loadAssignTaskSessionData({
 								taskId: data.taskId
 							}).then((rs) => {
-								const wechatAccountIds = Object.keys((rs || []).reduce((rs, v) => {
-									rs[v.wechatAccountId] = true
-									return rs
-								}, {}))
+								const wechatAccountIds = getAssignAccountIds(rs)
+								const accountUnreadBefore = assignAccountUnreadBefore.filter(item => wechatAccountIds.indexOf(item.wechatAccountId) >= 0)
+								const accountUnreadChanges = getAssignUnreadChanges(this, rs, sessionUnreadBefore, accountIdBeforeMap, data.taskId)
+								let accountUnreadUpdated = false
 								const changeFriendMap = {}
 								// 删除changeType为3移除的好友，例如转移的场景
 								if (data.friends && data.friends.length) {
@@ -919,25 +1064,27 @@ class ClientChat {
 										return this.contacts.getFriend(sessionFriendId, true)
 									})
 								}
-								// 刷新工作微信号未读消息数量
-								if (rs && rs.length) {
-									rs.forEach(session => {
-										this.account.updateAccountUnreadMessageNum(session.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
-											if (session.mute) {
-												return {
-													num: (unreadMesasgeNum || 0) + (session.unreadMsgCount || 0),
-													muteNum: (unreadMessageMuteNum || 0) + (session.unreadMsgCount || 0)
-												}
-											} else {
-												return {
-													num: (unreadMesasgeNum || 0) + (session.unreadMsgCount || 0),
-													muteNum: unreadMessageMuteNum
-												}
-											}
-										})
+								ps = ps.then(() => updateAssignAccountUnread(this, accountUnreadChanges, data.taskId, 'friend-info-changed')).then(() => {
+									accountUnreadUpdated = true
+								}).catch(error => {
+									console.error(ASSIGN_SESSION_LOG_PREFIX, 'socket-process-error', {
+										eventType: 'friend-info-changed',
+										taskId: data.taskId,
+										message: error && error.message ? error.message : String(error)
 									})
-								}
+									throw error
+								})
 								return ps.finally(() => {
+									console.info(ASSIGN_SESSION_LOG_PREFIX, 'socket-complete', {
+										eventType: 'friend-info-changed',
+										taskId: data.taskId,
+										sessionCount: rs ? rs.length : 0,
+										wechatAccountIds,
+										accountUnreadChanges,
+										accountUnreadBefore,
+										accountUnreadAfter: getAccountUnreadSnapshot(this.account, wechatAccountIds),
+										accountUnreadUpdated
+									})
 									// 这里应该标记那些工作微信号的通讯录修改了，后面要在界面打个提示，告诉用户通讯录变化了，让手动刷新一下
 									// 同时也将缓存都清理一下，例如工作微信号分组统计数量等
 									this.contacts.markModify() // 标记通讯录修改
@@ -976,16 +1123,31 @@ class ClientChat {
 			},
 			// 群聊有变化，如分配的情况
 			onCmdChatroomInfoChanged: ({ data }) => {
+				const assignAccountUnreadBefore = data.changeType === 4 ? getAccountUnreadSnapshot(this.account) : null
+				if (data.changeType === 4) {
+					console.info(ASSIGN_SESSION_LOG_PREFIX, 'socket-event', {
+						eventType: 'chatroom-info-changed',
+						taskId: data.taskId,
+						changeType: data.changeType,
+						itemCount: Array.isArray(data.chatrooms) ? data.chatrooms.length : 0,
+						accountUnreadBefore: assignAccountUnreadBefore
+					})
+				}
 				// 配分群聊
 				if (data.changeType === 4) {
+					const sessionUnreadBefore = getSessionUnreadSnapshot(this.session)
+					const accountIdBeforeMap = Object.keys(this.account.accountMap || {}).reduce((result, accountId) => {
+						result[accountId] = true
+						return result
+					}, {})
 					// 增量拉取分配产生的会话
 					return this.session.loadAssignTaskSessionData({
 						taskId: data.taskId
 					}).then((rs) => {
-						const wechatAccountIds = Object.keys((rs || []).reduce((rs, v) => {
-							rs[v.wechatAccountId] = true
-							return rs
-						}, {}))
+						const wechatAccountIds = getAssignAccountIds(rs)
+						const accountUnreadBefore = assignAccountUnreadBefore.filter(item => wechatAccountIds.indexOf(item.wechatAccountId) >= 0)
+						const accountUnreadChanges = getAssignUnreadChanges(this, rs, sessionUnreadBefore, accountIdBeforeMap, data.taskId)
+						let accountUnreadUpdated = false
 						// 删除changeType为3移除的群聊，例如转移的场景
 						if (data.chatrooms && data.chatrooms.length) {
 							data.chatrooms.forEach(room => {
@@ -1001,25 +1163,27 @@ class ClientChat {
 								ps = this.account.reloadData()
 							}
 						}
-						// 刷新工作微信号未读消息数量
-						if (rs && rs.length) {
-							rs.forEach(session => {
-								this.account.updateAccountUnreadMessageNum(session.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
-									if (session.mute) {
-										return {
-											num: (unreadMesasgeNum || 0) + (session.unreadMsgCount || 0),
-											muteNum: (unreadMessageMuteNum || 0) + (session.unreadMsgCount || 0)
-										}
-									} else {
-										return {
-											num: (unreadMesasgeNum || 0) + (session.unreadMsgCount || 0),
-											muteNum: unreadMessageMuteNum
-										}
-									}
-								})
+						ps = ps.then(() => updateAssignAccountUnread(this, accountUnreadChanges, data.taskId, 'chatroom-info-changed')).then(() => {
+							accountUnreadUpdated = true
+						}).catch(error => {
+							console.error(ASSIGN_SESSION_LOG_PREFIX, 'socket-process-error', {
+								eventType: 'chatroom-info-changed',
+								taskId: data.taskId,
+								message: error && error.message ? error.message : String(error)
 							})
-						}
+							throw error
+						})
 						return ps.finally(() => {
+							console.info(ASSIGN_SESSION_LOG_PREFIX, 'socket-complete', {
+								eventType: 'chatroom-info-changed',
+								taskId: data.taskId,
+								sessionCount: rs ? rs.length : 0,
+								wechatAccountIds,
+								accountUnreadChanges,
+								accountUnreadBefore,
+								accountUnreadAfter: getAccountUnreadSnapshot(this.account, wechatAccountIds),
+								accountUnreadUpdated
+							})
 							// 这里应该标记那些工作微信号的通讯录修改了，后面要在界面打个提示，告诉用户通讯录变化了，让手动刷新一下
 							// 同时也将缓存都清理一下，例如工作微信号分组统计数量等
 							this.contacts.markModify() // 标记通讯录修改