@tramvai/module-server 1.84.2 → 1.90.1

package/lib/server/error.d.ts

@@ -1,6 +1,9 @@
-import type express from 'express';
+import type { FastifyInstance } from 'fastify';
 import type { LOGGER_TOKEN } from '@tramvai/module-common';
-export declare const routerErrorHandler: (app: express.Application) => void;
-export declare const errorHandler: (app: express.Application, { log, }: {
+import type { WEB_FASTIFY_APP_AFTER_ERROR_TOKEN, WEB_FASTIFY_APP_BEFORE_ERROR_TOKEN, WEB_FASTIFY_APP_PROCESS_ERROR_TOKEN } from '@tramvai/tokens-server-private';
+export declare const errorHandler: (app: FastifyInstance, { log, beforeError, processError, afterError, }: {
     log: ReturnType<typeof LOGGER_TOKEN>;
+    beforeError: typeof WEB_FASTIFY_APP_BEFORE_ERROR_TOKEN;
+    processError: typeof WEB_FASTIFY_APP_PROCESS_ERROR_TOKEN;
+    afterError: typeof WEB_FASTIFY_APP_AFTER_ERROR_TOKEN;
 }) => void;

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

@@ -0,0 +1,25 @@
+/**
+ * Fork of https://github.com/fastify/fastify-express
+ */
+/// <reference types="node" />
+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("http").Server>;
+export {};

package/lib/server/server.d.ts

@@ -1,11 +1,9 @@
 /// <reference types="node" />
 import http from 'http';
-import type { SERVER_TOKEN, WEB_APP_TOKEN } from '@tramvai/tokens-server';
+import type { SERVER_TOKEN } from '@tramvai/tokens-server';
 import type { LOGGER_TOKEN } from '@tramvai/tokens-common';
 import type { ENV_MANAGER_TOKEN } from '@tramvai/module-environment';
-export declare const serverFactory: ({ webApp }: {
-    webApp: typeof WEB_APP_TOKEN;
-}) => http.Server;
+export declare const serverFactory: () => http.Server;
 export declare const serverListenCommand: ({ server, logger, envManager, }: {
     server: typeof SERVER_TOKEN;
     logger: typeof LOGGER_TOKEN;

package/lib/server/webApp.d.ts

@@ -1,13 +1,29 @@
-import type { LOGGER_TOKEN } from '@tramvai/module-common';
+/// <reference types="node" />
+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 } from '@tramvai/tokens-server';
-export declare const webAppFactory: () => import("express-serve-static-core").Express;
-export declare const webAppInitCommand: ({ app, logger, commandLineRunner, beforeInit, init, afterInit, limiterRequest, }: {
-    app: typeof WEB_APP_TOKEN;
+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, }: {
+    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;
+}) => import("express-serve-static-core").Express;
+export declare const webAppInitCommand: ({ app, expressApp, logger, commandLineRunner, beforeInit, init, afterInit, limiterRequest, expressBeforeInit, expressInit, expressAfterInit, expressLimiterRequest, beforeError, processError, afterError, }: {
+    app: typeof WEB_FASTIFY_APP_TOKEN;
+    expressApp: typeof WEB_APP_TOKEN;
     logger: typeof LOGGER_TOKEN;
     commandLineRunner: typeof COMMAND_LINE_RUNNER_TOKEN;
-    beforeInit: typeof WEB_APP_BEFORE_INIT_TOKEN;
-    init: typeof WEB_APP_INIT_TOKEN;
-    afterInit: typeof WEB_APP_AFTER_INIT_TOKEN;
-    limiterRequest: typeof WEB_APP_LIMITER_TOKEN;
+    beforeInit: typeof WEB_FASTIFY_APP_BEFORE_INIT_TOKEN;
+    init: typeof WEB_FASTIFY_APP_INIT_TOKEN;
+    afterInit: typeof WEB_FASTIFY_APP_AFTER_INIT_TOKEN;
+    limiterRequest: typeof WEB_FASTIFY_APP_LIMITER_TOKEN;
+    expressBeforeInit: typeof WEB_APP_BEFORE_INIT_TOKEN;
+    expressInit: typeof WEB_APP_INIT_TOKEN;
+    expressAfterInit: typeof WEB_APP_AFTER_INIT_TOKEN;
+    expressLimiterRequest: typeof WEB_APP_LIMITER_TOKEN;
+    beforeError: typeof WEB_FASTIFY_APP_BEFORE_ERROR_TOKEN;
+    processError: typeof WEB_FASTIFY_APP_PROCESS_ERROR_TOKEN;
+    afterError: typeof WEB_FASTIFY_APP_AFTER_ERROR_TOKEN;
 }) => () => Promise<void>;

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>;