jet-logger 1.1.5 → 1.2.2

package/README.md

@@ -21,7 +21,8 @@ take priority over environment variables. Note that file writes happen asynchron
 
 - The four environment variables are:
     - `JET_LOGGER_MODE`: can be `'CONSOLE'`(default), `'FILE'`, `'CUSTOM'`, and `'OFF'`.
-    - `JET_LOGGER_FILEPATH`: the file-path for file mode. Default is _home_dir/jet-logger.log_.
+    - `JET_LOGGER_FILEPATH`: the file-path for file mode. Default is `_home_dir/jet-logger.log_`.
+    - `JET_LOGGER_FILEPATH_DATETIME`: prepend the log file name with the datetime. Can be `'TRUE'` (default) or `'FALSE'`.
     - `JET_LOGGER_TIMESTAMP`: adds a timestamp next to each log. Can be `'TRUE'` (default) or `'FALSE'`.
     - `JET_LOGGER_FORMAT`: formats log as a line or JSON object. Can be `'LINE'` (default) or `'JSON'`.
 
@@ -114,7 +115,7 @@ const customSend: TCustomLogger = (timestamp: Date, level: string, content: any)
 }
 
 router.get('api/users', async (req: Request, res: Reponse) => {
-    const logger = JetLogger(LoggerModes.CUSTOM, '', true, customSend);
+    const logger = JetLogger(LoggerModes.CUSTOM, '', true, true, undefined, customSend);
     logger.rmTimestamp = true;
     logger.info(req.params.msg);
     return res.status(OK).json({

package/lib/index.d.ts

@@ -10,10 +10,11 @@ export declare enum Formats {
 }
 declare type TJetLogger = ReturnType<typeof JetLogger>;
 export declare type TCustomLogger = (timestamp: Date, prefix: string, content: any) => void;
-export declare function JetLogger(mode?: LoggerModes, filePath?: string, timestamp?: boolean, format?: Formats, customLogger?: TCustomLogger): {
+export declare function JetLogger(mode?: LoggerModes, filepath?: string, filepathDatetime?: boolean, timestamp?: boolean, format?: Formats, customLogger?: TCustomLogger): {
     readonly settings: {
         readonly mode: LoggerModes;
-        readonly filePath: string;
+        readonly filepath: string;
+        readonly filepathDatetime: boolean;
         readonly timestamp: boolean;
         readonly format: Formats;
         readonly customLogger: TCustomLogger | undefined;
@@ -30,7 +31,8 @@ declare function err(this: TJetLogger, content: any, printFull?: boolean): void;
 declare const _default: {
     readonly settings: {
         readonly mode: LoggerModes;
-        readonly filePath: string;
+        readonly filepath: string;
+        readonly filepathDatetime: boolean;
         readonly timestamp: boolean;
         readonly format: Formats;
         readonly customLogger: TCustomLogger | undefined;

package/lib/index.js

@@ -43,22 +43,18 @@ var errors = {
         '"OFF", or "CONSOLE".'
 };
 var defaults = {
-    fileName: 'jet-logger.log',
+    filepath: 'jet-logger.log',
     mode: LoggerModes.Console,
     timestamp: true,
+    filepathDatetime: true,
     format: Formats.Line,
 };
-function JetLogger(mode, filePath, timestamp, format, customLogger) {
-    return {
-        settings: getSettings(mode, filePath, timestamp, format, customLogger),
-        info: info,
-        imp: imp,
-        warn: warn,
-        err: err,
-    };
+function JetLogger(mode, filepath, filepathDatetime, timestamp, format, customLogger) {
+    var settings = getSettings(mode, filepath, timestamp, filepathDatetime, format, customLogger);
+    return { settings: settings, info: info, imp: imp, warn: warn, err: err };
 }
 exports.JetLogger = JetLogger;
-function getSettings(mode, filePath, timestamp, format, customLogger) {
+function getSettings(mode, filepath, filepathDatetime, timestamp, format, customLogger) {
     if (!mode) {
         if (!!process.env.JET_LOGGER_MODE) {
             mode = process.env.JET_LOGGER_MODE.toUpperCase();
@@ -67,15 +63,24 @@ function getSettings(mode, filePath, timestamp, format, customLogger) {
             mode = defaults.mode;
         }
     }
-    if (!filePath) {
+    if (!filepath) {
         if (!!process.env.JET_LOGGER_FILEPATH) {
-            filePath = process.env.JET_LOGGER_FILEPATH;
+            filepath = process.env.JET_LOGGER_FILEPATH;
+        }
+        else {
+            filepath = defaults.filepath;
+        }
+    }
+    if (filepathDatetime === undefined || filepathDatetime === null) {
+        var envVar = process.env.JET_LOGGER_FILEPATH_DATETIME;
+        if (!!envVar) {
+            filepathDatetime = (envVar.toUpperCase() === 'TRUE');
         }
         else {
-            filePath = defaults.fileName;
+            filepathDatetime = defaults.filepathDatetime;
         }
     }
-    if (!timestamp) {
+    if (timestamp === undefined || timestamp === null) {
         if (!!process.env.JET_LOGGER_TIMESTAMP) {
             timestamp = (process.env.JET_LOGGER_TIMESTAMP.toUpperCase() === 'TRUE');
         }
@@ -91,9 +96,13 @@ function getSettings(mode, filePath, timestamp, format, customLogger) {
             format = defaults.format;
         }
     }
+    if (filepathDatetime) {
+        filepath = addDatetimeToFileName(filepath);
+    }
     return {
         mode: mode,
-        filePath: filePath,
+        filepath: filepath,
+        filepathDatetime: filepathDatetime,
         timestamp: timestamp,
         format: format,
         customLogger: customLogger,
@@ -112,7 +121,7 @@ function err(content, printFull) {
     return printLog(content, printFull !== null && printFull !== void 0 ? printFull : false, levels.err, this.settings);
 }
 function printLog(content, printFull, level, settings) {
-    var mode = settings.mode, format = settings.format, timestamp = settings.timestamp, filePath = settings.filePath, customLogger = settings.customLogger;
+    var mode = settings.mode, format = settings.format, timestamp = settings.timestamp, filepath = settings.filepath, customLogger = settings.customLogger;
     if (mode === LoggerModes.Off) {
         return;
     }
@@ -134,7 +143,7 @@ function printLog(content, printFull, level, settings) {
     if (timestamp) {
         if (format === Formats.Line) {
             var time = '[' + new Date().toISOString() + '] ';
-            content = time + content;
+            content = (time + content);
         }
         else if (format === Formats.Json) {
             jsonContent.timestamp = new Date().toISOString();
@@ -148,9 +157,8 @@ function printLog(content, printFull, level, settings) {
         console.log(colorFn(content));
     }
     else if (mode === LoggerModes.File) {
-        writeToFile(content + '\n', filePath).catch(function (err) {
-            console.log(err);
-        });
+        writeToFile(content + '\n', filepath)
+            .catch(function (err) { return console.log(err); });
     }
     else if (mode === LoggerModes.Custom) {
         if (!!customLogger) {
@@ -164,11 +172,19 @@ function printLog(content, printFull, level, settings) {
         throw Error(errors.modeErr);
     }
 }
+function addDatetimeToFileName(filePath) {
+    var dateStr = new Date().toISOString()
+        .split('-').join('')
+        .split(':').join('')
+        .slice(0, 15);
+    var filePathArr = filePath.split('/'), lastIdx = filePathArr.length - 1, fileName = filePathArr[lastIdx], fileNameNew = (dateStr + '_' + fileName);
+    filePathArr[lastIdx] = fileNameNew;
+    return filePathArr.join('/');
+}
 function writeToFile(content, filePath) {
     return new Promise(function (res, rej) {
-        return fs_1.default.appendFile(filePath, content, function (err) {
-            return (!!err ? rej(err) : res());
-        });
+        var fn = (function (err) { return !!err ? rej(err) : res(); });
+        return fs_1.default.appendFile(filePath, content, fn);
     });
 }
 exports.default = JetLogger();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jet-logger",
-  "version": "1.1.5",
+  "version": "1.2.2",
   "description": "A super quick, easy to setup logging tool for NodeJS/TypeScript.",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",