@tramvai/module-http-client 1.39.0 → 1.44.4

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,7 @@
 import { __decorate } from 'tslib';
-import { createToken, createChildContainer } from '@tinkoff/dippy';
+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';
 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,10 +10,6 @@ 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';
-import find from '@tinkoff/utils/array/find';
-import flatten from '@tinkoff/utils/array/flatten';
-import { getPapiParameters } from '@tramvai/papi';
-import { REQUEST, RESPONSE } from '@tramvai/module-common';
 
 const fillHeaders = (deps) => (params) => {
     return params;
@@ -59,7 +55,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 клиента!`);
@@ -68,6 +64,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)
@@ -129,7 +126,7 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
     };
 };
 
-class PapiService$1 extends ApiService {
+class PapiService extends ApiService {
     constructor({ httpClientFactory, baseUrl }) {
         const httpClient = httpClientFactory({
             name: 'papi',
@@ -159,7 +156,7 @@ PapiClientModule = __decorate([
             provide({
                 provide: PAPI_SERVICE,
                 scope: Scope.SINGLETON,
-                useClass: PapiService$1,
+                useClass: PapiService,
                 deps: {
                     httpClientFactory: HTTP_CLIENT_FACTORY,
                     baseUrl: SERVER_MODULE_PAPI_PUBLIC_URL,
@@ -193,6 +190,10 @@ HttpClientModule = __decorate([
                         token: API_CLIENT_PASS_HEADERS,
                         optional: true,
                     },
+                    agent: {
+                        token: HTTP_CLIENT_AGENT,
+                        optional: true,
+                    },
                 },
             }),
             provide({
@@ -259,76 +260,4 @@ HttpClientModule = __decorate([
     })
 ], HttpClientModule);
 
-class PapiService {
-    constructor({ papi, di }) {
-        this.papi = flatten(papi || []);
-        this.di = di;
-    }
-    async request({ path, query, body }) {
-        var _a;
-        const papiRoute = find((papi) => getPapiParameters(papi).path === `/${path}`, this.papi);
-        if (!papiRoute) {
-            throw new Error(`papi handler '${path}' not found`);
-        }
-        const papi = getPapiParameters(papiRoute);
-        let rootDeps = {};
-        if (papi.rootDeps) {
-            rootDeps = this.di.getOfDeps(papi.rootDeps);
-            rootDeps = papi.mapRootDeps ? papi.mapRootDeps(rootDeps) : rootDeps;
-        }
-        const childDI = createChildContainer(this.di);
-        const req = { headers: { host: 'localhost' }, cookies: {}, query, body };
-        const res = {};
-        childDI.register({
-            provide: REQUEST,
-            useValue: req,
-        });
-        childDI.register({
-            provide: RESPONSE,
-            useValue: res,
-        });
-        const payload = await getPapiParameters(papiRoute).handler({
-            ...rootDeps,
-            ...childDI.getOfDeps((_a = papi.deps) !== null && _a !== void 0 ? _a : {}),
-            req,
-            res,
-        });
-        return { payload, status: 200, headers: {} };
-    }
-    get(path, payload, config) {
-        return this.request({
-            path,
-            ...payload,
-            ...config,
-            method: 'GET',
-        });
-    }
-    post(path, payload, config) {
-        return this.request({
-            path,
-            requestType: 'json',
-            ...payload,
-            ...config,
-            method: 'POST',
-        });
-    }
-    put(path, payload, config) {
-        return this.request({
-            path,
-            requestType: 'json',
-            ...payload,
-            ...config,
-            method: 'PUT',
-        });
-    }
-    delete(path, payload, config) {
-        return this.request({
-            path,
-            ...payload,
-            ...config,
-            method: 'DELETE',
-        });
-    }
-}
-
 export { HttpClientModule, PapiService, fillHeaderIp, fillHeaders, formatError, httpClientFactory };

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 export { HttpClientModule } from './httpClientModule';
 export { httpClientFactory } from './httpClient/httpClientFactory';
-export { PapiService } from './papi/papiService';
+export { PapiService } from './papiClientModule';
 export { fillHeaderIp, fillHeaders } from './utils/fillHeaders';
 export { formatError } from './utils/errors';

package/lib/index.es.js

@@ -1,7 +1,7 @@
 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';
 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';
@@ -84,7 +84,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 +93,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 +269,10 @@ HttpClientModule = __decorate([
                         token: API_CLIENT_PASS_HEADERS,
                         optional: true,
                     },
+                    agent: {
+                        token: HTTP_CLIENT_AGENT,
+                        optional: true,
+                    },
                 },
             }),
             provide({

package/lib/index.js

@@ -98,7 +98,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 +107,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 +283,10 @@ exports.HttpClientModule = tslib.__decorate([
                         token: tokensHttpClient.API_CLIENT_PASS_HEADERS,
                         optional: true,
                     },
+                    agent: {
+                        token: tokensHttpClient.HTTP_CLIENT_AGENT,
+                        optional: true,
+                    },
                 },
             }),
             core.provide({

package/lib/papiClientModule.browser.d.ts

@@ -1,2 +1,4 @@
+import { PapiService } from './papi/papiService.browser';
+export { PapiService };
 export declare class PapiClientModule {
 }

package/lib/papiClientModule.d.ts

@@ -1,2 +1,4 @@
+import { PapiService } from './papi/papiService';
+export { PapiService };
 export declare class PapiClientModule {
 }

package/package.json

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