@sima-land/isomorph 11.0.0-alpha.20 → 11.0.0-alpha.23
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/config/node.js +1 -0
- package/config/node.js.map +1 -1
- package/config/types.d.ts +4 -0
- package/error-tracking/types.d.ts +2 -2
- package/http-client/middleware/logging.d.ts +2 -2
- package/http-client/middleware/logging.js +14 -15
- package/http-client/middleware/logging.js.map +1 -1
- package/http-client/middleware/tracing.d.ts +3 -3
- package/http-client/middleware/tracing.js +13 -8
- package/http-client/middleware/tracing.js.map +1 -1
- package/http-client/utils.d.ts +6 -7
- package/http-client/utils.js +24 -14
- package/http-client/utils.js.map +1 -1
- package/http-server/template/index.js +5 -6
- package/http-server/template/index.js.map +1 -1
- package/http-server/utils.d.ts +8 -0
- package/http-server/utils.js +16 -1
- package/http-server/utils.js.map +1 -1
- package/logger/handler/console.js +4 -1
- package/logger/handler/console.js.map +1 -1
- package/package.json +29 -24
- package/preset/browser/index.d.ts +2 -0
- package/preset/browser/index.js +16 -4
- package/preset/browser/index.js.map +1 -1
- package/preset/node/index.js +3 -1
- package/preset/node/index.js.map +1 -1
- package/preset/node/response.js +14 -6
- package/preset/node/response.js.map +1 -1
- package/tokens.d.ts +3 -3
- package/tokens.js +1 -0
- package/tokens.js.map +1 -1
- package/utils/webpack/index.js +3 -1
- package/utils/webpack/index.js.map +1 -1
package/config/node.js
CHANGED
|
@@ -20,6 +20,7 @@ function createConfigSource() {
|
|
|
20
20
|
// после подключения env-файла формируем источник данных окружения
|
|
21
21
|
const source = { ...process.env };
|
|
22
22
|
// докидываем зашиваемые переменные окружения
|
|
23
|
+
// @todo возможно стоит делать так чтобы переменные из process.env имели приоритет
|
|
23
24
|
if (typeof __ISOMORPH_ENV__ !== 'undefined') {
|
|
24
25
|
Object.assign(source, __ISOMORPH_ENV__);
|
|
25
26
|
}
|
package/config/node.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/config/node.ts"],"names":[],"mappings":";;;;;;AACA,4CAAyC;AACzC,mCAAgC;AAChC,gDAAwB;AAIxB;;;GAGG;AACH,SAAgB,kBAAkB;IAChC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;IAErC,mEAAmE;IACnE,IAAI,OAAO,EAAE;QACX,IAAA,eAAM,EAAC,EAAE,IAAI,EAAE,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;KACpE;IAED,kEAAkE;IAClE,MAAM,MAAM,GAAuC,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAEtE,6CAA6C;IAC7C,IAAI,OAAO,gBAAgB,KAAK,WAAW,EAAE;QAC3C,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;KACzC;IAED,OAAO,IAAI,SAAG,CAAC,MAAM,CAAC,CAAC;AACzB,CAAC;
|
|
1
|
+
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/config/node.ts"],"names":[],"mappings":";;;;;;AACA,4CAAyC;AACzC,mCAAgC;AAChC,gDAAwB;AAIxB;;;GAGG;AACH,SAAgB,kBAAkB;IAChC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;IAErC,mEAAmE;IACnE,IAAI,OAAO,EAAE;QACX,IAAA,eAAM,EAAC,EAAE,IAAI,EAAE,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;KACpE;IAED,kEAAkE;IAClE,MAAM,MAAM,GAAuC,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAEtE,6CAA6C;IAC7C,kFAAkF;IAClF,IAAI,OAAO,gBAAgB,KAAK,WAAW,EAAE;QAC3C,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;KACzC;IAED,OAAO,IAAI,SAAG,CAAC,MAAM,CAAC,CAAC;AACzB,CAAC;AAlBD,gDAkBC"}
|
package/config/types.d.ts
CHANGED
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
import type { Env } from '@humanwhocodes/env';
|
|
2
|
+
/** Источник конфигурации. */
|
|
2
3
|
export declare type ConfigSource = Env;
|
|
3
4
|
/**
|
|
4
5
|
* Базовая информация о приложении, необходимая в большинстве мест.
|
|
5
6
|
*/
|
|
6
7
|
export interface BaseConfig {
|
|
8
|
+
/** Строка, характеризующая среду выполнения, например "production". */
|
|
7
9
|
env: string;
|
|
10
|
+
/** Имя приложения. */
|
|
8
11
|
appName: string;
|
|
12
|
+
/** Версия приложения. */
|
|
9
13
|
appVersion: string;
|
|
10
14
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { SeverityLevel, Context, Extra, Breadcrumb } from '@sentry/types';
|
|
2
2
|
/**
|
|
3
3
|
* Данные ошибки для Sentry.
|
|
4
4
|
*/
|
|
5
5
|
export interface SentryErrorData {
|
|
6
|
-
level?:
|
|
6
|
+
level?: SeverityLevel;
|
|
7
7
|
context?: {
|
|
8
8
|
key: string;
|
|
9
9
|
data: Context | null;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Middleware } from 'middleware-axios';
|
|
2
2
|
import { Logger } from '../../logger/types';
|
|
3
|
-
import {
|
|
3
|
+
import { SeverityLevel } from '@sentry/types';
|
|
4
4
|
/**
|
|
5
5
|
* Возвращает новый middleware для логирования запросов.
|
|
6
6
|
* @param logger Логгер.
|
|
@@ -13,4 +13,4 @@ export declare function loggingMiddleware(logger: Logger): Middleware<any>;
|
|
|
13
13
|
* @param status Статус.
|
|
14
14
|
* @return Уровень.
|
|
15
15
|
*/
|
|
16
|
-
export declare function severityFromStatus(status: number | undefined):
|
|
16
|
+
export declare function severityFromStatus(status: number | undefined): SeverityLevel;
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.severityFromStatus = exports.loggingMiddleware = void 0;
|
|
7
7
|
const axios_1 = __importDefault(require("axios"));
|
|
8
8
|
const error_tracking_1 = require("../../error-tracking");
|
|
9
|
-
const
|
|
9
|
+
const utils_1 = require("../utils");
|
|
10
10
|
/**
|
|
11
11
|
* Возвращает новый middleware для логирования запросов.
|
|
12
12
|
* @param logger Логгер.
|
|
@@ -16,9 +16,7 @@ function loggingMiddleware(logger) {
|
|
|
16
16
|
return async function log(config, next, defaults) {
|
|
17
17
|
const { baseURL, url, method = 'get', params, data } = { ...defaults, ...config };
|
|
18
18
|
const readyMethod = method.toUpperCase();
|
|
19
|
-
const readyURL = baseURL
|
|
20
|
-
? `${baseURL.replace(/\/$/, '')}/${(url || '').replace(/^\//, '')}`
|
|
21
|
-
: url;
|
|
19
|
+
const readyURL = (0, utils_1.displayUrl)(baseURL, url);
|
|
22
20
|
try {
|
|
23
21
|
logger.info(new error_tracking_1.SentryBreadcrumb({
|
|
24
22
|
category: 'http.request',
|
|
@@ -26,9 +24,9 @@ function loggingMiddleware(logger) {
|
|
|
26
24
|
data: {
|
|
27
25
|
url: readyURL,
|
|
28
26
|
method: readyMethod,
|
|
29
|
-
params,
|
|
27
|
+
...(params && { params }),
|
|
30
28
|
},
|
|
31
|
-
level:
|
|
29
|
+
level: 'info',
|
|
32
30
|
}));
|
|
33
31
|
const response = await next(config);
|
|
34
32
|
logger.info(new error_tracking_1.SentryBreadcrumb({
|
|
@@ -38,20 +36,21 @@ function loggingMiddleware(logger) {
|
|
|
38
36
|
url: readyURL,
|
|
39
37
|
status_code: response.status,
|
|
40
38
|
method: readyMethod,
|
|
41
|
-
params,
|
|
39
|
+
...(params && { params }),
|
|
42
40
|
},
|
|
43
|
-
level:
|
|
41
|
+
level: 'info',
|
|
44
42
|
}));
|
|
45
43
|
}
|
|
46
44
|
catch (error) {
|
|
47
45
|
if (axios_1.default.isAxiosError(error)) {
|
|
48
46
|
const statusCode = error.response?.status || 'UNKNOWN';
|
|
49
|
-
logger.error(new error_tracking_1.SentryError(`HTTP request failed with status code ${statusCode}`, {
|
|
47
|
+
logger.error(new error_tracking_1.SentryError(`HTTP request failed with status code ${statusCode}, error message: ${error.message}`, {
|
|
50
48
|
// @todo в будущем дать возможность конфигурировать
|
|
51
49
|
level: severityFromStatus(error.response?.status),
|
|
52
50
|
context: {
|
|
53
51
|
key: 'Request details',
|
|
54
52
|
data: {
|
|
53
|
+
error,
|
|
55
54
|
url,
|
|
56
55
|
baseURL,
|
|
57
56
|
method: readyMethod,
|
|
@@ -59,7 +58,7 @@ function loggingMiddleware(logger) {
|
|
|
59
58
|
...config.headers,
|
|
60
59
|
...defaults.headers[readyMethod.toLowerCase()],
|
|
61
60
|
},
|
|
62
|
-
params,
|
|
61
|
+
...(params && { params }),
|
|
63
62
|
data,
|
|
64
63
|
},
|
|
65
64
|
},
|
|
@@ -73,7 +72,7 @@ function loggingMiddleware(logger) {
|
|
|
73
72
|
method: readyMethod,
|
|
74
73
|
params,
|
|
75
74
|
},
|
|
76
|
-
level:
|
|
75
|
+
level: 'error',
|
|
77
76
|
}));
|
|
78
77
|
}
|
|
79
78
|
// ВАЖНО: не скрываем ошибку, сообщаем остальному миру про нее
|
|
@@ -93,17 +92,17 @@ function severityFromStatus(status) {
|
|
|
93
92
|
if (typeof status === 'number') {
|
|
94
93
|
switch (true) {
|
|
95
94
|
case status >= 200 && status <= 299:
|
|
96
|
-
result =
|
|
95
|
+
result = 'info';
|
|
97
96
|
break;
|
|
98
97
|
case status >= 300 && status <= 499:
|
|
99
|
-
result =
|
|
98
|
+
result = 'warning';
|
|
100
99
|
break;
|
|
101
100
|
default:
|
|
102
|
-
result =
|
|
101
|
+
result = 'error';
|
|
103
102
|
}
|
|
104
103
|
}
|
|
105
104
|
else {
|
|
106
|
-
result =
|
|
105
|
+
result = 'error';
|
|
107
106
|
}
|
|
108
107
|
return result;
|
|
109
108
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../src/http-client/middleware/logging.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAG1B,yDAAqE;
|
|
1
|
+
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../src/http-client/middleware/logging.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,10 +15,10 @@ export declare function tracingMiddleware(tracer: Tracer, rootContext: Context):
|
|
|
15
15
|
* @param defaults Базовый конфиг экземпляра Axios.
|
|
16
16
|
* @return Базовые данные запроса.
|
|
17
17
|
*/
|
|
18
|
-
export declare
|
|
18
|
+
export declare function getRequestInfo(config: AxiosRequestConfig, defaults: AxiosDefaults): {
|
|
19
19
|
method: string;
|
|
20
20
|
url: string;
|
|
21
|
-
foundId?: number
|
|
21
|
+
foundId?: number;
|
|
22
22
|
};
|
|
23
23
|
/**
|
|
24
24
|
* Преобразует строку вида:
|
|
@@ -29,4 +29,4 @@ export declare const getRequestInfo: (config: AxiosRequestConfig, defaults: Axio
|
|
|
29
29
|
* @param url Url.
|
|
30
30
|
* @return Кортеж со строкой и результатом поиска числа.
|
|
31
31
|
*/
|
|
32
|
-
export declare
|
|
32
|
+
export declare function hideFirstId(url: string): [string, number | undefined];
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.hideFirstId = exports.getRequestInfo = exports.tracingMiddleware = void 0;
|
|
4
4
|
const api_1 = require("@opentelemetry/api");
|
|
5
5
|
const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
|
|
6
|
+
const utils_1 = require("../utils");
|
|
6
7
|
/**
|
|
7
8
|
* Возвращает новый middleware для трассировки исходящих запросов.
|
|
8
9
|
* @param tracer Трейсер.
|
|
@@ -11,7 +12,7 @@ const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
|
|
|
11
12
|
*/
|
|
12
13
|
function tracingMiddleware(tracer, rootContext) {
|
|
13
14
|
return async function trace(config, next, defaults) {
|
|
14
|
-
const { method, url, foundId } =
|
|
15
|
+
const { method, url, foundId } = getRequestInfo(config, defaults);
|
|
15
16
|
const span = tracer.startSpan(`HTTP ${method} ${url}`, undefined, rootContext);
|
|
16
17
|
span.setAttributes({
|
|
17
18
|
[semantic_conventions_1.SemanticAttributes.HTTP_URL]: url,
|
|
@@ -35,6 +36,7 @@ function tracingMiddleware(tracer, rootContext) {
|
|
|
35
36
|
code: api_1.SpanStatusCode.ERROR,
|
|
36
37
|
message: 'HTTP Request failed',
|
|
37
38
|
});
|
|
39
|
+
span.end();
|
|
38
40
|
// не прячем ошибку
|
|
39
41
|
throw error;
|
|
40
42
|
}
|
|
@@ -49,14 +51,17 @@ exports.tracingMiddleware = tracingMiddleware;
|
|
|
49
51
|
* @param defaults Базовый конфиг экземпляра Axios.
|
|
50
52
|
* @return Базовые данные запроса.
|
|
51
53
|
*/
|
|
52
|
-
|
|
54
|
+
function getRequestInfo(config, defaults) {
|
|
53
55
|
const method = (config.method || 'GET').toUpperCase();
|
|
54
56
|
const baseURL = config.baseURL || defaults.baseURL || '';
|
|
55
57
|
// ВАЖНО: абстрагируем id только в url игнорируя baseURL
|
|
56
|
-
const [url, foundId] =
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
58
|
+
const [url, foundId] = hideFirstId(config.url || defaults.url || '');
|
|
59
|
+
return {
|
|
60
|
+
method,
|
|
61
|
+
url: (0, utils_1.displayUrl)(baseURL, url),
|
|
62
|
+
foundId,
|
|
63
|
+
};
|
|
64
|
+
}
|
|
60
65
|
exports.getRequestInfo = getRequestInfo;
|
|
61
66
|
/**
|
|
62
67
|
* Преобразует строку вида:
|
|
@@ -67,9 +72,9 @@ exports.getRequestInfo = getRequestInfo;
|
|
|
67
72
|
* @param url Url.
|
|
68
73
|
* @return Кортеж со строкой и результатом поиска числа.
|
|
69
74
|
*/
|
|
70
|
-
|
|
75
|
+
function hideFirstId(url) {
|
|
71
76
|
const found = /\d{2,}/.exec(url);
|
|
72
77
|
return found ? [url.replace(found[0], '{id}'), Number(found[0])] : [url, undefined];
|
|
73
|
-
}
|
|
78
|
+
}
|
|
74
79
|
exports.hideFirstId = hideFirstId;
|
|
75
80
|
//# sourceMappingURL=tracing.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../../src/http-client/middleware/tracing.ts"],"names":[],"mappings":";;;AAEA,4CAAqE;AACrE,8EAAyE;
|
|
1
|
+
{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../../src/http-client/middleware/tracing.ts"],"names":[],"mappings":";;;AAEA,4CAAqE;AACrE,8EAAyE;AACzE,oCAAsC;AAEtC;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,MAAc,EAAE,WAAoB;IACpE,OAAO,KAAK,UAAU,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ;QAChD,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAClE,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,MAAM,IAAI,GAAG,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAE/E,IAAI,CAAC,aAAa,CAAC;YACjB,CAAC,yCAAkB,CAAC,QAAQ,CAAC,EAAE,GAAG;YAClC,CAAC,yCAAkB,CAAC,WAAW,CAAC,EAAE,MAAM;YACxC,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC;gBAC/B,GAAG,QAAQ,CAAC,MAAM;gBAClB,GAAG,MAAM,CAAC,MAAM;aACjB,CAAC;YACF,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC;gBAChC,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAW,CAAC;gBAClD,GAAG,MAAM,CAAC,OAAO;aAClB,CAAC;YAEF,mCAAmC;YACnC,GAAG,CAAC,OAAO,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC;SAC1C,CAAC,CAAC;QAEH,IAAI;YACF,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC;SACpB;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,SAAS,CAAC;gBACb,IAAI,EAAE,oBAAc,CAAC,KAAK;gBAC1B,OAAO,EAAE,qBAAqB;aAC/B,CAAC,CAAC;YAEH,IAAI,CAAC,GAAG,EAAE,CAAC;YAEX,mBAAmB;YACnB,MAAM,KAAK,CAAC;SACb;QAED,IAAI,CAAC,GAAG,EAAE,CAAC;IACb,CAAC,CAAC;AACJ,CAAC;AArCD,8CAqCC;AAED;;;;;;GAMG;AACH,SAAgB,cAAc,CAC5B,MAA0B,EAC1B,QAAuB;IAMvB,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;IACtD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC;IAEzD,wDAAwD;IACxD,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,QAAQ,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;IAErE,OAAO;QACL,MAAM;QACN,GAAG,EAAE,IAAA,kBAAU,EAAC,OAAO,EAAE,GAAG,CAAC;QAC7B,OAAO;KACR,CAAC;AACJ,CAAC;AAnBD,wCAmBC;AAED;;;;;;;;GAQG;AACH,SAAgB,WAAW,CAAC,GAAW;IACrC,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEjC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;AACtF,CAAC;AAJD,kCAIC"}
|
package/http-client/utils.d.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import type { BaseConfig } from '../config/types';
|
|
1
|
+
import type { AxiosDefaults, AxiosRequestConfig } from 'axios';
|
|
3
2
|
/**
|
|
4
|
-
*
|
|
5
|
-
* @param
|
|
6
|
-
* @param
|
|
7
|
-
* @return
|
|
3
|
+
* Объединяет значения опций baseURL и url (axios) в одну строку для логирования.
|
|
4
|
+
* @param baseURL Опция baseURL.
|
|
5
|
+
* @param url Опция url.
|
|
6
|
+
* @return Отображение. Не является валидным URL.
|
|
8
7
|
*/
|
|
9
|
-
export declare function
|
|
8
|
+
export declare function displayUrl(baseURL?: AxiosDefaults['baseURL'], url?: AxiosRequestConfig['url']): string;
|
package/http-client/utils.js
CHANGED
|
@@ -1,20 +1,30 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
const utils_1 = require("../http-server/utils");
|
|
3
|
+
exports.displayUrl = void 0;
|
|
5
4
|
/**
|
|
6
|
-
*
|
|
7
|
-
* @param
|
|
8
|
-
* @param
|
|
9
|
-
* @return
|
|
5
|
+
* Объединяет значения опций baseURL и url (axios) в одну строку для логирования.
|
|
6
|
+
* @param baseURL Опция baseURL.
|
|
7
|
+
* @param url Опция url.
|
|
8
|
+
* @return Отображение. Не является валидным URL.
|
|
10
9
|
*/
|
|
11
|
-
function
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
10
|
+
function displayUrl(baseURL = '', url = '') {
|
|
11
|
+
let result;
|
|
12
|
+
switch (true) {
|
|
13
|
+
case Boolean(baseURL && url):
|
|
14
|
+
result = `${baseURL.replace(/\/$/, '')}/${url.replace(/^\//, '')}`;
|
|
15
|
+
break;
|
|
16
|
+
case Boolean(baseURL) && !url:
|
|
17
|
+
result = baseURL;
|
|
18
|
+
break;
|
|
19
|
+
case !baseURL && Boolean(url):
|
|
20
|
+
result = url;
|
|
21
|
+
break;
|
|
22
|
+
case !baseURL && !url:
|
|
23
|
+
default:
|
|
24
|
+
result = '[empty]';
|
|
25
|
+
break;
|
|
26
|
+
}
|
|
27
|
+
return result;
|
|
18
28
|
}
|
|
19
|
-
exports.
|
|
29
|
+
exports.displayUrl = displayUrl;
|
|
20
30
|
//# sourceMappingURL=utils.js.map
|
package/http-client/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/http-client/utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/http-client/utils.ts"],"names":[],"mappings":";;;AAEA;;;;;GAKG;AACH,SAAgB,UAAU,CACxB,UAAoC,EAAE,EACtC,MAAiC,EAAE;IAEnC,IAAI,MAAc,CAAC;IAEnB,QAAQ,IAAI,EAAE;QACZ,KAAK,OAAO,CAAC,OAAO,IAAI,GAAG,CAAC;YAC1B,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC;YACnE,MAAM;QACR,KAAK,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG;YAC3B,MAAM,GAAG,OAAO,CAAC;YACjB,MAAM;QACR,KAAK,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC;YAC3B,MAAM,GAAG,GAAG,CAAC;YACb,MAAM;QACR,KAAK,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC;QACtB;YACE,MAAM,GAAG,SAAS,CAAC;YACnB,MAAM;KACT;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAvBD,gCAuBC"}
|
|
@@ -10,15 +10,14 @@ exports.pageTemplate = (0, ejs_1.compile)(`
|
|
|
10
10
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
|
11
11
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
12
12
|
<title><%= title %></title>
|
|
13
|
+
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,600,700,700i,800&display=swap&subset=cyrillic">
|
|
13
14
|
<style>
|
|
14
15
|
* {
|
|
15
|
-
margin: 0;
|
|
16
|
-
padding: 0;
|
|
17
|
-
border: 0;
|
|
18
|
-
outline: 0;
|
|
19
16
|
box-sizing: border-box;
|
|
20
|
-
|
|
21
|
-
|
|
17
|
+
}
|
|
18
|
+
body {
|
|
19
|
+
font-family: -apple-system,BlinkMacSystemFont,'Source Sans Pro',"Segoe UI",Roboto,"Helvetica Neue",Ubuntu,Arial,sans-serif;
|
|
20
|
+
margin: 0;
|
|
22
21
|
}
|
|
23
22
|
</style>
|
|
24
23
|
<% if (assets.criticalCss) { %>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/http-server/template/index.ts"],"names":[],"mappings":";;;AAAA,6BAA8B;AAEjB,QAAA,YAAY,GAAG,IAAA,aAAO,EAAC
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/http-server/template/index.ts"],"names":[],"mappings":";;;AAAA,6BAA8B;AAEjB,QAAA,YAAY,GAAG,IAAA,aAAO,EAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmCnC,CAAC,CAAC"}
|
package/http-server/utils.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { Request, Response } from 'express';
|
|
2
2
|
import type { PageAssets, PageTemplate, PageTemplateData } from './types';
|
|
3
|
+
import type { BaseConfig } from '../config/types';
|
|
3
4
|
/**
|
|
4
5
|
* Определяет IP входящего запроса.
|
|
5
6
|
* @param req Входящий запрос.
|
|
@@ -12,6 +13,13 @@ export declare function getXClientIp(req: Request): string;
|
|
|
12
13
|
* @return Служебные заголовки.
|
|
13
14
|
*/
|
|
14
15
|
export declare function getServiceHeaders(req: Request): Record<string, string | undefined>;
|
|
16
|
+
/**
|
|
17
|
+
* Формирует заголовки для исходящих запросов с сервера по соглашению.
|
|
18
|
+
* @param config Конфиг.
|
|
19
|
+
* @param request Входящий запрос.
|
|
20
|
+
* @return Заголовки для исходящих запросов.
|
|
21
|
+
*/
|
|
22
|
+
export declare function getRequestHeaders(config: BaseConfig, request: Request): Record<string, string>;
|
|
15
23
|
export declare class PageResponse {
|
|
16
24
|
private type;
|
|
17
25
|
private html;
|
package/http-server/utils.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.PageResponse = exports.getServiceHeaders = exports.getXClientIp = void 0;
|
|
3
|
+
exports.PageResponse = exports.getRequestHeaders = exports.getServiceHeaders = exports.getXClientIp = void 0;
|
|
4
4
|
const net_1 = require("net");
|
|
5
5
|
/**
|
|
6
6
|
* Определяет IP входящего запроса.
|
|
@@ -27,6 +27,21 @@ function getServiceHeaders(req) {
|
|
|
27
27
|
return result;
|
|
28
28
|
}
|
|
29
29
|
exports.getServiceHeaders = getServiceHeaders;
|
|
30
|
+
/**
|
|
31
|
+
* Формирует заголовки для исходящих запросов с сервера по соглашению.
|
|
32
|
+
* @param config Конфиг.
|
|
33
|
+
* @param request Входящий запрос.
|
|
34
|
+
* @return Заголовки для исходящих запросов.
|
|
35
|
+
*/
|
|
36
|
+
function getRequestHeaders(config, request) {
|
|
37
|
+
return {
|
|
38
|
+
'X-Client-Ip': getXClientIp(request),
|
|
39
|
+
'User-Agent': `simaland-${config.appName}/${config.appVersion}`,
|
|
40
|
+
Cookie: request.get('cookie') || '',
|
|
41
|
+
...getServiceHeaders(request),
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
exports.getRequestHeaders = getRequestHeaders;
|
|
30
45
|
/* eslint-disable require-jsdoc, jsdoc/require-jsdoc */
|
|
31
46
|
class PageResponse {
|
|
32
47
|
constructor() {
|
package/http-server/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/http-server/utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/http-server/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,10 @@ function createConsoleHandler(config) {
|
|
|
20
20
|
level: label => ({ level: label }),
|
|
21
21
|
},
|
|
22
22
|
}
|
|
23
|
-
: (0, pino_pretty_1.default)({
|
|
23
|
+
: (0, pino_pretty_1.default)({
|
|
24
|
+
colorize: true,
|
|
25
|
+
translateTime: 'yyyy-mm-dd HH:MM:ss.l o',
|
|
26
|
+
}));
|
|
24
27
|
return function handler(event) {
|
|
25
28
|
switch (event.type) {
|
|
26
29
|
case 'log':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../src/logger/handler/console.ts"],"names":[],"mappings":";;;;;;AAEA,gDAAwB;AACxB,8DAAqC;AAErC;;;;GAIG;AACH,SAAgB,oBAAoB,CAAC,MAAkB;IACrD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,KAAK,YAAY,CAAC;IAE3C,MAAM,MAAM,GAAG,IAAA,cAAI,EACjB,MAAM;QACJ,CAAC,CAAC;YACE,UAAU,EAAE;gBACV,0DAA0D;gBAC1D,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;aACnC;SACF;QACH,CAAC,CAAC,IAAA,qBAAU,EAAC,
|
|
1
|
+
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../src/logger/handler/console.ts"],"names":[],"mappings":";;;;;;AAEA,gDAAwB;AACxB,8DAAqC;AAErC;;;;GAIG;AACH,SAAgB,oBAAoB,CAAC,MAAkB;IACrD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,KAAK,YAAY,CAAC;IAE3C,MAAM,MAAM,GAAG,IAAA,cAAI,EACjB,MAAM;QACJ,CAAC,CAAC;YACE,UAAU,EAAE;gBACV,0DAA0D;gBAC1D,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;aACnC;SACF;QACH,CAAC,CAAC,IAAA,qBAAU,EAAC;YACT,QAAQ,EAAE,IAAI;YACd,aAAa,EAAE,yBAAyB;SACzC,CAAC,CACP,CAAC;IAEF,OAAO,SAAS,OAAO,CAAC,KAAK;QAC3B,QAAQ,KAAK,CAAC,IAAI,EAAE;YAClB,KAAK,KAAK,CAAC;YACX,KAAK,MAAM;gBACT,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACxB,MAAM;YACR,KAAK,MAAM;gBACT,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACxB,MAAM;YACR,KAAK,OAAO;gBACV,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACzB,MAAM;YACR,KAAK,OAAO;gBACV,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACzB,MAAM;SACT;IACH,CAAC,CAAC;AACJ,CAAC;AAlCD,oDAkCC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sima-land/isomorph",
|
|
3
|
-
"version": "11.0.0-alpha.
|
|
3
|
+
"version": "11.0.0-alpha.23",
|
|
4
4
|
"description": "Tiny framework for fast start frontend microservices",
|
|
5
5
|
"author": "www.sima-land.ru team",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -15,52 +15,57 @@
|
|
|
15
15
|
"test": "jest",
|
|
16
16
|
"test:coverage": "jest --clearCache && jest --coverage"
|
|
17
17
|
},
|
|
18
|
+
"engines": {
|
|
19
|
+
"node": ">=16.15.1"
|
|
20
|
+
},
|
|
18
21
|
"devDependencies": {
|
|
19
|
-
"@sima-land/linters": "^2.1.
|
|
20
|
-
"@swc/jest": "^0.2.
|
|
22
|
+
"@sima-land/linters": "^2.1.5",
|
|
23
|
+
"@swc/jest": "^0.2.22",
|
|
21
24
|
"@testing-library/react": "^12.1.3",
|
|
22
25
|
"@types/ejs": "^3.1.1",
|
|
23
26
|
"@types/express": "^4.17.13",
|
|
24
|
-
"@types/jest": "^
|
|
27
|
+
"@types/jest": "^28.1.7",
|
|
25
28
|
"@types/jsesc": "^3.0.1",
|
|
26
|
-
"@types/lodash": "^4.14.
|
|
29
|
+
"@types/lodash": "^4.14.184",
|
|
27
30
|
"@types/react": "^17.0.40",
|
|
28
31
|
"@types/react-dom": "^17.0.13",
|
|
29
32
|
"@types/webpack": "^5.28.0",
|
|
30
|
-
"husky": "^
|
|
31
|
-
"jest": "^
|
|
32
|
-
"
|
|
33
|
+
"husky": "^8.0.1",
|
|
34
|
+
"jest": "^28.1.3",
|
|
35
|
+
"jest-environment-jsdom": "^28.1.3",
|
|
36
|
+
"typescript": "^4.7.4"
|
|
33
37
|
},
|
|
34
38
|
"dependencies": {
|
|
35
|
-
"@humanwhocodes/env": "^2.2.
|
|
39
|
+
"@humanwhocodes/env": "^2.2.2",
|
|
36
40
|
"@opentelemetry/api": "^1.1.0",
|
|
37
|
-
"@opentelemetry/exporter-jaeger": "^1.0
|
|
38
|
-
"@opentelemetry/instrumentation": "^0.
|
|
39
|
-
"@opentelemetry/instrumentation-express": "^0.
|
|
40
|
-
"@opentelemetry/instrumentation-http": "^0.
|
|
41
|
-
"@opentelemetry/resources": "^1.0
|
|
42
|
-
"@opentelemetry/sdk-trace-
|
|
43
|
-
"@opentelemetry/
|
|
41
|
+
"@opentelemetry/exporter-jaeger": "^1.5.0",
|
|
42
|
+
"@opentelemetry/instrumentation": "^0.31.0",
|
|
43
|
+
"@opentelemetry/instrumentation-express": "^0.30.0",
|
|
44
|
+
"@opentelemetry/instrumentation-http": "^0.31.0",
|
|
45
|
+
"@opentelemetry/resources": "^1.5.0",
|
|
46
|
+
"@opentelemetry/sdk-trace-base": "^1.6.0",
|
|
47
|
+
"@opentelemetry/sdk-trace-node": "^1.5.0",
|
|
48
|
+
"@opentelemetry/semantic-conventions": "^1.5.0",
|
|
44
49
|
"@opentelemetry/tracing": "^0.24.0",
|
|
45
|
-
"@sentry/browser": "^
|
|
46
|
-
"@sentry/node": "^
|
|
50
|
+
"@sentry/browser": "^7.11.1",
|
|
51
|
+
"@sentry/node": "^7.11.1",
|
|
47
52
|
"dotenv": "^16.0.0",
|
|
48
53
|
"ejs": "^3.1.8",
|
|
49
54
|
"express": "^4.17.3",
|
|
50
55
|
"jsesc": "^3.0.2",
|
|
51
56
|
"middleware-axios": "^2.1.2",
|
|
52
|
-
"pino": "^
|
|
53
|
-
"pino-pretty": "^
|
|
57
|
+
"pino": "^8.4.2",
|
|
58
|
+
"pino-pretty": "^9.0.1",
|
|
54
59
|
"prom-client": "^14.0.1",
|
|
55
|
-
"webpack": "^5.
|
|
60
|
+
"webpack": "^5.74.0"
|
|
56
61
|
},
|
|
57
62
|
"peerDependencies": {
|
|
58
|
-
"@reduxjs/toolkit": "^1.8.
|
|
63
|
+
"@reduxjs/toolkit": "^1.8.5",
|
|
59
64
|
"axios": "^0.24.0",
|
|
60
65
|
"lodash": "^4.17.21",
|
|
61
66
|
"react": "^17.0.2",
|
|
62
67
|
"react-dom": "^17.0.2",
|
|
63
|
-
"react-redux": "^
|
|
64
|
-
"redux-saga": "^1.1
|
|
68
|
+
"react-redux": "^8.0.2",
|
|
69
|
+
"redux-saga": "^1.2.1"
|
|
65
70
|
}
|
|
66
71
|
}
|
|
@@ -4,9 +4,11 @@ import { SagaExtendedMiddleware } from '../../utils/redux-saga';
|
|
|
4
4
|
import type { BaseConfig } from '../../config/types';
|
|
5
5
|
import { BridgeClientSide } from '../../utils/ssr';
|
|
6
6
|
import { StrictMap, KnownHttpApiKey } from '../types';
|
|
7
|
+
import { HttpClientFactory } from '../../http-client/types';
|
|
7
8
|
export declare function PresetBrowser(): import("../../di").Preset;
|
|
8
9
|
export declare function provideBaseConfig(resolve: Resolve): BaseConfig;
|
|
9
10
|
export declare function provideLogger(resolve: Resolve): Logger;
|
|
10
11
|
export declare function provideSagaMiddleware(resolve: Resolve): SagaExtendedMiddleware;
|
|
11
12
|
export declare function provideBridgeClientSide(resolve: Resolve): BridgeClientSide<unknown>;
|
|
12
13
|
export declare function provideKnownHttpApiHosts(resolve: Resolve): StrictMap<KnownHttpApiKey>;
|
|
14
|
+
export declare function provideHttpClientFactory(resolve: Resolve): HttpClientFactory;
|
package/preset/browser/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.provideKnownHttpApiHosts = exports.provideBridgeClientSide = exports.provideSagaMiddleware = exports.provideLogger = exports.provideBaseConfig = exports.PresetBrowser = void 0;
|
|
3
|
+
exports.provideHttpClientFactory = exports.provideKnownHttpApiHosts = exports.provideBridgeClientSide = exports.provideSagaMiddleware = exports.provideLogger = exports.provideBaseConfig = exports.PresetBrowser = void 0;
|
|
4
4
|
/* eslint-disable require-jsdoc, jsdoc/require-jsdoc */
|
|
5
5
|
const di_1 = require("../../di");
|
|
6
6
|
const tokens_1 = require("../../tokens");
|
|
@@ -13,13 +13,14 @@ const browser_2 = require("@sentry/browser");
|
|
|
13
13
|
const middleware_axios_1 = require("middleware-axios");
|
|
14
14
|
const ssr_1 = require("../../utils/ssr");
|
|
15
15
|
const utils_1 = require("../utils");
|
|
16
|
+
const logging_1 = require("../../http-client/middleware/logging");
|
|
16
17
|
function PresetBrowser() {
|
|
17
18
|
return (0, di_1.createPreset)([
|
|
18
19
|
[tokens_1.KnownToken.Config.source, browser_1.createConfigSource],
|
|
19
20
|
[tokens_1.KnownToken.Config.base, provideBaseConfig],
|
|
20
21
|
[tokens_1.KnownToken.logger, provideLogger],
|
|
21
22
|
[tokens_1.KnownToken.sagaMiddleware, provideSagaMiddleware],
|
|
22
|
-
[tokens_1.KnownToken.Http.Client.factory,
|
|
23
|
+
[tokens_1.KnownToken.Http.Client.factory, provideHttpClientFactory],
|
|
23
24
|
[tokens_1.KnownToken.SsrBridge.clientSide, provideBridgeClientSide],
|
|
24
25
|
[tokens_1.KnownToken.Http.Api.knownHosts, provideKnownHttpApiHosts],
|
|
25
26
|
]);
|
|
@@ -33,9 +34,11 @@ exports.provideBaseConfig = provideBaseConfig;
|
|
|
33
34
|
function provideLogger(resolve) {
|
|
34
35
|
const source = resolve(tokens_1.KnownToken.Config.source);
|
|
35
36
|
const client = new browser_2.BrowserClient({
|
|
36
|
-
|
|
37
|
+
transport: browser_2.makeFetchTransport,
|
|
38
|
+
stackParser: browser_2.defaultStackParser,
|
|
39
|
+
dsn: source.require('PUBLIC_SENTRY_DSN'),
|
|
37
40
|
release: source.require('SENTRY_RELEASE'),
|
|
38
|
-
environment: source.require('
|
|
41
|
+
environment: source.require('PUBLIC_SENTRY_ENVIRONMENT'),
|
|
39
42
|
integrations: [...browser_2.defaultIntegrations],
|
|
40
43
|
});
|
|
41
44
|
const hub = new browser_2.Hub(client);
|
|
@@ -64,4 +67,13 @@ function provideKnownHttpApiHosts(resolve) {
|
|
|
64
67
|
}, source);
|
|
65
68
|
}
|
|
66
69
|
exports.provideKnownHttpApiHosts = provideKnownHttpApiHosts;
|
|
70
|
+
function provideHttpClientFactory(resolve) {
|
|
71
|
+
const logger = resolve(tokens_1.KnownToken.logger);
|
|
72
|
+
return function createHttpClient(config) {
|
|
73
|
+
const client = (0, middleware_axios_1.create)(config);
|
|
74
|
+
client.use((0, logging_1.loggingMiddleware)(logger));
|
|
75
|
+
return client;
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
exports.provideHttpClientFactory = provideHttpClientFactory;
|
|
67
79
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/preset/browser/index.ts"],"names":[],"mappings":";;;AAAA,wDAAwD;AACxD,iCAAiD;AACjD,yCAA0C;AAC1C,4CAAqD;AACrD,kDAA0D;AAC1D,yCAAoD;AACpD,wDAAkE;AAClE,uDAAsF;AACtF,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/preset/browser/index.ts"],"names":[],"mappings":"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"}
|
package/preset/node/index.js
CHANGED
|
@@ -59,7 +59,9 @@ function provideLogger(resolve) {
|
|
|
59
59
|
const source = resolve(tokens_1.KnownToken.Config.source);
|
|
60
60
|
const config = resolve(tokens_1.KnownToken.Config.base);
|
|
61
61
|
const client = new node_3.NodeClient({
|
|
62
|
-
|
|
62
|
+
transport: node_3.makeNodeTransport,
|
|
63
|
+
stackParser: node_3.defaultStackParser,
|
|
64
|
+
dsn: source.require('SENTRY_DSN'),
|
|
63
65
|
release: source.require('SENTRY_RELEASE'),
|
|
64
66
|
environment: source.require('SENTRY_ENVIRONMENT'),
|
|
65
67
|
integrations: [...node_3.defaultIntegrations],
|
package/preset/node/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/preset/node/index.ts"],"names":[],"mappings":";;;;;;AAKA,iCAAyD;AACzD,oDAA+F;AAC/F,yCAA0C;AAC1C,4CAAuD;AACvD,4CAAqD;AACrD,yCAA4C;AAC5C,0DAAoE;AACpE,wDAAkE;AAClE,kEAAyE;AACzE,kEAAyE;AACzE,kEAG8C;AAC9C,6CAAgF;AAChF,oEAAgE;AAChE,uDAA0C;AAC1C,sDAA8B;AAC9B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/preset/node/index.ts"],"names":[],"mappings":"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"}
|
package/preset/node/response.js
CHANGED
|
@@ -30,17 +30,25 @@ function PresetResponse() {
|
|
|
30
30
|
}
|
|
31
31
|
exports.PresetResponse = PresetResponse;
|
|
32
32
|
function provideHttpClientFactory(resolve) {
|
|
33
|
+
const appConfig = resolve(tokens_1.KnownToken.Config.base);
|
|
33
34
|
const logger = resolve(tokens_1.KnownToken.logger);
|
|
34
35
|
const tracer = resolve(tokens_1.KnownToken.Tracing.tracer);
|
|
35
36
|
const context = resolve(tokens_1.KnownToken.Response.context);
|
|
36
37
|
return function createHttpClient(config) {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
38
|
+
const client = (0, middleware_axios_1.create)({
|
|
39
|
+
...config,
|
|
40
|
+
headers: {
|
|
41
|
+
...(0, utils_1.getRequestHeaders)(appConfig, context.req),
|
|
42
|
+
...config.headers,
|
|
43
|
+
},
|
|
44
|
+
});
|
|
45
|
+
client.use((0, tracing_1.tracingMiddleware)(tracer, context.res.locals.tracing.rootContext));
|
|
46
|
+
client.use((0, logging_1.loggingMiddleware)(logger));
|
|
47
|
+
client.use((0, headers_1.passHeadersMiddleware)(context.req, {
|
|
41
48
|
predicate: headerName => headerName.startsWith('simaland-'),
|
|
42
|
-
}))
|
|
43
|
-
|
|
49
|
+
}));
|
|
50
|
+
client.use((0, cookie_1.collectCookieMiddleware)(context.req, context.res));
|
|
51
|
+
return client;
|
|
44
52
|
};
|
|
45
53
|
}
|
|
46
54
|
exports.provideHttpClientFactory = provideHttpClientFactory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../../src/preset/node/response.ts"],"names":[],"mappings":";;;AAGA,iCAAmF;AACnF,yCAA0C;AAC1C,6CAAkD;AAClD,2DAA6D;AAC7D,yDAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../../src/preset/node/response.ts"],"names":[],"mappings":"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"}
|
package/tokens.d.ts
CHANGED
|
@@ -7,10 +7,10 @@ import type { HttpClientFactory } from './http-client/types';
|
|
|
7
7
|
import type { BaseConfig } from './config/types';
|
|
8
8
|
import type { Tracer } from '@opentelemetry/api';
|
|
9
9
|
import type { Cache } from './cache/types';
|
|
10
|
-
import type { BasicTracerProvider, SpanExporter } from '@opentelemetry/
|
|
10
|
+
import type { BasicTracerProvider, SpanExporter } from '@opentelemetry/sdk-trace-base';
|
|
11
11
|
import type { Resource } from '@opentelemetry/resources';
|
|
12
|
-
import {
|
|
13
|
-
import {
|
|
12
|
+
import type { StrictMap, KnownHttpApiKey } from './preset/types';
|
|
13
|
+
import type { BridgeClientSide, BridgeServerSide } from './utils/ssr';
|
|
14
14
|
export declare const KnownToken: {
|
|
15
15
|
readonly Config: {
|
|
16
16
|
readonly source: import("./di").Token<import("@humanwhocodes/env").Env>;
|
package/tokens.js
CHANGED
|
@@ -50,6 +50,7 @@ exports.KnownToken = {
|
|
|
50
50
|
render: (0, di_1.createToken)('response/render'),
|
|
51
51
|
main: (0, di_1.createToken)('response/main'),
|
|
52
52
|
},
|
|
53
|
+
// SSR
|
|
53
54
|
SsrBridge: {
|
|
54
55
|
clientSide: (0, di_1.createToken)('ssr-bridge/client-side'),
|
|
55
56
|
serverSide: (0, di_1.createToken)('ssr-bridge/server-side'),
|
package/tokens.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":";;;AAAA,6BAAmC;AAmBtB,QAAA,UAAU,GAAG;IACxB,SAAS;IACT,MAAM,EAAE;QACN,MAAM,EAAE,IAAA,gBAAW,EAAe,eAAe,CAAC;QAClD,IAAI,EAAE,IAAA,gBAAW,EAAa,aAAa,CAAC;KAC7C;IAED,QAAQ;IACR,KAAK,EAAE,IAAA,gBAAW,EAAQ,OAAO,CAAC;IAElC,UAAU;IACV,MAAM,EAAE,IAAA,gBAAW,EAAS,QAAQ,CAAC;IAErC,cAAc;IACd,cAAc,EAAE,IAAA,gBAAW,EAAyB,iBAAiB,CAAC;IAEtE,UAAU;IACV,OAAO,EAAE;QACP,MAAM,EAAE,IAAA,gBAAW,EAAS,gBAAgB,CAAC;QAC7C,YAAY,EAAE,IAAA,gBAAW,EAAe,uBAAuB,CAAC;QAChE,cAAc,EAAE,IAAA,gBAAW,EAAsB,yBAAyB,CAAC;QAC3E,sBAAsB,EAAE,IAAA,gBAAW,EAAW,kCAAkC,CAAC;KAClF;IAED,UAAU;IACV,OAAO,EAAE;QACP,OAAO,EAAE,IAAA,gBAAW,EAAc,kBAAkB,CAAC;KACtD;IAED,OAAO;IACP,IAAI,EAAE;QACJ,MAAM,EAAE;YACN,OAAO,EAAE,IAAA,gBAAW,EAAoB,qBAAqB,CAAC;SAC/D;QACD,MAAM,EAAE;YACN,OAAO,EAAE,IAAA,gBAAW,EAAoB,qBAAqB,CAAC;YAC9D,QAAQ,EAAE;gBACR,UAAU,EAAE,IAAA,gBAAW,EAAoB,iCAAiC,CAAC;aAC9E;SACF;QACD,GAAG,EAAE;YACH,UAAU,EAAE,IAAA,gBAAW,EAA6B,sBAAsB,CAAC;SAC5E;KACF;IAED,uBAAuB;IACvB,QAAQ,EAAE;QACR,MAAM,EAAE,IAAA,gBAAW,EAA0B,iBAAiB,CAAC;QAC/D,QAAQ,EAAE,IAAA,gBAAW,EAAe,mBAAmB,CAAC;QACxD,OAAO,EAAE,IAAA,gBAAW,EAAkB,kBAAkB,CAAC;QACzD,MAAM,EAAE,IAAA,gBAAW,EAAa,iBAAiB,CAAC;QAClD,OAAO,EAAE,IAAA,gBAAW,EAA2C,kBAAkB,CAAC;QAClF,MAAM,EAAE,IAAA,gBAAW,EAAqD,iBAAiB,CAAC;QAC1F,IAAI,EAAE,IAAA,gBAAW,EAAa,eAAe,CAAC;KAC/C;IAED,SAAS,EAAE;QACT,UAAU,EAAE,IAAA,gBAAW,EAA4B,wBAAwB,CAAC;QAC5E,UAAU,EAAE,IAAA,gBAAW,EAAmB,wBAAwB,CAAC;KACpE;CACO,CAAC"}
|
|
1
|
+
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":";;;AAAA,6BAAmC;AAmBtB,QAAA,UAAU,GAAG;IACxB,SAAS;IACT,MAAM,EAAE;QACN,MAAM,EAAE,IAAA,gBAAW,EAAe,eAAe,CAAC;QAClD,IAAI,EAAE,IAAA,gBAAW,EAAa,aAAa,CAAC;KAC7C;IAED,QAAQ;IACR,KAAK,EAAE,IAAA,gBAAW,EAAQ,OAAO,CAAC;IAElC,UAAU;IACV,MAAM,EAAE,IAAA,gBAAW,EAAS,QAAQ,CAAC;IAErC,cAAc;IACd,cAAc,EAAE,IAAA,gBAAW,EAAyB,iBAAiB,CAAC;IAEtE,UAAU;IACV,OAAO,EAAE;QACP,MAAM,EAAE,IAAA,gBAAW,EAAS,gBAAgB,CAAC;QAC7C,YAAY,EAAE,IAAA,gBAAW,EAAe,uBAAuB,CAAC;QAChE,cAAc,EAAE,IAAA,gBAAW,EAAsB,yBAAyB,CAAC;QAC3E,sBAAsB,EAAE,IAAA,gBAAW,EAAW,kCAAkC,CAAC;KAClF;IAED,UAAU;IACV,OAAO,EAAE;QACP,OAAO,EAAE,IAAA,gBAAW,EAAc,kBAAkB,CAAC;KACtD;IAED,OAAO;IACP,IAAI,EAAE;QACJ,MAAM,EAAE;YACN,OAAO,EAAE,IAAA,gBAAW,EAAoB,qBAAqB,CAAC;SAC/D;QACD,MAAM,EAAE;YACN,OAAO,EAAE,IAAA,gBAAW,EAAoB,qBAAqB,CAAC;YAC9D,QAAQ,EAAE;gBACR,UAAU,EAAE,IAAA,gBAAW,EAAoB,iCAAiC,CAAC;aAC9E;SACF;QACD,GAAG,EAAE;YACH,UAAU,EAAE,IAAA,gBAAW,EAA6B,sBAAsB,CAAC;SAC5E;KACF;IAED,uBAAuB;IACvB,QAAQ,EAAE;QACR,MAAM,EAAE,IAAA,gBAAW,EAA0B,iBAAiB,CAAC;QAC/D,QAAQ,EAAE,IAAA,gBAAW,EAAe,mBAAmB,CAAC;QACxD,OAAO,EAAE,IAAA,gBAAW,EAAkB,kBAAkB,CAAC;QACzD,MAAM,EAAE,IAAA,gBAAW,EAAa,iBAAiB,CAAC;QAClD,OAAO,EAAE,IAAA,gBAAW,EAA2C,kBAAkB,CAAC;QAClF,MAAM,EAAE,IAAA,gBAAW,EAAqD,iBAAiB,CAAC;QAC1F,IAAI,EAAE,IAAA,gBAAW,EAAa,eAAe,CAAC;KAC/C;IAED,MAAM;IACN,SAAS,EAAE;QACT,UAAU,EAAE,IAAA,gBAAW,EAA4B,wBAAwB,CAAC;QAC5E,UAAU,EAAE,IAAA,gBAAW,EAAmB,wBAAwB,CAAC;KACpE;CACO,CAAC"}
|
package/utils/webpack/index.js
CHANGED
|
@@ -54,7 +54,9 @@ class EnvPlugin {
|
|
|
54
54
|
};
|
|
55
55
|
new webpack_1.default.DefinePlugin({ __ISOMORPH_ENV__: JSON.stringify(valuesNode) }).apply(compiler);
|
|
56
56
|
if (this.options.define) {
|
|
57
|
-
new webpack_1.default.DefinePlugin(
|
|
57
|
+
new webpack_1.default.DefinePlugin(
|
|
58
|
+
// @todo похоже для консистентности здесь должно быть не this.options.define а valuesNode
|
|
59
|
+
Object.entries(this.options.define).reduce((acc, [key, value]) => {
|
|
58
60
|
acc[`process.env.${key}`] = JSON.stringify(value);
|
|
59
61
|
return acc;
|
|
60
62
|
}, {})).apply(compiler);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/webpack/index.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAsC;AACtC,sDAA8B;AAC9B,oDAA4B;AAC5B,gDAAwB;AACxB,4CAAyC;AAEzC;;;;GAIG;AACH,MAAa,SAAS;IAMpB;;OAEG;IACH,YAAY,UAAsE,EAAE;QAClF,IAAI,CAAC,OAAO,GAAG;YACb,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,EAAE;YACpC,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,QAA0B;QAC9B,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,SAAG,EAAE,CAAC,QAAQ,CAAC;QAExC,gBAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;QAEtE,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;YACnD,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM;YACzB,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAE9B,UAAU;QACV,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAC1B,MAAM,SAAS,GAAuC;gBACpD,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM;gBACtB,GAAG,IAAA,aAAI,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;gBAC9D,GAAG,IAAA,eAAM,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;aAC9D,CAAC;YAEF,IAAI,iBAAO,CAAC,YAAY,CAAC,EAAE,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC1F,IAAI,iBAAO,CAAC,YAAY,CACtB,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAAyB,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBAC7E,GAAG,CAAC,eAAe,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;gBAClD,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAAE,CAAC,CACP,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;SACnB;QAED,OAAO;QACP,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAC3B,MAAM,UAAU,GAAuC;gBACrD,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM;gBACtB,GAAG,IAAA,aAAI,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;aAC/D,CAAC;YAEF,IAAI,iBAAO,CAAC,YAAY,CAAC,EAAE,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAE3F,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;gBACvB,IAAI,iBAAO,CAAC,YAAY,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/webpack/index.ts"],"names":[],"mappings":"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"}
|