@blueking/chat-helper 0.0.1-beta.4 → 0.0.1-beta.6

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

@@ -533,7 +533,7 @@ export declare const useAgent: (options: IUseChatHelperOptions, http: IHttpModul
         };
     }>;
     isInfoLoading: import("vue").Ref<boolean, boolean>;
-    chat: () => void;
+    chat: (url: string) => void;
     stopChat: () => Promise<void>;
     getAgentInfo: () => Promise<void>;
 };

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

@@ -67,7 +67,7 @@ export const useAgent = (options, http, message)=>{
             isInfoLoading.value = false;
         });
     };
-    const chat = ()=>{
+    const chat = (url)=>{
         chatController = new AbortController();
         const protocol = options.protocol || new AGUIProtocol();
         // ag-ui 协议需要注入消息模块
@@ -75,7 +75,7 @@ export const useAgent = (options, http, message)=>{
             protocol.injectMessageModule(message);
         }
         fetchClient.streamRequest({
-            url: 'agent/chat/',
+            url: url || '/chat_completion/',
             controller: chatController,
             onDone: protocol.onDone,
             onError: protocol.onError,

package/dist/event/ag-ui.d.ts

@@ -131,7 +131,7 @@ export declare class AGUIProtocol implements ISSEProtocol {
     handleToolCallStartEvent(event: IToolCallStartEvent): void;
     injectMessageModule(message: IMessageModule): void;
     onDone(): void;
-    onError(error: unknown): void;
+    onError(error: Error): void;
     onMessage(message: unknown): void;
     onStart(): void;
 }

package/dist/event/ag-ui.ts.js

@@ -320,12 +320,31 @@ let tempTimestamp = 0;
         this.messageModule = message;
     }
     onDone() {
-        var _this_onDoneCallback, _this;
+        var // 回调给上层
+        _this_onDoneCallback, _this;
         (_this_onDoneCallback = (_this = this).onDoneCallback) === null || _this_onDoneCallback === void 0 ? void 0 : _this_onDoneCallback.call(_this);
+        // 处理完成
+        const message = this.messageModule.getCurrentLoadingMessage();
+        if (message) {
+            message.status = MessageStatus.Complete;
+        }
     }
     onError(error) {
-        var _this_onErrorCallback, _this;
+        var // 回调给上层
+        _this_onErrorCallback, _this;
         (_this_onErrorCallback = (_this = this).onErrorCallback) === null || _this_onErrorCallback === void 0 ? void 0 : _this_onErrorCallback.call(_this, error);
+        // 处理错误
+        const message = this.messageModule.getCurrentLoadingMessage();
+        if (message) {
+            message.status = MessageStatus.Error;
+            message.content = [
+                {
+                    type: MessageContentType.Text,
+                    data: error.message,
+                    status: MessageContentStatus.Error
+                }
+            ];
+        }
     }
     onMessage(message) {
         var // 回调给上层

package/dist/http/fetch/fetch.d.ts

@@ -29,14 +29,12 @@ export interface RequestError extends Error {
     code?: string;
     config: RequestConfig;
     isAxiosError: boolean;
-    request?: Request;
     response?: Response;
 }
 export interface Response<T = unknown> {
     config: RequestConfig;
     data: T;
     headers: Headers;
-    request?: Request;
     status: number;
     statusText: string;
 }
@@ -70,10 +68,15 @@ export declare class FetchClient {
     post<T = unknown>(url: string, data?: unknown, config?: RequestConfig): Promise<T>;
     prepareRequest(config: RequestConfig, isStream?: boolean): {
         url: string;
-        headers: Headers;
-        body: BodyInit;
         requestConfig: RequestConfig;
-        controller: AbortController;
+        fetchConfig: {
+            method: string;
+            credentials: "include" | "omit" | "same-origin";
+            mode: "same-origin" | "cors" | "no-cors";
+            headers: Headers;
+            body: BodyInit;
+            controller: AbortController;
+        };
     };
     put<T = unknown>(url: string, data?: unknown, config?: RequestConfig): Promise<T>;
     request<T = unknown>(config: RequestConfig): Promise<T>;

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

@@ -192,8 +192,9 @@ export class FetchClient {
     prepareRequest(config, isStream = false) {
         // 合并配置
         const mergedConfig = mergeConfig(this.defaults, config);
-        // 应用请求拦截器
+        // 总的请求配置
         let requestConfig = mergedConfig;
+        // 应用请求拦截器
         this.interceptors.request.forEach((interceptor)=>{
             if (interceptor.fulfilled) {
                 try {
@@ -208,7 +209,7 @@ export class FetchClient {
         });
         // 构建完整 URL
         let url = requestConfig.url || '';
-        if (requestConfig.baseURL) {
+        if (requestConfig.baseURL && !url.startsWith('http')) {
             url = requestConfig.baseURL + url;
         }
         url = buildURL(url, requestConfig.params);
@@ -219,6 +220,7 @@ export class FetchClient {
         if (isStream && !headers.has('Accept')) {
             headers.set('Accept', 'text/event-stream');
         }
+        // 处理请求体
         if (body !== undefined && body !== null) {
             var _headers_get;
             if (requestConfig.transformRequest) {
@@ -229,13 +231,20 @@ export class FetchClient {
         }
         // 创建 AbortController
         const controller = requestConfig.controller ? requestConfig.controller : new AbortController();
-        return {
-            url,
+        // 请求配置
+        const fetchConfig = {
+            method: requestConfig.method,
+            credentials: requestConfig.credentials,
+            mode: requestConfig.mode,
             headers,
             body,
-            requestConfig,
             controller
         };
+        return {
+            url,
+            requestConfig,
+            fetchConfig
+        };
     }
     put(url, data, config) {
         return this.request(_object_spread_props(_object_spread({}, config), {
@@ -248,20 +257,12 @@ export class FetchClient {
         var _this = this;
         return _async_to_generator(function*() {
             // 准备请求
-            const { url, headers, body, requestConfig, controller } = _this.prepareRequest(config);
+            const { url, fetchConfig, requestConfig } = _this.prepareRequest(config);
             // 创建超时控制
-            const timeoutId = requestConfig.timeout && requestConfig.timeout > 0 ? setTimeout(()=>controller.abort(), requestConfig.timeout) : undefined;
+            const timeoutId = requestConfig.timeout && requestConfig.timeout > 0 ? setTimeout(()=>fetchConfig.controller.abort(), requestConfig.timeout) : undefined;
             try {
                 // 发送请求
-                const request = new Request(url, {
-                    method: requestConfig.method,
-                    credentials: requestConfig.credentials,
-                    mode: requestConfig.mode,
-                    headers,
-                    body,
-                    signal: controller.signal
-                });
-                const fetchResponse = yield fetch(request);
+                const fetchResponse = yield fetch(url, fetchConfig);
                 // 清除超时定时器
                 if (timeoutId) {
                     clearTimeout(timeoutId);
@@ -302,13 +303,12 @@ export class FetchClient {
                     status: fetchResponse.status,
                     statusText: fetchResponse.statusText,
                     headers: fetchResponse.headers,
-                    config: requestConfig,
-                    request
+                    config: requestConfig
                 };
                 // 验证状态码
                 const validateStatus = requestConfig.validateStatus || _this.defaults.validateStatus;
                 if (!validateStatus(fetchResponse.status)) {
-                    throw createError(`Request failed with status code ${fetchResponse.status}`, requestConfig, `ERR_BAD_RESPONSE`, request, response);
+                    throw createError(`Request failed with status code ${fetchResponse.status}`, requestConfig, `ERR_BAD_RESPONSE`, response);
                 }
                 // 应用响应拦截器
                 let finalResponse = response;
@@ -334,7 +334,7 @@ export class FetchClient {
                     0,
                     'success'
                 ].includes(apiResponse.code)) {
-                    throw createError(apiResponse.message, requestConfig, apiResponse.code, request, finalResponse);
+                    throw createError(apiResponse.message, requestConfig, apiResponse.code, finalResponse);
                 }
                 return apiResponse.data;
             } catch (error) {
@@ -344,11 +344,11 @@ export class FetchClient {
                 }
                 // 处理中断错误
                 if (error instanceof Error && error.name === 'AbortError') {
-                    const requestError = createError('Request timeout', requestConfig, 'ECONNABORTED', undefined, undefined);
+                    const requestError = createError('Request timeout', requestConfig, 'ECONNABORTED', undefined);
                     throw _this.applyResponseErrorInterceptors(requestError);
                 }
                 // 处理其他错误
-                const requestError = error.isAxiosError === true ? error : createError(error.message, requestConfig, error.code, undefined, undefined);
+                const requestError = error.isAxiosError === true ? error : createError(error.message, requestConfig, error.code, undefined);
                 throw _this.applyResponseErrorInterceptors(requestError);
             }
         })();
@@ -364,25 +364,17 @@ export class FetchClient {
         var _this = this;
         return _async_to_generator(function*() {
             // 准备请求（标记为流式请求）
-            const { url, headers, body, requestConfig, controller } = _this.prepareRequest(config, true);
-            // 发送请求
-            const request = new Request(url, {
-                method: requestConfig.method,
-                credentials: requestConfig.credentials,
-                mode: requestConfig.mode,
-                headers,
-                body,
-                signal: controller.signal
-            });
+            const { url, fetchConfig, requestConfig } = _this.prepareRequest(config, true);
             try {
                 var // 触发 onStart 回调
                 _config_onStart, _fetchResponse_body;
-                const fetchResponse = yield fetch(request);
+                // 发送请求
+                const fetchResponse = yield fetch(url, fetchConfig);
                 // 验证状态码
                 const validateStatus = requestConfig.validateStatus || _this.defaults.validateStatus;
                 if (!validateStatus(fetchResponse.status)) {
                     var _config_onError;
-                    const error = createError(`Request failed with status code ${fetchResponse.status}`, requestConfig, `ERR_BAD_RESPONSE`, request, undefined);
+                    const error = createError(`Request failed with status code ${fetchResponse.status}`, requestConfig, `ERR_BAD_RESPONSE`, undefined);
                     (_config_onError = config.onError) === null || _config_onError === void 0 ? void 0 : _config_onError.call(config, error);
                     return;
                 }
@@ -435,7 +427,7 @@ export class FetchClient {
     constructor(config = {}){
         _define_property(this, "defaults", void 0);
         _define_property(this, "interceptors", void 0);
-        this.defaults = _object_spread({
+        this.defaults = mergeConfig({
             method: 'GET',
             headers: {
                 'Content-Type': 'application/json'
@@ -474,11 +466,10 @@ function buildURL(url, params) {
     return url;
 }
 // 创建错误对象
-function createError(message, config, code, request, response) {
+function createError(message, config, code, response) {
     const error = new Error(message);
     error.config = config;
     error.code = String(code);
-    error.request = request;
     error.response = response;
     error.isAxiosError = true;
     return error;

package/dist/index.d.ts

@@ -536,7 +536,7 @@ export declare const useChatHelper: (options: IUseChatHelperOptions) => {
             };
         }>;
         isInfoLoading: import("vue").Ref<boolean, boolean>;
-        chat: () => void;
+        chat: (url: string) => void;
         stopChat: () => Promise<void>;
         getAgentInfo: () => Promise<void>;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blueking/chat-helper",
-  "version": "0.0.1-beta.4",
+  "version": "0.0.1-beta.6",
   "description": "",
   "main": "./dist/index.ts.js",
   "scripts": {