@tramvai/module-server 2.11.0 → 2.21.0

package/lib/server/webApp.d.ts

@@ -2,7 +2,7 @@
 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,13 +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, executionContextManager, 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,9 +1,10 @@
 import { __decorate } from 'tslib';
 import { setDefaultResultOrder } from 'dns';
+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 { 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';
@@ -29,7 +30,6 @@ 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, executionContextManager, 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, executi
             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
@@ -1028,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([
@@ -1094,6 +1098,7 @@ ServerModule = __decorate([
                     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');
@@ -32,7 +33,6 @@ 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, executionContextManager, 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, executi
             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
@@ -744,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}
@@ -1053,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([
@@ -1119,6 +1124,7 @@ exports.ServerModule = tslib.__decorate([
                     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.11.0",
+  "version": "2.21.0",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -22,15 +22,15 @@
     "build-for-publish": "true"
   },
   "dependencies": {
-    "@tinkoff/errors": "0.2.23",
-    "@tinkoff/monkeypatch": "1.3.5",
-    "@tinkoff/terminus": "0.0.5",
-    "@tinkoff/url": "0.7.39",
-    "@tramvai/module-cache-warmup": "2.11.0",
-    "@tramvai/module-metrics": "2.11.0",
-    "@tramvai/papi": "2.11.0",
-    "@tramvai/tokens-server": "2.11.0",
-    "@tramvai/tokens-server-private": "2.11.0",
+    "@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.21.0",
+    "@tramvai/module-metrics": "2.21.0",
+    "@tramvai/papi": "2.21.0",
+    "@tramvai/tokens-server": "2.21.0",
+    "@tramvai/tokens-server-private": "2.21.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.45",
+    "@tinkoff/dippy": "0.8.2",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "2.11.0",
-    "@tramvai/core": "2.11.0",
-    "@tramvai/module-common": "2.11.0",
-    "@tramvai/module-environment": "2.11.0",
-    "@tramvai/tokens-common": "2.11.0",
+    "@tramvai/cli": "2.21.0",
+    "@tramvai/core": "2.21.0",
+    "@tramvai/module-common": "2.21.0",
+    "@tramvai/module-environment": "2.21.0",
+    "@tramvai/tokens-common": "2.21.0",
     "tslib": "^2.0.3"
   },
   "devDependencies": {