@tramvai/module-http-client 2.21.0 → 2.21.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 (3) hide show
  1. package/package.json +13 -11
  2. package/tests.d.ts +13 -0
  3. package/tests.js +357 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tramvai/module-http-client",
3
- "version": "2.21.0",
3
+ "version": "2.21.1",
4
4
  "initialVersion": "0.58.99",
5
5
  "description": "",
6
6
  "main": "lib/index.js",
@@ -11,7 +11,9 @@
11
11
  "./lib/index.es.js": "./lib/index.browser.js"
12
12
  },
13
13
  "files": [
14
- "lib"
14
+ "lib",
15
+ "tests.js",
16
+ "tests.d.ts"
15
17
  ],
16
18
  "sideEffects": false,
17
19
  "repository": {
@@ -25,10 +27,10 @@
25
27
  },
26
28
  "dependencies": {
27
29
  "@tramvai/http-client": "0.2.2",
28
- "@tramvai/tinkoff-request-http-client-adapter": "0.9.53",
29
- "@tramvai/tokens-http-client": "2.21.0",
30
- "@tramvai/tokens-common": "2.21.0",
31
- "@tramvai/tokens-server": "2.21.0"
30
+ "@tramvai/tinkoff-request-http-client-adapter": "0.9.54",
31
+ "@tramvai/tokens-http-client": "2.21.1",
32
+ "@tramvai/tokens-common": "2.21.1",
33
+ "@tramvai/tokens-server": "2.21.1"
32
34
  },
33
35
  "devDependencies": {
34
36
  "@tinkoff/request-core": "^0.9.2",
@@ -36,11 +38,11 @@
36
38
  },
37
39
  "peerDependencies": {
38
40
  "@tinkoff/utils": "^2.1.2",
39
- "@tramvai/core": "2.21.0",
40
- "@tramvai/module-common": "2.21.0",
41
- "@tramvai/papi": "2.21.0",
42
- "@tramvai/test-helpers": "2.21.0",
43
- "@tramvai/test-mocks": "2.21.0",
41
+ "@tramvai/core": "2.21.1",
42
+ "@tramvai/module-common": "2.21.1",
43
+ "@tramvai/papi": "2.21.1",
44
+ "@tramvai/test-helpers": "2.21.1",
45
+ "@tramvai/test-mocks": "2.21.1",
44
46
  "@tinkoff/dippy": "0.8.2",
45
47
  "node-fetch": "^2.6.1",
46
48
  "tslib": "^2.0.3"
package/tests.d.ts ADDED
@@ -0,0 +1,13 @@
1
+ /// <reference types="jest" />
2
+ import { getDiWrapper } from "@tramvai/test-helpers";
3
+ import { createMockEnvManager } from "@tramvai/test-mocks";
4
+ type Options = Parameters<typeof getDiWrapper>[0] & {
5
+ env?: Parameters<typeof createMockEnvManager>[0];
6
+ };
7
+ declare const testApi: (options: Options) => {
8
+ di: import("@tinkoff/dippy").Container;
9
+ fetchMock: jest.Mock<any, unknown[]>;
10
+ mockJsonResponse: (body: Record<string, any>, init?: ResponseInit) => Promise<void>;
11
+ clearCaches: () => void;
12
+ };
13
+ export { testApi };
package/tests.js ADDED
@@ -0,0 +1,357 @@
1
+ 'use strict';
2
+
3
+ Object.defineProperty(exports, '__esModule', { value: true });
4
+
5
+ var fetch = require('node-fetch');
6
+ var core = require('@tramvai/core');
7
+ var tokensCommon = require('@tramvai/tokens-common');
8
+ var testHelpers = require('@tramvai/test-helpers');
9
+ var testMocks = require('@tramvai/test-mocks');
10
+ var dippy = require('@tinkoff/dippy');
11
+ var tokensHttpClient = require('@tramvai/tokens-http-client');
12
+ var isNil = require('@tinkoff/utils/is/nil');
13
+ var compose = require('@tinkoff/utils/function/compose');
14
+ var tinkoffRequestHttpClientAdapter = require('@tramvai/tinkoff-request-http-client-adapter');
15
+ var identity = require('@tinkoff/utils/function/identity');
16
+ var flatten = require('@tinkoff/utils/array/flatten');
17
+ var pick = require('@tinkoff/utils/object/pick');
18
+ var tokensServer = require('@tramvai/tokens-server');
19
+ var find = require('@tinkoff/utils/array/find');
20
+ var httpClient = require('@tramvai/http-client');
21
+ var papi = require('@tramvai/papi');
22
+ var moduleCommon = require('@tramvai/module-common');
23
+
24
+ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
25
+
26
+ var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
27
+ var isNil__default = /*#__PURE__*/_interopDefaultLegacy(isNil);
28
+ var compose__default = /*#__PURE__*/_interopDefaultLegacy(compose);
29
+ var identity__default = /*#__PURE__*/_interopDefaultLegacy(identity);
30
+ var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
31
+ var pick__default = /*#__PURE__*/_interopDefaultLegacy(pick);
32
+ var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
33
+
34
+ const fillHeaderIp = ({ requestManager, }) => {
35
+ if (!requestManager) {
36
+ return identity__default["default"];
37
+ }
38
+ return (params) => {
39
+ return {
40
+ ...params,
41
+ headers: {
42
+ ...params.headers,
43
+ 'X-real-ip': requestManager.getClientIp(),
44
+ },
45
+ };
46
+ };
47
+ };
48
+ const fillHeaders = ({ requestManager, headersList, }) => {
49
+ if (!requestManager) {
50
+ return identity__default["default"];
51
+ }
52
+ const headerNames = flatten__default["default"](headersList !== null && headersList !== void 0 ? headersList : []);
53
+ return (params) => {
54
+ return {
55
+ ...params,
56
+ headers: {
57
+ ...params.headers,
58
+ ...pick__default["default"](headerNames, requestManager.getHeaders()),
59
+ },
60
+ };
61
+ };
62
+ };
63
+
64
+ const createUserAgent = ({ appInfo, envManager, }) => {
65
+ const { appName } = appInfo;
66
+ const appVersion = envManager.get('APP_VERSION');
67
+ const appRelease = envManager.get('APP_RELEASE');
68
+ const userAgent = [
69
+ 'tramvai',
70
+ appName,
71
+ appVersion && `version ${appVersion}`,
72
+ appRelease && `release ${appRelease}`,
73
+ ]
74
+ .filter(Boolean)
75
+ .join(' ');
76
+ return userAgent;
77
+ };
78
+
79
+ const environmentDependentOptions = typeof window === 'undefined'
80
+ ? {
81
+ defaultTimeout: 2000,
82
+ }
83
+ : {
84
+ defaultTimeout: 30000,
85
+ };
86
+ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, headersList, createCache, makeRequestRegistry, agent, querySerializer, disableCircuitBreaker = false, defaultOptions, commandLineExecutionContext, }) => {
87
+ return (options) => {
88
+ var _a;
89
+ if (!options.name) {
90
+ throw Error(`You need to pass a unique field "name" for the HTTP client instance`);
91
+ }
92
+ const forceDisableCache = envManager.get('HTTP_CLIENT_CACHE_DISABLED');
93
+ const forceDisabledCircuitBreaker = envManager.get('HTTP_CLIENT_CIRCUIT_BREAKER_DISABLED');
94
+ const adapterOptions = tinkoffRequestHttpClientAdapter.mergeOptions(tinkoffRequestHttpClientAdapter.mergeOptions({
95
+ logger,
96
+ agent,
97
+ querySerializer,
98
+ method: 'GET',
99
+ createCache: createCache
100
+ ? (cacheOptions) => createCache('memory', cacheOptions)
101
+ : undefined,
102
+ modifyRequest: compose__default["default"](fillHeaderIp({ requestManager }), fillHeaders({ requestManager, headersList })),
103
+ circuitBreakerOptions: {
104
+ failureThreshold: 75,
105
+ minimumFailureCount: 10,
106
+ },
107
+ signal: (_a = commandLineExecutionContext === null || commandLineExecutionContext === void 0 ? void 0 : commandLineExecutionContext()) === null || _a === void 0 ? void 0 : _a.abortSignal,
108
+ ...environmentDependentOptions,
109
+ }, defaultOptions !== null && defaultOptions !== void 0 ? defaultOptions : {}), options);
110
+ // по умолчанию, на сервере, библиотека https://github.com/node-fetch/node-fetch
111
+ // отправляет заголовок "User-Agent" вида "node-fetch".
112
+ // для улучшения логов сервисов, в которые делают запросы tramvai приложения,
113
+ // заменяем "User-Agent" на кастомный, содержащий название и версию приложения
114
+ if (typeof window === 'undefined') {
115
+ adapterOptions.headers = {
116
+ 'User-Agent': createUserAgent({ appInfo, envManager }),
117
+ ...adapterOptions.headers,
118
+ };
119
+ }
120
+ if (!isNil__default["default"](forceDisableCache)) {
121
+ adapterOptions.disableCache = !!forceDisableCache;
122
+ }
123
+ if (disableCircuitBreaker) {
124
+ adapterOptions.enableCircuitBreaker = false;
125
+ }
126
+ // environment variable in priority over disableCircuitBreaker
127
+ if (!isNil__default["default"](forceDisabledCircuitBreaker)) {
128
+ adapterOptions.enableCircuitBreaker = !forceDisabledCircuitBreaker;
129
+ }
130
+ // кэшируем инстанс @tinkoff/request
131
+ if (!makeRequestRegistry.has(adapterOptions.name)) {
132
+ makeRequestRegistry.set(adapterOptions.name, tinkoffRequestHttpClientAdapter.createTinkoffRequest(adapterOptions));
133
+ }
134
+ const makeRequest = makeRequestRegistry.get(adapterOptions.name);
135
+ const httpClientAdapter = new tinkoffRequestHttpClientAdapter.HttpClientAdapter({
136
+ options: adapterOptions,
137
+ makeRequest,
138
+ });
139
+ return httpClientAdapter;
140
+ };
141
+ };
142
+
143
+ class PapiService extends httpClient.BaseHttpClient {
144
+ constructor({ papi, di }) {
145
+ super();
146
+ this.papi = flatten__default["default"](papi || []);
147
+ this.di = di;
148
+ }
149
+ async request({ path, query, body }) {
150
+ var _a;
151
+ const papiRoute = find__default["default"]((papi$1) => papi.getPapiParameters(papi$1).path === `/${path}`, this.papi);
152
+ if (!papiRoute) {
153
+ throw new Error(`papi handler '${path}' not found`);
154
+ }
155
+ const papi$1 = papi.getPapiParameters(papiRoute);
156
+ let rootDeps = {};
157
+ if (papi$1.rootDeps) {
158
+ rootDeps = this.di.getOfDeps(papi$1.rootDeps);
159
+ rootDeps = papi$1.mapRootDeps ? papi$1.mapRootDeps(rootDeps) : rootDeps;
160
+ }
161
+ const childDI = dippy.createChildContainer(this.di);
162
+ const req = { headers: { host: 'localhost' }, cookies: {}, query, body };
163
+ const res = {};
164
+ childDI.register({
165
+ provide: moduleCommon.REQUEST,
166
+ useValue: req,
167
+ });
168
+ childDI.register({
169
+ provide: moduleCommon.RESPONSE,
170
+ useValue: res,
171
+ });
172
+ const payload = await papi.getPapiParameters(papiRoute).handler({
173
+ ...rootDeps,
174
+ ...childDI.getOfDeps((_a = papi$1.deps) !== null && _a !== void 0 ? _a : {}),
175
+ req,
176
+ res,
177
+ });
178
+ return { payload, status: 200, headers: {} };
179
+ }
180
+ }
181
+
182
+ const PapiClientModule = /* @__PURE__ */ core.Module({
183
+ providers: [
184
+ core.provide({
185
+ provide: tokensHttpClient.PAPI_SERVICE,
186
+ scope: core.Scope.SINGLETON,
187
+ useClass: PapiService,
188
+ deps: {
189
+ di: core.DI_TOKEN,
190
+ papi: { token: tokensServer.SERVER_MODULE_PAPI_PUBLIC_ROUTE, optional: true, multi: true },
191
+ },
192
+ }),
193
+ ],
194
+ })(class PapiClientModule {
195
+ });
196
+
197
+ const createCacheToken = dippy.createToken('httpClient createCache');
198
+ const HttpClientModule = /* @__PURE__ */ core.Module({
199
+ imports: [PapiClientModule],
200
+ providers: [
201
+ core.provide({
202
+ provide: tokensHttpClient.HTTP_CLIENT_FACTORY,
203
+ useFactory: httpClientFactory,
204
+ deps: {
205
+ logger: tokensCommon.LOGGER_TOKEN,
206
+ envManager: tokensCommon.ENV_MANAGER_TOKEN,
207
+ appInfo: core.APP_INFO_TOKEN,
208
+ createCache: createCacheToken,
209
+ makeRequestRegistry: 'makeRequestRegistry',
210
+ requestManager: {
211
+ token: tokensCommon.REQUEST_MANAGER_TOKEN,
212
+ optional: true,
213
+ },
214
+ headersList: {
215
+ token: tokensHttpClient.API_CLIENT_PASS_HEADERS,
216
+ optional: true,
217
+ },
218
+ agent: {
219
+ token: tokensHttpClient.HTTP_CLIENT_AGENT,
220
+ optional: true,
221
+ },
222
+ disableCircuitBreaker: {
223
+ token: tokensHttpClient.DISABLE_CIRCUIT_BREAKER,
224
+ optional: true,
225
+ },
226
+ defaultOptions: {
227
+ token: tokensHttpClient.DEFAULT_HTTP_CLIENT_FACTORY_OPTIONS,
228
+ optional: true,
229
+ },
230
+ commandLineExecutionContext: {
231
+ token: tokensCommon.COMMAND_LINE_EXECUTION_CONTEXT_TOKEN,
232
+ optional: true,
233
+ },
234
+ },
235
+ }),
236
+ core.provide({
237
+ provide: tokensHttpClient.HTTP_CLIENT,
238
+ useFactory: ({ factory }) => {
239
+ return factory({
240
+ name: 'http-client',
241
+ disableCache: true,
242
+ });
243
+ },
244
+ deps: {
245
+ factory: tokensHttpClient.HTTP_CLIENT_FACTORY,
246
+ },
247
+ }),
248
+ core.provide({
249
+ provide: tokensCommon.ENV_USED_TOKEN,
250
+ useValue: [
251
+ { key: 'HTTP_CLIENT_CACHE_DISABLED', optional: true, dehydrate: false },
252
+ { key: 'HTTP_CLIENT_CIRCUIT_BREAKER_DISABLED', optional: true, dehydrate: false },
253
+ ],
254
+ }),
255
+ /**
256
+ * хранилище для экземпляров @tinkoff/request
257
+ *
258
+ * требуется хранить экземпляры в единственном виде,
259
+ * т.к. многие плагины @tinkoff/request после инициализации имеют состояние
260
+ * (cache, circuit breaker), и не будут корректно работать на сервере,
261
+ * если создавать новые экземпляры на Scope.REQUEST
262
+ */
263
+ core.provide({
264
+ provide: 'makeRequestRegistry',
265
+ scope: core.Scope.SINGLETON,
266
+ useFactory: () => new Map(),
267
+ }),
268
+ /**
269
+ * `CREATE_CACHE_TOKEN` имеет проверку, если токен используется провайдером,
270
+ * который имеет Scope.SINGLETON, то инстанс кэша сохраняется в общее хранилище,
271
+ * и доступен для очистки через `/papi/clear-cache`.
272
+ * Scope.REQUEST игнорируется, т.к. это верная утечка памяти,
273
+ * инстансов кэши было бы неограниченное количество.
274
+ *
275
+ * HTTP клиенты создаются со Scope.REQUEST, но инстансы @tinkoff/request
276
+ * (и соответственно кэшей) создаются только один раз, благодаря `makeRequestRegistry`.
277
+ * это гарантирует отсутствие утечек памяти, поэтому мы обходим проверку
278
+ * на Scope.SINGLETON c помощью обертки `createCacheToken`
279
+ */
280
+ core.provide({
281
+ provide: createCacheToken,
282
+ scope: core.Scope.SINGLETON,
283
+ useFactory: ({ createCache }) => {
284
+ return createCache;
285
+ },
286
+ deps: {
287
+ createCache: tokensCommon.CREATE_CACHE_TOKEN,
288
+ },
289
+ }),
290
+ core.provide({
291
+ provide: tokensHttpClient.API_CLIENT_PASS_HEADERS,
292
+ useValue: ['x-request-id'],
293
+ }),
294
+ ],
295
+ })(class HttpClientModule {
296
+ });
297
+
298
+ jest.mock('node-fetch');
299
+ const { Response } = jest.requireActual('node-fetch');
300
+ const testApi = (options) => {
301
+ const caches = [];
302
+ const { modules = [], providers = [], env } = options;
303
+ const { di } = testHelpers.getDiWrapper({
304
+ di: options.di,
305
+ modules: [HttpClientModule, ...modules],
306
+ providers: [
307
+ core.provide({
308
+ provide: tokensCommon.ENV_MANAGER_TOKEN,
309
+ useValue: testMocks.createMockEnvManager(env),
310
+ }),
311
+ core.provide({
312
+ provide: tokensCommon.LOGGER_TOKEN,
313
+ useValue: testMocks.createMockLogger(),
314
+ }),
315
+ core.provide({
316
+ provide: core.APP_INFO_TOKEN,
317
+ useValue: testMocks.createMockAppInfo(),
318
+ }),
319
+ core.provide({
320
+ provide: tokensCommon.REQUEST_MANAGER_TOKEN,
321
+ useValue: testMocks.createMockRequestManager(),
322
+ }),
323
+ core.provide({
324
+ provide: tokensCommon.CREATE_CACHE_TOKEN,
325
+ useValue: () => {
326
+ const cache = testMocks.createMockCache();
327
+ caches.push(cache);
328
+ return cache;
329
+ },
330
+ }),
331
+ ...providers,
332
+ ],
333
+ });
334
+ const fetchMock = fetch__default["default"];
335
+ const clearCaches = () => {
336
+ caches.forEach((cache) => cache.clear());
337
+ };
338
+ return {
339
+ di,
340
+ fetchMock,
341
+ mockJsonResponse: async (body, init = {}) => {
342
+ clearCaches();
343
+ const { headers = {} } = init;
344
+ fetchMock.mockImplementation(() => Promise.resolve(new Response(JSON.stringify(body), {
345
+ status: 200,
346
+ ...init,
347
+ headers: {
348
+ 'content-type': 'application/json',
349
+ ...headers,
350
+ },
351
+ })));
352
+ },
353
+ clearCaches,
354
+ };
355
+ };
356
+
357
+ exports.testApi = testApi;