@ai-group/chat-sdk 3.6.4 → 3.6.6

package/dist/esm/hooks/useADKChat.js

@@ -49,6 +49,60 @@ var getMessageEventId = function getMessageEventId(messageItem) {
   var _messageItem$raw;
   return messageItem.eventId || ((_messageItem$raw = messageItem.raw) === null || _messageItem$raw === void 0 ? void 0 : _messageItem$raw.id);
 };
+var getMessageInvocationId = function getMessageInvocationId(messageItem) {
+  var _messageItem$raw2;
+  return messageItem.invocationId || ((_messageItem$raw2 = messageItem.raw) === null || _messageItem$raw2 === void 0 ? void 0 : _messageItem$raw2.invocationId);
+};
+var deduplicateMessages = function deduplicateMessages(messageItems) {
+  var seenMessageIds = new Set();
+  var hasDuplicate = false;
+  var uniqueIdMessages = messageItems.filter(function (messageItem) {
+    if (seenMessageIds.has(messageItem.id)) {
+      hasDuplicate = true;
+      return false;
+    }
+    seenMessageIds.add(messageItem.id);
+    return true;
+  });
+  var botTextGroups = new Map();
+  uniqueIdMessages.forEach(function (messageItem) {
+    var invocationId = getMessageInvocationId(messageItem);
+    if (messageItem.role !== "bot" || !invocationId || typeof messageItem.text !== "string") return;
+    var normalizedText = messageItem.text.replace(/\s+/g, " ").trim();
+    if (!normalizedText) return;
+    var fileKey = (messageItem.fileData || []).map(function (file) {
+      return file.fileUri;
+    }).join("|");
+    var groupKey = "".concat(invocationId, "\0").concat(Boolean(messageItem.thought), "\0").concat(fileKey);
+    var group = botTextGroups.get(groupKey) || [];
+    group.push({
+      messageItem: messageItem,
+      normalizedText: normalizedText
+    });
+    botTextGroups.set(groupKey, group);
+  });
+  var redundantMessageIds = new Set();
+  botTextGroups.forEach(function (group) {
+    var completeTexts = [];
+    _toConsumableArray(group).sort(function (a, b) {
+      return b.normalizedText.length - a.normalizedText.length;
+    }).forEach(function (_ref) {
+      var messageItem = _ref.messageItem,
+        normalizedText = _ref.normalizedText;
+      if (completeTexts.some(function (completeText) {
+        return completeText.includes(normalizedText);
+      })) {
+        redundantMessageIds.add(messageItem.id);
+        hasDuplicate = true;
+        return;
+      }
+      completeTexts.push(normalizedText);
+    });
+  });
+  return hasDuplicate ? uniqueIdMessages.filter(function (messageItem) {
+    return !redundantMessageIds.has(messageItem.id);
+  }) : messageItems;
+};
 var mapSessionMessages = function mapSessionMessages(sessionEvents) {
   var mapped = [];
   sessionEvents.forEach(function (item) {
@@ -145,12 +199,58 @@ var mapSessionMessages = function mapSessionMessages(sessionEvents) {
   });
   return mapped;
 };
+var getComparableMessageContent = function getComparableMessageContent(messageItem) {
+  var _messageItem$text;
+  return JSON.stringify({
+    role: messageItem.role,
+    text: ((_messageItem$text = messageItem.text) === null || _messageItem$text === void 0 ? void 0 : _messageItem$text.replace(/\r\n/g, "\n").trim()) || "",
+    thought: Boolean(messageItem.thought),
+    inlineData: messageItem.inlineData || null,
+    fileData: messageItem.fileData || null,
+    functionCall: messageItem.functionCall || null,
+    functionResponse: messageItem.functionResponse || null,
+    executableCode: messageItem.executableCode || null,
+    codeExecutionResult: messageItem.codeExecutionResult || null
+  });
+};
+var isStreamMessageWithoutServerEventId = function isStreamMessageWithoutServerEventId(messageItem) {
+  var eventId = getMessageEventId(messageItem);
+  return Boolean(messageItem.invocationId) && (!eventId || eventId === messageItem.invocationId);
+};
 var insertMissingSessionEvents = function insertMissingSessionEvents(currentMessages, sessionEvents) {
   var renderedEventIds = new Set(currentMessages.map(getMessageEventId).filter(Boolean));
+  var unmatchedStreamMessageIndexes = new Set(currentMessages.map(function (messageItem, index) {
+    return isStreamMessageWithoutServerEventId(messageItem) ? index : -1;
+  }).filter(function (index) {
+    return index >= 0;
+  }));
   var missingEvents = sessionEvents.filter(function (event) {
     var _event$content, _event$content2;
     var parts = (_event$content = event.content) === null || _event$content === void 0 ? void 0 : _event$content.parts;
-    return Boolean(event.id) && ((_event$content2 = event.content) === null || _event$content2 === void 0 ? void 0 : _event$content2.role) === "model" && Array.isArray(parts) && parts.length > 0 && !renderedEventIds.has(event.id);
+    var canRender = Boolean(event.id) && ((_event$content2 = event.content) === null || _event$content2 === void 0 ? void 0 : _event$content2.role) === "model" && Array.isArray(parts) && parts.length > 0;
+    if (!canRender || renderedEventIds.has(event.id)) return false;
+
+    // 新版 SSE 包装数据没有事件 id，只能临时使用 invocationId。
+    // 用 invocationId + 完整渲染内容做一次性身份对齐，避免会话轮询重复插入；
+    // 同 invocation 下内容不同或后续出现的事件，仍然按独立 event.id 补入。
+    var eventMessages = mapSessionMessages([event]);
+    var matchedIndexes = [];
+    var isRenderedByStream = eventMessages.length > 0 && eventMessages.every(function (eventMessage) {
+      var comparableContent = getComparableMessageContent(eventMessage);
+      var matchedIndex = currentMessages.findIndex(function (currentMessage, index) {
+        return unmatchedStreamMessageIndexes.has(index) && !matchedIndexes.includes(index) && currentMessage.invocationId === eventMessage.invocationId && getComparableMessageContent(currentMessage) === comparableContent;
+      });
+      if (matchedIndex < 0) return false;
+      matchedIndexes.push(matchedIndex);
+      return true;
+    });
+    if (isRenderedByStream) {
+      matchedIndexes.forEach(function (index) {
+        return unmatchedStreamMessageIndexes.delete(index);
+      });
+      return false;
+    }
+    return true;
   });
   if (missingEvents.length === 0) return currentMessages;
   var missingMessages = mapSessionMessages(missingEvents);
@@ -159,10 +259,10 @@ var insertMissingSessionEvents = function insertMissingSessionEvents(currentMess
     return [event.id, index];
   }));
   var getMessageOrder = function getMessageOrder(messageItem) {
-    var _messageItem$timestam, _messageItem$raw2;
+    var _messageItem$timestam, _messageItem$raw3;
     var eventId = getMessageEventId(messageItem);
     if (eventId && eventOrder.has(eventId)) return eventOrder.get(eventId);
-    var timestamp = (_messageItem$timestam = messageItem.timestamp) !== null && _messageItem$timestam !== void 0 ? _messageItem$timestam : (_messageItem$raw2 = messageItem.raw) === null || _messageItem$raw2 === void 0 ? void 0 : _messageItem$raw2.timestamp;
+    var timestamp = (_messageItem$timestam = messageItem.timestamp) !== null && _messageItem$timestam !== void 0 ? _messageItem$timestam : (_messageItem$raw3 = messageItem.raw) === null || _messageItem$raw3 === void 0 ? void 0 : _messageItem$raw3.timestamp;
     if (timestamp !== undefined) {
       var nextEventIndex = sessionEvents.findIndex(function (event) {
         return (event.timestamp || 0) > timestamp;
@@ -186,22 +286,22 @@ var insertMissingSessionEvents = function insertMissingSessionEvents(currentMess
 
 // 后台会话连接状态
 
-function useADKChat(_ref) {
+function useADKChat(_ref2) {
   var _config$session$pollS, _config$session, _config$session$sessi, _config$session2;
-  var _ref$url = _ref.url,
-    url = _ref$url === void 0 ? window.location.origin : _ref$url,
-    token = _ref.token,
-    _ref$config = _ref.config,
-    config = _ref$config === void 0 ? {} : _ref$config,
-    _ref$type = _ref.type,
-    type = _ref$type === void 0 ? "agentDebug" : _ref$type,
-    _ref$enabled = _ref.enabled,
-    enabled = _ref$enabled === void 0 ? true : _ref$enabled,
-    strategies = _ref.strategies,
-    onError = _ref.onError,
-    onMessage = _ref.onMessage,
-    onSuccess = _ref.onSuccess,
-    onStream = _ref.onStream;
+  var _ref2$url = _ref2.url,
+    url = _ref2$url === void 0 ? window.location.origin : _ref2$url,
+    token = _ref2.token,
+    _ref2$config = _ref2.config,
+    config = _ref2$config === void 0 ? {} : _ref2$config,
+    _ref2$type = _ref2.type,
+    type = _ref2$type === void 0 ? "agentDebug" : _ref2$type,
+    _ref2$enabled = _ref2.enabled,
+    enabled = _ref2$enabled === void 0 ? true : _ref2$enabled,
+    strategies = _ref2.strategies,
+    onError = _ref2.onError,
+    onMessage = _ref2.onMessage,
+    onSuccess = _ref2.onSuccess,
+    onStream = _ref2.onStream;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
@@ -220,9 +320,9 @@ function useADKChat(_ref) {
   var tokenRef = useRef(token);
   tokenRef.current = token;
   // 应用配置
-  var _ref2 = config || {},
-    appNo = _ref2.appNo,
-    showFirstSession = _ref2.showFirstSession;
+  var _ref3 = config || {},
+    appNo = _ref3.appNo,
+    showFirstSession = _ref3.showFirstSession;
   var pollSessionEvents = (_config$session$pollS = config === null || config === void 0 || (_config$session = config.session) === null || _config$session === void 0 ? void 0 : _config$session.pollSessionEvents) !== null && _config$session$pollS !== void 0 ? _config$session$pollS : true;
   var sessionEventsPollingInterval = Math.max((_config$session$sessi = config === null || config === void 0 || (_config$session2 = config.session) === null || _config$session2 === void 0 ? void 0 : _config$session2.sessionEventsPollingInterval) !== null && _config$session$sessi !== void 0 ? _config$session$sessi : DEFAULT_SESSION_EVENTS_POLLING_INTERVAL, 1000);
   var _useState5 = useState(null),
@@ -284,13 +384,14 @@ function useADKChat(_ref) {
   currentSessionIdRef.current = currentSessionId;
   var mergedMessages = useMemo(function () {
     var fnResMap = {};
-    messages.forEach(function (msg) {
+    var uniqueMessages = deduplicateMessages(messages);
+    uniqueMessages.forEach(function (msg) {
       if (msg.functionResponse) {
         var _msg$functionResponse;
         fnResMap[(msg === null || msg === void 0 || (_msg$functionResponse = msg.functionResponse) === null || _msg$functionResponse === void 0 ? void 0 : _msg$functionResponse.id) || ""] = msg.functionResponse;
       }
     });
-    return messages.map(function (msg) {
+    return uniqueMessages.map(function (msg) {
       if (msg.functionCall) {
         var _msg$functionCall;
         return _objectSpread(_objectSpread({}, msg), {}, {
@@ -646,7 +747,7 @@ function useADKChat(_ref) {
               content: rawData.data,
               invocationId: rawData.result.invocationId,
               sessionId: rawData.result.sessionId,
-              id: rawData.result.invocationId
+              id: rawData.data.id || rawData.result.id || rawData.result.eventId || rawData.result.invocationId
             });
           }
           if (chunkJson.error) {
@@ -796,12 +897,12 @@ function useADKChat(_ref) {
 
   // 发送会话
   var startChat = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
-      var _ref3$text, text, _ref3$files, files, functionResponse;
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref4) {
+      var _ref4$text, text, _ref4$files, files, functionResponse;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _ref3$text = _ref3.text, text = _ref3$text === void 0 ? "" : _ref3$text, _ref3$files = _ref3.files, files = _ref3$files === void 0 ? [] : _ref3$files, functionResponse = _ref3.functionResponse;
+            _ref4$text = _ref4.text, text = _ref4$text === void 0 ? "" : _ref4$text, _ref4$files = _ref4.files, files = _ref4$files === void 0 ? [] : _ref4$files, functionResponse = _ref4.functionResponse;
             if (!(loadingRef.current || sendingRef.current)) {
               _context2.next = 3;
               break;
@@ -893,13 +994,13 @@ function useADKChat(_ref) {
       }, _callee2, null, [[8,, 11, 14]]);
     }));
     return function startChat(_x) {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 
   // 重新发送会话
   var reChat = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var lastUserIndex, newMessages, lastUserMessage, _lastUserMessage$text, text, _lastUserMessage$file, fileData;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -967,7 +1068,7 @@ function useADKChat(_ref) {
       }, _callee3, null, [[14,, 17, 20]]);
     }));
     return function reChat() {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 
@@ -1031,7 +1132,7 @@ function useADKChat(_ref) {
 
   // 设置当前会话详情
   var setCurrentSession = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(sessionId) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(sessionId) {
       var prevSessionId, bg, _yield$fetchSessionDe, data, result, _appInfo$onboardingIn3, _appInfo$onboardingIn4;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -1132,13 +1233,13 @@ function useADKChat(_ref) {
       }, _callee4, null, [[21,, 28, 32]]);
     }));
     return function setCurrentSession(_x2) {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
 
   // 获取聊天记录
   var initAppConversations = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
       var fetchDetail,
         _yield$fetchSessionLi,
         _yield$fetchSessionLi2,
@@ -1242,13 +1343,13 @@ function useADKChat(_ref) {
       }, _callee5, null, [[1, 13, 16, 19]]);
     }));
     return function initAppConversations() {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
 
   // 删除会话
   var deleteSession = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(sessionId) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(sessionId) {
       var _yield$closeSession, result;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
@@ -1286,13 +1387,13 @@ function useADKChat(_ref) {
       }, _callee6);
     }));
     return function deleteSession(_x3) {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
 
   // 点赞/点踩
   var likeMessage = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(invocationId, isLike, feedbackData) {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(invocationId, isLike, feedbackData) {
       var _yield$addFeedback, result;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
@@ -1335,13 +1436,13 @@ function useADKChat(_ref) {
       }, _callee7);
     }));
     return function likeMessage(_x4, _x5, _x6) {
-      return _ref9.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }();
 
   // 更新会话名称
   var updateSession = /*#__PURE__*/function () {
-    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(sessionId, title) {
+    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(sessionId, title) {
       var _yield$updateSessionT, result;
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
         while (1) switch (_context8.prev = _context8.next) {
@@ -1376,13 +1477,13 @@ function useADKChat(_ref) {
       }, _callee8);
     }));
     return function updateSession(_x7, _x8) {
-      return _ref10.apply(this, arguments);
+      return _ref11.apply(this, arguments);
     };
   }();
 
   // 初始化应用
   var initConfig = /*#__PURE__*/function () {
-    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+    var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
       var _yield$fetchAppConfig, data, result;
       return _regeneratorRuntime().wrap(function _callee9$(_context9) {
         while (1) switch (_context9.prev = _context9.next) {
@@ -1433,7 +1534,7 @@ function useADKChat(_ref) {
       }, _callee9, null, [[0, 10, 13, 16]]);
     }));
     return function initConfig() {
-      return _ref11.apply(this, arguments);
+      return _ref12.apply(this, arguments);
     };
   }();
 
@@ -1459,7 +1560,7 @@ function useADKChat(_ref) {
     var requesting = false;
     var pollingSessionId = currentSessionId;
     var poll = /*#__PURE__*/function () {
-      var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+      var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
         var _yield$fetchSessionDe2, data, result;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
@@ -1502,7 +1603,7 @@ function useADKChat(_ref) {
         }, _callee10, null, [[3, 12, 14, 17]]);
       }));
       return function poll() {
-        return _ref12.apply(this, arguments);
+        return _ref13.apply(this, arguments);
       };
     }();
     void poll();