@aochuang/client-sdk 1.0.325 → 1.0.327

package/package.json

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

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

@@ -30,6 +30,8 @@ export default class ClientChatMessage {
 
 	messageMap = {}
 
+	lastMessageTimeMap = {}
+
 	// 记录一下临时更新的消息，主要是客服端发送消息后，如果失败的时候后端会返回两条消息，一条完整的接口一条失败的状态结果，两个消息顺序没发保证完整结构-》状态结果，所以要先把状态结果临时存一下，后面新增消息的时候从这里找一下，同步一下sendStatus和errMsg
 	tempMessageMap = {}
 
@@ -118,6 +120,8 @@ export default class ClientChatMessage {
 			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, {})
 		}
@@ -133,6 +137,7 @@ 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.sendStatus === 1 && !data._temp) {
 			// 排除一下系统消息，因为后端系统消息的sendStatus永远为1，这会导致前端总是轮训去调用接口检查消息状态
@@ -143,13 +148,15 @@ export default class ClientChatMessage {
 		if (fireEvent !== false) {
 			// 如果消息包含这种情况，就不能往外发送add-message事件
 			// 因为例如群发的消息，他没有会话，导致前端在处理来了新消息通知铃声提醒，获取会话一直获取不到，然后会总是发送请求
-			if (!isAutoReadMessage(data) && !shouldIgnoreSessionByMessage(data) && !isDeletedMsg(data) && !isBlockedMsg(data)) {
+			if (!isBeforeLastMessage && !isAutoReadMessage(data) && !shouldIgnoreSessionByMessage(data) && !isDeletedMsg(data) && !isBlockedMsg(data)) {
 				this.event && this.event.emit('add-message', {
 					data
 				})	
 			}
 			this.onAddMessageSuccess && this.onAddMessageSuccess({
-				data
+				data,
+				lastMessageTime,
+				isBeforeLastMessage
 			})
 		}
 	}
@@ -562,6 +569,7 @@ export default class ClientChatMessage {
 			task.cancel()
 		})
 		this.tempMessageMap = {}
+		this.lastMessageTimeMap = {}
 		this.data.messageData = {}
 	}
 
@@ -588,6 +596,23 @@ export default class ClientChatMessage {
 	 * 最后接收的一条好友消息时间
 	 */
 	setLastReceiveMessageTime (messageTime) {
+		if (!messageTime || (this.data.lastReceiveMessageTime && messageTime <= this.data.lastReceiveMessageTime)) {
+			return
+		}
 		this.data.lastReceiveMessageTime = messageTime
 	}
-}
+
+	getLastMessageTime (groupField) {
+		return this.lastMessageTimeMap[groupField]
+	}
+
+	setLastMessageTime (groupField, messageTime, message) {
+		if (!groupField || !messageTime || (message && message.msgType === '_EMPTY_')) {
+			return
+		}
+		const lastMessageTime = this.getLastMessageTime(groupField)
+		if (!lastMessageTime || messageTime > lastMessageTime) {
+			this.lastMessageTimeMap[groupField] = messageTime
+		}
+	}
+}

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

@@ -379,13 +379,16 @@ class ClientChat {
 			clientChat: this,
 			checkMessageSendResultMethod: options.checkMessageSendResultMethod,
 			loadLossMessageDataMethod: options.loadLossFriendMessageDataMethod,
-			onAddMessageSuccess: ({ data }) => {
+			onAddMessageSuccess: ({ data, isBeforeLastMessage }) => {
 				const accountId = options.getLoginAccountIdMethod ? options.getLoginAccountIdMethod() : data.accountId
 				let sessionId = createSessionId(accountId, data.wechatFriendId)
 				// 更新会话
 				if (!sessionId) {
 					return
 				}
+				if (isBeforeLastMessage) {
+					return
+				}
 				if (isAutoReadMessage(data)) {
 					return this.handleAutoReadMessageSession(sessionId)
 				}
@@ -513,7 +516,7 @@ class ClientChat {
 			clientChat: this,
 			checkMessageSendResultMethod: options.checkMessageSendResultMethod,
 			loadLossMessageDataMethod: options.loadLossRoomMessageDataMethod,
-			onAddMessageSuccess: ({ data }) => {
+			onAddMessageSuccess: ({ data, isBeforeLastMessage }) => {
 				const accountId = options.getLoginAccountIdMethod ? options.getLoginAccountIdMethod() : data.accountId
 				let sessionId = createSessionId(accountId, data.wechatChatroomId)
 				const atMessage = getAtMessageContent(data)
@@ -521,6 +524,9 @@ class ClientChat {
 				if (!sessionId) {
 					return
 				}
+				if (isBeforeLastMessage) {
+					return
+				}
 				if (isAutoReadMessage(data)) {
 					return this.handleAutoReadMessageSession(sessionId)
 				}

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

@@ -33,21 +33,20 @@ export default class ClietChatSocket {
 		// 执行消息前回调
 		this.beforeFireCallback = options.beforeFireCallback
 	}
-	/**
-	 * 发送聊天消息
-	*/
-	sendChatMessage (options) {
-		const message = Object.assign({
-			content: null,
-			msgType: null,
-			msgSubType: null,
-			qwAccountId: null
-			// contactId: null,
-			// roomId: null
-		}, options, {
-			cmdType: 'CmdQwSendMessage'
+	
+	sendMessage (message, beforeCallback) {
+		return this.socket.sendMessage(message, (data) => {
+			let ps = Promise.resolve()
+			// 如果发送消息的时候，连接是断开或者失败的，重新连接一次，主要是防止用户发送消息的时候网络断开了，提示socket已关闭，体验不好，程序静默来处理
+			if (this.socket.connectStatus === Socket.CONNECT_STATUS_ENUM.Close || this.socket.connectStatus === Socket.CONNECT_STATUS_ENUM.Error) {
+				ps = this.socket.reconnect()
+			}
+			return ps.finally(() => {
+				if (beforeCallback) {
+					return beforeCallback(data)
+				}
+			})
 		})
-		return this.socket.sendMessage(message)
 	}
 	
 	connect () {

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

@@ -25,6 +25,7 @@ class ClientChat {
 	_sessionPollRequestMap = {}
 	
 	constructor (options) {
+
 		options = Object.assign({
 			client: null,
 			socket: null, // socket实例