@aochuang/client-sdk 1.0.341 → 1.0.343

package/package.json

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

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

@@ -229,14 +229,14 @@ export default class ClientChatSession {
 	}
 
 	getSession (sessionId, serializeMethod) {
-		if (this.sessionMap[sessionId]) {
+		if (this.sessionMap[sessionId]) {  
 			return Promise.resolve({
 				data: this.sessionMap[sessionId]
 			})
 		}
 		// 这里需要轮询从后端获取会话，后端会话更新和创建是异步的，所以要多轮训请求几次
 		if (this.pollRequestMap[sessionId]) {
-			this.pollRequestMap[sessionId].stop()
+			return this.pollRequestMap[sessionId].ps
 		}
 		const pollRequest = createPollRequest(({ done, fail }) => {
 			return this.getSessionMethod({
@@ -248,7 +248,7 @@ export default class ClientChatSession {
 			})
 		})
 		this.pollRequestMap[sessionId] = pollRequest
-		return pollRequest.start().then(rs => {
+		this.pollRequestMap[sessionId].ps = pollRequest.start().then(rs => {
 			if (serializeMethod) {
 				rs = serializeMethod(rs)
 			}
@@ -263,6 +263,7 @@ export default class ClientChatSession {
 				delete this.pollRequestMap[sessionId]
 			}
 		})
+		return this.pollRequestMap[sessionId].ps
 	}
 	
 	findSession (findFn) {

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

@@ -452,9 +452,15 @@ class ClientChat {
 							}
 						})
 					})
-				} else {
-					this.session.updateSession(sessionId, ({ session }) => {
-						const nextSession = {
+					} else {
+						this.session.updateSession(sessionId, ({ session }) => {
+							// listChange/getSession may already include this message in unreadMsgCount.
+							// Only count messages newer than the session watermark.
+							const isNewerMessage = data.wechatTime > (session.lastMsgTime || 0)
+							if (!isNewerMessage) {
+								return {}
+							}
+							const nextSession = {
 							lastMsgContent: data.content,
 							lastMsgType: data.msgType,
 							lastMsgTime: data.wechatTime,
@@ -462,7 +468,7 @@ class ClientChat {
 							lastUpdateTime: data.updateDate,
 							unreadMsgCount: session.unreadMsgCount
 						}
-						if (!data.isSend) {
+							if (!data.isSend && isNewerMessage) {
 							if (this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId && this.shouldMarkCurrentSessionRead(sessionId, data)) {
 								// 标记已读
 								this.session.setSessionRead(sessionId)
@@ -594,9 +600,15 @@ class ClientChat {
 							}
 						})
 					})
-				} else {
-					this.session.updateSession(sessionId, ({ session }) => {
-						const nextSession = {
+					} else {
+						this.session.updateSession(sessionId, ({ session }) => {
+							// listChange/getSession may already include this message in unreadMsgCount.
+							// Only count messages newer than the session watermark.
+							const isNewerMessage = data.wechatTime > (session.lastMsgTime || 0)
+							if (!isNewerMessage) {
+								return {}
+							}
+							const nextSession = {
 							lastMsgContent: data.content,
 							lastMsgType: data.msgType,
 							lastMsgTime: data.wechatTime,
@@ -604,7 +616,7 @@ class ClientChat {
 							lastUpdateTime: data.updateDate,
 							unreadMsgCount: session.unreadMsgCount
 						}
-						if (!data.isSend) {
+							if (!data.isSend && isNewerMessage) {
 							if (this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId && this.shouldMarkCurrentSessionRead(sessionId, data)) {
 								// 标记已读
 								this.session.setSessionRead(sessionId)