@tramvai/module-http-client 5.49.1 → 6.59.0

package/lib/httpClient/headers.browser.js

@@ -0,0 +1,19 @@
+import { createUserAgent } from './createUserAgent.browser.js';
+
+/**
+ * `node-fetch` sends "User-Agent: node-fetch" header
+ * on the server by default. For logging purpose, we are
+ * replacing "User-Agent" value with custom one, containing
+ * both application name and version.
+ *
+ * @param appInfo
+ * @param envManager
+ */
+const transformUserAgent = ({ appInfo, envManager, }) => {
+    if (typeof window === 'undefined') {
+        return { 'User-Agent': createUserAgent({ appInfo, envManager }) };
+    }
+    return undefined;
+};
+
+export { transformUserAgent };

package/lib/httpClient/headers.d.ts

@@ -0,0 +1,17 @@
+import type { ExtractDependencyType } from '@tinkoff/dippy';
+import type { ENV_MANAGER_TOKEN } from '@tramvai/tokens-common';
+import type { APP_INFO_TOKEN } from '@tramvai/tokens-core';
+/**
+ * `node-fetch` sends "User-Agent: node-fetch" header
+ * on the server by default. For logging purpose, we are
+ * replacing "User-Agent" value with custom one, containing
+ * both application name and version.
+ *
+ * @param appInfo
+ * @param envManager
+ */
+export declare const transformUserAgent: ({ appInfo, envManager, }: {
+    appInfo: ExtractDependencyType<typeof APP_INFO_TOKEN>;
+    envManager: ExtractDependencyType<typeof ENV_MANAGER_TOKEN>;
+}) => Record<string, string> | undefined;
+//# sourceMappingURL=headers.d.ts.map

package/lib/httpClient/headers.es.js

@@ -0,0 +1,19 @@
+import { createUserAgent } from './createUserAgent.es.js';
+
+/**
+ * `node-fetch` sends "User-Agent: node-fetch" header
+ * on the server by default. For logging purpose, we are
+ * replacing "User-Agent" value with custom one, containing
+ * both application name and version.
+ *
+ * @param appInfo
+ * @param envManager
+ */
+const transformUserAgent = ({ appInfo, envManager, }) => {
+    if (typeof window === 'undefined') {
+        return { 'User-Agent': createUserAgent({ appInfo, envManager }) };
+    }
+    return undefined;
+};
+
+export { transformUserAgent };

package/lib/httpClient/headers.js

@@ -0,0 +1,23 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var createUserAgent = require('./createUserAgent.js');
+
+/**
+ * `node-fetch` sends "User-Agent: node-fetch" header
+ * on the server by default. For logging purpose, we are
+ * replacing "User-Agent" value with custom one, containing
+ * both application name and version.
+ *
+ * @param appInfo
+ * @param envManager
+ */
+const transformUserAgent = ({ appInfo, envManager, }) => {
+    if (typeof window === 'undefined') {
+        return { 'User-Agent': createUserAgent.createUserAgent({ appInfo, envManager }) };
+    }
+    return undefined;
+};
+
+exports.transformUserAgent = transformUserAgent;

package/lib/httpClient/httpClientFactory.browser.js

@@ -2,7 +2,7 @@ import isNil from '@tinkoff/utils/is/nil';
 import compose from '@tinkoff/utils/function/compose';
 import { mergeOptions, createTinkoffRequest, HttpClientAdapter } from '@tramvai/tinkoff-request-http-client-adapter';
 import { fillHeaderIp, fillHeaders } from '../utils/fillHeaders.browser.browser.js';
-import { createUserAgent } from './createUserAgent.browser.js';
+import { transformUserAgent } from './headers.browser.js';
 
 const environmentDependentOptions = typeof window === 'undefined'
     ? {
@@ -37,16 +37,10 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
             signal: commandLineExecutionContext?.()?.abortSignal,
             ...environmentDependentOptions,
         }, defaultOptions ? mergeOptions(defaultOptions, interceptors) : interceptors), options);
-        // по умолчанию, на сервере, библиотека https://github.com/node-fetch/node-fetch
-        // отправляет заголовок "User-Agent" вида "node-fetch".
-        // для улучшения логов сервисов, в которые делают запросы tramvai приложения,
-        // заменяем "User-Agent" на кастомный, содержащий название и версию приложения
-        if (typeof window === 'undefined') {
-            adapterOptions.headers = {
-                'User-Agent': createUserAgent({ appInfo, envManager }),
-                ...adapterOptions.headers,
-            };
-        }
+        adapterOptions.headers = {
+            ...transformUserAgent({ appInfo, envManager }),
+            ...adapterOptions.headers,
+        };
         if (!isNil(forceDisableCache)) {
             adapterOptions.disableCache = !!forceDisableCache;
         }
@@ -54,7 +48,7 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
             adapterOptions.enableCircuitBreaker = false;
         }
         // environment variable in priority over disableCircuitBreaker
-        if (!isNil(forceDisabledCircuitBreaker)) {
+        if (forceDisabledCircuitBreaker === 'true') {
             adapterOptions.enableCircuitBreaker = !forceDisabledCircuitBreaker;
         }
         // cache @tinkoff/request instance for performance reason

package/lib/httpClient/httpClientFactory.es.js

@@ -2,7 +2,7 @@ import isNil from '@tinkoff/utils/is/nil';
 import compose from '@tinkoff/utils/function/compose';
 import { mergeOptions, createTinkoffRequest, HttpClientAdapter } from '@tramvai/tinkoff-request-http-client-adapter';
 import { fillHeaderIp, fillHeaders } from '../utils/fillHeaders.es.js';
-import { createUserAgent } from './createUserAgent.es.js';
+import { transformUserAgent } from './headers.es.js';
 
 const environmentDependentOptions = typeof window === 'undefined'
     ? {
@@ -37,16 +37,10 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
             signal: commandLineExecutionContext?.()?.abortSignal,
             ...environmentDependentOptions,
         }, defaultOptions ? mergeOptions(defaultOptions, interceptors) : interceptors), options);
-        // по умолчанию, на сервере, библиотека https://github.com/node-fetch/node-fetch
-        // отправляет заголовок "User-Agent" вида "node-fetch".
-        // для улучшения логов сервисов, в которые делают запросы tramvai приложения,
-        // заменяем "User-Agent" на кастомный, содержащий название и версию приложения
-        if (typeof window === 'undefined') {
-            adapterOptions.headers = {
-                'User-Agent': createUserAgent({ appInfo, envManager }),
-                ...adapterOptions.headers,
-            };
-        }
+        adapterOptions.headers = {
+            ...transformUserAgent({ appInfo, envManager }),
+            ...adapterOptions.headers,
+        };
         if (!isNil(forceDisableCache)) {
             adapterOptions.disableCache = !!forceDisableCache;
         }
@@ -54,7 +48,7 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
             adapterOptions.enableCircuitBreaker = false;
         }
         // environment variable in priority over disableCircuitBreaker
-        if (!isNil(forceDisabledCircuitBreaker)) {
+        if (forceDisabledCircuitBreaker === 'true') {
             adapterOptions.enableCircuitBreaker = !forceDisabledCircuitBreaker;
         }
         // cache @tinkoff/request instance for performance reason

package/lib/httpClient/httpClientFactory.js

@@ -6,7 +6,7 @@ var isNil = require('@tinkoff/utils/is/nil');
 var compose = require('@tinkoff/utils/function/compose');
 var tinkoffRequestHttpClientAdapter = require('@tramvai/tinkoff-request-http-client-adapter');
 var fillHeaders = require('../utils/fillHeaders.js');
-var createUserAgent = require('./createUserAgent.js');
+var headers = require('./headers.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -46,16 +46,10 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
             signal: commandLineExecutionContext?.()?.abortSignal,
             ...environmentDependentOptions,
         }, defaultOptions ? tinkoffRequestHttpClientAdapter.mergeOptions(defaultOptions, interceptors) : interceptors), options);
-        // по умолчанию, на сервере, библиотека https://github.com/node-fetch/node-fetch
-        // отправляет заголовок "User-Agent" вида "node-fetch".
-        // для улучшения логов сервисов, в которые делают запросы tramvai приложения,
-        // заменяем "User-Agent" на кастомный, содержащий название и версию приложения
-        if (typeof window === 'undefined') {
-            adapterOptions.headers = {
-                'User-Agent': createUserAgent.createUserAgent({ appInfo, envManager }),
-                ...adapterOptions.headers,
-            };
-        }
+        adapterOptions.headers = {
+            ...headers.transformUserAgent({ appInfo, envManager }),
+            ...adapterOptions.headers,
+        };
         if (!isNil__default["default"](forceDisableCache)) {
             adapterOptions.disableCache = !!forceDisableCache;
         }
@@ -63,7 +57,7 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
             adapterOptions.enableCircuitBreaker = false;
         }
         // environment variable in priority over disableCircuitBreaker
-        if (!isNil__default["default"](forceDisabledCircuitBreaker)) {
+        if (forceDisabledCircuitBreaker === 'true') {
             adapterOptions.enableCircuitBreaker = !forceDisabledCircuitBreaker;
         }
         // cache @tinkoff/request instance for performance reason

package/lib/papi/papiService.es.js

@@ -10,6 +10,8 @@ import { comparePathWithPattern } from '../utils/comparePathWithPattern.es.js';
 import { getPathParams } from '../utils/getPathParams.es.js';
 
 class PapiService extends BaseHttpClient {
+    papi;
+    di;
     constructor({ papi, di }) {
         super();
         this.papi = flatten(papi || []);

package/lib/papi/papiService.js

@@ -19,6 +19,8 @@ var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
 var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
 
 class PapiService extends httpClient.BaseHttpClient {
+    papi;
+    di;
     constructor({ papi, di }) {
         super();
         this.papi = flatten__default["default"](papi || []);

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@tramvai/module-http-client",
-  "version": "5.49.1",
+  "version": "6.59.0",
   "initialVersion": "0.58.99",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "browser": {
+    "./lib/index.es.js": "./lib/index.browser.js",
     "./lib/papiClientModule.js": "./lib/papiClientModule.browser.js",
-    "./lib/utils/fillHeaders.js": "./lib/utils/fillHeaders.browser.js",
-    "./lib/index.es.js": "./lib/index.browser.js"
+    "./lib/utils/fillHeaders.js": "./lib/utils/fillHeaders.browser.js"
   },
   "files": [
     "lib",
@@ -25,12 +25,12 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@tramvai/http-client": "0.5.4",
-    "@tramvai/tinkoff-request-http-client-adapter": "0.12.115",
-    "@tramvai/tokens-http-client": "5.49.1",
-    "@tramvai/tokens-common": "5.49.1",
-    "@tramvai/tokens-server": "5.49.1",
-    "@tramvai/tokens-server-private": "5.49.1"
+    "@tramvai/http-client": "0.6.0",
+    "@tramvai/tinkoff-request-http-client-adapter": "0.13.102",
+    "@tramvai/tokens-common": "6.59.0",
+    "@tramvai/tokens-http-client": "6.59.0",
+    "@tramvai/tokens-server": "6.59.0",
+    "@tramvai/tokens-server-private": "6.59.0"
   },
   "devDependencies": {
     "@tinkoff/request-core": "^0.10.0",
@@ -38,14 +38,14 @@
     "@types/node-fetch": "^2.6.2"
   },
   "peerDependencies": {
+    "@tinkoff/dippy": "0.12.3",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "5.49.1",
-    "@tramvai/module-common": "5.49.1",
-    "@tramvai/papi": "5.49.1",
-    "@tramvai/test-helpers": "5.49.1",
-    "@tramvai/test-unit": "5.49.1",
-    "@tramvai/test-mocks": "5.49.1",
-    "@tinkoff/dippy": "0.11.4",
+    "@tramvai/core": "6.59.0",
+    "@tramvai/module-common": "6.59.0",
+    "@tramvai/papi": "6.59.0",
+    "@tramvai/test-helpers": "6.59.0",
+    "@tramvai/test-mocks": "6.59.0",
+    "@tramvai/test-unit": "6.59.0",
     "node-fetch": "^2.6.1",
     "tslib": "^2.4.0"
   },

package/tests.js

@@ -83,6 +83,22 @@ const createUserAgent = ({ appInfo, envManager, }) => {
     return userAgent;
 };
 
+/**
+ * `node-fetch` sends "User-Agent: node-fetch" header
+ * on the server by default. For logging purpose, we are
+ * replacing "User-Agent" value with custom one, containing
+ * both application name and version.
+ *
+ * @param appInfo
+ * @param envManager
+ */
+const transformUserAgent = ({ appInfo, envManager, }) => {
+    if (typeof window === 'undefined') {
+        return { 'User-Agent': createUserAgent({ appInfo, envManager }) };
+    }
+    return undefined;
+};
+
 const environmentDependentOptions = typeof window === 'undefined'
     ? {
         defaultTimeout: 2000,
@@ -116,16 +132,10 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
             signal: commandLineExecutionContext?.()?.abortSignal,
             ...environmentDependentOptions,
         }, defaultOptions ? tinkoffRequestHttpClientAdapter.mergeOptions(defaultOptions, interceptors) : interceptors), options);
-        // по умолчанию, на сервере, библиотека https://github.com/node-fetch/node-fetch
-        // отправляет заголовок "User-Agent" вида "node-fetch".
-        // для улучшения логов сервисов, в которые делают запросы tramvai приложения,
-        // заменяем "User-Agent" на кастомный, содержащий название и версию приложения
-        if (typeof window === 'undefined') {
-            adapterOptions.headers = {
-                'User-Agent': createUserAgent({ appInfo, envManager }),
-                ...adapterOptions.headers,
-            };
-        }
+        adapterOptions.headers = {
+            ...transformUserAgent({ appInfo, envManager }),
+            ...adapterOptions.headers,
+        };
         if (!isNil__default["default"](forceDisableCache)) {
             adapterOptions.disableCache = !!forceDisableCache;
         }
@@ -133,7 +143,7 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
             adapterOptions.enableCircuitBreaker = false;
         }
         // environment variable in priority over disableCircuitBreaker
-        if (!isNil__default["default"](forceDisabledCircuitBreaker)) {
+        if (forceDisabledCircuitBreaker === 'true') {
             adapterOptions.enableCircuitBreaker = !forceDisabledCircuitBreaker;
         }
         // cache @tinkoff/request instance for performance reason