metalog 3.1.11 → 3.1.13

package/metalog.d.ts

@@ -1,4 +1,4 @@
-import EventEmitter = require('node:events');
+import { EventEmitter } from 'node:events';
 
 interface LoggerOptions {
   path: string;
@@ -27,6 +27,7 @@ export class Logger extends EventEmitter {
   flushTimer: NodeJS.Timer;
   lock: boolean;
   buffer: Array<Buffer>;
+  bufferLength: number;
   file: string;
   toFile: Record<string, boolean>;
   fsEnabled: boolean;

package/metalog.js

@@ -47,7 +47,7 @@ const DEFAULT_FLAGS = {
   error: false,
 };
 
-const logTypes = (types = LOG_TYPES) => {
+const logTypes = (types) => {
   const flags = { ...DEFAULT_FLAGS };
   for (const type of types) {
     flags[type] = true;
@@ -77,74 +77,74 @@ const getNextReopen = () => {
   return nextDate - curTime + DAY_MILLISECONDS;
 };
 
-const isError = (val) =>
-  Object.prototype.toString.call(val) === '[object Error]';
-
 class Console {
+  #write;
+  #groupIndent = 0;
+  #counts = new Map();
+  #times = new Map();
+  #readline = readline;
+
   constructor(write) {
-    this._write = write;
-    this._groupIndent = 0;
-    this._counts = new Map();
-    this._times = new Map();
+    this.#write = write;
   }
 
   assert(assertion, ...args) {
     try {
       console.assert(assertion, ...args);
     } catch (err) {
-      this._write('error', this._groupIndent, err.stack);
+      this.#write('error', this.#groupIndent, err.stack);
     }
   }
 
   clear() {
-    readline.cursorTo(process.stdout, 0, 0);
-    readline.clearScreenDown(process.stdout);
+    this.#readline.cursorTo(process.stdout, 0, 0);
+    this.#readline.clearScreenDown(process.stdout);
   }
 
   count(label = 'default') {
-    let cnt = this._counts.get(label) || 0;
+    let cnt = this.#counts.get(label) || 0;
     cnt++;
-    this._counts.set(label, cnt);
-    this._write('debug', this._groupIndent, `${label}: ${cnt}`);
+    this.#counts.set(label, cnt);
+    this.#write('debug', this.#groupIndent, `${label}: ${cnt}`);
   }
 
   countReset(label = 'default') {
-    this._counts.delete(label);
+    this.#counts.delete(label);
   }
 
   debug(...args) {
-    this._write('debug', this._groupIndent, ...args);
+    this.#write('debug', this.#groupIndent, ...args);
   }
 
   dir(...args) {
-    this._write('debug', this._groupIndent, ...args);
+    this.#write('debug', this.#groupIndent, ...args);
   }
 
   trace(...args) {
     const msg = util.format(...args);
     const err = new Error(msg);
-    this._write('debug', this._groupIndent, `Trace${err.stack}`);
+    this.#write('debug', this.#groupIndent, `Trace${err.stack}`);
   }
 
   info(...args) {
-    this._write('info', this._groupIndent, ...args);
+    this.#write('info', this.#groupIndent, ...args);
   }
 
   log(...args) {
-    this._write('log', this._groupIndent, ...args);
+    this.#write('log', this.#groupIndent, ...args);
   }
 
   warn(...args) {
-    this._write('warn', this._groupIndent, ...args);
+    this.#write('warn', this.#groupIndent, ...args);
   }
 
   error(...args) {
-    this._write('error', this._groupIndent, ...args);
+    this.#write('error', this.#groupIndent, ...args);
   }
 
   group(...args) {
     if (args.length !== 0) this.log(...args);
-    this._groupIndent += INDENT;
+    this.#groupIndent += INDENT;
   }
 
   groupCollapsed(...args) {
@@ -152,34 +152,34 @@ class Console {
   }
 
   groupEnd() {
-    if (this._groupIndent.length === 0) return;
-    this._groupIndent -= INDENT;
+    if (this.#groupIndent.length === 0) return;
+    this.#groupIndent -= INDENT;
   }
 
   table(tabularData) {
-    this._write('log', 0, JSON.stringify(tabularData));
+    this.#write('log', 0, JSON.stringify(tabularData));
   }
 
   time(label = 'default') {
-    this._times.set(label, process.hrtime());
+    this.#times.set(label, process.hrtime());
   }
 
   timeEnd(label = 'default') {
-    const startTime = this._times.get(label);
+    const startTime = this.#times.get(label);
     const totalTime = process.hrtime(startTime);
     const totalTimeMs = totalTime[0] * 1e3 + totalTime[1] / 1e6;
     this.timeLog(label, `${label}: ${totalTimeMs}ms`);
-    this._times.delete(label);
+    this.#times.delete(label);
   }
 
   timeLog(label, ...args) {
-    const startTime = this._times.get(label);
+    const startTime = this.#times.get(label);
     if (startTime === undefined) {
       const msg = `Warning: No such label '${label}'`;
-      this._write('warn', this._groupIndent, msg);
+      this.#write('warn', this.#groupIndent, msg);
       return;
     }
-    this._write('debug', this._groupIndent, ...args);
+    this.#write('debug', this.#groupIndent, ...args);
   }
 }
 
@@ -188,7 +188,7 @@ class Logger extends events.EventEmitter {
     super();
     const { workerId = 0, createStream = fs.createWriteStream } = args;
     const { writeInterval, writeBuffer, keepDays, home, json } = args;
-    const { toFile = [], toStdout = [] } = args;
+    const { toFile = LOG_TYPES, toStdout = LOG_TYPES } = args;
     this.active = false;
     this.path = args.path;
     this.workerId = `W${workerId}`;
@@ -203,6 +203,7 @@ class Logger extends events.EventEmitter {
     this.flushTimer = null;
     this.lock = false;
     this.buffer = [];
+    this.bufferLength = 0;
     this.file = '';
     this.toFile = logTypes(toFile);
     this.fsEnabled = toFile.length !== 0;
@@ -216,10 +217,7 @@ class Logger extends events.EventEmitter {
       fs.access(this.path, (err) => {
         if (!err) resolve();
         fs.mkdir(this.path, (err) => {
-          if (!err || err.code === 'EEXIST') {
-            resolve();
-            return;
-          }
+          if (!err || err.code === 'EEXIST') return void resolve();
           const error = new Error(`Can not create directory: ${this.path}\n`);
           this.emit('error', error);
           reject();
@@ -249,8 +247,7 @@ class Logger extends events.EventEmitter {
       });
     }, nextReopen);
     if (this.keepDays) await this.rotate();
-    const options = { flags: 'a', bufferSize: this.writeBuffer };
-    this.stream = this.createStream(this.file, options);
+    this.stream = this.createStream(this.file, { flags: 'a' });
     this.flushTimer = setInterval(() => {
       this.flush();
     }, this.writeInterval);
@@ -277,10 +274,7 @@ class Logger extends events.EventEmitter {
     }
     return new Promise((resolve, reject) => {
       this.flush((err) => {
-        if (err) {
-          reject(err);
-          return;
-        }
+        if (err) return void reject(err);
         this.active = false;
         stream.end(() => {
           clearInterval(this.flushTimer);
@@ -351,13 +345,13 @@ class Logger extends events.EventEmitter {
       level: type,
       message: null,
     };
-    if (isError(args[0])) {
+    if (metautil.isError(args[0])) {
       log.err = this.expandError(args[0]);
       args = args.slice(1);
     } else if (typeof args[0] === 'object') {
       Object.assign(log, args[0]);
-      if (isError(log.err)) log.err = this.expandError(log.err);
-      if (isError(log.error)) log.error = this.expandError(log.error);
+      if (metautil.isError(log.err)) log.err = this.expandError(log.err);
+      if (metautil.isError(log.error)) log.error = this.expandError(log.error);
       args = args.slice(1);
     }
     log.message = util.format(...args);
@@ -377,6 +371,8 @@ class Logger extends events.EventEmitter {
         : this.formatFile(type, indent, ...args);
       const buffer = Buffer.from(line + '\n');
       this.buffer.push(buffer);
+      this.bufferLength += buffer.length;
+      if (this.bufferLength >= this.writeBuffer) this.flush();
     }
   }
 
@@ -398,6 +394,7 @@ class Logger extends events.EventEmitter {
     this.lock = true;
     const buffer = Buffer.concat(this.buffer);
     this.buffer.length = 0;
+    this.bufferLength = 0;
     this.stream.write(buffer, () => {
       this.lock = false;
       this.emit('unlocked');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metalog",
-  "version": "3.1.11",
+  "version": "3.1.13",
   "author": "Timur Shemsedinov <timur.shemsedinov@gmail.com>",
   "description": "Logger for Metarhia",
   "license": "MIT",
@@ -46,21 +46,21 @@
     "fmt": "prettier --write \"**/*.js\" \"**/*.json\" \"**/*.md\" \"**/.*rc\" \"**/*.ts\""
   },
   "engines": {
-    "node": "16 || 18 || 19 || 20"
+    "node": "18 || 20"
   },
   "dependencies": {
-    "concolor": "^1.0.6",
-    "metautil": "^3.7.2"
+    "concolor": "^1.1.0",
+    "metautil": "^3.15.0"
   },
   "devDependencies": {
-    "@types/node": "^18.16.1",
-    "eslint": "^8.36.0",
-    "eslint-config-metarhia": "^8.1.0",
-    "eslint-config-prettier": "^8.7.0",
+    "@types/node": "^20.4.1",
+    "eslint": "^8.44.0",
+    "eslint-config-metarhia": "^8.2.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-prettier": "^5.0.0-alpha.2",
     "metatests": "^0.8.2",
-    "prettier": "^2.8.4",
-    "typescript": "^5.0.4"
+    "prettier": "^3.0.0",
+    "typescript": "^5.1.6"
   }
 }