@nest-omni/core 4.1.3-11 → 4.1.3-13

package/dist/http-client/examples/proxy-from-environment.example.js

@@ -0,0 +1,410 @@
+"use strict";
+/**
+ * ProxyFromEnvironment 使用示例
+ *
+ * 本文件演示如何在 HTTP Client 中使用代理环境变量支持
+ */
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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 __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());
+    });
+};
+var _a, _b, _c, _d, _e, _f;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.environmentVariablesExamples = exports.httpClientModuleConfig = exports.ProxyUtilityExample = exports.DevelopmentProxyExample = exports.EnterpriseProxyExample = exports.MixedProxyExample = exports.NoProxyExample = exports.ProxyWithAuthExample = exports.ProxyFromEnvironmentExample = void 0;
+const common_1 = require("@nestjs/common");
+const core_1 = require("@nest-omni/core");
+/**
+ * 示例 1: 使用环境变量配置代理 (推荐方式)
+ *
+ * 设置环境变量:
+ * export HTTP_PROXY=http://proxy.example.com:8080
+ * export HTTPS_PROXY=https://secure-proxy.example.com:8443
+ * export NO_PROXY=localhost,127.0.0.1,.internal.com
+ */
+let ProxyFromEnvironmentExample = class ProxyFromEnvironmentExample {
+    constructor(httpClient) {
+        this.httpClient = httpClient;
+    }
+    /**
+     * 使用装饰器从环境变量读取代理配置
+     */
+    fetchWithProxyFromEnv() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // 此请求将根据环境变量使用代理
+            // - HTTP 请求使用 HTTP_PROXY
+            // - HTTPS 请求使用 HTTPS_PROXY（如果未设置则使用 HTTP_PROXY）
+            // - 匹配 NO_PROXY 的域名不使用代理
+            return this.httpClient.get('https://api.example.com/data');
+        });
+    }
+    /**
+     * 直接配置请求时指定从环境变量读取代理
+     */
+    fetchWithConfiguredProxy() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.httpClient.request({
+                url: 'https://api.example.com/data',
+                method: 'GET',
+                // 代理配置会在模块级别或请求级别应用
+            });
+        });
+    }
+};
+exports.ProxyFromEnvironmentExample = ProxyFromEnvironmentExample;
+__decorate([
+    (0, core_1.HttpUseProxy)({
+        enabled: true,
+        fromEnvironment: true,
+    }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], ProxyFromEnvironmentExample.prototype, "fetchWithProxyFromEnv", null);
+exports.ProxyFromEnvironmentExample = ProxyFromEnvironmentExample = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [typeof (_a = typeof core_1.HttpClientService !== "undefined" && core_1.HttpClientService) === "function" ? _a : Object])
+], ProxyFromEnvironmentExample);
+/**
+ * 示例 2: 带认证的代理环境变量
+ *
+ * 设置环境变量:
+ * export HTTP_PROXY=http://username:password@proxy.example.com:8080
+ */
+let ProxyWithAuthExample = class ProxyWithAuthExample {
+    constructor(httpClient) {
+        this.httpClient = httpClient;
+    }
+    fetchWithAuthenticatedProxy() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // 自动从环境变量解析认证信息
+            return this.httpClient.get('https://api.example.com/data');
+        });
+    }
+};
+exports.ProxyWithAuthExample = ProxyWithAuthExample;
+__decorate([
+    (0, core_1.HttpUseProxy)({
+        enabled: true,
+        fromEnvironment: true,
+    }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], ProxyWithAuthExample.prototype, "fetchWithAuthenticatedProxy", null);
+exports.ProxyWithAuthExample = ProxyWithAuthExample = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [typeof (_b = typeof core_1.HttpClientService !== "undefined" && core_1.HttpClientService) === "function" ? _b : Object])
+], ProxyWithAuthExample);
+/**
+ * 示例 3: NO_PROXY 使用示例
+ *
+ * 设置环境变量:
+ * export HTTP_PROXY=http://proxy.example.com:8080
+ * export NO_PROXY=localhost,127.0.0.1,.internal.com,.local
+ */
+let NoProxyExample = class NoProxyExample {
+    constructor(httpClient) {
+        this.httpClient = httpClient;
+    }
+    fetchExternalApi() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // 此请求会使用代理
+            return this.httpClient.get('https://api.external.com/data');
+        });
+    }
+    fetchInternalApi() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // 此请求不会使用代理（匹配 NO_PROXY 中的 .internal.com）
+            return this.httpClient.get('https://api.internal.com/data');
+        });
+    }
+    fetchLocalhost() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // 此请求不会使用代理（匹配 NO_PROXY 中的 localhost）
+            return this.httpClient.get('http://localhost:3000/api');
+        });
+    }
+};
+exports.NoProxyExample = NoProxyExample;
+__decorate([
+    (0, core_1.HttpUseProxy)({
+        enabled: true,
+        fromEnvironment: true,
+    }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], NoProxyExample.prototype, "fetchExternalApi", null);
+__decorate([
+    (0, core_1.HttpUseProxy)({
+        enabled: true,
+        fromEnvironment: true,
+    }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], NoProxyExample.prototype, "fetchInternalApi", null);
+__decorate([
+    (0, core_1.HttpUseProxy)({
+        enabled: true,
+        fromEnvironment: true,
+    }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], NoProxyExample.prototype, "fetchLocalhost", null);
+exports.NoProxyExample = NoProxyExample = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [typeof (_c = typeof core_1.HttpClientService !== "undefined" && core_1.HttpClientService) === "function" ? _c : Object])
+], NoProxyExample);
+/**
+ * 示例 4: 混合使用 - 部分请求使用代理，部分不使用
+ */
+let MixedProxyExample = class MixedProxyExample {
+    constructor(httpClient) {
+        this.httpClient = httpClient;
+    }
+    // 使用代理
+    fetchWithProxy() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.httpClient.get('https://api.external.com/data');
+        });
+    }
+    // 不使用代理
+    fetchWithoutProxy() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.httpClient.get('https://api.direct.com/data');
+        });
+    }
+};
+exports.MixedProxyExample = MixedProxyExample;
+__decorate([
+    (0, core_1.HttpUseProxy)({
+        enabled: true,
+        fromEnvironment: true,
+    }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], MixedProxyExample.prototype, "fetchWithProxy", null);
+exports.MixedProxyExample = MixedProxyExample = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [typeof (_d = typeof core_1.HttpClientService !== "undefined" && core_1.HttpClientService) === "function" ? _d : Object])
+], MixedProxyExample);
+/**
+ * 示例 5: 企业环境中的实际使用场景
+ *
+ * 在 docker-compose.yml 或 Kubernetes 配置中设置:
+ * environment:
+ *   - HTTP_PROXY=http://proxy-user:proxy-pass@corporate-proxy.company.com:8080
+ *   - HTTPS_PROXY=http://proxy-user:proxy-pass@corporate-proxy.company.com:8080
+ *   - NO_PROXY=localhost,127.0.0.1,.company.com,.svc.cluster.local
+ */
+let EnterpriseProxyExample = class EnterpriseProxyExample {
+    constructor(httpClient) {
+        this.httpClient = httpClient;
+    }
+    /**
+     * 访问外部 API（使用企业代理）
+     */
+    fetchFromExternalApi() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // 通过企业代理访问外部 API
+            return this.httpClient.get('https://api.github.com/repos/microsoft/TypeScript');
+        });
+    }
+    /**
+     * 访问内部服务（不使用代理）
+     */
+    fetchFromInternalService() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // 直接访问内部服务（匹配 NO_PROXY: .company.com）
+            return this.httpClient.get('https://api.company.com/internal/users');
+        });
+    }
+    /**
+     * 访问 Kubernetes 集群内服务（不使用代理）
+     */
+    fetchFromK8sService() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // 直接访问 K8s 服务（匹配 NO_PROXY: .svc.cluster.local）
+            return this.httpClient.get('http://user-service.default.svc.cluster.local/api/users');
+        });
+    }
+};
+exports.EnterpriseProxyExample = EnterpriseProxyExample;
+__decorate([
+    (0, core_1.HttpUseProxy)({
+        enabled: true,
+        fromEnvironment: true,
+    }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], EnterpriseProxyExample.prototype, "fetchFromExternalApi", null);
+__decorate([
+    (0, core_1.HttpUseProxy)({
+        enabled: true,
+        fromEnvironment: true,
+    }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], EnterpriseProxyExample.prototype, "fetchFromInternalService", null);
+__decorate([
+    (0, core_1.HttpUseProxy)({
+        enabled: true,
+        fromEnvironment: true,
+    }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], EnterpriseProxyExample.prototype, "fetchFromK8sService", null);
+exports.EnterpriseProxyExample = EnterpriseProxyExample = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [typeof (_e = typeof core_1.HttpClientService !== "undefined" && core_1.HttpClientService) === "function" ? _e : Object])
+], EnterpriseProxyExample);
+/**
+ * 示例 6: 开发环境调试代理
+ *
+ * 本地开发时使用 Charles、Fiddler 等代理工具调试:
+ * export HTTP_PROXY=http://localhost:8888
+ * export HTTPS_PROXY=http://localhost:8888
+ */
+let DevelopmentProxyExample = class DevelopmentProxyExample {
+    constructor(httpClient) {
+        this.httpClient = httpClient;
+    }
+    debugRequest() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // 开发环境下会通过本地代理工具
+            // 可以查看详细的请求和响应内容
+            return this.httpClient.post('https://api.example.com/debug', {
+                test: 'data',
+            });
+        });
+    }
+};
+exports.DevelopmentProxyExample = DevelopmentProxyExample;
+__decorate([
+    (0, core_1.HttpUseProxy)({
+        enabled: process.env.NODE_ENV === 'development',
+        fromEnvironment: true,
+    }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], DevelopmentProxyExample.prototype, "debugRequest", null);
+exports.DevelopmentProxyExample = DevelopmentProxyExample = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [typeof (_f = typeof core_1.HttpClientService !== "undefined" && core_1.HttpClientService) === "function" ? _f : Object])
+], DevelopmentProxyExample);
+/**
+ * 示例 7: 程序化检查代理配置
+ */
+let ProxyUtilityExample = class ProxyUtilityExample {
+    checkProxyConfiguration() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { ProxyEnvironmentParser } = yield Promise.resolve().then(() => require('@nest-omni/core'));
+            // 检查是否设置了代理环境变量
+            const hasProxy = ProxyEnvironmentParser.hasProxyEnvironment();
+            console.log('Has proxy environment:', hasProxy);
+            // 获取所有代理环境变量
+            const vars = ProxyEnvironmentParser.getProxyEnvironmentVariables();
+            console.log('Proxy environment variables:', vars);
+            // 解析特定 URL 的代理配置
+            const proxyConfig = ProxyEnvironmentParser.parseFromEnvironment('https', 'https://api.example.com/data');
+            console.log('Parsed proxy config:', proxyConfig);
+        });
+    }
+};
+exports.ProxyUtilityExample = ProxyUtilityExample;
+exports.ProxyUtilityExample = ProxyUtilityExample = __decorate([
+    (0, common_1.Injectable)()
+], ProxyUtilityExample);
+/**
+ * 模块配置示例
+ */
+exports.httpClientModuleConfig = {
+    // 方式 1: 全局启用环境变量代理
+    globalProxyFromEnv: {
+        imports: [
+            {
+                // HttpClientModule.forRoot({
+                proxy: {
+                    enabled: true,
+                    fromEnvironment: true, // 所有请求默认使用环境变量代理
+                },
+                // })
+            },
+        ],
+    },
+    // 方式 2: 全局禁用，按需启用
+    selectiveProxy: {
+        imports: [
+            {
+                // HttpClientModule.forRoot({
+                proxy: {
+                    enabled: false, // 全局禁用，使用装饰器按需启用
+                },
+                // })
+            },
+        ],
+    },
+};
+/**
+ * 环境变量配置示例
+ */
+exports.environmentVariablesExamples = {
+    // 基本配置
+    basic: `
+# 基本 HTTP 代理
+HTTP_PROXY=http://proxy.example.com:8080
+
+# HTTPS 代理
+HTTPS_PROXY=https://proxy.example.com:8443
+
+# 不使用代理的域名
+NO_PROXY=localhost,127.0.0.1
+`,
+    // 带认证
+    withAuth: `
+# 带认证的代理
+HTTP_PROXY=http://username:password@proxy.example.com:8080
+HTTPS_PROXY=http://username:password@proxy.example.com:8080
+`,
+    // 特殊字符认证（URL 编码）
+    specialChars: `
+# 用户名: user@domain.com
+# 密码: p@ssw0rd
+HTTP_PROXY=http://user%40domain.com:p%40ssw0rd@proxy.example.com:8080
+`,
+    // 企业环境
+    enterprise: `
+# 企业代理配置
+HTTP_PROXY=http://proxy-user:proxy-pass@corporate-proxy.company.com:8080
+HTTPS_PROXY=http://proxy-user:proxy-pass@corporate-proxy.company.com:8080
+NO_PROXY=localhost,127.0.0.1,.company.com,.internal.com,.svc.cluster.local,10.0.0.0/8
+`,
+    // 开发环境
+    development: `
+# 本地代理工具（Charles, Fiddler 等）
+HTTP_PROXY=http://localhost:8888
+HTTPS_PROXY=http://localhost:8888
+NO_PROXY=localhost,127.0.0.1
+`,
+};

package/{http-client → dist/http-client}/http-client.module.js

@@ -20,6 +20,7 @@ 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 cache_service_1 = require("../cache/cache.service");
 const http_client_service_1 = require("./services/http-client.service");
 const circuit_breaker_service_1 = require("./services/circuit-breaker.service");
@@ -52,11 +53,38 @@ let HttpClientModule = HttpClientModule_1 = class HttpClientModule {
                 inject: [config_1.ConfigService, cache_service_1.CacheService],
             },
             circuit_breaker_service_1.HttpCircuitBreakerService,
-            logging_service_1.HttpLoggingService,
+            {
+                provide: logging_service_1.HttpLoggingService,
+                useFactory: (httpConfig, dataSource) => {
+                    var _a, _b;
+                    // Check if database logging is enabled in the config
+                    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(databaseLoggingEnabled ? dataSource : undefined);
+                },
+                inject: ['HTTP_CLIENT_CONFIG', typeorm_2.DataSource],
+            },
             cache_service_2.HttpCacheService,
             http_log_query_service_1.HttpLogQueryService,
-            log_cleanup_service_1.HttpLogCleanupService,
-            api_client_registry_service_1.ApiClientRegistryService,
+            {
+                provide: log_cleanup_service_1.HttpLogCleanupService,
+                useFactory: (logQueryService, httpConfig) => {
+                    return new log_cleanup_service_1.HttpLogCleanupService(logQueryService, httpConfig.logCleanup || {});
+                },
+                inject: [http_log_query_service_1.HttpLogQueryService, 'HTTP_CLIENT_CONFIG'],
+            },
+            {
+                provide: api_client_registry_service_1.ApiClientRegistryService,
+                useFactory: (httpClientService, circuitBreakerService, loggingService, cacheService, httpConfig) => {
+                    return new api_client_registry_service_1.ApiClientRegistryService(httpClientService, circuitBreakerService, loggingService, cacheService, {});
+                },
+                inject: [
+                    http_client_service_1.HttpClientService,
+                    circuit_breaker_service_1.HttpCircuitBreakerService,
+                    logging_service_1.HttpLoggingService,
+                    cache_service_2.HttpCacheService,
+                    'HTTP_CLIENT_CONFIG',
+                ],
+            },
             {
                 provide: http_client_service_1.HttpClientService,
                 useFactory: (circuitBreakerService, loggingService, cacheService, redisLockService, httpConfig) => {
@@ -97,6 +125,10 @@ let HttpClientModule = HttpClientModule_1 = class HttpClientModule {
      * 异步注册HTTP客户端模块
      */
     static forRootAsync(config) {
+        // Determine if database logging will be enabled
+        // We need to check if the config will enable database logging
+        // This is a bit tricky since the config is async, so we'll inject DataSource conditionally later
+        const httpConfig = config.useFactory ? {} : {};
         // 基础服务提供者
         const baseProviders = [
             {
@@ -109,11 +141,38 @@ let HttpClientModule = HttpClientModule_1 = class HttpClientModule {
                 inject: config.inject || [config_1.ConfigService],
             },
             circuit_breaker_service_1.HttpCircuitBreakerService,
-            logging_service_1.HttpLoggingService,
+            {
+                provide: logging_service_1.HttpLoggingService,
+                useFactory: (httpConfig, dataSource) => {
+                    var _a, _b;
+                    // Check if database logging is enabled in the config
+                    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(databaseLoggingEnabled ? dataSource : undefined);
+                },
+                inject: ['HTTP_CLIENT_CONFIG', typeorm_2.DataSource],
+            },
             cache_service_2.HttpCacheService,
             http_log_query_service_1.HttpLogQueryService,
-            log_cleanup_service_1.HttpLogCleanupService,
-            api_client_registry_service_1.ApiClientRegistryService,
+            {
+                provide: log_cleanup_service_1.HttpLogCleanupService,
+                useFactory: (logQueryService, httpConfig) => {
+                    return new log_cleanup_service_1.HttpLogCleanupService(logQueryService, httpConfig.logCleanup || {});
+                },
+                inject: [http_log_query_service_1.HttpLogQueryService, 'HTTP_CLIENT_CONFIG'],
+            },
+            {
+                provide: api_client_registry_service_1.ApiClientRegistryService,
+                useFactory: (httpClientService, circuitBreakerService, loggingService, cacheService, httpConfig) => {
+                    return new api_client_registry_service_1.ApiClientRegistryService(httpClientService, circuitBreakerService, loggingService, cacheService, {});
+                },
+                inject: [
+                    http_client_service_1.HttpClientService,
+                    circuit_breaker_service_1.HttpCircuitBreakerService,
+                    logging_service_1.HttpLoggingService,
+                    cache_service_2.HttpCacheService,
+                    'HTTP_CLIENT_CONFIG',
+                ],
+            },
             {
                 provide: http_client_service_1.HttpClientService,
                 useFactory: (circuitBreakerService, loggingService, cacheService, redisLockService, httpConfig) => {

package/{http-client → dist/http-client}/interfaces/http-client-config.interface.d.ts

@@ -72,9 +72,15 @@ export interface HttpCacheConfig {
  */
 export interface ProxyConfig {
     enabled: boolean;
+    /** 是否从环境变量读取代理配置 (HTTP_PROXY, HTTPS_PROXY, NO_PROXY) */
+    fromEnvironment?: boolean;
+    /** 手动指定的代理主机 (当 fromEnvironment 为 false 时使用) */
     host?: string;
+    /** 手动指定的代理端口 (当 fromEnvironment 为 false 时使用) */
     port?: number;
+    /** 代理协议 */
     protocol?: 'http' | 'https';
+    /** 代理认证信息 */
     auth?: {
         username: string;
         password: string;

package/dist/http-client/interfaces/http-client-config.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/{http-client → dist/http-client}/services/http-client.service.d.ts

@@ -123,5 +123,13 @@ export declare class HttpClientService {
      * 深度合并对象
      */
     private deepMerge;
+    /**
+     * 解析代理配置
+     * 支持从环境变量或手动配置中读取
+     * @param proxyConfig 代理配置
+     * @param targetUrl 目标 URL（用于 NO_PROXY 检查）
+     * @returns 解析后的代理配置，如果不应使用代理则返回 false 或 undefined
+     */
+    private resolveProxyConfig;
 }
 export {};

package/{http-client → dist/http-client}/services/http-client.service.js

@@ -31,6 +31,7 @@ const context_extractor_util_1 = require("../utils/context-extractor.util");
 const curl_generator_util_1 = require("../utils/curl-generator.util");
 const retry_recorder_util_1 = require("../utils/retry-recorder.util");
 const request_id_util_1 = require("../utils/request-id.util");
+const proxy_environment_util_1 = require("../utils/proxy-environment.util");
 const redis_lock_service_1 = require("../../redis-lock/redis-lock.service");
 /**
  * HTTP客户端服务
@@ -105,12 +106,10 @@ let HttpClientService = HttpClientService_1 = class HttpClientService {
                 // 应用代理配置
                 const proxyConfig = decoratorConfigs.proxy || this.defaultConfig.proxy;
                 if (proxyConfig === null || proxyConfig === void 0 ? void 0 : proxyConfig.enabled) {
-                    enhancedConfig.proxy = {
-                        host: proxyConfig.host,
-                        port: proxyConfig.port,
-                        protocol: proxyConfig.protocol,
-                        auth: proxyConfig.auth,
-                    };
+                    const resolvedProxy = this.resolveProxyConfig(proxyConfig, enhancedConfig.url);
+                    if (resolvedProxy !== false) {
+                        enhancedConfig.proxy = resolvedProxy;
+                    }
                 }
                 // 配置axios-retry的onRetry回调以记录重试
                 if ((_c = this.defaultConfig.retry) === null || _c === void 0 ? void 0 : _c.enabled) {
@@ -136,7 +135,7 @@ 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.databaseLog) ||
+                    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);
                     this.loggingService.logRequestSuccess(response, startTime, requestId, loggingOptions, databaseLogging, retryRecorder.getRecords(), cacheHit, circuitBreakerState, decoratorContext);
                 }
@@ -369,21 +368,14 @@ let HttpClientService = HttpClientService_1 = class HttpClientService {
      * 创建Axios实例并配置axios-retry
      */
     createAxiosInstance() {
-        var _a, _b;
+        var _a;
         const instance = require('axios').create({
             baseURL: this.defaultConfig.baseURL,
             timeout: this.defaultConfig.timeout,
-            proxy: ((_a = this.defaultConfig.proxy) === null || _a === void 0 ? void 0 : _a.enabled)
-                ? {
-                    host: this.defaultConfig.proxy.host,
-                    port: this.defaultConfig.proxy.port,
-                    protocol: this.defaultConfig.proxy.protocol,
-                    auth: this.defaultConfig.proxy.auth,
-                }
-                : undefined,
+            proxy: this.resolveProxyConfig(this.defaultConfig.proxy),
         });
         // 配置axios-retry
-        if ((_b = this.defaultConfig.retry) === null || _b === void 0 ? void 0 : _b.enabled) {
+        if ((_a = this.defaultConfig.retry) === null || _a === void 0 ? void 0 : _a.enabled) {
             (0, axios_retry_1.default)(instance, {
                 retries: this.defaultConfig.retry.retries || 3,
                 retryDelay: this.defaultConfig.retry.retryDelay ||
@@ -594,6 +586,58 @@ let HttpClientService = HttpClientService_1 = class HttpClientService {
         }
         return result;
     }
+    /**
+     * 解析代理配置
+     * 支持从环境变量或手动配置中读取
+     * @param proxyConfig 代理配置
+     * @param targetUrl 目标 URL（用于 NO_PROXY 检查）
+     * @returns 解析后的代理配置，如果不应使用代理则返回 false 或 undefined
+     */
+    resolveProxyConfig(proxyConfig, targetUrl) {
+        if (!(proxyConfig === null || proxyConfig === void 0 ? void 0 : proxyConfig.enabled)) {
+            return undefined;
+        }
+        // 如果启用从环境变量读取
+        if (proxyConfig.fromEnvironment) {
+            // 确定目标协议
+            let protocol = 'http';
+            if (targetUrl) {
+                try {
+                    const url = new URL(targetUrl, this.defaultConfig.baseURL);
+                    protocol = url.protocol === 'https:' ? 'https' : 'http';
+                }
+                catch (error) {
+                    this.logger.warn(`Failed to parse target URL: ${error.message}`);
+                }
+            }
+            // 从环境变量解析
+            const fullUrl = targetUrl
+                ? new URL(targetUrl, this.defaultConfig.baseURL).href
+                : undefined;
+            const envProxy = proxy_environment_util_1.ProxyEnvironmentParser.parseFromEnvironment(protocol, fullUrl);
+            if (envProxy === false) {
+                this.logger.debug('Proxy bypassed based on environment configuration');
+                return false;
+            }
+            return {
+                host: envProxy.host,
+                port: envProxy.port,
+                protocol: envProxy.protocol,
+                auth: envProxy.auth,
+            };
+        }
+        // 使用手动配置
+        if (proxyConfig.host && proxyConfig.port) {
+            return {
+                host: proxyConfig.host,
+                port: proxyConfig.port,
+                protocol: proxyConfig.protocol,
+                auth: proxyConfig.auth,
+            };
+        }
+        this.logger.warn('Proxy is enabled but neither fromEnvironment nor manual configuration is provided');
+        return undefined;
+    }
 };
 exports.HttpClientService = HttpClientService;
 exports.HttpClientService = HttpClientService = HttpClientService_1 = __decorate([

package/{http-client → dist/http-client}/services/logging.service.d.ts

@@ -17,7 +17,7 @@ export declare class HttpLoggingService {
     /**
      * 记录请求成功响应
      */
-    logRequestSuccess(response: AxiosResponse, startTime: number, requestId: string, loggingOptions: any, databaseLogging?: boolean, retryRecords?: any[], cacheHit?: boolean, circuitBreakerState?: string, decoratorContext?: any): void;
+    logRequestSuccess(response: AxiosResponse, startTime: number, requestId: string, loggingOptions: any, databaseLogging?: boolean, retryRecords?: any[], cacheHit?: boolean, circuitBreakerState?: string, decoratorContext?: any): Promise<void>;
     /**
      * 记录请求错误
      */