@aochuang/client-sdk 1.0.379-wework-3 → 1.0.379-wework-4

package/components/wework-chat-panel/chat-panel-chat-status/chat-panel-chat-status.vue

@@ -1,7 +1,29 @@
 <template>
   <div class="sdk-wework-panel-chat-status">
     <!-- status: 0 success, 1 sending, 2 failed, 3 timeout -->
-    <template v-if="data.status === 1">
+    <template v-if="data.recalling">
+      <span class="sdk-wework-panel-chat-status__recalling">
+        <ui-loading size="mini"></ui-loading>
+        撤回中...
+      </span>
+    </template>
+    <template v-else-if="data.recallStatus === 'failed'">
+      <bi-tooltip :text="`撤回失败：${data.recallResultMsg || '未知原因'}`">
+        <span class="sdk-wework-panel-chat-status__recall-result sdk-wework-panel-chat-status__recall-result--failed">
+          <svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M512 938.666667C276.352 938.666667 85.333333 747.648 85.333333 512S276.352 85.333333 512 85.333333s426.666667 191.018667 426.666667 426.666667-191.018667 426.666667-426.666667 426.666667z m0-486.997334L391.338667 330.965333 330.965333 391.338667 451.669333 512l-120.704 120.661333 60.373334 60.373334L512 572.330667l120.661333 120.704 60.373334-60.373334L572.330667 512l120.704-120.661333-60.373334-60.373334L512 451.669333z" fill="currentColor"></path></svg>
+          撤回失败
+        </span>
+      </bi-tooltip>
+    </template>
+    <template v-else-if="data.recallStatus === 'timeout'">
+      <bi-tooltip :text="data.recallResultMsg || '获取结果超时'">
+        <span class="sdk-wework-panel-chat-status__recall-result sdk-wework-panel-chat-status__recall-result--timeout">
+          <svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M512 938.666667C276.352 938.666667 85.333333 747.648 85.333333 512S276.352 85.333333 512 85.333333s426.666667 191.018667 426.666667 426.666667-191.018667 426.666667-426.666667 426.666667z m42.666667-426.666667V298.666667h-85.333334v298.666666h256v-85.333333h-170.666666z" fill="currentColor"></path></svg>
+          获取结果超时
+        </span>
+      </bi-tooltip>
+    </template>
+    <template v-else-if="data.status === 1">
       <ui-loading size="mini"></ui-loading>
     </template>
     <template v-else-if="data.status === 2">
@@ -18,13 +40,6 @@
         </span>
       </bi-tooltip>
     </template>
-    <template v-if="data.recalled">
-      <bi-tooltip text="消息已撤回">
-        <span class="sdk-wework-panel-chat-status__error sdk-wework-panel-chat-status__recalled">
-          <svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="200" height="200"><path d="M512 0c282.752 0 512 229.248 512 512s-229.248 512-512 512S0 794.752 0 512 229.248 0 512 0z m-50.261333 255.317333c-7.765333-39.338667-39.893333-15.36-39.893334-15.36l-213.76 192c-47.616 34.944-2.730667 60.458667-2.730666 60.458667l211.541333 190.933333c42.410667 33.066667 45.866667-17.749333 45.866667-17.749333v-86.442667c215.125333-70.144 303.36 208.341333 303.36 208.341334 7.936 15.957333 13.824 0 13.824 0C862.933333 368.682667 461.952 348.586667 461.952 348.586667z" fill="currentColor"></path></svg>
-        </span>
-      </bi-tooltip>
-    </template>
   </div>
 </template>
 
@@ -64,8 +79,30 @@ export default {
     height: 100%;
   }
 }
-.sdk-wework-panel-chat-status__recalled {
-  opacity: .6;
+.sdk-wework-panel-chat-status__recalling {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  color: #999;
+  font-size: 12px;
+  white-space: nowrap;
+}
+.sdk-wework-panel-chat-status__recall-result {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  font-size: 12px;
+  white-space: nowrap;
+  .icon {
+    width: 14px;
+    height: 14px;
+  }
+  &--failed {
+    color: #c00;
+  }
+  &--timeout {
+    color: #d48806;
+  }
 }
 .sdk-wework-panel-chat-status {
   margin: 0 6px;

package/components/wework-chat-panel/chat-panel-item.vue

@@ -4,31 +4,37 @@
   >
     <template slot-scope="{ configData }">
       <div class="sdk-wechat-panel-item" :data-id="item.id">
-        <template v-if="item.msgType !== '_EMPTY_'">
-			<slot name="chat-prefix" :item="item"></slot>
-		</template>
-      <template v-if="item.msgType === MESSAGE_TYPE.TEXT || item.msgType === MESSAGE_TYPE.TEXT_W">
-        <sdk-chat-panel-box
-          :dir="dir"
-          :data="item"
-          :fetchUserMethod="fetchUserMethod"
-          max-width="540px"
-          @user-avatar-click="handleUserAvatarClick"
-          @user-avatar-contextmenu="handleUserAvatarContextmenu"
+        <template v-if="item.msgType !== '_EMPTY_' && !item.recalled">
+          <slot name="chat-prefix" :item="item"></slot>
+        </template>
+        <template v-if="item.recalled">
+          <sdk-chat-control-jx-sys-text
+            :id="item.id"
+            content="撤回了一条消息"
+          ></sdk-chat-control-jx-sys-text>
+        </template>
+        <template v-else-if="item.msgType === MESSAGE_TYPE.TEXT || item.msgType === MESSAGE_TYPE.TEXT_W">
+          <sdk-chat-panel-box
+            :dir="dir"
+            :data="item"
+            :fetchUserMethod="fetchUserMethod"
+            max-width="540px"
+            @user-avatar-click="handleUserAvatarClick"
+            @user-avatar-contextmenu="handleUserAvatarContextmenu"
           >
-          <template slot-scope="{ setFootVnode }">
-            <sdk-chat-control-text
-              v-bind="configData"
-              :id="item.id"
-              :content="msgContent"
-              :set-chat-box-foot-vnode="setFootVnode"
-            ></sdk-chat-control-text>
-          </template>
-          <template slot="append" slot-scope="{ updateProp }">
-            <slot name="chat-append" :item="item" :update-chat-box-prop="updateProp"></slot>
-          </template>
-        </sdk-chat-panel-box>
-      </template>
+            <template slot-scope="{ setFootVnode }">
+              <sdk-chat-control-text
+                v-bind="configData"
+                :id="item.id"
+                :content="msgContent"
+                :set-chat-box-foot-vnode="setFootVnode"
+              ></sdk-chat-control-text>
+            </template>
+            <template slot="append" slot-scope="{ updateProp }">
+              <slot name="chat-append" :item="item" :update-chat-box-prop="updateProp"></slot>
+            </template>
+          </sdk-chat-panel-box>
+        </template>
       <template v-else-if="item.msgType === MESSAGE_TYPE.IMAGE">
         <sdk-chat-panel-box
           :dir="dir"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/client-sdk",
-  "version": "1.0.379-wework-3",
+  "version": "1.0.379-wework-4",
   "description": "",
   "files": [
     "common",

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

@@ -26,6 +26,7 @@ export default class ClientChatMessage {
 	lastMessageTimeMap = {}
 	tempMessageMap = {}
 	checkMessageSendResultTaskList = []
+	recallTaskMap = {}
 	
 	get messageData () {
 		return this.data.messageData
@@ -38,6 +39,8 @@ export default class ClientChatMessage {
 			sortField: null, // 排序的字段，必须是唯一的，例如时间
 			groupField: null, // 分组的字段
 			checkMessageSendResultMethod: null,
+			recallMessageMethod: null,
+			recallMessageIdField: null,
 			onAddMessageSuccess: null // 新增消息成功回调事件
 		}, options)
 		if (!options.clientChat) {
@@ -49,9 +52,15 @@ export default class ClientChatMessage {
 		this.groupField = options.groupField
 		this.sortField = options.sortField
 		this.checkMessageSendResultMethod = options.checkMessageSendResultMethod
+		this.recallMessageMethod = options.recallMessageMethod
+		this.recallMessageIdField = options.recallMessageIdField
 		this.onAddMessageSuccess = options.onAddMessageSuccess
 		this.event = new Event()
 	}
+
+	setRelatedMessageService (messageService) {
+		this.relatedMessageService = messageService
+	}
 	
 	getSortField (time) {
 		const step = 1000 * 60 * 60 * 24
@@ -147,6 +156,7 @@ export default class ClientChatMessage {
 			return
 		}
 		this.removeCheckMessageSendResultTask(id)
+		this.clearRecallState(id)
 		const message = this.messageMap[id]
 		if (!message) {
 			return
@@ -242,6 +252,7 @@ export default class ClientChatMessage {
 								message
 							})
 							if (rs === false) {
+								this.clearRecallState(message.id)
 								delete this.messageMap[message.id]
 							}
 							return rs
@@ -263,6 +274,8 @@ export default class ClientChatMessage {
 				return rs
 			}, {})
 		} else {
+			this.clearRecallTasks()
+			this.tempMessageMap = {}
 			this.data.messageData = {}
 			this.messageMap = {}
 		}
@@ -294,6 +307,139 @@ export default class ClientChatMessage {
 			return data
 		})
 	}
+
+	getRecallMessage (id) {
+		return this.getMessage(id) || this.tempMessageMap[id] ||
+			(this.relatedMessageService && (this.relatedMessageService.getMessage(id) || this.relatedMessageService.tempMessageMap[id]))
+	}
+
+	updateRecallMessage (id, props) {
+		this.updateMessage(id, props)
+		if (this.relatedMessageService) {
+			this.relatedMessageService.updateMessage(id, props)
+		}
+	}
+
+	clearRecallTask (id) {
+		const task = this.recallTaskMap[id]
+		if (!task) {
+			return
+		}
+		clearTimeout(task.timer)
+		delete this.recallTaskMap[id]
+	}
+
+	clearRecallState (id) {
+		this.clearRecallTask(id)
+		delete this.tempMessageMap[id]
+	}
+
+	getRecallErrorMessage (error) {
+		const responseData = error && error.response && error.response.data
+		if (responseData) {
+			return responseData.msg || responseData.message || responseData.error_description || '未知原因'
+		}
+		if (typeof error === 'string') {
+			return error
+		}
+		return (error && (error.errMsg || error.message)) || '未知原因'
+	}
+
+	recallMessage (params) {
+		const data = params || {}
+		const messageId = data[this.recallMessageIdField]
+		if (!this.recallMessageIdField || !messageId) {
+			return Promise.reject(new Error('缺少消息ID'))
+		}
+		if (!data.sendTime) {
+			return Promise.reject(new Error('缺少消息发送时间'))
+		}
+		if (!this.recallMessageMethod) {
+			return Promise.reject(new Error('缺少撤回消息接口配置'))
+		}
+		const message = this.getRecallMessage(messageId)
+		if (message && message.recalled) {
+			return Promise.reject(new Error('消息已撤回'))
+		}
+		if (message && message.recalling) {
+			return Promise.reject(new Error('消息正在撤回中'))
+		}
+		const requestData = {
+			[this.recallMessageIdField]: messageId,
+			sendTime: data.sendTime
+		}
+		this.clearRecallTask(messageId)
+		this.updateRecallMessage(messageId, {
+			recalling: true,
+			recallStatus: null,
+			recallResultMsg: null
+		})
+		const task = {
+			timer: setTimeout(() => {
+				if (this.recallTaskMap[messageId] !== task) {
+					return
+				}
+				delete this.recallTaskMap[messageId]
+				this.updateRecallMessage(messageId, {
+					recalling: false,
+					recallStatus: 'timeout',
+					recallResultMsg: '获取结果超时'
+				})
+			}, 10 * 1000)
+		}
+		this.recallTaskMap[messageId] = task
+
+		return Promise.resolve().then(() => this.recallMessageMethod(requestData)).catch(error => {
+			if (this.recallTaskMap[messageId] === task) {
+				this.clearRecallTask(messageId)
+				this.updateRecallMessage(messageId, {
+					recalling: false,
+					recallStatus: 'failed',
+					recallResultMsg: this.getRecallErrorMessage(error)
+				})
+			}
+			return Promise.reject(error)
+		})
+	}
+
+	handleMessageRecalled (data) {
+		const messageId = data && data[this.recallMessageIdField]
+		if (!messageId) {
+			return
+		}
+		this.clearRecallTask(messageId)
+		this.updateRecallMessage(messageId, {
+			recalled: true,
+			recalling: false,
+			recallStatus: null,
+			recallResultMsg: null,
+			revokeTime: data.revokeTime
+		})
+	}
+
+	handleMessageRecallFailed (data) {
+		const messageId = data && data[this.recallMessageIdField]
+		if (!messageId) {
+			return
+		}
+		const message = this.getRecallMessage(messageId)
+		if (message && message.recalled) {
+			return
+		}
+		this.clearRecallTask(messageId)
+		this.updateRecallMessage(messageId, {
+			recalling: false,
+			recallStatus: 'failed',
+			recallResultMsg: data.reason || '未知原因'
+		})
+	}
+
+	clearRecallTasks () {
+		Object.keys(this.recallTaskMap).forEach(id => {
+			clearTimeout(this.recallTaskMap[id].timer)
+		})
+		this.recallTaskMap = {}
+	}
 	
 	/***
 	 * 远程加载消息
@@ -363,6 +509,7 @@ export default class ClientChatMessage {
 	}
 	
 	reset () {
+		this.clearRecallTasks()
 		this.checkMessageSendResultTaskList.forEach(task => task.cancel())
 		this.checkMessageSendResultTaskList = []
 		this.tempMessageMap = {}

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

@@ -16,6 +16,7 @@ export default class ClietChatSocket {
 			beforeFireCallback: null, 
 			onCmdQwNewMessage: null,
 			onCmdQwMessageRecalled: null,
+			onCmdQwMessageRecallFailed: null,
 			onCmdQwContactInfoChanged: null,
 			onCmdQwContactRequestChanged: null,
 			onCmdQwAcceptContactRequest: null,
@@ -34,6 +35,7 @@ export default class ClietChatSocket {
 		this.socket = options.socket
 		this.socket.event.on('onCmdQwNewMessage', options.onCmdQwNewMessage)
 		this.socket.event.on('onCmdQwMessageRecalled', options.onCmdQwMessageRecalled)
+		this.socket.event.on('onCmdQwMessageRecallFailed', options.onCmdQwMessageRecallFailed)
 		this.socket.event.on('onCmdQwContactInfoChanged', options.onCmdQwContactInfoChanged)
 		this.socket.event.on('onCmdQwContactRequestChanged', options.onCmdQwContactRequestChanged)
 		this.socket.event.on('onCmdQwAcceptContactRequest', options.onCmdQwAcceptContactRequest)
@@ -65,21 +67,6 @@ export default class ClietChatSocket {
 		})
 	}
 
-	recallMessage (params) {
-		return this.sendMessage(Object.assign({
-			contactMessageId: null,
-			roomMessageId: null,
-			contactId: null,
-			roomId: null,
-			qwAccountId: null,
-			msgId: null,
-			convType: null,
-			sendTime: null
-		}, params, {
-			cmdType: 'CmdQwRecallMessage'
-		}))
-	}
-	
 	connect () {
 		return this.socket.connect()
 	}

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

@@ -47,9 +47,10 @@ class ClientChat {
 			getContactsRoomGroupCountMethod: null,
 			getContactsFriendMethod: null,
 			getContactsRoomMethod: null, 
-			loadFriendMessageDataMethod: null, 
+			loadFriendMessageDataMethod: null,
 			loadRoomMessageDataMethod: null,
 			checkMessageSendResultMethod: null,
+			recallMessageMethod: null,
 			onOverwriteFriendInfoChange: null // 为了兼容1.0拉取会话逻辑加的，1.0暂时不支持根据taskId拉取
 		}, options)
 		if (!options.loadFriendMessageDataMethod) {
@@ -95,6 +96,8 @@ class ClientChat {
 			sortField: 'sendTime',
 			clientChat: this,
 			checkMessageSendResultMethod: options.checkMessageSendResultMethod,
+			recallMessageMethod: options.recallMessageMethod,
+			recallMessageIdField: 'contactMessageId',
 			onAddMessageSuccess: ({ data, isBeforeLastMessage }) => {
 				const accountId = options.getLoginAccountIdMethod ? options.getLoginAccountIdMethod() : data.qwAccountId
 				let sessionId = createSessionId(accountId, data.contactId)
@@ -175,11 +178,14 @@ class ClientChat {
 				return options.loadFriendMessageDataMethod(params)
 			}
 		})
+		this.friendMessage.setRelatedMessageService(this.friendMessageFilter)
 		this.roomMessage = new ClientChatMessage({
 			groupField: 'roomId',
 			sortField: 'sendTime',
 			clientChat: this,
 			checkMessageSendResultMethod: options.checkMessageSendResultMethod,
+			recallMessageMethod: options.recallMessageMethod,
+			recallMessageIdField: 'roomMessageId',
 			onAddMessageSuccess: ({ data, isBeforeLastMessage }) => {
 				const accountId = options.getLoginAccountIdMethod ? options.getLoginAccountIdMethod() : data.qwAccountId
 				let sessionId = createSessionId(accountId, data.roomId)
@@ -261,6 +267,7 @@ class ClientChat {
 				return options.loadRoomMessageDataMethod(params)
 			}
 		})
+		this.roomMessage.setRelatedMessageService(this.roomMessageFilter)
 		this.contacts = new ClientChatContacts({
 			loadContactsRoomGroupDataMethod: options.loadContactsRoomGroupDataMethod,
 			loadContactsFriendGroupDataMethod: options.loadContactsFriendGroupDataMethod,
@@ -405,17 +412,17 @@ class ClientChat {
 				}
 			},
 			onCmdQwMessageRecalled: ({ data }) => {
-				if (!data) {
-					return
-				}
-				const recalled = {
-					recalled: true,
-					revokeTime: data.revokeTime
+				if (data && data.contactMessageId) {
+					this.friendMessage.handleMessageRecalled(data)
+				} else if (data && data.roomMessageId) {
+					this.roomMessage.handleMessageRecalled(data)
 				}
-				if (Number(data.convType) === 0 && data.contactMessageId) {
-					this.friendMessage.updateMessage(data.contactMessageId, recalled)
-				} else if (Number(data.convType) === 1 && data.roomMessageId) {
-					this.roomMessage.updateMessage(data.roomMessageId, recalled)
+			},
+			onCmdQwMessageRecallFailed: ({ data }) => {
+				if (data && data.contactMessageId) {
+					this.friendMessage.handleMessageRecallFailed(data)
+				} else if (data && data.roomMessageId) {
+					this.roomMessage.handleMessageRecallFailed(data)
 				}
 			},
 			// 会话失效