@aochuang/client-sdk 1.0.342 → 1.0.344

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

@@ -32,6 +32,7 @@ class ClientChat {
 			getLoginUserIdMethod: null,
 			getLoginUserTokenMethod: null,
 			loadAccountDataMethod: null,
+			getLoginAccountIdMethod: null, // 因为1.0有帮聊逻辑，帮聊消息以及通讯录的accountId不是登录用户的accountId，会导致找到的会话出现问题，所以这里提供一个方法让外部传入
 			loadSessionDataMethod: null,
 			updateSessionReadMethod: null,
 			getSessionMethod: null,
@@ -57,8 +58,9 @@ class ClientChat {
 		} 
 		if (!options.loadRoomMessageDataMethod) {
 			throw new Error('loadRoomMessageDataMethod不能为空')
-		} 
+		}
 		this.onOverwriteFriendInfoChange = options.onOverwriteFriendInfoChange
+		this.getLoginAccountIdMethod = options.getLoginAccountIdMethod
 		this.event = new Event({
 			checkOnMethod: (name) => {
 				if (name === 'ready') {
@@ -86,7 +88,8 @@ class ClientChat {
 			sortField: 'sendTime',
 			clientChat: this,
 			onAddMessageSuccess: ({ data }) => {
-				let sessionId = createSessionId(data.corpId, data.qwAccountId, data.contactId)
+				const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : data.qwAccountId
+				let sessionId = createSessionId(accountId, data.contactId)
 				// 更新会话
 				if (!sessionId) {
 					return
@@ -100,6 +103,15 @@ class ClientChat {
 						return this.session.getSession(sessionId).then(done)
 					})
 					this._sessionPollRequestMap[sessionId].start().then((rs) => {
+						// 后端更新会话是异步过程，返回的会话信息可能还未包含当前消息
+						if (rs && rs.data && !rs.data.unreadMsgCount) {
+							rs.data.unreadMsgCount = data.send ? 0 : 1
+							rs.data.lastMsgContent = data.content
+							rs.data.lastMsgType = data.msgType
+							rs.data.lastMsgTime = data.sendTime
+							rs.data.lastMsgId = data.id
+							rs.data.lastUpdateTime = data.updateDate
+						}
 						// 更新账号未读消息数量
 						this.account.updateAccountUnreadMessageNum(rs.data.qwAccountId, ({ unreadMesasgeNum }) => {
 							return unreadMesasgeNum += (rs.data.unreadMsgCount || 0)
@@ -110,7 +122,7 @@ class ClientChat {
 				} else {
 					this.session.updateSession(sessionId, ({ session }) => {
 						let unreadMsgCount = session.unreadMsgCount
-						if (!data.isSend) {
+						if (!data.send) {
 							unreadMsgCount = unreadMsgCount + 1
 						}
 						// 如果是当前会话，那么未读消息需要设置为0
@@ -155,7 +167,8 @@ class ClientChat {
 			sortField: 'sendTime',
 			clientChat: this,
 			onAddMessageSuccess: ({ data }) => {
-				let sessionId = createSessionId(data.corpId, data.qwAccountId, data.roomId)
+				const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : data.qwAccountId
+				let sessionId = createSessionId(accountId, data.roomId)
 				// 更新会话
 				if (!sessionId) {
 					return
@@ -170,6 +183,15 @@ class ClientChat {
 						return this.session.getSession(sessionId).then(done)
 					})
 					this._sessionPollRequestMap[sessionId].start().then((rs) => {
+						// 后端更新会话是异步过程，返回的会话信息可能还未包含当前消息
+						if (rs && rs.data && !rs.data.unreadMsgCount) {
+							rs.data.unreadMsgCount = data.send ? 0 : 1
+							rs.data.lastMsgContent = data.content
+							rs.data.lastMsgType = data.msgType
+							rs.data.lastMsgTime = data.sendTime
+							rs.data.lastMsgId = data.id
+							rs.data.lastUpdateTime = data.updateDate
+						}
 						// 更新账号未读消息数量
 						this.account.updateAccountUnreadMessageNum(rs.data.qwAccountId, ({ unreadMesasgeNum }) => {
 							return unreadMesasgeNum += (rs.data.unreadMsgCount || 0)
@@ -180,7 +202,7 @@ class ClientChat {
 				} else {
 					this.session.updateSession(sessionId, ({ session }) => {
 						let unreadMsgCount = session.unreadMsgCount
-						if (!data.isSend) {
+						if (!data.send) {
 							unreadMsgCount = unreadMsgCount + 1
 						}
 						// 如果是当前会话，那么未读消息需要设置为0
@@ -258,6 +280,77 @@ class ClientChat {
 		})
 		this.socket = new ClientChatSocket({
 			socket: options.socket,
+			onCmdQwContactInfoChanged: ({ data }) => {
+				const contacts = data && (Array.isArray(data.contacts)
+					? data.contacts
+					: (data.contactId ? [data] : []))
+				if (!contacts || !contacts.length) {
+					this.markAccountsModified(data && data.qwAccountIds)
+					return
+				}
+				const tasks = []
+				const removedTasks = []
+				contacts.forEach(contact => {
+					if (!contact) {
+						return
+					}
+					const changeType = Number(contact.changeType)
+					if (changeType === 1) {
+						tasks.push(this.handleQwContactAdded(contact, data))
+					} else if (changeType === 2) {
+						tasks.push(this.handleQwContactUpdated(contact))
+					} else if (changeType === 3) {
+						removedTasks.push(this.handleQwContactRemoved(contact, data))
+					}
+				})
+				return Promise.all(tasks.concat(removedTasks)).then(results => {
+					const accountUnreadCountMap = {}
+					removedTasks.forEach((task, index) => {
+						const result = results[tasks.length + index]
+						if (!result || !result.accountId || !result.unreadCount) {
+							return
+						}
+						accountUnreadCountMap[result.accountId] = (accountUnreadCountMap[result.accountId] || 0) + result.unreadCount
+					})
+					return Promise.all(Object.keys(accountUnreadCountMap).map(accountId => {
+						const removedUnreadCount = accountUnreadCountMap[accountId]
+						return this.account.updateAccountUnreadMessageNum(accountId, ({ unreadMesasgeNum }) => {
+							return Math.max(0, unreadMesasgeNum - removedUnreadCount)
+						}).catch(error => {
+							console.warn('[client-chat] update account unread count failed', error)
+						})
+					}))
+				})
+			},
+			onCmdQwRoomInfoChanged: ({ data }) => {
+				const rooms = data && (Array.isArray(data.rooms)
+					? data.rooms
+					: (data.roomId ? [data] : []))
+				if (!rooms || !rooms.length) {
+					this.markAccountsModified(data && data.qwAccountIds)
+					return
+				}
+				const tasks = []
+				const removedTasks = []
+				rooms.forEach(room => {
+					if (!room) {
+						return
+					}
+					const changeType = Number(room.changeType)
+					if (changeType === 1) {
+						tasks.push(this.handleQwRoomAdded(room, data))
+					} else if (changeType === 2) {
+						tasks.push(this.handleQwRoomUpdated(room))
+					} else if (changeType === 3) {
+						removedTasks.push(this.handleQwRoomRemoved(room, data))
+					}
+				})
+				return Promise.all(tasks.concat(removedTasks)).then(results => {
+					return this.updateRemovedSessionUnreadCounts(
+						results.slice(tasks.length)
+					)
+				})
+			},
 			// 接受新消息
 			onCmdQwNewMessage: ({ data }) => {
 				// 插入消息
@@ -279,19 +372,193 @@ class ClientChat {
 				})
 			},
 			onHeartbeatSuccess: ({ data }) => {
-				if (!data.wq) {
-					return
-				}
-				const onlineMap = data.wq || {}
+				const onlineMap = data || {}
 				Object.keys(onlineMap).forEach(k => {
 					this.account.updateAccount(k, {
 						alive: onlineMap[k]
-					})
+					}) 
+				})
+			}
+		})
+	}
+
+	getQwAccountCorpId (qwAccountId, corpId) {
+		if (corpId || !qwAccountId || !this.account) {
+			return corpId
+		}
+		const account = this.account.getAccountData().find(item => item.id === qwAccountId)
+		return account && account.corpId
+	}
+
+	markAccountsModified (qwAccountIds) {
+		if (!Array.isArray(qwAccountIds) || !qwAccountIds.length) {
+			return
+		}
+		this.session.markModify(qwAccountIds)
+		this.contacts.markModify(qwAccountIds)
+	}
+
+	updateRemovedSessionUnreadCounts (results) {
+		const accountUnreadCountMap = {}
+		;(results || []).forEach(result => {
+			if (!result || !result.accountId || !result.unreadCount) {
+				return
+			}
+			accountUnreadCountMap[result.accountId] = (accountUnreadCountMap[result.accountId] || 0) + result.unreadCount
+		})
+		return Promise.all(Object.keys(accountUnreadCountMap).map(accountId => {
+			const removedUnreadCount = accountUnreadCountMap[accountId]
+			return this.account.updateAccountUnreadMessageNum(accountId, ({ unreadMesasgeNum }) => {
+				return Math.max(0, unreadMesasgeNum - removedUnreadCount)
+			}).catch(error => {
+				console.warn('[client-chat] update account unread count failed', error)
+			})
+		}))
+	}
+
+	handleQwContactAdded (contact, eventData) {
+		const qwAccountId = contact.qwAccountId || (eventData && eventData.qwAccountId)
+		const corpId = this.getQwAccountCorpId(
+			qwAccountId,
+			contact.corpId || (eventData && eventData.corpId)
+		)
+		const contactId = contact.contactId
+		const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : qwAccountId
+		const sessionId = createSessionId(accountId, contactId)
+		if (!sessionId) {
+			return Promise.resolve()
+		}
+		const localSession = this.session.getSessionByLocal(sessionId)
+		const oldUnread = localSession ? (localSession.unreadMsgCount || 0) : 0
+		return this.session.refreshSession(sessionId).then(rs => {
+			const serverSession = rs && rs.data
+			const newUnread = serverSession ? (serverSession.unreadMsgCount || 0) : 0
+			const accountId = (serverSession && serverSession.qwAccountId) || qwAccountId
+			const unreadDiff = newUnread - oldUnread
+			if (accountId && unreadDiff) {
+				return this.account.updateAccountUnreadMessageNum(accountId, ({ unreadMesasgeNum }) => {
+					return Math.max(0, unreadMesasgeNum + unreadDiff)
 				})
 			}
+		}).catch(error => {
+			console.warn('[client-chat] refresh added contact session failed', error)
+		})
+	}
+
+	handleQwContactUpdated (contact) {
+		if (!contact.contactId) {
+			return Promise.resolve()
+		}
+		return this.contacts.refreshFriend(contact.contactId).catch(error => {
+			console.warn('[client-chat] refresh contact failed', error)
+		})
+	}
+
+	handleQwContactRemoved (contact, eventData) {
+		if (!contact.contactId) {
+			return Promise.resolve()
+		}
+		this.contacts.removeFriend(contact.contactId)
+		let session = this.session.findSession(({ session }) => {
+			return String(session.type) === '0' &&
+				session.targetId === contact.contactId &&
+				(!contact.qwAccountId || session.qwAccountId === contact.qwAccountId)
+		})
+		if (!session) {
+			const qwAccountId = contact.qwAccountId || (eventData && eventData.qwAccountId)
+			const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : qwAccountId
+			const sessionId = createSessionId(
+				accountId,
+				contact.contactId
+			)
+			session = sessionId && this.session.getSessionByLocal(sessionId)
+		}
+		if (!session) {
+			return Promise.resolve()
+		}
+		if (this.session.currentSession && this.session.currentSession.id === session.id) {
+			this.session.setCurrentSession(null)
+		}
+		const accountId = session.qwAccountId || contact.qwAccountId
+		const unreadCount = session.unreadMsgCount || 0
+		this.session.removeSession(session.id)
+		return Promise.resolve({
+			accountId,
+			unreadCount
 		})
 	}
 	
+	handleQwRoomAdded (room, eventData) {
+		if (!room.roomId) {
+			return Promise.resolve()
+		}
+		const qwAccountId = room.qwAccountId || (eventData && eventData.qwAccountId)
+		const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : qwAccountId
+		const sessionId = createSessionId(accountId, room.roomId)
+		const localSession = sessionId && this.session.getSessionByLocal(sessionId)
+		const oldUnread = localSession ? (localSession.unreadMsgCount || 0) : 0
+		const tasks = [this.contacts.refreshRoom(room.roomId).catch(error => {
+			console.warn('[client-chat] refresh added room failed', error)
+		})]
+		if (sessionId) {
+			tasks.push(this.session.refreshSession(sessionId).then(rs => {
+				const serverSession = rs && rs.data
+				const unreadDiff = (serverSession ? (serverSession.unreadMsgCount || 0) : 0) - oldUnread
+				const changedAccountId = (serverSession && serverSession.qwAccountId) || qwAccountId
+				if (changedAccountId && unreadDiff) {
+					return this.account.updateAccountUnreadMessageNum(changedAccountId, ({ unreadMesasgeNum }) => {
+						return Math.max(0, unreadMesasgeNum + unreadDiff)
+					})
+				}
+			}).catch(error => {
+				console.warn('[client-chat] refresh added room session failed', error)
+			}))
+		}
+		return Promise.all(tasks)
+	}
+
+	handleQwRoomUpdated (room) {
+		if (!room.roomId) {
+			return Promise.resolve()
+		}
+		return this.contacts.refreshRoom(room.roomId).catch(error => {
+			console.warn('[client-chat] refresh room failed', error)
+		})
+	}
+
+	handleQwRoomRemoved (room, eventData) {
+		if (!room.roomId) {
+			return Promise.resolve()
+		}
+		this.contacts.removeRoom(room.roomId)
+		this.event.emit('roomRemoved', {
+			roomId: room.roomId
+		})
+		const qwAccountId = room.qwAccountId || (eventData && eventData.qwAccountId)
+		let session = this.session.findSession(({ session }) => {
+			return String(session.type) === '1' &&
+				session.targetId === room.roomId &&
+				(!qwAccountId || session.qwAccountId === qwAccountId)
+		})
+		if (!session) {
+			const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : qwAccountId
+			const sessionId = createSessionId(accountId, room.roomId)
+			session = sessionId && this.session.getSessionByLocal(sessionId)
+		}
+		if (!session) {
+			return Promise.resolve()
+		}
+		if (this.session.currentSession && this.session.currentSession.id === session.id) {
+			this.session.setCurrentSession(null)
+		}
+		const unreadCount = session.unreadMsgCount || 0
+		this.session.removeSession(session.id)
+		return Promise.resolve({
+			accountId: session.qwAccountId || qwAccountId,
+			unreadCount
+		})
+	}
+
 	connect () {
 		if (this.data.connectStatus === CONNECT_STATUS.Complete) {
 			return Promise.resolve()
@@ -328,4 +595,4 @@ class ClientChat {
 	}
 }
 
-export default ClientChat
+export default ClientChat

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

@@ -13,11 +13,11 @@ export function isUni () {
  * @param accountId - 客服id
  * @param targetId - wechatFriendId | wechatChatroomId
 */
-export function createSessionId (corpId, accountId, targetId) {
-	if (!corpId || !accountId || !targetId) {
+export function createSessionId (accountId, targetId) {
+	if (!accountId || !targetId) {
 		return
 	}
-	return shajs('sha1').update(`${corpId}${accountId}${targetId}`).digest('hex')
+	return shajs('sha1').update(`${accountId}${targetId}`).digest('hex')
 }
 
 /**
@@ -54,7 +54,7 @@ export function createSessionId (corpId, accountId, targetId) {
  *	     "msgSvrId": "4319123759514541049",
  *	     "msgType": 1,
  *	     "origin": "0",
- *	     "sendStatus": 0,
+ *	     "status": 0,
  *	     "tenantId": "1761952223049924608",
  *	     "wechatAccountId": "ad9d9ae2a8be4f27311312cdd4af3549dc8427ef",
  *	     "wechatFriendId": "2089efcc7f8f40b00b7f05fa4c6dfd3bb642774d",
@@ -79,4 +79,4 @@ export function createSessionData (message) {
 		wechatAccountId: message.wechatAccountId
 	}
 	return nextSession
-}
+}

package/components/wework-chat-panel/chat-panel-controls/company-card/company-card.vue

@@ -1,35 +0,0 @@
-<script>
-import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
-import { companyCard } from '../../../wework-chat-control'
-
-export default {
-  name: 'SdkWeworkChatPanelControlsCompanyCard',
-  functional: true,
-  props: {
-    dir: {
-      type: String
-    },
-    data: {
-      type: Object,
-      required: true
-    },
-    fetchUserMethod: {
-      type: Function
-    }
-  },
-  render (h, c) {
-    const { props } = c
-    return h(SdkChatPanelBox, {
-      props: {
-        dir: props.dir,
-        data: props.data,
-        fetchUserMethod: props.fetchUserMethod
-      }
-    }, [h(companyCard, {
-      props: {
-        data: props.data
-      }
-    })])
-  }
-}
-</script>

package/components/wework-chat-panel/chat-panel-controls/expression/expression.vue

@@ -1,36 +0,0 @@
-<script>
-import { expression } from '../../../wework-chat-control'
-import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
-
-export default {
-  name: 'SdkWeworkChatPanelControlsExpression',
-  functional: true,
-  props: {
-    dir: {
-      type: String
-    },
-    data: {
-      type: Object,
-      default: () => ({})
-    },
-    fetchUserMethod: {
-      type: Function
-    }
-  },
-  render (h, c) {
-    const { props } = c
-    return h(SdkChatPanelBox, {
-      props: {
-        dir: props.dir,
-        data: props.data,
-        fetchUserMethod: props.fetchUserMethod
-      }
-    }, [h(expression, {
-      props: {
-        data: props.data
-      },
-      key: c.data.key
-    })])
-  }
-}
-</script>

package/components/wework-chat-panel/chat-panel-controls/file-url/file-url.vue

@@ -1,35 +0,0 @@
-<script>
-import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
-import { fileUrl } from '../../../wework-chat-control'
-
-export default {
-  name: 'SdkWeworkChatPanelControlsFileUrl',
-  functional: true,
-  props: {
-    dir: {
-      type: String
-    },
-    data: {
-      type: Object,
-      required: true
-    },
-    fetchUserMethod: {
-      type: Function
-    }
-  },
-  render (h, c) {
-    const { props } = c
-    return h(SdkChatPanelBox, {
-      props: {
-        dir: props.dir,
-        data: props.data,
-        fetchUserMethod: props.fetchUserMethod
-      }
-    }, [h(fileUrl, {
-      props: {
-        content: props.data.content
-      }
-    })])
-  }
-}
-</script>

package/components/wework-chat-panel/chat-panel-controls/image/image.vue

@@ -1,36 +0,0 @@
-<script>
-import { image } from '../../../wework-chat-control'
-import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
-
-export default {
-  name: 'SdkWeworkChatPanelControlsImage',
-  functional: true,
-  props: {
-    dir: {
-      type: String
-    },
-    data: {
-      type: Object,
-      default: () => ({})
-    },
-    fetchUserMethod: {
-      type: Function
-    }
-  },
-  render (h, c) {
-    const { props } = c
-    return h(SdkChatPanelBox, {
-      props: {
-        dir: props.dir,
-        data: props.data,
-        fetchUserMethod: props.fetchUserMethod
-      }
-    }, [h(image, {
-      props: {
-        data: props.data
-      },
-      key: c.data.key
-    })])
-  }
-}
-</script>

package/components/wework-chat-panel/chat-panel-controls/index.js

@@ -1,35 +0,0 @@
-import text from './text/text.vue'
-import link from './link/link.vue'
-import companyCard from './company-card/company-card.vue'
-import video from './video/video.vue'
-import image from './image/image.vue'
-import unkonw from './unkonw/unkonw.vue'
-import expression from './expression/expression.vue'
-import voice from './voice/voice.vue'
-import jxSysText from './jx-sys-text/jx-sys-text.vue'
-import fileUrl from './file-url/file-url.vue'
-import location from './location/location.vue'
-
-export default {
-  0: text,
-  2: text,
-  14: image,
-  101: image,
-  // '49': link,
-  22: video,
-  23: video,
-  103: video,
-  29: expression,
-  104: expression,
-  16: voice,
-  40: voice,
-  1011: jxSysText,
-  1022: jxSysText,
-  41: companyCard,
-  13: fileUrl,
-  15: fileUrl,
-  20: fileUrl,
-  102: fileUrl,
-  6: location,
-  unkonw
-}

package/components/wework-chat-panel/chat-panel-controls/jx-sys-text/jx-sys-text.vue

@@ -1,28 +0,0 @@
-<script>
-import { jxSysText } from '../../../wework-chat-control'
-
-export default {
-  name: 'SdkWeworkChatPanelControlsJxSysText',
-  functional: true,
-  props: {
-    dir: {
-      type: String
-    },
-    data: {
-      type: Object,
-      required: true
-    },
-    fetchUserMethod: {
-      type: Function
-    }
-  },
-  render (h, c) {
-    const { props } = c
-    return h(jxSysText, {
-      props: {
-        content: props.data.content
-      }
-    })
-  }
-}
-</script>

package/components/wework-chat-panel/chat-panel-controls/link/link.vue

@@ -1,35 +0,0 @@
-<script>
-import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
-import { link } from '../../../wework-chat-control'
-
-export default {
-  name: 'SdkWeworkChatPanelControlsLink',
-  functional: true,
-  props: {
-    dir: {
-      type: String
-    },
-    data: {
-      type: Object,
-      required: true
-    },
-    fetchUserMethod: {
-      type: Function
-    }
-  },
-  render (h, c) {
-    const { props } = c
-    return h(SdkChatPanelBox, {
-      props: {
-        dir: props.dir,
-        data: props.data,
-        fetchUserMethod: props.fetchUserMethod
-      }
-    }, [h(link, {
-      props: {
-        data: props.data
-      }
-    })])
-  }
-}
-</script>

package/components/wework-chat-panel/chat-panel-controls/location/location.vue

@@ -1,35 +0,0 @@
-<script>
-import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
-import { location } from '../../../wework-chat-control'
-
-export default {
-  name: 'SdkWeworkChatPanelControlsLocation',
-  functional: true,
-  props: {
-    dir: {
-      type: String
-    },
-    data: {
-      type: Object,
-      required: true
-    },
-    fetchUserMethod: {
-      type: Function
-    }
-  },
-  render (h, c) {
-    const { props } = c
-    return h(SdkChatPanelBox, {
-      props: {
-        dir: props.dir,
-        data: props.data,
-        fetchUserMethod: props.fetchUserMethod
-      }
-    }, [h(location, {
-      props: {
-        content: props.data.content
-      }
-    })])
-  }
-}
-</script>