@aochuang/client-sdk 1.0.377 → 1.0.378-wework

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

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import Event from '../../../utils/event.js'
 import { unique } from '../../../utils/string.js'
 import { formatDate } from '../../../utils/date.js'
+import { createPromise } from '../../../utils/util'
 
 export default class ClientChatMessage {
 	
@@ -20,8 +21,11 @@ export default class ClientChatMessage {
 		*/
 		messageData: {}
 	})
-	
+
 	messageMap = {}
+	lastMessageTimeMap = {}
+	tempMessageMap = {}
+	checkMessageSendResultTaskList = []
 	
 	get messageData () {
 		return this.data.messageData
@@ -33,15 +37,18 @@ export default class ClientChatMessage {
 			queryMethod: null,
 			sortField: null, // 排序的字段，必须是唯一的，例如时间
 			groupField: null, // 分组的字段
+			checkMessageSendResultMethod: null,
 			onAddMessageSuccess: null // 新增消息成功回调事件
 		}, options)
 		if (!options.clientChat) {
 			throw new Error('必须将clientChat传递过来')
 		}
+		if (!options.checkMessageSendResultMethod) throw new Error('缺少checkMessageSendResultMethod配置')
 		this.queryMethod = options.queryMethod
 		this.clientChat = options.clientChat
 		this.groupField = options.groupField
 		this.sortField = options.sortField
+		this.checkMessageSendResultMethod = options.checkMessageSendResultMethod
 		this.onAddMessageSuccess = options.onAddMessageSuccess
 		this.event = new Event()
 	}
@@ -74,7 +81,7 @@ export default class ClientChatMessage {
 	 *	     "msgSvrId": "4319123759514541049",
 	 *	     "msgType": 1,
 	 *	     "origin": "0",
-	 *	     "sendStatus": 0,
+	 *	     "status": 0,
 	 *	     "tenantId": "1761952223049924608",
 	 *	     "wechatAccountId": "ad9d9ae2a8be4f27311312cdd4af3549dc8427ef",
 	 *	     "wechatFriendId": "2089efcc7f8f40b00b7f05fa4c6dfd3bb642774d",
@@ -89,7 +96,13 @@ export default class ClientChatMessage {
 		if (this.messageMap[data.id]) {
 			return
 		}
+		if (this.tempMessageMap[data.id]) {
+			Object.assign(data, this.tempMessageMap[data.id])
+			delete this.tempMessageMap[data.id]
+		}
 		const groupField = data[this.groupField]
+		const lastMessageTime = this.getLastMessageTime(groupField)
+		const isBeforeLastMessage = !data.isSend && lastMessageTime && data[this.sortField] < lastMessageTime
 		if (!this.data.messageData[groupField]) {
 			Vue.set(this.data.messageData, groupField, {})
 		}
@@ -105,13 +118,27 @@ export default class ClientChatMessage {
 		}
 		this.data.messageData[groupField][sortFields.day][sortFields.milliseconds].push(data)
 		this.messageMap[data.id] = data
+		this.setLastMessageTime(groupField, data[this.sortField], data)
+		if (data.isSend && data.status === 1 && !data._temp) this.addCheckMessageSendResultTask(data)
 		if (fireEvent !== false) {
+			try {
+				this.onAddMessageSuccess && this.onAddMessageSuccess({
+					data,
+					lastMessageTime,
+					isBeforeLastMessage
+				})
+			} catch (error) {
+				console.error('[client-chat-message] onAddMessageSuccess error', {
+					messageId: data.id,
+					error
+				})
+			}
+			if (isBeforeLastMessage) {
+				return
+			}
 			this.event && this.event.emit('add-message', {
 				data
 			})
-			this.onAddMessageSuccess && this.onAddMessageSuccess({
-				data
-			})
 		}
 	}
 	
@@ -119,6 +146,7 @@ export default class ClientChatMessage {
 		if (!id) {
 			return
 		}
+		this.removeCheckMessageSendResultTask(id)
 		const message = this.messageMap[id]
 		if (!message) {
 			return
@@ -147,21 +175,57 @@ export default class ClientChatMessage {
 			delete this.data.messageData[groupField]
 		}
 		this.event && this.event.emit('remove-message', {
-			data
+			data: message
 		})
 	}
 	
 	updateMessage (id, props) {
 		const message = this.getMessage(id)
 		if (!message) {
+			this.tempMessageMap[id] = props
 			return
 		}
 		if (!props) {
 			return
 		}
+		const groupField = message[this.groupField]
+		const oldSortFieldValue = message[this.sortField]
+		const oldSortFields = this.getSortField(oldSortFieldValue)
 		Object.keys(props).forEach(key => {
-			message[key] = props[key]
+			Vue.set(message, key, props[key])
 		})
+		if (typeof props[this.sortField] !== 'undefined' && props[this.sortField] !== oldSortFieldValue) {
+			const oldBucket = this.data.messageData[groupField] &&
+				this.data.messageData[groupField][oldSortFields.day] &&
+				this.data.messageData[groupField][oldSortFields.day][oldSortFields.milliseconds]
+			if (oldBucket) {
+				const index = oldBucket.findIndex(item => item.id === message.id)
+				if (index >= 0) {
+					oldBucket.splice(index, 1)
+				}
+				if (!oldBucket.length) {
+					Vue.delete(this.data.messageData[groupField][oldSortFields.day], oldSortFields.milliseconds)
+				}
+				if (!Object.keys(this.data.messageData[groupField][oldSortFields.day]).length) {
+					Vue.delete(this.data.messageData[groupField], oldSortFields.day)
+				}
+			}
+			const newSortFields = this.getSortField(message[this.sortField])
+			if (!this.data.messageData[groupField]) {
+				Vue.set(this.data.messageData, groupField, {})
+			}
+			if (!this.data.messageData[groupField][newSortFields.day]) {
+				Vue.set(this.data.messageData[groupField], newSortFields.day, {})
+			}
+			if (!this.data.messageData[groupField][newSortFields.day][newSortFields.milliseconds]) {
+				Vue.set(this.data.messageData[groupField][newSortFields.day], newSortFields.milliseconds, [])
+			}
+			const newBucket = this.data.messageData[groupField][newSortFields.day][newSortFields.milliseconds]
+			if (!newBucket.some(item => item.id === message.id)) {
+				newBucket.push(message)
+			}
+			this.setLastMessageTime(groupField, message[this.sortField], message)
+		}
 	}
 	
 	getMessage (id) {
@@ -215,11 +279,11 @@ export default class ClientChatMessage {
 		}, data, {
 			cmdType: 'CmdQwSendMessage'
 		})).then(({ data }) => {
-			if (data.sendStatus === 0) {
+			if (data.status === 0) {
 				// 发送成功
-			} else if (data.sendStatus === 2) {
+			} else if (data.status === 2) {
 				// 发送失败
-			} else if (data.sendStatus === 1) {
+			} else if (data.status === 1) {
 				// 发送中
 			}
 			// 如果返回的是对象，证明发送成功了
@@ -273,8 +337,54 @@ export default class ClientChatMessage {
 		this.clearMessage()
 		return this.loadMessageData(params)
 	}
+
+	addCheckMessageSendResultTask (message) {
+		if (this.checkMessageSendResultTaskList.some(v => v.id === message.id)) return
+		let timer
+		const task = { id: message.id, promise: createPromise(), check: () => {
+			if (message.status !== 1) return task.promise.resolve()
+			if (Date.now() - (message.createTime || message.sendTime) > 5 * 60 * 1000) return task.promise.resolve({status: 3, resultMsg: '消息发送超时'})
+			timer = setTimeout(() => {
+				Promise.resolve(this.checkMessageSendResultMethod({message})).then(rs => {
+					const data = rs && rs.data
+					if (data && data.status === 1) task.check()
+					else task.promise.resolve(data || {})
+				}, () => task.check())
+			}, 3000)
+		}, cancel: () => { clearTimeout(timer); task.promise.reject('reject') } }
+		this.checkMessageSendResultTaskList.push(task)
+		task.check()
+		task.promise.then(rs => this.updateMessage(message.id, rs || {})).finally(() => this.removeCheckMessageSendResultTask(message.id))
+	}
+
+	removeCheckMessageSendResultTask (id) {
+		const index = this.checkMessageSendResultTaskList.findIndex(v => v.id === id)
+		if (index >= 0) { this.checkMessageSendResultTaskList[index].cancel(); this.checkMessageSendResultTaskList.splice(index, 1) }
+	}
 	
 	reset () {
+		this.checkMessageSendResultTaskList.forEach(task => task.cancel())
+		this.checkMessageSendResultTaskList = []
+		this.tempMessageMap = {}
+		this.messageMap = {}
+		this.lastMessageTimeMap = {}
 		this.data.messageData = {}
 	}
-}
+
+	getLastMessageTime (groupField) {
+		return this.lastMessageTimeMap[groupField]
+	}
+
+	setLastMessageTime (groupField, messageTime, message) {
+		if (!groupField || !messageTime || (message && message.msgType === '_EMPTY_')) {
+			return
+		}
+		if (message && message._temp) {
+			return
+		}
+		const lastMessageTime = this.getLastMessageTime(groupField)
+		if (!lastMessageTime || messageTime > lastMessageTime) {
+			this.lastMessageTimeMap[groupField] = messageTime
+		}
+	}
+}