@tramvai/module-server 2.7.1 → 2.20.0

package/lib/modules/papi/shared.d.ts

@@ -1,10 +1,10 @@
 export declare const sharedProviders: {
-    provide: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<string>;
+    provide: import("@tinkoff/dippy").BaseTokenInterface<string>;
     useFactory: ({ appInfo }: {
         appInfo: any;
     }) => string;
     deps: {
-        appInfo: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<{
+        appInfo: import("@tinkoff/dippy").BaseTokenInterface<{
             [key: string]: string;
             appName: string;
         }>;

package/lib/server/webApp.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
-import type { LOGGER_TOKEN } from '@tramvai/tokens-common';
+import type { EXECUTION_CONTEXT_MANAGER_TOKEN, LOGGER_TOKEN } from '@tramvai/tokens-common';
 import type { COMMAND_LINE_RUNNER_TOKEN } from '@tramvai/core';
 import type { WEB_APP_TOKEN, WEB_APP_BEFORE_INIT_TOKEN, WEB_APP_INIT_TOKEN, WEB_APP_AFTER_INIT_TOKEN, WEB_APP_LIMITER_TOKEN, SERVER_TOKEN } from '@tramvai/tokens-server';
-import type { WEB_FASTIFY_APP_TOKEN, WEB_FASTIFY_APP_AFTER_INIT_TOKEN, WEB_FASTIFY_APP_BEFORE_INIT_TOKEN, WEB_FASTIFY_APP_INIT_TOKEN, WEB_FASTIFY_APP_LIMITER_TOKEN, WEB_FASTIFY_APP_BEFORE_ERROR_TOKEN, WEB_FASTIFY_APP_AFTER_ERROR_TOKEN, WEB_FASTIFY_APP_PROCESS_ERROR_TOKEN } from '@tramvai/tokens-server-private';
+import type { WEB_FASTIFY_APP_TOKEN, WEB_FASTIFY_APP_AFTER_INIT_TOKEN, WEB_FASTIFY_APP_BEFORE_INIT_TOKEN, WEB_FASTIFY_APP_INIT_TOKEN, WEB_FASTIFY_APP_LIMITER_TOKEN, WEB_FASTIFY_APP_BEFORE_ERROR_TOKEN, WEB_FASTIFY_APP_AFTER_ERROR_TOKEN, WEB_FASTIFY_APP_PROCESS_ERROR_TOKEN, WEB_FASTIFY_APP_METRICS_TOKEN } from '@tramvai/tokens-server-private';
 import type { ExtractDependencyType } from '@tinkoff/dippy';
 export declare const webAppFactory: ({ server }: {
     server: typeof SERVER_TOKEN;
@@ -10,12 +10,14 @@ export declare const webAppFactory: ({ server }: {
 export declare const webAppExpressFactory: ({ webApp }: {
     webApp: typeof WEB_FASTIFY_APP_TOKEN;
 }) => import("express-serve-static-core").Express;
-export declare const webAppInitCommand: ({ app, expressApp, logger, commandLineRunner, beforeInit, limiterRequest, init, afterInit, expressBeforeInit, expressInit, expressAfterInit, expressLimiterRequest, beforeError, processError, afterError, }: {
+export declare const webAppInitCommand: ({ app, expressApp, logger, commandLineRunner, executionContextManager, beforeInit, requestMetrics, limiterRequest, init, afterInit, expressBeforeInit, expressInit, expressAfterInit, expressLimiterRequest, beforeError, processError, afterError, }: {
     app: ExtractDependencyType<typeof WEB_FASTIFY_APP_TOKEN>;
     expressApp: ExtractDependencyType<typeof WEB_APP_TOKEN>;
     logger: ExtractDependencyType<typeof LOGGER_TOKEN>;
     commandLineRunner: ExtractDependencyType<typeof COMMAND_LINE_RUNNER_TOKEN>;
+    executionContextManager: ExtractDependencyType<typeof EXECUTION_CONTEXT_MANAGER_TOKEN>;
     beforeInit: ExtractDependencyType<typeof WEB_FASTIFY_APP_BEFORE_INIT_TOKEN>;
+    requestMetrics: ExtractDependencyType<typeof WEB_FASTIFY_APP_METRICS_TOKEN>;
     limiterRequest: ExtractDependencyType<typeof WEB_FASTIFY_APP_LIMITER_TOKEN>;
     init: ExtractDependencyType<typeof WEB_FASTIFY_APP_INIT_TOKEN>;
     afterInit: ExtractDependencyType<typeof WEB_FASTIFY_APP_AFTER_INIT_TOKEN>;

package/lib/server.es.js

@@ -1,10 +1,11 @@
 import { __decorate } from 'tslib';
 import { setDefaultResultOrder } from 'dns';
-import { Scope, APP_INFO_TOKEN, Module, provide, DI_TOKEN, COMMAND_LINE_RUNNER_TOKEN, commandLineListTokens, createToken } from '@tramvai/core';
+import EventEmitter$1, { EventEmitter } from 'events';
+import { Scope, APP_INFO_TOKEN, Module, provide as provide$1, DI_TOKEN, COMMAND_LINE_RUNNER_TOKEN, commandLineListTokens, createToken } from '@tramvai/core';
 import { SERVER_MODULE_PAPI_PUBLIC_ROUTE, SERVER_MODULE_PAPI_PUBLIC_URL, SERVER_MODULE_PAPI_PRIVATE_URL, WEB_APP_BEFORE_INIT_TOKEN, WEB_APP_TOKEN, SERVER_MODULE_PAPI_PRIVATE_ROUTE, SERVER_MODULE_STATICS_OPTIONS, SERVER_TOKEN, READINESS_PROBE_TOKEN, LIVENESS_PROBE_TOKEN, UTILITY_SERVER_PATHS, PROXY_CONFIG_TOKEN, DEPENDENCIES_VERSION_FILTER_TOKEN, UTILITY_SERVER_PORT_TOKEN, WEB_APP_INIT_TOKEN, WEB_APP_AFTER_INIT_TOKEN, WEB_APP_LIMITER_TOKEN } from '@tramvai/tokens-server';
 export * from '@tramvai/tokens-server';
-import { WEB_FASTIFY_APP_BEFORE_INIT_TOKEN, UTILITY_WEB_FASTIFY_APP_TOKEN, UTILITY_SERVER_TOKEN, SERVER_FACTORY_TOKEN, WEB_FASTIFY_APP_TOKEN, WEB_FASTIFY_APP_FACTORY_TOKEN, WEB_FASTIFY_APP_INIT_TOKEN, WEB_FASTIFY_APP_AFTER_INIT_TOKEN, WEB_FASTIFY_APP_LIMITER_TOKEN, WEB_FASTIFY_APP_BEFORE_ERROR_TOKEN, WEB_FASTIFY_APP_PROCESS_ERROR_TOKEN, WEB_FASTIFY_APP_AFTER_ERROR_TOKEN } from '@tramvai/tokens-server-private';
-import { REQUEST, RESPONSE, FASTIFY_REQUEST, FASTIFY_RESPONSE, RESPONSE_MANAGER_TOKEN, LOGGER_TOKEN, ENV_MANAGER_TOKEN, ENV_USED_TOKEN } from '@tramvai/tokens-common';
+import { WEB_FASTIFY_APP_BEFORE_INIT_TOKEN, UTILITY_WEB_FASTIFY_APP_TOKEN, UTILITY_SERVER_TOKEN, SERVER_FACTORY_TOKEN, WEB_FASTIFY_APP_TOKEN, WEB_FASTIFY_APP_FACTORY_TOKEN, WEB_FASTIFY_APP_INIT_TOKEN, WEB_FASTIFY_APP_AFTER_INIT_TOKEN, WEB_FASTIFY_APP_METRICS_TOKEN, WEB_FASTIFY_APP_LIMITER_TOKEN, WEB_FASTIFY_APP_BEFORE_ERROR_TOKEN, WEB_FASTIFY_APP_PROCESS_ERROR_TOKEN, WEB_FASTIFY_APP_AFTER_ERROR_TOKEN } from '@tramvai/tokens-server-private';
+import { ROOT_EXECUTION_CONTEXT_TOKEN, REQUEST, RESPONSE, FASTIFY_REQUEST, FASTIFY_RESPONSE, RESPONSE_MANAGER_TOKEN, LOGGER_TOKEN, ENV_MANAGER_TOKEN, ENV_USED_TOKEN, EXECUTION_CONTEXT_MANAGER_TOKEN } from '@tramvai/tokens-common';
 import { MetricsModule } from '@tramvai/module-metrics';
 import { CacheWarmupModule } from '@tramvai/module-cache-warmup';
 import http from 'http';
@@ -12,6 +13,7 @@ import fastify from 'fastify';
 import express from 'express';
 import { fastifyCookie } from '@fastify/cookie';
 import fastifyFormBody from '@fastify/formbody';
+import { provide, createChildContainer } from '@tinkoff/dippy';
 import fp from 'fastify-plugin';
 import symbols from 'fastify/lib/symbols';
 import isNil from '@tinkoff/utils/is/nil';
@@ -23,13 +25,11 @@ import filterObj from '@tinkoff/utils/object/filter';
 import flatten from '@tinkoff/utils/array/flatten';
 import toArray from '@tinkoff/utils/array/toArray';
 import { create, middlewares, getPapiParameters, createPapiMethod } from '@tramvai/papi';
-import { createChildContainer } from '@tinkoff/dippy';
 import eachObj from '@tinkoff/utils/object/each';
 import { resolve } from 'path';
 import FastifyStatic from '@fastify/static';
 import { createTerminus } from '@tinkoff/terminus';
 import { parse } from '@tinkoff/url';
-import { EventEmitter } from 'events';
 import monkeypatch from '@tinkoff/monkeypatch';
 import https from 'https';
 import isArray from '@tinkoff/utils/is/array';
@@ -201,7 +201,7 @@ const webAppExpressFactory = ({ webApp }) => {
     app.disable('x-powered-by');
     return app;
 };
-const webAppInitCommand = ({ app, expressApp, logger, commandLineRunner, beforeInit, limiterRequest, init, afterInit, expressBeforeInit, expressInit, expressAfterInit, expressLimiterRequest, beforeError, processError, afterError, }) => {
+const webAppInitCommand = ({ app, expressApp, logger, commandLineRunner, executionContextManager, beforeInit, requestMetrics, limiterRequest, init, afterInit, expressBeforeInit, expressInit, expressAfterInit, expressLimiterRequest, beforeError, processError, afterError, }) => {
     const log = logger('server:webapp');
     const runHandlers = (instance, handlers, expressHandlers) => {
         return Promise.all([
@@ -220,6 +220,7 @@ const webAppInitCommand = ({ app, expressApp, logger, commandLineRunner, beforeI
             await runHandlers(instance, beforeInit, expressBeforeInit);
         });
         await app.register(async (instance) => {
+            await runHandlers(instance, requestMetrics, []);
             await runHandlers(instance, limiterRequest, expressLimiterRequest);
             await app.register(fastifyCookie);
             await app.register(fastifyFormBody, { bodyLimit: 2097152 }); // 2mb
@@ -235,45 +236,51 @@ const webAppInitCommand = ({ app, expressApp, logger, commandLineRunner, beforeI
                         message: 'Клиент зашел на страницу',
                         url: request.url,
                     });
-                    const di = await commandLineRunner.run('server', 'customer', [
-                        {
-                            provide: REQUEST,
-                            scope: Scope.REQUEST,
-                            useValue: request.raw,
-                        },
-                        {
-                            provide: RESPONSE,
-                            scope: Scope.REQUEST,
-                            useValue: reply.raw,
-                        },
-                        // TODO: перевести использование на новые
-                        // TODO: добавить для papi
-                        {
-                            provide: FASTIFY_REQUEST,
-                            scope: Scope.REQUEST,
-                            useValue: request,
-                        },
-                        {
-                            provide: FASTIFY_RESPONSE,
-                            scope: Scope.REQUEST,
-                            useValue: reply,
-                        },
-                    ]);
-                    const responseManager = di.get(RESPONSE_MANAGER_TOKEN);
-                    if (reply.sent) {
-                        log.debug({
-                            event: 'response-ended',
-                            message: 'Response was already ended.',
-                            url: request.url,
-                        });
-                    }
-                    else {
-                        reply
-                            .header('content-type', 'text/html')
-                            .headers(responseManager.getHeaders())
-                            .status(responseManager.getStatus())
-                            .send(responseManager.getBody());
-                    }
+                    await executionContextManager.withContext(null, 'root', async (rootExecutionContext) => {
+                        const di = await commandLineRunner.run('server', 'customer', [
+                            provide({
+                                provide: ROOT_EXECUTION_CONTEXT_TOKEN,
+                                useValue: rootExecutionContext,
+                            }),
+                            {
+                                provide: REQUEST,
+                                scope: Scope.REQUEST,
+                                useValue: request.raw,
+                            },
+                            {
+                                provide: RESPONSE,
+                                scope: Scope.REQUEST,
+                                useValue: reply.raw,
+                            },
+                            // TODO: перевести использование на новые
+                            // TODO: добавить для papi
+                            {
+                                provide: FASTIFY_REQUEST,
+                                scope: Scope.REQUEST,
+                                useValue: request,
+                            },
+                            {
+                                provide: FASTIFY_RESPONSE,
+                                scope: Scope.REQUEST,
+                                useValue: reply,
+                            },
+                        ]);
+                        const responseManager = di.get(RESPONSE_MANAGER_TOKEN);
+                        if (reply.sent) {
+                            log.debug({
+                                event: 'response-ended',
+                                message: 'Response was already ended.',
+                                url: request.url,
+                            });
+                        }
+                        else {
+                            reply
+                                .header('content-type', 'text/html')
+                                .headers(responseManager.getHeaders())
+                                .status(responseManager.getStatus())
+                                .send(responseManager.getBody());
+                        }
+                    });
                 }
                 catch (err) {
                     if (err.di) {
@@ -439,7 +446,7 @@ ServerPapiModule = __decorate([
         providers: [
             fileApiProvider,
             ...sharedProviders,
-            provide({
+            provide$1({
                 provide: WEB_APP_BEFORE_INIT_TOKEN,
                 useFactory: ({ di, app, logger, privateRoutes, publicRoutes, publicBaseUrl, privateBaseUrl, }) => () => {
                     if (process.env.NODE_ENV === 'development') {
@@ -509,7 +516,7 @@ ServerPapiModule = __decorate([
                 multi: true,
             }),
             // необходимо для утилит. Подумать как можно убрать в будующем. Если убрать не будет ломающим изменением
-            provide({
+            provide$1({
                 provide: SERVER_MODULE_PAPI_PUBLIC_ROUTE,
                 multi: true,
                 useValue: createPapiMethod({
@@ -543,7 +550,7 @@ let ServerStaticsModule = class ServerStaticsModule {
 ServerStaticsModule = __decorate([
     Module({
         providers: [
-            provide({
+            provide$1({
                 provide: WEB_FASTIFY_APP_BEFORE_INIT_TOKEN,
                 useFactory: ({ options }) => {
                     const path = (options === null || options === void 0 ? void 0 : options.path) || 'public';
@@ -587,7 +594,7 @@ let ServerGracefulShutdownModule = class ServerGracefulShutdownModule {
 ServerGracefulShutdownModule = __decorate([
     Module({
         providers: [
-            provide({
+            provide$1({
                 provide: WEB_FASTIFY_APP_BEFORE_INIT_TOKEN,
                 multi: true,
                 useFactory: ({ app, server, logger, commandLineRunner, livenessProbe, readinessProbe }) => {
@@ -893,12 +900,12 @@ let UtilityServerModule = class UtilityServerModule {
 UtilityServerModule = __decorate([
     Module({
         providers: [
-            provide({
+            provide$1({
                 provide: ENV_USED_TOKEN,
                 multi: true,
                 useValue: [{ key: 'UTILITY_SERVER_PORT', optional: true }],
             }),
-            provide({
+            provide$1({
                 provide: UTILITY_SERVER_PORT_TOKEN,
                 scope: Scope.SINGLETON,
                 useFactory: ({ envManager }) => {
@@ -908,7 +915,7 @@ UtilityServerModule = __decorate([
                     envManager: ENV_MANAGER_TOKEN,
                 },
             }),
-            provide({
+            provide$1({
                 provide: IS_CUSTOM_SERVER_TOKEN,
                 scope: Scope.SINGLETON,
                 useFactory: ({ port, envManager }) => {
@@ -919,7 +926,7 @@ UtilityServerModule = __decorate([
                     port: UTILITY_SERVER_PORT_TOKEN,
                 },
             }),
-            provide({
+            provide$1({
                 provide: UTILITY_SERVER_TOKEN,
                 scope: Scope.SINGLETON,
                 useFactory: ({ isCustomServer, serverFactory, server }) => {
@@ -931,7 +938,7 @@ UtilityServerModule = __decorate([
                     serverFactory: SERVER_FACTORY_TOKEN,
                 },
             }),
-            provide({
+            provide$1({
                 provide: UTILITY_WEB_FASTIFY_APP_TOKEN,
                 scope: Scope.SINGLETON,
                 useFactory: ({ isCustomServer, app, appFactory, server }) => {
@@ -944,7 +951,7 @@ UtilityServerModule = __decorate([
                     server: UTILITY_SERVER_TOKEN,
                 },
             }),
-            provide({
+            provide$1({
                 provide: commandLineListTokens.listen,
                 multi: true,
                 scope: Scope.SINGLETON,
@@ -984,7 +991,7 @@ let KeepAliveModule = class KeepAliveModule {
 KeepAliveModule = __decorate([
     Module({
         providers: [
-            provide({
+            provide$1({
                 provide: ENV_USED_TOKEN,
                 useValue: [
                     {
@@ -1003,7 +1010,7 @@ KeepAliveModule = __decorate([
                     },
                 ],
             }),
-            provide({
+            provide$1({
                 provide: commandLineListTokens.init,
                 useFactory: ({ server, envManager, }) => () => {
                     const externalKeepAliveTimeout = envManager.get('NODE_KEEPALIVE_TIMEOUT');
@@ -1022,6 +1029,9 @@ KeepAliveModule = __decorate([
 if (typeof setDefaultResultOrder === 'function') {
     setDefaultResultOrder('ipv4first');
 }
+// tramvai add a lot of "abort" event listeners to AbortSignal, but we can't configure only AbortSignal max listeners,
+// because AbortSignal is not instance of EventEmitter - https://github.com/southpolesteve/node-abort-controller/blob/master/index.js
+EventEmitter$1.defaultMaxListeners = 50;
 let ServerModule = class ServerModule {
 };
 ServerModule = __decorate([
@@ -1039,12 +1049,12 @@ ServerModule = __decorate([
             process.env.NODE_ENV !== 'production' && DebugHttpRequestsModule,
         ].filter(Boolean),
         providers: [
-            provide({
+            provide$1({
                 provide: SERVER_FACTORY_TOKEN,
                 scope: Scope.SINGLETON,
                 useValue: serverFactory,
             }),
-            provide({
+            provide$1({
                 provide: SERVER_TOKEN,
                 scope: Scope.SINGLETON,
                 useFactory: ({ factory }) => factory(),
@@ -1052,12 +1062,12 @@ ServerModule = __decorate([
                     factory: SERVER_FACTORY_TOKEN,
                 },
             }),
-            provide({
+            provide$1({
                 provide: WEB_FASTIFY_APP_FACTORY_TOKEN,
                 scope: Scope.SINGLETON,
                 useValue: webAppFactory,
             }),
-            provide({
+            provide$1({
                 provide: WEB_FASTIFY_APP_TOKEN,
                 useFactory: ({ factory, server }) => factory({ server }),
                 scope: Scope.SINGLETON,
@@ -1066,7 +1076,7 @@ ServerModule = __decorate([
                     factory: WEB_FASTIFY_APP_FACTORY_TOKEN,
                 },
             }),
-            provide({
+            provide$1({
                 // BACKWARD: provide the express app as before
                 provide: WEB_APP_TOKEN,
                 scope: Scope.SINGLETON,
@@ -1084,9 +1094,11 @@ ServerModule = __decorate([
                     expressApp: WEB_APP_TOKEN,
                     logger: LOGGER_TOKEN,
                     commandLineRunner: COMMAND_LINE_RUNNER_TOKEN,
+                    executionContextManager: EXECUTION_CONTEXT_MANAGER_TOKEN,
                     beforeInit: { token: WEB_FASTIFY_APP_BEFORE_INIT_TOKEN, optional: true },
                     init: { token: WEB_FASTIFY_APP_INIT_TOKEN, optional: true },
                     afterInit: { token: WEB_FASTIFY_APP_AFTER_INIT_TOKEN, optional: true },
+                    requestMetrics: { token: WEB_FASTIFY_APP_METRICS_TOKEN, optional: true },
                     limiterRequest: { token: WEB_FASTIFY_APP_LIMITER_TOKEN, optional: true },
                     expressBeforeInit: { token: WEB_APP_BEFORE_INIT_TOKEN, optional: true },
                     expressInit: { token: WEB_APP_INIT_TOKEN, optional: true },

package/lib/server.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var dns = require('dns');
+var EventEmitter = require('events');
 var core = require('@tramvai/core');
 var tokensServer = require('@tramvai/tokens-server');
 var tokensServerPrivate = require('@tramvai/tokens-server-private');
@@ -15,6 +16,7 @@ var fastify = require('fastify');
 var express = require('express');
 var cookie = require('@fastify/cookie');
 var fastifyFormBody = require('@fastify/formbody');
+var dippy = require('@tinkoff/dippy');
 var fp = require('fastify-plugin');
 var symbols = require('fastify/lib/symbols');
 var isNil = require('@tinkoff/utils/is/nil');
@@ -26,13 +28,11 @@ var filterObj = require('@tinkoff/utils/object/filter');
 var flatten = require('@tinkoff/utils/array/flatten');
 var toArray = require('@tinkoff/utils/array/toArray');
 var papi = require('@tramvai/papi');
-var dippy = require('@tinkoff/dippy');
 var eachObj = require('@tinkoff/utils/object/each');
 var path = require('path');
 var FastifyStatic = require('@fastify/static');
 var terminus = require('@tinkoff/terminus');
 var url = require('@tinkoff/url');
-var events = require('events');
 var monkeypatch = require('@tinkoff/monkeypatch');
 var https = require('https');
 var isArray = require('@tinkoff/utils/is/array');
@@ -42,6 +42,7 @@ var moduleCommon = require('@tramvai/module-common');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+var EventEmitter__default = /*#__PURE__*/_interopDefaultLegacy(EventEmitter);
 var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
 var fastify__default = /*#__PURE__*/_interopDefaultLegacy(fastify);
 var express__default = /*#__PURE__*/_interopDefaultLegacy(express);
@@ -226,7 +227,7 @@ const webAppExpressFactory = ({ webApp }) => {
     app.disable('x-powered-by');
     return app;
 };
-const webAppInitCommand = ({ app, expressApp, logger, commandLineRunner, beforeInit, limiterRequest, init, afterInit, expressBeforeInit, expressInit, expressAfterInit, expressLimiterRequest, beforeError, processError, afterError, }) => {
+const webAppInitCommand = ({ app, expressApp, logger, commandLineRunner, executionContextManager, beforeInit, requestMetrics, limiterRequest, init, afterInit, expressBeforeInit, expressInit, expressAfterInit, expressLimiterRequest, beforeError, processError, afterError, }) => {
     const log = logger('server:webapp');
     const runHandlers = (instance, handlers, expressHandlers) => {
         return Promise.all([
@@ -245,6 +246,7 @@ const webAppInitCommand = ({ app, expressApp, logger, commandLineRunner, beforeI
             await runHandlers(instance, beforeInit, expressBeforeInit);
         });
         await app.register(async (instance) => {
+            await runHandlers(instance, requestMetrics, []);
             await runHandlers(instance, limiterRequest, expressLimiterRequest);
             await app.register(cookie.fastifyCookie);
             await app.register(fastifyFormBody__default["default"], { bodyLimit: 2097152 }); // 2mb
@@ -260,45 +262,51 @@ const webAppInitCommand = ({ app, expressApp, logger, commandLineRunner, beforeI
                         message: 'Клиент зашел на страницу',
                         url: request.url,
                     });
-                    const di = await commandLineRunner.run('server', 'customer', [
-                        {
-                            provide: tokensCommon.REQUEST,
-                            scope: core.Scope.REQUEST,
-                            useValue: request.raw,
-                        },
-                        {
-                            provide: tokensCommon.RESPONSE,
-                            scope: core.Scope.REQUEST,
-                            useValue: reply.raw,
-                        },
-                        // TODO: перевести использование на новые
-                        // TODO: добавить для papi
-                        {
-                            provide: tokensCommon.FASTIFY_REQUEST,
-                            scope: core.Scope.REQUEST,
-                            useValue: request,
-                        },
-                        {
-                            provide: tokensCommon.FASTIFY_RESPONSE,
-                            scope: core.Scope.REQUEST,
-                            useValue: reply,
-                        },
-                    ]);
-                    const responseManager = di.get(tokensCommon.RESPONSE_MANAGER_TOKEN);
-                    if (reply.sent) {
-                        log.debug({
-                            event: 'response-ended',
-                            message: 'Response was already ended.',
-                            url: request.url,
-                        });
-                    }
-                    else {
-                        reply
-                            .header('content-type', 'text/html')
-                            .headers(responseManager.getHeaders())
-                            .status(responseManager.getStatus())
-                            .send(responseManager.getBody());
-                    }
+                    await executionContextManager.withContext(null, 'root', async (rootExecutionContext) => {
+                        const di = await commandLineRunner.run('server', 'customer', [
+                            dippy.provide({
+                                provide: tokensCommon.ROOT_EXECUTION_CONTEXT_TOKEN,
+                                useValue: rootExecutionContext,
+                            }),
+                            {
+                                provide: tokensCommon.REQUEST,
+                                scope: core.Scope.REQUEST,
+                                useValue: request.raw,
+                            },
+                            {
+                                provide: tokensCommon.RESPONSE,
+                                scope: core.Scope.REQUEST,
+                                useValue: reply.raw,
+                            },
+                            // TODO: перевести использование на новые
+                            // TODO: добавить для papi
+                            {
+                                provide: tokensCommon.FASTIFY_REQUEST,
+                                scope: core.Scope.REQUEST,
+                                useValue: request,
+                            },
+                            {
+                                provide: tokensCommon.FASTIFY_RESPONSE,
+                                scope: core.Scope.REQUEST,
+                                useValue: reply,
+                            },
+                        ]);
+                        const responseManager = di.get(tokensCommon.RESPONSE_MANAGER_TOKEN);
+                        if (reply.sent) {
+                            log.debug({
+                                event: 'response-ended',
+                                message: 'Response was already ended.',
+                                url: request.url,
+                            });
+                        }
+                        else {
+                            reply
+                                .header('content-type', 'text/html')
+                                .headers(responseManager.getHeaders())
+                                .status(responseManager.getStatus())
+                                .send(responseManager.getBody());
+                        }
+                    });
                 }
                 catch (err) {
                     if (err.di) {
@@ -738,7 +746,7 @@ DebugHttpRequestsModule = tslib.__decorate([
                                 .on('response', (response) => {
                                 // Workaround for res._dump in Node.JS http client
                                 // https://github.com/nodejs/node/blob/20285ad17755187ece16b8a5effeaa87f5407da2/lib/_http_client.js#L421-L427
-                                if (!wasHandled && events.EventEmitter.listenerCount(response.req, 'response') === 0) {
+                                if (!wasHandled && EventEmitter.EventEmitter.listenerCount(response.req, 'response') === 0) {
                                     response.resume();
                                 }
                                 log.debug(`${response.statusCode}
@@ -1047,6 +1055,9 @@ KeepAliveModule = tslib.__decorate([
 if (typeof dns.setDefaultResultOrder === 'function') {
     dns.setDefaultResultOrder('ipv4first');
 }
+// tramvai add a lot of "abort" event listeners to AbortSignal, but we can't configure only AbortSignal max listeners,
+// because AbortSignal is not instance of EventEmitter - https://github.com/southpolesteve/node-abort-controller/blob/master/index.js
+EventEmitter__default["default"].defaultMaxListeners = 50;
 exports.ServerModule = class ServerModule {
 };
 exports.ServerModule = tslib.__decorate([
@@ -1109,9 +1120,11 @@ exports.ServerModule = tslib.__decorate([
                     expressApp: tokensServer.WEB_APP_TOKEN,
                     logger: tokensCommon.LOGGER_TOKEN,
                     commandLineRunner: core.COMMAND_LINE_RUNNER_TOKEN,
+                    executionContextManager: tokensCommon.EXECUTION_CONTEXT_MANAGER_TOKEN,
                     beforeInit: { token: tokensServerPrivate.WEB_FASTIFY_APP_BEFORE_INIT_TOKEN, optional: true },
                     init: { token: tokensServerPrivate.WEB_FASTIFY_APP_INIT_TOKEN, optional: true },
                     afterInit: { token: tokensServerPrivate.WEB_FASTIFY_APP_AFTER_INIT_TOKEN, optional: true },
+                    requestMetrics: { token: tokensServerPrivate.WEB_FASTIFY_APP_METRICS_TOKEN, optional: true },
                     limiterRequest: { token: tokensServerPrivate.WEB_FASTIFY_APP_LIMITER_TOKEN, optional: true },
                     expressBeforeInit: { token: tokensServer.WEB_APP_BEFORE_INIT_TOKEN, optional: true },
                     expressInit: { token: tokensServer.WEB_APP_INIT_TOKEN, optional: true },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-server",
-  "version": "2.7.1",
+  "version": "2.20.0",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -22,15 +22,15 @@
     "build-for-publish": "true"
   },
   "dependencies": {
-    "@tinkoff/errors": "0.2.22",
-    "@tinkoff/monkeypatch": "1.3.5",
-    "@tinkoff/terminus": "0.0.5",
-    "@tinkoff/url": "0.7.39",
-    "@tramvai/module-cache-warmup": "2.7.1",
-    "@tramvai/module-metrics": "2.7.1",
-    "@tramvai/papi": "2.7.1",
-    "@tramvai/tokens-server": "2.7.1",
-    "@tramvai/tokens-server-private": "2.7.1",
+    "@tinkoff/errors": "0.3.2",
+    "@tinkoff/monkeypatch": "2.0.2",
+    "@tinkoff/terminus": "0.1.2",
+    "@tinkoff/url": "0.8.2",
+    "@tramvai/module-cache-warmup": "2.20.0",
+    "@tramvai/module-metrics": "2.20.0",
+    "@tramvai/papi": "2.20.0",
+    "@tramvai/tokens-server": "2.20.0",
+    "@tramvai/tokens-server-private": "2.20.0",
     "compression": "^1.7.4",
     "express": "^4.17.1",
     "fastify": "^3.29.0",
@@ -41,13 +41,13 @@
     "http-proxy-middleware": "^2.0.2"
   },
   "peerDependencies": {
-    "@tinkoff/dippy": "0.7.44",
+    "@tinkoff/dippy": "0.8.2",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "2.7.1",
-    "@tramvai/core": "2.7.1",
-    "@tramvai/module-common": "2.7.1",
-    "@tramvai/module-environment": "2.7.1",
-    "@tramvai/tokens-common": "2.7.1",
+    "@tramvai/cli": "2.20.0",
+    "@tramvai/core": "2.20.0",
+    "@tramvai/module-common": "2.20.0",
+    "@tramvai/module-environment": "2.20.0",
+    "@tramvai/tokens-common": "2.20.0",
     "tslib": "^2.0.3"
   },
   "devDependencies": {