@tramvai/module-server 6.78.0 → 6.79.0

package/lib/server/error/index.es.js

@@ -41,7 +41,7 @@ More information about redirects - https://tramvai.dev/docs/features/routing/red
             });
             reply
                 .header('cache-control', 'no-store, no-cache, must-revalidate')
-                .redirect(error.httpStatus || 307, error.nextUrl);
+                .redirect(error.nextUrl, error.httpStatus || 307);
             return;
         }
         const { logMessage, logLevel, logEvent, httpStatus } = prepareLogsForError({

package/lib/server/error/index.js

@@ -49,7 +49,7 @@ More information about redirects - https://tramvai.dev/docs/features/routing/red
             });
             reply
                 .header('cache-control', 'no-store, no-cache, must-revalidate')
-                .redirect(error.httpStatus || 307, error.nextUrl);
+                .redirect(error.nextUrl, error.httpStatus || 307);
             return;
         }
         const { logMessage, logLevel, logEvent, httpStatus } = prepareLogsForError.prepareLogsForError({

package/lib/server/static.es.js

@@ -11,7 +11,7 @@ const staticAppCommand = ({ logger, envManager, appInfo, }) => {
     const log = logger('server:static');
     const port = +envManager.get('PORT_STATIC');
     const host = (envManager.get('HOST_STATIC') ?? DEFAULT_STATIC_HOST).replace('localhost', '0.0.0.0');
-    const appVersion = envManager.get('APP_VERSION');
+    const appVersion = envManager.get('APP_VERSION') ?? 'unknown';
     return async function staticApp() {
         const appStatic = fastify();
         await appStatic.register(fastifyCompress);
@@ -26,7 +26,15 @@ const staticAppCommand = ({ logger, envManager, appInfo, }) => {
                 res.setHeader('X-Host', os.hostname());
             },
         });
-        appStatic.listen({ host, port }, () => log.info(`Running static server on ${host}:${port}`));
+        let resolveStaticServerStart;
+        const staticServerWaiter = new Promise((resolve) => {
+            resolveStaticServerStart = resolve;
+        });
+        appStatic.listen({ host, port }, () => {
+            log.info(`Running static server on ${host}:${port}`);
+            resolveStaticServerStart();
+        });
+        await staticServerWaiter;
         return appStatic;
     };
 };

package/lib/server/static.js

@@ -21,7 +21,7 @@ const staticAppCommand = ({ logger, envManager, appInfo, }) => {
     const log = logger('server:static');
     const port = +envManager.get('PORT_STATIC');
     const host = (envManager.get('HOST_STATIC') ?? DEFAULT_STATIC_HOST).replace('localhost', '0.0.0.0');
-    const appVersion = envManager.get('APP_VERSION');
+    const appVersion = envManager.get('APP_VERSION') ?? 'unknown';
     return async function staticApp() {
         const appStatic = fastify__default["default"]();
         await appStatic.register(fastifyCompress__default["default"]);
@@ -36,7 +36,15 @@ const staticAppCommand = ({ logger, envManager, appInfo, }) => {
                 res.setHeader('X-Host', os__default["default"].hostname());
             },
         });
-        appStatic.listen({ host, port }, () => log.info(`Running static server on ${host}:${port}`));
+        let resolveStaticServerStart;
+        const staticServerWaiter = new Promise((resolve) => {
+            resolveStaticServerStart = resolve;
+        });
+        appStatic.listen({ host, port }, () => {
+            log.info(`Running static server on ${host}:${port}`);
+            resolveStaticServerStart();
+        });
+        await staticServerWaiter;
         return appStatic;
     };
 };

package/lib/server/webApp.d.ts

@@ -8,7 +8,9 @@ import type { DI_TOKEN, ExtractDependencyType } from '@tinkoff/dippy';
 import type { STATIC_ROOT_ERROR_BOUNDARY_ERROR_TOKEN } from '@tramvai/tokens-server';
 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").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>>;
+}) => 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>> & {
+    __linterBrands: "SafePromiseLike";
+};
 export declare const webAppInitCommand: ({ app, logger, commandLineRunner, executionContextManager, beforeInit, requestMetrics, limiterRequest, init, afterInit, beforeError, afterError, fetchWebpackStats, staticRootErrorBoundaryError, rootDi, asyncLocalStorage, }: {
     app: ExtractDependencyType<typeof WEB_FASTIFY_APP_TOKEN>;
     logger: ExtractDependencyType<typeof LOGGER_TOKEN>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-server",
-  "version": "6.78.0",
+  "version": "6.79.0",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -21,38 +21,38 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@fastify/compress": "^6.2.0",
-    "@fastify/cookie": "^8.3.0",
-    "@fastify/formbody": "^7.4.0",
-    "@fastify/static": "^6.9.0",
+    "@fastify/compress": "^8.3.0",
+    "@fastify/cookie": "^11.0.2",
+    "@fastify/formbody": "^8.0.2",
+    "@fastify/static": "^8.3.0",
     "@loadable/server": "^5.15.0",
     "@tinkoff/errors": "0.7.2",
     "@tinkoff/monkeypatch": "6.0.1",
     "@tinkoff/terminus": "0.5.3",
     "@tinkoff/url": "0.12.2",
-    "@tramvai/module-cache-warmup": "6.78.0",
-    "@tramvai/module-metrics": "6.78.0",
-    "@tramvai/papi": "6.78.0",
+    "@tramvai/module-cache-warmup": "6.79.0",
+    "@tramvai/module-metrics": "6.79.0",
+    "@tramvai/papi": "6.79.0",
     "@tramvai/safe-strings": "0.9.1",
-    "@tramvai/tokens-router": "6.78.0",
-    "@tramvai/tokens-server": "6.78.0",
-    "@tramvai/tokens-server-private": "6.78.0",
+    "@tramvai/tokens-router": "6.79.0",
+    "@tramvai/tokens-server": "6.79.0",
+    "@tramvai/tokens-server-private": "6.79.0",
     "afterframe": "^1.0.2",
-    "fastify": "^4.14.1",
+    "fastify": "^5.6.2",
     "http-proxy-middleware": "^2.0.2",
     "undici": "^7.16.0"
   },
   "peerDependencies": {
     "@tinkoff/dippy": "0.12.6",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "6.78.0",
-    "@tramvai/core": "6.78.0",
-    "@tramvai/module-common": "6.78.0",
-    "@tramvai/module-environment": "6.78.0",
-    "@tramvai/react": "6.78.0",
-    "@tramvai/tokens-common": "6.78.0",
-    "@tramvai/tokens-core-private": "6.78.0",
-    "@tramvai/tokens-render": "6.78.0",
+    "@tramvai/cli": "6.79.0",
+    "@tramvai/core": "6.79.0",
+    "@tramvai/module-common": "6.79.0",
+    "@tramvai/module-environment": "6.79.0",
+    "@tramvai/react": "6.79.0",
+    "@tramvai/tokens-common": "6.79.0",
+    "@tramvai/tokens-core-private": "6.79.0",
+    "@tramvai/tokens-render": "6.79.0",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "tslib": "^2.4.0"