@blueking/chat-helper 0.0.12-beta.17 → 0.0.12-beta.18

package/dist/agent/use-agent.ts.js

@@ -79,6 +79,30 @@ function _object_spread(target) {
     }
     return target;
 }
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
 import { ref } from 'vue';
 import { AGUIProtocol, ApprovalInterruptTicketStatus, EventType, ResumeStatus, RunFinishedOutcomeType } from '../event/index.ts.js';
 import { MessageRole, MessageStatus, UserOperation } from '../message/index.ts.js';
@@ -129,6 +153,7 @@ const getReconnectDelayMs = (attempt)=>Math.min(RECONNECT_BASE_DELAY_MS * Math.p
     /** 用户主动中止（abortChat），禁止自动重连 */ let manualAbort = false;
     /** 当前轮次已静默重连次数 */ let reconnectAttempt = 0;
     /** 本轮流是否已收到 RUN_FINISHED */ let runFinished = false;
+    /** 流世代号：新开流时递增，用于忽略已被替换的旧 SSE 回调 */ let activeStreamId = 0;
     let reconnectTimer = null;
     let reconnectWaitResolve = null;
     let activeStreamContext = null;
@@ -245,11 +270,13 @@ const getReconnectDelayMs = (attempt)=>Math.min(RECONNECT_BASE_DELAY_MS * Math.p
     };
     /**
    * 尝试静默重连。
+   * @param streamId - 发起重连的流世代；任一 await 后若已被新流/abort 取代则立即退出，避免 abort 掉更新流
    * @returns reconnected | finished（服务端已结束）| failed（需对外报错或中止）
    */ const attemptSilentReconnect = function() {
-        var _ref = _async_to_generator(function*(sessionCode) {
+        var _ref = _async_to_generator(function*(sessionCode, streamId) {
             var _mediator_session_current_value, _mediator_session, _mediator_session_current_value1, _mediator_session1, _mediator_message_list_value_at, _mediator_message;
-            if (manualAbort || !isSameActiveSession(sessionCode)) {
+            const isOwnerStream = ()=>streamId === activeStreamId && !manualAbort;
+            if (!isOwnerStream() || !isSameActiveSession(sessionCode)) {
                 return 'failed';
             }
             try {
@@ -258,7 +285,7 @@ const getReconnectDelayMs = (attempt)=>Math.min(RECONNECT_BASE_DELAY_MS * Math.p
             } catch (e) {
             // 状态刷新失败时沿用本地 session.status
             }
-            if (manualAbort || !isSameActiveSession(sessionCode)) {
+            if (!isOwnerStream() || !isSameActiveSession(sessionCode)) {
                 return 'failed';
             }
             if (((_mediator_session = mediator.session) === null || _mediator_session === void 0 ? void 0 : (_mediator_session_current_value = _mediator_session.current.value) === null || _mediator_session_current_value === void 0 ? void 0 : _mediator_session_current_value.status) !== SessionStatus.Running) {
@@ -272,12 +299,16 @@ const getReconnectDelayMs = (attempt)=>Math.min(RECONNECT_BASE_DELAY_MS * Math.p
             isChatting.value = true;
             const delayMs = getReconnectDelayMs(reconnectAttempt);
             const waited = yield waitForReconnectDelay(delayMs);
-            if (!waited || manualAbort || !isSameActiveSession(sessionCode)) {
+            if (!waited || !isOwnerStream() || !isSameActiveSession(sessionCode)) {
                 return 'failed';
             }
             if (((_mediator_session1 = mediator.session) === null || _mediator_session1 === void 0 ? void 0 : (_mediator_session_current_value1 = _mediator_session1.current.value) === null || _mediator_session_current_value1 === void 0 ? void 0 : _mediator_session_current_value1.status) !== SessionStatus.Running) {
                 return 'finished';
             }
+            // 发起新流前再校验一次：防止 await 后窗口期被新用户请求抢走 activeStreamId
+            if (!isOwnerStream()) {
+                return 'failed';
+            }
             pruneTrailingIncompleteMessages();
             const lastMessageId = (_mediator_message = mediator.message) === null || _mediator_message === void 0 ? void 0 : (_mediator_message_list_value_at = _mediator_message.list.value.at(-1)) === null || _mediator_message_list_value_at === void 0 ? void 0 : _mediator_message_list_value_at.id;
             const ctx = activeStreamContext;
@@ -291,13 +322,13 @@ const getReconnectDelayMs = (attempt)=>Math.min(RECONNECT_BASE_DELAY_MS * Math.p
             });
             return 'reconnected';
         });
-        return function attemptSilentReconnect(sessionCode) {
+        return function attemptSilentReconnect(sessionCode, streamId) {
             return _ref.apply(this, arguments);
         };
     }();
     const streamRequest = function() {
         var _ref = _async_to_generator(function*({ sessionCode, model, url, config, resume, input, lastMessageId, isReconnect = false }) {
-            var _mediator_http;
+            var _previousController_abort, _mediator_http;
             if (!isReconnect) {
                 resetStreamReconnectState();
             }
@@ -307,6 +338,12 @@ const getReconnectDelayMs = (attempt)=>Math.min(RECONNECT_BASE_DELAY_MS * Math.p
                 url,
                 config
             };
+            // 先递增世代再 abort 旧连接，避免旧流 onDone 误触发二次重连
+            const streamId = ++activeStreamId;
+            const previousController = chatAbortController;
+            chatAbortController = new AbortController();
+            previousController === null || previousController === void 0 ? void 0 : (_previousController_abort = previousController.abort) === null || _previousController_abort === void 0 ? void 0 : _previousController_abort.call(previousController);
+            const isActiveStream = ()=>streamId === activeStreamId;
             // ag-ui 协议需要注入消息模块
             if (usedProtocol instanceof AGUIProtocol) {
                 usedProtocol.injectMessageModule(mediator.message);
@@ -323,6 +360,9 @@ const getReconnectDelayMs = (attempt)=>Math.min(RECONNECT_BASE_DELAY_MS * Math.p
             }
             const finishSuccessfully = ()=>{
                 var _usedProtocol_onDone;
+                if (!isActiveStream()) {
+                    return;
+                }
                 isChatting.value = false;
                 (_usedProtocol_onDone = usedProtocol.onDone) === null || _usedProtocol_onDone === void 0 ? void 0 : _usedProtocol_onDone.call(usedProtocol);
                 if (input) {
@@ -342,18 +382,30 @@ const getReconnectDelayMs = (attempt)=>Math.min(RECONNECT_BASE_DELAY_MS * Math.p
             };
             const failWithError = (error)=>{
                 var _usedProtocol_onError;
+                if (!isActiveStream()) {
+                    return;
+                }
                 isChatting.value = false;
                 (_usedProtocol_onError = usedProtocol.onError) === null || _usedProtocol_onError === void 0 ? void 0 : _usedProtocol_onError.call(usedProtocol, error);
             };
             // 事件代理
             const onDone = ()=>{
-                // 用户 abort：FetchClient 将 AbortError 转为 onDone，不重连
-                if (manualAbort || runFinished) {
+                if (!isActiveStream()) {
+                    return;
+                }
+                // 用户 abort：本地状态已在 abortChat 结算，勿走 completion/poll
+                if (manualAbort) {
+                    return;
+                }
+                if (runFinished) {
                     finishSuccessfully();
                     return;
                 }
                 // 连接被干净掐断且未收到 RUN_FINISHED：尝试静默重连
-                void attemptSilentReconnect(sessionCode).then((result)=>{
+                void attemptSilentReconnect(sessionCode, streamId).then((result)=>{
+                    if (!isActiveStream()) {
+                        return;
+                    }
                     if (result === 'reconnected') {
                         // 保持 isChatting=true，不展示错误
                         return;
@@ -371,14 +423,17 @@ const getReconnectDelayMs = (attempt)=>Math.min(RECONNECT_BASE_DELAY_MS * Math.p
                 });
             };
             const onError = (error)=>{
-                if (manualAbort) {
+                if (!isActiveStream() || manualAbort) {
                     return;
                 }
                 if (!isRecoverableStreamError(error)) {
                     failWithError(error);
                     return;
                 }
-                void attemptSilentReconnect(sessionCode).then((result)=>{
+                void attemptSilentReconnect(sessionCode, streamId).then((result)=>{
+                    if (!isActiveStream()) {
+                        return;
+                    }
                     if (result === 'reconnected') {
                         return;
                     }
@@ -395,6 +450,9 @@ const getReconnectDelayMs = (attempt)=>Math.min(RECONNECT_BASE_DELAY_MS * Math.p
             };
             const onMessage = (event)=>{
                 var _usedProtocol_onMessage;
+                if (!isActiveStream()) {
+                    return;
+                }
                 const typedEvent = event;
                 if ((typedEvent === null || typedEvent === void 0 ? void 0 : typedEvent.type) === EventType.RunFinished) {
                     runFinished = true;
@@ -403,13 +461,14 @@ const getReconnectDelayMs = (attempt)=>Math.min(RECONNECT_BASE_DELAY_MS * Math.p
             };
             const onStart = ()=>{
                 var _usedProtocol_onStart;
+                if (!isActiveStream()) {
+                    return;
+                }
                 isChatting.value = true;
                 (_usedProtocol_onStart = usedProtocol.onStart) === null || _usedProtocol_onStart === void 0 ? void 0 : _usedProtocol_onStart.call(usedProtocol);
             };
-            // 创建 AbortController
-            chatAbortController = new AbortController();
-            // 发起聊天
-            void ((_mediator_http = mediator.http) === null || _mediator_http === void 0 ? void 0 : _mediator_http.fetchClient.streamRequest(_object_spread({
+            // 发起聊天（controller / 回调必须在 ...config 之后，防止被覆盖）
+            void ((_mediator_http = mediator.http) === null || _mediator_http === void 0 ? void 0 : _mediator_http.fetchClient.streamRequest(_object_spread_props(_object_spread({
                 url: url || 'chat_completion/',
                 method: 'POST',
                 data: {
@@ -422,13 +481,14 @@ const getReconnectDelayMs = (attempt)=>Math.min(RECONNECT_BASE_DELAY_MS * Math.p
                         last_message_id: lastMessageId,
                         resume
                     }
-                },
+                }
+            }, config), {
                 controller: chatAbortController,
                 onDone,
                 onError,
                 onMessage,
                 onStart
-            }, config)).catch(()=>{
+            })).catch(()=>{
             // 非 abort 错误已通过 onError 回调处理；abort 为正常结束
             }));
         });
@@ -546,10 +606,15 @@ const getReconnectDelayMs = (attempt)=>Math.min(RECONNECT_BASE_DELAY_MS * Math.p
     };
     /**
    * 中止聊天（纯前端中止，后端继续处理）
+   * 会使当前流世代失效，避免 abort 后的 onDone 误触发 finishSuccessfully / pollResumeSession
    */ const abortChat = ()=>{
         var _chatAbortController_abort;
         manualAbort = true;
+        // 先失效世代，再 abort：FetchClient 同步触发的 onDone 会因 isActiveStream=false 直接返回
+        activeStreamId += 1;
         clearReconnectTimer(false);
+        clearLongPollTimer();
+        isChatting.value = false;
         chatAbortController === null || chatAbortController === void 0 ? void 0 : (_chatAbortController_abort = chatAbortController.abort) === null || _chatAbortController_abort === void 0 ? void 0 : _chatAbortController_abort.call(chatAbortController);
         chatAbortController = null;
     };

package/dist/http/fetch/fetch.ts.js

@@ -399,7 +399,12 @@ export class FetchClient {
             const wrappedConfig = _object_spread_props(_object_spread({}, config), {
                 onError: wrappedOnError
             });
-            const { url, fetchConfig, requestConfig } = _this.prepareRequest(wrappedConfig, true);
+            const { url, fetchConfig, requestConfig, controller } = _this.prepareRequest(wrappedConfig, true);
+            let reader;
+            const cancelReaderOnAbort = ()=>{
+                // pipeThrough(TextDecoderStream) 后，仅 abort fetch signal 在部分环境下不会立刻打断 reader.read()
+                void (reader === null || reader === void 0 ? void 0 : reader.cancel().catch(()=>{}));
+            };
             try {
                 var _wrappedConfig_onStart, _fetchResponse_body;
                 const fetchResponse = yield fetch(url, fetchConfig);
@@ -417,12 +422,21 @@ export class FetchClient {
                     return;
                 }
                 (_wrappedConfig_onStart = wrappedConfig.onStart) === null || _wrappedConfig_onStart === void 0 ? void 0 : _wrappedConfig_onStart.call(wrappedConfig);
-                const reader = (_fetchResponse_body = fetchResponse.body) === null || _fetchResponse_body === void 0 ? void 0 : _fetchResponse_body.pipeThrough(new window.TextDecoderStream()).getReader();
+                reader = (_fetchResponse_body = fetchResponse.body) === null || _fetchResponse_body === void 0 ? void 0 : _fetchResponse_body.pipeThrough(new window.TextDecoderStream()).getReader();
                 if (!reader) {
                     const error = new Error('IResponse body is not readable');
                     wrappedOnError(error);
                     return;
                 }
+                controller.signal.addEventListener('abort', cancelReaderOnAbort, {
+                    once: true
+                });
+                if (controller.signal.aborted) {
+                    var _wrappedConfig_onDone;
+                    cancelReaderOnAbort();
+                    (_wrappedConfig_onDone = wrappedConfig.onDone) === null || _wrappedConfig_onDone === void 0 ? void 0 : _wrappedConfig_onDone.call(wrappedConfig);
+                    return;
+                }
                 // 缓存跨行分片数据
                 let temp = '';
                 const isJson = (str)=>{
@@ -437,8 +451,8 @@ export class FetchClient {
                 while(true){
                     const { value, done } = yield reader.read();
                     if (done) {
-                        var _wrappedConfig_onDone;
-                        (_wrappedConfig_onDone = wrappedConfig.onDone) === null || _wrappedConfig_onDone === void 0 ? void 0 : _wrappedConfig_onDone.call(wrappedConfig);
+                        var _wrappedConfig_onDone1;
+                        (_wrappedConfig_onDone1 = wrappedConfig.onDone) === null || _wrappedConfig_onDone1 === void 0 ? void 0 : _wrappedConfig_onDone1.call(wrappedConfig);
                         break;
                     }
                     const values = (temp + value.toString()).split('\n');
@@ -457,13 +471,15 @@ export class FetchClient {
             } catch (error) {
                 if (error instanceof Error) {
                     if (error.name === 'AbortError') {
-                        var _wrappedConfig_onDone1;
-                        (_wrappedConfig_onDone1 = wrappedConfig.onDone) === null || _wrappedConfig_onDone1 === void 0 ? void 0 : _wrappedConfig_onDone1.call(wrappedConfig);
+                        var _wrappedConfig_onDone2;
+                        (_wrappedConfig_onDone2 = wrappedConfig.onDone) === null || _wrappedConfig_onDone2 === void 0 ? void 0 : _wrappedConfig_onDone2.call(wrappedConfig);
                         return;
                     }
                     wrappedOnError(error);
                 }
                 throw error;
+            } finally{
+                controller.signal.removeEventListener('abort', cancelReaderOnAbort);
             }
         })();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blueking/chat-helper",
-  "version": "0.0.12-beta.17",
+  "version": "0.0.12-beta.18",
   "description": "",
   "main": "./dist/index.ts.js",
   "types": "./dist/index.d.ts",