@aochuang/client-sdk 1.0.371 → 1.0.372

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 {
 	
@@ -22,6 +23,8 @@ export default class ClientChatMessage {
 	})
 	
 	messageMap = {}
+	tempMessageMap = {}
+	checkMessageSendResultTaskList = []
 	
 	get messageData () {
 		return this.data.messageData
@@ -33,15 +36,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 +80,7 @@ export default class ClientChatMessage {
 	 *	     "msgSvrId": "4319123759514541049",
 	 *	     "msgType": 1,
 	 *	     "origin": "0",
-	 *	     "sendStatus": 0,
+	 *	     "status": 0,
 	 *	     "tenantId": "1761952223049924608",
 	 *	     "wechatAccountId": "ad9d9ae2a8be4f27311312cdd4af3549dc8427ef",
 	 *	     "wechatFriendId": "2089efcc7f8f40b00b7f05fa4c6dfd3bb642774d",
@@ -89,6 +95,10 @@ 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]
 		if (!this.data.messageData[groupField]) {
 			Vue.set(this.data.messageData, groupField, {})
@@ -105,6 +115,7 @@ export default class ClientChatMessage {
 		}
 		this.data.messageData[groupField][sortFields.day][sortFields.milliseconds].push(data)
 		this.messageMap[data.id] = data
+		if (data.isSend && data.status === 1 && !data._temp) this.addCheckMessageSendResultTask(data)
 		if (fireEvent !== false) {
 			this.event && this.event.emit('add-message', {
 				data
@@ -119,6 +130,7 @@ export default class ClientChatMessage {
 		if (!id) {
 			return
 		}
+		this.removeCheckMessageSendResultTask(id)
 		const message = this.messageMap[id]
 		if (!message) {
 			return
@@ -154,6 +166,7 @@ export default class ClientChatMessage {
 	updateMessage (id, props) {
 		const message = this.getMessage(id)
 		if (!message) {
+			this.tempMessageMap[id] = props
 			return
 		}
 		if (!props) {
@@ -215,11 +228,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 +286,35 @@ 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.data.messageData = {}
 	}
-}
+}

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

@@ -82,7 +82,8 @@ export default class ClientChatSession {
 		/**
 		 * 删除会话
 		*/
-		deleteSessionMethod: null
+		deleteSessionMethod: null,
+		modifiedAccountMap: {}
 	})
 	
 	accountIds = []
@@ -119,6 +120,23 @@ export default class ClientChatSession {
 		return this.data.loading
 	}
 	
+	isModify (qwAccountId) {
+		return !!(qwAccountId && this.data.modifiedAccountMap[qwAccountId])
+	}
+
+	markModify (qwAccountIds) {
+		const ids = Array.isArray(qwAccountIds) ? qwAccountIds : [qwAccountIds]
+		ids.filter(Boolean).forEach(id => {
+			Vue.set(this.data.modifiedAccountMap, id, true)
+		})
+	}
+
+	unmarkModify (qwAccountId) {
+		if (qwAccountId) {
+			Vue.delete(this.data.modifiedAccountMap, qwAccountId)
+		}
+	}
+
 	get loadAssignTaskSessioning () {
 		return this.data.loadAssignTaskSessioning
 	}
@@ -205,6 +223,35 @@ export default class ClientChatSession {
 	getSessionByLocal (sessionId) {
 		return this.sessionMap[sessionId]
 	}
+
+	/**
+	 * 强制从服务端刷新会话，绕过本地缓存。
+	 */
+	refreshSession (sessionId) {
+		if (!sessionId) {
+			return Promise.reject('缺少会话id')
+		}
+		return this.getSessionMethod({
+			id: sessionId
+		}).then(rs => {
+			if (!rs || !rs.data) {
+				return Promise.reject('未找到会话' + sessionId)
+			}
+			// 事件计算出的 sessionId 是本地索引，始终保持与服务端返回对象一致。
+			const serverSession = Object.assign({}, rs.data, {
+				id: sessionId
+			})
+			const localSession = this.getSessionByLocal(sessionId)
+			if (localSession) {
+				this.updateSession(sessionId, serverSession)
+			} else {
+				this.addSession(serverSession)
+			}
+			return Object.assign({}, rs, {
+				data: serverSession
+			})
+		})
+	}
 	
 	findSession (findFn) {
 		let result 
@@ -418,6 +465,9 @@ export default class ClientChatSession {
 			}
 		}
 		delete this.sessionMap[id]
+		if (this.data.currentSessionId === id) {
+			this.data.currentSessionId = null
+		}
 		if (checkLastUpdateSession !== false) {
 			// todo 后面可能会删掉这块的逻辑，因为后端排序逻辑变了
 			this.checkAndUpdateLastUpdateSession()
@@ -562,7 +612,9 @@ export default class ClientChatSession {
 								return true
 							}
 						})
-						this.data.sessionGroupData[groupField][topField][oldSortFields.day][oldSortFields.milliseconds].splice(index, 1)
+						if (index >= 0) {
+							this.data.sessionGroupData[groupField][topField][oldSortFields.day][oldSortFields.milliseconds].splice(index, 1)
+						}
 					}
 				})
 				// 按照新的时间来分组排序
@@ -635,7 +687,9 @@ export default class ClientChatSession {
 								return true
 							}
 						})
-						this.data.sessionGroupData[groupField][topField][sortFields.day][sortFields.milliseconds].splice(index, 1)
+						if (index >= 0) {
+							this.data.sessionGroupData[groupField][topField][sortFields.day][sortFields.milliseconds].splice(index, 1)
+						}
 					}
 				})
 				// 所有的
@@ -915,6 +969,7 @@ export default class ClientChatSession {
 		this.data.sessionData = {}
 		this.data.sessionGroupData = {}
 		this.data.sessionMuteMap = {}
+		this.data.modifiedAccountMap = {}
 		// this.data.sessionUnreadCountMap = {}
 		this.sessionMap = {}
 		if (this.cancelLoadDataRequest) {
@@ -926,4 +981,4 @@ export default class ClientChatSession {
 			this.cancelRefreshRequest = null
 		}
 	}
-}
+}

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

@@ -15,11 +15,16 @@ export default class ClietChatSocket {
 			// 执行回调事件前的方法
 			beforeFireCallback: null, 
 			onCmdQwNewMessage: null,
+			onCmdQwContactInfoChanged: null,
+			onCmdQwContactRequestChanged: null,
+			onCmdQwAcceptContactRequest: null,
+			onCmdQwRoomInfoChanged: null,
 			onCmdSendMessageResult: null,
 			onCmdFriendInfoChanged: null,
 			onCmdDownloadVideoResult: null,
 			onCmdChatroomInfoChanged: null,
 			onCmdChatroomInfoChangedBatch: null,
+			onHeartbeatSuccess: null,
 			onHeartbeatCheck: null
 		}, options)
 		if (!options.socket) {
@@ -27,6 +32,13 @@ export default class ClietChatSocket {
 		}
 		this.socket = options.socket
 		this.socket.event.on('onCmdQwNewMessage', options.onCmdQwNewMessage)
+		this.socket.event.on('onCmdQwContactInfoChanged', options.onCmdQwContactInfoChanged)
+		this.socket.event.on('onCmdQwContactRequestChanged', options.onCmdQwContactRequestChanged)
+		this.socket.event.on('onCmdQwAcceptContactRequest', options.onCmdQwAcceptContactRequest)
+		this.socket.event.on('onCmdQwRoomInfoChanged', options.onCmdQwRoomInfoChanged)
+		this.socket.event.on('onHeartbeatSuccess', (evt) => {
+			options.onHeartbeatSuccess && options.onHeartbeatSuccess(evt)
+		})
 		this.socket.event.on('onHeartbeatCheck', ({ mergeParams }) => {
 			options.onHeartbeatCheck && options.onHeartbeatCheck({
 				mergeParams
@@ -62,4 +74,4 @@ export default class ClietChatSocket {
 	setUrl (url) {
 		this.socket.setUrl(url)
 	}
-}
+}