@tramvai/module-server 1.90.6 → 1.91.0

package/lib/server/webApp.d.ts

@@ -3,9 +3,8 @@ import type { 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';
-export declare const webAppFactory: ({ server, expressApp, }: {
+export declare const webAppFactory: ({ server }: {
     server: typeof SERVER_TOKEN;
-    expressApp: typeof WEB_APP_TOKEN;
 }) => import("fastify").FastifyInstance<import("http").Server, import("http").IncomingMessage, import("http").ServerResponse, import("fastify").FastifyLoggerInstance> & PromiseLike<import("fastify").FastifyInstance<import("http").Server, import("http").IncomingMessage, import("http").ServerResponse, import("fastify").FastifyLoggerInstance>>;
 export declare const webAppExpressFactory: ({ webApp }: {
     webApp: typeof WEB_FASTIFY_APP_TOKEN;

package/lib/server.es.js

@@ -2,7 +2,7 @@ import { __decorate } from 'tslib';
 import { Scope, APP_INFO_TOKEN, Module, provide, DI_TOKEN, COMMAND_LINE_RUNNER_TOKEN, commandLineListTokens } 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, SPECIAL_SERVER_PATHS, PROXY_CONFIG_TOKEN, DEPENDENCIES_VERSION_FILTER_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, WEB_FASTIFY_APP_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, WEB_FASTIFY_APP_TOKEN, SERVER_FACTORY_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 { REQUEST, RESPONSE, FASTIFY_REQUEST, FASTIFY_RESPONSE, RESPONSE_MANAGER_TOKEN, LOGGER_TOKEN, ENV_MANAGER_TOKEN, ENV_USED_TOKEN } from '@tramvai/tokens-common';
 import { MetricsModule } from '@tramvai/module-metrics';
 import { CacheWarmupModule } from '@tramvai/module-cache-warmup';
@@ -179,7 +179,7 @@ const errorHandler = (app, { log, beforeError, processError, afterError, }) => {
     });
 };
 
-const webAppFactory = ({ server, expressApp, }) => {
+const webAppFactory = ({ server }) => {
     const app = fastify({
         serverFactory: (handler) => {
             server.on('request', handler);
@@ -889,17 +889,31 @@ ServerModule = __decorate([
             process.env.NODE_ENV !== 'production' && DebugHttpRequestsModule,
         ].filter(Boolean),
         providers: [
+            provide({
+                provide: SERVER_FACTORY_TOKEN,
+                scope: Scope.SINGLETON,
+                useValue: serverFactory,
+            }),
             provide({
                 provide: SERVER_TOKEN,
                 scope: Scope.SINGLETON,
-                useFactory: serverFactory,
+                useFactory: ({ factory }) => factory(),
+                deps: {
+                    factory: SERVER_FACTORY_TOKEN,
+                },
+            }),
+            provide({
+                provide: WEB_FASTIFY_APP_FACTORY_TOKEN,
+                scope: Scope.SINGLETON,
+                useValue: webAppFactory,
             }),
             provide({
                 provide: WEB_FASTIFY_APP_TOKEN,
-                useFactory: webAppFactory,
+                useFactory: ({ factory, server }) => factory({ server }),
                 scope: Scope.SINGLETON,
                 deps: {
                     server: SERVER_TOKEN,
+                    factory: WEB_FASTIFY_APP_FACTORY_TOKEN,
                 },
             }),
             provide({

package/lib/server.js

@@ -206,7 +206,7 @@ const errorHandler = (app, { log, beforeError, processError, afterError, }) => {
     });
 };
 
-const webAppFactory = ({ server, expressApp, }) => {
+const webAppFactory = ({ server }) => {
     const app = fastify__default["default"]({
         serverFactory: (handler) => {
             server.on('request', handler);
@@ -916,17 +916,31 @@ exports.ServerModule = tslib.__decorate([
             process.env.NODE_ENV !== 'production' && DebugHttpRequestsModule,
         ].filter(Boolean),
         providers: [
+            core.provide({
+                provide: tokensServerPrivate.SERVER_FACTORY_TOKEN,
+                scope: core.Scope.SINGLETON,
+                useValue: serverFactory,
+            }),
             core.provide({
                 provide: tokensServer.SERVER_TOKEN,
                 scope: core.Scope.SINGLETON,
-                useFactory: serverFactory,
+                useFactory: ({ factory }) => factory(),
+                deps: {
+                    factory: tokensServerPrivate.SERVER_FACTORY_TOKEN,
+                },
+            }),
+            core.provide({
+                provide: tokensServerPrivate.WEB_FASTIFY_APP_FACTORY_TOKEN,
+                scope: core.Scope.SINGLETON,
+                useValue: webAppFactory,
             }),
             core.provide({
                 provide: tokensServerPrivate.WEB_FASTIFY_APP_TOKEN,
-                useFactory: webAppFactory,
+                useFactory: ({ factory, server }) => factory({ server }),
                 scope: core.Scope.SINGLETON,
                 deps: {
                     server: tokensServer.SERVER_TOKEN,
+                    factory: tokensServerPrivate.WEB_FASTIFY_APP_FACTORY_TOKEN,
                 },
             }),
             core.provide({

package/package.json

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