@athenna/http 3.1.0 → 3.1.1

package/build/Commands/MakeControllerCommand.js

@@ -26,7 +26,7 @@ export class MakeControllerCommand extends BaseCommand {
         this.logger.simple('({bold,green} [ MAKING CONTROLLER ])\n');
         const file = await this.generator
             .path(Path.http(`Controllers/${this.name}.${Path.ext()}`))
-            .template('artisan::controller')
+            .template('controller')
             .setNameProperties(true)
             .make();
         this.logger.success(`Controller ({yellow} "${file.name}") successfully created.`);

package/build/Commands/MakeInterceptorCommand.js

@@ -26,7 +26,7 @@ export class MakeInterceptorCommand extends BaseCommand {
         this.logger.simple('({bold,green} [ MAKING INTERCEPTOR ])\n');
         const file = await this.generator
             .path(Path.http(`Interceptors/${this.name}.${Path.ext()}`))
-            .template('artisan::interceptor')
+            .template('interceptor')
             .setNameProperties(true)
             .make();
         this.logger.success(`Interceptor ({yellow} "${file.name}") successfully created.`);

package/build/Commands/MakeMiddlewareCommand.js

@@ -26,7 +26,7 @@ export class MakeMiddlewareCommand extends BaseCommand {
         this.logger.simple('({bold,green} [ MAKING MIDDLEWARE ])\n');
         const file = await this.generator
             .path(Path.http(`Middlewares/${this.name}.${Path.ext()}`))
-            .template('artisan::middleware')
+            .template('middleware')
             .setNameProperties(true)
             .make();
         this.logger.success(`Middleware ({yellow} "${file.name}") successfully created.`);

package/build/Commands/MakeTerminatorCommand.js

@@ -26,7 +26,7 @@ export class MakeTerminatorCommand extends BaseCommand {
         this.logger.simple('({bold,green} [ MAKING TERMINATOR ])\n');
         const file = await this.generator
             .path(Path.http(`Terminators/${this.name}.${Path.ext()}`))
-            .template('artisan::terminator')
+            .template('terminator')
             .setNameProperties(true)
             .make();
         this.logger.success(`Terminator ({yellow} "${file.name}") successfully created.`);

package/build/Commands/RouteListCommand.d.ts

@@ -12,8 +12,4 @@ export declare class RouteListCommand extends BaseCommand {
     static signature(): string;
     static description(): string;
     handle(): Promise<void>;
-    /**
-     * Resolve the import path by meta URL and import it.
-     */
-    private resolveRoutePathAndImport;
 }

package/build/Commands/RouteListCommand.js

@@ -6,8 +6,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-import { resolve } from 'node:path';
-import { pathToFileURL } from 'node:url';
 import { Config } from '@athenna/config';
 import { Module } from '@athenna/common';
 import { BaseCommand } from '@athenna/artisan';
@@ -27,7 +25,7 @@ export class RouteListCommand extends BaseCommand {
         const kernel = new HttpKernel();
         await kernel.registerControllers();
         await kernel.registerMiddlewares();
-        await this.resolveRoutePathAndImport();
+        await Module.resolve(this.routeFilePath, Config.get('rc.meta'));
         const routes = Route.list();
         const table = this.logger.table();
         table.head('Methods', 'Route', 'Name', 'Handler');
@@ -44,19 +42,4 @@ export class RouteListCommand extends BaseCommand {
         });
         table.render();
     }
-    /**
-     * Resolve the import path by meta URL and import it.
-     */
-    resolveRoutePathAndImport() {
-        if (this.routeFilePath.includes('./') ||
-            this.routeFilePath.includes('../')) {
-            this.routeFilePath = resolve(this.routeFilePath);
-        }
-        if (!this.routeFilePath.startsWith('#')) {
-            this.routeFilePath = pathToFileURL(this.routeFilePath).href;
-        }
-        return import.meta
-            .resolve(this.routeFilePath, Config.get('rc.meta'))
-            .then(meta => Module.get(import(meta)));
-    }
 }

package/build/Handlers/HttpExceptionHandler.d.ts

@@ -24,8 +24,4 @@ export declare class HttpExceptionHandler {
      * Return a boolean indicating if the error can be logged or not.
      */
     private canBeLogged;
-    /**
-     * Returns a boolean indicating if the error is an internal server error.
-     */
-    private isInternalServerError;
 }

package/build/Handlers/HttpExceptionHandler.js

@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 import { Log } from '@athenna/logger';
-import { String } from '@athenna/common';
+import { Is, String } from '@athenna/common';
 export class HttpExceptionHandler {
     /**
      * Error codes that should be ignored from logging.
@@ -35,7 +35,7 @@ export class HttpExceptionHandler {
         if (error.help) {
             body.help = error.help;
         }
-        const isInternalServerError = this.isInternalServerError(error);
+        const isInternalServerError = Is.Error(error) && !Is.Exception(error);
         const isDebugMode = Config.is('app.debug', true);
         if (isInternalServerError && !isDebugMode) {
             body.code = 'E_INTERNAL_SERVER';
@@ -47,10 +47,10 @@ export class HttpExceptionHandler {
         if (!this.canBeLogged(error)) {
             return;
         }
-        if (!error.prettify) {
+        if (!Is.Exception(error)) {
             error = error.toAthennaException();
         }
-        Log.channelOrVanilla('exception').error((await error.prettify()).concat('\n'));
+        Log.channelOrVanilla('exception').error(await error.prettify());
     }
     /**
      * Return a boolean indicating if the error can be logged or not.
@@ -64,19 +64,4 @@ export class HttpExceptionHandler {
         }
         return true;
     }
-    /**
-     * Returns a boolean indicating if the error is an internal server error.
-     */
-    isInternalServerError(error) {
-        return [
-            'Error',
-            'URIError',
-            'TypeError',
-            'EvalError',
-            'RangeError',
-            'SyntaxError',
-            'InternalError',
-            'ReferenceError',
-        ].includes(error.name);
-    }
 }

package/build/Kernels/HttpKernel.d.ts

@@ -69,5 +69,5 @@ export declare class HttpKernel {
     /**
      * Resolve the import path by meta URL and import it.
      */
-    private resolvePathAndImport;
+    private resolvePath;
 }

package/build/Kernels/HttpKernel.js

@@ -8,60 +8,64 @@
  */
 import 'reflect-metadata';
 import { Server } from '#src';
-import { resolve } from 'node:path';
 import { Log } from '@athenna/logger';
-import { pathToFileURL } from 'node:url';
 import { Config } from '@athenna/config';
-import { Is, Module } from '@athenna/common';
+import { Exec, Is, Module } from '@athenna/common';
 import { HttpExceptionHandler } from '#src/Handlers/HttpExceptionHandler';
+const corsPlugin = await Module.safeImport('@fastify/cors');
+const helmetPlugin = await Module.safeImport('@fastify/helmet');
+const swaggerPlugin = await Module.safeImport('@fastify/swagger');
+const swaggerUiPlugin = await Module.safeImport('@fastify/swagger-ui');
+const rateLimitPlugin = await Module.safeImport('@fastify/rate-limit');
+const rTracerPlugin = await Module.safeImport('cls-rtracer');
 export class HttpKernel {
     /**
      * Register the @fastify/cors plugin in the Http server.
      */
     async registerCors() {
-        if (!Config.exists('http.cors')) {
+        if (!corsPlugin) {
             return;
         }
-        await Server.plugin(import('@fastify/cors'), Config.get('http.cors'));
+        await Server.plugin(corsPlugin, Config.get('http.cors'));
     }
     /**
      * Register the @fastify/helmet plugin in the Http server.
      */
     async registerHelmet() {
-        if (!Config.exists('http.helmet')) {
+        if (!helmetPlugin) {
             return;
         }
-        await Server.plugin(import('@fastify/helmet'), Config.get('http.helmet'));
+        await Server.plugin(helmetPlugin, Config.get('http.helmet'));
     }
     /**
      * Register the @fastify/swagger plugin in the Http server.
      */
     async registerSwagger() {
-        if (!Config.exists('http.swagger')) {
-            return;
+        if (swaggerPlugin) {
+            await Server.plugin(swaggerPlugin, Config.get('http.swagger.configurations'));
+        }
+        if (swaggerUiPlugin) {
+            await Server.plugin(swaggerUiPlugin, Config.get('http.swagger.ui'));
         }
-        await Server.plugin(import('@fastify/swagger'), Config.get('http.swagger.configurations'));
-        await Server.plugin(import('@fastify/swagger-ui'), Config.get('http.swagger.ui'));
     }
     /**
      * Register the @fastify/rate-limit plugin in the Http server.
      */
     async registerRateLimit() {
-        if (!Config.exists('http.rateLimit')) {
+        if (!rateLimitPlugin) {
             return;
         }
-        await Server.plugin(import('@fastify/rate-limit'), Config.get('http.rateLimit'));
+        await Server.plugin(rateLimitPlugin, Config.get('http.rateLimit'));
     }
     /**
      * Register the cls-rtracer plugin in the Http server.
      */
     async registerRTracer() {
-        if (!Config.exists('http.rTracer')) {
+        if (!rTracerPlugin) {
             return;
         }
-        const rTracer = await import('cls-rtracer');
-        Server.middleware(async (ctx) => (ctx.data.traceId = rTracer.id()));
-        await Server.plugin(rTracer.fastifyPlugin, Config.get('http.rTracer'));
+        Server.middleware(async (ctx) => (ctx.data.traceId = rTracerPlugin.id()));
+        await Server.plugin(rTracerPlugin.fastifyPlugin, Config.get('http.rTracer'));
     }
     /**
      * Register the global log terminator in the Http server.
@@ -78,15 +82,15 @@ export class HttpKernel {
      */
     async registerControllers() {
         const controllers = Config.get('rc.controllers', []);
-        const promises = controllers.map(path => this.resolvePathAndImport(path).then(Controller => {
+        await Exec.concurrently(controllers, async (path) => {
+            const Controller = await this.resolvePath(path);
             if (Reflect.hasMetadata('provider:registered', Controller)) {
                 return;
             }
             const createCamelAlias = false;
             const alias = `App/Http/Controllers/${Controller.name}`;
             ioc.bind(alias, Controller, createCamelAlias);
-        }));
-        await Promise.all(promises);
+        });
     }
     /**
      * Register all the middlewares found inside "rc.middlewares" config
@@ -97,7 +101,7 @@ export class HttpKernel {
         await this.registerNamedMiddlewares();
         await this.registerGlobalMiddlewares();
         if (Config.exists('rc.middlewares')) {
-            await Promise.all(Config.get('rc.middlewares').map(this.resolvePathAndImport));
+            await Exec.concurrently(Config.get('rc.middlewares'), this.resolvePath);
         }
     }
     /**
@@ -109,15 +113,15 @@ export class HttpKernel {
         if (Is.Empty(namedMiddlewares)) {
             return;
         }
-        const promises = Object.keys(namedMiddlewares).map(key => this.resolvePathAndImport(namedMiddlewares[key]).then(Middleware => {
+        await Exec.concurrently(Object.keys(namedMiddlewares), async (key) => {
+            const Middleware = await this.resolvePath(namedMiddlewares[key]);
             if (Reflect.hasMetadata('provider:registered', Middleware)) {
                 return;
             }
             const createCamelAlias = false;
             const { alias, namedAlias } = this.getNamedMiddlewareAlias(key, Middleware);
             ioc.bind(alias, Middleware, createCamelAlias).alias(namedAlias, alias);
-        }));
-        await Promise.all(promises);
+        });
     }
     /**
      * Register all the named middlewares found inside "rc.globalMiddlewares"
@@ -128,7 +132,8 @@ export class HttpKernel {
         if (Is.Empty(globalMiddlewares)) {
             return;
         }
-        const promises = globalMiddlewares.map(path => this.resolvePathAndImport(path).then(Middleware => {
+        await Exec.concurrently(globalMiddlewares, async (path) => {
+            const Middleware = await this.resolvePath(path);
             if (Reflect.hasMetadata('provider:registered', Middleware)) {
                 return;
             }
@@ -136,8 +141,7 @@ export class HttpKernel {
             const { alias, handler, serverMethod } = this.getGlobalMiddlewareAliasAndHandler(Middleware);
             ioc.bind(alias, Middleware, createCamelAlias);
             Server[serverMethod](ioc.safeUse(alias)[handler]);
-        }));
-        await Promise.all(promises);
+        });
     }
     /**
      * Register the exception handler for all request handlers.
@@ -148,7 +152,7 @@ export class HttpKernel {
             Server.setErrorHandler(handler.handle.bind(handler));
             return;
         }
-        const Handler = await this.resolvePathAndImport(path);
+        const Handler = await this.resolvePath(path);
         const handler = new Handler();
         Server.setErrorHandler(handler.handle.bind(handler));
     }
@@ -207,15 +211,7 @@ export class HttpKernel {
     /**
      * Resolve the import path by meta URL and import it.
      */
-    resolvePathAndImport(path) {
-        if (path.includes('./') || path.includes('../')) {
-            path = resolve(path);
-        }
-        if (!path.startsWith('#')) {
-            path = pathToFileURL(path).href;
-        }
-        return import.meta
-            .resolve(path, Config.get('rc.meta'))
-            .then(meta => Module.get(import(`${meta}?version=${Math.random()}`)));
+    resolvePath(path) {
+        return Module.resolve(`${path}?version=${Math.random()}`, Config.get('rc.meta'));
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@athenna/http",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "The Athenna Http server. Built on top of fastify.",
   "license": "MIT",
   "author": "João Lenon <lenon@athenna.io>",
@@ -213,6 +213,16 @@
     }
   },
   "athenna": {
+    "view": {
+      "disks": {},
+      "templates": {
+        "controller": "./templates/controller.edge",
+        "interceptor": "./templates/interceptor.edge",
+        "middleware": "./templates/middleware.edge",
+        "terminator": "./templates/terminator.edge",
+        "command": "@athenna/artisan/templates/command.edge"
+      }
+    },
     "preloads": [],
     "services": [],
     "providers": [],