@tramvai/module-http-client 2.70.1 → 2.72.3
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.
- package/lib/httpClient/createUserAgent.browser.js +16 -0
- package/lib/httpClient/createUserAgent.es.js +16 -0
- package/lib/httpClient/createUserAgent.js +20 -0
- package/lib/httpClient/httpClientFactory.browser.js +72 -0
- package/lib/httpClient/httpClientFactory.es.js +72 -0
- package/lib/httpClient/httpClientFactory.js +81 -0
- package/lib/httpClientModule.browser.js +109 -0
- package/lib/httpClientModule.es.js +109 -0
- package/lib/httpClientModule.js +113 -0
- package/lib/index.browser.js +6 -235
- package/lib/index.es.js +6 -273
- package/lib/index.js +19 -289
- package/lib/papi/papiService.browser.browser.js +26 -0
- package/lib/papi/papiService.es.js +38 -0
- package/lib/papi/papiService.js +47 -0
- package/lib/papiClientModule.browser.browser.js +22 -0
- package/lib/papiClientModule.es.js +22 -0
- package/lib/papiClientModule.js +26 -0
- package/lib/utils/fillHeaders.browser.browser.js +6 -0
- package/lib/utils/fillHeaders.es.js +35 -0
- package/lib/utils/fillHeaders.js +46 -0
- package/package.json +16 -17
package/lib/index.js
CHANGED
|
@@ -2,301 +2,31 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var
|
|
6
|
-
var
|
|
5
|
+
var httpClientModule = require('./httpClientModule.js');
|
|
6
|
+
var httpClientFactory = require('./httpClient/httpClientFactory.js');
|
|
7
|
+
require('@tramvai/core');
|
|
8
|
+
require('@tramvai/tokens-server');
|
|
7
9
|
var tokensHttpClient = require('@tramvai/tokens-http-client');
|
|
8
|
-
var
|
|
9
|
-
var
|
|
10
|
-
var compose = require('@tinkoff/utils/function/compose');
|
|
11
|
-
var tinkoffRequestHttpClientAdapter = require('@tramvai/tinkoff-request-http-client-adapter');
|
|
12
|
-
var identity = require('@tinkoff/utils/function/identity');
|
|
13
|
-
var flatten = require('@tinkoff/utils/array/flatten');
|
|
14
|
-
var pick = require('@tinkoff/utils/object/pick');
|
|
15
|
-
var tokensServer = require('@tramvai/tokens-server');
|
|
16
|
-
var find = require('@tinkoff/utils/array/find');
|
|
10
|
+
var papiService = require('./papi/papiService.js');
|
|
11
|
+
var fillHeaders = require('./utils/fillHeaders.js');
|
|
17
12
|
var httpClient = require('@tramvai/http-client');
|
|
18
|
-
var papi = require('@tramvai/papi');
|
|
19
|
-
var tokensServerPrivate = require('@tramvai/tokens-server-private');
|
|
20
13
|
|
|
21
|
-
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
22
14
|
|
|
23
|
-
var isNil__default = /*#__PURE__*/_interopDefaultLegacy(isNil);
|
|
24
|
-
var compose__default = /*#__PURE__*/_interopDefaultLegacy(compose);
|
|
25
|
-
var identity__default = /*#__PURE__*/_interopDefaultLegacy(identity);
|
|
26
|
-
var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
|
|
27
|
-
var pick__default = /*#__PURE__*/_interopDefaultLegacy(pick);
|
|
28
|
-
var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
|
|
29
15
|
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
return {
|
|
36
|
-
...params,
|
|
37
|
-
headers: {
|
|
38
|
-
...params.headers,
|
|
39
|
-
'X-real-ip': requestManager.getClientIp(),
|
|
40
|
-
},
|
|
41
|
-
};
|
|
42
|
-
};
|
|
43
|
-
};
|
|
44
|
-
const fillHeaders = ({ requestManager, headersList, }) => {
|
|
45
|
-
if (!requestManager) {
|
|
46
|
-
return identity__default["default"];
|
|
47
|
-
}
|
|
48
|
-
const headerNames = flatten__default["default"](headersList !== null && headersList !== void 0 ? headersList : []);
|
|
49
|
-
return (params) => {
|
|
50
|
-
return {
|
|
51
|
-
...params,
|
|
52
|
-
headers: {
|
|
53
|
-
...params.headers,
|
|
54
|
-
...pick__default["default"](headerNames, requestManager.getHeaders()),
|
|
55
|
-
},
|
|
56
|
-
};
|
|
57
|
-
};
|
|
58
|
-
};
|
|
59
|
-
|
|
60
|
-
const createUserAgent = ({ appInfo, envManager, }) => {
|
|
61
|
-
const { appName } = appInfo;
|
|
62
|
-
const appVersion = envManager.get('APP_VERSION');
|
|
63
|
-
const appRelease = envManager.get('APP_RELEASE');
|
|
64
|
-
const userAgent = [
|
|
65
|
-
'tramvai',
|
|
66
|
-
appName,
|
|
67
|
-
appVersion && `version ${appVersion}`,
|
|
68
|
-
appRelease && `release ${appRelease}`,
|
|
69
|
-
]
|
|
70
|
-
.filter(Boolean)
|
|
71
|
-
.join(' ');
|
|
72
|
-
return userAgent;
|
|
73
|
-
};
|
|
74
|
-
|
|
75
|
-
const environmentDependentOptions = typeof window === 'undefined'
|
|
76
|
-
? {
|
|
77
|
-
defaultTimeout: 2000,
|
|
78
|
-
}
|
|
79
|
-
: {
|
|
80
|
-
defaultTimeout: 30000,
|
|
81
|
-
};
|
|
82
|
-
const httpClientFactory = ({ logger, envManager, appInfo, requestManager, headersList, createCache, makeRequestRegistry, agent, querySerializer, disableCircuitBreaker = false, defaultOptions, commandLineExecutionContext, }) => {
|
|
83
|
-
return (options) => {
|
|
84
|
-
var _a;
|
|
85
|
-
if (!options.name) {
|
|
86
|
-
throw Error(`You need to pass a unique field "name" for the HTTP client instance`);
|
|
87
|
-
}
|
|
88
|
-
const forceDisableCache = envManager.get('HTTP_CLIENT_CACHE_DISABLED');
|
|
89
|
-
const forceDisabledCircuitBreaker = envManager.get('HTTP_CLIENT_CIRCUIT_BREAKER_DISABLED');
|
|
90
|
-
const adapterOptions = tinkoffRequestHttpClientAdapter.mergeOptions(tinkoffRequestHttpClientAdapter.mergeOptions({
|
|
91
|
-
logger,
|
|
92
|
-
agent,
|
|
93
|
-
querySerializer,
|
|
94
|
-
method: 'GET',
|
|
95
|
-
createCache: createCache
|
|
96
|
-
? (cacheOptions) => createCache('memory', cacheOptions)
|
|
97
|
-
: undefined,
|
|
98
|
-
modifyRequest: compose__default["default"](fillHeaderIp({ requestManager }), fillHeaders({ requestManager, headersList })),
|
|
99
|
-
circuitBreakerOptions: {
|
|
100
|
-
failureThreshold: 75,
|
|
101
|
-
minimumFailureCount: 10,
|
|
102
|
-
},
|
|
103
|
-
// TODO: remove any after [resolving](https://github.com/southpolesteve/node-abort-controller/issues/31)
|
|
104
|
-
signal: (_a = commandLineExecutionContext === null || commandLineExecutionContext === void 0 ? void 0 : commandLineExecutionContext()) === null || _a === void 0 ? void 0 : _a.abortSignal,
|
|
105
|
-
...environmentDependentOptions,
|
|
106
|
-
}, defaultOptions !== null && defaultOptions !== void 0 ? defaultOptions : {}), options);
|
|
107
|
-
// по умолчанию, на сервере, библиотека https://github.com/node-fetch/node-fetch
|
|
108
|
-
// отправляет заголовок "User-Agent" вида "node-fetch".
|
|
109
|
-
// для улучшения логов сервисов, в которые делают запросы tramvai приложения,
|
|
110
|
-
// заменяем "User-Agent" на кастомный, содержащий название и версию приложения
|
|
111
|
-
if (typeof window === 'undefined') {
|
|
112
|
-
adapterOptions.headers = {
|
|
113
|
-
'User-Agent': createUserAgent({ appInfo, envManager }),
|
|
114
|
-
...adapterOptions.headers,
|
|
115
|
-
};
|
|
116
|
-
}
|
|
117
|
-
if (!isNil__default["default"](forceDisableCache)) {
|
|
118
|
-
adapterOptions.disableCache = !!forceDisableCache;
|
|
119
|
-
}
|
|
120
|
-
if (disableCircuitBreaker) {
|
|
121
|
-
adapterOptions.enableCircuitBreaker = false;
|
|
122
|
-
}
|
|
123
|
-
// environment variable in priority over disableCircuitBreaker
|
|
124
|
-
if (!isNil__default["default"](forceDisabledCircuitBreaker)) {
|
|
125
|
-
adapterOptions.enableCircuitBreaker = !forceDisabledCircuitBreaker;
|
|
126
|
-
}
|
|
127
|
-
// кэшируем инстанс @tinkoff/request
|
|
128
|
-
if (!makeRequestRegistry.has(adapterOptions.name)) {
|
|
129
|
-
makeRequestRegistry.set(adapterOptions.name, tinkoffRequestHttpClientAdapter.createTinkoffRequest(adapterOptions));
|
|
130
|
-
}
|
|
131
|
-
const makeRequest = makeRequestRegistry.get(adapterOptions.name);
|
|
132
|
-
const httpClientAdapter = new tinkoffRequestHttpClientAdapter.HttpClientAdapter({
|
|
133
|
-
options: adapterOptions,
|
|
134
|
-
makeRequest,
|
|
135
|
-
});
|
|
136
|
-
return httpClientAdapter;
|
|
137
|
-
};
|
|
138
|
-
};
|
|
139
|
-
|
|
140
|
-
class PapiService extends httpClient.BaseHttpClient {
|
|
141
|
-
constructor({ papi, di }) {
|
|
142
|
-
super();
|
|
143
|
-
this.papi = flatten__default["default"](papi || []);
|
|
144
|
-
this.di = di;
|
|
145
|
-
}
|
|
146
|
-
async request({ path, query, body }) {
|
|
147
|
-
var _a;
|
|
148
|
-
const papiRoute = find__default["default"]((papi$1) => papi.getPapiParameters(papi$1).path === `/${path}`, (_a = this.papi) !== null && _a !== void 0 ? _a : []);
|
|
149
|
-
if (!papiRoute) {
|
|
150
|
-
throw new Error(`papi handler '${path}' not found`);
|
|
151
|
-
}
|
|
152
|
-
const req = { headers: { host: 'localhost' }, cookies: {}, query, body };
|
|
153
|
-
const res = {};
|
|
154
|
-
const childDi = dippy.createChildContainer(this.di, [
|
|
155
|
-
{
|
|
156
|
-
provide: tokensServerPrivate.FASTIFY_REQUEST,
|
|
157
|
-
useValue: req,
|
|
158
|
-
},
|
|
159
|
-
{
|
|
160
|
-
provide: tokensServerPrivate.FASTIFY_RESPONSE,
|
|
161
|
-
useValue: res,
|
|
162
|
-
},
|
|
163
|
-
]);
|
|
164
|
-
const papiExecutor = childDi.get(tokensServerPrivate.PAPI_EXECUTOR);
|
|
165
|
-
const payload = await papiExecutor(papiRoute);
|
|
166
|
-
return { payload, status: 200, headers: {} };
|
|
167
|
-
}
|
|
168
|
-
}
|
|
169
|
-
|
|
170
|
-
const PapiClientModule = /* @__PURE__ */ core.Module({
|
|
171
|
-
providers: [
|
|
172
|
-
core.provide({
|
|
173
|
-
provide: tokensHttpClient.PAPI_SERVICE,
|
|
174
|
-
scope: core.Scope.SINGLETON,
|
|
175
|
-
useClass: PapiService,
|
|
176
|
-
deps: {
|
|
177
|
-
di: core.DI_TOKEN,
|
|
178
|
-
papi: { token: tokensServer.SERVER_MODULE_PAPI_PUBLIC_ROUTE, optional: true },
|
|
179
|
-
},
|
|
180
|
-
}),
|
|
181
|
-
],
|
|
182
|
-
})(class PapiClientModule {
|
|
183
|
-
});
|
|
184
|
-
|
|
185
|
-
const createCacheToken = dippy.createToken('httpClient createCache');
|
|
186
|
-
const HttpClientModule = /* @__PURE__ */ core.Module({
|
|
187
|
-
imports: [PapiClientModule],
|
|
188
|
-
providers: [
|
|
189
|
-
core.provide({
|
|
190
|
-
provide: tokensHttpClient.HTTP_CLIENT_FACTORY,
|
|
191
|
-
useFactory: httpClientFactory,
|
|
192
|
-
deps: {
|
|
193
|
-
logger: tokensCommon.LOGGER_TOKEN,
|
|
194
|
-
envManager: tokensCommon.ENV_MANAGER_TOKEN,
|
|
195
|
-
appInfo: core.APP_INFO_TOKEN,
|
|
196
|
-
createCache: createCacheToken,
|
|
197
|
-
makeRequestRegistry: 'makeRequestRegistry',
|
|
198
|
-
requestManager: {
|
|
199
|
-
token: tokensCommon.REQUEST_MANAGER_TOKEN,
|
|
200
|
-
optional: true,
|
|
201
|
-
},
|
|
202
|
-
headersList: {
|
|
203
|
-
token: tokensHttpClient.API_CLIENT_PASS_HEADERS,
|
|
204
|
-
optional: true,
|
|
205
|
-
},
|
|
206
|
-
agent: {
|
|
207
|
-
token: tokensHttpClient.HTTP_CLIENT_AGENT,
|
|
208
|
-
optional: true,
|
|
209
|
-
},
|
|
210
|
-
disableCircuitBreaker: {
|
|
211
|
-
token: tokensHttpClient.DISABLE_CIRCUIT_BREAKER,
|
|
212
|
-
optional: true,
|
|
213
|
-
},
|
|
214
|
-
defaultOptions: {
|
|
215
|
-
token: tokensHttpClient.DEFAULT_HTTP_CLIENT_FACTORY_OPTIONS,
|
|
216
|
-
optional: true,
|
|
217
|
-
},
|
|
218
|
-
commandLineExecutionContext: {
|
|
219
|
-
token: tokensCommon.COMMAND_LINE_EXECUTION_CONTEXT_TOKEN,
|
|
220
|
-
optional: true,
|
|
221
|
-
},
|
|
222
|
-
},
|
|
223
|
-
}),
|
|
224
|
-
core.provide({
|
|
225
|
-
provide: tokensHttpClient.HTTP_CLIENT,
|
|
226
|
-
useFactory: ({ factory }) => {
|
|
227
|
-
return factory({
|
|
228
|
-
name: 'http-client',
|
|
229
|
-
disableCache: true,
|
|
230
|
-
});
|
|
231
|
-
},
|
|
232
|
-
deps: {
|
|
233
|
-
factory: tokensHttpClient.HTTP_CLIENT_FACTORY,
|
|
234
|
-
},
|
|
235
|
-
}),
|
|
236
|
-
core.provide({
|
|
237
|
-
provide: tokensCommon.ENV_USED_TOKEN,
|
|
238
|
-
useValue: [
|
|
239
|
-
{ key: 'HTTP_CLIENT_CACHE_DISABLED', optional: true, dehydrate: false },
|
|
240
|
-
{ key: 'HTTP_CLIENT_CIRCUIT_BREAKER_DISABLED', optional: true, dehydrate: false },
|
|
241
|
-
],
|
|
242
|
-
}),
|
|
243
|
-
/**
|
|
244
|
-
* хранилище для экземпляров @tinkoff/request
|
|
245
|
-
*
|
|
246
|
-
* требуется хранить экземпляры в единственном виде,
|
|
247
|
-
* т.к. многие плагины @tinkoff/request после инициализации имеют состояние
|
|
248
|
-
* (cache, circuit breaker), и не будут корректно работать на сервере,
|
|
249
|
-
* если создавать новые экземпляры на Scope.REQUEST
|
|
250
|
-
*/
|
|
251
|
-
core.provide({
|
|
252
|
-
provide: 'makeRequestRegistry',
|
|
253
|
-
scope: core.Scope.SINGLETON,
|
|
254
|
-
useFactory: () => new Map(),
|
|
255
|
-
}),
|
|
256
|
-
/**
|
|
257
|
-
* `CREATE_CACHE_TOKEN` имеет проверку, если токен используется провайдером,
|
|
258
|
-
* который имеет Scope.SINGLETON, то инстанс кэша сохраняется в общее хранилище,
|
|
259
|
-
* и доступен для очистки через `/papi/clear-cache`.
|
|
260
|
-
* Scope.REQUEST игнорируется, т.к. это верная утечка памяти,
|
|
261
|
-
* инстансов кэши было бы неограниченное количество.
|
|
262
|
-
*
|
|
263
|
-
* HTTP клиенты создаются со Scope.REQUEST, но инстансы @tinkoff/request
|
|
264
|
-
* (и соответственно кэшей) создаются только один раз, благодаря `makeRequestRegistry`.
|
|
265
|
-
* это гарантирует отсутствие утечек памяти, поэтому мы обходим проверку
|
|
266
|
-
* на Scope.SINGLETON c помощью обертки `createCacheToken`
|
|
267
|
-
*/
|
|
268
|
-
core.provide({
|
|
269
|
-
provide: createCacheToken,
|
|
270
|
-
scope: core.Scope.SINGLETON,
|
|
271
|
-
useFactory: ({ createCache }) => {
|
|
272
|
-
return createCache;
|
|
273
|
-
},
|
|
274
|
-
deps: {
|
|
275
|
-
createCache: tokensCommon.CREATE_CACHE_TOKEN,
|
|
276
|
-
},
|
|
277
|
-
}),
|
|
278
|
-
core.provide({
|
|
279
|
-
provide: tokensHttpClient.API_CLIENT_PASS_HEADERS,
|
|
280
|
-
useValue: ['x-request-id'],
|
|
281
|
-
}),
|
|
282
|
-
],
|
|
283
|
-
})(class HttpClientModule {
|
|
284
|
-
});
|
|
285
|
-
|
|
286
|
-
exports.HttpClientModule = HttpClientModule;
|
|
287
|
-
exports.PapiService = PapiService;
|
|
288
|
-
exports.fillHeaderIp = fillHeaderIp;
|
|
289
|
-
exports.fillHeaders = fillHeaders;
|
|
290
|
-
exports.httpClientFactory = httpClientFactory;
|
|
16
|
+
exports.HttpClientModule = httpClientModule.HttpClientModule;
|
|
17
|
+
exports.httpClientFactory = httpClientFactory.httpClientFactory;
|
|
18
|
+
exports.PapiService = papiService.PapiService;
|
|
19
|
+
exports.fillHeaderIp = fillHeaders.fillHeaderIp;
|
|
20
|
+
exports.fillHeaders = fillHeaders.fillHeaders;
|
|
291
21
|
Object.keys(tokensHttpClient).forEach(function (k) {
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
22
|
+
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
|
|
23
|
+
enumerable: true,
|
|
24
|
+
get: function () { return tokensHttpClient[k]; }
|
|
25
|
+
});
|
|
296
26
|
});
|
|
297
27
|
Object.keys(httpClient).forEach(function (k) {
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
28
|
+
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
|
|
29
|
+
enumerable: true,
|
|
30
|
+
get: function () { return httpClient[k]; }
|
|
31
|
+
});
|
|
302
32
|
});
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import prop from '@tinkoff/utils/object/prop';
|
|
2
|
+
import { ApiService } from '@tramvai/http-client';
|
|
3
|
+
|
|
4
|
+
class PapiService extends ApiService {
|
|
5
|
+
constructor({ httpClientFactory, baseUrl }) {
|
|
6
|
+
const httpClient = httpClientFactory({
|
|
7
|
+
name: 'papi',
|
|
8
|
+
baseUrl,
|
|
9
|
+
validator: ({ response }) => {
|
|
10
|
+
if (response.resultCode && response.payload) {
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
return response.error || new Error(JSON.stringify(response));
|
|
14
|
+
},
|
|
15
|
+
modifyResponse(response) {
|
|
16
|
+
return {
|
|
17
|
+
...response,
|
|
18
|
+
payload: prop('payload', response.payload),
|
|
19
|
+
};
|
|
20
|
+
},
|
|
21
|
+
});
|
|
22
|
+
super(httpClient);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
export { PapiService };
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import find from '@tinkoff/utils/array/find';
|
|
2
|
+
import flatten from '@tinkoff/utils/array/flatten';
|
|
3
|
+
import { BaseHttpClient } from '@tramvai/http-client';
|
|
4
|
+
import { createChildContainer } from '@tinkoff/dippy';
|
|
5
|
+
import { getPapiParameters } from '@tramvai/papi';
|
|
6
|
+
import { FASTIFY_REQUEST, FASTIFY_RESPONSE, PAPI_EXECUTOR } from '@tramvai/tokens-server-private';
|
|
7
|
+
|
|
8
|
+
class PapiService extends BaseHttpClient {
|
|
9
|
+
constructor({ papi, di }) {
|
|
10
|
+
super();
|
|
11
|
+
this.papi = flatten(papi || []);
|
|
12
|
+
this.di = di;
|
|
13
|
+
}
|
|
14
|
+
async request({ path, query, body }) {
|
|
15
|
+
var _a;
|
|
16
|
+
const papiRoute = find((papi) => getPapiParameters(papi).path === `/${path}`, (_a = this.papi) !== null && _a !== void 0 ? _a : []);
|
|
17
|
+
if (!papiRoute) {
|
|
18
|
+
throw new Error(`papi handler '${path}' not found`);
|
|
19
|
+
}
|
|
20
|
+
const req = { headers: { host: 'localhost' }, cookies: {}, query, body };
|
|
21
|
+
const res = {};
|
|
22
|
+
const childDi = createChildContainer(this.di, [
|
|
23
|
+
{
|
|
24
|
+
provide: FASTIFY_REQUEST,
|
|
25
|
+
useValue: req,
|
|
26
|
+
},
|
|
27
|
+
{
|
|
28
|
+
provide: FASTIFY_RESPONSE,
|
|
29
|
+
useValue: res,
|
|
30
|
+
},
|
|
31
|
+
]);
|
|
32
|
+
const papiExecutor = childDi.get(PAPI_EXECUTOR);
|
|
33
|
+
const payload = await papiExecutor(papiRoute);
|
|
34
|
+
return { payload, status: 200, headers: {} };
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
export { PapiService };
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
|
+
|
|
5
|
+
var find = require('@tinkoff/utils/array/find');
|
|
6
|
+
var flatten = require('@tinkoff/utils/array/flatten');
|
|
7
|
+
var httpClient = require('@tramvai/http-client');
|
|
8
|
+
var dippy = require('@tinkoff/dippy');
|
|
9
|
+
var papi = require('@tramvai/papi');
|
|
10
|
+
var tokensServerPrivate = require('@tramvai/tokens-server-private');
|
|
11
|
+
|
|
12
|
+
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
13
|
+
|
|
14
|
+
var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
|
|
15
|
+
var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
|
|
16
|
+
|
|
17
|
+
class PapiService extends httpClient.BaseHttpClient {
|
|
18
|
+
constructor({ papi, di }) {
|
|
19
|
+
super();
|
|
20
|
+
this.papi = flatten__default["default"](papi || []);
|
|
21
|
+
this.di = di;
|
|
22
|
+
}
|
|
23
|
+
async request({ path, query, body }) {
|
|
24
|
+
var _a;
|
|
25
|
+
const papiRoute = find__default["default"]((papi$1) => papi.getPapiParameters(papi$1).path === `/${path}`, (_a = this.papi) !== null && _a !== void 0 ? _a : []);
|
|
26
|
+
if (!papiRoute) {
|
|
27
|
+
throw new Error(`papi handler '${path}' not found`);
|
|
28
|
+
}
|
|
29
|
+
const req = { headers: { host: 'localhost' }, cookies: {}, query, body };
|
|
30
|
+
const res = {};
|
|
31
|
+
const childDi = dippy.createChildContainer(this.di, [
|
|
32
|
+
{
|
|
33
|
+
provide: tokensServerPrivate.FASTIFY_REQUEST,
|
|
34
|
+
useValue: req,
|
|
35
|
+
},
|
|
36
|
+
{
|
|
37
|
+
provide: tokensServerPrivate.FASTIFY_RESPONSE,
|
|
38
|
+
useValue: res,
|
|
39
|
+
},
|
|
40
|
+
]);
|
|
41
|
+
const papiExecutor = childDi.get(tokensServerPrivate.PAPI_EXECUTOR);
|
|
42
|
+
const payload = await papiExecutor(papiRoute);
|
|
43
|
+
return { payload, status: 200, headers: {} };
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
exports.PapiService = PapiService;
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { Module, provide, Scope } from '@tramvai/core';
|
|
2
|
+
import { SERVER_MODULE_PAPI_PUBLIC_URL } from '@tramvai/tokens-server';
|
|
3
|
+
import { PAPI_SERVICE, HTTP_CLIENT_FACTORY } from '@tramvai/tokens-http-client';
|
|
4
|
+
import { PapiService } from './papi/papiService.browser.browser.js';
|
|
5
|
+
export { PapiService } from './papi/papiService.browser.browser.js';
|
|
6
|
+
|
|
7
|
+
const PapiClientModule = /* @__PURE__ */ Module({
|
|
8
|
+
providers: [
|
|
9
|
+
provide({
|
|
10
|
+
provide: PAPI_SERVICE,
|
|
11
|
+
scope: Scope.SINGLETON,
|
|
12
|
+
useClass: PapiService,
|
|
13
|
+
deps: {
|
|
14
|
+
httpClientFactory: HTTP_CLIENT_FACTORY,
|
|
15
|
+
baseUrl: SERVER_MODULE_PAPI_PUBLIC_URL,
|
|
16
|
+
},
|
|
17
|
+
}),
|
|
18
|
+
],
|
|
19
|
+
})(class PapiClientModule {
|
|
20
|
+
});
|
|
21
|
+
|
|
22
|
+
export { PapiClientModule };
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { Module, provide, Scope, DI_TOKEN } from '@tramvai/core';
|
|
2
|
+
import { SERVER_MODULE_PAPI_PUBLIC_ROUTE } from '@tramvai/tokens-server';
|
|
3
|
+
import { PAPI_SERVICE } from '@tramvai/tokens-http-client';
|
|
4
|
+
import { PapiService } from './papi/papiService.es.js';
|
|
5
|
+
export { PapiService } from './papi/papiService.es.js';
|
|
6
|
+
|
|
7
|
+
const PapiClientModule = /* @__PURE__ */ Module({
|
|
8
|
+
providers: [
|
|
9
|
+
provide({
|
|
10
|
+
provide: PAPI_SERVICE,
|
|
11
|
+
scope: Scope.SINGLETON,
|
|
12
|
+
useClass: PapiService,
|
|
13
|
+
deps: {
|
|
14
|
+
di: DI_TOKEN,
|
|
15
|
+
papi: { token: SERVER_MODULE_PAPI_PUBLIC_ROUTE, optional: true },
|
|
16
|
+
},
|
|
17
|
+
}),
|
|
18
|
+
],
|
|
19
|
+
})(class PapiClientModule {
|
|
20
|
+
});
|
|
21
|
+
|
|
22
|
+
export { PapiClientModule };
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
|
+
|
|
5
|
+
var core = require('@tramvai/core');
|
|
6
|
+
var tokensServer = require('@tramvai/tokens-server');
|
|
7
|
+
var tokensHttpClient = require('@tramvai/tokens-http-client');
|
|
8
|
+
var papiService = require('./papi/papiService.js');
|
|
9
|
+
|
|
10
|
+
const PapiClientModule = /* @__PURE__ */ core.Module({
|
|
11
|
+
providers: [
|
|
12
|
+
core.provide({
|
|
13
|
+
provide: tokensHttpClient.PAPI_SERVICE,
|
|
14
|
+
scope: core.Scope.SINGLETON,
|
|
15
|
+
useClass: papiService.PapiService,
|
|
16
|
+
deps: {
|
|
17
|
+
di: core.DI_TOKEN,
|
|
18
|
+
papi: { token: tokensServer.SERVER_MODULE_PAPI_PUBLIC_ROUTE, optional: true },
|
|
19
|
+
},
|
|
20
|
+
}),
|
|
21
|
+
],
|
|
22
|
+
})(class PapiClientModule {
|
|
23
|
+
});
|
|
24
|
+
|
|
25
|
+
exports.PapiService = papiService.PapiService;
|
|
26
|
+
exports.PapiClientModule = PapiClientModule;
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import identity from '@tinkoff/utils/function/identity';
|
|
2
|
+
import flatten from '@tinkoff/utils/array/flatten';
|
|
3
|
+
import pick from '@tinkoff/utils/object/pick';
|
|
4
|
+
|
|
5
|
+
const fillHeaderIp = ({ requestManager, }) => {
|
|
6
|
+
if (!requestManager) {
|
|
7
|
+
return identity;
|
|
8
|
+
}
|
|
9
|
+
return (params) => {
|
|
10
|
+
return {
|
|
11
|
+
...params,
|
|
12
|
+
headers: {
|
|
13
|
+
...params.headers,
|
|
14
|
+
'X-real-ip': requestManager.getClientIp(),
|
|
15
|
+
},
|
|
16
|
+
};
|
|
17
|
+
};
|
|
18
|
+
};
|
|
19
|
+
const fillHeaders = ({ requestManager, headersList, }) => {
|
|
20
|
+
if (!requestManager) {
|
|
21
|
+
return identity;
|
|
22
|
+
}
|
|
23
|
+
const headerNames = flatten(headersList !== null && headersList !== void 0 ? headersList : []);
|
|
24
|
+
return (params) => {
|
|
25
|
+
return {
|
|
26
|
+
...params,
|
|
27
|
+
headers: {
|
|
28
|
+
...params.headers,
|
|
29
|
+
...pick(headerNames, requestManager.getHeaders()),
|
|
30
|
+
},
|
|
31
|
+
};
|
|
32
|
+
};
|
|
33
|
+
};
|
|
34
|
+
|
|
35
|
+
export { fillHeaderIp, fillHeaders };
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
|
+
|
|
5
|
+
var identity = require('@tinkoff/utils/function/identity');
|
|
6
|
+
var flatten = require('@tinkoff/utils/array/flatten');
|
|
7
|
+
var pick = require('@tinkoff/utils/object/pick');
|
|
8
|
+
|
|
9
|
+
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
10
|
+
|
|
11
|
+
var identity__default = /*#__PURE__*/_interopDefaultLegacy(identity);
|
|
12
|
+
var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
|
|
13
|
+
var pick__default = /*#__PURE__*/_interopDefaultLegacy(pick);
|
|
14
|
+
|
|
15
|
+
const fillHeaderIp = ({ requestManager, }) => {
|
|
16
|
+
if (!requestManager) {
|
|
17
|
+
return identity__default["default"];
|
|
18
|
+
}
|
|
19
|
+
return (params) => {
|
|
20
|
+
return {
|
|
21
|
+
...params,
|
|
22
|
+
headers: {
|
|
23
|
+
...params.headers,
|
|
24
|
+
'X-real-ip': requestManager.getClientIp(),
|
|
25
|
+
},
|
|
26
|
+
};
|
|
27
|
+
};
|
|
28
|
+
};
|
|
29
|
+
const fillHeaders = ({ requestManager, headersList, }) => {
|
|
30
|
+
if (!requestManager) {
|
|
31
|
+
return identity__default["default"];
|
|
32
|
+
}
|
|
33
|
+
const headerNames = flatten__default["default"](headersList !== null && headersList !== void 0 ? headersList : []);
|
|
34
|
+
return (params) => {
|
|
35
|
+
return {
|
|
36
|
+
...params,
|
|
37
|
+
headers: {
|
|
38
|
+
...params.headers,
|
|
39
|
+
...pick__default["default"](headerNames, requestManager.getHeaders()),
|
|
40
|
+
},
|
|
41
|
+
};
|
|
42
|
+
};
|
|
43
|
+
};
|
|
44
|
+
|
|
45
|
+
exports.fillHeaderIp = fillHeaderIp;
|
|
46
|
+
exports.fillHeaders = fillHeaders;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tramvai/module-http-client",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.72.3",
|
|
4
4
|
"initialVersion": "0.58.99",
|
|
5
5
|
"description": "",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -21,17 +21,16 @@
|
|
|
21
21
|
"url": "git@github.com:Tinkoff/tramvai.git"
|
|
22
22
|
},
|
|
23
23
|
"scripts": {
|
|
24
|
-
"build": "tramvai-build --
|
|
25
|
-
"watch": "tsc -w"
|
|
26
|
-
"build-for-publish": "true"
|
|
24
|
+
"build": "tramvai-build --forPublish --preserveModules",
|
|
25
|
+
"watch": "tsc -w"
|
|
27
26
|
},
|
|
28
27
|
"dependencies": {
|
|
29
|
-
"@tramvai/http-client": "0.2.
|
|
30
|
-
"@tramvai/tinkoff-request-http-client-adapter": "0.9.
|
|
31
|
-
"@tramvai/tokens-http-client": "2.
|
|
32
|
-
"@tramvai/tokens-common": "2.
|
|
33
|
-
"@tramvai/tokens-server": "2.
|
|
34
|
-
"@tramvai/tokens-server-private": "2.
|
|
28
|
+
"@tramvai/http-client": "0.2.6",
|
|
29
|
+
"@tramvai/tinkoff-request-http-client-adapter": "0.9.181",
|
|
30
|
+
"@tramvai/tokens-http-client": "2.72.3",
|
|
31
|
+
"@tramvai/tokens-common": "2.72.3",
|
|
32
|
+
"@tramvai/tokens-server": "2.72.3",
|
|
33
|
+
"@tramvai/tokens-server-private": "2.72.3"
|
|
35
34
|
},
|
|
36
35
|
"devDependencies": {
|
|
37
36
|
"@tinkoff/request-core": "^0.9.2",
|
|
@@ -40,13 +39,13 @@
|
|
|
40
39
|
},
|
|
41
40
|
"peerDependencies": {
|
|
42
41
|
"@tinkoff/utils": "^2.1.2",
|
|
43
|
-
"@tramvai/core": "2.
|
|
44
|
-
"@tramvai/module-common": "2.
|
|
45
|
-
"@tramvai/papi": "2.
|
|
46
|
-
"@tramvai/test-helpers": "2.
|
|
47
|
-
"@tramvai/test-unit": "2.
|
|
48
|
-
"@tramvai/test-mocks": "2.
|
|
49
|
-
"@tinkoff/dippy": "0.8.
|
|
42
|
+
"@tramvai/core": "2.72.3",
|
|
43
|
+
"@tramvai/module-common": "2.72.3",
|
|
44
|
+
"@tramvai/papi": "2.72.3",
|
|
45
|
+
"@tramvai/test-helpers": "2.72.3",
|
|
46
|
+
"@tramvai/test-unit": "2.72.3",
|
|
47
|
+
"@tramvai/test-mocks": "2.72.3",
|
|
48
|
+
"@tinkoff/dippy": "0.8.13",
|
|
50
49
|
"node-fetch": "^2.6.1",
|
|
51
50
|
"tslib": "^2.4.0"
|
|
52
51
|
},
|