@sima-land/isomorph 11.0.0-alpha.32 → 11.0.0-alpha.34

package/preset/node/handler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/preset/node/handler.ts"],"names":[],"mappings":"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"}

package/preset/node/index.d.ts

@@ -1,23 +1,29 @@
-import type { Logger, LoggerEventHandler } from '../../log/types';
-import type { Tracer } from '@opentelemetry/api';
-import type { DefaultMiddleware } from '../../http-server/types';
+import type { Logger, LogHandler } from '../../log/types';
+import { BridgeServerSide } from '../../utils/ssr';
+import { ConfigSource } from '../../config';
 import { Resolve, Preset } from '../../di';
+import { StrictMap, KnownHttpApiKey, PresetTuner } from '../parts/types';
+import { Application, Handler } from 'express';
+import type { Tracer } from '@opentelemetry/api';
 import { BasicTracerProvider, SpanExporter } from '@opentelemetry/sdk-trace-base';
 import { Resource } from '@opentelemetry/resources';
-import { BridgeServerSide } from '../../utils/ssr';
-import { StrictMap, KnownHttpApiKey } from '../parts/types';
 /**
  * Возвращает preset с зависимостями по умолчанию для frontend-микросервисов на Node.js.
+ * @param customize Получит функцию с помощью которой можно переопределить предустановленные провайдеры.
  * @return Preset.
  */
-export declare function PresetNode(): Preset;
+export declare function PresetNode(customize?: PresetTuner): Preset;
+export declare function provideConfigSource(): ConfigSource;
 export declare function provideLogger(resolve: Resolve): Logger;
-export declare function provideSentryHandler(resolve: Resolve): LoggerEventHandler;
-export declare function providePinoHandler(resolve: Resolve): LoggerEventHandler;
+export declare function provideSentryHandler(resolve: Resolve): LogHandler;
+export declare function providePinoHandler(resolve: Resolve): LogHandler;
 export declare function provideTracer(resolve: Resolve): Tracer;
 export declare function provideSpanExporter(resolve: Resolve): SpanExporter;
 export declare function provideTracerProvider(resolve: Resolve): BasicTracerProvider;
 export declare function provideTracerProviderResource(resolve: Resolve): Resource;
-export declare function provideDefaultMiddleware(resolve: Resolve): DefaultMiddleware;
+export declare function provideHttpServerLogMiddleware(resolve: Resolve): Handler;
+export declare function provideHttpServerMetricsMiddleware(resolve: Resolve): Handler;
+export declare function provideHttpServerTracingMiddleware(resolve: Resolve): Handler;
 export declare function provideBridgeServerSide(resolve: Resolve): BridgeServerSide;
 export declare function provideKnownHttpApiHosts(resolve: Resolve): StrictMap<KnownHttpApiKey>;
+export declare function provideMetricsHttpApp(): Application;

package/preset/node/index.js

@@ -1,57 +1,113 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.provideKnownHttpApiHosts = exports.provideBridgeServerSide = exports.provideDefaultMiddleware = exports.provideTracerProviderResource = exports.provideTracerProvider = exports.provideSpanExporter = exports.provideTracer = exports.providePinoHandler = exports.provideSentryHandler = exports.provideLogger = exports.PresetNode = void 0;
-const di_1 = require("../../di");
-const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
-const tokens_1 = require("../../tokens");
-const node_1 = require("../../config/node");
+exports.provideMetricsHttpApp = exports.provideKnownHttpApiHosts = exports.provideBridgeServerSide = exports.provideHttpServerTracingMiddleware = exports.provideHttpServerMetricsMiddleware = exports.provideHttpServerLogMiddleware = exports.provideTracerProviderResource = exports.provideTracerProvider = exports.provideSpanExporter = exports.provideTracer = exports.providePinoHandler = exports.provideSentryHandler = exports.provideLogger = exports.provideConfigSource = exports.PresetNode = void 0;
+const ssr_1 = require("../../utils/ssr");
+const config_1 = require("../../config");
 const log_1 = require("../../log");
 const pino_1 = require("../../log/handler/pino");
 const sentry_1 = require("../../log/handler/sentry");
-const log_2 = require("../../http-server/middleware/log");
-const tracing_1 = require("../../http-server/middleware/tracing");
 const metrics_1 = require("../../http-server/middleware/metrics");
-const node_2 = require("../../metrics/node");
-const exporter_jaeger_1 = require("@opentelemetry/exporter-jaeger");
+const utils_1 = require("../parts/utils");
+const tokens_1 = require("../../tokens");
+const providers_1 = require("../parts/providers");
+const di_1 = require("../../di");
+const tracing_1 = require("../../http-server/middleware/tracing");
+// nodejs specific packages
+const node_os_1 = __importDefault(require("node:os"));
+const node_path_1 = __importDefault(require("node:path"));
+// nodejs libraries (not isomorphic)
+const dotenv_1 = require("dotenv");
 const middleware_axios_1 = require("middleware-axios");
+const node_1 = require("@sentry/node");
+const PromClient = __importStar(require("prom-client"));
 const express_1 = __importDefault(require("express"));
-const node_3 = require("@sentry/node");
+const pino_2 = __importDefault(require("pino"));
+const pino_pretty_1 = __importDefault(require("pino-pretty"));
+const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
+const exporter_trace_otlp_http_1 = require("@opentelemetry/exporter-trace-otlp-http");
+const propagator_jaeger_1 = require("@opentelemetry/propagator-jaeger");
 const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
 const resources_1 = require("@opentelemetry/resources");
-const propagator_jaeger_1 = require("@opentelemetry/propagator-jaeger");
 const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
-const tracing_2 = require("../../tracing");
-const os_1 = require("os");
-const ssr_1 = require("../../utils/ssr");
-const utils_1 = require("../parts/utils");
-const providers_1 = require("../parts/providers");
-const pino_2 = __importDefault(require("pino"));
-const pino_pretty_1 = __importDefault(require("pino-pretty"));
+const health_check_1 = require("../../http-server/handler/health-check");
+const utils_2 = require("../../http-server/utils");
+const node_2 = require("../../metrics/node");
+const number_1 = require("../../utils/number");
 /**
  * Возвращает preset с зависимостями по умолчанию для frontend-микросервисов на Node.js.
+ * @param customize Получит функцию с помощью которой можно переопределить предустановленные провайдеры.
  * @return Preset.
  */
-function PresetNode() {
-    return (0, di_1.createPreset)([
-        [tokens_1.KnownToken.Config.source, node_1.createConfigSource],
-        [tokens_1.KnownToken.Config.base, providers_1.provideBaseConfig],
-        [tokens_1.KnownToken.logger, provideLogger],
-        [tokens_1.KnownToken.Tracing.tracer, provideTracer],
-        [tokens_1.KnownToken.Tracing.spanExporter, provideSpanExporter],
-        [tokens_1.KnownToken.Tracing.tracerProvider, provideTracerProvider],
-        [tokens_1.KnownToken.Tracing.tracerProviderResource, provideTracerProviderResource],
-        [tokens_1.KnownToken.Http.Client.factory, () => middleware_axios_1.create],
-        [tokens_1.KnownToken.Http.Server.factory, () => express_1.default],
-        [tokens_1.KnownToken.Http.Server.Defaults.middleware, provideDefaultMiddleware],
-        [tokens_1.KnownToken.Metrics.httpApp, node_2.createMetricsHttpApp],
-        [tokens_1.KnownToken.SsrBridge.serverSide, provideBridgeServerSide],
-        [tokens_1.KnownToken.Http.Api.knownHosts, provideKnownHttpApiHosts],
-    ]);
+function PresetNode(customize) {
+    // ВАЖНО: используем .set() вместо аргумента defaults функции createPreset из-за скорости
+    const preset = (0, di_1.createPreset)();
+    // config
+    preset.set(tokens_1.KnownToken.Config.source, provideConfigSource);
+    preset.set(tokens_1.KnownToken.Config.base, providers_1.provideBaseConfig);
+    // log
+    preset.set(tokens_1.KnownToken.logger, provideLogger);
+    // tracing
+    preset.set(tokens_1.KnownToken.Tracing.tracer, provideTracer);
+    preset.set(tokens_1.KnownToken.Tracing.spanExporter, provideSpanExporter);
+    preset.set(tokens_1.KnownToken.Tracing.tracerProvider, provideTracerProvider);
+    preset.set(tokens_1.KnownToken.Tracing.tracerProviderResource, provideTracerProviderResource);
+    // metrics
+    preset.set(tokens_1.KnownToken.Metrics.httpApp, provideMetricsHttpApp);
+    // http client
+    preset.set(tokens_1.KnownToken.Http.Client.factory, () => middleware_axios_1.create);
+    // http server
+    preset.set(tokens_1.KnownToken.Http.Server.factory, () => express_1.default);
+    preset.set(tokens_1.KnownToken.Http.Server.Handler.healthCheck, () => (0, health_check_1.healthCheck)());
+    preset.set(tokens_1.KnownToken.Http.Server.Middleware.request, () => node_1.Handlers.requestHandler());
+    preset.set(tokens_1.KnownToken.Http.Server.Middleware.log, provideHttpServerLogMiddleware);
+    preset.set(tokens_1.KnownToken.Http.Server.Middleware.metrics, provideHttpServerMetricsMiddleware);
+    preset.set(tokens_1.KnownToken.Http.Server.Middleware.tracing, provideHttpServerTracingMiddleware);
+    preset.set(tokens_1.KnownToken.Http.Server.Middleware.error, () => node_1.Handlers.errorHandler());
+    // http api
+    preset.set(tokens_1.KnownToken.Http.Api.knownHosts, provideKnownHttpApiHosts);
+    // ssr bridge
+    preset.set(tokens_1.KnownToken.SsrBridge.serverSide, provideBridgeServerSide);
+    if (customize) {
+        customize({ override: preset.set.bind(preset) });
+    }
+    return preset;
 }
 exports.PresetNode = PresetNode;
+function provideConfigSource() {
+    const envName = process.env.NODE_ENV;
+    // подключаем соответствующий среде файл со значениями по умолчанию
+    if (envName) {
+        (0, dotenv_1.config)({ path: node_path_1.default.resolve(process.cwd(), `./.env.${envName}`) });
+    }
+    return (0, config_1.createConfigSource)(process.env);
+}
+exports.provideConfigSource = provideConfigSource;
 function provideLogger(resolve) {
     const logger = (0, log_1.createLogger)();
     // @todo возможно надо придумать как не давать вызывать провайдеры внутри провайдеров
@@ -63,14 +119,14 @@ exports.provideLogger = provideLogger;
 function provideSentryHandler(resolve) {
     const source = resolve(tokens_1.KnownToken.Config.source);
     // экспериментально пробуем не использовать вручную созданный клиент
-    (0, node_3.init)({
+    (0, node_1.init)({
         dsn: source.require('SENTRY_DSN'),
         release: source.require('SENTRY_RELEASE'),
         environment: source.require('SENTRY_ENVIRONMENT'),
     });
     // ВАЖНО: передаем функцию чтобы брать текущий hub в момент вызова метода logger'а
     // это нужно чтобы хлебные крошки в ошибках Sentry группировались по запросам
-    return (0, sentry_1.createSentryHandler)(node_3.getCurrentHub);
+    return (0, sentry_1.createSentryHandler)(node_1.getCurrentHub);
 }
 exports.provideSentryHandler = provideSentryHandler;
 function providePinoHandler(resolve) {
@@ -97,55 +153,82 @@ function provideTracer(resolve) {
 exports.provideTracer = provideTracer;
 function provideSpanExporter(resolve) {
     const source = resolve(tokens_1.KnownToken.Config.source);
-    const exporter = new exporter_jaeger_1.JaegerExporter({
-        host: source.require('JAEGER_AGENT_HOST'),
-        port: parseInt(source.require('JAEGER_AGENT_PORT')) || undefined,
+    const host = source.require('JAEGER_AGENT_HOST');
+    const port = source.require('JAEGER_AGENT_PORT');
+    return new exporter_trace_otlp_http_1.OTLPTraceExporter({
+        url: port ? `${host}:${port}` : host,
     });
-    return exporter;
 }
 exports.provideSpanExporter = provideSpanExporter;
 function provideTracerProvider(resolve) {
     const exporter = resolve(tokens_1.KnownToken.Tracing.spanExporter);
     const resource = resolve(tokens_1.KnownToken.Tracing.tracerProviderResource);
-    const provider = new sdk_trace_node_1.NodeTracerProvider({
-        resource,
-    });
+    const provider = new sdk_trace_node_1.NodeTracerProvider({ resource });
     provider.addSpanProcessor(new sdk_trace_base_1.BatchSpanProcessor(exporter));
-    provider.register({
-        propagator: new propagator_jaeger_1.JaegerPropagator(),
-    });
+    provider.register({ propagator: new propagator_jaeger_1.JaegerPropagator() });
     return provider;
 }
 exports.provideTracerProvider = provideTracerProvider;
 function provideTracerProviderResource(resolve) {
     const config = resolve(tokens_1.KnownToken.Config.base);
-    return (0, tracing_2.getConventionalResource)(config).merge(new resources_1.Resource({
-        [semantic_conventions_1.SemanticResourceAttributes.HOST_NAME]: (0, os_1.hostname)(),
-    }));
+    return new resources_1.Resource({
+        [semantic_conventions_1.SemanticResourceAttributes.HOST_NAME]: node_os_1.default.hostname(),
+        [semantic_conventions_1.SemanticResourceAttributes.SERVICE_NAME]: config.appName,
+        [semantic_conventions_1.SemanticResourceAttributes.SERVICE_VERSION]: config.appVersion,
+        [semantic_conventions_1.SemanticResourceAttributes.DEPLOYMENT_ENVIRONMENT]: config.env,
+    });
 }
 exports.provideTracerProviderResource = provideTracerProviderResource;
-function provideDefaultMiddleware(resolve) {
+function provideHttpServerLogMiddleware(resolve) {
     const config = resolve(tokens_1.KnownToken.Config.base);
     const logger = resolve(tokens_1.KnownToken.logger);
-    const tracer = resolve(tokens_1.KnownToken.Tracing.tracer);
-    const metrics = (0, node_2.createDefaultMetrics)();
-    return {
-        start: [node_3.Handlers.requestHandler()],
-        logging: [(0, log_2.logMiddleware)(config, logger)],
-        tracing: [(0, tracing_1.tracingMiddleware)(tracer)],
-        metrics: [
-            (0, metrics_1.responseMetricsMiddleware)(config, {
-                counter: metrics.requestCount,
-                histogram: metrics.responseDuration,
-            }),
-            (0, metrics_1.renderMetricsMiddleware)(config, {
-                histogram: metrics.renderDuration,
-            }),
-        ],
-        finish: [node_3.Handlers.errorHandler()],
+    return (req, res, next) => {
+        const start = process.hrtime.bigint();
+        const remoteIp = (0, utils_2.getXClientIp)(req);
+        const startMsg = {
+            type: 'http.request[incoming]',
+            version: config.appVersion,
+            route: req.originalUrl,
+            method: req.method,
+            remote_ip: remoteIp,
+        };
+        logger.info(startMsg);
+        res.once('finish', () => {
+            const finish = process.hrtime.bigint();
+            const finishMsg = {
+                type: 'http.response[outgoing]',
+                version: config.appVersion,
+                route: req.originalUrl,
+                method: req.method,
+                status: res.statusCode,
+                remote_ip: remoteIp,
+                latency: (0, number_1.toMilliseconds)(finish - start),
+            };
+            logger.info(finishMsg);
+        });
+        next();
     };
 }
-exports.provideDefaultMiddleware = provideDefaultMiddleware;
+exports.provideHttpServerLogMiddleware = provideHttpServerLogMiddleware;
+function provideHttpServerMetricsMiddleware(resolve) {
+    const config = resolve(tokens_1.KnownToken.Config.base);
+    const metrics = (0, node_2.createDefaultMetrics)();
+    return (0, utils_2.composeMiddleware)([
+        (0, metrics_1.responseMetricsMiddleware)(config, {
+            counter: metrics.requestCount,
+            histogram: metrics.responseDuration,
+        }),
+        (0, metrics_1.renderMetricsMiddleware)(config, {
+            histogram: metrics.renderDuration,
+        }),
+    ]);
+}
+exports.provideHttpServerMetricsMiddleware = provideHttpServerMetricsMiddleware;
+function provideHttpServerTracingMiddleware(resolve) {
+    const tracer = resolve(tokens_1.KnownToken.Tracing.tracer);
+    return (0, tracing_1.tracingMiddleware)(tracer);
+}
+exports.provideHttpServerTracingMiddleware = provideHttpServerTracingMiddleware;
 function provideBridgeServerSide(resolve) {
     const config = resolve(tokens_1.KnownToken.Config.base);
     return ssr_1.SsrBridge.prepare(config.appName);
@@ -161,4 +244,15 @@ function provideKnownHttpApiHosts(resolve) {
     }, source);
 }
 exports.provideKnownHttpApiHosts = provideKnownHttpApiHosts;
+function provideMetricsHttpApp() {
+    PromClient.collectDefaultMetrics();
+    const app = (0, express_1.default)();
+    app.get('/', async function (req, res) {
+        const metrics = await PromClient.register.metrics();
+        res.setHeader('Content-Type', PromClient.register.contentType);
+        res.send(metrics);
+    });
+    return app;
+}
+exports.provideMetricsHttpApp = provideMetricsHttpApp;
 //# sourceMappingURL=index.js.map

package/preset/node/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/preset/node/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/preset/node/index.ts"],"names":[],"mappings":"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"}

package/preset/parts/types.d.ts

@@ -1,3 +1,9 @@
+import type { Provider, Token } from '../../di';
+export interface PresetTuner {
+    (tools: {
+        override: <T>(token: Token<T>, provider: Provider<T>) => void;
+    }): void;
+}
 export type KnownHttpApiKey = 'ilium' | 'simaV3' | 'simaV4' | 'simaV6';
 /**
  * Строгая версия Map без возможности добавлять/удалять.

package/preset/parts/utils.d.ts

@@ -1,9 +1,9 @@
 import { SeverityLevel } from '@sentry/browser';
 import type { Middleware } from 'middleware-axios';
 import { ConfigSource } from '../../config/types';
+import { Logger } from '../../log';
 import { SharedData, DoneSharedData, FailSharedData, LogMiddlewareHandler } from '../../http-client/middleware/log';
 import { applyAxiosDefaults } from '../../http-client/utils';
-import { Logger } from '../../log';
 import { SagaErrorInfo, SagaInterruptInfo, SagaMiddlewareHandler } from '../../utils/redux-saga/types';
 import { StrictMap } from './types';
 /** Реализация пула хостов. */
@@ -106,5 +106,5 @@ export declare abstract class HttpStatus {
      * Валидация применяется только если в конфиге запроса не указан validateStatus.
      * @return Промежуточный слой.
      */
-    static createMiddleware(): Middleware<unknown>;
+    static axiosMiddleware(): Middleware<unknown>;
 }

package/preset/parts/utils.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpStatus = exports.SagaLogging = exports.HttpClientLogging = exports.severityFromStatus = exports.HttpApiHostPool = void 0;
 const axios_1 = __importDefault(require("axios"));
-const error_tracking_1 = require("../../error-tracking");
+const log_1 = require("../../log");
 const utils_1 = require("../../http-client/utils");
 /** Реализация пула хостов. */
 class HttpApiHostPool {
@@ -77,7 +77,7 @@ class HttpClientLogging {
      */
     beforeRequest() {
         const { readyURL, method, params } = this.requestInfo;
-        this.logger.info(new error_tracking_1.SentryBreadcrumb({
+        this.logger.info(new log_1.Breadcrumb({
             category: 'http.request',
             type: 'http',
             data: {
@@ -94,7 +94,7 @@ class HttpClientLogging {
      */
     afterResponse({ response }) {
         const { readyURL, method, params } = this.requestInfo;
-        this.logger.info(new error_tracking_1.SentryBreadcrumb({
+        this.logger.info(new log_1.Breadcrumb({
             category: 'http.response',
             type: 'http',
             data: {
@@ -116,7 +116,7 @@ class HttpClientLogging {
             const statusCode = error.response?.status || 'UNKNOWN';
             // @todo выяснить: нужно ли нам отправлять ответы с кодом <500 в Sentry на уровне всех команд
             // если да то можно добавить метод в духе errorStatusFilter(s => s !== 422)
-            this.logger.error(new error_tracking_1.SentryError(`HTTP request failed, status code: ${statusCode}, error message: ${error.message}`, {
+            this.logger.error(new log_1.DetailedError(`HTTP request failed, status code: ${statusCode}, error message: ${error.message}`, {
                 level: severityFromStatus(error.response?.status),
                 context: [
                     {
@@ -142,7 +142,7 @@ class HttpClientLogging {
                 ],
             }));
             if (typeof statusCode === 'number') {
-                this.logger.info(new error_tracking_1.SentryBreadcrumb({
+                this.logger.info(new log_1.Breadcrumb({
                     category: 'http.response',
                     type: 'http',
                     data: {
@@ -177,7 +177,7 @@ class SagaLogging {
      * @param info Инфо выполнения саги.
      */
     onSagaError(error, info) {
-        this.logger.error(new error_tracking_1.SentryError(error.message, {
+        this.logger.error(new log_1.DetailedError(error.message, {
             extra: {
                 key: 'Saga stack',
                 data: info.sagaStack,
@@ -196,7 +196,9 @@ class SagaLogging {
      * @param info Инфо прерывания саги.
      */
     onTimeoutInterrupt({ timeout }) {
-        this.logger.error(new Error(`Сага прервана по таймауту (${timeout} миллисекунд)`));
+        this.logger.error(new log_1.DetailedError(`Сага прервана по таймауту (${timeout}мс)`, {
+            level: 'warning',
+        }));
     }
 }
 exports.SagaLogging = SagaLogging;
@@ -231,7 +233,7 @@ class HttpStatus {
      * Валидация применяется только если в конфиге запроса не указан validateStatus.
      * @return Промежуточный слой.
      */
-    static createMiddleware() {
+    static axiosMiddleware() {
         return async (config, next, defaults) => {
             if (config.validateStatus !== undefined || defaults.validateStatus !== undefined) {
                 // если validateStatus указан явно то не применяем валидацию по умолчанию

package/preset/parts/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/preset/parts/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/preset/parts/utils.ts"],"names":[],"mappings":"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"}

package/tokens.d.ts

@@ -1,6 +1,7 @@
+/// <reference types="qs" />
 /// <reference types="react" />
-import type { Application } from 'express';
-import type { DefaultMiddleware, PageAssets, PageTemplate, ResponseContext } from './http-server/types';
+import type * as express from 'express';
+import type { PageAssets, PageTemplate, HandlerContext } from './http-server/types';
 import type { SagaExtendedMiddleware } from './utils/redux-saga';
 import type { Logger } from './log/types';
 import type { HttpClientFactory } from './http-client/types';
@@ -28,35 +29,50 @@ export declare const KnownToken: {
         readonly tracerProviderResource: import("./di").Token<Resource>;
     };
     readonly Metrics: {
-        readonly httpApp: import("./di").Token<Application>;
+        readonly httpApp: import("./di").Token<express.Application>;
     };
     readonly Http: {
+        readonly Api: {
+            readonly knownHosts: import("./di").Token<StrictMap<KnownHttpApiKey>>;
+        };
         readonly Client: {
             readonly factory: import("./di").Token<HttpClientFactory>;
-            readonly LogMiddleware: {
-                readonly handler: import("./di").Token<LogMiddlewareHandlerInit>;
+            readonly Middleware: {
+                readonly Log: {
+                    readonly handler: import("./di").Token<LogMiddlewareHandlerInit>;
+                };
             };
         };
         readonly Server: {
-            readonly factory: import("./di").Token<() => Application>;
-            readonly Defaults: {
-                readonly middleware: import("./di").Token<DefaultMiddleware>;
+            readonly factory: import("./di").Token<() => express.Application>;
+            readonly Handler: {
+                readonly healthCheck: import("./di").Token<express.Handler>;
+            };
+            readonly Middleware: {
+                readonly request: import("./di").Token<express.Handler>;
+                readonly log: import("./di").Token<express.Handler>;
+                readonly tracing: import("./di").Token<express.Handler>;
+                readonly metrics: import("./di").Token<express.Handler>;
+                readonly error: import("./di").Token<express.ErrorRequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>>;
             };
         };
-        readonly Api: {
-            readonly knownHosts: import("./di").Token<StrictMap<KnownHttpApiKey>>;
+        readonly Handler: {
+            readonly main: import("./di").Token<() => void>;
+            readonly context: import("./di").Token<HandlerContext>;
+            readonly Request: {
+                readonly specificParams: import("./di").Token<Record<string, unknown>>;
+            };
+            readonly Response: {
+                readonly builder: import("./di").Token<PageResponse>;
+                readonly Page: {
+                    readonly assets: import("./di").Token<PageAssets | (() => PageAssets | Promise<PageAssets>)>;
+                    readonly template: import("./di").Token<PageTemplate>;
+                    readonly prepare: import("./di").Token<() => JSX.Element | Promise<JSX.Element>>;
+                    readonly render: import("./di").Token<(element: JSX.Element) => string | Promise<string>>;
+                };
+            };
         };
     };
-    readonly Response: {
-        readonly builder: import("./di").Token<PageResponse>;
-        readonly params: import("./di").Token<Record<string, unknown>>;
-        readonly template: import("./di").Token<PageTemplate>;
-        readonly context: import("./di").Token<ResponseContext>;
-        readonly assets: import("./di").Token<PageAssets>;
-        readonly prepare: import("./di").Token<() => JSX.Element | Promise<JSX.Element>>;
-        readonly render: import("./di").Token<(element: JSX.Element) => string | Promise<string>>;
-        readonly main: import("./di").Token<() => void>;
-    };
     readonly SsrBridge: {
         readonly clientSide: import("./di").Token<BridgeClientSide<unknown>>;
         readonly serverSide: import("./di").Token<BridgeServerSide>;