@aochuang/client-sdk 1.0.349 → 1.0.350

package/package.json

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

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

@@ -412,56 +412,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,6 +489,10 @@ 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)
@@ -499,14 +500,53 @@ export default class ClientChatSession {
 			this.data.virtualSessionData.splice(virtualSessionIndex, 1)
 		}
 		callback && callback({
-			session: data
+			session: nextData
 		})
 		this.onAddSession && this.onAddSession({
-			session: data
+			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 +555,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 +563,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 +581,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 +602,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