@nest-omni/core 4.1.3-23 → 4.1.3-25

package/http-client/interfaces/api-client-config.interface.d.ts

@@ -116,17 +116,36 @@ export interface ResponseTransformerConfig {
 }
 /**
  * API客户端配置
+ * 用于创建多个具有不同配置的 HttpClient 实例
  */
 export interface ApiClientConfig {
     /** API名称（用于标识和日志） */
     name: string;
     /** 基础URL */
     baseURL: string;
-    /** HTTP客户端基础配置 */
-    httpConfig?: HttpClientConfig;
-    /** 鉴权配置 */
+    /**
+     * HttpClient 配置
+     * 包含所有 HttpClientConfig 的配置项（timeout, retry, logging, axiosConfig 等）
+     */
+    httpConfig?: Partial<HttpClientConfig>;
+    /**
+     * 重试配置（快捷方式，会合并到 httpConfig.retry）
+     * @deprecated 使用 httpConfig.retry 代替
+     */
+    retry?: {
+        enabled?: boolean;
+        retries?: number;
+        retryCondition?: (error: any) => boolean;
+    };
+    /**
+     * 鉴权配置
+     * API客户端特有的鉴权功能
+     */
     auth?: AuthConfig;
-    /** 响应转换配置 */
+    /**
+     * 响应转换配置
+     * API客户端特有的响应处理
+     */
     responseTransformer?: ResponseTransformerConfig;
     /** 默认请求头 */
     defaultHeaders?: Record<string, string>;
@@ -138,20 +157,12 @@ export interface ApiClientConfig {
         response?: Array<(response: AxiosResponse) => AxiosResponse | Promise<AxiosResponse>>;
         error?: Array<(error: any) => any>;
     };
-    /** 重试配置（覆盖全局配置） */
-    retry?: {
-        enabled?: boolean;
-        retries?: number;
-        retryCondition?: (error: any) => boolean;
-    };
     /** 是否启用响应验证 */
     enableValidation?: boolean;
     /** 响应时间警告阈值（毫秒） */
     responseTimeWarningThreshold?: number;
     /** 自定义标签（用于分类和查询） */
     tags?: string[];
-    /** 是否启用详细日志 */
-    enableDetailedLogging?: boolean;
 }
 /**
  * API客户端实例配置

package/http-client/services/api-client-registry.service.d.ts

@@ -19,6 +19,11 @@ export declare class ApiClientRegistryService {
      * 使用 HttpClientService.createApiClient 静态方法创建
      */
     createClient<T = any>(config: ApiClientInstanceConfig): T;
+    /**
+     * 深度合并配置（已废弃，不再需要）
+     * @deprecated 配置结构简化后不再需要此方法
+     */
+    private deepMergeConfigs;
     /**
      * 获取已注册的客户端
      */

package/http-client/services/api-client-registry.service.js

@@ -62,7 +62,6 @@ let ApiClientRegistryService = ApiClientRegistryService_1 = class ApiClientRegis
      * 使用 HttpClientService.createApiClient 静态方法创建
      */
     createClient(config) {
-        var _a, _b, _c, _d, _e, _f, _g;
         const clientName = config.name;
         const existingClient = this.clients.get(clientName);
         if (existingClient && !config.override) {
@@ -71,6 +70,15 @@ let ApiClientRegistryService = ApiClientRegistryService_1 = class ApiClientRegis
         }
         // 合并环境特定配置
         const finalConfig = this.mergeEnvironmentConfig(config);
+        // 构建 HttpClient 配置
+        // 1. 从全局默认配置开始
+        // 2. 合并 ApiClient 的 httpConfig
+        // 3. 应用 ApiClient 特有的 retry 配置（兼容旧代码）
+        let mergedHttpConfig = Object.assign(Object.assign({}, this.globalDefaults.globalDefaults), finalConfig.httpConfig);
+        // 兼容：如果 ApiClientConfig 顶层有 retry 配置，合并到 httpConfig.retry
+        if (finalConfig.retry) {
+            mergedHttpConfig.retry = Object.assign(Object.assign({}, mergedHttpConfig.retry), finalConfig.retry);
+        }
         // 使用静态工厂方法创建 HttpClientService 实例
         const httpClient = http_client_service_1.HttpClientService.createApiClient({
             circuitBreakerService: this.circuitBreakerService,
@@ -78,30 +86,7 @@ let ApiClientRegistryService = ApiClientRegistryService_1 = class ApiClientRegis
         }, {
             name: clientName,
             baseURL: finalConfig.baseURL,
-            timeout: ((_a = finalConfig.httpConfig) === null || _a === void 0 ? void 0 : _a.timeout) || 30000,
-            httpConfig: Object.assign({ retry: {
-                    enabled: ((_b = finalConfig.retry) === null || _b === void 0 ? void 0 : _b.enabled) !== false &&
-                        this.globalDefaults.enableGlobalRetry,
-                    retries: ((_c = finalConfig.retry) === null || _c === void 0 ? void 0 : _c.retries) ||
-                        ((_e = (_d = this.globalDefaults.globalDefaults) === null || _d === void 0 ? void 0 : _d.retry) === null || _e === void 0 ? void 0 : _e.retries) ||
-                        3,
-                    retryDelay: (retryCount) => Math.pow(2, retryCount) * 1000,
-                    retryCondition: ((_f = finalConfig.retry) === null || _f === void 0 ? void 0 : _f.retryCondition) ||
-                        ((error) => {
-                            if (!error.response)
-                                return true;
-                            const status = error.response.status;
-                            return status >= 500 || status === 429;
-                        }),
-                    shouldResetTimeout: true,
-                }, logging: Object.assign({ enabled: true, logRequests: true, logResponses: true, logErrors: true, logHeaders: true, logBody: true, maxBodyLength: 10000, sanitizeHeaders: ['authorization', 'api-key'], logLevel: 'info' }, (_g = this.globalDefaults.globalDefaults) === null || _g === void 0 ? void 0 : _g.logging), circuitBreaker: {
-                    enabled: this.globalDefaults.enableCircuitBreaker,
-                    failureThreshold: 5,
-                    recoveryTimeoutMs: 60000,
-                    monitoringPeriodMs: 10000,
-                    minimumThroughputThreshold: 10,
-                    countHalfOpenCalls: true,
-                } }, finalConfig.httpConfig),
+            httpConfig: mergedHttpConfig,
             auth: finalConfig.auth,
         });
         // 存储客户端和配置
@@ -110,6 +95,13 @@ let ApiClientRegistryService = ApiClientRegistryService_1 = class ApiClientRegis
         this.logger.log(`Created API client: ${clientName}`);
         return httpClient;
     }
+    /**
+     * 深度合并配置（已废弃，不再需要）
+     * @deprecated 配置结构简化后不再需要此方法
+     */
+    deepMergeConfigs(defaults, userConfig) {
+        return Object.assign(Object.assign({}, defaults), userConfig);
+    }
     /**
      * 获取已注册的客户端
      */

package/http-client/services/http-client.service.d.ts

@@ -135,6 +135,7 @@ export declare class HttpClientService {
     private calculateRetryDelay;
     /**
      * 应用装饰器配置
+     * 只在装饰器配置值有效时才覆盖请求配置
      */
     private applyDecoratorConfig;
     /**
@@ -147,6 +148,7 @@ export declare class HttpClientService {
     private mergeWithDefaults;
     /**
      * 深度合并对象
+     * 只在源值有效（非 undefined）时才覆盖目标值
      */
     private deepMerge;
     /**

package/http-client/services/http-client.service.js

@@ -79,14 +79,23 @@ let HttpClientService = HttpClientService_1 = class HttpClientService {
      * @returns HttpClientService 实例
      */
     static createApiClient(dependencies, config) {
-        return new HttpClientService_1(dependencies.circuitBreakerService, dependencies.loggingService, dependencies.redisLockService, Object.assign({ baseURL: config.baseURL, timeout: config.timeout || 30000 }, config.httpConfig), config.name, config.auth);
+        // 构建配置，只在值有效时才覆盖
+        const mergedConfig = Object.assign({}, config.httpConfig);
+        // 只在显式提供且值有效时才覆盖
+        if (config.baseURL !== undefined) {
+            mergedConfig.baseURL = config.baseURL;
+        }
+        if (config.timeout !== undefined) {
+            mergedConfig.timeout = config.timeout;
+        }
+        return new HttpClientService_1(dependencies.circuitBreakerService, dependencies.loggingService, dependencies.redisLockService, mergedConfig, config.name, config.auth);
     }
     /**
      * 执行HTTP请求
      */
     request(config, decoratorContext, clientName) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             // Use the instance's clientName as fallback if not provided
             const effectiveClientName = clientName || this.clientName;
             // If no decorator context provided, try to get it from CallStackExtractor
@@ -94,22 +103,36 @@ let HttpClientService = HttpClientService_1 = class HttpClientService {
             const effectiveDecoratorContext = decoratorContext || call_stack_extractor_util_1.CallStackExtractor.getDecoratorContext();
             // ========== 安全验证开始 ==========
             // 构造完整URL进行验证
-            const fullURL = config.url || '';
+            const requestURL = config.url || '';
             const baseURL = config.baseURL || this.defaultConfig.baseURL || '';
-            // 执行URL安全验证
-            const sanitizeResult = security_validator_util_1.SecurityValidator.sanitizeURL(fullURL, {
-                urlConfig: (_a = this.defaultConfig.security) === null || _a === void 0 ? void 0 : _a.urlValidation,
-                ssrfConfig: (_b = this.defaultConfig.security) === null || _b === void 0 ? void 0 : _b.ssrfProtection,
-            });
-            if (!sanitizeResult.valid) {
-                const error = new Error(`URL validation failed: ${sanitizeResult.error}`);
-                this.logger.error(`URL validation failed for ${fullURL}: ${sanitizeResult.error}`);
-                throw error;
+            // 构建完整的URL用于验证
+            let fullURL = requestURL;
+            if (requestURL && !requestURL.startsWith('http://') && !requestURL.startsWith('https://') && baseURL) {
+                // 处理相对URL
+                try {
+                    fullURL = new URL(requestURL, baseURL).href;
+                }
+                catch (_m) {
+                    // 如果URL构建失败，使用原始URL
+                    fullURL = requestURL;
+                }
             }
-            // 如果URL被修改，更新配置
-            if (sanitizeResult.url !== fullURL) {
-                config.url = sanitizeResult.url;
-                this.logger.debug(`URL sanitized from "${fullURL}" to "${sanitizeResult.url}"`);
+            // 执行URL安全验证（只对完整URL进行验证）
+            if (fullURL && (fullURL.startsWith('http://') || fullURL.startsWith('https://'))) {
+                const sanitizeResult = security_validator_util_1.SecurityValidator.sanitizeURL(fullURL, {
+                    urlConfig: (_a = this.defaultConfig.security) === null || _a === void 0 ? void 0 : _a.urlValidation,
+                    ssrfConfig: (_b = this.defaultConfig.security) === null || _b === void 0 ? void 0 : _b.ssrfProtection,
+                });
+                if (!sanitizeResult.valid) {
+                    const error = new Error(`URL validation failed: ${sanitizeResult.error}`);
+                    this.logger.error(`URL validation failed for ${fullURL}: ${sanitizeResult.error}`);
+                    throw error;
+                }
+                // 如果URL被修改，更新配置
+                if (sanitizeResult.url !== fullURL) {
+                    // 仅更新完整URL，保留原始的相对路径
+                    this.logger.debug(`URL sanitized from "${fullURL}" to "${sanitizeResult.url}"`);
+                }
             }
             // ========== 安全验证结束 ==========
             // Capture the calling context information
@@ -167,7 +190,7 @@ let HttpClientService = HttpClientService_1 = class HttpClientService {
                     this.loggingService.logRequestSuccess(response, startTime, requestId, loggingOptions, databaseLogging, retryRecorder.getRecords(), circuitBreakerState, decoratorContext, effectiveClientName, callingContext);
                 }
                 // 更新统计信息
-                this.updateRequestStats(true, Date.now() - startTime, response.config.method, response.status);
+                this.updateRequestStats(true, Date.now() - startTime, ((_f = response.config) === null || _f === void 0 ? void 0 : _f.method) || 'GET', response.status);
                 return response.data;
             }
             catch (error) {
@@ -175,16 +198,16 @@ let HttpClientService = HttpClientService_1 = class HttpClientService {
                 const decoratorLogging = effectiveDecoratorContext
                     ? decorators_1.HttpDecoratorUtils.getLoggingOptions(effectiveDecoratorContext.target, effectiveDecoratorContext.propertyKey)
                     : {};
-                const loggingOptions = Object.assign(Object.assign(Object.assign({}, this.defaultConfig.logging), decoratorLogging), { databaseLogging: (_f = this.defaultConfig.logging) === null || _f === void 0 ? void 0 : _f.databaseLogging });
+                const loggingOptions = Object.assign(Object.assign(Object.assign({}, this.defaultConfig.logging), decoratorLogging), { databaseLogging: (_g = this.defaultConfig.logging) === null || _g === void 0 ? void 0 : _g.databaseLogging });
                 if (loggingOptions === null || loggingOptions === void 0 ? void 0 : loggingOptions.enabled) {
                     const databaseLogging = (loggingOptions === null || loggingOptions === void 0 ? void 0 : loggingOptions.databaseLog) ||
-                        ((_h = (_g = this.defaultConfig.logging) === null || _g === void 0 ? void 0 : _g.databaseLogging) === null || _h === void 0 ? void 0 : _h.enabled);
+                        ((_j = (_h = this.defaultConfig.logging) === null || _h === void 0 ? void 0 : _h.databaseLogging) === null || _j === void 0 ? void 0 : _j.enabled);
                     const records = retryRecorder.getRecords();
                     this.loggingService.logRequestError(error, startTime, requestId, (records === null || records === void 0 ? void 0 : records.length) ? Math.max(...records.map((r) => r.attempt)) + 1 : 1, loggingOptions, databaseLogging, records, circuitBreakerState, effectiveDecoratorContext, effectiveClientName, callingContext);
                 }
                 // 更新统计信息
-                const errorMethod = (_j = error.config) === null || _j === void 0 ? void 0 : _j.method;
-                const errorStatus = (_k = error.response) === null || _k === void 0 ? void 0 : _k.status;
+                const errorMethod = (_k = error.config) === null || _k === void 0 ? void 0 : _k.method;
+                const errorStatus = (_l = error.response) === null || _l === void 0 ? void 0 : _l.status;
                 this.updateRequestStats(false, Date.now() - startTime, errorMethod, errorStatus);
                 throw error;
             }
@@ -478,9 +501,14 @@ let HttpClientService = HttpClientService_1 = class HttpClientService {
             httpsAgent: httpsAgent,
         };
         // 透传所有其他 axiosConfig 配置（排除已特殊处理的字段）
+        // 只在值有效时才覆盖
         if (this.defaultConfig.axiosConfig) {
             const _d = this.defaultConfig.axiosConfig, { ssl, httpsAgent: _ } = _d, restAxiosConfig = __rest(_d, ["ssl", "httpsAgent"]);
-            Object.assign(axiosCreateConfig, restAxiosConfig);
+            for (const key in restAxiosConfig) {
+                if (restAxiosConfig[key] !== undefined) {
+                    axiosCreateConfig[key] = restAxiosConfig[key];
+                }
+            }
         }
         const instance = require('axios').create(axiosCreateConfig);
         // 配置axios-retry
@@ -587,12 +615,20 @@ let HttpClientService = HttpClientService_1 = class HttpClientService {
     }
     /**
      * 应用装饰器配置
+     * 只在装饰器配置值有效时才覆盖请求配置
      */
     applyDecoratorConfig(config, decoratorContext) {
         if (!decoratorContext)
             return Object.assign({}, config);
         const httpClientConfig = decorators_1.HttpDecoratorUtils.getHttpClientOptions(decoratorContext.target);
-        return Object.assign(Object.assign({}, config), httpClientConfig);
+        // 只在值有效时才合并
+        const result = Object.assign({}, config);
+        for (const key in httpClientConfig) {
+            if (httpClientConfig[key] !== undefined) {
+                result[key] = httpClientConfig[key];
+            }
+        }
+        return result;
     }
     // Note: applyDecoratorConfig is not currently being called in executeWithFeatures
     // The decorator config is already being applied via effectiveDecoratorContext
@@ -663,10 +699,15 @@ let HttpClientService = HttpClientService_1 = class HttpClientService {
     }
     /**
      * 深度合并对象
+     * 只在源值有效（非 undefined）时才覆盖目标值
      */
     deepMerge(target, source) {
         const result = Object.assign({}, target);
         for (const key in source) {
+            // 跳过 undefined 值，不覆盖目标值
+            if (source[key] === undefined) {
+                continue;
+            }
             if (source[key] &&
                 typeof source[key] === 'object' &&
                 !Array.isArray(source[key])) {

package/http-client/services/logging.service.js

@@ -154,7 +154,6 @@ let HttpLoggingService = HttpLoggingService_1 = class HttpLoggingService {
                     ? callingContext
                     : this.extractCallInfo(decoratorContext, response.config);
                 this.saveToDatabase({
-                    id: requestId,
                     requestId,
                     userId: context.userId,
                     method: ((_c = response.config.method) === null || _c === void 0 ? void 0 : _c.toUpperCase()) || 'UNKNOWN',
@@ -232,7 +231,6 @@ let HttpLoggingService = HttpLoggingService_1 = class HttpLoggingService {
                 ? callingContext
                 : this.extractCallInfo(decoratorContext, error.config);
             this.saveToDatabase({
-                id: requestId,
                 requestId,
                 userId: context.userId,
                 method: ((_d = (_c = error.config) === null || _c === void 0 ? void 0 : _c.method) === null || _d === void 0 ? void 0 : _d.toUpperCase()) || 'UNKNOWN',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nest-omni/core",
-  "version": "4.1.3-23",
+  "version": "4.1.3-25",
   "description": "A comprehensive NestJS framework for building enterprise-grade applications with best practices",
   "main": "index.js",
   "types": "index.d.ts",