@tramvai/module-http-client 1.41.2 → 1.46.5

package/lib/httpClient/httpClientFactory.d.ts

@@ -1,8 +1,8 @@
 import type { MakeRequest } from '@tinkoff/request-core';
 import type { APP_INFO_TOKEN } from '@tramvai/core';
-import type { API_CLIENT_PASS_HEADERS, HTTP_CLIENT_FACTORY } from '@tramvai/tokens-http-client';
+import type { API_CLIENT_PASS_HEADERS, HTTP_CLIENT_AGENT, HTTP_CLIENT_FACTORY } from '@tramvai/tokens-http-client';
 import type { LOGGER_TOKEN, CREATE_CACHE_TOKEN, ENV_MANAGER_TOKEN, REQUEST_MANAGER_TOKEN } from '@tramvai/tokens-common';
-export declare const httpClientFactory: ({ logger, envManager, appInfo, requestManager, headersList, createCache, tinkoffRequestRegistry, }: {
+export declare const httpClientFactory: ({ logger, envManager, appInfo, requestManager, headersList, createCache, tinkoffRequestRegistry, agent, }: {
     logger: typeof LOGGER_TOKEN;
     envManager: typeof ENV_MANAGER_TOKEN;
     appInfo: typeof APP_INFO_TOKEN;
@@ -10,4 +10,5 @@ export declare const httpClientFactory: ({ logger, envManager, appInfo, requestM
     headersList?: typeof API_CLIENT_PASS_HEADERS;
     createCache?: typeof CREATE_CACHE_TOKEN;
     tinkoffRequestRegistry: Map<string, MakeRequest>;
+    agent?: typeof HTTP_CLIENT_AGENT;
 }) => typeof HTTP_CLIENT_FACTORY;

package/lib/index.browser.js

@@ -1,7 +1,8 @@
 import { __decorate } from 'tslib';
 import { createToken } from '@tinkoff/dippy';
 import { Module, provide, Scope, APP_INFO_TOKEN } from '@tramvai/core';
-import { PAPI_SERVICE, HTTP_CLIENT_FACTORY, API_CLIENT_PASS_HEADERS, HTTP_CLIENT } from '@tramvai/tokens-http-client';
+import { PAPI_SERVICE, HTTP_CLIENT_FACTORY, API_CLIENT_PASS_HEADERS, HTTP_CLIENT_AGENT, HTTP_CLIENT } from '@tramvai/tokens-http-client';
+export * from '@tramvai/tokens-http-client';
 import { LOGGER_TOKEN, ENV_MANAGER_TOKEN, REQUEST_MANAGER_TOKEN, ENV_USED_TOKEN, CREATE_CACHE_TOKEN } from '@tramvai/tokens-common';
 import isNil from '@tinkoff/utils/is/nil';
 import omit from '@tinkoff/utils/object/omit';
@@ -10,6 +11,7 @@ import { mergeOptions, createTinkoffRequest, HttpClientAdapter } from '@tramvai/
 import { SERVER_MODULE_PAPI_PUBLIC_URL } from '@tramvai/tokens-server';
 import prop from '@tinkoff/utils/object/prop';
 import { ApiService } from '@tramvai/http-client';
+export * from '@tramvai/http-client';
 
 const fillHeaders = (deps) => (params) => {
     return params;
@@ -55,7 +57,7 @@ const environmentDependentOptions = typeof window === 'undefined'
     : {
         defaultTimeout: 30000,
     };
-const httpClientFactory = ({ logger, envManager, appInfo, requestManager, headersList, createCache, tinkoffRequestRegistry, }) => {
+const httpClientFactory = ({ logger, envManager, appInfo, requestManager, headersList, createCache, tinkoffRequestRegistry, agent, }) => {
     return (options) => {
         if (!options.name) {
             throw Error(`Необходимо передать уникальное поле "name" для экземпляра HTTP клиента!`);
@@ -64,6 +66,7 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
         const forceDisabledCircuitBreaker = envManager.get('HTTP_CLIENT_CIRCUIT_BREAKER_DISABLED');
         const adapterOptions = mergeOptions({
             logger,
+            agent,
             method: 'GET',
             createCache: createCache
                 ? (cacheOptions) => createCache('memory', cacheOptions)
@@ -189,6 +192,10 @@ HttpClientModule = __decorate([
                         token: API_CLIENT_PASS_HEADERS,
                         optional: true,
                     },
+                    agent: {
+                        token: HTTP_CLIENT_AGENT,
+                        optional: true,
+                    },
                 },
             }),
             provide({

package/lib/index.d.ts

@@ -3,3 +3,5 @@ export { httpClientFactory } from './httpClient/httpClientFactory';
 export { PapiService } from './papiClientModule';
 export { fillHeaderIp, fillHeaders } from './utils/fillHeaders';
 export { formatError } from './utils/errors';
+export * from '@tramvai/tokens-http-client';
+export * from '@tramvai/http-client';

package/lib/index.es.js

@@ -1,7 +1,8 @@
 import { __decorate } from 'tslib';
 import { createChildContainer, createToken } from '@tinkoff/dippy';
 import { Module, provide, Scope, DI_TOKEN, APP_INFO_TOKEN } from '@tramvai/core';
-import { PAPI_SERVICE, HTTP_CLIENT_FACTORY, API_CLIENT_PASS_HEADERS, HTTP_CLIENT } from '@tramvai/tokens-http-client';
+import { PAPI_SERVICE, HTTP_CLIENT_FACTORY, API_CLIENT_PASS_HEADERS, HTTP_CLIENT_AGENT, HTTP_CLIENT } from '@tramvai/tokens-http-client';
+export * from '@tramvai/tokens-http-client';
 import { LOGGER_TOKEN, ENV_MANAGER_TOKEN, REQUEST_MANAGER_TOKEN, ENV_USED_TOKEN, CREATE_CACHE_TOKEN } from '@tramvai/tokens-common';
 import isNil from '@tinkoff/utils/is/nil';
 import omit from '@tinkoff/utils/object/omit';
@@ -14,6 +15,7 @@ import { SERVER_MODULE_PAPI_PUBLIC_ROUTE } from '@tramvai/tokens-server';
 import find from '@tinkoff/utils/array/find';
 import { getPapiParameters } from '@tramvai/papi';
 import { REQUEST, RESPONSE } from '@tramvai/module-common';
+export * from '@tramvai/http-client';
 
 const fillHeaderIp = ({ requestManager, }) => {
     if (!requestManager) {
@@ -84,7 +86,7 @@ const environmentDependentOptions = typeof window === 'undefined'
     : {
         defaultTimeout: 30000,
     };
-const httpClientFactory = ({ logger, envManager, appInfo, requestManager, headersList, createCache, tinkoffRequestRegistry, }) => {
+const httpClientFactory = ({ logger, envManager, appInfo, requestManager, headersList, createCache, tinkoffRequestRegistry, agent, }) => {
     return (options) => {
         if (!options.name) {
             throw Error(`Необходимо передать уникальное поле "name" для экземпляра HTTP клиента!`);
@@ -93,6 +95,7 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
         const forceDisabledCircuitBreaker = envManager.get('HTTP_CLIENT_CIRCUIT_BREAKER_DISABLED');
         const adapterOptions = mergeOptions({
             logger,
+            agent,
             method: 'GET',
             createCache: createCache
                 ? (cacheOptions) => createCache('memory', cacheOptions)
@@ -268,6 +271,10 @@ HttpClientModule = __decorate([
                         token: API_CLIENT_PASS_HEADERS,
                         optional: true,
                     },
+                    agent: {
+                        token: HTTP_CLIENT_AGENT,
+                        optional: true,
+                    },
                 },
             }),
             provide({

package/lib/index.js

@@ -18,6 +18,7 @@ var tokensServer = require('@tramvai/tokens-server');
 var find = require('@tinkoff/utils/array/find');
 var papi = require('@tramvai/papi');
 var moduleCommon = require('@tramvai/module-common');
+var httpClient = require('@tramvai/http-client');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -98,7 +99,7 @@ const environmentDependentOptions = typeof window === 'undefined'
     : {
         defaultTimeout: 30000,
     };
-const httpClientFactory = ({ logger, envManager, appInfo, requestManager, headersList, createCache, tinkoffRequestRegistry, }) => {
+const httpClientFactory = ({ logger, envManager, appInfo, requestManager, headersList, createCache, tinkoffRequestRegistry, agent, }) => {
     return (options) => {
         if (!options.name) {
             throw Error(`Необходимо передать уникальное поле "name" для экземпляра HTTP клиента!`);
@@ -107,6 +108,7 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
         const forceDisabledCircuitBreaker = envManager.get('HTTP_CLIENT_CIRCUIT_BREAKER_DISABLED');
         const adapterOptions = tinkoffRequestHttpClientAdapter.mergeOptions({
             logger,
+            agent,
             method: 'GET',
             createCache: createCache
                 ? (cacheOptions) => createCache('memory', cacheOptions)
@@ -282,6 +284,10 @@ exports.HttpClientModule = tslib.__decorate([
                         token: tokensHttpClient.API_CLIENT_PASS_HEADERS,
                         optional: true,
                     },
+                    agent: {
+                        token: tokensHttpClient.HTTP_CLIENT_AGENT,
+                        optional: true,
+                    },
                 },
             }),
             core.provide({
@@ -353,3 +359,15 @@ exports.fillHeaderIp = fillHeaderIp;
 exports.fillHeaders = fillHeaders;
 exports.formatError = formatError;
 exports.httpClientFactory = httpClientFactory;
+Object.keys(tokensHttpClient).forEach(function (k) {
+    if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+        enumerable: true,
+        get: function () { return tokensHttpClient[k]; }
+    });
+});
+Object.keys(httpClient).forEach(function (k) {
+    if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+        enumerable: true,
+        get: function () { return httpClient[k]; }
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-http-client",
-  "version": "1.41.2",
+  "version": "1.46.5",
   "initialVersion": "0.58.99",
   "description": "",
   "main": "lib/index.js",
@@ -25,22 +25,22 @@
   },
   "dependencies": {
     "@tramvai/http-client": "0.1.23",
-    "@tramvai/tinkoff-request-http-client-adapter": "0.8.189",
-    "@tramvai/tokens-http-client": "1.41.2",
-    "@tramvai/tokens-common": "1.41.2",
-    "@tramvai/tokens-server": "1.41.2"
+    "@tramvai/tinkoff-request-http-client-adapter": "0.8.205",
+    "@tramvai/tokens-http-client": "1.46.5",
+    "@tramvai/tokens-common": "1.46.5",
+    "@tramvai/tokens-server": "1.46.5"
   },
   "devDependencies": {
     "@tinkoff/request-core": "^0.8.9"
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "1.41.2",
-    "@tramvai/module-common": "1.41.2",
-    "@tramvai/papi": "1.41.2",
-    "@tramvai/test-helpers": "1.41.2",
-    "@tramvai/test-mocks": "1.41.2",
-    "@tinkoff/dippy": "0.7.35",
+    "@tramvai/core": "1.46.5",
+    "@tramvai/module-common": "1.46.5",
+    "@tramvai/papi": "1.46.5",
+    "@tramvai/test-helpers": "1.46.5",
+    "@tramvai/test-mocks": "1.46.5",
+    "@tinkoff/dippy": "0.7.36",
     "node-fetch": "^2.6.1",
     "tslib": "^2.0.3"
   },