@tramvai/module-server 1.85.0 → 1.90.2

package/lib/server/xHeaders.d.ts

@@ -1,8 +1,8 @@
 import type { APP_INFO_TOKEN } from '@tramvai/core';
-import type { WEB_APP_TOKEN } from '@tramvai/tokens-server';
 import type { ENV_MANAGER_TOKEN } from '@tramvai/module-common';
+import type { WEB_FASTIFY_APP_TOKEN } from '@tramvai/tokens-server-private';
 export declare const xHeadersFactory: ({ app, envManager, appInfo, }: {
-    app: typeof WEB_APP_TOKEN;
+    app: typeof WEB_FASTIFY_APP_TOKEN;
     envManager: typeof ENV_MANAGER_TOKEN;
     appInfo: typeof APP_INFO_TOKEN;
 }) => () => Promise<void>;

package/lib/server.es.js

@@ -26,6 +26,8 @@ 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';
@@ -33,7 +35,6 @@ import monkeypatch from '@tinkoff/monkeypatch';
 import https from 'https';
 import isArray from '@tinkoff/utils/is/array';
 import isObject from '@tinkoff/utils/is/object';
-import { resolve } from 'path';
 import { createProxyMiddleware } from 'http-proxy-middleware';
 
 const serverFactory = () => {
@@ -323,9 +324,8 @@ const xHeadersFactory = ({ app, envManager, appInfo, }) => {
         'x-deploy-repository': envManager.get('DEPLOY_REPOSITORY'),
     });
     return async () => {
-        app.use((req, res, next) => {
-            res.set(xHeaders);
-            next();
+        app.addHook('preHandler', async (_, reply) => {
+            reply.headers(xHeaders);
         });
     };
 };
@@ -369,10 +369,20 @@ try {
     Api = require('@tramvai/cli/lib/external/api').default; // eslint-disable-line import/no-unresolved
 }
 catch (e) { }
-const getFileApi = () => {
+const getFileApi = ({ logger }) => {
+    const log = logger('papi:fileApi');
     const result = [];
     eachObj((v, k) => {
         const handler = (v.handler || v.default);
+        if (!handler) {
+            log.error({
+                message: `Cannot resolve a papi handler.
+Check that you are using file based papi right way by docs https://tramvai.dev/docs/how-to/how-create-papi#automatic-handler-creation
+In case you have not added any file papi handler, consider renaming directory ./src/api (by default) to the other name to resolve conflicts with papi, or
+change settings application.commands.build.options.serverApiDir in tramvai.json`,
+            });
+            throw new Error('Not a papi');
+        }
         const papiParameters = getPapiParameters(handler);
         result.push(createPapiMethod({
             ...v,
@@ -386,7 +396,10 @@ const getFileApi = () => {
 const fileApiProvider = {
     provide: SERVER_MODULE_PAPI_PUBLIC_ROUTE,
     multi: true,
-    useValue: getFileApi(),
+    useFactory: getFileApi,
+    deps: {
+        logger: LOGGER_TOKEN,
+    },
 };
 
 const sharedProviders = [
@@ -521,29 +534,32 @@ let ServerStaticsModule = class ServerStaticsModule {
 ServerStaticsModule = __decorate([
     Module({
         providers: [
-            {
-                provide: WEB_APP_BEFORE_INIT_TOKEN,
+            provide({
+                provide: WEB_FASTIFY_APP_BEFORE_INIT_TOKEN,
                 useFactory: ({ app, options }) => {
                     const path = (options === null || options === void 0 ? void 0 : options.path) || 'public';
                     return () => {
-                        app.use(express.static(path, {
+                        app.register(FastifyStatic, {
+                            decorateReply: false,
+                            prefix: `/${path}`,
+                            root: resolve(process.cwd(), path),
                             setHeaders: (res) => {
                                 const oneYearForward = new Date(Date.now() + ONE_YEAR * 1000);
-                                res.set('cache-control', `public, max-age=${ONE_YEAR}`);
-                                res.set('expires', oneYearForward.toUTCString());
+                                res.setHeader('cache-control', `public, max-age=${ONE_YEAR}`);
+                                res.setHeader('expires', oneYearForward.toUTCString());
                             },
-                        }));
+                        });
                     };
                 },
                 deps: {
-                    app: WEB_APP_TOKEN,
+                    app: WEB_FASTIFY_APP_TOKEN,
                     options: {
                         token: SERVER_MODULE_STATICS_OPTIONS,
                         optional: true,
                     },
                 },
                 multi: true,
-            },
+            }),
         ],
     })
 ], ServerStaticsModule);
@@ -768,6 +784,8 @@ 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 () => {
@@ -956,11 +974,11 @@ ServerModule = __decorate([
                 ],
             },
             {
-                provide: WEB_APP_BEFORE_INIT_TOKEN,
+                provide: WEB_FASTIFY_APP_INIT_TOKEN,
                 multi: true,
                 useFactory: xHeadersFactory,
                 deps: {
-                    app: WEB_APP_TOKEN,
+                    app: WEB_FASTIFY_APP_TOKEN,
                     envManager: ENV_MANAGER_TOKEN,
                     appInfo: APP_INFO_TOKEN,
                 },

package/lib/server.js

@@ -29,6 +29,8 @@ 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');
@@ -36,7 +38,6 @@ var monkeypatch = require('@tinkoff/monkeypatch');
 var https = require('https');
 var isArray = require('@tinkoff/utils/is/array');
 var isObject = require('@tinkoff/utils/is/object');
-var path = require('path');
 var httpProxyMiddleware = require('http-proxy-middleware');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -57,6 +58,7 @@ 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);
@@ -349,9 +351,8 @@ const xHeadersFactory = ({ app, envManager, appInfo, }) => {
         'x-deploy-repository': envManager.get('DEPLOY_REPOSITORY'),
     });
     return async () => {
-        app.use((req, res, next) => {
-            res.set(xHeaders);
-            next();
+        app.addHook('preHandler', async (_, reply) => {
+            reply.headers(xHeaders);
         });
     };
 };
@@ -395,10 +396,20 @@ try {
     Api = require('@tramvai/cli/lib/external/api').default; // eslint-disable-line import/no-unresolved
 }
 catch (e) { }
-const getFileApi = () => {
+const getFileApi = ({ logger }) => {
+    const log = logger('papi:fileApi');
     const result = [];
     eachObj__default["default"]((v, k) => {
         const handler = (v.handler || v.default);
+        if (!handler) {
+            log.error({
+                message: `Cannot resolve a papi handler.
+Check that you are using file based papi right way by docs https://tramvai.dev/docs/how-to/how-create-papi#automatic-handler-creation
+In case you have not added any file papi handler, consider renaming directory ./src/api (by default) to the other name to resolve conflicts with papi, or
+change settings application.commands.build.options.serverApiDir in tramvai.json`,
+            });
+            throw new Error('Not a papi');
+        }
         const papiParameters = papi.getPapiParameters(handler);
         result.push(papi.createPapiMethod({
             ...v,
@@ -412,7 +423,10 @@ const getFileApi = () => {
 const fileApiProvider = {
     provide: tokensServer.SERVER_MODULE_PAPI_PUBLIC_ROUTE,
     multi: true,
-    useValue: getFileApi(),
+    useFactory: getFileApi,
+    deps: {
+        logger: tokensCommon.LOGGER_TOKEN,
+    },
 };
 
 const sharedProviders = [
@@ -547,29 +561,32 @@ let ServerStaticsModule = class ServerStaticsModule {
 ServerStaticsModule = tslib.__decorate([
     core.Module({
         providers: [
-            {
-                provide: tokensServer.WEB_APP_BEFORE_INIT_TOKEN,
+            core.provide({
+                provide: tokensServerPrivate.WEB_FASTIFY_APP_BEFORE_INIT_TOKEN,
                 useFactory: ({ app, options }) => {
-                    const path = (options === null || options === void 0 ? void 0 : options.path) || 'public';
+                    const path$1 = (options === null || options === void 0 ? void 0 : options.path) || 'public';
                     return () => {
-                        app.use(express__default["default"].static(path, {
+                        app.register(FastifyStatic__default["default"], {
+                            decorateReply: false,
+                            prefix: `/${path$1}`,
+                            root: path.resolve(process.cwd(), path$1),
                             setHeaders: (res) => {
                                 const oneYearForward = new Date(Date.now() + ONE_YEAR * 1000);
-                                res.set('cache-control', `public, max-age=${ONE_YEAR}`);
-                                res.set('expires', oneYearForward.toUTCString());
+                                res.setHeader('cache-control', `public, max-age=${ONE_YEAR}`);
+                                res.setHeader('expires', oneYearForward.toUTCString());
                             },
-                        }));
+                        });
                     };
                 },
                 deps: {
-                    app: tokensServer.WEB_APP_TOKEN,
+                    app: tokensServerPrivate.WEB_FASTIFY_APP_TOKEN,
                     options: {
                         token: tokensServer.SERVER_MODULE_STATICS_OPTIONS,
                         optional: true,
                     },
                 },
                 multi: true,
-            },
+            }),
         ],
     })
 ], ServerStaticsModule);
@@ -794,6 +811,8 @@ 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 () => {
@@ -982,11 +1001,11 @@ exports.ServerModule = tslib.__decorate([
                 ],
             },
             {
-                provide: tokensServer.WEB_APP_BEFORE_INIT_TOKEN,
+                provide: tokensServerPrivate.WEB_FASTIFY_APP_INIT_TOKEN,
                 multi: true,
                 useFactory: xHeadersFactory,
                 deps: {
-                    app: tokensServer.WEB_APP_TOKEN,
+                    app: tokensServerPrivate.WEB_FASTIFY_APP_TOKEN,
                     envManager: tokensCommon.ENV_MANAGER_TOKEN,
                     appInfo: core.APP_INFO_TOKEN,
                 },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-server",
-  "version": "1.85.0",
+  "version": "1.90.2",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -20,14 +20,14 @@
   },
   "dependencies": {
     "@tinkoff/errors": "0.2.20",
-    "@tinkoff/terminus": "0.0.1",
     "@tinkoff/monkeypatch": "1.3.3",
+    "@tinkoff/terminus": "0.0.1",
     "@tinkoff/url": "0.7.37",
-    "@tramvai/module-cache-warmup": "1.85.0",
-    "@tramvai/module-metrics": "1.85.0",
-    "@tramvai/papi": "1.85.0",
-    "@tramvai/tokens-server": "1.85.0",
-    "@tramvai/tokens-server-private": "1.85.0",
+    "@tramvai/module-cache-warmup": "1.90.2",
+    "@tramvai/module-metrics": "1.90.2",
+    "@tramvai/papi": "1.90.2",
+    "@tramvai/tokens-server": "1.90.2",
+    "@tramvai/tokens-server-private": "1.90.2",
     "body-parser": "^1.19.0",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.3",
@@ -36,16 +36,17 @@
     "fastify-cookie": "^5.6.0",
     "fastify-formbody": "^5.2.0",
     "fastify-plugin": "^3.0.1",
+    "fastify-static": "^4.6.1",
     "http-proxy-middleware": "^2.0.2"
   },
   "peerDependencies": {
     "@tinkoff/dippy": "0.7.39",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "1.85.0",
-    "@tramvai/core": "1.85.0",
-    "@tramvai/module-common": "1.85.0",
-    "@tramvai/module-environment": "1.85.0",
-    "@tramvai/tokens-common": "1.85.0",
+    "@tramvai/cli": "1.90.2",
+    "@tramvai/core": "1.90.2",
+    "@tramvai/module-common": "1.90.2",
+    "@tramvai/module-environment": "1.90.2",
+    "@tramvai/tokens-common": "1.90.2",
     "tslib": "^2.0.3"
   },
   "devDependencies": {