@aochuang/client-sdk 1.0.365 → 1.0.366

package/package.json

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

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

@@ -272,14 +272,7 @@ export default class ClientChatSession {
 		// 这里需要轮询从后端获取会话，后端会话更新和创建是异步的，所以要多轮训请求几次
 		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
-			})
+			this._addGetSessionSerializeTask(pollRequest, serializeMethod, taskOptions)
 			return pollRequest.ps
 		}
 
@@ -291,23 +284,20 @@ export default class ClientChatSession {
 				if (rs.data) {
 					done(rs)
 				} else {
-					this._addGetSessionLog('会话轮询返回空', {
-						sessionId,
-						requestCount: pollRequest.requestCount
-					})
+					pollRequest.emptyResponseCount += 1
 				}
 			}, (error) => {
-				this._addGetSessionLog('会话轮询请求异常', {
-					sessionId,
-					requestCount: pollRequest.requestCount,
-					error: error && (error.message || error.errMsg || error.toString && error.toString()) || error
-				})
+				pollRequest.requestErrorCount += 1
+				pollRequest.lastRequestError = error && (error.message || error.errMsg || error.toString && error.toString()) || error
 				return Promise.reject(error)
 			})
 		})
 		pollRequest.serializeTasks = []
 		pollRequest.serializeTaskMap = {}
 		pollRequest.requestCount = 0
+		pollRequest.emptyResponseCount = 0
+		pollRequest.requestErrorCount = 0
+		pollRequest.lastRequestError = null
 		pollRequest.startedAt = Date.now()
 		this._addGetSessionSerializeTask(pollRequest, serializeMethod, taskOptions)
 		this.pollRequestMap[sessionId] = pollRequest
@@ -341,14 +331,16 @@ export default class ClientChatSession {
 			this._addGetSessionLog('会话轮询合并完成', {
 				sessionId,
 				requestCount: pollRequest.requestCount,
+				emptyResponseCount: pollRequest.emptyResponseCount,
+				requestErrorCount: pollRequest.requestErrorCount,
 				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,
+				processedMessageCount: context.processedMessageIds.length,
+				skippedMessageCount: context.skippedMessageIds.length,
+				unreadMessageCount: context.unreadMessageIds.length,
 				hasSessionMap: !!this.sessionMap[sessionId],
 				hasAllSessionGroup: !!this._getSessionBySessionGroup(sessionId, ALL_WECHAT_ACCOUNT_ID),
 				hasAccountSessionGroup: !!this._getSessionBySessionGroup(sessionId, wechatAccountId)
@@ -358,8 +350,11 @@ export default class ClientChatSession {
 			this._addGetSessionLog('会话轮询失败', {
 				sessionId,
 				requestCount: pollRequest.requestCount,
+				emptyResponseCount: pollRequest.emptyResponseCount,
+				requestErrorCount: pollRequest.requestErrorCount,
 				duration: Date.now() - pollRequest.startedAt,
-				error: error && (error.message || error.errMsg || error.toString && error.toString()) || error
+				error: error && (error.message || error.errMsg || error.toString && error.toString()) || error,
+				lastRequestError: pollRequest.lastRequestError
 			})
 			return Promise.reject(error)
 		}).finally(() => {

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

@@ -418,17 +418,22 @@ class ClientChat {
 				}
 				const localSession = this.session.findSession(({ session }) => session.conversationId === sessionId)
 				if (!localSession) {
-					this.socket.addLog({
-						group: 'client-chat-message:onAddMessageSuccess',
-						content: {
-							title: '未获取到会话，开始从服务端获取',
-							data: {
-								sessionId,
-								accountId,
-								wechatFriendId: data.wechatFriendId
+					if (!this.session.pollRequestMap[sessionId]) {
+						this.socket.addLog({
+							group: 'client-chat-message:onAddMessageSuccess',
+							content: {
+								title: '未获取到会话，开始从服务端获取',
+								data: {
+									sessionId,
+									accountId,
+									wechatFriendId: data.wechatFriendId,
+									wechatAccountId: data.wechatAccountId,
+									messageId: data.id,
+									wechatTime: data.wechatTime
+								}
 							}
-						}
-					})
+						})
+					}
 					return this.session.getSession(sessionId, (rs, context) => {
 						if (rs && rs.data) {
 							const isAfterServerMessage = data.wechatTime > context.baseLastMsgTime
@@ -455,20 +460,7 @@ class ClientChat {
 					}, {
 						messageId: data.id,
 						wechatTime: data.wechatTime
-					}).then(null, (error) => {
-						this.socket.addLog({
-							group: 'client-chat-message:onAddMessageSuccess',
-							content: {
-								title: '未获取到会话，从服务端获取失败',
-								data: {
-									error: error && (error.message || error.errMsg || error.toString && error.toString()) || error,
-									sessionId,
-									accountId,
-									wechatFriendId: data.wechatFriendId
-								}
-							}
-						})
-					})
+					}).catch(() => {})
 					} else {
 						this.session.updateSession(sessionId, ({ session }) => {
 							// listChange/getSession may already include this message in unreadMsgCount.
@@ -562,17 +554,22 @@ class ClientChat {
 				// 更新会话未读消息数量
 				const localSession = this.session.findSession(({ session }) => session.conversationId === sessionId)
 				if (!localSession) {
-					this.socket.addLog({
-						group: 'client-chat-message:onAddMessageSuccess',
-						content: {
-							title: '未获取到会话，开始从服务端获取',
-							data: {
-								sessionId,
-								accountId,
-								wechatChatroomId: data.wechatChatroomId
+					if (!this.session.pollRequestMap[sessionId]) {
+						this.socket.addLog({
+							group: 'client-chat-message:onAddMessageSuccess',
+							content: {
+								title: '未获取到会话，开始从服务端获取',
+								data: {
+									sessionId,
+									accountId,
+									wechatChatroomId: data.wechatChatroomId,
+									wechatAccountId: data.wechatAccountId,
+									messageId: data.id,
+									wechatTime: data.wechatTime
+								}
 							}
-						}
-					})
+						})
+					}
 					return this.session.getSession(sessionId, (rs, context) => {
 						if (rs && rs.data) {
 							const isAfterServerMessage = data.wechatTime > context.baseLastMsgTime
@@ -602,20 +599,7 @@ class ClientChat {
 					}, {
 						messageId: data.id,
 						wechatTime: data.wechatTime
-					}).then(null, (error) => {
-						this.socket.addLog({
-							group: 'client-chat-message:onAddMessageSuccess',
-							content: {
-								title: '未获取到会话，从服务端获取失败',
-								data: {
-									error: error && (error.message || error.errMsg || error.toString && error.toString()) || error,
-									sessionId,
-									accountId,
-									wechatChatroomId: data.wechatChatroomId
-								}
-							}
-						})
-					})
+					}).catch(() => {})
 					} else {
 						this.session.updateSession(sessionId, ({ session }) => {
 							// listChange/getSession may already include this message in unreadMsgCount.