@nitronjs/framework 0.2.3 → 0.2.4

package/lib/Http/Server.js

@@ -1,6 +1,4 @@
-import { pathToFileURL } from "node:url";
 import dotenv from "dotenv";
-import path from "node:path";
 import fastify from "fastify";
 import fastifyCors from "@fastify/cors";
 import fastifyStatic from "@fastify/static";
@@ -8,69 +6,103 @@ import fastifyCookie from "@fastify/cookie";
 import fastifyHelmet from "@fastify/helmet";
 import fastifyMultipart from "@fastify/multipart";
 import fastifyFormbody from "@fastify/formbody";
+import fs from "node:fs";
+import { fileURLToPath } from "node:url";
+import path from "node:path";
 import Paths from "../Core/Paths.js";
 import Config from "../Core/Config.js";
 import Environment from "../Core/Environment.js";
-import Route from "../Route/Manager.js";
-import View from "../View/Manager.js";
-import Auth from "../Auth/Manager.js";
+import Router from "../Route/Router.js";
+import View from "../View/View.js";
+import Auth from "../Auth/Auth.js";
 import SessionManager from "../Session/Manager.js";
 import DB from "../Database/DB.js";
-import Log from "../Logging/Manager.js";
-import Loader from "../Route/Loader.js";
+import Log from "../Logging/Log.js";
 import HMRServer from "../HMR/Server.js";
 
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const packageJson = JSON.parse(fs.readFileSync(path.join(__dirname, "../../package.json"), "utf8"));
+
+/**
+ * HTTP server manager built on Fastify.
+ * Handles server configuration, plugin registration, and lifecycle management.
+ * 
+ * @example
+ * import { Server } from "@nitronjs/framework";
+ * await Server.start();
+ */
 class Server {
     static #server;
-    static #serverConfigs;
+    static #config;
 
+    /**
+     * Starts the HTTP server with all configured plugins and routes.
+     * @returns {Promise<void>}
+     */
     static async start() {
         dotenv.config({ quiet: true });
-        
-        // Initialize config system first (loads all configs once)
         await Config.initialize();
-        
-        // Load project configs dynamically
-        this.#serverConfigs = Config.all("server");
 
-        await Loader.initialize();
+        this.#config = Config.all("server");
+        const { web_server = {}, cors = {} } = this.#config;
         
-        // Load project routes dynamically
-        await import(Paths.routeUrl("web"));
-
-        await this.#createServer();
-        await DB.setup();
-        await SessionManager.setup(this.#server);
-        Auth.setup(this.#server);
-        await Route.setup(this.#server);
-        View.setup(this.#server);
-        await this.#listen();
-    }
+        const serverDefaults = {
+            bodyLimit: 50 * 1024 * 1024,
+            trustProxy: true,
+            maxParamLength: 150
+        };
+        
+        const webServerConfig = { ...serverDefaults, ...web_server };
 
-    static async #createServer() {
+        // Create Fastify instance
         this.#server = fastify({
             logger: false,
-            bodyLimit: this.#serverConfigs.web_server.bodyLimit,
-            trustProxy: this.#serverConfigs.web_server.trustProxy,
+            bodyLimit: webServerConfig.bodyLimit,
+            trustProxy: webServerConfig.trustProxy,
             requestIdHeader: "x-request-id",
             exposeHeadRoutes: false,
             requestTimeout: 60000,
             connectionTimeout: 120000,
             routerOptions: {
                 ignoreTrailingSlash: true,
-                maxParamLength: this.#serverConfigs.web_server.maxParamLength
+                maxParamLength: webServerConfig.maxParamLength
             }
         });
 
-        this.#registerPlugins();
-        this.#registerHooks();
-        this.#registerShutdownHandlers();
-    }
-
-    static #registerPlugins() {
+        // Register plugins
         this.#server.register(fastifyCors, {
-            origin: this.#getCorsOrigin.bind(this),
-            credentials: this.#serverConfigs.cors.origin === "*" ? false : this.#serverConfigs.cors.credentials === true
+            origin: (requestOrigin, cb) => {
+                if (!requestOrigin) {
+                    return cb(null, true);
+                }
+
+                const origin = cors.origin;
+
+                if (origin === "*") {
+                    return cb(null, true);
+                }
+                else if (origin === "auto") {
+                    const url = process.env.APP_URL;
+                    const port = process.env.APP_PORT;
+
+                    if (!url) {
+                        return cb(null, false);
+                    }
+
+                    const appOrigin = !port || port === "80" || port === "443" ? url : `${url}:${port}`;
+
+                    return cb(null, requestOrigin === appOrigin);
+                }
+                else if (typeof origin === "string") {
+                    return cb(null, requestOrigin === origin);
+                }
+                else if (Array.isArray(origin)) {
+                    return cb(null, origin.includes(requestOrigin));
+                }
+
+                return cb(null, false);
+            },
+            credentials: cors.origin === "*" ? false : cors.credentials === true
         });
 
         this.#server.register(fastifyStatic, {
@@ -101,110 +133,90 @@ class Server {
             xssFilter: true
         });
 
+        const multipartDefaults = {
+            fieldNameSize: 100,
+            fieldSize: 2 * 1024 * 1024,
+            maxFields: 50,
+            maxFileSize: 20 * 1024 * 1024,
+            maxFiles: 10,
+            maxParts: 60,
+            attachFieldsToBody: true
+        };
+        
+        const multipartConfig = { ...multipartDefaults, ...web_server.multipart };
+
         this.#server.register(fastifyMultipart, {
             limits: {
-                fieldNameSize: this.#serverConfigs.web_server.multipart.fieldNameSize,
-                fieldSize: this.#serverConfigs.web_server.multipart.fieldSize,
-                fields: this.#serverConfigs.web_server.multipart.maxFields,
-                fileSize: this.#serverConfigs.web_server.multipart.maxFileSize,
-                files: this.#serverConfigs.web_server.multipart.maxFiles,
-                parts: this.#serverConfigs.web_server.multipart.maxParts
+                fieldNameSize: multipartConfig.fieldNameSize,
+                fieldSize: multipartConfig.fieldSize,
+                fields: multipartConfig.maxFields,
+                fileSize: multipartConfig.maxFileSize,
+                files: multipartConfig.maxFiles,
+                parts: multipartConfig.maxParts
             },
-            attachFieldsToBody: this.#serverConfigs.web_server.multipart.attachFieldsToBody
+            attachFieldsToBody: multipartConfig.attachFieldsToBody
         });
 
         this.#server.register(fastifyFormbody);
-    }
-
-    static #getCorsOrigin(requestOrigin, cb) {
-        if (!requestOrigin) return cb(null, true);
-
-        const { origin } = this.#serverConfigs.cors;
-
-        if (origin === "*") return cb(null, true);
-
-        if (origin === "auto") {
-            const url = process.env.APP_URL;
-            const port = process.env.APP_PORT;
-            if (!url) return cb(null, false);
 
-            const appOrigin = !port || port === "80" || port === "443" ? url : `${url}:${port}`;
-            return cb(null, requestOrigin === appOrigin);
-        }
-
-        if (typeof origin === "string") return cb(null, requestOrigin === origin);
-        if (Array.isArray(origin)) return cb(null, origin.includes(requestOrigin));
+        // Register hooks
+        this.#server.addHook("preHandler", async (req) => {
+            if (!req.isMultipart() || !req.body) {
+                return;
+            }
 
-        return cb(null, false);
-    }
+            const normalized = {};
+            const files = {};
 
-    static #parseBracketNotation(data) {
-        if (!data || typeof data !== "object") {
-            return data;
-        }
+            for (const [key, field] of Object.entries(req.body)) {
+                if (field?.toBuffer) {
+                    if (field.filename) {
+                        files[key] = field;
+                    }
+                }
+                else if (field && typeof field === "object" && "value" in field) {
+                    normalized[key] = field.value;
+                }
+                else {
+                    normalized[key] = field;
+                }
+            }
 
-        const hasBrackets = Object.keys(data).some(key => key.includes("["));
-        if (!hasBrackets) {
-            return data;
-        }
+            const data = { ...normalized, ...files };
+            const hasBrackets = Object.keys(data).some(key => key.includes("["));
 
-        const result = {};
+            if (!hasBrackets) {
+                req.body = data;
 
-        for (const [key, value] of Object.entries(data)) {
-            if (!key.includes("[")) {
-                result[key] = value;
-                continue;
+                return;
             }
 
-            const parts = key.replace(/\]/g, "").split("[");
-            let current = result;
-
-            for (let i = 0; i < parts.length - 1; i++) {
-                const part = parts[i];
-                const nextPart = parts[i + 1];
-                const isNextIndex = /^\d+$/.test(nextPart);
+            const result = {};
 
-                if (current[part] === undefined) {
-                    current[part] = isNextIndex ? [] : {};
+            for (const [key, value] of Object.entries(data)) {
+                if (!key.includes("[")) {
+                    result[key] = value;
+                    continue;
                 }
 
-                current = current[part];
-            }
-
-            const lastPart = parts[parts.length - 1];
-            current[lastPart] = value;
-        }
+                const parts = key.replace(/\]/g, "").split("[");
+                let current = result;
 
-        return result;
-    }
+                for (let i = 0; i < parts.length - 1; i++) {
+                    const part = parts[i];
+                    const isNextIndex = /^\d+$/.test(parts[i + 1]);
 
-    static #registerHooks() {
-        this.#server.addHook("preHandler", async (req) => {
-            if (req.isMultipart() && req.body) {
-                const normalized = {};
-                const files = {};
-
-                for (const [key, field] of Object.entries(req.body)) {
-                    if (field && typeof field === 'object') {
-                        if (field.toBuffer) {
-                            if (!field.filename) continue;
-                            
-                            files[key] = field;
-                        }
-                        else if ('value' in field) {
-                            normalized[key] = field.value;
-                        }
-                        else {
-                            normalized[key] = field;
-                        }
-                    }
-                    else {
-                        normalized[key] = field;
+                    if (current[part] === undefined) {
+                        current[part] = isNextIndex ? [] : {};
                     }
+
+                    current = current[part];
                 }
 
-                req.body = this.#parseBracketNotation({ ...normalized, ...files });
+                current[parts[parts.length - 1]] = value;
             }
+
+            req.body = result;
         });
 
         this.#server.addHook("onResponse", async (req, res) => {
@@ -220,26 +232,51 @@ class Server {
                 requestId: req.id
             });
         });
-    }
 
-    static #registerShutdownHandlers() {
+        // Register shutdown handlers
         const shutdown = async () => {
-            const sessionManager = await SessionManager.getInstance();
-            sessionManager.stopGarbageCollection();
-            await DB.close();
-            await this.#server.close();
-            process.exit(0);
+            console.log();
+            console.log("\x1b[33m⏻ Server shutting down...\x1b[0m");
+            console.log("\x1b[32m✓ Server stopped gracefully\x1b[0m");
+            
+            try {
+                (await SessionManager.getInstance()).stopGC();
+                await Promise.race([
+                    DB.close(),
+                    new Promise(resolve => setTimeout(resolve, 1000))
+                ]);
+                await Promise.race([
+                    this.#server.close(),
+                    new Promise(resolve => setTimeout(resolve, 1000))
+                ]);
+            }
+            catch {
+                // Ignore errors during shutdown
+            }
         };
 
         process.on("SIGTERM", shutdown);
         process.on("SIGINT", shutdown);
-    }
 
-    static async #listen() {
+        // Setup managers
+        await DB.setup();
+        await SessionManager.setup(this.#server);
+        Auth.setup(this.#server);
+
+        // Register HMR routes before Router (dev only)
+        if (Environment.isDev) {
+            HMRServer.registerRoutes(this.#server);
+        }
+
+        await Router.setup(this.#server);
+        View.setup(this.#server);
+
+        // Listen
         try {
             const url = process.env.APP_URL ? new URL(process.env.APP_URL) : null;
-            const host = url ? url.hostname : "127.0.0.1";
+            const host = url?.hostname || "127.0.0.1";
             const port = Number(process.env.APP_PORT) || 3000;
+
             const address = await this.#server.listen({ host, port });
 
             if (Environment.isDev) {
@@ -247,36 +284,30 @@ class Server {
             }
 
             this.#printBanner({ success: true, address, host, port });
-
-            Log.info("Server started successfully!", {
-                address,
-                host,
-                port,
-                environment: Environment.isDev ? "development" : "production"
-            });
+            Log.info("Server started successfully!", { address, host, port, environment: Environment.isDev ? "development" : "production" });
         }
         catch (err) {
             this.#printBanner({ success: false, error: err });
-
-            Log.fatal("Server startup failed", {
-                error: err.message,
-                code: err.code,
-                stack: err.stack
-            });
-
+            Log.fatal("Server startup failed", { error: err.message, code: err.code, stack: err.stack });
             process.exit(1);
         }
     }
 
+    // Private Methods
     static #printBanner({ success, address, host, port, error }) {
-        const { log } = this.#serverConfigs;
-        if (log.channel !== "none" && log.channel !== "file") return;
+        if (this.#config.log.channel !== "none" && this.#config.log.channel !== "file") {
+            return;
+        }
 
         const color = success ? "\x1b[32m" : "\x1b[31m";
         const reset = "\x1b[0m";
         const bold = "\x1b[1m";
         const boxWidth = 70;
+        const stripAnsi = str => str.replace(/\x1b\[[0-9;]*m/g, "");
+        const pad = (content, length) => content + " ".repeat(Math.max(0, length - stripAnsi(content).length));
 
+        const version = `v${packageJson.version}`;
+        
         const logo = `
 ${color}███╗   ██╗██╗████████╗██████╗  ██████╗ ███╗   ██╗     ██╗███████╗
 ████╗  ██║██║╚══██╔══╝██╔══██╗██╔═══██╗████╗  ██║     ██║██╔════╝
@@ -286,12 +317,6 @@ ${color}███╗   ██╗██╗████████╗████
 ╚═╝  ╚═══╝╚═╝   ╚═╝   ╚═╝  ╚═╝ ╚═════╝ ╚═╝  ╚═══╝ ╚════╝ ╚══════╝${reset}
 `;
 
-        const stripAnsi = str => str.replace(/\x1b\[[0-9;]*m/g, "");
-        const pad = (content, length) => {
-            const visible = stripAnsi(content);
-            return content + " ".repeat(Math.max(0, length - visible.length));
-        };
-
         const lines = success
             ? [
                 `${color}${bold}✓${reset} ${bold}Server started successfully!${reset}`,
@@ -299,7 +324,8 @@ ${color}███╗   ██╗██╗████████╗████
                 `${bold}Address:${reset} ${address}`,
                 `${bold}Host:${reset}    ${host}`,
                 `${bold}Port:${reset}    ${port}`,
-                `${bold}Mode:${reset}    ${Environment.isDev ? "development" : "production"}`
+                `${bold}Mode:${reset}    ${Environment.isDev ? "development" : "production"}`,
+                `${bold}Version:${reset} ${version}`
             ]
             : [
                 `${color}${bold}✕${reset} ${bold}Server failed to start${reset}`,
@@ -317,7 +343,6 @@ ${color}███╗   ██╗██╗████████╗████
 
         console.log(`${color}│${reset} ${" ".repeat(boxWidth - 4)} ${color}│${reset}`);
         console.log(`${color}└${"─".repeat(boxWidth - 2)}┘${reset}`);
-        console.log();
     }
 }