@tramvai/module-http-client 1.57.1 → 1.60.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/index.browser.js +1 -22
  2. package/lib/index.es.js +1 -22
  3. package/lib/index.js +1 -23
  4. package/package.json +11 -11
package/lib/index.browser.js CHANGED
@@ -5,7 +5,6 @@ import { PAPI_SERVICE, HTTP_CLIENT_FACTORY, API_CLIENT_PASS_HEADERS, HTTP_CLIENT
5
5
  export * from '@tramvai/tokens-http-client';
6
6
  import { LOGGER_TOKEN, ENV_MANAGER_TOKEN, REQUEST_MANAGER_TOKEN, ENV_USED_TOKEN, CREATE_CACHE_TOKEN } from '@tramvai/tokens-common';
7
7
  import isNil from '@tinkoff/utils/is/nil';
8
- import omit from '@tinkoff/utils/object/omit';
9
8
  import compose from '@tinkoff/utils/function/compose';
10
9
  import { mergeOptions, createTinkoffRequest, HttpClientAdapter } from '@tramvai/tinkoff-request-http-client-adapter';
11
10
  import { SERVER_MODULE_PAPI_PUBLIC_URL } from '@tramvai/tokens-server';
@@ -95,33 +94,13 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
95
94
  if (!isNil(forceDisabledCircuitBreaker)) {
96
95
  adapterOptions.enableCircuitBreaker = !forceDisabledCircuitBreaker;
97
96
  }
98
- if (!adapterOptions.modifyRequest) {
99
- adapterOptions.modifyRequest = (req) => req;
100
- }
101
- if (!adapterOptions.modifyResponse) {
102
- adapterOptions.modifyResponse = (res) => res;
103
- }
104
- if (!adapterOptions.modifyError) {
105
- adapterOptions.modifyError = (err) => err;
106
- }
107
- const httpClientOptions = omit([
108
- 'logger',
109
- 'name',
110
- 'disableCache',
111
- 'createCache',
112
- 'cacheTime',
113
- 'defaultTimeout',
114
- 'validator',
115
- 'errorValidator',
116
- 'errorModificator',
117
- ], adapterOptions);
118
97
  // кэшируем инстанс @tinkoff/request
119
98
  if (!tinkoffRequestRegistry.has(adapterOptions.name)) {
120
99
  tinkoffRequestRegistry.set(adapterOptions.name, createTinkoffRequest(adapterOptions));
121
100
  }
122
101
  const tinkoffRequest = tinkoffRequestRegistry.get(adapterOptions.name);
123
102
  const httpClientAdapter = new HttpClientAdapter({
124
- options: httpClientOptions,
103
+ options: adapterOptions,
125
104
  tinkoffRequest,
126
105
  });
127
106
  return httpClientAdapter;
package/lib/index.es.js CHANGED
@@ -5,7 +5,6 @@ import { PAPI_SERVICE, HTTP_CLIENT_FACTORY, API_CLIENT_PASS_HEADERS, HTTP_CLIENT
5
5
  export * from '@tramvai/tokens-http-client';
6
6
  import { LOGGER_TOKEN, ENV_MANAGER_TOKEN, REQUEST_MANAGER_TOKEN, ENV_USED_TOKEN, CREATE_CACHE_TOKEN } from '@tramvai/tokens-common';
7
7
  import isNil from '@tinkoff/utils/is/nil';
8
- import omit from '@tinkoff/utils/object/omit';
9
8
  import compose from '@tinkoff/utils/function/compose';
10
9
  import { mergeOptions, createTinkoffRequest, HttpClientAdapter } from '@tramvai/tinkoff-request-http-client-adapter';
11
10
  import identity from '@tinkoff/utils/function/identity';
@@ -124,33 +123,13 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
124
123
  if (!isNil(forceDisabledCircuitBreaker)) {
125
124
  adapterOptions.enableCircuitBreaker = !forceDisabledCircuitBreaker;
126
125
  }
127
- if (!adapterOptions.modifyRequest) {
128
- adapterOptions.modifyRequest = (req) => req;
129
- }
130
- if (!adapterOptions.modifyResponse) {
131
- adapterOptions.modifyResponse = (res) => res;
132
- }
133
- if (!adapterOptions.modifyError) {
134
- adapterOptions.modifyError = (err) => err;
135
- }
136
- const httpClientOptions = omit([
137
- 'logger',
138
- 'name',
139
- 'disableCache',
140
- 'createCache',
141
- 'cacheTime',
142
- 'defaultTimeout',
143
- 'validator',
144
- 'errorValidator',
145
- 'errorModificator',
146
- ], adapterOptions);
147
126
  // кэшируем инстанс @tinkoff/request
148
127
  if (!tinkoffRequestRegistry.has(adapterOptions.name)) {
149
128
  tinkoffRequestRegistry.set(adapterOptions.name, createTinkoffRequest(adapterOptions));
150
129
  }
151
130
  const tinkoffRequest = tinkoffRequestRegistry.get(adapterOptions.name);
152
131
  const httpClientAdapter = new HttpClientAdapter({
153
- options: httpClientOptions,
132
+ options: adapterOptions,
154
133
  tinkoffRequest,
155
134
  });
156
135
  return httpClientAdapter;
package/lib/index.js CHANGED
@@ -8,7 +8,6 @@ var core = require('@tramvai/core');
8
8
  var tokensHttpClient = require('@tramvai/tokens-http-client');
9
9
  var tokensCommon = require('@tramvai/tokens-common');
10
10
  var isNil = require('@tinkoff/utils/is/nil');
11
- var omit = require('@tinkoff/utils/object/omit');
12
11
  var compose = require('@tinkoff/utils/function/compose');
13
12
  var tinkoffRequestHttpClientAdapter = require('@tramvai/tinkoff-request-http-client-adapter');
14
13
  var identity = require('@tinkoff/utils/function/identity');
@@ -23,7 +22,6 @@ var httpClient = require('@tramvai/http-client');
23
22
  function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
24
23
 
25
24
  var isNil__default = /*#__PURE__*/_interopDefaultLegacy(isNil);
26
- var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
27
25
  var compose__default = /*#__PURE__*/_interopDefaultLegacy(compose);
28
26
  var identity__default = /*#__PURE__*/_interopDefaultLegacy(identity);
29
27
  var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
@@ -137,33 +135,13 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
137
135
  if (!isNil__default["default"](forceDisabledCircuitBreaker)) {
138
136
  adapterOptions.enableCircuitBreaker = !forceDisabledCircuitBreaker;
139
137
  }
140
- if (!adapterOptions.modifyRequest) {
141
- adapterOptions.modifyRequest = (req) => req;
142
- }
143
- if (!adapterOptions.modifyResponse) {
144
- adapterOptions.modifyResponse = (res) => res;
145
- }
146
- if (!adapterOptions.modifyError) {
147
- adapterOptions.modifyError = (err) => err;
148
- }
149
- const httpClientOptions = omit__default["default"]([
150
- 'logger',
151
- 'name',
152
- 'disableCache',
153
- 'createCache',
154
- 'cacheTime',
155
- 'defaultTimeout',
156
- 'validator',
157
- 'errorValidator',
158
- 'errorModificator',
159
- ], adapterOptions);
160
138
  // кэшируем инстанс @tinkoff/request
161
139
  if (!tinkoffRequestRegistry.has(adapterOptions.name)) {
162
140
  tinkoffRequestRegistry.set(adapterOptions.name, tinkoffRequestHttpClientAdapter.createTinkoffRequest(adapterOptions));
163
141
  }
164
142
  const tinkoffRequest = tinkoffRequestRegistry.get(adapterOptions.name);
165
143
  const httpClientAdapter = new tinkoffRequestHttpClientAdapter.HttpClientAdapter({
166
- options: httpClientOptions,
144
+ options: adapterOptions,
167
145
  tinkoffRequest,
168
146
  });
169
147
  return httpClientAdapter;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tramvai/module-http-client",
3
- "version": "1.57.1",
3
+ "version": "1.60.1",
4
4
  "initialVersion": "0.58.99",
5
5
  "description": "",
6
6
  "main": "lib/index.js",
@@ -24,22 +24,22 @@
24
24
  "build-for-publish": "true"
25
25
  },
26
26
  "dependencies": {
27
- "@tramvai/http-client": "0.1.24",
28
- "@tramvai/tinkoff-request-http-client-adapter": "0.8.245",
29
- "@tramvai/tokens-http-client": "1.57.1",
30
- "@tramvai/tokens-common": "1.57.1",
31
- "@tramvai/tokens-server": "1.57.1"
27
+ "@tramvai/http-client": "0.1.25",
28
+ "@tramvai/tinkoff-request-http-client-adapter": "0.8.250",
29
+ "@tramvai/tokens-http-client": "1.60.1",
30
+ "@tramvai/tokens-common": "1.60.1",
31
+ "@tramvai/tokens-server": "1.60.1"
32
32
  },
33
33
  "devDependencies": {
34
34
  "@tinkoff/request-core": "^0.8.9"
35
35
  },
36
36
  "peerDependencies": {
37
37
  "@tinkoff/utils": "^2.1.2",
38
- "@tramvai/core": "1.57.1",
39
- "@tramvai/module-common": "1.57.1",
40
- "@tramvai/papi": "1.57.1",
41
- "@tramvai/test-helpers": "1.57.1",
42
- "@tramvai/test-mocks": "1.57.1",
38
+ "@tramvai/core": "1.60.1",
39
+ "@tramvai/module-common": "1.60.1",
40
+ "@tramvai/papi": "1.60.1",
41
+ "@tramvai/test-helpers": "1.60.1",
42
+ "@tramvai/test-mocks": "1.60.1",
43
43
  "@tinkoff/dippy": "0.7.38",
44
44
  "node-fetch": "^2.6.1",
45
45
  "tslib": "^2.0.3"