@nest-omni/core 4.1.3-19 → 4.1.3-20

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

@@ -1,15 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpDecoratorUtils = exports.HttpUseProxy = exports.HttpTimeout = exports.HttpLogRequest = exports.HttpCacheable = exports.HttpCircuitBreaker = exports.HttpRetry = exports.HttpClient = exports.CALL_INFO_KEY = exports.PROXY_OPTIONS_KEY = exports.TIMEOUT_OPTIONS_KEY = exports.LOGGING_OPTIONS_KEY = exports.CACHE_OPTIONS_KEY = exports.CIRCUIT_BREAKER_OPTIONS_KEY = exports.RETRY_OPTIONS_KEY = exports.HTTP_CLIENT_OPTIONS_KEY = void 0;
+exports.HttpDecoratorUtils = exports.HttpUseProxy = exports.HttpTimeout = exports.HttpLogRequest = exports.HttpCircuitBreaker = exports.HttpRetry = exports.HttpClient = exports.CALL_INFO_KEY = exports.PROXY_OPTIONS_KEY = exports.TIMEOUT_OPTIONS_KEY = exports.LOGGING_OPTIONS_KEY = exports.CIRCUIT_BREAKER_OPTIONS_KEY = exports.RETRY_OPTIONS_KEY = exports.HTTP_CLIENT_OPTIONS_KEY = void 0;
 require("reflect-metadata");
 const common_1 = require("@nestjs/common");
-const cache_options_interface_1 = require("../../cache/interfaces/cache-options.interface");
 const call_stack_extractor_util_1 = require("../utils/call-stack-extractor.util");
 // 装饰器元数据键
 exports.HTTP_CLIENT_OPTIONS_KEY = 'http_client_options';
 exports.RETRY_OPTIONS_KEY = 'http_retry_options';
 exports.CIRCUIT_BREAKER_OPTIONS_KEY = 'http_circuit_breaker_options';
-exports.CACHE_OPTIONS_KEY = 'http_cache_options';
 exports.LOGGING_OPTIONS_KEY = 'http_logging_options';
 exports.TIMEOUT_OPTIONS_KEY = 'http_timeout_options';
 exports.PROXY_OPTIONS_KEY = 'http_proxy_options';
@@ -45,7 +43,29 @@ const HttpRetry = (options = {}) => {
             shouldResetTimeout: options.shouldResetTimeout !== false,
             onRetry: options.onRetry,
         };
-        (0, common_1.SetMetadata)(`${exports.RETRY_OPTIONS_KEY}_${propertyKey}`, retryOptions)(descriptor.value);
+        // Wrap the method to pass decorator context to HTTP client
+        const originalMethod = descriptor.value;
+        const wrappedMethod = function (...args) {
+            // Set decorator context (reference counting prevents overwriting)
+            call_stack_extractor_util_1.CallStackExtractor.setDecoratorContext({
+                target,
+                propertyKey,
+            });
+            try {
+                return originalMethod.apply(this, args);
+            }
+            finally {
+                call_stack_extractor_util_1.CallStackExtractor.clearDecoratorContext();
+            }
+        };
+        // Copy metadata from original to wrapped method
+        const metadataKeys = Reflect.getMetadataKeys(originalMethod);
+        for (const key of metadataKeys) {
+            Reflect.defineMetadata(key, Reflect.getMetadata(key, originalMethod), wrappedMethod);
+        }
+        // Store the retry options on the wrapped method
+        (0, common_1.SetMetadata)(`${exports.RETRY_OPTIONS_KEY}_${propertyKey}`, retryOptions)(wrappedMethod);
+        descriptor.value = wrappedMethod;
         return descriptor;
     };
 };
@@ -64,74 +84,37 @@ const HttpCircuitBreaker = (options = {}) => {
             minimumThroughputThreshold: options.minimumThroughputThreshold || 10,
             countHalfOpenCalls: true,
         };
-        (0, common_1.SetMetadata)(`${exports.CIRCUIT_BREAKER_OPTIONS_KEY}_${propertyKey}`, circuitBreakerOptions)(descriptor.value);
-        return descriptor;
-    };
-};
-exports.HttpCircuitBreaker = HttpCircuitBreaker;
-/**
- * HTTP缓存装饰器
- * 集成现有的三层缓存架构
- */
-const HttpCacheable = (options = {}) => {
-    return (target, propertyKey, descriptor) => {
-        var _a;
-        const cacheOptions = {
-            enabled: true,
-            defaultTtl: options.ttl || 300000, // 5分钟默认
-            keyGenerator: typeof options.key === 'function'
-                ? (config) => options.key(config.url, config.method, config.data, config.params)
-                : options.key
-                    ? () => options.key
-                    : undefined,
-            options: {
-                layers: (_a = options.layers) === null || _a === void 0 ? void 0 : _a.map((layer) => {
-                    switch (layer) {
-                        case 'cls':
-                            return cache_options_interface_1.CacheLayer.CLS;
-                        case 'memory':
-                            return cache_options_interface_1.CacheLayer.MEMORY;
-                        case 'redis':
-                            return cache_options_interface_1.CacheLayer.REDIS;
-                        default:
-                            return cache_options_interface_1.CacheLayer.MEMORY;
-                    }
-                }),
-                condition: options.condition,
-                prefix: options.namespace,
-            },
-            cacheableMethods: ['get'],
-            cacheableStatusCodes: [200, 201, 202, 204, 301, 302, 304],
+        // Wrap the method to pass decorator context to HTTP client
+        const originalMethod = descriptor.value;
+        const wrappedMethod = function (...args) {
+            // 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()) {
+                call_stack_extractor_util_1.CallStackExtractor.setDecoratorContext({
+                    target,
+                    propertyKey,
+                });
+            }
+            try {
+                return originalMethod.apply(this, args);
+            }
+            finally {
+                // Clean up the context after execution
+                call_stack_extractor_util_1.CallStackExtractor.clearDecoratorContext();
+            }
         };
-        // 处理unless条件
-        if (options.unless) {
-            const originalMethod = descriptor.value;
-            descriptor.value = function (...args) {
-                const result = originalMethod.apply(this, args);
-                if (typeof options.unless === 'string') {
-                    // 如果是字符串，作为表达式求值
-                    if (evalInContext(options.unless, { result, args })) {
-                        return result;
-                    }
-                }
-                else if (typeof options.unless === 'function') {
-                    // 如果是函数，直接调用
-                    if (options.unless(result, args)) {
-                        return result;
-                    }
-                }
-                // 正常缓存
-                (0, common_1.SetMetadata)(`${exports.CACHE_OPTIONS_KEY}_${propertyKey}`, cacheOptions)(originalMethod);
-                return result;
-            };
-        }
-        else {
-            (0, common_1.SetMetadata)(`${exports.CACHE_OPTIONS_KEY}_${propertyKey}`, cacheOptions)(descriptor.value);
+        // Copy metadata from original to wrapped method
+        const metadataKeys = Reflect.getMetadataKeys(originalMethod);
+        for (const key of metadataKeys) {
+            Reflect.defineMetadata(key, Reflect.getMetadata(key, originalMethod), wrappedMethod);
         }
+        // Store the circuit breaker options on the wrapped method
+        (0, common_1.SetMetadata)(`${exports.CIRCUIT_BREAKER_OPTIONS_KEY}_${propertyKey}`, circuitBreakerOptions)(wrappedMethod);
+        descriptor.value = wrappedMethod;
         return descriptor;
     };
 };
-exports.HttpCacheable = HttpCacheable;
+exports.HttpCircuitBreaker = HttpCircuitBreaker;
 /**
  * 请求日志装饰器
  * 类似Spring Boot的@LogRequest注解
@@ -161,8 +144,30 @@ const HttpLogRequest = (options = {}) => {
             methodName: options.methodName || decoratorInfo.methodName,
             operationName: options.operationName || decoratorInfo.operationName,
         };
-        (0, common_1.SetMetadata)(`${exports.LOGGING_OPTIONS_KEY}_${propertyKey}`, loggingOptions)(descriptor.value);
-        (0, common_1.SetMetadata)(`${exports.CALL_INFO_KEY}_${propertyKey}`, callInfo)(descriptor.value);
+        // Wrap the method to pass decorator context to HTTP client
+        const originalMethod = descriptor.value;
+        const wrappedMethod = function (...args) {
+            // Set decorator context (reference counting prevents overwriting)
+            call_stack_extractor_util_1.CallStackExtractor.setDecoratorContext({
+                target,
+                propertyKey,
+            });
+            try {
+                return originalMethod.apply(this, args);
+            }
+            finally {
+                call_stack_extractor_util_1.CallStackExtractor.clearDecoratorContext();
+            }
+        };
+        // Copy metadata from original to wrapped method
+        const metadataKeys = Reflect.getMetadataKeys(originalMethod);
+        for (const key of metadataKeys) {
+            Reflect.defineMetadata(key, Reflect.getMetadata(key, originalMethod), wrappedMethod);
+        }
+        // Store the logging options on the wrapped method
+        (0, common_1.SetMetadata)(`${exports.LOGGING_OPTIONS_KEY}_${propertyKey}`, loggingOptions)(wrappedMethod);
+        (0, common_1.SetMetadata)(`${exports.CALL_INFO_KEY}_${propertyKey}`, callInfo)(wrappedMethod);
+        descriptor.value = wrappedMethod;
         return descriptor;
     };
 };
@@ -173,7 +178,29 @@ exports.HttpLogRequest = HttpLogRequest;
  */
 const HttpTimeout = (timeoutMs) => {
     return (target, propertyKey, descriptor) => {
-        (0, common_1.SetMetadata)(`${exports.TIMEOUT_OPTIONS_KEY}_${propertyKey}`, timeoutMs)(descriptor.value);
+        // Wrap the method to pass decorator context to HTTP client
+        const originalMethod = descriptor.value;
+        const wrappedMethod = function (...args) {
+            // Set decorator context (reference counting prevents overwriting)
+            call_stack_extractor_util_1.CallStackExtractor.setDecoratorContext({
+                target,
+                propertyKey,
+            });
+            try {
+                return originalMethod.apply(this, args);
+            }
+            finally {
+                call_stack_extractor_util_1.CallStackExtractor.clearDecoratorContext();
+            }
+        };
+        // Copy metadata from original to wrapped method
+        const metadataKeys = Reflect.getMetadataKeys(originalMethod);
+        for (const key of metadataKeys) {
+            Reflect.defineMetadata(key, Reflect.getMetadata(key, originalMethod), wrappedMethod);
+        }
+        // Store the timeout options on the wrapped method
+        (0, common_1.SetMetadata)(`${exports.TIMEOUT_OPTIONS_KEY}_${propertyKey}`, timeoutMs)(wrappedMethod);
+        descriptor.value = wrappedMethod;
         return descriptor;
     };
 };
@@ -205,12 +232,6 @@ class HttpDecoratorUtils {
     static getCircuitBreakerOptions(target, propertyKey) {
         return Reflect.getMetadata(`${exports.CIRCUIT_BREAKER_OPTIONS_KEY}_${propertyKey}`, target[propertyKey]);
     }
-    /**
-     * 获取方法上的缓存配置
-     */
-    static getCacheOptions(target, propertyKey) {
-        return Reflect.getMetadata(`${exports.CACHE_OPTIONS_KEY}_${propertyKey}`, target[propertyKey]);
-    }
     /**
      * 获取方法上的日志配置
      */
@@ -248,7 +269,6 @@ class HttpDecoratorUtils {
         return {
             retry: this.getRetryOptions(target, propertyKey),
             circuitBreaker: this.getCircuitBreakerOptions(target, propertyKey),
-            cache: this.getCacheOptions(target, propertyKey),
             logging: this.getLoggingOptions(target, propertyKey),
             timeout: this.getTimeoutOptions(target, propertyKey),
             proxy: this.getProxyOptions(target, propertyKey),
@@ -258,16 +278,3 @@ class HttpDecoratorUtils {
     }
 }
 exports.HttpDecoratorUtils = HttpDecoratorUtils;
-/**
- * 在上下文中执行表达式
- */
-function evalInContext(expression, context) {
-    try {
-        // 创建一个安全的执行环境
-        const func = new Function(...Object.keys(context), `return ${expression}`);
-        return func(...Object.values(context));
-    }
-    catch (error) {
-        return false;
-    }
-}

package/http-client/entities/http-log.entity.d.ts

@@ -68,14 +68,6 @@ export declare class HttpLogEntity extends AbstractUuidPrimaryEntity {
      * 响应体内容
      */
     responseBody?: string;
-    /**
-     * 响应大小（字节）
-     */
-    responseSize?: number;
-    /**
-     * 请求大小（字节）
-     */
-    requestSize?: number;
     /**
      * 服务名称（用于微服务环境）
      */
@@ -104,10 +96,6 @@ export declare class HttpLogEntity extends AbstractUuidPrimaryEntity {
      * 重试记录（JSON格式）
      */
     retryRecords?: RetryRecord[];
-    /**
-     * 缓存命中状态
-     */
-    cacheHit?: boolean;
     /**
      * 熔断器状态
      */
@@ -316,12 +304,4 @@ export interface HttpLogStats {
         maxRetries: number;
         retryRate: number;
     };
-    /**
-     * 缓存统计
-     */
-    cacheStats: {
-        cacheHits: number;
-        cacheMisses: number;
-        cacheHitRate: number;
-    };
 }

package/http-client/entities/http-log.entity.js

@@ -83,14 +83,6 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'text', nullable: true }),
     __metadata("design:type", String)
 ], HttpLogEntity.prototype, "responseBody", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
-    __metadata("design:type", Number)
-], HttpLogEntity.prototype, "responseSize", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
-    __metadata("design:type", Number)
-], HttpLogEntity.prototype, "requestSize", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
@@ -120,10 +112,6 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'json', nullable: true }),
     __metadata("design:type", Array)
 ], HttpLogEntity.prototype, "retryRecords", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'boolean', nullable: true }),
-    __metadata("design:type", Boolean)
-], HttpLogEntity.prototype, "cacheHit", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 20, nullable: true }),
     __metadata("design:type", String)

package/http-client/examples/advanced-usage.example.d.ts

@@ -1,17 +1,16 @@
 import { HttpClientService } from '../services/http-client.service';
 /**
  * 高级使用示例 - GitHub API客户端
- * 集成现有的三层缓存架构
  */
 export declare class GitHubHttpService {
     private httpClient;
     constructor(httpClient: HttpClientService);
     /**
-     * 获取用户信息 - 带重试、熔断器、缓存和日志
+     * 获取用户信息 - 带重试、熔断器和日志
      */
     getUser(username: string): Promise<any>;
     /**
-     * 搜索仓库 - 带重试和缓存
+     * 搜索仓库 - 带重试
      */
     searchRepositories(query: string, sort?: string, order?: string): Promise<any>;
     /**
@@ -31,7 +30,7 @@ export declare class GitHubHttpService {
      */
     getMultipleUsers(usernames: string[]): Promise<any[]>;
     /**
-     * 条件缓存示例
+     * 获取仓库详情
      */
     getRepositoryDetails(owner: string, repo: string, options?: {
         public?: boolean;
@@ -49,7 +48,7 @@ export declare class PaymentHttpService {
      */
     createPayment(paymentData: any, apiKey: string): Promise<any>;
     /**
-     * 查询支付状态 - 可缓存
+     * 查询支付状态
      */
     getPaymentStatus(paymentId: string, apiKey: string): Promise<any>;
     /**

package/http-client/examples/advanced-usage.example.js

@@ -22,17 +22,15 @@ exports.PaymentHttpService = exports.GitHubHttpService = void 0;
 const common_1 = require("@nestjs/common");
 const decorators_1 = require("../decorators");
 const http_client_service_1 = require("../services/http-client.service");
-const cache_options_interface_1 = require("../../cache/interfaces/cache-options.interface");
 /**
  * 高级使用示例 - GitHub API客户端
- * 集成现有的三层缓存架构
  */
 let GitHubHttpService = class GitHubHttpService {
     constructor(httpClient) {
         this.httpClient = httpClient;
     }
     /**
-     * 获取用户信息 - 带重试、熔断器、缓存和日志
+     * 获取用户信息 - 带重试、熔断器和日志
      */
     getUser(username) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -40,7 +38,7 @@ let GitHubHttpService = class GitHubHttpService {
         });
     }
     /**
-     * 搜索仓库 - 带重试和缓存
+     * 搜索仓库 - 带重试
      */
     searchRepositories(query_1) {
         return __awaiter(this, arguments, void 0, function* (query, sort = 'stars', order = 'desc') {
@@ -102,7 +100,7 @@ let GitHubHttpService = class GitHubHttpService {
         });
     }
     /**
-     * 条件缓存示例
+     * 获取仓库详情
      */
     getRepositoryDetails(owner, repo, options) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -126,11 +124,6 @@ __decorate([
         failureThreshold: 3,
         recoveryTimeoutMs: 30000,
     }),
-    (0, decorators_1.HttpCacheable)({
-        ttl: 300000, // 5分钟缓存
-        layers: ['cls', 'memory', 'redis'], // 使用三层缓存
-        namespace: 'github',
-    }),
     (0, decorators_1.HttpLogRequest)({
         databaseLog: true,
         logHeaders: true,
@@ -146,12 +139,6 @@ __decorate([
 ], GitHubHttpService.prototype, "getUser", null);
 __decorate([
     (0, decorators_1.HttpRetry)({ retries: 3 }),
-    (0, decorators_1.HttpCacheable)({
-        ttl: 600000, // 10分钟缓存
-        layers: ['memory', 'redis'], // 仅使用内存和Redis缓存
-        namespace: 'github-search',
-        condition: (args) => args[0].length > 2, // 只缓存搜索词长度大于2的请求
-    }),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, String, String]),
     __metadata("design:returntype", Promise)
@@ -162,10 +149,6 @@ __decorate([
         port: 8080,
         protocol: 'http',
     }),
-    (0, decorators_1.HttpCacheable)({
-        ttl: 120000, // 2分钟缓存
-        namespace: 'github-repos',
-    }),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
@@ -186,39 +169,14 @@ __decorate([
         failureThreshold: 5,
         recoveryTimeoutMs: 60000,
     }),
-    (0, decorators_1.HttpCacheable)({
-        ttl: 900000, // 15分钟缓存
-        namespace: 'github-contributors',
-    }),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, String]),
     __metadata("design:returntype", Promise)
 ], GitHubHttpService.prototype, "getRepositoryContributors", null);
-__decorate([
-    (0, decorators_1.HttpCacheable)({
-        ttl: 120000, // 2分钟缓存
-        layers: ['memory'], // 仅内存缓存
-        namespace: 'github-repo-details',
-        condition: (args) => { var _a; return ((_a = args[2]) === null || _a === void 0 ? void 0 : _a.public) === true; }, // 只缓存公开仓库
-        unless: (result, args) => (result === null || result === void 0 ? void 0 : result.archived) === true, // 不缓存已归档的仓库
-    }),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, String, Object]),
-    __metadata("design:returntype", Promise)
-], GitHubHttpService.prototype, "getRepositoryDetails", null);
 exports.GitHubHttpService = GitHubHttpService = __decorate([
     (0, decorators_1.HttpClient)({
         baseURL: 'https://api.github.com',
         timeout: 10000,
-        cache: {
-            enabled: true,
-            defaultTtl: 300000,
-            cacheableMethods: ['GET', 'HEAD'],
-            cacheableStatusCodes: [200, 304],
-            options: {
-                layers: [cache_options_interface_1.CacheLayer.MEMORY, cache_options_interface_1.CacheLayer.REDIS], // 使用现有的三层缓存
-            },
-        },
         logging: {
             enabled: true,
             logRequests: true,
@@ -257,7 +215,7 @@ let PaymentHttpService = class PaymentHttpService {
         });
     }
     /**
-     * 查询支付状态 - 可缓存
+     * 查询支付状态
      */
     getPaymentStatus(paymentId, apiKey) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -322,16 +280,6 @@ __decorate([
     __metadata("design:paramtypes", [Object, String]),
     __metadata("design:returntype", Promise)
 ], PaymentHttpService.prototype, "createPayment", null);
-__decorate([
-    (0, decorators_1.HttpCacheable)({
-        ttl: 30000, // 30秒缓存
-        layers: ['redis'], // 仅Redis缓存，确保多实例共享
-        namespace: 'payment-status',
-    }),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, String]),
-    __metadata("design:returntype", Promise)
-], PaymentHttpService.prototype, "getPaymentStatus", null);
 __decorate([
     (0, decorators_1.HttpRetry)({
         retries: 2,

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

@@ -3,17 +3,50 @@ import { HttpClientConfig } from './interfaces/http-client-config.interface';
 /**
  * HTTP客户端模块
  * 类似Spring Boot的自动配置机制，集成现有的cache服务
+ *
+ * @example
+ * // 最简单的方式 - 使用所有默认配置
+ * HttpClientModule.forRoot()
+ *
+ * @example
+ * // 只覆盖部分配置
+ * HttpClientModule.forRoot({
+ *   baseURL: 'https://api.example.com',
+ *   timeout: 5000,
+ * })
+ *
+ * @example
+ * // 深度合并配置
+ * HttpClientModule.forRoot({
+ *   logging: {
+ *     logLevel: 'debug',
+ *     // 其他 logging 配置会使用默认值
+ *   },
+ * })
  */
 export declare class HttpClientModule {
     /**
      * 动态注册HTTP客户端模块
+     * @param config 用户配置，所有字段都是可选的
+     * @returns DynamicModule
      */
-    static forRoot(config?: HttpClientConfig): DynamicModule;
+    static forRoot(config?: Partial<HttpClientConfig>): DynamicModule;
     /**
      * 异步注册HTTP客户端模块
+     * @param config 异步配置，所有字段都是可选的
+     * @returns DynamicModule
+     *
+     * @example
+     * HttpClientModule.forRootAsync({
+     *   useFactory: (configService: ConfigService) => ({
+     *     baseURL: configService.get('API_BASE_URL'),
+     *     timeout: 5000,
+     *   }),
+     *   inject: [ConfigService],
+     * })
      */
     static forRootAsync(config: {
-        useFactory: (...args: any[]) => Promise<HttpClientConfig> | HttpClientConfig;
+        useFactory: (...args: any[]) => Promise<Partial<HttpClientConfig>> | Partial<HttpClientConfig>;
         inject?: any[];
         imports?: any[];
     }): DynamicModule;