@tramvai/module-http-client 7.21.1 → 7.26.8

package/lib/httpClient/httpClientFactory.browser.js

@@ -37,6 +37,10 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
             ...environmentDependentOptions,
         }, defaultOptions ? mergeOptions(defaultOptions, interceptors) : interceptors), options);
         adapterOptions.headers = {
+            // prevent CORS error when trying to set custom header in browser
+            ...(options.baseUrlEnv && typeof window === 'undefined'
+                ? { 'x-tramvai-service-name': options.baseUrlEnv }
+                : {}),
             ...transformUserAgent({ appInfo, envManager }),
             ...adapterOptions.headers,
         };
@@ -50,6 +54,9 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
         if (forceDisabledCircuitBreaker === 'true') {
             adapterOptions.enableCircuitBreaker = !forceDisabledCircuitBreaker;
         }
+        if (options.baseUrlEnv && typeof adapterOptions.baseUrl !== 'string') {
+            adapterOptions.baseUrl = envManager.get(options.baseUrlEnv);
+        }
         // cache @tinkoff/request instance for performance reason
         if (!makeRequestRegistry.has(adapterOptions.name)) {
             const tRequestOptions = { ...adapterOptions };

package/lib/httpClient/httpClientFactory.es.js

@@ -37,6 +37,10 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
             ...environmentDependentOptions,
         }, defaultOptions ? mergeOptions(defaultOptions, interceptors) : interceptors), options);
         adapterOptions.headers = {
+            // prevent CORS error when trying to set custom header in browser
+            ...(options.baseUrlEnv && typeof window === 'undefined'
+                ? { 'x-tramvai-service-name': options.baseUrlEnv }
+                : {}),
             ...transformUserAgent({ appInfo, envManager }),
             ...adapterOptions.headers,
         };
@@ -50,6 +54,9 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
         if (forceDisabledCircuitBreaker === 'true') {
             adapterOptions.enableCircuitBreaker = !forceDisabledCircuitBreaker;
         }
+        if (options.baseUrlEnv && typeof adapterOptions.baseUrl !== 'string') {
+            adapterOptions.baseUrl = envManager.get(options.baseUrlEnv);
+        }
         // cache @tinkoff/request instance for performance reason
         if (!makeRequestRegistry.has(adapterOptions.name)) {
             const tRequestOptions = { ...adapterOptions };

package/lib/httpClient/httpClientFactory.js

@@ -46,6 +46,10 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
             ...environmentDependentOptions,
         }, defaultOptions ? tinkoffRequestHttpClientAdapter.mergeOptions(defaultOptions, interceptors) : interceptors), options);
         adapterOptions.headers = {
+            // prevent CORS error when trying to set custom header in browser
+            ...(options.baseUrlEnv && typeof window === 'undefined'
+                ? { 'x-tramvai-service-name': options.baseUrlEnv }
+                : {}),
             ...headers.transformUserAgent({ appInfo, envManager }),
             ...adapterOptions.headers,
         };
@@ -59,6 +63,9 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
         if (forceDisabledCircuitBreaker === 'true') {
             adapterOptions.enableCircuitBreaker = !forceDisabledCircuitBreaker;
         }
+        if (options.baseUrlEnv && typeof adapterOptions.baseUrl !== 'string') {
+            adapterOptions.baseUrl = envManager.get(options.baseUrlEnv);
+        }
         // cache @tinkoff/request instance for performance reason
         if (!makeRequestRegistry.has(adapterOptions.name)) {
             const tRequestOptions = { ...adapterOptions };

package/lib/httpClientModule.browser.js

@@ -1,5 +1,8 @@
+import noop from '@tinkoff/utils/function/noop';
 import { declareModule, provide, commandLineListTokens, optional } from '@tramvai/core';
 import { HTTP_CLIENT_AGENT, HTTP_CLIENT_AGENT_OPTIONS, HTTP_CLIENT_AGENT_INTERCEPTORS } from '@tramvai/tokens-http-client';
+import { commandLineListTokens as commandLineListTokens$1 } from '@tramvai/child-app-core';
+import { IS_CHILD_APP_DI_TOKEN } from '@tramvai/tokens-child-app';
 import { PapiClientModule } from './papiClientModule.browser.browser.js';
 import { providers } from './shared.browser.js';
 
@@ -46,6 +49,21 @@ const HttpClientModule = /* @__PURE__ */ declareModule({
                     provide: HTTP_CLIENT_AGENT_OPTIONS,
                     useValue: {},
                 }),
+                // Show an error in the development environment to prevent developers
+                // from including this module in child app dependencies, as it causes
+                // bundle size inflation and cache-related errors.
+                provide({
+                    provide: commandLineListTokens$1.customerStart,
+                    useFactory: ({ isChildAppRunner }) => {
+                        if (process.env.NODE_ENV === 'development' && isChildAppRunner) {
+                            throw new Error('HttpClientModule cannot be imported in a child app. This module must be used in host application.');
+                        }
+                        return noop;
+                    },
+                    deps: {
+                        isChildAppRunner: optional(IS_CHILD_APP_DI_TOKEN),
+                    },
+                }),
             ]
             : []),
     ],

package/lib/httpClientModule.es.js

@@ -1,5 +1,8 @@
+import noop from '@tinkoff/utils/function/noop';
 import { declareModule, provide, commandLineListTokens, optional } from '@tramvai/core';
 import { HTTP_CLIENT_AGENT, HTTP_CLIENT_AGENT_OPTIONS, HTTP_CLIENT_AGENT_INTERCEPTORS } from '@tramvai/tokens-http-client';
+import { commandLineListTokens as commandLineListTokens$1 } from '@tramvai/child-app-core';
+import { IS_CHILD_APP_DI_TOKEN } from '@tramvai/tokens-child-app';
 import { PapiClientModule } from './papiClientModule.es.js';
 import { providers } from './shared.es.js';
 
@@ -46,6 +49,21 @@ const HttpClientModule = /* @__PURE__ */ declareModule({
                     provide: HTTP_CLIENT_AGENT_OPTIONS,
                     useValue: {},
                 }),
+                // Show an error in the development environment to prevent developers
+                // from including this module in child app dependencies, as it causes
+                // bundle size inflation and cache-related errors.
+                provide({
+                    provide: commandLineListTokens$1.customerStart,
+                    useFactory: ({ isChildAppRunner }) => {
+                        if (process.env.NODE_ENV === 'development' && isChildAppRunner) {
+                            throw new Error('HttpClientModule cannot be imported in a child app. This module must be used in host application.');
+                        }
+                        return noop;
+                    },
+                    deps: {
+                        isChildAppRunner: optional(IS_CHILD_APP_DI_TOKEN),
+                    },
+                }),
             ]
             : []),
     ],

package/lib/httpClientModule.js

@@ -2,11 +2,18 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var noop = require('@tinkoff/utils/function/noop');
 var core = require('@tramvai/core');
 var tokensHttpClient = require('@tramvai/tokens-http-client');
+var childAppCore = require('@tramvai/child-app-core');
+var tokensChildApp = require('@tramvai/tokens-child-app');
 var papiClientModule = require('./papiClientModule.js');
 var shared = require('./shared.js');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var noop__default = /*#__PURE__*/_interopDefaultLegacy(noop);
+
 const HttpClientModule = /* @__PURE__ */ core.declareModule({
     name: 'HttpClientModule',
     imports: [papiClientModule.PapiClientModule],
@@ -50,6 +57,21 @@ const HttpClientModule = /* @__PURE__ */ core.declareModule({
                     provide: tokensHttpClient.HTTP_CLIENT_AGENT_OPTIONS,
                     useValue: {},
                 }),
+                // Show an error in the development environment to prevent developers
+                // from including this module in child app dependencies, as it causes
+                // bundle size inflation and cache-related errors.
+                core.provide({
+                    provide: childAppCore.commandLineListTokens.customerStart,
+                    useFactory: ({ isChildAppRunner }) => {
+                        if (process.env.NODE_ENV === 'development' && isChildAppRunner) {
+                            throw new Error('HttpClientModule cannot be imported in a child app. This module must be used in host application.');
+                        }
+                        return noop__default["default"];
+                    },
+                    deps: {
+                        isChildAppRunner: core.optional(tokensChildApp.IS_CHILD_APP_DI_TOKEN),
+                    },
+                }),
             ]
             : []),
     ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-http-client",
-  "version": "7.21.1",
+  "version": "7.26.8",
   "initialVersion": "0.58.99",
   "description": "",
   "engines": {
@@ -29,29 +29,31 @@
   },
   "dependencies": {
     "@jest/globals": "^29.7.0",
+    "@tramvai/child-app-core": "7.26.8",
     "@tramvai/http-client": "0.7.1",
-    "@tramvai/tinkoff-request-http-client-adapter": "0.14.74",
-    "@tramvai/tokens-common": "7.21.1",
-    "@tramvai/tokens-http-client": "7.21.1",
-    "@tramvai/tokens-server": "7.21.1",
-    "@tramvai/tokens-server-private": "7.21.1",
+    "@tramvai/tinkoff-request-http-client-adapter": "0.14.106",
+    "@tramvai/tokens-child-app": "7.26.8",
+    "@tramvai/tokens-common": "7.26.8",
+    "@tramvai/tokens-http-client": "7.26.8",
+    "@tramvai/tokens-server": "7.26.8",
+    "@tramvai/tokens-server-private": "7.26.8",
     "jest": "^29.7.0",
     "undici": "^7.24.4"
   },
   "devDependencies": {
     "@tinkoff/request-core": "^0.10.0",
     "@tinkoff/request-plugin-protocol-http": "0.16.0",
-    "@tramvai/build": "8.0.1"
+    "@tramvai/build": "8.0.2"
   },
   "peerDependencies": {
     "@tinkoff/dippy": "^1.0.0",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "7.21.1",
-    "@tramvai/module-common": "7.21.1",
-    "@tramvai/papi": "7.21.1",
-    "@tramvai/test-helpers": "7.21.1",
-    "@tramvai/test-mocks": "7.21.1",
-    "@tramvai/test-unit": "7.21.1",
+    "@tramvai/core": "7.26.8",
+    "@tramvai/module-common": "7.26.8",
+    "@tramvai/papi": "7.26.8",
+    "@tramvai/test-helpers": "7.26.8",
+    "@tramvai/test-mocks": "7.26.8",
+    "@tramvai/test-unit": "7.26.8",
     "tslib": "^2.4.0"
   },
   "license": "Apache-2.0",

package/tests.js

@@ -4,8 +4,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var testHelpers = require('@tramvai/test-helpers');
 var testMocks = require('@tramvai/test-mocks');
+var globals = require('@jest/globals');
+var noop = require('@tinkoff/utils/function/noop');
 var core = require('@tramvai/core');
 var tokensHttpClient = require('@tramvai/tokens-http-client');
+var childAppCore = require('@tramvai/child-app-core');
+var tokensChildApp = require('@tramvai/tokens-child-app');
 var tokensServer = require('@tramvai/tokens-server');
 var tokensCommon = require('@tramvai/tokens-common');
 var find = require('@tinkoff/utils/array/find');
@@ -19,10 +23,10 @@ var pick = require('@tinkoff/utils/object/pick');
 var isNil = require('@tinkoff/utils/is/nil');
 var compose = require('@tinkoff/utils/function/compose');
 var tinkoffRequestHttpClientAdapter = require('@tramvai/tinkoff-request-http-client-adapter');
-var globals = require('@jest/globals');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+var noop__default = /*#__PURE__*/_interopDefaultLegacy(noop);
 var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
 var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
 var identity__default = /*#__PURE__*/_interopDefaultLegacy(identity);
@@ -188,6 +192,10 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
             ...environmentDependentOptions,
         }, defaultOptions ? tinkoffRequestHttpClientAdapter.mergeOptions(defaultOptions, interceptors) : interceptors), options);
         adapterOptions.headers = {
+            // prevent CORS error when trying to set custom header in browser
+            ...(options.baseUrlEnv && typeof window === 'undefined'
+                ? { 'x-tramvai-service-name': options.baseUrlEnv }
+                : {}),
             ...transformUserAgent({ appInfo, envManager }),
             ...adapterOptions.headers,
         };
@@ -201,6 +209,9 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
         if (forceDisabledCircuitBreaker === 'true') {
             adapterOptions.enableCircuitBreaker = !forceDisabledCircuitBreaker;
         }
+        if (options.baseUrlEnv && typeof adapterOptions.baseUrl !== 'string') {
+            adapterOptions.baseUrl = envManager.get(options.baseUrlEnv);
+        }
         // cache @tinkoff/request instance for performance reason
         if (!makeRequestRegistry.has(adapterOptions.name)) {
             const tRequestOptions = { ...adapterOptions };
@@ -361,6 +372,21 @@ const HttpClientModule = /* @__PURE__ */ core.declareModule({
                     provide: tokensHttpClient.HTTP_CLIENT_AGENT_OPTIONS,
                     useValue: {},
                 }),
+                // Show an error in the development environment to prevent developers
+                // from including this module in child app dependencies, as it causes
+                // bundle size inflation and cache-related errors.
+                core.provide({
+                    provide: childAppCore.commandLineListTokens.customerStart,
+                    useFactory: ({ isChildAppRunner }) => {
+                        if (process.env.NODE_ENV === 'development' && isChildAppRunner) {
+                            throw new Error('HttpClientModule cannot be imported in a child app. This module must be used in host application.');
+                        }
+                        return noop__default["default"];
+                    },
+                    deps: {
+                        isChildAppRunner: core.optional(tokensChildApp.IS_CHILD_APP_DI_TOKEN),
+                    },
+                }),
             ]
             : []),
     ],