@abejarano/ts-express-server 1.7.6 → 2.0.0

package/README.md

@@ -1,6 +1,6 @@
-# TypeScript Server Framework (Express + Bun)
+# TypeScript Server Framework (Bun)
 
-A modular and extensible TypeScript framework for building Express or Bun servers with a clean architecture pattern that separates concerns between server modules and services.
+A modular and extensible TypeScript framework for building Bun servers with a clean architecture pattern that separates concerns between server modules and services.
 
 ## Features
 
@@ -12,7 +12,6 @@ A modular and extensible TypeScript framework for building Express or Bun server
 - 🛡️ **Type Safety**: Full TypeScript support with strong typing
 - 🔧 **Configurable**: Highly customizable modules and services
 - 🎨 **Decorators**: Clean and declarative controller definition
-- ⚙️ **Runtime Choice**: Run on Express (Node) or Bun via `ServerRuntime`
 
 ## Installation
 
@@ -33,17 +32,21 @@ yarn add @abejarano/ts-express-server
 - [API Reference](docs/api-reference.md)
 - [Examples](docs/examples.md)
 
-## Runtime Selection
+## File uploads
 
-```typescript
-import { BootstrapServer } from "@abejarano/ts-express-server";
+Uploads are disabled unless `FileUploadModule` is registered. Configure limits and MIME allowlists through the module:
 
-const server = new BootstrapServer(3000, { runtime: "bun" });
-server.start();
+```typescript
+import { FileUploadModule } from "@abejarano/ts-express-server";
+
+const fileUpload = new FileUploadModule({
+  maxBodyBytes: 10 * 1024 * 1024,
+  maxFileBytes: 10 * 1024 * 1024,
+  maxFiles: 10,
+  allowedMimeTypes: ["image/*", "application/pdf"],
+});
 ```
 
-You can also use `ServerRuntime.Bun` and `ServerRuntime.Express` if you prefer the enum.
-
 ## Contributing
 
 1. Fork the repository

package/dist/BootstrapServer.d.ts

@@ -1,7 +1,6 @@
 import { BaseServerModule, BaseServerService } from "./abstract";
-import { ServerAdapter, ServerApp, ServerInstance, ServerRuntime } from "./abstract";
+import { ServerAdapter, ServerApp, ServerInstance } from "./abstract";
 export interface BootstrapServerOptions {
-    runtime?: ServerRuntime;
     adapter?: ServerAdapter;
 }
 export declare class BootstrapServer {
@@ -29,5 +28,4 @@ export declare class BootstrapServer {
     private initializeServices;
     private initializeServerModules;
     private setupGracefulShutdown;
-    private createAdapter;
 }

package/dist/BootstrapServer.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BootstrapServer = void 0;
-const abstract_1 = require("./abstract");
 const adapters_1 = require("./adapters");
 class BootstrapServer {
     constructor(port, options) {
         this.modules = [];
         this.services = [];
         this.port = port;
-        this.adapter = options?.adapter ?? this.createAdapter(options?.runtime);
+        this.adapter = options?.adapter ?? new adapters_1.BunAdapter();
         this.runtime = this.adapter.runtime;
         this.app = this.adapter.createApp();
         this.adapter.configure(this.app, port);
@@ -170,11 +169,5 @@ class BootstrapServer {
         process.on("SIGINT", () => shutdown("SIGINT"));
         process.on("SIGTERM", () => shutdown("SIGTERM"));
     }
-    createAdapter(runtime) {
-        if (runtime === abstract_1.ServerRuntime.Bun) {
-            return new adapters_1.BunAdapter();
-        }
-        return new adapters_1.ExpressAdapter();
-    }
 }
 exports.BootstrapServer = BootstrapServer;

package/dist/BootstrapStandardServer.d.ts

@@ -1,8 +1,8 @@
 import { BootstrapServer } from "./BootstrapServer";
 import { ControllersModule, RoutesModule } from "./modules";
-import { BaseServerModule, BaseServerService, ServerRuntime } from "./abstract";
+import { BaseServerModule, BaseServerService, ServerAdapter } from "./abstract";
 export interface BootstrapStandardServerOptions {
-    runtime?: ServerRuntime;
+    adapter?: ServerAdapter;
     modules?: {
         cors?: BaseServerModule | false;
         security?: BaseServerModule | false;

package/dist/BootstrapStandardServer.js

@@ -65,7 +65,7 @@ function BootstrapStandardServer(port, arg2, arg3, arg4, arg5) {
         modulesToRegister.push(...preset.extra);
     }
     const server = new BootstrapServer_1.BootstrapServer(port, {
-        runtime: options?.runtime,
+        adapter: options?.adapter,
     }).addModules(modulesToRegister);
     if (controllersModule) {
         server.addModule(controllersModule);

package/dist/abstract/ServerTypes.d.ts

@@ -1,6 +1,4 @@
-import type fileUpload from "express-fileupload";
 export declare enum ServerRuntime {
-    Express = "express",
     Bun = "bun"
 }
 export type NextFunction = (err?: unknown) => void;
@@ -48,7 +46,7 @@ export type BunMultipartFile = {
     arrayBuffer(): Promise<ArrayBuffer>;
     lastModified?: number;
 };
-export type ServerFile = BunMultipartFile | fileUpload.UploadedFile;
+export type ServerFile = BunMultipartFile;
 export type ServerFiles = Record<string, ServerFile | ServerFile[]>;
 export type ServerHandlerInput = ServerHandler | ServerHandler[] | ServerRouter;
 export interface ServerRouter {

package/dist/abstract/ServerTypes.js

@@ -3,6 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServerRuntime = void 0;
 var ServerRuntime;
 (function (ServerRuntime) {
-    ServerRuntime["Express"] = "express";
     ServerRuntime["Bun"] = "bun";
 })(ServerRuntime || (exports.ServerRuntime = ServerRuntime = {}));

package/dist/adapters/BunAdapter.js

@@ -512,6 +512,12 @@ const createMultipartBodyParser = (app) => {
         if (!contentType.includes("multipart/form-data")) {
             return next();
         }
+        if (app.get("fileUploadEnabled") !== true) {
+            res
+                .status(415)
+                .json({ message: "File uploads are disabled. Enable FileUploadModule." });
+            return;
+        }
         const options = normalizeMultipartOptions(app.get("multipart"));
         const lengthHeader = req.headers["content-length"];
         const contentLength = parseContentLength(lengthHeader);
@@ -986,16 +992,8 @@ function resolveCookieDefaults(input) {
 }
 function resolveTrustProxySetting(app) {
     const input = app.get("trustProxy");
-    const allowInsecure = app.get("allowInsecureTrustProxy") === true ||
-        process?.env?.ALLOW_INSECURE_TRUST_PROXY === "true";
-    if (input === true) {
-        if (!allowInsecure) {
-            throw new Error("Invalid trustProxy=true. Use CIDR allowlist or set allowInsecureTrustProxy=true explicitly.");
-        }
-        return true;
-    }
-    if (input === false) {
-        return false;
+    if (typeof input === "boolean") {
+        throw new Error("Invalid trustProxy boolean. Use a CIDR allowlist or a custom trust function instead.");
     }
     if (Array.isArray(input) && input.every((entry) => typeof entry === "string")) {
         return input;

package/dist/adapters/index.d.ts

@@ -1,2 +1 @@
 export * from "./BunAdapter";
-export * from "./ExpressAdapter";

package/dist/adapters/index.js

@@ -15,4 +15,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./BunAdapter"), exports);
-__exportStar(require("./ExpressAdapter"), exports);

package/dist/createRouter.d.ts

@@ -1,2 +1,2 @@
-import { ServerRuntime, ServerRouter } from "./abstract";
-export declare const createRouter: (runtime?: ServerRuntime) => ServerRouter;
+import { ServerRouter } from "./abstract";
+export declare const createRouter: () => ServerRouter;

package/dist/createRouter.js

@@ -1,12 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRouter = void 0;
-const abstract_1 = require("./abstract");
 const adapters_1 = require("./adapters");
-const createRouter = (runtime = abstract_1.ServerRuntime.Express) => {
-    if (runtime === abstract_1.ServerRuntime.Bun) {
-        return new adapters_1.BunAdapter().createRouter();
-    }
-    return new adapters_1.ExpressAdapter().createRouter();
+const createRouter = () => {
+    return new adapters_1.BunAdapter().createRouter();
 };
 exports.createRouter = createRouter;

package/dist/modules/ControllersModule.js

@@ -24,7 +24,7 @@ class ControllersModule extends abstract_1.BaseServerModule {
             if (!basePath) {
                 return;
             }
-            const adapter = context?.adapter ?? new adapters_1.ExpressAdapter();
+            const adapter = context?.adapter ?? new adapters_1.BunAdapter();
             const router = adapter.createRouter();
             // Create a single controller instance per controller class (singleton pattern)
             const controllerInstance = new ControllerClass();
@@ -109,7 +109,7 @@ class ControllersModule extends abstract_1.BaseServerModule {
                                 break;
                         }
                     });
-                    // Fallbacks for common Express arguments when not explicitly decorated
+                    // Fallbacks for common handler arguments when not explicitly decorated
                     if (args[0] === undefined) {
                         args[0] = req;
                     }

package/dist/modules/CorsModule.d.ts

@@ -1,11 +1,11 @@
 import { BaseServerModule } from "../abstract";
 import { ServerApp, ServerContext } from "../abstract";
-import cors from "cors";
+import type { CorsOptions } from "cors";
 export declare class CorsModule extends BaseServerModule {
     name: string;
     priority: number;
     private corsOptions;
-    constructor(corsOptions?: cors.CorsOptions);
+    constructor(corsOptions?: CorsOptions);
     getModuleName(): string;
     init(app: ServerApp, context?: ServerContext): void;
 }

package/dist/modules/CorsModule.js

@@ -1,12 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CorsModule = void 0;
 const abstract_1 = require("../abstract");
-const abstract_2 = require("../abstract");
-const cors_1 = __importDefault(require("cors"));
 class CorsModule extends abstract_1.BaseServerModule {
     constructor(corsOptions) {
         super();
@@ -24,11 +19,6 @@ class CorsModule extends abstract_1.BaseServerModule {
         return this.name;
     }
     init(app, context) {
-        const runtime = context?.runtime ?? abstract_2.ServerRuntime.Express;
-        if (runtime === abstract_2.ServerRuntime.Express) {
-            app.use((0, cors_1.default)(this.corsOptions));
-            return;
-        }
         app.use(createCorsMiddleware(this.corsOptions));
     }
 }

package/dist/modules/FileUploadModule.d.ts

@@ -1,6 +1,16 @@
 import { BaseServerModule } from "../abstract";
-import { ServerApp, ServerContext } from "../abstract";
-import type { Options as FileUploadOptions } from "express-fileupload";
+import { BunMultipartFile, ServerApp, ServerContext } from "../abstract";
+export type FileUploadOptions = {
+    maxBodyBytes?: number;
+    maxFileBytes?: number;
+    maxFiles?: number;
+    maxFields?: number;
+    maxFieldBytes?: number;
+    maxFieldsBytes?: number;
+    allowedMimeTypes?: string[];
+    allowedFileSignatures?: Array<"png" | "jpg" | "jpeg" | "pdf">;
+    validateFile?: (file: BunMultipartFile) => boolean | Promise<boolean>;
+};
 export declare class FileUploadModule extends BaseServerModule {
     name: string;
     priority: number;

package/dist/modules/FileUploadModule.js

@@ -2,28 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileUploadModule = void 0;
 const abstract_1 = require("../abstract");
-const abstract_2 = require("../abstract");
 class FileUploadModule extends abstract_1.BaseServerModule {
     constructor(fileUploadOptions) {
         super();
         this.name = "FileUpload";
         this.priority = -60;
-        this.fileUploadOptions = fileUploadOptions || {
-            limits: { fileSize: 50 * 1024 * 1024 },
-            useTempFiles: true,
-            tempFileDir: "/tmp/",
-        };
+        this.fileUploadOptions = fileUploadOptions ?? {};
     }
     getModuleName() {
         return this.name;
     }
     init(app, context) {
-        const runtime = context?.runtime ?? abstract_2.ServerRuntime.Express;
-        if (runtime === abstract_2.ServerRuntime.Express) {
-            const fileUpload = require("express-fileupload");
-            app.use(fileUpload(this.fileUploadOptions));
-            return;
-        }
+        app.set?.("fileUploadEnabled", true);
+        app.set?.("multipart", this.fileUploadOptions);
     }
 }
 exports.FileUploadModule = FileUploadModule;

package/dist/modules/RateLimitModule.d.ts

@@ -1,6 +1,13 @@
 import { BaseServerModule } from "../abstract";
 import { ServerApp, ServerContext } from "../abstract";
-import type { Options as RateLimitOptions } from "express-rate-limit";
+export type RateLimitOptions = {
+    windowMs?: number;
+    limit?: number;
+    max?: number;
+    standardHeaders?: boolean;
+    legacyHeaders?: boolean;
+    message?: string | Record<string, unknown>;
+};
 export declare class RateLimitModule extends BaseServerModule {
     name: string;
     priority: number;

package/dist/modules/RateLimitModule.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RateLimitModule = void 0;
 const abstract_1 = require("../abstract");
-const abstract_2 = require("../abstract");
 class RateLimitModule extends abstract_1.BaseServerModule {
     constructor(limiterOptions) {
         super();
@@ -19,14 +18,6 @@ class RateLimitModule extends abstract_1.BaseServerModule {
         return this.name;
     }
     init(app, context) {
-        const runtime = context?.runtime ?? abstract_2.ServerRuntime.Express;
-        if (runtime === abstract_2.ServerRuntime.Express) {
-            const rateLimitModule = require("express-rate-limit");
-            const rateLimit = rateLimitModule.default ?? rateLimitModule;
-            const limiter = rateLimit(this.limiterOptions);
-            app.use(limiter);
-            return;
-        }
         app.use(createRateLimitMiddleware(this.limiterOptions));
     }
 }

package/dist/modules/RoutesModule.js

@@ -2,7 +2,6 @@
 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();
@@ -22,9 +21,6 @@ class RoutesModule extends abstract_1.BaseServerModule {
         this.routes.push(...routes);
     }
     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 }) => {
             const middlewareList = Array.isArray(middleware)
                 ? middleware

package/dist/modules/SecurityModule.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SecurityModule = void 0;
 const abstract_1 = require("../abstract");
-const abstract_2 = require("../abstract");
 class SecurityModule extends abstract_1.BaseServerModule {
     constructor(helmetOptions) {
         super();
@@ -27,13 +26,6 @@ class SecurityModule extends abstract_1.BaseServerModule {
         return this.name;
     }
     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));
     }
 }

package/dist/testing/createDecoratedTestApp.d.ts

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

package/dist/testing/createDecoratedTestApp.js

@@ -12,7 +12,7 @@ const mergeOptions = (base, override) => {
         ...(override.services ?? []),
     ];
     return {
-        runtime: override.runtime ?? base.runtime,
+        adapter: override.adapter ?? base.adapter,
         services: mergedServices.length ? mergedServices : undefined,
         modules: {
             ...(base.modules ?? {}),
@@ -34,7 +34,6 @@ async function createDecoratedTestApp(options) {
     const mergedOptions = mergeOptions(baseOptions, standardOptions);
     const server = (0, BootstrapStandardServer_1.BootstrapStandardServer)(port, moduleInstance, {
         ...mergedOptions,
-        runtime: options.runtime ?? mergedOptions.runtime,
     });
     await server.initialize();
     return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@abejarano/ts-express-server",
   "author": "angel bejarano / angel.bejarano@jaspesoft.com",
-  "version": "1.7.6",
+  "version": "2.0.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -26,16 +26,11 @@
   "keywords": [
     "server",
     "modular",
-    "express"
+    "bun"
   ],
   "license": "MIT",
   "dependencies": {
-    "body-parser": "^2.2.1",
-    "cookie-parser": "^1.4.7",
     "cors": "^2.8.5",
-    "express": "^5.2.1",
-    "express-fileupload": "^1.5.2",
-    "express-rate-limit": "^8.2.1",
     "helmet": "^8.1.0",
     "reflect-metadata": "^0.2.2",
     "uuid": "^13.0.0"
@@ -43,19 +38,13 @@
   "devDependencies": {
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "@types/body-parser": "^1.19.6",
-    "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
-    "@types/express": "^5.0.6",
-    "@types/express-fileupload": "^1.5.1",
     "@types/jest": "^30.0.0",
     "@types/node": "^25.0.3",
-    "@types/supertest": "^6.0.3",
     "jest": "^30.2.0",
     "prettier": "^3.6.2",
     "rimraf": "^6.0.1",
     "semantic-release": "^25.0.2",
-    "supertest": "^7.1.4",
     "ts-jest": "^29.4.5",
     "typescript": "^5.9.3"
   },

package/dist/adapters/ExpressAdapter.d.ts

@@ -1,8 +0,0 @@
-import { ServerAdapter, ServerApp, ServerInstance, ServerRouter, ServerRuntime } from "../abstract/ServerTypes";
-export declare class ExpressAdapter implements ServerAdapter {
-    runtime: ServerRuntime;
-    createApp(): ServerApp;
-    createRouter(): ServerRouter;
-    configure(app: ServerApp, port: number): void;
-    listen(app: ServerApp, port: number, onListen: () => void): ServerInstance;
-}

package/dist/adapters/ExpressAdapter.js

@@ -1,65 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExpressAdapter = void 0;
-const ServerTypes_1 = require("../abstract/ServerTypes");
-let expressModule = null;
-const getExpressModule = () => {
-    if (!expressModule) {
-        expressModule = require("express");
-    }
-    return expressModule;
-};
-class ExpressAdapter {
-    constructor() {
-        this.runtime = ServerTypes_1.ServerRuntime.Express;
-    }
-    createApp() {
-        const express = getExpressModule();
-        return express();
-    }
-    createRouter() {
-        const express = getExpressModule();
-        return express.Router();
-    }
-    configure(app, port) {
-        const expressApp = app;
-        const express = getExpressModule();
-        const bodyParser = require("body-parser");
-        const cookieParser = require("cookie-parser");
-        const jsonParser = express.json();
-        expressApp.use((req, res, next) => {
-            if (!shouldParseJson(req)) {
-                return next();
-            }
-            return jsonParser(req, res, next);
-        });
-        expressApp.use(bodyParser.urlencoded({ extended: true }));
-        expressApp.use(cookieParser());
-        expressApp.set("port", port);
-        expressApp.set("trust proxy", 1);
-    }
-    listen(app, port, onListen) {
-        const expressApp = app;
-        return expressApp.listen(port, onListen);
-    }
-}
-exports.ExpressAdapter = ExpressAdapter;
-const shouldParseJson = (req) => {
-    const method = String(req.method || "").toUpperCase();
-    if (method === "GET" || method === "HEAD") {
-        return false;
-    }
-    const lengthHeader = req.headers?.["content-length"];
-    if (lengthHeader === undefined) {
-        return true;
-    }
-    const value = Array.isArray(lengthHeader) ? lengthHeader[0] : lengthHeader;
-    if (!value) {
-        return true;
-    }
-    const parsed = Number.parseInt(value, 10);
-    if (Number.isNaN(parsed)) {
-        return true;
-    }
-    return parsed > 0;
-};