@nest-omni/core 4.1.3-27 → 4.1.3-29

package/http-client/decorators/http-client.decorators.js

@@ -28,21 +28,14 @@ exports.HttpClient = HttpClient;
  */
 const HttpRetry = (options = {}) => {
     return (target, propertyKey, descriptor) => {
-        const retryOptions = {
-            enabled: true,
-            retries: options.retries || 3,
-            retryDelay: options.retryDelay || ((retryCount) => Math.pow(2, retryCount) * 1000),
-            retryCondition: options.retryCondition ||
+        const retryOptions = Object.assign(Object.assign({}, (options.enabled !== undefined && { enabled: options.enabled })), { retries: options.retries || 3, retryDelay: options.retryDelay || ((retryCount) => Math.pow(2, retryCount) * 1000), retryCondition: options.retryCondition ||
                 ((error) => {
                     // 默认重试条件：网络错误、超时、5xx错误、429错误
                     if (!error.response)
                         return true; // 网络错误
                     const status = error.response.status;
                     return status >= 500 || status === 429; // 5xx错误或429限流
-                }),
-            shouldResetTimeout: options.shouldResetTimeout !== false,
-            onRetry: options.onRetry,
-        };
+                }), shouldResetTimeout: options.shouldResetTimeout !== false, onRetry: options.onRetry });
         // Wrap the method to pass decorator context to HTTP client
         const originalMethod = descriptor.value;
         const wrappedMethod = function (...args) {
@@ -51,12 +44,17 @@ const HttpRetry = (options = {}) => {
                 target,
                 propertyKey,
             });
-            try {
-                return originalMethod.apply(this, args);
-            }
-            finally {
-                call_stack_extractor_util_1.CallStackExtractor.clearDecoratorContext();
+            // 获取原始方法的返回值
+            const result = originalMethod.apply(this, args);
+            // 如果是 Promise，等待其完成后再清除上下文
+            if (result && typeof result.then === 'function') {
+                return result.finally(() => {
+                    call_stack_extractor_util_1.CallStackExtractor.clearDecoratorContext();
+                });
             }
+            // 同步方法，立即清除上下文
+            call_stack_extractor_util_1.CallStackExtractor.clearDecoratorContext();
+            return result;
         };
         // Copy metadata from original to wrapped method
         const metadataKeys = Reflect.getMetadataKeys(originalMethod);
@@ -87,6 +85,7 @@ const HttpCircuitBreaker = (options = {}) => {
         // Wrap the method to pass decorator context to HTTP client
         const originalMethod = descriptor.value;
         const wrappedMethod = function (...args) {
+            var _a;
             // Store decorator context in async local storage or call stack
             // Only set if not already set by another decorator
             if (!call_stack_extractor_util_1.CallStackExtractor.getDecoratorContext()) {
@@ -95,13 +94,21 @@ const HttpCircuitBreaker = (options = {}) => {
                     propertyKey,
                 });
             }
-            try {
-                return originalMethod.apply(this, args);
-            }
-            finally {
-                // Clean up the context after execution
-                call_stack_extractor_util_1.CallStackExtractor.clearDecoratorContext();
+            // 获取原始方法的返回值
+            const result = originalMethod.apply(this, args);
+            // 如果是 Promise，等待其完成后再清除上下文
+            if (result && typeof result.then === 'function') {
+                // 只有在最外层装饰器时才清除上下文
+                if (!call_stack_extractor_util_1.CallStackExtractor.getDecoratorContext() || ((_a = call_stack_extractor_util_1.CallStackExtractor.getDecoratorContext()) === null || _a === void 0 ? void 0 : _a.target) === target) {
+                    return result.finally(() => {
+                        call_stack_extractor_util_1.CallStackExtractor.clearDecoratorContext();
+                    });
+                }
+                return result;
             }
+            // 同步方法，立即清除上下文
+            call_stack_extractor_util_1.CallStackExtractor.clearDecoratorContext();
+            return result;
         };
         // Copy metadata from original to wrapped method
         const metadataKeys = Reflect.getMetadataKeys(originalMethod);
@@ -152,12 +159,17 @@ const HttpLogRequest = (options = {}) => {
                 target,
                 propertyKey,
             });
-            try {
-                return originalMethod.apply(this, args);
-            }
-            finally {
-                call_stack_extractor_util_1.CallStackExtractor.clearDecoratorContext();
+            // 获取原始方法的返回值
+            const result = originalMethod.apply(this, args);
+            // 如果是 Promise，等待其完成后再清除上下文
+            if (result && typeof result.then === 'function') {
+                return result.finally(() => {
+                    call_stack_extractor_util_1.CallStackExtractor.clearDecoratorContext();
+                });
             }
+            // 同步方法，立即清除上下文
+            call_stack_extractor_util_1.CallStackExtractor.clearDecoratorContext();
+            return result;
         };
         // Copy metadata from original to wrapped method
         const metadataKeys = Reflect.getMetadataKeys(originalMethod);
@@ -186,12 +198,17 @@ const HttpTimeout = (timeoutMs) => {
                 target,
                 propertyKey,
             });
-            try {
-                return originalMethod.apply(this, args);
-            }
-            finally {
-                call_stack_extractor_util_1.CallStackExtractor.clearDecoratorContext();
+            // 获取原始方法的返回值
+            const result = originalMethod.apply(this, args);
+            // 如果是 Promise，等待其完成后再清除上下文
+            if (result && typeof result.then === 'function') {
+                return result.finally(() => {
+                    call_stack_extractor_util_1.CallStackExtractor.clearDecoratorContext();
+                });
             }
+            // 同步方法，立即清除上下文
+            call_stack_extractor_util_1.CallStackExtractor.clearDecoratorContext();
+            return result;
         };
         // Copy metadata from original to wrapped method
         const metadataKeys = Reflect.getMetadataKeys(originalMethod);

package/http-client/http-client.module.d.ts

@@ -50,6 +50,14 @@ export declare class HttpClientModule {
         inject?: any[];
         imports?: any[];
     }): DynamicModule;
+    /**
+     * 安全地从环境变量解析整数
+     * @param configService NestJS ConfigService
+     * @param key 环境变量键
+     * @param defaultValue 默认值
+     * @returns 解析后的数字或默认值
+     */
+    private static parseEnvInt;
     /**
      * 从环境变量加载配置
      */

package/http-client/http-client.module.js

@@ -20,7 +20,6 @@ exports.HttpClientModule = void 0;
 const common_1 = require("@nestjs/common");
 const config_1 = require("@nestjs/config");
 const typeorm_1 = require("@nestjs/typeorm");
-const typeorm_2 = require("typeorm");
 const http_client_service_1 = require("./services/http-client.service");
 const circuit_breaker_service_1 = require("./services/circuit-breaker.service");
 const logging_service_1 = require("./services/logging.service");
@@ -86,7 +85,7 @@ let HttpClientModule = HttpClientModule_1 = class HttpClientModule {
                     const databaseLoggingEnabled = (_b = (_a = httpConfig === null || httpConfig === void 0 ? void 0 : httpConfig.logging) === null || _a === void 0 ? void 0 : _a.databaseLogging) === null || _b === void 0 ? void 0 : _b.enabled;
                     return new logging_service_1.HttpLoggingService();
                 },
-                inject: ['HTTP_CLIENT_CONFIG', typeorm_2.DataSource],
+                inject: ['HTTP_CLIENT_CONFIG'],
             },
             http_log_query_service_1.HttpLogQueryService,
             {
@@ -186,7 +185,7 @@ let HttpClientModule = HttpClientModule_1 = class HttpClientModule {
                     const databaseLoggingEnabled = (_b = (_a = httpConfig === null || httpConfig === void 0 ? void 0 : httpConfig.logging) === null || _a === void 0 ? void 0 : _a.databaseLogging) === null || _b === void 0 ? void 0 : _b.enabled;
                     return new logging_service_1.HttpLoggingService();
                 },
-                inject: ['HTTP_CLIENT_CONFIG', typeorm_2.DataSource],
+                inject: ['HTTP_CLIENT_CONFIG'],
             },
             http_log_query_service_1.HttpLogQueryService,
             {
@@ -242,6 +241,21 @@ let HttpClientModule = HttpClientModule_1 = class HttpClientModule {
             exports: baseExports,
         };
     }
+    /**
+     * 安全地从环境变量解析整数
+     * @param configService NestJS ConfigService
+     * @param key 环境变量键
+     * @param defaultValue 默认值
+     * @returns 解析后的数字或默认值
+     */
+    static parseEnvInt(configService, key, defaultValue) {
+        const value = configService.get(key);
+        if (value === undefined || value === null || value === '') {
+            return defaultValue;
+        }
+        const parsed = parseInt(value, 10);
+        return isNaN(parsed) ? defaultValue : parsed;
+    }
     /**
      * 从环境变量加载配置
      */
@@ -249,14 +263,10 @@ let HttpClientModule = HttpClientModule_1 = class HttpClientModule {
         var _a;
         return {
             baseURL: configService.get('HTTP_CLIENT_BASE_URL'),
-            timeout: configService.get('HTTP_CLIENT_TIMEOUT')
-                ? parseInt(configService.get('HTTP_CLIENT_TIMEOUT'))
-                : undefined,
+            timeout: this.parseEnvInt(configService, 'HTTP_CLIENT_TIMEOUT'),
             retry: {
                 enabled: configService.get('HTTP_CLIENT_RETRY_ENABLED') === 'true',
-                retries: configService.get('HTTP_CLIENT_RETRY_RETRIES')
-                    ? parseInt(configService.get('HTTP_CLIENT_RETRY_RETRIES'))
-                    : undefined,
+                retries: this.parseEnvInt(configService, 'HTTP_CLIENT_RETRY_RETRIES'),
                 retryDelay: configService.get('HTTP_CLIENT_RETRY_DELAY_STRATEGY') ===
                     'exponential'
                     ? (retryCount) => Math.pow(2, retryCount) * 1000
@@ -271,18 +281,10 @@ let HttpClientModule = HttpClientModule_1 = class HttpClientModule {
             circuitBreaker: {
                 enabled: configService.get('HTTP_CLIENT_CIRCUIT_BREAKER_ENABLED') ===
                     'true',
-                failureThreshold: configService.get('HTTP_CLIENT_CIRCUIT_BREAKER_FAILURE_THRESHOLD')
-                    ? parseInt(configService.get('HTTP_CLIENT_CIRCUIT_BREAKER_FAILURE_THRESHOLD'))
-                    : 5,
-                recoveryTimeoutMs: configService.get('HTTP_CLIENT_CIRCUIT_BREAKER_RECOVERY_TIMEOUT')
-                    ? parseInt(configService.get('HTTP_CLIENT_CIRCUIT_BREAKER_RECOVERY_TIMEOUT'))
-                    : 60000,
-                monitoringPeriodMs: configService.get('HTTP_CLIENT_CIRCUIT_BREAKER_MONITORING_PERIOD')
-                    ? parseInt(configService.get('HTTP_CLIENT_CIRCUIT_BREAKER_MONITORING_PERIOD'))
-                    : 10000,
-                minimumThroughputThreshold: configService.get('HTTP_CLIENT_CIRCUIT_BREAKER_MINIMUM_THROUGHPUT')
-                    ? parseInt(configService.get('HTTP_CLIENT_CIRCUIT_BREAKER_MINIMUM_THROUGHPUT'))
-                    : 10,
+                failureThreshold: this.parseEnvInt(configService, 'HTTP_CLIENT_CIRCUIT_BREAKER_FAILURE_THRESHOLD', 5),
+                recoveryTimeoutMs: this.parseEnvInt(configService, 'HTTP_CLIENT_CIRCUIT_BREAKER_RECOVERY_TIMEOUT', 60000),
+                monitoringPeriodMs: this.parseEnvInt(configService, 'HTTP_CLIENT_CIRCUIT_BREAKER_MONITORING_PERIOD', 10000),
+                minimumThroughputThreshold: this.parseEnvInt(configService, 'HTTP_CLIENT_CIRCUIT_BREAKER_MINIMUM_THROUGHPUT', 10),
                 countHalfOpenCalls: configService.get('HTTP_CLIENT_CIRCUIT_BREAKER_COUNT_HALF_OPEN') === 'true',
             },
             logging: {
@@ -292,9 +294,7 @@ let HttpClientModule = HttpClientModule_1 = class HttpClientModule {
                 logErrors: configService.get('HTTP_CLIENT_LOG_ERRORS') !== 'false',
                 logHeaders: configService.get('HTTP_CLIENT_LOG_HEADERS') !== 'false',
                 logBody: configService.get('HTTP_CLIENT_LOG_BODY') !== 'false',
-                maxBodyLength: configService.get('HTTP_CLIENT_LOG_MAX_BODY_LENGTH')
-                    ? parseInt(configService.get('HTTP_CLIENT_LOG_MAX_BODY_LENGTH'))
-                    : undefined,
+                maxBodyLength: this.parseEnvInt(configService, 'HTTP_CLIENT_LOG_MAX_BODY_LENGTH'),
                 sanitize: (_a = configService
                     .get('HTTP_CLIENT_LOG_SANITIZE')) === null || _a === void 0 ? void 0 : _a.split(','),
                 logLevel: configService.get('HTTP_CLIENT_LOG_LEVEL'),

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

@@ -8,6 +8,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -103,7 +106,7 @@ let HttpClientService = HttpClientService_1 = class HttpClientService {
      */
     request(config, decoratorContext, clientName, returnOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
             // 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
@@ -123,7 +126,7 @@ let HttpClientService = HttpClientService_1 = class HttpClientService {
                 try {
                     fullURL = new URL(requestURL, baseURL).href;
                 }
-                catch (_m) {
+                catch (_o) {
                     // 如果URL构建失败，使用原始URL
                     fullURL = requestURL;
                 }
@@ -142,8 +145,34 @@ let HttpClientService = HttpClientService_1 = class HttpClientService {
                 }
                 // 如果URL被修改，更新配置
                 if (sanitizeResult.url !== fullURL) {
-                    // 仅更新完整URL，保留原始的相对路径
+                    // 更新URL为清洗后的安全URL
                     this.logger.debug(`URL sanitized from "${fullURL}" to "${sanitizeResult.url}"`);
+                    // 如果原始URL是相对路径，保持相对路径；否则更新为清洗后的完整URL
+                    if (requestURL && !requestURL.startsWith('http://') && !requestURL.startsWith('https://')) {
+                        // 相对路径情况：从清洗后的完整URL中提取相对路径部分
+                        try {
+                            const sanitizedURL = new URL(sanitizeResult.url);
+                            const baseURLParts = baseURL.split('/');
+                            const sanitizedPathParts = sanitizedURL.pathname.split('/');
+                            // 计算相对路径
+                            let relativePath = sanitizedURL.pathname;
+                            if (baseURLParts.length > 3) {
+                                const basePath = baseURLParts.slice(3).join('/');
+                                if (relativePath.startsWith(basePath)) {
+                                    relativePath = relativePath.substring(basePath.length);
+                                }
+                            }
+                            config.url = relativePath || requestURL;
+                        }
+                        catch (_p) {
+                            // 如果提取失败，保持原始URL
+                            config.url = requestURL;
+                        }
+                    }
+                    else {
+                        // 绝对路径情况：直接使用清洗后的URL
+                        config.url = sanitizeResult.url;
+                    }
                 }
             }
             // ========== 安全验证结束 ==========
@@ -165,10 +194,14 @@ let HttpClientService = HttpClientService_1 = class HttpClientService {
                 const decoratorConfigs = effectiveDecoratorContext
                     ? decorators_1.HttpDecoratorUtils.getAllDecoratorConfigs(effectiveDecoratorContext.target, effectiveDecoratorContext.propertyKey)
                     : {};
+                // 存储装饰器的重试配置到 metadata，供 retryCondition 使用
+                if (((_c = decoratorConfigs.retry) === null || _c === void 0 ? void 0 : _c.enabled) !== undefined) {
+                    enhancedConfig.metadata.retryEnabled = decoratorConfigs.retry.enabled;
+                }
                 // 日志记录开始
                 const decoratorLogging = decoratorConfigs.logging || {};
                 this.logger.debug(`Logging config merge: decoratorLogging=${JSON.stringify(decoratorLogging)}, defaultLogging=${JSON.stringify(this.defaultConfig.logging)}`);
-                const loggingOptions = Object.assign(Object.assign(Object.assign({}, this.defaultConfig.logging), decoratorLogging), { databaseLogging: (_c = this.defaultConfig.logging) === null || _c === void 0 ? void 0 : _c.databaseLogging });
+                const loggingOptions = Object.assign(Object.assign(Object.assign({}, this.defaultConfig.logging), decoratorLogging), { databaseLogging: (_d = this.defaultConfig.logging) === null || _d === void 0 ? void 0 : _d.databaseLogging });
                 this.logger.debug(`Merged loggingOptions: databaseLog=${loggingOptions.databaseLog}, hasDatabaseLogging=${!!loggingOptions.databaseLogging}`);
                 if (loggingOptions === null || loggingOptions === void 0 ? void 0 : loggingOptions.enabled) {
                     requestId = this.loggingService.logRequestStart(enhancedConfig, loggingOptions);
@@ -197,12 +230,12 @@ let HttpClientService = HttpClientService_1 = class HttpClientService {
                 // 成功日志
                 if (loggingOptions === null || loggingOptions === void 0 ? void 0 : loggingOptions.enabled) {
                     const databaseLogging = (loggingOptions === null || loggingOptions === void 0 ? void 0 : loggingOptions.databaseLogging) ||
-                        ((_e = (_d = this.defaultConfig.logging) === null || _d === void 0 ? void 0 : _d.databaseLogging) === null || _e === void 0 ? void 0 : _e.enabled);
+                        ((_f = (_e = this.defaultConfig.logging) === null || _e === void 0 ? void 0 : _e.databaseLogging) === null || _f === void 0 ? void 0 : _f.enabled);
                     this.logger.debug(`Logging request success with circuitBreakerState: ${circuitBreakerState || 'undefined'}`);
                     this.loggingService.logRequestSuccess(response, startTime, requestId, loggingOptions, databaseLogging, retryRecorder.getRecords(), circuitBreakerState, decoratorContext, effectiveClientName, callingContext);
                 }
                 // 更新统计信息
-                this.updateRequestStats(true, Date.now() - startTime, ((_f = response.config) === null || _f === void 0 ? void 0 : _f.method) || 'GET', response.status);
+                this.updateRequestStats(true, Date.now() - startTime, ((_g = response.config) === null || _g === void 0 ? void 0 : _g.method) || 'GET', response.status);
                 // 根据返回选项处理响应
                 const options = returnOptions || { returnType: 'data' };
                 switch (options.returnType) {
@@ -227,16 +260,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: (_g = this.defaultConfig.logging) === null || _g === void 0 ? void 0 : _g.databaseLogging });
+                const loggingOptions = Object.assign(Object.assign(Object.assign({}, this.defaultConfig.logging), decoratorLogging), { databaseLogging: (_h = this.defaultConfig.logging) === null || _h === void 0 ? void 0 : _h.databaseLogging });
                 if (loggingOptions === null || loggingOptions === void 0 ? void 0 : loggingOptions.enabled) {
                     const databaseLogging = (loggingOptions === null || loggingOptions === void 0 ? void 0 : loggingOptions.databaseLog) ||
-                        ((_j = (_h = this.defaultConfig.logging) === null || _h === void 0 ? void 0 : _h.databaseLogging) === null || _j === void 0 ? void 0 : _j.enabled);
+                        ((_k = (_j = this.defaultConfig.logging) === null || _j === void 0 ? void 0 : _j.databaseLogging) === null || _k === void 0 ? void 0 : _k.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 = (_k = error.config) === null || _k === void 0 ? void 0 : _k.method;
-                const errorStatus = (_l = error.response) === null || _l === void 0 ? void 0 : _l.status;
+                const errorMethod = (_l = error.config) === null || _l === void 0 ? void 0 : _l.method;
+                const errorStatus = (_m = error.response) === null || _m === void 0 ? void 0 : _m.status;
                 this.updateRequestStats(false, Date.now() - startTime, errorMethod, errorStatus);
                 throw error;
             }
@@ -525,7 +558,11 @@ let HttpClientService = HttpClientService_1 = class HttpClientService {
         const axiosCreateConfig = {
             baseURL: this.defaultConfig.baseURL,
             timeout: this.defaultConfig.timeout,
-            proxy: resolvedProxy !== undefined ? resolvedProxy : undefined,
+            // 只有当 resolvedProxy 是有效的配置对象时才设置代理
+            // false 和 undefined 都表示不使用代理
+            proxy: resolvedProxy && typeof resolvedProxy === 'object'
+                ? resolvedProxy
+                : undefined,
             // 应用处理后的 httpsAgent
             httpsAgent: httpsAgent,
         };
@@ -548,6 +585,13 @@ let HttpClientService = HttpClientService_1 = class HttpClientService {
                     ((retryCount) => Math.pow(2, retryCount) * 1000),
                 retryCondition: this.defaultConfig.retry.retryCondition ||
                     ((error) => {
+                        var _a;
+                        // 检查装饰器配置是否禁用了重试
+                        const requestConfig = error.config;
+                        if (((_a = requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.metadata) === null || _a === void 0 ? void 0 : _a.retryEnabled) === false) {
+                            return false; // 装饰器明确禁用了重试
+                        }
+                        // 默认重试条件：网络错误、超时、5xx错误、429错误
                         if (!error.response)
                             return true; // 网络错误
                         const status = error.response.status;
@@ -898,6 +942,7 @@ let HttpClientService = HttpClientService_1 = class HttpClientService {
 exports.HttpClientService = HttpClientService;
 exports.HttpClientService = HttpClientService = HttpClientService_1 = __decorate([
     (0, common_1.Injectable)(),
+    __param(2, (0, common_1.Optional)()),
     __metadata("design:paramtypes", [circuit_breaker_service_1.HttpCircuitBreakerService,
         logging_service_1.HttpLoggingService,
         redis_lock_service_1.RedisLockService, Object, String, Object])

package/http-client/utils/context-extractor.util.d.ts

@@ -29,6 +29,8 @@ export declare class ContextExtractor {
     static getClientIp(): string | undefined;
     /**
      * 获取用户代理
+     * 注意：当前 ContextProvider 不存储 userAgent 信息
+     * 如需使用此功能，需要扩展 ContextProvider 或从请求头中获取
      */
     static getUserAgent(): string | undefined;
     /**

package/http-client/utils/context-extractor.util.js

@@ -13,7 +13,15 @@ class ContextExtractor {
     static getHttpContext() {
         try {
             const requestId = providers_1.ContextProvider.getRequestId();
-            const authUser = providers_1.ContextProvider.getAuthUser();
+            // 使用安全的方式获取 authUser，避免抛出异常
+            let authUser = undefined;
+            try {
+                authUser = providers_1.ContextProvider.getAuthUser();
+            }
+            catch (_a) {
+                // 在测试/CLI环境中可能没有用户上下文
+                authUser = undefined;
+            }
             const router = providers_1.ContextProvider.getRouter();
             const source = providers_1.ContextProvider.getSource();
             return {
@@ -29,7 +37,7 @@ class ContextExtractor {
                 tags: [],
             };
         }
-        catch (_a) {
+        catch (_b) {
             // If no context is available, return empty context
             return {
                 tags: [],
@@ -73,11 +81,15 @@ class ContextExtractor {
     }
     /**
      * 获取用户代理
+     * 注意：当前 ContextProvider 不存储 userAgent 信息
+     * 如需使用此功能，需要扩展 ContextProvider 或从请求头中获取
      */
     static getUserAgent() {
         try {
             const router = providers_1.ContextProvider.getRouter();
-            return undefined;
+            // TODO: userAgent 需要从请求头中获取，当前 router 对象不包含此字段
+            // 可以考虑扩展 ContextProvider 来存储完整的请求信息
+            return router === null || router === void 0 ? void 0 : router.userAgent;
         }
         catch (_a) {
             return undefined;

package/interceptors/index.d.ts

@@ -1,3 +1,2 @@
 export * from './language-interceptor.service';
 export * from './translation-interceptor.service';
-export * from './http-logging-interceptor.service';

package/interceptors/index.js

@@ -16,4 +16,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./language-interceptor.service"), exports);
 __exportStar(require("./translation-interceptor.service"), exports);
-__exportStar(require("./http-logging-interceptor.service"), exports);

package/interceptors/translation-interceptor.service.d.ts

@@ -1,5 +1,12 @@
 import type { CallHandler, ExecutionContext, NestInterceptor } from '@nestjs/common';
 import type { Observable } from 'rxjs';
+import { TranslationService } from '../shared/services/translation.service';
+/**
+ * 翻译拦截器
+ * 自动翻译响应数据中标记为需要翻译的字段
+ */
 export declare class TranslationInterceptor implements NestInterceptor {
+    private readonly translationService?;
+    constructor(translationService?: TranslationService);
     intercept(context: ExecutionContext, next: CallHandler): Observable<any>;
 }

package/interceptors/translation-interceptor.service.js

@@ -5,35 +5,67 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TranslationInterceptor = void 0;
 const common_1 = require("@nestjs/common");
 const operators_1 = require("rxjs/operators");
-// import { TranslationService } from '../shared/services/translation.service';
-// FIXME: add implementation
+const translation_service_1 = require("../shared/services/translation.service");
+/**
+ * 翻译拦截器
+ * 自动翻译响应数据中标记为需要翻译的字段
+ */
 let TranslationInterceptor = class TranslationInterceptor {
-    // constructor(private readonly translationService: TranslationService) {}
+    constructor(translationService) {
+        this.translationService = translationService;
+    }
     intercept(context, next) {
         const ctx = context.switchToHttp();
         const req = ctx.getRequest();
         const res = ctx.getResponse();
-        return next.handle().pipe((0, operators_1.map)((data) => {
-            // const newData = this.translationService.translateNecessaryKeys(data);
+        return next.handle().pipe((0, operators_1.map)((data) => __awaiter(this, void 0, void 0, function* () {
+            // 如果 TranslationService 可用，翻译响应数据
+            let translatedData = data;
+            if (this.translationService) {
+                try {
+                    translatedData = yield this.translationService.translateNecessaryKeys(data);
+                }
+                catch (error) {
+                    // 翻译失败时返回原始数据，不中断请求
+                    translatedData = data;
+                }
+            }
             // status 201 => 200
             if (res.statusCode === common_1.HttpStatus.CREATED) {
                 res.status(common_1.HttpStatus.OK);
             }
             return {
                 code: 200,
-                data,
+                data: translatedData,
                 msg: 'success',
                 requestId: req.id,
                 timestamp: new Date().toISOString(),
             };
-        }));
+        })));
     }
 };
 exports.TranslationInterceptor = TranslationInterceptor;
 exports.TranslationInterceptor = TranslationInterceptor = __decorate([
-    (0, common_1.Injectable)()
+    (0, common_1.Injectable)(),
+    __param(0, (0, common_1.Optional)()),
+    __metadata("design:paramtypes", [translation_service_1.TranslationService])
 ], TranslationInterceptor);

package/package.json

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

package/setup/bootstrap.setup.js

@@ -166,7 +166,7 @@ function bootstrapSetup(AppModule, SetupSwagger) {
         const reflector = app.get(core_1.Reflector);
         app.useGlobalFilters(new setup_1.SentryGlobalFilter(), new __1.HttpExceptionFilter(), new __1.QueryFailedFilter(reflector));
         // 全局拦截器
-        app.useGlobalInterceptors(new __1.HttpLoggingInterceptor(configService), new __1.LanguageInterceptor(), new __1.TranslationInterceptor());
+        app.useGlobalInterceptors(new __1.LanguageInterceptor(), new __1.TranslationInterceptor(), new nestjs_pino_1.LoggerErrorInterceptor());
         // 全局管道
         app.useGlobalPipes(new nestjs_i18n_1.I18nValidationPipe({
             whitelist: true,

package/shared/services/api-config.service.js

@@ -57,7 +57,7 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
             password: this.getString('DB_PASSWORD'),
             database: this.getString('DB_DATABASE'),
             subscribers: [],
-            synchronize: this.isDev,
+            synchronize: this.getBoolean('DB_SYNCHRONIZE', this.isDev),
             migrationsRun: true,
             logging: this.getBoolean('DB_LOG_ENABLED'),
             logger: this.isDev ? 'formatted-console' : 'simple-console',
@@ -214,8 +214,23 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
                 genReqId: (req) => req.id,
                 transport,
                 level: this.isDev ? 'debug' : 'info',
-                // 禁用 pinoHttp 的自动日志，由 HttpLoggingInterceptor 处理
-                autoLogging: false,
+                customLogLevel: function (res) {
+                    if (res.statusCode >= 500)
+                        return 'error';
+                    if (res.statusCode >= 400)
+                        return 'warn';
+                    return 'info';
+                },
+                wrapSerializers: true,
+                customProps: (req, res) => {
+                    return {
+                        env: this.nodeEnv,
+                        appName: this.getString('NAME'),
+                        user: req === null || req === void 0 ? void 0 : req.user,
+                        'req.body': req === null || req === void 0 ? void 0 : req.body,
+                        'res.body': res === null || res === void 0 ? void 0 : res.body,
+                    };
+                },
                 redact: {
                     paths: ['req.headers.authorization', 'req.headers.apikey', 'req.headers.cookie'],
                     remove: true,

package/interceptors/http-logging-interceptor.service.d.ts

@@ -1,38 +0,0 @@
-import { NestInterceptor, ExecutionContext, CallHandler } from '@nestjs/common';
-import { Observable } from 'rxjs';
-import { ApiConfigService } from '../shared/services/api-config.service';
-/**
- * HTTP 日志拦截器
- * 参考 Tomcat AccessLog 的实现，每个请求只记录一条日志
- * 在请求完成时同时记录请求和响应的完整信息
- */
-export declare class HttpLoggingInterceptor implements NestInterceptor {
-    private readonly configService;
-    private readonly logger;
-    constructor(configService: ApiConfigService);
-    intercept(context: ExecutionContext, next: CallHandler): Observable<any>;
-    /**
-     * 生成请求 ID
-     */
-    private generateRequestId;
-    /**
-     * 记录请求和响应（一条日志）
-     */
-    private logRequestResponse;
-    /**
-     * 记录请求和错误（一条日志）
-     */
-    private logRequestError;
-    /**
-     * 清理敏感的 header 信息
-     */
-    private sanitizeHeaders;
-    /**
-     * 清理敏感的 body 信息
-     */
-    private sanitizeBody;
-    /**
-     * 从 headers 提取用户信息
-     */
-    private extractUser;
-}