@tramvai/module-http-client 1.97.0 → 1.101.2

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_AGENT, HTTP_CLIENT_FACTORY, DISABLE_CIRCUIT_BREAKER } from '@tramvai/tokens-http-client';
+import type { API_CLIENT_PASS_HEADERS, HttpClientFactoryOptions, HTTP_CLIENT_AGENT, HTTP_CLIENT_FACTORY, DISABLE_CIRCUIT_BREAKER } 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, makeRequestRegistry, agent, disableCircuitBreaker, }: {
+export declare const httpClientFactory: ({ logger, envManager, appInfo, requestManager, headersList, createCache, makeRequestRegistry, agent, disableCircuitBreaker, defaultOptions, }: {
     logger: typeof LOGGER_TOKEN;
     envManager: typeof ENV_MANAGER_TOKEN;
     appInfo: typeof APP_INFO_TOKEN;
@@ -12,4 +12,5 @@ export declare const httpClientFactory: ({ logger, envManager, appInfo, requestM
     makeRequestRegistry: Map<string, MakeRequest>;
     agent?: typeof HTTP_CLIENT_AGENT;
     disableCircuitBreaker: typeof DISABLE_CIRCUIT_BREAKER;
+    defaultOptions?: Partial<HttpClientFactoryOptions>;
 }) => typeof HTTP_CLIENT_FACTORY;

package/lib/index.browser.js

@@ -1,6 +1,6 @@
 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_AGENT, DISABLE_CIRCUIT_BREAKER, HTTP_CLIENT } from '@tramvai/tokens-http-client';
+import { PAPI_SERVICE, HTTP_CLIENT_FACTORY, API_CLIENT_PASS_HEADERS, HTTP_CLIENT_AGENT, DISABLE_CIRCUIT_BREAKER, DEFAULT_HTTP_CLIENT_FACTORY_OPTIONS, 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';
@@ -16,23 +16,6 @@ const fillHeaders = (deps) => (params) => {
 };
 const fillHeaderIp = fillHeaders;
 
-const getErrorMessage = (message) => {
-    switch (true) {
-        case /network timeout at/i.test(message) || /request timed out/i.test(message):
-            return 'Время истекло. Обновите страницу и повторите попытку.';
-        default:
-            return 'Что-то пошло не так. Мы уже решаем проблему. Попробуйте снова через несколько минут.';
-    }
-};
-const formatError = (error) => {
-    if (error.originalMessage) {
-        return error;
-    }
-    const originalMessage = error.message;
-    const message = getErrorMessage(originalMessage);
-    return Object.assign(error, { message, originalMessage });
-};
-
 const createUserAgent = ({ appInfo, envManager, }) => {
     const { appName } = appInfo;
     const appVersion = envManager.get('APP_VERSION');
@@ -55,28 +38,27 @@ const environmentDependentOptions = typeof window === 'undefined'
     : {
         defaultTimeout: 30000,
     };
-const httpClientFactory = ({ logger, envManager, appInfo, requestManager, headersList, createCache, makeRequestRegistry, agent, disableCircuitBreaker = false, }) => {
+const httpClientFactory = ({ logger, envManager, appInfo, requestManager, headersList, createCache, makeRequestRegistry, agent, disableCircuitBreaker = false, defaultOptions, }) => {
     return (options) => {
         if (!options.name) {
             throw Error(`You need to pass a unique field "name" for the HTTP client instance`);
         }
         const forceDisableCache = envManager.get('HTTP_CLIENT_CACHE_DISABLED');
         const forceDisabledCircuitBreaker = envManager.get('HTTP_CLIENT_CIRCUIT_BREAKER_DISABLED');
-        const adapterOptions = mergeOptions({
+        const adapterOptions = mergeOptions(mergeOptions({
             logger,
             agent,
             method: 'GET',
             createCache: createCache
                 ? (cacheOptions) => createCache('memory', cacheOptions)
                 : undefined,
-            modifyRequest: compose(fillHeaderIp(), fillHeaders()),
-            modifyError: formatError,
+            modifyRequest: compose(fillHeaderIp({ requestManager }), fillHeaders({ requestManager, headersList })),
             circuitBreakerOptions: {
                 failureThreshold: 75,
                 minimumFailureCount: 10,
             },
             ...environmentDependentOptions,
-        }, options);
+        }, defaultOptions !== null && defaultOptions !== void 0 ? defaultOptions : {}), options);
         // по умолчанию, на сервере, библиотека https://github.com/node-fetch/node-fetch
         // отправляет заголовок "User-Agent" вида "node-fetch".
         // для улучшения логов сервисов, в которые делают запросы tramvai приложения,
@@ -176,6 +158,10 @@ const HttpClientModule = /* @__PURE__ */ Module({
                     token: DISABLE_CIRCUIT_BREAKER,
                     optional: true,
                 },
+                defaultOptions: {
+                    token: DEFAULT_HTTP_CLIENT_FACTORY_OPTIONS,
+                    optional: true,
+                },
             },
         }),
         provide({
@@ -242,4 +228,4 @@ const HttpClientModule = /* @__PURE__ */ Module({
 })(class HttpClientModule {
 });
 
-export { HttpClientModule, PapiService, fillHeaderIp, fillHeaders, formatError, httpClientFactory };
+export { HttpClientModule, PapiService, fillHeaderIp, fillHeaders, httpClientFactory };

package/lib/index.d.ts

@@ -2,6 +2,5 @@ export { HttpClientModule } from './httpClientModule';
 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,6 +1,6 @@
 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_AGENT, DISABLE_CIRCUIT_BREAKER, HTTP_CLIENT } from '@tramvai/tokens-http-client';
+import { PAPI_SERVICE, HTTP_CLIENT_FACTORY, API_CLIENT_PASS_HEADERS, HTTP_CLIENT_AGENT, DISABLE_CIRCUIT_BREAKER, DEFAULT_HTTP_CLIENT_FACTORY_OPTIONS, 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';
@@ -46,23 +46,6 @@ const fillHeaders = ({ requestManager, headersList, }) => {
     };
 };
 
-const getErrorMessage = (message) => {
-    switch (true) {
-        case /network timeout at/i.test(message) || /request timed out/i.test(message):
-            return 'Время истекло. Обновите страницу и повторите попытку.';
-        default:
-            return 'Что-то пошло не так. Мы уже решаем проблему. Попробуйте снова через несколько минут.';
-    }
-};
-const formatError = (error) => {
-    if (error.originalMessage) {
-        return error;
-    }
-    const originalMessage = error.message;
-    const message = getErrorMessage(originalMessage);
-    return Object.assign(error, { message, originalMessage });
-};
-
 const createUserAgent = ({ appInfo, envManager, }) => {
     const { appName } = appInfo;
     const appVersion = envManager.get('APP_VERSION');
@@ -85,14 +68,14 @@ const environmentDependentOptions = typeof window === 'undefined'
     : {
         defaultTimeout: 30000,
     };
-const httpClientFactory = ({ logger, envManager, appInfo, requestManager, headersList, createCache, makeRequestRegistry, agent, disableCircuitBreaker = false, }) => {
+const httpClientFactory = ({ logger, envManager, appInfo, requestManager, headersList, createCache, makeRequestRegistry, agent, disableCircuitBreaker = false, defaultOptions, }) => {
     return (options) => {
         if (!options.name) {
             throw Error(`You need to pass a unique field "name" for the HTTP client instance`);
         }
         const forceDisableCache = envManager.get('HTTP_CLIENT_CACHE_DISABLED');
         const forceDisabledCircuitBreaker = envManager.get('HTTP_CLIENT_CIRCUIT_BREAKER_DISABLED');
-        const adapterOptions = mergeOptions({
+        const adapterOptions = mergeOptions(mergeOptions({
             logger,
             agent,
             method: 'GET',
@@ -100,13 +83,12 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
                 ? (cacheOptions) => createCache('memory', cacheOptions)
                 : undefined,
             modifyRequest: compose(fillHeaderIp({ requestManager }), fillHeaders({ requestManager, headersList })),
-            modifyError: formatError,
             circuitBreakerOptions: {
                 failureThreshold: 75,
                 minimumFailureCount: 10,
             },
             ...environmentDependentOptions,
-        }, options);
+        }, defaultOptions !== null && defaultOptions !== void 0 ? defaultOptions : {}), options);
         // по умолчанию, на сервере, библиотека https://github.com/node-fetch/node-fetch
         // отправляет заголовок "User-Agent" вида "node-fetch".
         // для улучшения логов сервисов, в которые делают запросы tramvai приложения,
@@ -223,6 +205,10 @@ const HttpClientModule = /* @__PURE__ */ Module({
                     token: DISABLE_CIRCUIT_BREAKER,
                     optional: true,
                 },
+                defaultOptions: {
+                    token: DEFAULT_HTTP_CLIENT_FACTORY_OPTIONS,
+                    optional: true,
+                },
             },
         }),
         provide({
@@ -289,4 +275,4 @@ const HttpClientModule = /* @__PURE__ */ Module({
 })(class HttpClientModule {
 });
 
-export { HttpClientModule, PapiService, fillHeaderIp, fillHeaders, formatError, httpClientFactory };
+export { HttpClientModule, PapiService, fillHeaderIp, fillHeaders, httpClientFactory };

package/lib/index.js

@@ -57,23 +57,6 @@ const fillHeaders = ({ requestManager, headersList, }) => {
     };
 };
 
-const getErrorMessage = (message) => {
-    switch (true) {
-        case /network timeout at/i.test(message) || /request timed out/i.test(message):
-            return 'Время истекло. Обновите страницу и повторите попытку.';
-        default:
-            return 'Что-то пошло не так. Мы уже решаем проблему. Попробуйте снова через несколько минут.';
-    }
-};
-const formatError = (error) => {
-    if (error.originalMessage) {
-        return error;
-    }
-    const originalMessage = error.message;
-    const message = getErrorMessage(originalMessage);
-    return Object.assign(error, { message, originalMessage });
-};
-
 const createUserAgent = ({ appInfo, envManager, }) => {
     const { appName } = appInfo;
     const appVersion = envManager.get('APP_VERSION');
@@ -96,14 +79,14 @@ const environmentDependentOptions = typeof window === 'undefined'
     : {
         defaultTimeout: 30000,
     };
-const httpClientFactory = ({ logger, envManager, appInfo, requestManager, headersList, createCache, makeRequestRegistry, agent, disableCircuitBreaker = false, }) => {
+const httpClientFactory = ({ logger, envManager, appInfo, requestManager, headersList, createCache, makeRequestRegistry, agent, disableCircuitBreaker = false, defaultOptions, }) => {
     return (options) => {
         if (!options.name) {
             throw Error(`You need to pass a unique field "name" for the HTTP client instance`);
         }
         const forceDisableCache = envManager.get('HTTP_CLIENT_CACHE_DISABLED');
         const forceDisabledCircuitBreaker = envManager.get('HTTP_CLIENT_CIRCUIT_BREAKER_DISABLED');
-        const adapterOptions = tinkoffRequestHttpClientAdapter.mergeOptions({
+        const adapterOptions = tinkoffRequestHttpClientAdapter.mergeOptions(tinkoffRequestHttpClientAdapter.mergeOptions({
             logger,
             agent,
             method: 'GET',
@@ -111,13 +94,12 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
                 ? (cacheOptions) => createCache('memory', cacheOptions)
                 : undefined,
             modifyRequest: compose__default["default"](fillHeaderIp({ requestManager }), fillHeaders({ requestManager, headersList })),
-            modifyError: formatError,
             circuitBreakerOptions: {
                 failureThreshold: 75,
                 minimumFailureCount: 10,
             },
             ...environmentDependentOptions,
-        }, options);
+        }, defaultOptions !== null && defaultOptions !== void 0 ? defaultOptions : {}), options);
         // по умолчанию, на сервере, библиотека https://github.com/node-fetch/node-fetch
         // отправляет заголовок "User-Agent" вида "node-fetch".
         // для улучшения логов сервисов, в которые делают запросы tramvai приложения,
@@ -234,6 +216,10 @@ const HttpClientModule = /* @__PURE__ */ core.Module({
                     token: tokensHttpClient.DISABLE_CIRCUIT_BREAKER,
                     optional: true,
                 },
+                defaultOptions: {
+                    token: tokensHttpClient.DEFAULT_HTTP_CLIENT_FACTORY_OPTIONS,
+                    optional: true,
+                },
             },
         }),
         core.provide({
@@ -304,7 +290,6 @@ exports.HttpClientModule = HttpClientModule;
 exports.PapiService = PapiService;
 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, {

package/lib/utils/index.d.ts

@@ -1,2 +1 @@
 export * from './fillHeaders';
-export * from './errors';

package/package.json

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

package/lib/utils/errors.d.ts

@@ -1,6 +0,0 @@
-export declare const getErrorMessage: (message: string) => "Время истекло. Обновите страницу и повторите попытку." | "Что-то пошло не так. Мы уже решаем проблему. Попробуйте снова через несколько минут.";
-export declare const formatError: (error: Error & {
-    originalMessage?: string;
-}) => Error & {
-    originalMessage?: string;
-};