@ai-group/chat-sdk 3.3.6 → 3.3.7

package/dist/esm/hooks/useADKChat.js

@@ -22,13 +22,15 @@ var combineTextParts = function combineTextParts(parts) {
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var part = _step.value;
-      if (part.text) {
+      // 纯文本 part（没有 fileData 等其他字段）才合并
+      var isPureText = part.text && !part.fileData;
+      if (isPureText) {
         // 如果没有 combined 或 combined 思考类型跟当前 part 不同，则创建新的合并引用
         if (!combinedTextPart || combinedTextPart.thought !== part.thought) {
           combinedTextPart = _objectSpread({}, part);
           result.push(combinedTextPart);
         } else {
-          combinedTextPart.text += part.text;
+          combinedTextPart.text = (combinedTextPart.text || "") + (part.text || "");
         }
       } else {
         combinedTextPart = undefined;
@@ -61,56 +63,60 @@ function useADKChat(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
     setLoading = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    sessionLoading = _useState4[0],
+    setSessionLoading = _useState4[1];
   var sendingRef = useRef(false); // 同步锁，防止快速重复点击
   var ctrl = useRef(null);
   // 应用配置
   var _ref2 = config || {},
     appNo = _ref2.appNo,
     showFirstSession = _ref2.showFirstSession;
-  var _useState3 = useState(null),
-    _useState4 = _slicedToArray(_useState3, 2),
-    appInfo = _useState4[0],
-    setAppInfo = _useState4[1];
-  // 初始化完成
-  var _useState5 = useState(false),
+  var _useState5 = useState(null),
     _useState6 = _slicedToArray(_useState5, 2),
-    initialized = _useState6[0],
-    setInitialized = _useState6[1];
-  // 会话记录
-  var _useState7 = useState([]),
+    appInfo = _useState6[0],
+    setAppInfo = _useState6[1];
+  // 初始化完成
+  var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    sessionList = _useState8[0],
-    setSessionList = _useState8[1];
+    initialized = _useState8[0],
+    setInitialized = _useState8[1];
+  // 会话记录
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    sessionList = _useState10[0],
+    setSessionList = _useState10[1];
   // 当前会话
-  var _useState9 = useState(function () {
+  var _useState11 = useState(function () {
       return v4();
     }),
-    _useState10 = _slicedToArray(_useState9, 2),
-    currentSessionId = _useState10[0],
-    setCurrentSessionId = _useState10[1];
+    _useState12 = _slicedToArray(_useState11, 2),
+    currentSessionId = _useState12[0],
+    setCurrentSessionId = _useState12[1];
   // 会话分页设置
-  var _useState11 = useState({
+  var _useState13 = useState({
       total: 0,
       pageNum: 1,
       pageSize: SESSION_PAGE_SIZE
     }),
-    _useState12 = _slicedToArray(_useState11, 2),
-    sessionPagination = _useState12[0],
-    setSessionPagination = _useState12[1];
-  // 开场白
-  var _useState13 = useState(""),
     _useState14 = _slicedToArray(_useState13, 2),
-    prologue = _useState14[0],
-    setPrologue = _useState14[1];
-  // 建议问题
-  var _useState15 = useState([]),
+    sessionPagination = _useState14[0],
+    setSessionPagination = _useState14[1];
+  // 开场白
+  var _useState15 = useState(""),
     _useState16 = _slicedToArray(_useState15, 2),
-    suggestedQuestions = _useState16[0],
-    setSuggestedQuestions = _useState16[1];
+    prologue = _useState16[0],
+    setPrologue = _useState16[1];
+  // 建议问题
   var _useState17 = useState([]),
     _useState18 = _slicedToArray(_useState17, 2),
-    messages = _useState18[0],
-    setMessages = _useState18[1];
+    suggestedQuestions = _useState18[0],
+    setSuggestedQuestions = _useState18[1];
+  var _useState19 = useState([]),
+    _useState20 = _slicedToArray(_useState19, 2),
+    messages = _useState20[0],
+    setMessages = _useState20[1];
   // 用户自定义业务参数 (stateDelta)，每次发送请求时携带
   var stateDeltaRef = useRef(undefined);
   var mergedMessages = useMemo(function () {
@@ -302,11 +308,6 @@ function useADKChat(_ref) {
         // 插入消息
         insertMessage(newMessage);
       } else {
-        if (event.partial === false) {
-          storeEvents(part, event);
-          textMsgRef.current = null;
-          return;
-        }
         if (renderedContent) {
           textMsgRef.current = _objectSpread(_objectSpread({}, textMsgRef.current), {}, {
             renderedContent: renderedContent
@@ -316,6 +317,10 @@ function useADKChat(_ref) {
           text: (textMsgRef.current.text || "") + newChunk
         });
         updateMessage(textMsgRef.current);
+        if (event.partial === false) {
+          storeEvents(part, event);
+          textMsgRef.current = null;
+        }
       }
     } else {
       textMsgRef.current = null;
@@ -571,52 +576,78 @@ function useADKChat(_ref) {
   }();
 
   // 重新发送会话
-  var reChat = function reChat() {
-    if (loading) return;
-    if (messages.length === 0) return;
-    setMessages(function (prev) {
-      var newMessages = _toConsumableArray(prev);
-      // 删除最后一条 AI 消息
-      var lastAIIndex = newMessages.findLastIndex(function (msg) {
-        return msg.role === "bot";
-      });
-      if (lastAIIndex !== -1) {
-        newMessages.splice(lastAIIndex, 1);
-      }
-      // 清空建议问题
-      setSuggestedQuestions([]);
-      // 重新发送最后一条用户消息
-      var lastUserMessage = newMessages.findLast(function (msg) {
-        return msg.role === "user";
-      });
-      if (lastUserMessage) {
-        var _lastUserMessage$text = lastUserMessage.text,
-          text = _lastUserMessage$text === void 0 ? "" : _lastUserMessage$text,
-          _lastUserMessage$file = lastUserMessage.fileData,
-          fileData = _lastUserMessage$file === void 0 ? [] : _lastUserMessage$file;
-        sendMessageRequest(_objectSpread({
-          stream: true,
-          sessionId: currentSessionId,
-          content: {
-            role: "user",
-            parts: [{
-              text: text
-            }]
-          },
-          files: fileData === null || fileData === void 0 ? void 0 : fileData.map(function (file) {
-            return {
-              fileName: file.displayName,
-              tempUrl: file.fileUri,
-              mimeType: file.mimeType
-            };
-          })
-        }, stateDeltaRef.current !== undefined && {
-          stateDelta: stateDeltaRef.current
-        }));
-      }
-      return newMessages;
-    });
-  };
+  var reChat = /*#__PURE__*/function () {
+    var _ref5 = _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) {
+          case 0:
+            if (!(loading || sendingRef.current)) {
+              _context3.next = 2;
+              break;
+            }
+            return _context3.abrupt("return");
+          case 2:
+            if (!(messages.length === 0)) {
+              _context3.next = 4;
+              break;
+            }
+            return _context3.abrupt("return");
+          case 4:
+            sendingRef.current = true;
+            // 清空建议问题
+            setSuggestedQuestions([]);
+
+            // 找到最后一条用户消息的索引，删除其后所有 bot 消息
+            lastUserIndex = messages.findLastIndex(function (msg) {
+              return msg.role === "user" && !msg.functionResponse;
+            });
+            if (!(lastUserIndex === -1)) {
+              _context3.next = 10;
+              break;
+            }
+            sendingRef.current = false;
+            return _context3.abrupt("return");
+          case 10:
+            newMessages = messages.slice(0, lastUserIndex + 1);
+            setMessages(newMessages);
+            lastUserMessage = newMessages[lastUserIndex];
+            _lastUserMessage$text = lastUserMessage.text, text = _lastUserMessage$text === void 0 ? "" : _lastUserMessage$text, _lastUserMessage$file = lastUserMessage.fileData, fileData = _lastUserMessage$file === void 0 ? [] : _lastUserMessage$file;
+            _context3.prev = 14;
+            _context3.next = 17;
+            return sendMessageRequest(_objectSpread({
+              stream: true,
+              sessionId: currentSessionId,
+              content: {
+                role: "user",
+                parts: [{
+                  text: text
+                }]
+              },
+              files: fileData === null || fileData === void 0 ? void 0 : fileData.map(function (file) {
+                return {
+                  fileName: file.displayName,
+                  tempUrl: file.fileUri,
+                  mimeType: file.mimeType
+                };
+              })
+            }, stateDeltaRef.current !== undefined && {
+              stateDelta: stateDeltaRef.current
+            }));
+          case 17:
+            _context3.prev = 17;
+            sendingRef.current = false;
+            return _context3.finish(17);
+          case 20:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3, null, [[14,, 17, 20]]);
+    }));
+    return function reChat() {
+      return _ref5.apply(this, arguments);
+    };
+  }();
 
   // 确认函数调用
   var confirmFnCall = function confirmFnCall(fnCall, confirmed) {
@@ -779,25 +810,25 @@ function useADKChat(_ref) {
 
   // 设置当前会话详情
   var setCurrentSession = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(sessionId) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(sessionId) {
       var _yield$fetchSessionDe, data, result, _appInfo$onboardingIn3, _appInfo$onboardingIn4;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             if (!sessionId) {
-              _context3.next = 13;
+              _context4.next = 13;
               break;
             }
             if (!(sessionId === currentSessionId)) {
-              _context3.next = 3;
+              _context4.next = 3;
               break;
             }
-            return _context3.abrupt("return");
+            return _context4.abrupt("return");
           case 3:
             // 切换会话时，abort 当前流式请求，防止数据污染和 loading 状态泄漏
             stopChat();
             setCurrentSessionId(sessionId); // 设置当前会话 id;
-            _context3.next = 7;
+            _context4.next = 7;
             return fetchSessionDetail({
               url: url,
               appNo: appNo,
@@ -805,7 +836,7 @@ function useADKChat(_ref) {
               token: token
             });
           case 7:
-            _yield$fetchSessionDe = _context3.sent;
+            _yield$fetchSessionDe = _context4.sent;
             data = _yield$fetchSessionDe.data;
             result = _yield$fetchSessionDe.result;
             if ((result === null || result === void 0 ? void 0 : result.code) === API_SUCCESS_CODE) {
@@ -817,25 +848,25 @@ function useADKChat(_ref) {
                 setSuggestedQuestions((appInfo === null || appInfo === void 0 || (_appInfo$onboardingIn4 = appInfo.onboardingInfo) === null || _appInfo$onboardingIn4 === void 0 ? void 0 : _appInfo$onboardingIn4.suggested_questions) || []);
               }
             }
-            _context3.next = 14;
+            _context4.next = 14;
             break;
           case 13:
             // 兼容 无 session异常
             setCurrentSessionId(v4());
           case 14:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3);
+      }, _callee4);
     }));
     return function setCurrentSession(_x2) {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 
   // 获取聊天记录
   var initAppConversations = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
       var fetchDetail,
         _yield$fetchSessionLi,
         _yield$fetchSessionLi2,
@@ -847,14 +878,14 @@ function useADKChat(_ref) {
         sessionId,
         _appInfo$onboardingIn5,
         _appInfo$onboardingIn6,
-        _args4 = arguments;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+        _args5 = arguments;
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            fetchDetail = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : false;
-            _context4.prev = 1;
-            setLoading(true);
-            _context4.next = 5;
+            fetchDetail = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : false;
+            _context5.prev = 1;
+            setSessionLoading(true);
+            _context5.next = 5;
             return fetchSessionList({
               url: url,
               appNo: appNo,
@@ -862,7 +893,7 @@ function useADKChat(_ref) {
               pageSize: sessionPagination.pageSize
             });
           case 5:
-            _yield$fetchSessionLi = _context4.sent;
+            _yield$fetchSessionLi = _context5.sent;
             _yield$fetchSessionLi2 = _yield$fetchSessionLi.data;
             data = _yield$fetchSessionLi2 === void 0 ? [] : _yield$fetchSessionLi2;
             pagination = _yield$fetchSessionLi.pagination;
@@ -913,44 +944,44 @@ function useADKChat(_ref) {
               setPrologue("");
               setSuggestedQuestions([]);
             }
-            _context4.next = 16;
+            _context5.next = 16;
             break;
           case 13:
-            _context4.prev = 13;
-            _context4.t0 = _context4["catch"](1);
+            _context5.prev = 13;
+            _context5.t0 = _context5["catch"](1);
             onError === null || onError === void 0 || onError({
               code: ErrorCode.API_ERROR,
               message: "获取会话列表失败"
             });
           case 16:
-            _context4.prev = 16;
-            setLoading(false);
-            return _context4.finish(16);
+            _context5.prev = 16;
+            setSessionLoading(false);
+            return _context5.finish(16);
           case 19:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4, null, [[1, 13, 16, 19]]);
+      }, _callee5, null, [[1, 13, 16, 19]]);
     }));
     return function initAppConversations() {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
 
   // 删除会话
   var deleteSession = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(sessionId) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(sessionId) {
       var _yield$closeSession, result;
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
             if (sessionId) {
-              _context5.next = 2;
+              _context6.next = 2;
               break;
             }
-            return _context5.abrupt("return");
+            return _context6.abrupt("return");
           case 2:
-            _context5.next = 4;
+            _context6.next = 4;
             return closeSession({
               url: url,
               appNo: appNo,
@@ -958,7 +989,7 @@ function useADKChat(_ref) {
               token: token
             });
           case 4:
-            _yield$closeSession = _context5.sent;
+            _yield$closeSession = _context6.sent;
             result = _yield$closeSession.result;
             if ((result === null || result === void 0 ? void 0 : result.code) === API_SUCCESS_CODE) {
               // 删除成功后，重新获取会话列表
@@ -972,29 +1003,29 @@ function useADKChat(_ref) {
             }
           case 7:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
-      }, _callee5);
+      }, _callee6);
     }));
     return function deleteSession(_x3) {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
 
   // 点赞/点踩
   var likeMessage = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(invocationId, isLike, feedbackData) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(invocationId, isLike, feedbackData) {
       var _yield$addFeedback, result;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
             if (!(!appNo || !invocationId)) {
-              _context6.next = 2;
+              _context7.next = 2;
               break;
             }
-            return _context6.abrupt("return", false);
+            return _context7.abrupt("return", false);
           case 2:
-            _context6.next = 4;
+            _context7.next = 4;
             return addFeedback(_objectSpread({
               url: url,
               appNo: appNo,
@@ -1003,10 +1034,10 @@ function useADKChat(_ref) {
               isLike: isLike
             }, feedbackData));
           case 4:
-            _yield$addFeedback = _context6.sent;
+            _yield$addFeedback = _context7.sent;
             result = _yield$addFeedback.result;
             if (!((result === null || result === void 0 ? void 0 : result.code) === API_SUCCESS_CODE)) {
-              _context6.next = 9;
+              _context7.next = 9;
               break;
             }
             setMessages(function (prev) {
@@ -1016,34 +1047,34 @@ function useADKChat(_ref) {
                 }) : m;
               });
             });
-            return _context6.abrupt("return", true);
+            return _context7.abrupt("return", true);
           case 9:
-            return _context6.abrupt("return", false);
+            return _context7.abrupt("return", false);
           case 10:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6);
+      }, _callee7);
     }));
     return function likeMessage(_x4, _x5, _x6) {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
 
   // 更新会话名称
   var updateSession = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(sessionId, title) {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(sessionId, title) {
       var _yield$updateSessionT, result;
-      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
-            if (!(!sessionId && !title)) {
-              _context7.next = 2;
+            if (!(!sessionId || !title)) {
+              _context8.next = 2;
               break;
             }
-            return _context7.abrupt("return");
+            return _context8.abrupt("return");
           case 2:
-            _context7.next = 4;
+            _context8.next = 4;
             return updateSessionTitle({
               url: url,
               appNo: appNo,
@@ -1052,7 +1083,7 @@ function useADKChat(_ref) {
               token: token
             });
           case 4:
-            _yield$updateSessionT = _context7.sent;
+            _yield$updateSessionT = _context8.sent;
             result = _yield$updateSessionT.result;
             if ((result === null || result === void 0 ? void 0 : result.code) === API_SUCCESS_CODE) {
               // 编辑成功后，重新获取会话列表
@@ -1062,31 +1093,31 @@ function useADKChat(_ref) {
             }
           case 7:
           case "end":
-            return _context7.stop();
+            return _context8.stop();
         }
-      }, _callee7);
+      }, _callee8);
     }));
     return function updateSession(_x7, _x8) {
-      return _ref9.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }();
 
   // 初始化应用
   var initConfig = /*#__PURE__*/function () {
-    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
       var _yield$fetchAppConfig, data, result;
-      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
           case 0:
-            _context8.prev = 0;
-            setLoading(true);
-            _context8.next = 4;
+            _context9.prev = 0;
+            setSessionLoading(true);
+            _context9.next = 4;
             return fetchAppConfig({
               url: url,
               appNo: appNo
             });
           case 4:
-            _yield$fetchAppConfig = _context8.sent;
+            _yield$fetchAppConfig = _context9.sent;
             data = _yield$fetchAppConfig.data;
             result = _yield$fetchAppConfig.result;
             if (result.code === API_SUCCESS_CODE) {
@@ -1102,27 +1133,27 @@ function useADKChat(_ref) {
                 message: result.message || "获取应用配置失败"
               });
             }
-            _context8.next = 13;
+            _context9.next = 13;
             break;
           case 10:
-            _context8.prev = 10;
-            _context8.t0 = _context8["catch"](0);
+            _context9.prev = 10;
+            _context9.t0 = _context9["catch"](0);
             onError === null || onError === void 0 || onError({
               code: ErrorCode.API_ERROR,
               message: "获取应用配置失败"
             });
           case 13:
-            _context8.prev = 13;
-            setLoading(false);
-            return _context8.finish(13);
+            _context9.prev = 13;
+            setSessionLoading(false);
+            return _context9.finish(13);
           case 16:
           case "end":
-            return _context8.stop();
+            return _context9.stop();
         }
-      }, _callee8, null, [[0, 10, 13, 16]]);
+      }, _callee9, null, [[0, 10, 13, 16]]);
     }));
     return function initConfig() {
-      return _ref10.apply(this, arguments);
+      return _ref11.apply(this, arguments);
     };
   }();
 
@@ -1155,6 +1186,7 @@ function useADKChat(_ref) {
     prologue: prologue,
     suggestions: suggestedQuestions,
     loading: loading,
+    sessionLoading: sessionLoading,
     messages: mergedMessages,
     insertSuggestedQuestions: insertSuggestedQuestions,
     insertPrologue: insertPrologue,