@aochuang/client-sdk 1.0.363 → 1.0.365

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

@@ -131,6 +131,7 @@ export default class ClientChatSession {
 			stickyTopSessionMethod: null,
 			muteNotificationSessionMethod: null,
 			getSessionMethod: null,
+			onGetSessionLog: null,
 			updateSessionReadMethod: null,
 			starSessionMethod: null,
 			unstarSessionMethod: null,
@@ -166,6 +167,7 @@ export default class ClientChatSession {
 		this.loadSessionData = options.loadSessionDataMethod
 		this.updateSessionRead = options.updateSessionReadMethod
 		this.getSessionMethod = options.getSessionMethod
+		this.onGetSessionLog = options.onGetSessionLog
 		this.loadAssignTaskSessionDataMethod = options.loadAssignTaskSessionDataMethod
 		this.stickyTopSessionMethod = options.stickyTopSessionMethod
 		this.muteNotificationSessionMethod = options.muteNotificationSessionMethod
@@ -228,51 +230,144 @@ export default class ClientChatSession {
 		})
 	}
 
-	getSession (sessionId, serializeMethod, callback = null, isCache = true) {
-		if (typeof callback === 'boolean') {
-			isCache = callback
-			callback = null
+	_addGetSessionLog (title, data) {
+		if (this.onGetSessionLog) {
+			this.onGetSessionLog({
+				group: 'client-chat-session:getSession',
+				content: {
+					title,
+					data
+				}
+			})
+		}
+	}
+
+	_addGetSessionSerializeTask (pollRequest, serializeMethod, taskOptions = {}) {
+		if (!serializeMethod) {
+			return false
+		}
+		const messageId = taskOptions.messageId
+		if (messageId && pollRequest.serializeTaskMap[messageId]) {
+			return false
+		}
+		const task = {
+			messageId,
+			wechatTime: taskOptions.wechatTime || 0,
+			index: pollRequest.serializeTasks.length,
+			serializeMethod
+		}
+		pollRequest.serializeTasks.push(task)
+		if (messageId) {
+			pollRequest.serializeTaskMap[messageId] = task
 		}
+		return true
+	}
+
+	getSession (sessionId, serializeMethod, taskOptions = {}) {
 		if (this.sessionMap[sessionId]) {  
 			return Promise.resolve({
 				data: this.sessionMap[sessionId]
 			})
 		}
 		// 这里需要轮询从后端获取会话，后端会话更新和创建是异步的，所以要多轮训请求几次
-		if (this.pollRequestMap[sessionId]) {
-			// 因为有的地方要复用缓存，有的地方不能缓存，比如onAddMessagSuccess的时候不能缓存
-			if (isCache) {
-				return this.pollRequestMap[sessionId].ps
-			} else {
-				this.pollRequestMap[sessionId].stop()
-			}
+		let pollRequest = this.pollRequestMap[sessionId]
+		if (pollRequest && pollRequest.ps) {
+			const taskAdded = this._addGetSessionSerializeTask(pollRequest, serializeMethod, taskOptions)
+			this._addGetSessionLog('复用会话轮询', {
+				sessionId,
+				messageId: taskOptions.messageId,
+				wechatTime: taskOptions.wechatTime,
+				taskAdded,
+				taskCount: pollRequest.serializeTasks.length
+			})
+			return pollRequest.ps
 		}
-		const pollRequest = createPollRequest(({ done, fail }) => {
+
+		pollRequest = createPollRequest(({ done }) => {
+			pollRequest.requestCount += 1
 			return this.getSessionMethod({
 				id: sessionId
 			}).then((rs) => {
 				if (rs.data) {
 					done(rs)
+				} else {
+					this._addGetSessionLog('会话轮询返回空', {
+						sessionId,
+						requestCount: pollRequest.requestCount
+					})
 				}
+			}, (error) => {
+				this._addGetSessionLog('会话轮询请求异常', {
+					sessionId,
+					requestCount: pollRequest.requestCount,
+					error: error && (error.message || error.errMsg || error.toString && error.toString()) || error
+				})
+				return Promise.reject(error)
 			})
 		})
+		pollRequest.serializeTasks = []
+		pollRequest.serializeTaskMap = {}
+		pollRequest.requestCount = 0
+		pollRequest.startedAt = Date.now()
+		this._addGetSessionSerializeTask(pollRequest, serializeMethod, taskOptions)
 		this.pollRequestMap[sessionId] = pollRequest
-		this.pollRequestMap[sessionId].ps = pollRequest.start().then(rs => {
-			if (serializeMethod) {
-				rs = serializeMethod(rs)
-			}
-			if (rs.data) {
-				this.addSession(rs.data, null, callback)
-				return rs
-			} else {
+		this._addGetSessionLog('创建会话轮询', {
+			sessionId,
+			messageId: taskOptions.messageId,
+			wechatTime: taskOptions.wechatTime,
+			taskCount: pollRequest.serializeTasks.length
+		})
+		pollRequest.ps = pollRequest.start().then(rs => {
+			if (!rs.data) {
 				return Promise.reject('未找到会话' + sessionId)
 			}
+			const context = {
+				baseLastMsgTime: rs.data.lastMsgTime || 0,
+				processedMessageIds: [],
+				skippedMessageIds: [],
+				unreadMessageIds: []
+			}
+			const serializeTasks = pollRequest.serializeTasks.slice().sort((a, b) => {
+				return a.wechatTime - b.wechatTime || a.index - b.index
+			})
+			serializeTasks.forEach(task => {
+				rs = task.serializeMethod(rs, context) || rs
+				if (task.messageId) {
+					context.processedMessageIds.push(task.messageId)
+				}
+			})
+			this.addSession(rs.data, null)
+			const wechatAccountId = rs.data.wechatAccountId
+			this._addGetSessionLog('会话轮询合并完成', {
+				sessionId,
+				requestCount: pollRequest.requestCount,
+				duration: Date.now() - pollRequest.startedAt,
+				baseLastMsgTime: context.baseLastMsgTime,
+				lastMsgTime: rs.data.lastMsgTime,
+				lastMsgId: rs.data.lastMsgId,
+				unreadMsgCount: rs.data.unreadMsgCount,
+				processedMessageIds: context.processedMessageIds,
+				skippedMessageIds: context.skippedMessageIds,
+				unreadMessageIds: context.unreadMessageIds,
+				hasSessionMap: !!this.sessionMap[sessionId],
+				hasAllSessionGroup: !!this._getSessionBySessionGroup(sessionId, ALL_WECHAT_ACCOUNT_ID),
+				hasAccountSessionGroup: !!this._getSessionBySessionGroup(sessionId, wechatAccountId)
+			})
+			return rs
+		}).catch((error) => {
+			this._addGetSessionLog('会话轮询失败', {
+				sessionId,
+				requestCount: pollRequest.requestCount,
+				duration: Date.now() - pollRequest.startedAt,
+				error: error && (error.message || error.errMsg || error.toString && error.toString()) || error
+			})
+			return Promise.reject(error)
 		}).finally(() => {
 			if (this.pollRequestMap[sessionId] === pollRequest) {
 				delete this.pollRequestMap[sessionId]
 			}
 		})
-		return this.pollRequestMap[sessionId].ps
+		return pollRequest.ps
 	}
 	
 	findSession (findFn) {
@@ -397,7 +492,7 @@ export default class ClientChatSession {
 	 *		"wechatAccountId": "2a39a725814acf07502299ab2285fff8d44377f5"
 	 *	}
 	*/
-	addSession (data, wechatAccountId, callback) {
+	addSession (data, wechatAccountId) {
 		if (!data || !data.conversationId) {
 			throw new Error('缺少必须参数conversationId')
 		}
@@ -412,56 +507,53 @@ export default class ClientChatSession {
 		}) === false) {
 			return
 		}
-		let nextData = data
+		if (wechatAccountId && wechatAccountId !== ALL_WECHAT_ACCOUNT_ID && data.wechatAccountId !== wechatAccountId) {
+			throw new Error('会话的wechatAccount和加载分组的wechatAccountId不一致')
+		}
+		let nextData = null
+		let isRefreshAll = false
+		let groupIds = []
 		// 如果会话已经存在，那么取已经存在的，以后有需要可以用data更新已经存在的会话，保持引用关系
+		// 一般比较容易出现，例如all的时候，分配的时候有可能会出现，例如以前的会话没有正确删除，后面有分配过来了
 		if (this.sessionMap[data.conversationId]) {
+			// 如果会话比较老，就不更新属性
+			if (this.sessionMap[data.conversationId].lastMsgTime && data.lastMsgTime && this.sessionMap[data.conversationId].lastMsgTime <= data.lastMsgTime) {
+				// 先删后插
+				this._removeSessionBySessionGroup(this.sessionMap[data.conversationId].conversationId)
+				// 更新属性
+				Object.keys(data).forEach(k => {
+					Vue.set(this.sessionMap[data.conversationId], k, data[k])
+				})
+			}
 			nextData = this.sessionMap[data.conversationId]
+			isRefreshAll = true
 		} else {
-			this.sessionMap[data.conversationId] = nextData
+			nextData = data
 		}
-		const topField = nextData.stickyOnTop ? 0 : 1 // 置顶
-		if (wechatAccountId && wechatAccountId !== ALL_WECHAT_ACCOUNT_ID && nextData.wechatAccountId !== wechatAccountId) {
-			throw new Error('会话的wechatAccount和加载分组的wechatAccountId不一致')
+		if (!nextData) {
+			return
 		}
-		const groupIds = []
-		// 传了wechatAccountId，是分页加载的，这里要保持分页加载数据的链路不受动态加载的影响
 		if (wechatAccountId) {
-			groupIds.push(wechatAccountId)
-			// 传了wechatAccountId才记录lastMsgTime和lastUpdateTime
-			const lastFields = ['lastMsgTime', 'lastUpdateTime']
-			groupIds.forEach(groupId => {
-				lastFields.forEach(lastField => {
-					const lastUpdateSortFields = this.getSortField(nextData[lastField])
-					if (!lastUpdateSortFields) {
-						return
-					}
-					if (!this._lastUpdateSessionMap) {
-						this._lastUpdateSessionMap = {}
-					}
-					if (!this._lastUpdateSessionMap[groupId]) {
-						this._lastUpdateSessionMap[groupId] = {}
-					}
-					if (!this._lastUpdateSessionMap[groupId][lastField]) {
-						this._lastUpdateSessionMap[groupId][lastField] = {}
-					}
-					if (!this._lastUpdateSessionMap[groupId][lastField][topField]) {
-						this._lastUpdateSessionMap[groupId][lastField][topField] = {}
-					}
-					if (!this._lastUpdateSessionMap[groupId][lastField][topField][lastUpdateSortFields.day]) {
-						this._lastUpdateSessionMap[groupId][lastField][topField][lastUpdateSortFields.day] = {}
-					}
-					if (!this._lastUpdateSessionMap[groupId][lastField][topField][lastUpdateSortFields.day][lastUpdateSortFields.milliseconds]) {
-						this._lastUpdateSessionMap[groupId][lastField][topField][lastUpdateSortFields.day][lastUpdateSortFields.milliseconds] = []
-					}
-					this._lastUpdateSessionMap[groupId][lastField][topField][lastUpdateSortFields.day][lastUpdateSortFields.milliseconds].push(nextData)
-				})
-			})
+			// 传了wechatAccountId，是分页加载的，这里要保持分页加载数据的链路不受动态加载的影响
+			// 加载会话是新的在上面，老的在下面，所以一定要记录好上次分页加载的时间点
+			if (isRefreshAll) {
+				groupIds.push(nextData.wechatAccountId)
+				groupIds.push(ALL_WECHAT_ACCOUNT_ID)
+			} else {
+				groupIds.push(wechatAccountId)
+			}
+			// 先把老的删除掉
+			this._removeLastUpdateSessionMap(nextData.conversationId, wechatAccountId)
+			// 再插入新的
+			this._updateLastUpdateSessionMap([wechatAccountId], nextData)
 		} else {
 			groupIds.push(nextData.wechatAccountId)
 			groupIds.push(ALL_WECHAT_ACCOUNT_ID)
 		}
+		this.sessionMap[data.conversationId] = nextData
 		// 分组的
 		const sortFields = this.getSortField(nextData.lastMsgTime)
+		const topField = nextData.stickyOnTop ? 0 : 1 // 置顶
 		groupIds.forEach(groupId => {
 			// 如果已经在分组里面了，就不新增了，
 			if (this._getSessionBySessionGroup(nextData.conversationId, groupId)) {
@@ -492,21 +584,62 @@ export default class ClientChatSession {
 				Vue.set(this.data.sessionMuteMap, nextData.wechatAccountId, {})
 			}
 			Vue.set(this.data.sessionMuteMap[nextData.wechatAccountId], nextData.conversationId, nextData)
+		} else {
+			if (this.data.sessionMuteMap[nextData.wechatAccountId]) {
+				Vue.delete(this.data.sessionMuteMap[nextData.wechatAccountId], nextData.conversationId)
+			}
 		}
 		// 检测一下是不是存在一样的虚拟会话，存在的话就删除
 		const virtualSessionIndex = this.data.virtualSessionData.findIndex(v => v.conversationId === nextData.conversationId)
 		if (virtualSessionIndex > -1) {
 			this.data.virtualSessionData.splice(virtualSessionIndex, 1)
 		}
-		callback && callback({
-			session: data
-		})
 		this.onAddSession && this.onAddSession({
-			session: data
+			wechatAccountId,
+			session: nextData
 		})
 	}
-	
-	removeSession (conversationId) {
+
+	_updateLastUpdateSessionMap (groupIds, nextData) {
+		if (!groupIds || !groupIds.length || !nextData) {
+			return
+		}
+		// 传了wechatAccountId才记录lastMsgTime
+		const lastFields = ['lastMsgTime']
+		const topField = nextData.stickyOnTop ? 0 : 1 // 置顶
+		groupIds.forEach(groupId => {
+			lastFields.forEach(lastField => {
+				const lastUpdateSortFields = this.getSortField(nextData[lastField])
+				if (!lastUpdateSortFields) {
+					return
+				}
+				if (!this._lastUpdateSessionMap) {
+					this._lastUpdateSessionMap = {}
+				}
+				if (!this._lastUpdateSessionMap[groupId]) {
+					this._lastUpdateSessionMap[groupId] = {}
+				}
+				if (!this._lastUpdateSessionMap[groupId][lastField]) {
+					this._lastUpdateSessionMap[groupId][lastField] = {}
+				}
+				if (!this._lastUpdateSessionMap[groupId][lastField][topField]) {
+					this._lastUpdateSessionMap[groupId][lastField][topField] = {}
+				}
+				if (!this._lastUpdateSessionMap[groupId][lastField][topField][lastUpdateSortFields.day]) {
+					this._lastUpdateSessionMap[groupId][lastField][topField][lastUpdateSortFields.day] = {}
+				}
+				if (!this._lastUpdateSessionMap[groupId][lastField][topField][lastUpdateSortFields.day][lastUpdateSortFields.milliseconds]) {
+					this._lastUpdateSessionMap[groupId][lastField][topField][lastUpdateSortFields.day][lastUpdateSortFields.milliseconds] = []
+				}
+				this._lastUpdateSessionMap[groupId][lastField][topField][lastUpdateSortFields.day][lastUpdateSortFields.milliseconds].push({
+					conversationId: nextData.conversationId,
+					lastMsgTime: nextData.lastMsgTime
+				})
+			})
+		})
+	}
+
+	_removeSessionBySessionGroup (conversationId, wechatAccountId) {
 		if (!this.sessionMap[conversationId]) {
 			return
 		}
@@ -515,7 +648,7 @@ export default class ClientChatSession {
 			return
 		}
 		const topField = session.stickyOnTop ? 0 : 1 // 置顶
-		const groupIds = [session.wechatAccountId, ALL_WECHAT_ACCOUNT_ID]
+		const groupIds = wechatAccountId ? [wechatAccountId] : [session.wechatAccountId, ALL_WECHAT_ACCOUNT_ID]
 		const sortFields = this.getSortField(session.lastMsgTime)
 		groupIds.forEach(groupId => {
 			if (!this.data.sessionGroupData[groupId] || !this.data.sessionGroupData[groupId][topField]) {
@@ -523,7 +656,7 @@ export default class ClientChatSession {
 			}
 			const groupSession = this.data.sessionGroupData[groupId][topField]
 			if (groupSession[sortFields.day] && groupSession[sortFields.day][sortFields.milliseconds]) {
-				const groupIndex = groupSession[sortFields.day][sortFields.milliseconds].indexOf(this.sessionMap[conversationId])
+				const groupIndex = groupSession[sortFields.day][sortFields.milliseconds].indexOf(session)
 				if (groupIndex >= 0) {
 					groupSession[sortFields.day][sortFields.milliseconds].splice(groupIndex, 1)
 				}
@@ -541,10 +674,19 @@ export default class ClientChatSession {
 				}
 			}
 		})
-		if (this.data.sessionMuteMap[session.wechatAccountId]) {
-			delete this.data.sessionMuteMap[session.wechatAccountId][conversationId]
+	}
+
+	_removeLastUpdateSessionMap (conversationId, wechatAccountId) {
+		if (!this.sessionMap[conversationId]) {
+			return
+		}
+		const session = this.sessionMap[conversationId]
+		if (!session) {
+			return
 		}
-		const lastFields = ['lastMsgTime', 'lastUpdateTime']
+		let isDeleted = false
+		const lastFields = ['lastMsgTime']
+		const groupIds = wechatAccountId ? [wechatAccountId] : [session.wechatAccountId, ALL_WECHAT_ACCOUNT_ID]
 		groupIds.forEach(groupId => {
 			if (!this._lastUpdateSessionMap || !this._lastUpdateSessionMap[groupId]) {
 				return
@@ -553,26 +695,93 @@ export default class ClientChatSession {
 				if (!this._lastUpdateSessionMap[groupId][lastField]) {
 					return
 				}
+				const loastUpdateSortFields = this.getSortField(session[lastField])
 				Object.keys(this._lastUpdateSessionMap[groupId][lastField]).forEach(topField => {
 					if (!this._lastUpdateSessionMap[groupId][lastField][topField]) {
 						return
 					}
-					const loastUpdateSortFields = this.getSortField(session.lastUpdateTime)
 					if (this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day] && this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day][loastUpdateSortFields.milliseconds]) {
-						const index = this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day][loastUpdateSortFields.milliseconds].indexOf(session)
+						let index = -1
+						this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day][loastUpdateSortFields.milliseconds].some((v, i) => {
+							if (v.conversationId === session.conversationId) {
+								index = i
+								return true
+							}
+						})
 						if (index >= 0) {
 							this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day][loastUpdateSortFields.milliseconds].splice(index, 1)
-						}
-						if (!this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day][loastUpdateSortFields.milliseconds].length) {
-							Vue.delete(this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day], loastUpdateSortFields.milliseconds)
-						}
-						if (isEmptyObject(this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day])) {
-							Vue.delete(this._lastUpdateSessionMap[groupId][lastField][topField], loastUpdateSortFields.day)
+							if (!this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day][loastUpdateSortFields.milliseconds].length) {
+								Vue.delete(this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day], loastUpdateSortFields.milliseconds)
+							}
+							if (isEmptyObject(this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day])) {
+								Vue.delete(this._lastUpdateSessionMap[groupId][lastField][topField], loastUpdateSortFields.day)
+							}
+							isDeleted = true
 						}
 					}
 				})
 			})
 		})
+		if (!isDeleted) {
+			groupIds.some(groupId => {
+				if (!this._lastUpdateSessionMap || !this._lastUpdateSessionMap[groupId]) {
+					return
+				}
+				return lastFields.some(lastField => {
+					if (!this._lastUpdateSessionMap[groupId][lastField]) {
+						return
+					}
+					return Object.keys(this._lastUpdateSessionMap[groupId][lastField]).some(topField => {
+						if (!this._lastUpdateSessionMap[groupId][lastField][topField]) {
+							return
+						}
+						return Object.keys(this._lastUpdateSessionMap[groupId][lastField][topField]).some(day => {
+							if (!this._lastUpdateSessionMap[groupId][lastField][topField][day]) {
+								return
+							}
+							return Object.keys(this._lastUpdateSessionMap[groupId][lastField][topField][day]).some(milliseconds => {
+								if (!this._lastUpdateSessionMap[groupId][lastField][topField][day][milliseconds]) {
+									return
+								}
+								let index = -1
+								this._lastUpdateSessionMap[groupId][lastField][topField][day][milliseconds].some((v, i) => {
+									if (v.conversationId === session.conversationId) {
+										index = i
+										return true
+									}
+								})
+								if (index >= 0) {
+									this._lastUpdateSessionMap[groupId][lastField][topField][day][milliseconds].splice(index, 1)
+									if (!this._lastUpdateSessionMap[groupId][lastField][topField][day][milliseconds].length) {
+										Vue.delete(this._lastUpdateSessionMap[groupId][lastField][topField][day], milliseconds)
+									}
+									if (isEmptyObject(this._lastUpdateSessionMap[groupId][lastField][topField][day])) {
+										Vue.delete(this._lastUpdateSessionMap[groupId][lastField][topField], day)
+									}
+									isDeleted = true
+									return true
+								}
+							})
+						})
+					})
+				})
+			})
+		} 
+	}
+	
+	removeSession (conversationId) {
+		if (!this.sessionMap[conversationId]) {
+			return
+		}
+		const session = this.sessionMap[conversationId]
+		if (!session) {
+			return
+		}
+		this._removeSessionBySessionGroup(conversationId)
+		this._removeLastUpdateSessionMap(conversationId)
+		if (this.data.sessionMuteMap[session.wechatAccountId]) {
+			delete this.data.sessionMuteMap[session.wechatAccountId][conversationId]
+		}
 		delete this.sessionMap[conversationId]
 		this.onRemoveSession && this.onRemoveSession({
 			session
@@ -637,7 +846,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)
+							}
 						}
 					})
 				})