@sima-land/isomorph 11.0.0-alpha.2 → 11.0.0-alpha.20

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 (177) hide show
  1. package/cache/types.d.ts +24 -2
  2. package/config/{index.d.ts → base.d.ts} +2 -2
  3. package/config/{index.js → base.js} +3 -3
  4. package/config/base.js.map +1 -0
  5. package/config/browser.d.ts +1 -1
  6. package/config/browser.js +11 -2
  7. package/config/browser.js.map +1 -1
  8. package/config/node.d.ts +1 -1
  9. package/config/node.js +16 -6
  10. package/config/node.js.map +1 -1
  11. package/config/types.d.ts +3 -0
  12. package/di/application.d.ts +10 -0
  13. package/{container → di}/application.js +30 -8
  14. package/di/application.js.map +1 -0
  15. package/di/container.d.ts +6 -0
  16. package/di/container.js +52 -0
  17. package/di/container.js.map +1 -0
  18. package/di/errors.d.ts +32 -0
  19. package/di/errors.js +48 -0
  20. package/di/errors.js.map +1 -0
  21. package/di/index.d.ts +6 -0
  22. package/di/index.js +17 -0
  23. package/di/index.js.map +1 -0
  24. package/di/preset.d.ts +9 -0
  25. package/di/preset.js +31 -0
  26. package/di/preset.js.map +1 -0
  27. package/di/token.d.ts +7 -0
  28. package/di/token.js +39 -0
  29. package/di/token.js.map +1 -0
  30. package/di/types.d.ts +88 -0
  31. package/{container → di}/types.js +0 -0
  32. package/{tracer → di}/types.js.map +1 -1
  33. package/error-tracking/index.d.ts +24 -0
  34. package/error-tracking/index.js +32 -0
  35. package/error-tracking/index.js.map +1 -0
  36. package/error-tracking/types.d.ts +19 -0
  37. package/{error-tracker → error-tracking}/types.js +0 -0
  38. package/{container → error-tracking}/types.js.map +1 -1
  39. package/http-client/middleware/cookie.d.ts +1 -0
  40. package/http-client/middleware/cookie.js +2 -1
  41. package/http-client/middleware/cookie.js.map +1 -1
  42. package/http-client/middleware/headers.d.ts +13 -0
  43. package/http-client/middleware/headers.js +24 -0
  44. package/http-client/middleware/headers.js.map +1 -0
  45. package/http-client/middleware/logging.d.ts +16 -0
  46. package/http-client/middleware/logging.js +111 -0
  47. package/http-client/middleware/logging.js.map +1 -0
  48. package/http-client/middleware/tracing.js +9 -1
  49. package/http-client/middleware/tracing.js.map +1 -1
  50. package/http-client/sauce/index.d.ts +3 -1
  51. package/http-client/sauce/index.js +15 -2
  52. package/http-client/sauce/index.js.map +1 -1
  53. package/http-server/errors.d.ts +11 -0
  54. package/http-server/errors.js +18 -0
  55. package/http-server/errors.js.map +1 -0
  56. package/http-server/handler/health-check.d.ts +1 -1
  57. package/http-server/handler/health-check.js +1 -1
  58. package/http-server/middleware/metrics.js +2 -2
  59. package/http-server/middleware/metrics.js.map +1 -1
  60. package/http-server/middleware/tracing.d.ts +8 -2
  61. package/http-server/middleware/tracing.js +19 -1
  62. package/http-server/middleware/tracing.js.map +1 -1
  63. package/http-server/template/index.js +6 -0
  64. package/http-server/template/index.js.map +1 -1
  65. package/http-server/types.d.ts +2 -0
  66. package/http-server/utils.d.ts +3 -5
  67. package/http-server/utils.js +16 -15
  68. package/http-server/utils.js.map +1 -1
  69. package/logger/handler/console.d.ts +1 -1
  70. package/logger/handler/console.js +8 -1
  71. package/logger/handler/console.js.map +1 -1
  72. package/logger/handler/sentry.d.ts +3 -3
  73. package/logger/handler/sentry.js +13 -7
  74. package/logger/handler/sentry.js.map +1 -1
  75. package/logger/index.d.ts +2 -6
  76. package/logger/index.js +2 -27
  77. package/logger/index.js.map +1 -1
  78. package/logger/logger.d.ts +6 -0
  79. package/logger/logger.js +31 -0
  80. package/logger/logger.js.map +1 -0
  81. package/logger/types.d.ts +16 -0
  82. package/metrics/constants.d.ts +3 -0
  83. package/metrics/constants.js +3 -0
  84. package/metrics/constants.js.map +1 -1
  85. package/metrics/node.d.ts +7 -0
  86. package/metrics/node.js +1 -0
  87. package/metrics/node.js.map +1 -1
  88. package/package.json +4 -2
  89. package/preset/browser/index.d.ts +12 -0
  90. package/preset/browser/index.js +67 -0
  91. package/preset/browser/index.js.map +1 -0
  92. package/preset/node/index.d.ts +14 -6
  93. package/preset/node/index.js +92 -36
  94. package/preset/node/index.js.map +1 -1
  95. package/preset/node/response.d.ts +14 -8
  96. package/preset/node/response.js +87 -27
  97. package/preset/node/response.js.map +1 -1
  98. package/preset/types.d.ts +7 -6
  99. package/preset/utils.d.ts +15 -0
  100. package/preset/utils.js +26 -0
  101. package/preset/utils.js.map +1 -0
  102. package/tokens.d.ts +35 -18
  103. package/tokens.js +31 -17
  104. package/tokens.js.map +1 -1
  105. package/tracing/index.d.ts +9 -0
  106. package/tracing/index.js +20 -0
  107. package/tracing/index.js.map +1 -0
  108. package/utils/browser/analytics/oko.d.ts +2 -1
  109. package/utils/browser/analytics/oko.js +2 -1
  110. package/utils/browser/analytics/oko.js.map +1 -1
  111. package/utils/browser/storage/index.d.ts +8 -0
  112. package/utils/browser/storage/index.js +5 -0
  113. package/utils/browser/storage/index.js.map +1 -1
  114. package/utils/react/error-handlers/index.d.ts +9 -6
  115. package/utils/react/error-handlers/index.js +4 -3
  116. package/utils/react/error-handlers/index.js.map +1 -1
  117. package/utils/redux/remote-data.d.ts +9 -0
  118. package/utils/redux/remote-data.js +3 -0
  119. package/utils/redux/remote-data.js.map +1 -1
  120. package/utils/redux-saga/index.d.ts +3 -0
  121. package/utils/redux-saga/index.js +8 -0
  122. package/utils/redux-saga/index.js.map +1 -0
  123. package/utils/redux-saga/middleware.d.ts +9 -0
  124. package/utils/redux-saga/middleware.js +87 -0
  125. package/utils/redux-saga/middleware.js.map +1 -0
  126. package/utils/redux-saga/take-chain.d.ts +2 -0
  127. package/utils/redux-saga/take-chain.js +2 -0
  128. package/utils/redux-saga/take-chain.js.map +1 -1
  129. package/utils/redux-saga/types.d.ts +6 -0
  130. package/{saga-runner → utils/redux-saga}/types.js +0 -0
  131. package/{error-tracker → utils/redux-saga}/types.js.map +1 -1
  132. package/utils/ssr/index.d.ts +41 -0
  133. package/utils/ssr/index.js +54 -0
  134. package/utils/ssr/index.js.map +1 -0
  135. package/utils/webpack/index.d.ts +23 -0
  136. package/utils/webpack/index.js +66 -0
  137. package/utils/webpack/index.js.map +1 -0
  138. package/utils/webpack/module-federation/index.d.ts +4 -1
  139. package/utils/webpack/module-federation/index.js +4 -2
  140. package/utils/webpack/module-federation/index.js.map +1 -1
  141. package/utils/webpack/module-federation/types.d.ts +4 -0
  142. package/utils/webpack/module-federation/utils.d.ts +1 -0
  143. package/utils/webpack/module-federation/utils.js +1 -0
  144. package/utils/webpack/module-federation/utils.js.map +1 -1
  145. package/config/index.js.map +0 -1
  146. package/config/utils.d.ts +0 -5
  147. package/config/utils.js +0 -12
  148. package/config/utils.js.map +0 -1
  149. package/container/application.d.ts +0 -25
  150. package/container/application.js.map +0 -1
  151. package/container/index.d.ts +0 -18
  152. package/container/index.js +0 -74
  153. package/container/index.js.map +0 -1
  154. package/container/types.d.ts +0 -14
  155. package/error-tracker/browser.d.ts +0 -8
  156. package/error-tracker/browser.js +0 -40
  157. package/error-tracker/browser.js.map +0 -1
  158. package/error-tracker/node.d.ts +0 -8
  159. package/error-tracker/node.js +0 -40
  160. package/error-tracker/node.js.map +0 -1
  161. package/error-tracker/types.d.ts +0 -18
  162. package/error-tracker/utils.d.ts +0 -12
  163. package/error-tracker/utils.js +0 -19
  164. package/error-tracker/utils.js.map +0 -1
  165. package/preset/index.d.ts +0 -7
  166. package/preset/index.js +0 -25
  167. package/preset/index.js.map +0 -1
  168. package/saga-runner/index.d.ts +0 -8
  169. package/saga-runner/index.js +0 -79
  170. package/saga-runner/index.js.map +0 -1
  171. package/saga-runner/types.d.ts +0 -10
  172. package/saga-runner/types.js.map +0 -1
  173. package/tracer/node.d.ts +0 -10
  174. package/tracer/node.js +0 -38
  175. package/tracer/node.js.map +0 -1
  176. package/tracer/types.d.ts +0 -2
  177. package/tracer/types.js +0 -3
@@ -3,77 +3,118 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.provideDefaultMiddleware = exports.provideTracer = exports.provideLogger = exports.provideBaseConfig = exports.PresetNode = void 0;
6
+ exports.provideKnownHttpApiHosts = exports.provideBridgeServerSide = exports.provideDefaultMiddleware = exports.provideTracerProviderResource = exports.provideTracerProvider = exports.provideSpanExporter = exports.provideTracer = exports.provideLogger = exports.provideBaseConfig = exports.PresetNode = void 0;
7
+ const di_1 = require("../../di");
8
+ const tracing_1 = require("@opentelemetry/tracing");
7
9
  const tokens_1 = require("../../tokens");
8
- const __1 = require("..");
9
10
  const node_1 = require("../../config/node");
10
- const config_1 = require("../../config");
11
+ const base_1 = require("../../config/base");
11
12
  const logger_1 = require("../../logger");
12
- const node_2 = require("../../tracer/node");
13
13
  const console_1 = require("../../logger/handler/console");
14
14
  const sentry_1 = require("../../logger/handler/sentry");
15
- const node_3 = require("../../error-tracker/node");
16
15
  const logging_1 = require("../../http-server/middleware/logging");
17
- const tracing_1 = require("../../http-server/middleware/tracing");
16
+ const tracing_2 = require("../../http-server/middleware/tracing");
18
17
  const metrics_1 = require("../../http-server/middleware/metrics");
19
- const node_4 = require("../../metrics/node");
18
+ const node_2 = require("../../metrics/node");
20
19
  const exporter_jaeger_1 = require("@opentelemetry/exporter-jaeger");
21
20
  const middleware_axios_1 = require("middleware-axios");
22
21
  const express_1 = __importDefault(require("express"));
23
- const node_5 = require("@sentry/node");
22
+ const node_3 = require("@sentry/node");
23
+ const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
24
+ const resources_1 = require("@opentelemetry/resources");
25
+ const propagator_jaeger_1 = require("@opentelemetry/propagator-jaeger");
26
+ const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
27
+ const tracing_3 = require("../../tracing");
28
+ const os_1 = require("os");
29
+ const ssr_1 = require("../../utils/ssr");
30
+ const utils_1 = require("../utils");
24
31
  /**
25
32
  * Возвращает preset с зависимостями по умолчанию для frontend-микросервисов на Node.js.
26
33
  * @return Preset.
27
34
  */
28
35
  function PresetNode() {
29
- return (0, __1.createPreset)([
36
+ return (0, di_1.createPreset)([
30
37
  [tokens_1.KnownToken.Config.source, node_1.createConfigSource],
31
- [tokens_1.KnownToken.Config.base, exports.provideBaseConfig],
32
- [tokens_1.KnownToken.logger, exports.provideLogger],
33
- [tokens_1.KnownToken.tracer, exports.provideTracer],
38
+ [tokens_1.KnownToken.Config.base, provideBaseConfig],
39
+ [tokens_1.KnownToken.logger, provideLogger],
40
+ [tokens_1.KnownToken.Tracing.tracer, provideTracer],
41
+ [tokens_1.KnownToken.Tracing.spanExporter, provideSpanExporter],
42
+ [tokens_1.KnownToken.Tracing.tracerProvider, provideTracerProvider],
43
+ [tokens_1.KnownToken.Tracing.tracerProviderResource, provideTracerProviderResource],
34
44
  [tokens_1.KnownToken.Http.Client.factory, () => middleware_axios_1.create],
35
45
  [tokens_1.KnownToken.Http.Server.factory, () => express_1.default],
36
- [tokens_1.KnownToken.Http.Server.Defaults.middleware, exports.provideDefaultMiddleware],
37
- [tokens_1.KnownToken.Metrics.httpApp, node_4.createMetricsHttpApp],
46
+ [tokens_1.KnownToken.Http.Server.Defaults.middleware, provideDefaultMiddleware],
47
+ [tokens_1.KnownToken.Metrics.httpApp, node_2.createMetricsHttpApp],
48
+ [tokens_1.KnownToken.SsrBridge.serverSide, provideBridgeServerSide],
49
+ [tokens_1.KnownToken.Http.Api.knownHosts, provideKnownHttpApiHosts],
38
50
  ]);
39
51
  }
40
52
  exports.PresetNode = PresetNode;
41
- const provideBaseConfig = resolve => {
53
+ function provideBaseConfig(resolve) {
42
54
  const source = resolve(tokens_1.KnownToken.Config.source);
43
- return (0, config_1.createBaseConfig)(source);
44
- };
55
+ return (0, base_1.createBaseConfig)(source);
56
+ }
45
57
  exports.provideBaseConfig = provideBaseConfig;
46
- const provideLogger = resolve => {
58
+ function provideLogger(resolve) {
47
59
  const source = resolve(tokens_1.KnownToken.Config.source);
48
60
  const config = resolve(tokens_1.KnownToken.Config.base);
49
- const sentry = (0, node_3.createSentryLib)({
50
- dsn: source.get('SENTRY_DSN'),
51
- release: source.get('SENTRY_RELEASE'),
52
- environment: source.get('SENTRY_ENVIRONMENT'),
61
+ const client = new node_3.NodeClient({
62
+ dsn: source.require('SENTRY_SERVER_DSN'),
63
+ release: source.require('SENTRY_RELEASE'),
64
+ environment: source.require('SENTRY_ENVIRONMENT'),
65
+ integrations: [...node_3.defaultIntegrations],
53
66
  });
67
+ const hub = new node_3.Hub(client);
54
68
  const logger = (0, logger_1.createLogger)();
55
69
  logger.subscribe((0, console_1.createConsoleHandler)(config));
56
- logger.subscribe((0, sentry_1.createSentryHandler)(sentry));
70
+ logger.subscribe((0, sentry_1.createSentryHandler)(hub));
57
71
  return logger;
58
- };
72
+ }
59
73
  exports.provideLogger = provideLogger;
60
- const provideTracer = resolve => {
74
+ function provideTracer(resolve) {
75
+ const config = resolve(tokens_1.KnownToken.Config.base);
76
+ const provider = resolve(tokens_1.KnownToken.Tracing.tracerProvider);
77
+ return provider.getTracer(config.appName, config.appVersion);
78
+ }
79
+ exports.provideTracer = provideTracer;
80
+ function provideSpanExporter(resolve) {
61
81
  const source = resolve(tokens_1.KnownToken.Config.source);
62
82
  const exporter = new exporter_jaeger_1.JaegerExporter({
63
- endpoint: source.require('JAEGER_ENDPOINT'),
83
+ host: source.require('JAEGER_AGENT_HOST'),
84
+ port: parseInt(source.require('JAEGER_AGENT_PORT')) || undefined,
64
85
  });
65
- return (0, node_2.createTracer)(resolve(tokens_1.KnownToken.Config.base), exporter);
66
- };
67
- exports.provideTracer = provideTracer;
68
- const provideDefaultMiddleware = resolve => {
86
+ return exporter;
87
+ }
88
+ exports.provideSpanExporter = provideSpanExporter;
89
+ function provideTracerProvider(resolve) {
90
+ const exporter = resolve(tokens_1.KnownToken.Tracing.spanExporter);
91
+ const resource = resolve(tokens_1.KnownToken.Tracing.tracerProviderResource);
92
+ const provider = new sdk_trace_node_1.NodeTracerProvider({
93
+ resource,
94
+ });
95
+ provider.addSpanProcessor(new tracing_1.BatchSpanProcessor(exporter)); // @todo разобраться с as any
96
+ provider.register({
97
+ propagator: new propagator_jaeger_1.JaegerPropagator(),
98
+ });
99
+ return provider; // @todo разобраться с as any
100
+ }
101
+ exports.provideTracerProvider = provideTracerProvider;
102
+ function provideTracerProviderResource(resolve) {
103
+ const config = resolve(tokens_1.KnownToken.Config.base);
104
+ return (0, tracing_3.getConventionalResource)(config).merge(new resources_1.Resource({
105
+ [semantic_conventions_1.SemanticResourceAttributes.HOST_NAME]: (0, os_1.hostname)(),
106
+ }));
107
+ }
108
+ exports.provideTracerProviderResource = provideTracerProviderResource;
109
+ function provideDefaultMiddleware(resolve) {
69
110
  const config = resolve(tokens_1.KnownToken.Config.base);
70
111
  const logger = resolve(tokens_1.KnownToken.logger);
71
- const tracer = resolve(tokens_1.KnownToken.tracer);
72
- const metrics = (0, node_4.createDefaultMetrics)();
112
+ const tracer = resolve(tokens_1.KnownToken.Tracing.tracer);
113
+ const metrics = (0, node_2.createDefaultMetrics)();
73
114
  return {
74
- start: [node_5.Handlers.requestHandler()],
115
+ start: [node_3.Handlers.requestHandler()],
75
116
  logging: [(0, logging_1.loggingMiddleware)(config, logger)],
76
- tracing: [(0, tracing_1.tracingMiddleware)(tracer)],
117
+ tracing: [(0, tracing_2.tracingMiddleware)(tracer)],
77
118
  metrics: [
78
119
  (0, metrics_1.responseMetricsMiddleware)(config, {
79
120
  counter: metrics.requestCount,
@@ -83,8 +124,23 @@ const provideDefaultMiddleware = resolve => {
83
124
  histogram: metrics.renderDuration,
84
125
  }),
85
126
  ],
86
- finish: [node_5.Handlers.errorHandler()],
127
+ finish: [node_3.Handlers.errorHandler()],
87
128
  };
88
- };
129
+ }
89
130
  exports.provideDefaultMiddleware = provideDefaultMiddleware;
131
+ function provideBridgeServerSide(resolve) {
132
+ const config = resolve(tokens_1.KnownToken.Config.base);
133
+ return ssr_1.SsrBridge.prepare(config.appName);
134
+ }
135
+ exports.provideBridgeServerSide = provideBridgeServerSide;
136
+ function provideKnownHttpApiHosts(resolve) {
137
+ const source = resolve(tokens_1.KnownToken.Config.source);
138
+ return new utils_1.HttpApiHostPool({
139
+ ilium: 'API_URL_ILIUM',
140
+ simaV3: 'API_URL_SIMALAND_V3',
141
+ simaV4: 'API_URL_SIMALAND_V4',
142
+ simaV6: 'API_URL_SIMALAND_V6',
143
+ }, source);
144
+ }
145
+ exports.provideKnownHttpApiHosts = provideKnownHttpApiHosts;
90
146
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/preset/node/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/preset/node/index.ts"],"names":[],"mappings":"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"}
@@ -1,17 +1,23 @@
1
1
  /// <reference types="react" />
2
- import type { Preset } from '../types';
3
- import type { Provider, Resolve } from '../../container/types';
4
- import type { SagaRunner } from '../../saga-runner/types';
5
2
  import type { PageTemplate } from '../../http-server/types';
6
3
  import type { Handler } from 'express';
7
- import { Application } from '../../container/application';
4
+ import { Application, Preset, Resolve } from '../../di';
5
+ import { SagaExtendedMiddleware } from '../../utils/redux-saga';
6
+ import { HttpClientFactory } from '../../http-client/types';
8
7
  /**
9
8
  * Возвращает preset с зависимостями по умолчанию для работы в рамках ответа на http-запрос.
10
9
  * @return Preset.
11
10
  */
12
11
  export declare function PresetResponse(): Preset;
13
- export declare const provideSagaRunner: Provider<SagaRunner>;
14
- export declare const provideRender: Provider<(el: JSX.Element) => string | Promise<string>>;
15
- export declare const provideTemplate: Provider<PageTemplate>;
16
- export declare const provideMain: Provider<() => void>;
12
+ export declare function provideHttpClientFactory(resolve: Resolve): HttpClientFactory;
13
+ export declare function provideSagaMiddleware(resolve: Resolve): SagaExtendedMiddleware;
14
+ export declare function provideRender(resolve: Resolve): (element: JSX.Element) => string;
15
+ export declare function provideTemplate(resolve: Resolve): PageTemplate;
16
+ export declare function provideMain(resolve: Resolve): VoidFunction;
17
+ export declare function provideParams(resolve: Resolve): Record<string, unknown>;
18
+ /**
19
+ * Возвращает express-handler, создающий дочернее di-приложение при запросе.
20
+ * @param appFactory Фабрика di-приложения запроса.
21
+ * @return Обработчик.
22
+ */
17
23
  export declare function HandlerProvider(appFactory: () => Application): (resolve: Resolve) => Handler;
@@ -1,33 +1,55 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.HandlerProvider = exports.provideMain = exports.provideTemplate = exports.provideRender = exports.provideSagaRunner = exports.PresetResponse = void 0;
4
- const application_1 = require("../../container/application");
3
+ exports.HandlerProvider = exports.provideParams = exports.provideMain = exports.provideTemplate = exports.provideRender = exports.provideSagaMiddleware = exports.provideHttpClientFactory = exports.PresetResponse = void 0;
4
+ const di_1 = require("../../di");
5
5
  const tokens_1 = require("../../tokens");
6
- const __1 = require("..");
7
6
  const server_1 = require("react-dom/server");
8
- const saga_runner_1 = require("../../saga-runner");
9
7
  const constants_1 = require("../../http-server/constants");
10
8
  const template_1 = require("../../http-server/template");
11
9
  const utils_1 = require("../../http-server/utils");
10
+ const redux_saga_1 = require("../../utils/redux-saga");
11
+ const middleware_axios_1 = require("middleware-axios");
12
+ const tracing_1 = require("../../http-client/middleware/tracing");
13
+ const logging_1 = require("../../http-client/middleware/logging");
14
+ const headers_1 = require("../../http-client/middleware/headers");
15
+ const cookie_1 = require("../../http-client/middleware/cookie");
16
+ const errors_1 = require("../../http-server/errors");
12
17
  /**
13
18
  * Возвращает preset с зависимостями по умолчанию для работы в рамках ответа на http-запрос.
14
19
  * @return Preset.
15
20
  */
16
21
  function PresetResponse() {
17
- return (0, __1.createPreset)([
18
- [tokens_1.KnownToken.Response.sagaRunner, exports.provideSagaRunner],
19
- [tokens_1.KnownToken.Response.render, exports.provideRender],
20
- [tokens_1.KnownToken.Response.template, exports.provideTemplate],
21
- [tokens_1.KnownToken.Response.main, exports.provideMain],
22
+ return (0, di_1.createPreset)([
23
+ [tokens_1.KnownToken.sagaMiddleware, provideSagaMiddleware],
24
+ [tokens_1.KnownToken.Response.render, provideRender],
25
+ [tokens_1.KnownToken.Response.template, provideTemplate],
26
+ [tokens_1.KnownToken.Response.main, provideMain],
27
+ [tokens_1.KnownToken.Response.params, provideParams],
28
+ [tokens_1.KnownToken.Http.Client.factory, provideHttpClientFactory],
22
29
  ]);
23
30
  }
24
31
  exports.PresetResponse = PresetResponse;
25
- const provideSagaRunner = resolve => {
32
+ function provideHttpClientFactory(resolve) {
26
33
  const logger = resolve(tokens_1.KnownToken.logger);
27
- return (0, saga_runner_1.createSagaRunner)(logger);
28
- };
29
- exports.provideSagaRunner = provideSagaRunner;
30
- const provideRender = resolve => {
34
+ const tracer = resolve(tokens_1.KnownToken.Tracing.tracer);
35
+ const context = resolve(tokens_1.KnownToken.Response.context);
36
+ return function createHttpClient(config) {
37
+ return (0, middleware_axios_1.create)(config)
38
+ .use((0, tracing_1.tracingMiddleware)(tracer, context.res.locals.tracing.rootContext))
39
+ .use((0, logging_1.loggingMiddleware)(logger))
40
+ .use((0, headers_1.passHeadersMiddleware)(context.req, {
41
+ predicate: headerName => headerName.startsWith('simaland-'),
42
+ }))
43
+ .use((0, cookie_1.collectCookieMiddleware)(context.req, context.res));
44
+ };
45
+ }
46
+ exports.provideHttpClientFactory = provideHttpClientFactory;
47
+ function provideSagaMiddleware(resolve) {
48
+ const logger = resolve(tokens_1.KnownToken.logger);
49
+ return (0, redux_saga_1.createSagaMiddleware)(logger);
50
+ }
51
+ exports.provideSagaMiddleware = provideSagaMiddleware;
52
+ function provideRender(resolve) {
31
53
  const { res } = resolve(tokens_1.KnownToken.Response.context);
32
54
  return function render(element) {
33
55
  res.emit(constants_1.RESPONSE_EVENT.renderStart);
@@ -35,37 +57,75 @@ const provideRender = resolve => {
35
57
  res.emit(constants_1.RESPONSE_EVENT.renderFinish);
36
58
  return result;
37
59
  };
38
- };
60
+ }
39
61
  exports.provideRender = provideRender;
40
- const provideTemplate = resolve => {
62
+ function provideTemplate(resolve) {
41
63
  const config = resolve(tokens_1.KnownToken.Config.base);
42
64
  return function template(data) {
43
65
  return data.type === 'html'
44
66
  ? (0, template_1.pageTemplate)({ ...data, title: `[dev] ${config.appName}` })
45
67
  : data.markup;
46
68
  };
47
- };
69
+ }
48
70
  exports.provideTemplate = provideTemplate;
49
- const provideMain = resolve => {
71
+ function provideMain(resolve) {
50
72
  const context = resolve(tokens_1.KnownToken.Response.context);
51
73
  const assets = resolve(tokens_1.KnownToken.Response.assets);
52
74
  const prepare = resolve(tokens_1.KnownToken.Response.prepare);
53
75
  const render = resolve(tokens_1.KnownToken.Response.render);
54
76
  const template = resolve(tokens_1.KnownToken.Response.template);
77
+ const logger = resolve(tokens_1.KnownToken.logger);
55
78
  return async function main() {
56
- utils_1.PageResponse.create()
57
- .markup(await render(await prepare()))
58
- .script(assets.js)
59
- .styles(assets.css)
60
- .format(utils_1.PageResponse.defineFormat(context.req))
61
- .template(template)
62
- .send(context.res);
79
+ try {
80
+ new utils_1.PageResponse()
81
+ .markup(await render(await prepare()))
82
+ .assets(assets)
83
+ .format(utils_1.PageResponse.defineFormat(context.req))
84
+ .template(template)
85
+ .send(context.res);
86
+ }
87
+ catch (error) {
88
+ let message;
89
+ let statusCode = 500;
90
+ if (error instanceof Error) {
91
+ message = error.message;
92
+ if (error instanceof errors_1.SSRError) {
93
+ statusCode = error.statusCode;
94
+ }
95
+ }
96
+ else {
97
+ message = String(error);
98
+ }
99
+ context.res.status(statusCode).send(message);
100
+ logger.error(error);
101
+ }
63
102
  };
64
- };
103
+ }
65
104
  exports.provideMain = provideMain;
105
+ function provideParams(resolve) {
106
+ const context = resolve(tokens_1.KnownToken.Response.context);
107
+ try {
108
+ const headerValue = context.req.header('simaland-params');
109
+ /**
110
+ * Node.js переводит в ASCII.
111
+ * @see {https://github.com/nodejs/node/issues/17390}
112
+ */
113
+ const processedValue = headerValue ? Buffer.from(headerValue, 'binary').toString('utf8') : '';
114
+ return processedValue ? JSON.parse(processedValue) : {};
115
+ }
116
+ catch {
117
+ return {};
118
+ }
119
+ }
120
+ exports.provideParams = provideParams;
121
+ /**
122
+ * Возвращает express-handler, создающий дочернее di-приложение при запросе.
123
+ * @param appFactory Фабрика di-приложения запроса.
124
+ * @return Обработчик.
125
+ */
66
126
  function HandlerProvider(appFactory) {
67
127
  return function provider(resolve) {
68
- const parent = resolve(application_1.Application.self);
128
+ const parent = resolve(di_1.CURRENT_APP);
69
129
  return function handler(req, res, next) {
70
130
  const app = appFactory();
71
131
  app.attach(parent);
@@ -1 +1 @@
1
- {"version":3,"file":"response.js","sourceRoot":"","sources":["../../../src/preset/node/response.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"response.js","sourceRoot":"","sources":["../../../src/preset/node/response.ts"],"names":[],"mappings":"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"}
package/preset/types.d.ts CHANGED
@@ -1,7 +1,8 @@
1
- import type { Application } from '../container/application';
2
- import type { Token, Provider } from '../container/types';
3
- export declare type PresetEntry<T = any> = [Token<T>, Provider<T>];
4
- export interface Preset {
5
- override: <T>(token: Token<T>, provider: Provider<T>) => this;
6
- apply: (app: Application) => void;
1
+ export declare type KnownHttpApiKey = 'ilium' | 'simaV3' | 'simaV4' | 'simaV6';
2
+ /**
3
+ * Строгая версия Map без возможности добавлять/удалять.
4
+ */
5
+ export interface StrictMap<Key extends string> {
6
+ /** Возвращает значение по ключу. */
7
+ get(key: Key): string;
7
8
  }
@@ -0,0 +1,15 @@
1
+ import { ConfigSource } from '../config/types';
2
+ import { StrictMap } from './types';
3
+ /** Реализация пула хостов. */
4
+ export declare class HttpApiHostPool<Key extends string> implements StrictMap<Key> {
5
+ private map;
6
+ private source;
7
+ /**
8
+ * Конструктор.
9
+ * @param map Карта значений по их ключам.
10
+ * @param source Источник конфигурации.
11
+ */
12
+ constructor(map: Record<Key, string>, source: ConfigSource);
13
+ /** @inheritDoc */
14
+ get(key: Key): string;
15
+ }
@@ -0,0 +1,26 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.HttpApiHostPool = void 0;
4
+ /** Реализация пула хостов. */
5
+ class HttpApiHostPool {
6
+ /**
7
+ * Конструктор.
8
+ * @param map Карта значений по их ключам.
9
+ * @param source Источник конфигурации.
10
+ */
11
+ constructor(map, source) {
12
+ this.map = map;
13
+ this.source = source;
14
+ }
15
+ /** @inheritDoc */
16
+ get(key) {
17
+ const variableName = this.map[key];
18
+ if (!variableName) {
19
+ throw Error(`Known HTTP API not found by key "${key}"`);
20
+ }
21
+ // "лениво" берём переменную, именно в момент вызова (чтобы не заставлять указывать в сервисах все переменные разом)
22
+ return this.source.require(variableName);
23
+ }
24
+ }
25
+ exports.HttpApiHostPool = HttpApiHostPool;
26
+ //# sourceMappingURL=utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/preset/utils.ts"],"names":[],"mappings":";;;AAGA,8BAA8B;AAC9B,MAAa,eAAe;IAI1B;;;;OAIG;IACH,YAAY,GAAwB,EAAE,MAAoB;QACxD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,kBAAkB;IAClB,GAAG,CAAC,GAAQ;QACV,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEnC,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,KAAK,CAAC,oCAAoC,GAAG,GAAG,CAAC,CAAC;SACzD;QAED,oHAAoH;QACpH,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3C,CAAC;CACF;AAzBD,0CAyBC"}
package/tokens.d.ts CHANGED
@@ -1,41 +1,58 @@
1
1
  /// <reference types="react" />
2
2
  import type { Application } from 'express';
3
3
  import type { DefaultMiddleware, PageAssets, PageTemplate, ResponseContext } from './http-server/types';
4
- import type { SagaRunner } from './saga-runner/types';
4
+ import type { SagaExtendedMiddleware } from './utils/redux-saga';
5
5
  import type { Logger } from './logger/types';
6
6
  import type { HttpClientFactory } from './http-client/types';
7
7
  import type { BaseConfig } from './config/types';
8
- import type { Tracer } from './tracer/types';
8
+ import type { Tracer } from '@opentelemetry/api';
9
9
  import type { Cache } from './cache/types';
10
+ import type { BasicTracerProvider, SpanExporter } from '@opentelemetry/tracing';
11
+ import type { Resource } from '@opentelemetry/resources';
12
+ import { BridgeClientSide, BridgeServerSide } from './utils/ssr';
13
+ import { StrictMap, KnownHttpApiKey } from './preset/types';
10
14
  export declare const KnownToken: {
11
15
  readonly Config: {
12
- readonly source: import("./container/types").Token<import("@humanwhocodes/env").Env>;
13
- readonly base: import("./container/types").Token<BaseConfig>;
16
+ readonly source: import("./di").Token<import("@humanwhocodes/env").Env>;
17
+ readonly base: import("./di").Token<BaseConfig>;
18
+ };
19
+ readonly cache: import("./di").Token<Cache>;
20
+ readonly logger: import("./di").Token<Logger>;
21
+ readonly sagaMiddleware: import("./di").Token<SagaExtendedMiddleware>;
22
+ readonly Tracing: {
23
+ readonly tracer: import("./di").Token<Tracer>;
24
+ readonly spanExporter: import("./di").Token<SpanExporter>;
25
+ readonly tracerProvider: import("./di").Token<BasicTracerProvider>;
26
+ readonly tracerProviderResource: import("./di").Token<Resource>;
14
27
  };
15
- readonly cache: import("./container/types").Token<Cache>;
16
- readonly logger: import("./container/types").Token<Logger>;
17
- readonly tracer: import("./container/types").Token<Tracer>;
18
28
  readonly Metrics: {
19
- readonly httpApp: import("./container/types").Token<Application>;
29
+ readonly httpApp: import("./di").Token<Application>;
20
30
  };
21
31
  readonly Http: {
22
32
  readonly Client: {
23
- readonly factory: import("./container/types").Token<HttpClientFactory>;
33
+ readonly factory: import("./di").Token<HttpClientFactory>;
24
34
  };
25
35
  readonly Server: {
26
- readonly factory: import("./container/types").Token<() => Application>;
36
+ readonly factory: import("./di").Token<() => Application>;
27
37
  readonly Defaults: {
28
- readonly middleware: import("./container/types").Token<DefaultMiddleware>;
38
+ readonly middleware: import("./di").Token<DefaultMiddleware>;
29
39
  };
30
40
  };
41
+ readonly Api: {
42
+ readonly knownHosts: import("./di").Token<StrictMap<KnownHttpApiKey>>;
43
+ };
31
44
  };
32
45
  readonly Response: {
33
- readonly template: import("./container/types").Token<PageTemplate>;
34
- readonly context: import("./container/types").Token<ResponseContext>;
35
- readonly assets: import("./container/types").Token<PageAssets>;
36
- readonly prepare: import("./container/types").Token<() => JSX.Element | Promise<JSX.Element>>;
37
- readonly render: import("./container/types").Token<(element: JSX.Element) => string | Promise<string>>;
38
- readonly main: import("./container/types").Token<() => void>;
39
- readonly sagaRunner: import("./container/types").Token<SagaRunner>;
46
+ readonly params: import("./di").Token<Record<string, unknown>>;
47
+ readonly template: import("./di").Token<PageTemplate>;
48
+ readonly context: import("./di").Token<ResponseContext>;
49
+ readonly assets: import("./di").Token<PageAssets>;
50
+ readonly prepare: import("./di").Token<() => JSX.Element | Promise<JSX.Element>>;
51
+ readonly render: import("./di").Token<(element: JSX.Element) => string | Promise<string>>;
52
+ readonly main: import("./di").Token<() => void>;
53
+ };
54
+ readonly SsrBridge: {
55
+ readonly clientSide: import("./di").Token<BridgeClientSide<unknown>>;
56
+ readonly serverSide: import("./di").Token<BridgeServerSide>;
40
57
  };
41
58
  };