emilsoftware-utilities 1.1.3 → 1.1.5

package/logger.d.ts

@@ -6,15 +6,17 @@ export declare enum LogLevels {
 }
 export declare class Logger {
     private readonly winstonLogger;
-    tag: string;
+    private readonly tag;
     private logFormat;
+    private replaceAll;
     constructor(tag: string);
     private getFileName;
-    execStart(prefix?: string): any;
-    execStop(prefix: string, startTime: any, error?: boolean): any;
-    info(...data: any): void;
-    debug(...data: any): void;
-    log(...data: any): void;
-    error(...data: any): void;
+    execStart(prefix?: string): number;
+    execStop(prefix: string, startTime: number, error?: boolean): void;
+    info(...data: Object[]): void;
+    debug(...data: Object[]): void;
+    log(...data: Object[]): void;
+    error(...data: Object[]): void;
+    private test;
     private print;
 }

package/logger.js

@@ -48,10 +48,11 @@ var LogLevels;
 })(LogLevels || (exports.LogLevels = LogLevels = {}));
 var Logger = /** @class */ (function () {
     function Logger(tag) {
+        var _this = this;
         this.tag = "[UNTAGGED]";
         this.logFormat = winston_1.default.format.printf(function (tmp) {
             var time = tmp.time, file = tmp.file, level = tmp.level, message = tmp.message;
-            return "".concat(JSON.stringify({ time: time, file: file === null || file === void 0 ? void 0 : file.replaceAll("\\", "/"), level: level, message: message }), ",");
+            return "".concat(JSON.stringify({ time: time, file: _this.replaceAll(file, "\\", "/"), level: level, message: message }), ",");
         });
         var fileName = this.getFileName();
         var logsDirectory = "logs";
@@ -65,6 +66,9 @@ var Logger = /** @class */ (function () {
             transports: [new winston_1.default.transports.File({ filename: logFilePath, format: this.logFormat })],
         });
     }
+    Logger.prototype.replaceAll = function (string, match, replacer) {
+        return string.replace(new RegExp(match, 'g'), replacer);
+    };
     Logger.prototype.getFileName = function () {
         var now = new Date();
         return now.getDate() + "-" + (now.getMonth() + 1) + "-" + now.getFullYear();
@@ -116,6 +120,13 @@ var Logger = /** @class */ (function () {
         }
         this.print.apply(this, __spreadArray([LogLevels.ERROR], data, false));
     };
+    Logger.prototype.test = function () {
+        var startTime = this.execStart("test");
+        this.execStop("test", startTime);
+        this.debug("test");
+        this.log("test");
+        this.error("test");
+    };
     Logger.prototype.print = function (level) {
         var _a;
         if (level === void 0) { level = LogLevels.INFO; }
@@ -124,13 +135,11 @@ var Logger = /** @class */ (function () {
             data[_i - 1] = arguments[_i];
         }
         var now = new Date();
-        // Utilities.getNowDateString();
         this.winstonLogger.defaultMeta = {
             file: this.tag, time: now,
             level: level
         };
         (_a = this.winstonLogger)[level.toLowerCase()].apply(_a, data);
-        // @ts-ignore
         console[level.toLowerCase()].apply(console, __spreadArray(["[".concat(level, "][").concat(now, "][").concat(this.tag.split("\\").pop(), "]")], data, false));
     };
     return Logger;

package/orm.js

@@ -35,10 +35,12 @@ var testConnection = function (options) {
     return new Promise(function (resolve) {
         Firebird.attach(options, function (err, db) {
             if (err) {
-                logger.error("La connessione con il DATABASE non è andata a buon fine.");
+                logger.error('La connessione con il DATABASE non è andata a buon fine.');
+                db.detach();
                 return resolve(false);
             }
             logger.info("DATABASE connesso.");
+            db.detach();
             return resolve(true);
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emilsoftware-utilities",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Utilities for EmilSoftware",
   "main": "index.js",
   "scripts": {

package/src/logger.ts

@@ -1,4 +1,3 @@
-import {Utilities} from "./utilities";
 import winston from "winston";
 import * as path from "path";
 import * as fs from "fs";
@@ -8,14 +7,18 @@ export enum LogLevels {
 }
 
 export class Logger {
-    private readonly winstonLogger: any;
-    public tag: string = "[UNTAGGED]";
+    private readonly winstonLogger: winston.Logger;
+    private readonly tag: string = "[UNTAGGED]";
 
     private logFormat: winston.Logform.Format = winston.format.printf((tmp: winston.Logform.TransformableInfo): string => {
         const {time, file, level, message} = tmp;
-        return `${JSON.stringify({time, file: file?.replaceAll("\\", "/"), level, message})},`;
+        return `${JSON.stringify({time, file: this.replaceAll(file, "\\", "/"), level, message})},`;
     });
 
+    private replaceAll(string: string, match: string, replacer: string) {
+        return string.replace(new RegExp(match, 'g'), replacer);
+    }
+
     constructor(tag: string) {
         const fileName: string = this.getFileName();
         const logsDirectory = "logs";
@@ -31,17 +34,18 @@ export class Logger {
         });
     }
 
+
     private getFileName(): string {
         const now = new Date();
         return now.getDate() + "-" + (now.getMonth() + 1) + "-" + now.getFullYear();
     }
 
-    public execStart(prefix: string = ""): any {
+    public execStart(prefix: string = ""): number {
         this.print(LogLevels.INFO, `${prefix} - Execution started`);
         return performance.now();
     }
 
-    public execStop(prefix: string = "", startTime: any, error: boolean = false): any {
+    public execStop(prefix: string = "", startTime: number, error: boolean = false): void {
         switch (error) {
             case true: {
                 this.print(LogLevels.ERROR, `${prefix} - Execution ended due to an error. Execution time: ${performance.now() - startTime} ms`);
@@ -54,30 +58,36 @@ export class Logger {
         }
     }
 
-    public info(...data: any): void {
+    public info(...data: Object[]): void {
         this.print(LogLevels.INFO, ...data);
     }
 
-    public debug(...data: any): void {
+    public debug(...data: Object[]): void {
         this.print(LogLevels.DEBUG, ...data);
     }
 
-    public log(...data: any): void {
+    public log(...data: Object[]): void {
         this.print(LogLevels.LOG, ...data);
     }
 
-    public error(...data: any): void {
+    public error(...data: Object[]): void {
         this.print(LogLevels.ERROR, ...data);
     }
 
-    private print(level: LogLevels = LogLevels.INFO, ...data: any): void {
-        const now = new Date();
-        // Utilities.getNowDateString();
+    private test() {
+        let startTime = this.execStart("test");
+        this.execStop("test", startTime);
+        this.debug("test");
+        this.log("test");
+        this.error("test")
+    }
+
+    private print(level: LogLevels = LogLevels.INFO, ...data: Object[]): void {
+        const now: Date = new Date();
         this.winstonLogger.defaultMeta = {
             file: this.tag, time: now, level
         };
         this.winstonLogger[level.toLowerCase()](...data);
-        // @ts-ignore
         console[level.toLowerCase()](`[${level}][${now}][${this.tag.split("\\").pop()}]`, ...data);
     }
 }

package/src/orm.ts

@@ -10,12 +10,14 @@ const quote = (value: string): string => {
 const testConnection = (options: Options): Promise<any> => {
     const logger: Logger = new Logger(__filename);
     return new Promise((resolve): void => {
-        Firebird.attach(options, (err: any, db: any): void => {
+        Firebird.attach(options, (err: Error, db: Database): void => {
             if (err) {
-                logger.error("La connessione con il DATABASE non è andata a buon fine.");
+                logger.error('La connessione con il DATABASE non è andata a buon fine.');
+                db.detach();
                 return resolve(false);
             }
             logger.info("DATABASE connesso.");
+            db.detach();
             return resolve(true);
         })
     })