@blueking/chat-helper 0.0.2 → 0.0.3

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

@@ -3,11 +3,14 @@ export interface ApiResponse<T = unknown> {
     data: T;
     message: string;
 }
+/** 单次请求配置，优先级高于 `requestData` 全局默认值 */
 export interface IRequestConfig {
     baseURL?: string;
     controller?: AbortController;
     credentials?: 'include' | 'omit' | 'same-origin';
+    /** 请求体；可传函数以便延迟求值（在 `prepareRequest` 中通过 `getValue` 解析） */
     data?: (() => unknown) | unknown;
+    /** 请求头；可传函数以便延迟求值，便于动态注入（如 token） */
     headers?: (() => Record<string, string>) | Record<string, string>;
     method?: string;
     mode?: 'cors' | 'no-cors' | 'same-origin';

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

@@ -132,7 +132,6 @@ class InterceptorManager {
     }
 }
 export class FetchClient {
-    // 应用响应拦截器的错误处理
     applyResponseErrorInterceptors(error) {
         let rejectedError = error;
         this.interceptors.response.forEach((interceptor)=>{
@@ -142,7 +141,6 @@ export class FetchClient {
         });
         return rejectedError;
     }
-    // 创建新实例
     create(config) {
         return new FetchClient(mergeConfig(this.defaults, config || {}));
     }
@@ -188,13 +186,9 @@ export class FetchClient {
             data
         }));
     }
-    // 准备请求：合并配置、应用拦截器、构建 URL 和请求体
     prepareRequest(config, isStream = false) {
-        // 合并配置
         const mergedConfig = mergeConfig(this.defaults, config);
-        // 总的请求配置
         let requestConfig = mergedConfig;
-        // 应用请求拦截器
         this.interceptors.request.forEach((interceptor)=>{
             if (interceptor.fulfilled) {
                 try {
@@ -207,20 +201,16 @@ export class FetchClient {
                 }
             }
         });
-        // 构建完整 URL
         let url = requestConfig.url || '';
         if (requestConfig.baseURL && !url.startsWith('http')) {
             url = requestConfig.baseURL + url;
         }
         url = buildURL(url, requestConfig.params);
-        // 处理请求体
         let body = getValue(requestConfig.data);
         const headers = new Headers(getValue(requestConfig.headers));
-        // 流式请求设置 Accept 头
         if (isStream && !headers.has('Accept')) {
             headers.set('Accept', 'text/event-stream');
         }
-        // 处理请求体
         if (body !== undefined && body !== null) {
             var _headers_get;
             if (requestConfig.transformRequest) {
@@ -229,9 +219,8 @@ export class FetchClient {
                 body = JSON.stringify(body);
             }
         }
-        // 创建 AbortController
-        const controller = requestConfig.controller ? requestConfig.controller : new AbortController();
-        // 请求配置
+        var _requestConfig_controller;
+        const controller = (_requestConfig_controller = requestConfig.controller) !== null && _requestConfig_controller !== void 0 ? _requestConfig_controller : new AbortController();
         const fetchConfig = {
             method: requestConfig.method,
             credentials: requestConfig.credentials,
@@ -257,18 +246,13 @@ export class FetchClient {
     request(config) {
         var _this = this;
         return _async_to_generator(function*() {
-            // 准备请求
             const { url, fetchConfig, requestConfig, controller } = _this.prepareRequest(config);
-            // 创建超时控制
             const timeoutId = requestConfig.timeout && requestConfig.timeout > 0 ? setTimeout(()=>controller.abort(), requestConfig.timeout) : undefined;
             try {
-                // 发送请求
                 const fetchResponse = yield fetch(url, fetchConfig);
-                // 清除超时定时器
                 if (timeoutId) {
                     clearTimeout(timeoutId);
                 }
-                // 解析响应数据
                 let data;
                 const responseType = requestConfig.responseType || 'json';
                 try {
@@ -294,11 +278,9 @@ export class FetchClient {
                 } catch (_error) {
                     data = null;
                 }
-                // 应用响应转换
                 if (requestConfig.transformResponse) {
                     data = requestConfig.transformResponse(data);
                 }
-                // 构建响应对象
                 const response = {
                     data: data,
                     status: fetchResponse.status,
@@ -306,14 +288,12 @@ export class FetchClient {
                     headers: fetchResponse.headers,
                     config: requestConfig
                 };
-                // 验证状态码
                 const validateStatus = requestConfig.validateStatus || _this.defaults.validateStatus;
                 if (!validateStatus(fetchResponse.status)) {
                     var _response_data_error, _response_data;
                     const message = ((_response_data = response.data) === null || _response_data === void 0 ? void 0 : (_response_data_error = _response_data.error) === null || _response_data_error === void 0 ? void 0 : _response_data_error.message) || `Request failed with status code ${fetchResponse.status}`;
                     throw createError(message, requestConfig, `ERR_BAD_RESPONSE`, response);
                 }
-                // 应用响应拦截器
                 let finalResponse = response;
                 _this.interceptors.response.forEach((interceptor)=>{
                     if (interceptor.fulfilled) {
@@ -327,11 +307,10 @@ export class FetchClient {
                         }
                     }
                 });
-                // 等待所有异步拦截器完成
                 if (finalResponse instanceof Promise) {
                     finalResponse = yield finalResponse;
                 }
-                // 检查业务逻辑状态码
+                // 检查业务状态码（区别于 HTTP 状态码）
                 const apiResponse = finalResponse.data;
                 if (![
                     0,
@@ -341,39 +320,30 @@ export class FetchClient {
                 }
                 return apiResponse.data;
             } catch (error) {
-                // 清除超时定时器
                 if (timeoutId) {
                     clearTimeout(timeoutId);
                 }
-                // 处理中断错误
                 if (error instanceof Error && error.name === 'AbortError') {
                     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);
                 throw _this.applyResponseErrorInterceptors(requestError);
             }
         })();
     }
-    // SSE 流式请求便捷方法
     stream(url, config) {
         return this.streamRequest(_object_spread_props(_object_spread({}, config), {
             url
         }));
     }
-    // SSE 流式请求
     streamRequest(config) {
         var _this = this;
         return _async_to_generator(function*() {
-            // 准备请求（标记为流式请求）
             const { url, fetchConfig, requestConfig } = _this.prepareRequest(config, true);
             try {
-                var // 触发 onStart 回调
-                _config_onStart, _fetchResponse_body;
-                // 发送请求
+                var _config_onStart, _fetchResponse_body;
                 const fetchResponse = yield fetch(url, fetchConfig);
-                // 验证状态码
                 const validateStatus = requestConfig.validateStatus || _this.defaults.validateStatus;
                 if (!validateStatus(fetchResponse.status)) {
                     var _config_onError;
@@ -392,7 +362,6 @@ export class FetchClient {
                     return;
                 }
                 (_config_onStart = config.onStart) === null || _config_onStart === void 0 ? void 0 : _config_onStart.call(config);
-                // 获取 reader
                 const reader = (_fetchResponse_body = fetchResponse.body) === null || _fetchResponse_body === void 0 ? void 0 : _fetchResponse_body.pipeThrough(new window.TextDecoderStream()).getReader();
                 if (!reader) {
                     var _config_onError1;
@@ -400,9 +369,8 @@ export class FetchClient {
                     (_config_onError1 = config.onError) === null || _config_onError1 === void 0 ? void 0 : _config_onError1.call(config, error);
                     return;
                 }
-                // 临时存储数据
+                // 缓存跨行分片数据
                 let temp = '';
-                // 判断是否为 JSON 字符串
                 const isJson = (str)=>{
                     try {
                         JSON.parse(str);
@@ -414,7 +382,6 @@ export class FetchClient {
                 // eslint-disable-next-line no-constant-condition
                 while(true){
                     const { value, done } = yield reader.read();
-                    // 接口完成
                     if (done) {
                         var _config_onDone;
                         (_config_onDone = config.onDone) === null || _config_onDone === void 0 ? void 0 : _config_onDone.call(config);
@@ -467,7 +434,6 @@ export class FetchClient {
         };
     }
 }
-// 构建完整 URL
 function buildURL(url, params) {
     if (!params) return url;
     const searchParams = new URLSearchParams();
@@ -488,7 +454,6 @@ function buildURL(url, params) {
     }
     return url;
 }
-// 创建错误对象
 function createError(message, config, code, response) {
     const error = new Error(message);
     error.config = config;
@@ -497,22 +462,18 @@ function createError(message, config, code, response) {
     error.isAxiosError = true;
     return error;
 }
-// 获取值
 function getValue(value) {
     return typeof value === 'function' ? value() : value;
 }
-// 判断是否是普通对象（排除类实例如 AbortController、Headers 等）
-function isPlainObject(value) {
+/** 排除 AbortController、Headers 等类实例，只对普通对象深度合并 */ function isPlainObject(value) {
     if (!value || typeof value !== 'object') return false;
     const proto = Object.getPrototypeOf(value);
     return proto === Object.prototype || proto === null;
 }
-// 合并配置
 function mergeConfig(config1, config2) {
     const output = _object_spread({}, config1);
     for(const key in config2){
         const value2 = config2[key];
-        // 只对普通对象进行深度合并，类实例（如 AbortController）直接赋值
         if (isPlainObject(value2)) {
             const value1 = config1[key];
             output[key] = mergeConfig(value1 || {}, value2);
@@ -522,7 +483,5 @@ function mergeConfig(config1, config2) {
     }
     return output;
 }
-// 创建默认实例
 const fetchClient = new FetchClient();
-// 导出默认实例
 export default fetchClient;

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

@@ -22,13 +22,127 @@
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
  * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
- */ import { FetchClient } from './fetch.ts.js';
+ */ function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    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 { FetchClient } from './fetch.ts.js';
+/** 仅支持 body 的 HTTP 方法 */ const BODY_METHODS = new Set([
+    'POST',
+    'PUT',
+    'PATCH',
+    'DELETE'
+]);
+/** 排除 FormData / Blob / ArrayBuffer 等，只对普通对象展开合并 */ function isPlainObject(value) {
+    if (!value || typeof value !== 'object') return false;
+    const proto = Object.getPrototypeOf(value);
+    return proto === Object.prototype || proto === null;
+}
+/** 解析「函数 | 值」两种形式，支持延迟求值（如响应式 token） */ function resolveValue(value) {
+    return typeof value === 'function' ? value() : value;
+}
+/**
+ * 注册全局默认请求配置拦截器，将 `requestData.headers/data` 自动合并到每次请求。
+ * - `headers` 注入所有请求；`data` 仅注入 POST/PUT/PATCH/DELETE，避免 GET/HEAD body 报错。
+ * - 优先级最低（单次 IRequestConfig > 用户拦截器 > 本拦截器）。
+ */ function registerRequestDataInterceptor(client, opts) {
+    const { headers: extraHeadersFn, data: extraDataFn } = opts.requestData;
+    if (!extraHeadersFn && !extraDataFn) return;
+    client.interceptors.request.use((config)=>{
+        let result = config;
+        if (extraHeadersFn) {
+            const extra = resolveValue(extraHeadersFn);
+            if (extra && Object.keys(extra).length > 0) {
+                var _resolveValue;
+                const existing = (_resolveValue = resolveValue(config.headers)) !== null && _resolveValue !== void 0 ? _resolveValue : {};
+                result = _object_spread_props(_object_spread({}, result), {
+                    headers: _object_spread({}, existing, extra)
+                });
+            }
+        }
+        var _config_method;
+        const method = ((_config_method = config.method) !== null && _config_method !== void 0 ? _config_method : 'GET').toUpperCase();
+        if (extraDataFn && BODY_METHODS.has(method)) {
+            const extra = resolveValue(extraDataFn);
+            if (extra && Object.keys(extra).length > 0) {
+                const existing = resolveValue(config.data);
+                if (existing == null) {
+                    // body 为空（如 clearSession POST undefined）：直接用 extra 作为 body
+                    result = _object_spread_props(_object_spread({}, result), {
+                        data: extra
+                    });
+                } else if (isPlainObject(existing)) {
+                    // body 是普通对象：浅合并，extra 字段优先级更低（existing 已有同名字段时保留）
+                    result = _object_spread_props(_object_spread({}, result), {
+                        data: _object_spread({}, extra, existing)
+                    });
+                } else {
+                    // body 是 FormData / Blob / string 等：跳过注入，避免破坏原始 body
+                    console.warn('[chat-helper] requestData.data 无法注入：当前请求体不是普通对象（FormData/Blob/string 等），已跳过合并。', {
+                        method,
+                        existingType: typeof existing
+                    });
+                }
+            }
+        }
+        return result;
+    });
+}
 export const useFetch = (options)=>{
     var _options_interceptors, _options_interceptors1;
     const fetchClient = new FetchClient({
         baseURL: options.requestData.urlPrefix
     });
-    // 用户定义拦截器
+    // 先注册默认拦截器（优先级低），再注册用户拦截器（优先级高）
+    registerRequestDataInterceptor(fetchClient, options);
     if ((_options_interceptors = options.interceptors) === null || _options_interceptors === void 0 ? void 0 : _options_interceptors.request) {
         fetchClient.interceptors.request.use(options.interceptors.request);
     }
@@ -38,11 +152,11 @@ export const useFetch = (options)=>{
     // 重置 fetchClient 配置
     const reset = (newOptions)=>{
         var _newOptions_interceptors, _newOptions_interceptors1;
-        // 更新 baseURL
         fetchClient.defaults.baseURL = newOptions.requestData.urlPrefix;
-        // 清空并重新注册拦截器
+        // 清空并重新注册所有拦截器
         fetchClient.interceptors.request.clear();
         fetchClient.interceptors.response.clear();
+        registerRequestDataInterceptor(fetchClient, newOptions);
         if ((_newOptions_interceptors = newOptions.interceptors) === null || _newOptions_interceptors === void 0 ? void 0 : _newOptions_interceptors.request) {
             fetchClient.interceptors.request.use(newOptions.interceptors.request);
         }

package/dist/type.d.ts

@@ -2,10 +2,12 @@ import type { IRequestConfig, ISSEProtocol } from './http/fetch';
 import type { IResponse } from './http/fetch';
 export interface IUseChatHelperOptions {
     protocol?: ISSEProtocol;
+    /** 自定义拦截器，优先级高于内置 requestData 拦截器 */
     interceptors?: {
         request?: (config: IRequestConfig) => IRequestConfig;
         response?: (response: IResponse) => IResponse;
     };
+    /** 全局默认请求配置，通过内置拦截器自动合并到每次请求（函数形式可延迟求值） */
     requestData: {
         data?: (() => Record<string, unknown>) | Record<string, unknown>;
         headers?: (() => Record<string, string>) | Record<string, string>;

package/package.json

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