@aochuang/client-sdk 1.0.350 → 1.0.351

package/package.json

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

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

@@ -228,50 +228,40 @@ export default class ClientChatSession {
 		})
 	}
 
-	getSession (sessionId, serializeMethod, callback = null, isCache = true) {
-		if (typeof callback === 'boolean') {
-			isCache = callback
-			callback = null
-		}
+	getSession (sessionId, serializeMethod) {
 		if (this.sessionMap[sessionId]) {  
 			return Promise.resolve({
 				data: this.sessionMap[sessionId]
 			})
 		}
 		// 这里需要轮询从后端获取会话，后端会话更新和创建是异步的，所以要多轮训请求几次
-		if (this.pollRequestMap[sessionId]) {
-			// 因为有的地方要复用缓存，有的地方不能缓存，比如onAddMessagSuccess的时候不能缓存
-			if (isCache) {
-				return this.pollRequestMap[sessionId].ps
-			} else {
-				this.pollRequestMap[sessionId].stop()
-			}
-		}
-		const pollRequest = createPollRequest(({ done, fail }) => {
-			return this.getSessionMethod({
-				id: sessionId
-			}).then((rs) => {
+		if (!this.pollRequestMap[sessionId] || !this.pollRequestMap[sessionId].ps) {
+			const pollRequest = createPollRequest(({ done, fail }) => {
+				return this.getSessionMethod({
+					id: sessionId
+				}).then((rs) => {
+					if (rs.data) {
+						done(rs)
+					}
+				})
+			})
+			this.pollRequestMap[sessionId] = pollRequest
+			this.pollRequestMap[sessionId].ps = pollRequest.start().then(rs => {
+				if (serializeMethod) {
+					rs = serializeMethod(rs)
+				}
 				if (rs.data) {
-					done(rs)
+					this.addSession(rs.data, null)
+					return rs
+				} else {
+					return Promise.reject('未找到会话' + sessionId)
+				}
+			}).finally(() => {
+				if (this.pollRequestMap[sessionId] === pollRequest) {
+					delete this.pollRequestMap[sessionId]
 				}
 			})
-		})
-		this.pollRequestMap[sessionId] = pollRequest
-		this.pollRequestMap[sessionId].ps = pollRequest.start().then(rs => {
-			if (serializeMethod) {
-				rs = serializeMethod(rs)
-			}
-			if (rs.data) {
-				this.addSession(rs.data, null, callback)
-				return rs
-			} else {
-				return Promise.reject('未找到会话' + sessionId)
-			}
-		}).finally(() => {
-			if (this.pollRequestMap[sessionId] === pollRequest) {
-				delete this.pollRequestMap[sessionId]
-			}
-		})
+		}
 		return this.pollRequestMap[sessionId].ps
 	}
 	
@@ -397,7 +387,7 @@ export default class ClientChatSession {
 	 *		"wechatAccountId": "2a39a725814acf07502299ab2285fff8d44377f5"
 	 *	}
 	*/
-	addSession (data, wechatAccountId, callback) {
+	addSession (data, wechatAccountId) {
 		if (!data || !data.conversationId) {
 			throw new Error('缺少必须参数conversationId')
 		}
@@ -499,10 +489,8 @@ export default class ClientChatSession {
 		if (virtualSessionIndex > -1) {
 			this.data.virtualSessionData.splice(virtualSessionIndex, 1)
 		}
-		callback && callback({
-			session: nextData
-		})
 		this.onAddSession && this.onAddSession({
+			wechatAccountId,
 			session: nextData
 		})
 	}

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

@@ -115,7 +115,24 @@ class ClientChat {
 		const mergeSessionCommonOptions = (options, instance) => {
 			let updateSessioning = false
 			let removeSessioning = false
-			options.onAddSession = ({ session }) => {
+			options.onAddSession = ({ session, wechatAccountId }) => {
+				// 不是来源于分页的时候，没有wechatAccountId就是代表不是走的分页增加的会话，一般为获取新消息或则分配的会话
+				if (!wechatAccountId && instance === this.session) {
+					// 更新账号未读消息数量
+					this.account.updateAccountUnreadMessageNum(session.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
+						if (session.mute) {
+							return {
+								num: (unreadMesasgeNum || 0) + (session.unreadMsgCount || 0),
+								muteNum: (unreadMessageMuteNum || 0) + (session.unreadMsgCount || 0)
+							}
+						} else {
+							return {
+								num: (unreadMesasgeNum || 0) + (session.unreadMsgCount || 0),
+								muteNum: unreadMessageMuteNum
+							}
+						}
+					})
+				}
 				// 同步未读会话
 				if (instance !== this.sessionUnread && session.unreadMsgCount > 0) {
 					const localSession = this.sessionUnread.findSession((localSession) => localSession.conversationId === session.conversationId)
@@ -423,22 +440,7 @@ class ClientChat {
 							rs.data.lastUpdateTime = data.updateDate
 						}
 						return rs
-					}, ({ session }) => {
-						// 更新账号未读消息数量
-						this.account.updateAccountUnreadMessageNum(session.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
-							if (session.mute) {
-								return {
-									num: (unreadMesasgeNum || 0) + (session.unreadMsgCount || 0),
-									muteNum: (unreadMessageMuteNum || 0) + (session.unreadMsgCount || 0)
-								}
-							} else {
-								return {
-									num: (unreadMesasgeNum || 0) + (session.unreadMsgCount || 0),
-									muteNum: unreadMessageMuteNum
-								}
-							}
-						})
-					}, false).then((rs => {
+					}).then((rs => {
 						// 前面更新未读消息数量只是处理会话的时候，因为getSession是异步的，会导致addMessage多次执行到这里，不会倒下面更新会话的逻辑
 						// 比如连续发了3条消息，然后getSession后端返回可能只会返回2条未读数，所以这里还需要补偿一下
 						const session = rs.data || {}
@@ -594,22 +596,7 @@ class ClientChat {
 							rs.data.lastAtMsgContent = appendLastAtMsgContent(rs.data.lastAtMsgContent, atMessage)
 						}
 						return rs
-					}, ({ session }) => {
-						// 更新账号未读消息数量
-						this.account.updateAccountUnreadMessageNum(session.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
-							if (session.mute) {
-								return {
-									num: (unreadMesasgeNum || 0) + (session.unreadMsgCount || 0),
-									muteNum: (unreadMessageMuteNum || 0) + (session.unreadMsgCount || 0)
-								}
-							} else {
-								return {
-									num: (unreadMesasgeNum || 0) + (session.unreadMsgCount || 0),
-									muteNum: unreadMessageMuteNum
-								}
-							}
-						})
-					}, false).then(rs => {
+					}).then(rs => {
 						// 前面更新未读消息数量只是处理会话的时候，因为getSession是异步的，会导致addMessage多次执行到这里，不会倒下面更新会话的逻辑
 						// 比如连续发了3条消息，然后getSession后端返回可能只会返回2条未读数，所以这里还需要补偿一下
 						const session = rs.data || {}