@tramvai/module-server 2.31.0 → 2.32.0

package/lib/modules/papi/server/executor.d.ts

@@ -1,9 +1,8 @@
 export declare const papiExecutorProvider: import("@tinkoff/dippy").Provider<{
     di: import("@tinkoff/dippy").BaseTokenInterface<import("@tinkoff/dippy").Container>;
     logger: import("@tinkoff/dippy").BaseTokenInterface<import("@tramvai/tokens-common").LoggerFactory>;
-    fastifyRequest: import("@tinkoff/dippy").BaseTokenInterface<import("fastify").FastifyRequest<import("fastify/types/route").RouteGenericInterface, import("fastify").RawServerDefault, import("http").IncomingMessage, unknown, import("fastify").FastifyLoggerInstance> & {
+    fastifyRequest: import("@tinkoff/dippy").BaseTokenInterface<import("fastify").FastifyRequest<import("fastify").RouteGenericInterface, import("fastify").RawServerDefault, import("http").IncomingMessage, import("fastify").FastifySchema, import("fastify").FastifyTypeProviderDefault, unknown, import("fastify").FastifyBaseLogger, import("fastify/types/type-provider").ResolveFastifyRequestType<import("fastify").FastifyTypeProviderDefault, import("fastify").FastifySchema, import("fastify").RouteGenericInterface>> & {
         cookies: Record<string, string>;
-        query: Record<string, string>;
     }>;
     requestManager: import("@tinkoff/dippy").BaseTokenInterface<import("@tramvai/tokens-common").RequestManager>;
     responseManager: import("@tinkoff/dippy").BaseTokenInterface<import("@tramvai/tokens-common").ResponseManager>;

package/lib/server/webApp.d.ts

@@ -1,17 +1,13 @@
 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 { 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, 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;
-}) => import("fastify").FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyLoggerInstance> & PromiseLike<import("fastify").FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyLoggerInstance>>;
-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, requestMetrics, limiterRequest, init, afterInit, expressBeforeInit, expressInit, expressAfterInit, expressLimiterRequest, beforeError, processError, afterError, }: {
+}) => import("fastify").FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault> & PromiseLike<import("fastify").FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault>>;
+export declare const webAppInitCommand: ({ app, logger, commandLineRunner, executionContextManager, beforeInit, requestMetrics, limiterRequest, init, afterInit, 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>;
@@ -20,10 +16,6 @@ export declare const webAppInitCommand: ({ app, expressApp, logger, commandLineR
     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>;
-    expressBeforeInit: ExtractDependencyType<typeof WEB_APP_BEFORE_INIT_TOKEN>;
-    expressInit: ExtractDependencyType<typeof WEB_APP_INIT_TOKEN>;
-    expressAfterInit: ExtractDependencyType<typeof WEB_APP_AFTER_INIT_TOKEN>;
-    expressLimiterRequest: ExtractDependencyType<typeof WEB_APP_LIMITER_TOKEN>;
     beforeError: ExtractDependencyType<typeof WEB_FASTIFY_APP_BEFORE_ERROR_TOKEN>;
     processError: ExtractDependencyType<typeof WEB_FASTIFY_APP_PROCESS_ERROR_TOKEN>;
     afterError: ExtractDependencyType<typeof WEB_FASTIFY_APP_AFTER_ERROR_TOKEN>;

package/lib/server.es.js

@@ -2,24 +2,21 @@ 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 as DI_TOKEN$1, 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, SERVER_MODULE_PAPI_PRIVATE_ROUTE, SERVER_MODULE_STATICS_OPTIONS, SERVER_TOKEN, READINESS_PROBE_TOKEN, LIVENESS_PROBE_TOKEN, UTILITY_SERVER_PATHS, WEB_APP_BEFORE_INIT_TOKEN, WEB_APP_TOKEN, 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';
+import { SERVER_MODULE_PAPI_PUBLIC_ROUTE, SERVER_MODULE_PAPI_PUBLIC_URL, SERVER_MODULE_PAPI_PRIVATE_URL, 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 } from '@tramvai/tokens-server';
 export * from '@tramvai/tokens-server';
-import { PAPI_EXECUTOR, 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, REQUEST_MANAGER_TOKEN, ENV_MANAGER_TOKEN, ENV_USED_TOKEN, EXECUTION_CONTEXT_MANAGER_TOKEN } from '@tramvai/tokens-common';
+import { FASTIFY_REQUEST, FASTIFY_RESPONSE, PAPI_EXECUTOR, WEB_FASTIFY_APP_BEFORE_INIT_TOKEN, UTILITY_WEB_FASTIFY_APP_TOKEN, WEB_FASTIFY_APP_INIT_TOKEN, UTILITY_SERVER_TOKEN, SERVER_FACTORY_TOKEN, WEB_FASTIFY_APP_TOKEN, WEB_FASTIFY_APP_FACTORY_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, RESPONSE_MANAGER_TOKEN, LOGGER_TOKEN, REQUEST_MANAGER_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';
 import fastify from 'fastify';
-import express from 'express';
 import { fastifyCookie } from '@fastify/cookie';
 import fastifyFormBody from '@fastify/formbody';
 import { provide, createChildContainer, Scope as Scope$1, DI_TOKEN } from '@tinkoff/dippy';
-import fp from 'fastify-plugin';
-import symbols from 'fastify/lib/symbols';
 import isNil from '@tinkoff/utils/is/nil';
 import { isRedirectFoundError, isNotFoundError, isHttpError, HttpError } from '@tinkoff/errors';
-import zlib from 'zlib';
-import compression from 'compression';
+import fastifyCompress from '@fastify/compress';
+import FastifyStatic, { fastifyStatic } from '@fastify/static';
 import os from 'os';
 import filterObj from '@tinkoff/utils/object/filter';
 import flatten from '@tinkoff/utils/array/flatten';
@@ -27,7 +24,6 @@ import toArray from '@tinkoff/utils/array/toArray';
 import { getPapiParameters, isPapiMethod, createPapiMethod } from '@tramvai/papi';
 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 monkeypatch from '@tinkoff/monkeypatch';
@@ -51,91 +47,6 @@ const serverListenCommand = ({ server, logger, envManager, }) => {
     };
 };
 
-/**
- * Fork of https://github.com/fastify/fastify-express
- */
-const kMiddlewares = Symbol('fastify-express-middlewares');
-const expressPlugin = (fastify, options, next) => {
-    var _a, _b;
-    fastify.decorate('use', use);
-    // eslint-disable-next-line no-param-reassign
-    fastify[kMiddlewares] = [];
-    fastify.decorate('express', (_b = (_a = options.express) === null || _a === void 0 ? void 0 : _a.instance) !== null && _b !== void 0 ? _b : express());
-    fastify.express.disable('x-powered-by');
-    fastify
-        .addHook('preHandler', enhanceRequest)
-        .addHook('preHandler', runConnect)
-        .addHook('onRegister', onRegister);
-    function use(path, fn) {
-        if (typeof path === 'string') {
-            const prefix = this[symbols.kRoutePrefix];
-            // eslint-disable-next-line no-param-reassign
-            path = prefix + (path === '/' && prefix.length > 0 ? '' : path);
-        }
-        this[kMiddlewares].push([path, fn]);
-        if (fn == null) {
-            this.express.use(path);
-        }
-        else {
-            this.express.use(path, fn);
-        }
-        return this;
-    }
-    function enhanceRequest(req, reply, next) {
-        req.raw.originalUrl = req.raw.url;
-        req.raw.id = req.id;
-        req.raw.hostname = req.hostname;
-        req.raw.ip = req.ip;
-        req.raw.ips = req.ips;
-        req.raw.log = req.log;
-        // eslint-disable-next-line no-param-reassign
-        reply.raw.log = req.log;
-        if (req.body) {
-            req.raw.body = req.body;
-        }
-        if (req.cookies) {
-            req.raw.cookies = req.cookies;
-        }
-        const originalProtocol = req.raw.protocol;
-        // Make it lazy as it does a bit of work
-        Object.defineProperty(req.raw, 'protocol', {
-            get() {
-                // added in Fastify@3.5, so handle it missing
-                return req.protocol || originalProtocol;
-            },
-        });
-        next();
-    }
-    function runConnect(req, reply, next) {
-        if (this[kMiddlewares].length > 0) {
-            for (const [headerName, headerValue] of Object.entries(reply.getHeaders())) {
-                reply.raw.setHeader(headerName, headerValue);
-            }
-            this.express(req.raw, reply.raw, next);
-        }
-        else {
-            next();
-        }
-    }
-    function onRegister(instance) {
-        var _a, _b;
-        const middlewares = instance[kMiddlewares].slice();
-        // eslint-disable-next-line no-param-reassign
-        instance[kMiddlewares] = [];
-        instance.decorate('express', (_b = (_a = options.express) === null || _a === void 0 ? void 0 : _a.instance) !== null && _b !== void 0 ? _b : express());
-        instance.express.disable('x-powered-by');
-        instance.decorate('use', use);
-        for (const middleware of middlewares) {
-            instance.use(...middleware);
-        }
-    }
-    next();
-};
-const fastifyExpressCompatibility = fp(expressPlugin, {
-    fastify: '>=3.0.0',
-    name: 'fastify-express',
-});
-
 const errorHandler = (app, { log, beforeError, processError, afterError, }) => {
     app.setErrorHandler(async (error, request, reply) => {
         const runHandlers = async (handlers) => {
@@ -196,39 +107,28 @@ const webAppFactory = ({ server }) => {
     });
     return app;
 };
-const webAppExpressFactory = ({ webApp }) => {
-    const app = express();
-    app.disable('etag');
-    app.disable('x-powered-by');
-    return app;
-};
-const webAppInitCommand = ({ app, expressApp, logger, commandLineRunner, executionContextManager, beforeInit, requestMetrics, limiterRequest, init, afterInit, expressBeforeInit, expressInit, expressAfterInit, expressLimiterRequest, beforeError, processError, afterError, }) => {
+const webAppInitCommand = ({ app, logger, commandLineRunner, executionContextManager, beforeInit, requestMetrics, limiterRequest, init, afterInit, beforeError, processError, afterError, }) => {
     const log = logger('server:webapp');
-    const runHandlers = (instance, handlers, expressHandlers) => {
-        return Promise.all([
-            handlers && Promise.all(handlers.map((handler) => handler(instance))),
-            expressHandlers && Promise.all(expressHandlers.map((handler) => handler(expressApp))),
-        ]);
+    const runHandlers = (instance, handlers) => {
+        return Promise.all([handlers && Promise.all(handlers.map((handler) => handler(instance)))]);
     };
     return async function webAppInit() {
         errorHandler(app, { log, beforeError, processError, afterError });
-        await app.register(fastifyExpressCompatibility, {
-            express: {
-                instance: expressApp,
-            },
-        });
         await app.register(async (instance) => {
-            await runHandlers(instance, beforeInit, expressBeforeInit);
+            await runHandlers(instance, beforeInit);
         });
         await app.register(async (instance) => {
-            await runHandlers(instance, requestMetrics, []);
-            await runHandlers(instance, limiterRequest, expressLimiterRequest);
+            await runHandlers(instance, requestMetrics);
+            await runHandlers(instance, limiterRequest);
             await app.register(fastifyCookie);
             await app.register(fastifyFormBody, { bodyLimit: 2097152 }); // 2mb
-            await runHandlers(instance, init, expressInit);
-            // force express to execute to update server's request and response instances
-            instance.use((req, res, next) => {
-                next();
+            await runHandlers(instance, init);
+            // break the cycle of event loop to allow server to handle other requests
+            // while current on is in processing
+            // mainly to prevent problems and response hanging in case the response process
+            // uses only sync and microtask code
+            instance.addHook('preHandler', (req, res, next) => {
+                setImmediate(next);
             });
             instance.all('*', async (request, reply) => {
                 try {
@@ -243,18 +143,6 @@ const webAppInitCommand = ({ app, expressApp, logger, commandLineRunner, executi
                                 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,
@@ -295,7 +183,7 @@ const webAppInitCommand = ({ app, expressApp, logger, commandLineRunner, executi
             });
         });
         await app.register(async (instance) => {
-            await runHandlers(app, afterInit, expressAfterInit);
+            await runHandlers(instance, afterInit);
         });
         await app.ready();
     };
@@ -308,25 +196,23 @@ const staticAppCommand = ({ logger, envManager, appInfo, }) => {
     const log = logger('server:static');
     const port = +envManager.get('PORT_STATIC');
     const appVersion = envManager.get('APP_VERSION');
-    return function staticApp() {
-        const appStatic = express();
-        appStatic.disable('x-powered-by');
-        // WEB-389: Переключить на brotli после мержа https://github.com/expressjs/compression/pull/156
-        appStatic.use(compression({
-            level: zlib.Z_DEFAULT_COMPRESSION,
-        }));
-        appStatic.use((_, res, next) => {
-            res.set({
-                'Access-Control-Allow-Origin': '*',
-                'Timing-Allow-Origin': '*',
-                'X-App-Id': appInfo.appName,
-                'X-App-Version': appVersion,
-                'X-Host': os.hostname(),
-            });
-            next();
+    return async function staticApp() {
+        const appStatic = fastify();
+        await appStatic.register(fastifyCompress);
+        await appStatic.register(fastifyStatic, {
+            root: process.cwd(),
+            prefix: '/',
+            setHeaders: (res) => {
+                res.headers({
+                    'Access-Control-Allow-Origin': '*',
+                    'Timing-Allow-Origin': '*',
+                    'X-App-Id': appInfo.appName,
+                    'X-App-Version': appVersion,
+                    'X-Host': os.hostname(),
+                });
+            },
         });
-        appStatic.use('/', express.static('./'));
-        appStatic.listen(port, () => log.info(`Running static server on port: ${port}`));
+        appStatic.listen({ port }, () => log.info(`Running static server on port: ${port}`));
         return appStatic;
     };
 };
@@ -394,17 +280,6 @@ function createApi(rootApp, papiList, { baseUrl, di, logger }) {
                         scope: Scope$1.REQUEST,
                         useValue: res,
                     },
-                    // TODO: remove deprecated after removing express compatibility layer
-                    {
-                        provide: REQUEST,
-                        scope: Scope$1.REQUEST,
-                        useValue: req.raw,
-                    },
-                    {
-                        provide: RESPONSE,
-                        scope: Scope$1.REQUEST,
-                        useValue: res.raw,
-                    },
                 ]);
                 const papiExecutor = childDi.get(PAPI_EXECUTOR);
                 // TODO: use abortSignal
@@ -887,11 +762,9 @@ ServerProxyModule = __decorate([
     Module({
         providers: [
             {
-                // TODO: tramvai@2 migrate to `fastify` and `@fastify/http-proxy`
-                // interfaces for the proxies are not compatible so some migration from the app is needed
-                provide: WEB_APP_BEFORE_INIT_TOKEN,
-                useFactory: ({ app, defaultProxies }) => {
-                    return () => {
+                provide: WEB_FASTIFY_APP_INIT_TOKEN,
+                useFactory: ({ defaultProxies }) => {
+                    return (app) => {
                         const proxyConfig = safeNodeRequire(resolve(process.cwd(), 'proxy.conf'));
                         const proxies = defaultProxies !== null && defaultProxies !== void 0 ? defaultProxies : [];
                         if (!proxyConfig && proxies.length === 0) {
@@ -910,19 +783,21 @@ ServerProxyModule = __decorate([
                             }, proxyConfig);
                         }
                         proxies.forEach((proxy) => {
-                            app.use(createProxyMiddleware(proxy.context, {
+                            const middleware = createProxyMiddleware(proxy.context, {
                                 changeOrigin: true,
                                 onProxyRes: (proxyRes) => {
                                     // eslint-disable-next-line no-param-reassign
                                     proxyRes.headers['x-tramvai-proxied-response'] = '1';
                                 },
                                 ...proxy,
-                            }));
+                            });
+                            app.addHook('onRequest', (req, res, next) => {
+                                middleware(req.raw, res.raw, next);
+                            });
                         });
                     };
                 },
                 deps: {
-                    app: WEB_APP_TOKEN,
                     defaultProxies: {
                         token: PROXY_CONFIG_TOKEN,
                         optional: true,
@@ -1159,22 +1034,12 @@ ServerModule = __decorate([
                     factory: WEB_FASTIFY_APP_FACTORY_TOKEN,
                 },
             }),
-            provide$1({
-                // BACKWARD: provide the express app as before
-                provide: WEB_APP_TOKEN,
-                scope: Scope.SINGLETON,
-                useFactory: webAppExpressFactory,
-                deps: {
-                    webApp: WEB_FASTIFY_APP_TOKEN,
-                },
-            }),
             {
                 provide: commandLineListTokens.init,
                 multi: true,
                 useFactory: webAppInitCommand,
                 deps: {
                     app: WEB_FASTIFY_APP_TOKEN,
-                    expressApp: WEB_APP_TOKEN,
                     logger: LOGGER_TOKEN,
                     commandLineRunner: COMMAND_LINE_RUNNER_TOKEN,
                     executionContextManager: EXECUTION_CONTEXT_MANAGER_TOKEN,
@@ -1183,10 +1048,6 @@ ServerModule = __decorate([
                     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 },
-                    expressAfterInit: { token: WEB_APP_AFTER_INIT_TOKEN, optional: true },
-                    expressLimiterRequest: { token: WEB_APP_LIMITER_TOKEN, optional: true },
                     beforeError: { token: WEB_FASTIFY_APP_BEFORE_ERROR_TOKEN, optional: true },
                     processError: { token: WEB_FASTIFY_APP_PROCESS_ERROR_TOKEN, optional: true },
                     afterError: { token: WEB_FASTIFY_APP_AFTER_ERROR_TOKEN, optional: true },

package/lib/server.js

@@ -13,16 +13,13 @@ var moduleMetrics = require('@tramvai/module-metrics');
 var moduleCacheWarmup = require('@tramvai/module-cache-warmup');
 var http = require('http');
 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');
 var errors = require('@tinkoff/errors');
-var zlib = require('zlib');
-var compression = require('compression');
+var fastifyCompress = require('@fastify/compress');
+var FastifyStatic = require('@fastify/static');
 var os = require('os');
 var filterObj = require('@tinkoff/utils/object/filter');
 var flatten = require('@tinkoff/utils/array/flatten');
@@ -30,7 +27,6 @@ var toArray = require('@tinkoff/utils/array/toArray');
 var papi = require('@tramvai/papi');
 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 monkeypatch = require('@tinkoff/monkeypatch');
@@ -45,19 +41,15 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var EventEmitter__default = /*#__PURE__*/_interopDefaultLegacy(EventEmitter);
 var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
 var fastify__default = /*#__PURE__*/_interopDefaultLegacy(fastify);
-var express__default = /*#__PURE__*/_interopDefaultLegacy(express);
 var fastifyFormBody__default = /*#__PURE__*/_interopDefaultLegacy(fastifyFormBody);
-var fp__default = /*#__PURE__*/_interopDefaultLegacy(fp);
-var symbols__default = /*#__PURE__*/_interopDefaultLegacy(symbols);
 var isNil__default = /*#__PURE__*/_interopDefaultLegacy(isNil);
-var zlib__default = /*#__PURE__*/_interopDefaultLegacy(zlib);
-var compression__default = /*#__PURE__*/_interopDefaultLegacy(compression);
+var fastifyCompress__default = /*#__PURE__*/_interopDefaultLegacy(fastifyCompress);
+var FastifyStatic__default = /*#__PURE__*/_interopDefaultLegacy(FastifyStatic);
 var os__default = /*#__PURE__*/_interopDefaultLegacy(os);
 var filterObj__default = /*#__PURE__*/_interopDefaultLegacy(filterObj);
 var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
 var toArray__default = /*#__PURE__*/_interopDefaultLegacy(toArray);
 var eachObj__default = /*#__PURE__*/_interopDefaultLegacy(eachObj);
-var FastifyStatic__default = /*#__PURE__*/_interopDefaultLegacy(FastifyStatic);
 var monkeypatch__default = /*#__PURE__*/_interopDefaultLegacy(monkeypatch);
 var https__default = /*#__PURE__*/_interopDefaultLegacy(https);
 var isArray__default = /*#__PURE__*/_interopDefaultLegacy(isArray);
@@ -77,91 +69,6 @@ const serverListenCommand = ({ server, logger, envManager, }) => {
     };
 };
 
-/**
- * Fork of https://github.com/fastify/fastify-express
- */
-const kMiddlewares = Symbol('fastify-express-middlewares');
-const expressPlugin = (fastify, options, next) => {
-    var _a, _b;
-    fastify.decorate('use', use);
-    // eslint-disable-next-line no-param-reassign
-    fastify[kMiddlewares] = [];
-    fastify.decorate('express', (_b = (_a = options.express) === null || _a === void 0 ? void 0 : _a.instance) !== null && _b !== void 0 ? _b : express__default["default"]());
-    fastify.express.disable('x-powered-by');
-    fastify
-        .addHook('preHandler', enhanceRequest)
-        .addHook('preHandler', runConnect)
-        .addHook('onRegister', onRegister);
-    function use(path, fn) {
-        if (typeof path === 'string') {
-            const prefix = this[symbols__default["default"].kRoutePrefix];
-            // eslint-disable-next-line no-param-reassign
-            path = prefix + (path === '/' && prefix.length > 0 ? '' : path);
-        }
-        this[kMiddlewares].push([path, fn]);
-        if (fn == null) {
-            this.express.use(path);
-        }
-        else {
-            this.express.use(path, fn);
-        }
-        return this;
-    }
-    function enhanceRequest(req, reply, next) {
-        req.raw.originalUrl = req.raw.url;
-        req.raw.id = req.id;
-        req.raw.hostname = req.hostname;
-        req.raw.ip = req.ip;
-        req.raw.ips = req.ips;
-        req.raw.log = req.log;
-        // eslint-disable-next-line no-param-reassign
-        reply.raw.log = req.log;
-        if (req.body) {
-            req.raw.body = req.body;
-        }
-        if (req.cookies) {
-            req.raw.cookies = req.cookies;
-        }
-        const originalProtocol = req.raw.protocol;
-        // Make it lazy as it does a bit of work
-        Object.defineProperty(req.raw, 'protocol', {
-            get() {
-                // added in Fastify@3.5, so handle it missing
-                return req.protocol || originalProtocol;
-            },
-        });
-        next();
-    }
-    function runConnect(req, reply, next) {
-        if (this[kMiddlewares].length > 0) {
-            for (const [headerName, headerValue] of Object.entries(reply.getHeaders())) {
-                reply.raw.setHeader(headerName, headerValue);
-            }
-            this.express(req.raw, reply.raw, next);
-        }
-        else {
-            next();
-        }
-    }
-    function onRegister(instance) {
-        var _a, _b;
-        const middlewares = instance[kMiddlewares].slice();
-        // eslint-disable-next-line no-param-reassign
-        instance[kMiddlewares] = [];
-        instance.decorate('express', (_b = (_a = options.express) === null || _a === void 0 ? void 0 : _a.instance) !== null && _b !== void 0 ? _b : express__default["default"]());
-        instance.express.disable('x-powered-by');
-        instance.decorate('use', use);
-        for (const middleware of middlewares) {
-            instance.use(...middleware);
-        }
-    }
-    next();
-};
-const fastifyExpressCompatibility = fp__default["default"](expressPlugin, {
-    fastify: '>=3.0.0',
-    name: 'fastify-express',
-});
-
 const errorHandler = (app, { log, beforeError, processError, afterError, }) => {
     app.setErrorHandler(async (error, request, reply) => {
         const runHandlers = async (handlers) => {
@@ -222,39 +129,28 @@ const webAppFactory = ({ server }) => {
     });
     return app;
 };
-const webAppExpressFactory = ({ webApp }) => {
-    const app = express__default["default"]();
-    app.disable('etag');
-    app.disable('x-powered-by');
-    return app;
-};
-const webAppInitCommand = ({ app, expressApp, logger, commandLineRunner, executionContextManager, beforeInit, requestMetrics, limiterRequest, init, afterInit, expressBeforeInit, expressInit, expressAfterInit, expressLimiterRequest, beforeError, processError, afterError, }) => {
+const webAppInitCommand = ({ app, logger, commandLineRunner, executionContextManager, beforeInit, requestMetrics, limiterRequest, init, afterInit, beforeError, processError, afterError, }) => {
     const log = logger('server:webapp');
-    const runHandlers = (instance, handlers, expressHandlers) => {
-        return Promise.all([
-            handlers && Promise.all(handlers.map((handler) => handler(instance))),
-            expressHandlers && Promise.all(expressHandlers.map((handler) => handler(expressApp))),
-        ]);
+    const runHandlers = (instance, handlers) => {
+        return Promise.all([handlers && Promise.all(handlers.map((handler) => handler(instance)))]);
     };
     return async function webAppInit() {
         errorHandler(app, { log, beforeError, processError, afterError });
-        await app.register(fastifyExpressCompatibility, {
-            express: {
-                instance: expressApp,
-            },
-        });
         await app.register(async (instance) => {
-            await runHandlers(instance, beforeInit, expressBeforeInit);
+            await runHandlers(instance, beforeInit);
         });
         await app.register(async (instance) => {
-            await runHandlers(instance, requestMetrics, []);
-            await runHandlers(instance, limiterRequest, expressLimiterRequest);
+            await runHandlers(instance, requestMetrics);
+            await runHandlers(instance, limiterRequest);
             await app.register(cookie.fastifyCookie);
             await app.register(fastifyFormBody__default["default"], { bodyLimit: 2097152 }); // 2mb
-            await runHandlers(instance, init, expressInit);
-            // force express to execute to update server's request and response instances
-            instance.use((req, res, next) => {
-                next();
+            await runHandlers(instance, init);
+            // break the cycle of event loop to allow server to handle other requests
+            // while current on is in processing
+            // mainly to prevent problems and response hanging in case the response process
+            // uses only sync and microtask code
+            instance.addHook('preHandler', (req, res, next) => {
+                setImmediate(next);
             });
             instance.all('*', async (request, reply) => {
                 try {
@@ -270,24 +166,12 @@ const webAppInitCommand = ({ app, expressApp, logger, commandLineRunner, executi
                                 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,
+                                provide: tokensServerPrivate.FASTIFY_REQUEST,
                                 scope: core.Scope.REQUEST,
                                 useValue: request,
                             },
                             {
-                                provide: tokensCommon.FASTIFY_RESPONSE,
+                                provide: tokensServerPrivate.FASTIFY_RESPONSE,
                                 scope: core.Scope.REQUEST,
                                 useValue: reply,
                             },
@@ -321,7 +205,7 @@ const webAppInitCommand = ({ app, expressApp, logger, commandLineRunner, executi
             });
         });
         await app.register(async (instance) => {
-            await runHandlers(app, afterInit, expressAfterInit);
+            await runHandlers(instance, afterInit);
         });
         await app.ready();
     };
@@ -334,25 +218,23 @@ const staticAppCommand = ({ logger, envManager, appInfo, }) => {
     const log = logger('server:static');
     const port = +envManager.get('PORT_STATIC');
     const appVersion = envManager.get('APP_VERSION');
-    return function staticApp() {
-        const appStatic = express__default["default"]();
-        appStatic.disable('x-powered-by');
-        // WEB-389: Переключить на brotli после мержа https://github.com/expressjs/compression/pull/156
-        appStatic.use(compression__default["default"]({
-            level: zlib__default["default"].Z_DEFAULT_COMPRESSION,
-        }));
-        appStatic.use((_, res, next) => {
-            res.set({
-                'Access-Control-Allow-Origin': '*',
-                'Timing-Allow-Origin': '*',
-                'X-App-Id': appInfo.appName,
-                'X-App-Version': appVersion,
-                'X-Host': os__default["default"].hostname(),
-            });
-            next();
+    return async function staticApp() {
+        const appStatic = fastify__default["default"]();
+        await appStatic.register(fastifyCompress__default["default"]);
+        await appStatic.register(FastifyStatic.fastifyStatic, {
+            root: process.cwd(),
+            prefix: '/',
+            setHeaders: (res) => {
+                res.headers({
+                    'Access-Control-Allow-Origin': '*',
+                    'Timing-Allow-Origin': '*',
+                    'X-App-Id': appInfo.appName,
+                    'X-App-Version': appVersion,
+                    'X-Host': os__default["default"].hostname(),
+                });
+            },
         });
-        appStatic.use('/', express__default["default"].static('./'));
-        appStatic.listen(port, () => log.info(`Running static server on port: ${port}`));
+        appStatic.listen({ port }, () => log.info(`Running static server on port: ${port}`));
         return appStatic;
     };
 };
@@ -411,26 +293,15 @@ function createApi(rootApp, papiList, { baseUrl, di, logger }) {
             }, async (req, res) => {
                 const childDi = dippy.createChildContainer(di, [
                     {
-                        provide: tokensCommon.FASTIFY_REQUEST,
+                        provide: tokensServerPrivate.FASTIFY_REQUEST,
                         scope: dippy.Scope.REQUEST,
                         useValue: req,
                     },
                     {
-                        provide: tokensCommon.FASTIFY_RESPONSE,
+                        provide: tokensServerPrivate.FASTIFY_RESPONSE,
                         scope: dippy.Scope.REQUEST,
                         useValue: res,
                     },
-                    // TODO: remove deprecated after removing express compatibility layer
-                    {
-                        provide: tokensCommon.REQUEST,
-                        scope: dippy.Scope.REQUEST,
-                        useValue: req.raw,
-                    },
-                    {
-                        provide: tokensCommon.RESPONSE,
-                        scope: dippy.Scope.REQUEST,
-                        useValue: res.raw,
-                    },
                 ]);
                 const papiExecutor = childDi.get(tokensServerPrivate.PAPI_EXECUTOR);
                 // TODO: use abortSignal
@@ -542,7 +413,7 @@ const papiExecutorProvider = dippy.provide({
     deps: {
         di: dippy.DI_TOKEN,
         logger: tokensCommon.LOGGER_TOKEN,
-        fastifyRequest: tokensCommon.FASTIFY_REQUEST,
+        fastifyRequest: tokensServerPrivate.FASTIFY_REQUEST,
         requestManager: tokensCommon.REQUEST_MANAGER_TOKEN,
         responseManager: tokensCommon.RESPONSE_MANAGER_TOKEN,
     },
@@ -913,11 +784,9 @@ ServerProxyModule = tslib.__decorate([
     core.Module({
         providers: [
             {
-                // TODO: tramvai@2 migrate to `fastify` and `@fastify/http-proxy`
-                // interfaces for the proxies are not compatible so some migration from the app is needed
-                provide: tokensServer.WEB_APP_BEFORE_INIT_TOKEN,
-                useFactory: ({ app, defaultProxies }) => {
-                    return () => {
+                provide: tokensServerPrivate.WEB_FASTIFY_APP_INIT_TOKEN,
+                useFactory: ({ defaultProxies }) => {
+                    return (app) => {
                         const proxyConfig = safeNodeRequire(path.resolve(process.cwd(), 'proxy.conf'));
                         const proxies = defaultProxies !== null && defaultProxies !== void 0 ? defaultProxies : [];
                         if (!proxyConfig && proxies.length === 0) {
@@ -936,19 +805,21 @@ ServerProxyModule = tslib.__decorate([
                             }, proxyConfig);
                         }
                         proxies.forEach((proxy) => {
-                            app.use(httpProxyMiddleware.createProxyMiddleware(proxy.context, {
+                            const middleware = httpProxyMiddleware.createProxyMiddleware(proxy.context, {
                                 changeOrigin: true,
                                 onProxyRes: (proxyRes) => {
                                     // eslint-disable-next-line no-param-reassign
                                     proxyRes.headers['x-tramvai-proxied-response'] = '1';
                                 },
                                 ...proxy,
-                            }));
+                            });
+                            app.addHook('onRequest', (req, res, next) => {
+                                middleware(req.raw, res.raw, next);
+                            });
                         });
                     };
                 },
                 deps: {
-                    app: tokensServer.WEB_APP_TOKEN,
                     defaultProxies: {
                         token: tokensServer.PROXY_CONFIG_TOKEN,
                         optional: true,
@@ -1185,22 +1056,12 @@ exports.ServerModule = tslib.__decorate([
                     factory: tokensServerPrivate.WEB_FASTIFY_APP_FACTORY_TOKEN,
                 },
             }),
-            core.provide({
-                // BACKWARD: provide the express app as before
-                provide: tokensServer.WEB_APP_TOKEN,
-                scope: core.Scope.SINGLETON,
-                useFactory: webAppExpressFactory,
-                deps: {
-                    webApp: tokensServerPrivate.WEB_FASTIFY_APP_TOKEN,
-                },
-            }),
             {
                 provide: core.commandLineListTokens.init,
                 multi: true,
                 useFactory: webAppInitCommand,
                 deps: {
                     app: tokensServerPrivate.WEB_FASTIFY_APP_TOKEN,
-                    expressApp: tokensServer.WEB_APP_TOKEN,
                     logger: tokensCommon.LOGGER_TOKEN,
                     commandLineRunner: core.COMMAND_LINE_RUNNER_TOKEN,
                     executionContextManager: tokensCommon.EXECUTION_CONTEXT_MANAGER_TOKEN,
@@ -1209,10 +1070,6 @@ exports.ServerModule = tslib.__decorate([
                     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 },
-                    expressAfterInit: { token: tokensServer.WEB_APP_AFTER_INIT_TOKEN, optional: true },
-                    expressLimiterRequest: { token: tokensServer.WEB_APP_LIMITER_TOKEN, optional: true },
                     beforeError: { token: tokensServerPrivate.WEB_FASTIFY_APP_BEFORE_ERROR_TOKEN, optional: true },
                     processError: { token: tokensServerPrivate.WEB_FASTIFY_APP_PROCESS_ERROR_TOKEN, optional: true },
                     afterError: { token: tokensServerPrivate.WEB_FASTIFY_APP_AFTER_ERROR_TOKEN, optional: true },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-server",
-  "version": "2.31.0",
+  "version": "2.32.0",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -26,33 +26,30 @@
     "@tinkoff/monkeypatch": "2.0.2",
     "@tinkoff/terminus": "0.1.3",
     "@tinkoff/url": "0.8.3",
-    "@tramvai/module-cache-warmup": "2.31.0",
-    "@tramvai/module-metrics": "2.31.0",
-    "@tramvai/papi": "2.31.0",
-    "@tramvai/tokens-server": "2.31.0",
-    "@tramvai/tokens-server-private": "2.31.0",
-    "compression": "^1.7.4",
-    "express": "^4.17.1",
-    "fastify": "^3.29.0",
-    "fastify-plugin": "^3.0.1",
-    "@fastify/cookie": "^6.0.0",
-    "@fastify/formbody": "^6.0.1",
-    "@fastify/static": "^5.0.2",
+    "@tramvai/module-cache-warmup": "2.32.0",
+    "@tramvai/module-metrics": "2.32.0",
+    "@tramvai/papi": "2.32.0",
+    "@tramvai/tokens-server": "2.32.0",
+    "@tramvai/tokens-server-private": "2.32.0",
+    "fastify": "^4.6.0",
+    "fastify-plugin": "^4.2.1",
+    "@fastify/cookie": "^8.1.0",
+    "@fastify/compress": "^6.1.1",
+    "@fastify/formbody": "^7.2.0",
+    "@fastify/static": "^6.5.0",
     "http-proxy-middleware": "^2.0.2"
   },
   "peerDependencies": {
     "@tinkoff/dippy": "0.8.6",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "2.31.0",
-    "@tramvai/core": "2.31.0",
-    "@tramvai/module-common": "2.31.0",
-    "@tramvai/module-environment": "2.31.0",
-    "@tramvai/tokens-common": "2.31.0",
+    "@tramvai/cli": "2.32.0",
+    "@tramvai/core": "2.32.0",
+    "@tramvai/module-common": "2.32.0",
+    "@tramvai/module-environment": "2.32.0",
+    "@tramvai/tokens-common": "2.32.0",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@types/compression": "^1.7.0",
-    "@types/express": "^4.17.9",
     "@types/http-proxy-middleware": "^0.19.3"
   },
   "module": "lib/server.es.js",

package/lib/server/express-compatibility.d.ts

@@ -1,24 +0,0 @@
-/**
- * Fork of https://github.com/fastify/fastify-express
- */
-import express from 'express';
-import type { FastifyPluginCallback } from 'fastify';
-declare module 'fastify' {
-    interface FastifyInstance {
-        /**
-         * Express middleware function
-         */
-        use: express.Application['use'];
-        /**
-         * Express application instance
-         */
-        express: express.Application;
-    }
-}
-interface Options {
-    express: {
-        instance: express.Application;
-    };
-}
-export declare const fastifyExpressCompatibility: FastifyPluginCallback<Options, import("fastify").RawServerDefault>;
-export {};