@abejarano/ts-express-server 1.5.3 → 1.7.0

package/dist/modules/RoutesModule.d.ts

@@ -1,9 +1,9 @@
-import { Express, RequestHandler, Router } from "express";
 import { BaseServerModule } from "../abstract";
+import { ServerApp, ServerContext, ServerHandler, ServerRouter } from "../abstract";
 export interface RouteConfig {
     path: string;
-    router: Router;
-    middleware?: RequestHandler[] | RequestHandler;
+    router: ServerRouter;
+    middleware?: ServerHandler[] | ServerHandler;
 }
 export declare class RoutesModule extends BaseServerModule {
     name: string;
@@ -13,5 +13,5 @@ export declare class RoutesModule extends BaseServerModule {
     getModuleName(): string;
     addRoute(route: RouteConfig): void;
     addRoutes(routes: RouteConfig[]): void;
-    init(app: Express): void;
+    init(app: ServerApp, context?: ServerContext): void;
 }

package/dist/modules/RoutesModule.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoutesModule = void 0;
 const abstract_1 = require("../abstract");
+const abstract_2 = require("../abstract");
 class RoutesModule extends abstract_1.BaseServerModule {
     constructor(routes = []) {
         super();
@@ -20,10 +21,18 @@ class RoutesModule extends abstract_1.BaseServerModule {
     addRoutes(routes) {
         this.routes.push(...routes);
     }
-    init(app) {
+    init(app, context) {
+        if (context?.runtime === abstract_2.ServerRuntime.Bun) {
+            console.warn("[RoutesModule] Express routers are not supported on Bun. Migrate to decorated controllers for Bun runtime.");
+        }
         this.routes.forEach(({ path, router, middleware }) => {
-            if (middleware && middleware.length > 0) {
-                app.use(path, middleware, router);
+            const middlewareList = Array.isArray(middleware)
+                ? middleware
+                : middleware
+                    ? [middleware]
+                    : [];
+            if (middlewareList.length > 0) {
+                app.use(path, ...middlewareList, router);
             }
             else {
                 app.use(path, router);

package/dist/modules/SecurityModule.d.ts

@@ -1,11 +1,11 @@
-import { Express } from "express";
-import helmet from "helmet";
 import { BaseServerModule } from "../abstract";
+import { ServerApp, ServerContext } from "../abstract";
+import type { HelmetOptions } from "helmet";
 export declare class SecurityModule extends BaseServerModule {
     name: string;
     priority: number;
     private readonly helmetOptions;
-    constructor(helmetOptions?: Parameters<typeof helmet>[0]);
+    constructor(helmetOptions?: HelmetOptions);
     getModuleName(): string;
-    init(app: Express): void;
+    init(app: ServerApp, context?: ServerContext): void;
 }

package/dist/modules/SecurityModule.js

@@ -1,11 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SecurityModule = void 0;
-const helmet_1 = __importDefault(require("helmet"));
 const abstract_1 = require("../abstract");
+const abstract_2 = require("../abstract");
 class SecurityModule extends abstract_1.BaseServerModule {
     constructor(helmetOptions) {
         super();
@@ -29,8 +26,48 @@ class SecurityModule extends abstract_1.BaseServerModule {
     getModuleName() {
         return this.name;
     }
-    init(app) {
-        app.use((0, helmet_1.default)(this.helmetOptions));
+    init(app, context) {
+        const runtime = context?.runtime ?? abstract_2.ServerRuntime.Express;
+        if (runtime === abstract_2.ServerRuntime.Express) {
+            const helmetModule = require("helmet");
+            const helmet = helmetModule.default ?? helmetModule;
+            app.use(helmet(this.helmetOptions));
+            return;
+        }
+        app.use(createSecurityMiddleware(this.helmetOptions));
     }
 }
 exports.SecurityModule = SecurityModule;
+const createSecurityMiddleware = (options) => {
+    return (_req, res, next) => {
+        const frameguard = options?.frameguard;
+        if (frameguard && typeof frameguard === "object" && "action" in frameguard) {
+            const action = frameguard.action;
+            if (action) {
+                res.set("x-frame-options", action.toUpperCase());
+            }
+        }
+        if (options?.ieNoOpen !== false) {
+            res.set("x-download-options", "noopen");
+        }
+        if (options?.noSniff !== false) {
+            res.set("x-content-type-options", "nosniff");
+        }
+        if (options?.originAgentCluster) {
+            res.set("origin-agent-cluster", "?1");
+        }
+        if (options?.permittedCrossDomainPolicies === false) {
+            res.set("x-permitted-cross-domain-policies", "none");
+        }
+        const referrerPolicy = options?.referrerPolicy;
+        if (referrerPolicy && typeof referrerPolicy === "object" && "policy" in referrerPolicy) {
+            res.set("referrer-policy", Array.isArray(referrerPolicy.policy)
+                ? referrerPolicy.policy.join(",")
+                : referrerPolicy.policy);
+        }
+        if (options?.dnsPrefetchControl) {
+            res.set("x-dns-prefetch-control", "on");
+        }
+        next();
+    };
+};

package/dist/testing/createDecoratedTestApp.d.ts

@@ -1,7 +1,6 @@
-import { Express } from "express";
 import type { BootstrapServer } from "../BootstrapServer";
 import { ControllersModule } from "../modules";
-import { BaseServerService } from "../abstract";
+import { BaseServerService, ServerApp, ServerRuntime } from "../abstract";
 import { BootstrapStandardServerOptions } from "../BootstrapStandardServer";
 type ControllerClass<T = any> = new (...args: any[]) => T;
 export interface DecoratedTestAppOptions {
@@ -10,9 +9,10 @@ export interface DecoratedTestAppOptions {
     port?: number;
     services?: BaseServerService[];
     standardOptions?: BootstrapStandardServerOptions;
+    runtime?: ServerRuntime;
 }
 export interface DecoratedTestAppResult {
-    app: Express;
+    app: ServerApp;
     server: BootstrapServer;
     stop: () => Promise<void>;
 }

package/dist/testing/createDecoratedTestApp.js

@@ -12,6 +12,7 @@ const mergeOptions = (base, override) => {
         ...(override.services ?? []),
     ];
     return {
+        runtime: override.runtime ?? base.runtime,
         services: mergedServices.length ? mergedServices : undefined,
         modules: {
             ...(base.modules ?? {}),
@@ -31,15 +32,18 @@ async function createDecoratedTestApp(options) {
         },
     };
     const mergedOptions = mergeOptions(baseOptions, standardOptions);
-    const server = (0, BootstrapStandardServer_1.BootstrapStandardServer)(port, moduleInstance, mergedOptions);
+    const server = (0, BootstrapStandardServer_1.BootstrapStandardServer)(port, moduleInstance, {
+        ...mergedOptions,
+        runtime: options.runtime ?? mergedOptions.runtime,
+    });
     await server.initialize();
     return {
         app: server.getApp(),
         server,
         stop: async () => {
-            const httpServer = server.getHttpServer();
-            if (httpServer) {
-                await new Promise((resolve) => httpServer.close(() => resolve()));
+            const serverInstance = server.getServer();
+            if (serverInstance) {
+                await new Promise((resolve) => serverInstance.close(() => resolve()));
             }
         },
     };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@abejarano/ts-express-server",
   "author": "angel bejarano / angel.bejarano@jaspesoft.com",
-  "version": "1.5.3",
+  "version": "1.7.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [