@tramvai/module-server 1.92.2 → 1.94.0

package/README.md

@@ -178,10 +178,10 @@ Module uses loggers with identifiers: `server`, `server:static`, `server:webapp`
 
 ### Specify server port
 
-By default server starts at `3000` port. You can change this value by specifying environment variable `PORT`:
+By default server starts at `3000` port. You have next options to override this value depending on your environment:
 
-- in dev environment it can be done by adding env `PORT` to file `env.development.json` e.g. `PORT: "8080"`
-- it can be specified explicitly as an environment variable `PORT` e.g. `PORT=8080`
+- **in dev environment** port in fully controlled by `@tramvai/cli` and should be specified by [`-p` option](references/cli/start.md#-p---port)
+- **in prod environment** it can be specified explicitly as an environment variable `PORT` e.g. `PORT=8080`
 
 ## Exportable tokens
 

package/lib/server.es.js

@@ -9,8 +9,6 @@ import { CacheWarmupModule } from '@tramvai/module-cache-warmup';
 import http from 'http';
 import fastify from 'fastify';
 import express from 'express';
-import cookieParser from 'cookie-parser';
-import bodyParser from 'body-parser';
 import { fastifyCookie } from 'fastify-cookie';
 import fastifyFormBody from 'fastify-formbody';
 import fp from 'fastify-plugin';
@@ -63,8 +61,8 @@ const expressPlugin = (fastify, options, next) => {
     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('onRequest', enhanceRequest)
-        .addHook('onRequest', runConnect)
+        .addHook('preHandler', enhanceRequest)
+        .addHook('preHandler', runConnect)
         .addHook('onRegister', onRegister);
     function use(path, fn) {
         if (typeof path === 'string') {
@@ -90,6 +88,12 @@ const expressPlugin = (fastify, options, next) => {
         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', {
@@ -212,11 +216,7 @@ const webAppInitCommand = ({ app, expressApp, logger, commandLineRunner, beforeI
         await runHandlers(beforeInit, expressBeforeInit);
         await runHandlers(limiterRequest, expressLimiterRequest);
         await app.register(fastifyCookie);
-        await app.register(fastifyFormBody);
-        expressApp.use(bodyParser.urlencoded({
-            limit: '2mb',
-            extended: false,
-        }), cookieParser());
+        await app.register(fastifyFormBody, { bodyLimit: 2097152 }); // 2mb
         await runHandlers(init, expressInit);
         // force express to execute to update server's request and response instances
         app.use((req, res, next) => {
@@ -333,7 +333,6 @@ const xHeadersFactory = ({ app, envManager, appInfo, }) => {
 function createApi(papiList, { di, logger }) {
     return create(papiList, [
         middlewares.timeout(),
-        middlewares.body(),
         middlewares.cookie(),
         middlewares.validate(),
         middlewares.fillPapiState({

package/lib/server.js

@@ -12,8 +12,6 @@ var moduleCacheWarmup = require('@tramvai/module-cache-warmup');
 var http = require('http');
 var fastify = require('fastify');
 var express = require('express');
-var cookieParser = require('cookie-parser');
-var bodyParser = require('body-parser');
 var fastifyCookie = require('fastify-cookie');
 var fastifyFormBody = require('fastify-formbody');
 var fp = require('fastify-plugin');
@@ -45,8 +43,6 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
 var fastify__default = /*#__PURE__*/_interopDefaultLegacy(fastify);
 var express__default = /*#__PURE__*/_interopDefaultLegacy(express);
-var cookieParser__default = /*#__PURE__*/_interopDefaultLegacy(cookieParser);
-var bodyParser__default = /*#__PURE__*/_interopDefaultLegacy(bodyParser);
 var fastifyFormBody__default = /*#__PURE__*/_interopDefaultLegacy(fastifyFormBody);
 var fp__default = /*#__PURE__*/_interopDefaultLegacy(fp);
 var symbols__default = /*#__PURE__*/_interopDefaultLegacy(symbols);
@@ -90,8 +86,8 @@ const expressPlugin = (fastify, options, next) => {
     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('onRequest', enhanceRequest)
-        .addHook('onRequest', runConnect)
+        .addHook('preHandler', enhanceRequest)
+        .addHook('preHandler', runConnect)
         .addHook('onRegister', onRegister);
     function use(path, fn) {
         if (typeof path === 'string') {
@@ -117,6 +113,12 @@ const expressPlugin = (fastify, options, next) => {
         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', {
@@ -239,11 +241,7 @@ const webAppInitCommand = ({ app, expressApp, logger, commandLineRunner, beforeI
         await runHandlers(beforeInit, expressBeforeInit);
         await runHandlers(limiterRequest, expressLimiterRequest);
         await app.register(fastifyCookie.fastifyCookie);
-        await app.register(fastifyFormBody__default["default"]);
-        expressApp.use(bodyParser__default["default"].urlencoded({
-            limit: '2mb',
-            extended: false,
-        }), cookieParser__default["default"]());
+        await app.register(fastifyFormBody__default["default"], { bodyLimit: 2097152 }); // 2mb
         await runHandlers(init, expressInit);
         // force express to execute to update server's request and response instances
         app.use((req, res, next) => {
@@ -360,7 +358,6 @@ const xHeadersFactory = ({ app, envManager, appInfo, }) => {
 function createApi(papiList, { di, logger }) {
     return papi.create(papiList, [
         papi.middlewares.timeout(),
-        papi.middlewares.body(),
         papi.middlewares.cookie(),
         papi.middlewares.validate(),
         papi.middlewares.fillPapiState({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-server",
-  "version": "1.92.2",
+  "version": "1.94.0",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -23,14 +23,12 @@
     "@tinkoff/monkeypatch": "1.3.3",
     "@tinkoff/terminus": "0.0.1",
     "@tinkoff/url": "0.7.37",
-    "@tramvai/module-cache-warmup": "1.92.2",
-    "@tramvai/module-metrics": "1.92.2",
-    "@tramvai/papi": "1.92.2",
-    "@tramvai/tokens-server": "1.92.2",
-    "@tramvai/tokens-server-private": "1.92.2",
-    "body-parser": "^1.19.0",
+    "@tramvai/module-cache-warmup": "1.94.0",
+    "@tramvai/module-metrics": "1.94.0",
+    "@tramvai/papi": "1.94.0",
+    "@tramvai/tokens-server": "1.94.0",
+    "@tramvai/tokens-server-private": "1.94.0",
     "compression": "^1.7.4",
-    "cookie-parser": "^1.4.3",
     "express": "^4.17.1",
     "fastify": "^3.27.4",
     "fastify-cookie": "^5.6.0",
@@ -42,11 +40,11 @@
   "peerDependencies": {
     "@tinkoff/dippy": "0.7.39",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "1.92.2",
-    "@tramvai/core": "1.92.2",
-    "@tramvai/module-common": "1.92.2",
-    "@tramvai/module-environment": "1.92.2",
-    "@tramvai/tokens-common": "1.92.2",
+    "@tramvai/cli": "1.94.0",
+    "@tramvai/core": "1.94.0",
+    "@tramvai/module-common": "1.94.0",
+    "@tramvai/module-environment": "1.94.0",
+    "@tramvai/tokens-common": "1.94.0",
     "tslib": "^2.0.3"
   },
   "devDependencies": {