@athenna/logger 1.0.1 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@athenna/logger",
-  "version": "1.0.1",
+  "version": "1.0.4",
   "description": "",
   "license": "MIT",
   "author": "João Lenon <lenon@athenna.io>",

package/src/Drivers/ConsoleDriver.d.ts

@@ -12,6 +12,7 @@ export interface ConsoleDriverOpts {
     color: Color;
     level: string;
     context: string;
+    formatter: string;
     streamType: string;
 }
 export declare class ConsoleDriver implements DriverContract {
@@ -19,6 +20,6 @@ export declare class ConsoleDriver implements DriverContract {
     private readonly _context;
     private readonly _formatter;
     private readonly _streamType;
-    constructor(channel: string);
+    constructor(channel: string, configs?: any);
     transport(message: string, options?: ConsoleDriverOpts): void;
 }

package/src/Drivers/ConsoleDriver.js

@@ -12,21 +12,22 @@ exports.ConsoleDriver = void 0;
 const utils_1 = require("@secjs/utils");
 const FormatterFactory_1 = require("../Factories/FormatterFactory");
 class ConsoleDriver {
-    constructor(channel) {
+    constructor(channel, configs = {}) {
         const channelConfig = utils_1.Config.get(`logging.channels.${channel}`);
-        this._level = channelConfig.level || 'INFO';
-        this._context = channelConfig.context || 'ConsoleDriver';
-        this._formatter = channelConfig.formatter || 'context';
-        this._streamType = channelConfig.streamType || 'stdout';
+        this._level = configs.level || channelConfig.level;
+        this._context = configs.context || channelConfig.context;
+        this._formatter = configs.formatter || channelConfig.formatter;
+        this._streamType = configs.streamType || channelConfig.streamType;
     }
     transport(message, options) {
         options = Object.assign({}, {
             level: this._level,
             context: this._context,
+            formatter: this._formatter,
             streamType: this._streamType,
         }, options);
-        message = FormatterFactory_1.FormatterFactory.fabricate(this._formatter).format(message, options);
-        process[this._streamType].write(`${message}\n`);
+        message = FormatterFactory_1.FormatterFactory.fabricate(options.formatter).format(message, options);
+        process[options.streamType].write(`${message}\n`);
     }
 }
 exports.ConsoleDriver = ConsoleDriver;

package/src/Drivers/DebugDriver.d.ts

@@ -20,6 +20,6 @@ export declare class DebugDriver implements DriverContract {
     private readonly _context;
     private readonly _formatter;
     private readonly _namespace;
-    constructor(channel: string);
+    constructor(channel: string, configs?: any);
     transport(message: string, options?: DebugDriverOpts): void;
 }

package/src/Drivers/DebugDriver.js

@@ -13,20 +13,21 @@ const debug_1 = require("debug");
 const utils_1 = require("@secjs/utils");
 const FormatterFactory_1 = require("../Factories/FormatterFactory");
 class DebugDriver {
-    constructor(channel) {
+    constructor(channel, configs = {}) {
         const channelConfig = utils_1.Config.get(`logging.channels.${channel}`);
-        this._level = channelConfig.level || 'DEBUG';
-        this._context = channelConfig.context || 'DebugDriver';
-        this._formatter = channelConfig.formatter || 'context';
-        this._namespace = channelConfig.namespace || 'api:main';
+        this._level = configs.level || channelConfig.level;
+        this._context = configs.context || channelConfig.context;
+        this._formatter = configs.formatter || channelConfig.formatter;
+        this._namespace = configs.namespace || channelConfig.namespace;
     }
     transport(message, options) {
         options = Object.assign({}, {
             level: this._level,
             context: this._context,
+            formatter: this._formatter,
             namespace: this._namespace,
         }, options);
-        message = FormatterFactory_1.FormatterFactory.fabricate(this._formatter).format(message, options);
+        message = FormatterFactory_1.FormatterFactory.fabricate(options.formatter).format(message, options);
         debug_1.debug(options.namespace)(message);
     }
 }

package/src/Drivers/FileDriver.d.ts

@@ -18,6 +18,6 @@ export declare class FileDriver implements DriverContract {
     private readonly _context;
     private readonly _filePath;
     private readonly _formatter;
-    constructor(channel: string);
+    constructor(channel: string, configs?: any);
     transport(message: string, options?: FileDriverOpts): Promise<void>;
 }

package/src/Drivers/FileDriver.js

@@ -10,26 +10,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileDriver = void 0;
 const path_1 = require("path");
-const Color_1 = require("../Utils/Color");
 const utils_1 = require("@secjs/utils");
+const Color_1 = require("../Utils/Color");
 const fs_1 = require("fs");
 const FormatterFactory_1 = require("../Factories/FormatterFactory");
 class FileDriver {
-    constructor(channel) {
+    constructor(channel, configs = {}) {
         const channelConfig = utils_1.Config.get(`logging.channels.${channel}`);
-        this._level = channelConfig.level || 'INFO';
-        this._context = channelConfig.context || 'FileDriver';
-        this._filePath = channelConfig.filePath || utils_1.Path.noBuild().logs('secjs.log');
-        this._formatter = channelConfig.formatter || 'log';
+        this._level = configs.level || channelConfig.level;
+        this._context = configs.context || channelConfig.context;
+        this._filePath = configs.filePath || channelConfig.filePath;
+        this._formatter = configs.formatter || channelConfig.formatter;
     }
     async transport(message, options) {
-        options = Object.assign({}, { level: this._level, context: this._context, filePath: this._filePath }, options);
+        options = Object.assign({}, {
+            level: this._level,
+            context: this._context,
+            filePath: this._filePath,
+            formatter: this._formatter,
+        }, options);
         const filePath = options.filePath;
         const { dir } = path_1.parse(filePath);
         if (!fs_1.existsSync(dir)) {
             fs_1.mkdirSync(dir, { recursive: true });
         }
-        message = FormatterFactory_1.FormatterFactory.fabricate(this._formatter).format(message, options);
+        message = FormatterFactory_1.FormatterFactory.fabricate(options.formatter).format(message, options);
         return new Promise((resolve, reject) => {
             const stream = fs_1.createWriteStream(filePath, { flags: 'a' });
             stream.write(`${Color_1.Color.removeColors(message)}` + '\n');

package/src/Formatters/ContextFormatter.js

@@ -14,7 +14,7 @@ const getTimestamp_1 = require("../Utils/getTimestamp");
 class ContextFormatter {
     format(message, options) {
         options = Object.assign({}, { color: Color_1.Color.green, context: 'Logger' }, options);
-        const pid = Color_1.Color.darkPurple(`[Athenna] - PID: ${process.pid}`);
+        const pid = Color_1.Color.yellow(`[Athenna] - PID: ${process.pid}`);
         const timestamp = getTimestamp_1.getTimestamp();
         const messageCtx = Color_1.Color.yellow(`[${options.context}] `);
         const timestampDiff = ContextFormatter.getTimestampDiff();

package/src/Formatters/DebugFormatter.js

@@ -14,7 +14,7 @@ const getTimestamp_1 = require("../Utils/getTimestamp");
 class DebugFormatter {
     format(message, options) {
         options = Object.assign({}, { color: Color_1.Color.green, context: 'Debugger', namespace: 'api:main' }, options);
-        const pid = Color_1.Color.purple(`[Athenna Debugger] - PID: ${process.pid}`);
+        const pid = Color_1.Color.yellow(`[Athenna Debugger] - PID: ${process.pid}`);
         const timestamp = Color_1.Color.white(getTimestamp_1.getTimestamp());
         const messageCtx = Color_1.Color.yellow(`[${options.context}] `);
         const timestampDiff = DebugFormatter.getTimestampDiff();

package/src/Formatters/JsonFormatter.js

@@ -14,7 +14,7 @@ class JsonFormatter {
     format(message, options) {
         options = Object.assign({}, { color: Color_1.Color.green }, options);
         const pid = Color_1.Color.yellow(`[Athenna] - PID: ${process.pid}`);
-        return `${pid} - ${Color_1.Color.bold('JSON:')} ${options.color(JSON.stringify(message))}`;
+        return `${pid} - ${Color_1.Color.bold('JSON:')} ${options.color(JSON.stringify(message, null, 2))}`;
     }
 }
 exports.JsonFormatter = JsonFormatter;

package/src/Logger.js

@@ -32,10 +32,10 @@ class Logger {
     }
     async log(message, options) {
         options = Object.assign({}, { context: 'Logger' }, options);
-        if (this.runtimeConfig && this.runtimeConfig.formatter) {
+        if (this.runtimeConfig && this.runtimeConfig.formatterConfig) {
             options = {
                 ...options,
-                ...this.runtimeConfig.formatter,
+                ...this.runtimeConfig.formatterConfig,
             };
         }
         await this.driver.transport(message, options);
@@ -45,10 +45,10 @@ class Logger {
         options.level = 'INFO';
         options.color = Color_1.Color.cyan;
         options.streamType = 'stdout';
-        if (this.runtimeConfig && this.runtimeConfig.formatter) {
+        if (this.runtimeConfig && this.runtimeConfig.formatterConfig) {
             options = {
                 ...options,
-                ...this.runtimeConfig.formatter,
+                ...this.runtimeConfig.formatterConfig,
             };
         }
         await this.driver.transport(message, options);
@@ -58,10 +58,10 @@ class Logger {
         options.level = 'WARN';
         options.color = Color_1.Color.orange;
         options.streamType = 'stdout';
-        if (this.runtimeConfig && this.runtimeConfig.formatter) {
+        if (this.runtimeConfig && this.runtimeConfig.formatterConfig) {
             options = {
                 ...options,
-                ...this.runtimeConfig.formatter,
+                ...this.runtimeConfig.formatterConfig,
             };
         }
         await this.driver.transport(message, options);
@@ -71,10 +71,10 @@ class Logger {
         options.level = 'ERROR';
         options.color = Color_1.Color.red;
         options.streamType = 'stderr';
-        if (this.runtimeConfig && this.runtimeConfig.formatter) {
+        if (this.runtimeConfig && this.runtimeConfig.formatterConfig) {
             options = {
                 ...options,
-                ...this.runtimeConfig.formatter,
+                ...this.runtimeConfig.formatterConfig,
             };
         }
         await this.driver.transport(message, options);
@@ -84,10 +84,10 @@ class Logger {
         options.level = 'DEBUG';
         options.color = Color_1.Color.purple;
         options.streamType = 'stdout';
-        if (this.runtimeConfig && this.runtimeConfig.formatter) {
+        if (this.runtimeConfig && this.runtimeConfig.formatterConfig) {
             options = {
                 ...options,
-                ...this.runtimeConfig.formatter,
+                ...this.runtimeConfig.formatterConfig,
             };
         }
         await this.driver.transport(message, options);
@@ -97,10 +97,10 @@ class Logger {
         options.level = 'SUCCESS';
         options.color = Color_1.Color.green;
         options.streamType = 'stdout';
-        if (this.runtimeConfig && this.runtimeConfig.formatter) {
+        if (this.runtimeConfig && this.runtimeConfig.formatterConfig) {
             options = {
                 ...options,
-                ...this.runtimeConfig.formatter,
+                ...this.runtimeConfig.formatterConfig,
             };
         }
         await this.driver.transport(message, options);