Export module entrypoint

.editorconfig

@@ -1,3 +1,4 @@
+[*]
 charset = utf-8
 indent_style = space
 indent_size = 3

.gitattributes

@@ -0,0 +1,4 @@
+/.yarn/**            linguist-vendored
+/.yarn/releases/*    binary
+/.yarn/plugins/**/*  binary
+/.pnp.*              binary linguist-generated

.gitignore

@@ -1,4 +1,8 @@
 node_modules/
 logs/
 yarn.lock
-out/
+out/
+esm/
+.history/
+.yarn/cache
+.yarn/install-state.gz

.yarnrc.yml

@@ -0,0 +1,11 @@
+nodeLinker: node-modules
+
+npmScopes:
+   "hibas123":
+      npmRegistryServer: "https://git.hibas.dev/api/packages/hibas123/npm/"
+
+plugins:
+   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+     spec: "@yarnpkg/plugin-interactive-tools"
+
+yarnPath: .yarn/releases/yarn-3.6.4.cjs

package.json

@@ -1,28 +1,42 @@
 {
    "name": "@hibas123/nodelogging",
-   "version": "1.5.0-alpha.1",
+   "packageManager": "yarn@3.6.4",
+   "version": "3.1.6",
    "description": "",
    "main": "out/index.js",
    "types": "out/index.d.ts",
+   "module": "esm/index.js",
    "scripts": {
-      "prepublish": "tsc",
-      "build": "tsc",
-      "watch": "tsc --watch",
-      "test": "node out/test.js",
+      "prepublish": "npm run build",
+      "build": "tsc && tsc -p tsconfig.esm.json",
+      "watch-ts": "tsc --watch",
+      "watch-js": "nodemon out/test.js",
+      "watch": "concurrently npm:watch-*",
+      "test": "npm run build && node out/test.js",
+      "benchmark": "npm run build && node out/benchmark.js",
       "live": "nodemon out/test.js"
    },
    "repository": {
       "type": "git",
-      "url": "https://git.stamm.me/PerfCloud/nodelogging.git"
+      "url": "https://git.stamm.me/OpenServer/NodeLogging.git"
    },
    "author": "Fabian Stamm",
    "license": "MIT",
+   "files": [
+      "src/",
+      "out/",
+      "esm/",
+      "tsconfig.json",
+      "readme.md"
+   ],
    "devDependencies": {
-      "@types/node": "^8.0.24",
-      "nodemon": "^1.17.4",
-      "typescript": "^2.4.2"
+      "@types/node": "^20.8.6",
+      "concurrently": "^8.2.1",
+      "nodemon": "^3.0.1",
+      "typescript": "^5.2.2"
    },
    "dependencies": {
-      "@hibas123/utils": "^2.0.0"
+      "@hibas123/logging": "^3.1.2",
+      "@hibas123/utils": "^2.2.18"
    }
 }

readme.md

@@ -1,4 +1,8 @@
-Simple node logging module, that supports terminal coloring and writing to files
+Simple logging module, that supports terminal coloring and writing to files.
+
+This module build ontop of [@hibas123/logging](https://www.npmjs.com/package/@hibas123/utils).
+
+It extends the default behavior to support Logging to Files out of the Box.
 
 # Getting Started
 
@@ -27,7 +31,7 @@ All Logging types except the simple error take as many arguments as you want. Th
 
 NodeLogging can work without any configuration, but it may be useful to change the log output folder.
 
-Todo so you are capable of creating own instances of the LoggingBase class
+To do so you are capable of creating own instances of the LoggingBase class
 
 ``` javascript
    const CustomLogging = new LoggingBase(name | {
@@ -49,10 +53,10 @@ To not use any logfiles just set files to false.
 
 # Plugins
 
-There is a new Plugin API available, that makes is possible to add custom Logging Adapter.
+There is a Plugin API available, that makes is possible to add custom Logging Adapter.
 
 ``` javascript
-const Demo = new LoggingBase("Demo");
+const Demo = new LoggingExtended("Demo");
 Demo.addAdapter(new DemoAdapter({ color: "rainbow" }));
 ```
 

src/benchmark.ts

@@ -0,0 +1,51 @@
+import { Formatted, LoggingBase, LoggingTypes } from "@hibas123/logging";
+import { once } from "events";
+import { createWriteStream } from "fs";
+import { FileAdapter } from "./filewriter";
+
+let results = {};
+
+async function benchmark(
+   name: string,
+   count: number,
+   runner: (cnt: number) => Promise<void>
+) {
+   console.log("Benchmark starting:", name);
+   const start = process.hrtime.bigint();
+
+   await runner(count);
+
+   const diffNS = process.hrtime.bigint() - start;
+   const diffMS = Number(diffNS / BigInt(1000 * 1000));
+
+   console.log("Benchmark ended:", name);
+
+   results[name] = {
+      count,
+      time: diffMS,
+      timePerI: (diffMS / count).toFixed(4),
+   };
+}
+
+Promise.resolve().then(async () => {
+   const largeText = "hallowelt!".repeat(250);
+
+   await benchmark("large data", 100000, async (cnt) => {
+      const lg = new LoggingBase({
+         console: false,
+      });
+      const fs = new FileAdapter("logs/benchmark", Number.MAX_SAFE_INTEGER);
+      await lg.addAdapter(fs);
+
+      console.time("Logging");
+      for (let i = 0; i < cnt; i++) {
+         lg.log(largeText);
+      }
+      console.timeEnd("Logging");
+
+      await fs.close();
+      await lg.close();
+   });
+
+   console.table(results);
+});

src/consolewriter.ts

@@ -1,39 +0,0 @@
-import {Adapter, Message, LoggingTypes} from "./types";
-import {  ObservableInterface } from "@hibas123/utils"
-import { Colors } from "./index";
-
-
-export class ConsoleWriter implements Adapter {
-  init(observable:ObservableInterface<Message>) {
-     observable.subscribe(this.onMessage.bind(this));
-  }
-
-  flush() {}
-
-  onMessage(message:Message) {
-      let consoleLogFormat = Colors.Reset;
-      if (!message.customColors) {
-         switch (message.type) {
-            case LoggingTypes.Log:
-               //m += FgWhite + BgBlack;
-               break;
-            case LoggingTypes.Error:
-               consoleLogFormat += Colors.FgRed;//FgWhite + BgRed + FgWhite;
-               break;
-            case LoggingTypes.Debug:
-               consoleLogFormat += Colors.FgCyan;
-               break;
-            case LoggingTypes.Warning:
-               consoleLogFormat += Colors.FgYellow;
-               break;
-         }
-      } else {
-         consoleLogFormat += message.customColors;
-      }
-
-     let lines = message.text.formatted;
-     let name = "";
-     if(message.name) name = `[${message.name}]=>`;
-     lines.forEach(line=>console.log(consoleLogFormat + name + line + Colors.Reset))
-  }
-}

src/filewriter.ts

@@ -1,43 +1,74 @@
-import { Lock, ObservableInterface } from "@hibas123/utils"
-import * as path from "path";
+import { AwaitStore, Lock } from "@hibas123/utils";
 import * as fs from "fs";
-import { Adapter, Message, LoggingTypes } from "./types";
+import * as path from "path";
+import { Adapter, Message, Formatted, LoggingTypes } from "@hibas123/logging";
+import { once } from "events";
 
-const maxFileSize = 500000000;
+const MAX_FILE_SIZE = 500000000;
+
+export class FileAdapter implements Adapter {
+   level = LoggingTypes.Debug;
 
-export class LoggingFiles implements Adapter {
    file: Files;
-   constructor(filename: string, private error = false) {
-      this.file = Files.getFile(filename);
+   isInit = new AwaitStore(false);
+   constructor(private filename: string, private maxFileSize = MAX_FILE_SIZE) {}
+
+   setLevel(level: LoggingTypes) {
+      this.level = level;
    }
 
-
-   init(observable: ObservableInterface<Message>) {
-      observable.subscribe(this.onMessage.bind(this));
-      return this.file.init();
+   async init() {
+      if (!this.file) {
+         this.file = Files.getFile(this.filename);
+         await this.file
+            .init(this.maxFileSize)
+            .then(() => this.isInit.send(true));
+      }
    }
 
    flush(sync: boolean) {
-      this.file.flush(sync);
+      // return this.file.flush(sync);
    }
 
    onMessage(message: Message) {
-      // Just ignore all non error messages, if this.error is set
-      if (this.error && message.type !== LoggingTypes.Error)
-         return;
-      let txt = message.text.formatted.join("\n") + "\n";
-      txt = txt.replace(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, "");
-
-      let index = txt.indexOf("\x1b");
-      while (index >= 0) {
-         txt = txt.substring(0, index) + txt.substring(index + 5, txt.length);
-         index = txt.indexOf("\x1b");
-      }
-      let msg = Buffer.from(txt);
+      let msg = Buffer.from(Formatted.strip(message.text) + "\n");
       this.file.write(msg);
    }
+
+   async close() {
+      if (this.file) {
+         await this.file.close();
+         this.file = undefined;
+      }
+      this.isInit.send(false);
+   }
 }
 
+//TODO: Optimise write path
+
+const Debounce = (callback: () => void, iv = 500, max = 100) => {
+   let to: any;
+   let curr = 0;
+
+   return {
+      trigger: () => {
+         curr++;
+         if (curr >= max) {
+            curr = 0; // not clearing timeout, since this is a very high cost operation
+            callback();
+         } else if (!to) {
+            to = setTimeout(() => {
+               to = undefined;
+               curr = 0;
+               callback();
+            }, iv);
+         }
+      },
+   };
+};
+
+const QUEUE_START_SIZE = 10000;
+
 export class Files {
    private static files = new Map<string, Files>();
    static getFile(filename: string): Files {
@@ -47,96 +78,144 @@ export class Files {
          file = new Files(filename);
          this.files.set(filename, file);
       }
+      file.open++;
       return file;
    }
 
-   private size: number = 0;
-   private stream: fs.WriteStream = undefined;
-   private lock = new Lock();
+   private open = 0;
 
-   public initialized = false;
+   #maxFileSize = MAX_FILE_SIZE;
+   #size: number = 0;
+   #stream: fs.WriteStream = undefined;
+   #lock = new Lock();
+   #debounce = Debounce(this.checkQueue.bind(this));
+   #initialized = false;
+   #queue: Buffer[] = new Array(QUEUE_START_SIZE);
+   #queueIdx = 0;
 
-   private constructor(private file: string) { }
+   public get initlialized() {
+      return this.#initialized;
+   }
 
-   public async init() {
-      if (this.initialized)
-         return;
-      let lock = await this.lock.getLock();
-      await this.initializeFile()
-      this.initialized = true;
+   private constructor(private file: string) {}
+
+   public async init(maxFileSize: number) {
+      if (this.#initialized) return;
+      this.#maxFileSize = maxFileSize;
+
+      let lock = await this.#lock.getLock();
+
+      const folder = path.dirname(this.file);
+      if (folder) {
+         if (!(await fsExists(folder))) {
+            await fsMkDir(folder).catch(() => {}); //Could happen, if two seperate instances want to create the same folder so ignoring
+         }
+      }
+
+      await this.initializeFile();
+      this.#initialized = true;
+      await this.checkQueue(true);
       lock.release();
-      this.checkQueue()
    }
 
    private async initializeFile(new_file = false) {
       try {
-         if (this.stream) {
-            this.stream.close();
-         }
-         const folder = path.dirname(this.file);
-         if (folder) {
-            if (!await fsExists(folder)) {
-               await fsMkDir(folder).catch(() => { }); //Could happen, if two seperate instances want to create the same folder so ignoring
-            }
+         if (this.#stream) {
+            const closePrms = once(this.#stream, "close");
+
+            this.#stream.end();
+
+            await closePrms;
          }
 
          let size = 0;
          if (await fsExists(this.file)) {
             let stats = await fsStat(this.file);
-            if (new_file || stats.size >= maxFileSize) {
+            if (new_file || stats.size >= this.#maxFileSize) {
                if (await fsExists(this.file + ".old"))
                   await fsUnlink(this.file + ".old");
-               await fsMove(this.file, this.file + ".old")
+               await fsMove(this.file, this.file + ".old");
             } else {
                size = stats.size;
             }
          }
 
-         this.stream = fs.createWriteStream(this.file, { flags: "a" })
-         this.size = size;
-      } catch (e) {
-         console.log(e);
-         //ToDo is this the right behavior?
+         this.#stream = fs.createWriteStream(this.file, { flags: "a" });
+         this.#size = size;
+      } catch (err) {
+         console.log(err);
+         //TODO: is this the right behavior? Probably not...
          process.exit(1);
       }
    }
 
-   private queue: Buffer[] = [];
+   private async checkQueue(nolock: boolean = false) {
+      let lock: any;
+      if (nolock == false) {
+         //TODO: New design might cause new messages to be "stalled" till close or another message
+         if (this.#lock.locked) return;
+         lock = await this.#lock.getLock();
+      }
 
-   async checkQueue() {
-      if (this.lock.locked) return;
-      let lock = await this.lock.getLock();
-      let msg: Buffer;
-      while (msg = this.queue.shift()) {
-         await this.write_to_file(msg);
+      const queue = this.#queue;
+      const queueCnt = this.#queueIdx;
+
+      this.#queue = new Array(QUEUE_START_SIZE);
+      this.#queueIdx = 0;
+
+      let buffer = Buffer.alloc(1024 * 128);
+      let ci = 0;
+      for (let i = 0; i < queueCnt; i++) {
+         const entry = queue[i];
+
+         if (entry.length + ci > buffer.length) {
+            await this.write_to_file(buffer.slice(0, ci));
+            ci = 0;
+            if (entry.length > buffer.length) {
+               await this.write_to_file(entry);
+            } else {
+               entry.copy(buffer, ci);
+               ci += entry.length;
+            }
+         } else {
+            entry.copy(buffer, ci);
+            ci += entry.length;
+         }
+      }
+
+      if (ci > 0) {
+         await this.write_to_file(buffer.slice(0, ci));
+      }
+
+      if (lock) lock.release();
+   }
+
+   public async close() {
+      //TODO: maybe some raceconditions when open collides with close
+      const lock = await this.#lock.getLock();
+      await this.checkQueue(true);
+      this.open--;
+      if (this.open <= 0) {
+         const a = once(this.#stream, "close");
+         this.#stream.close();
+         await a;
+         Files.files.delete(this.file);
       }
       lock.release();
    }
 
-   public flush(sync: boolean) {
-      if (sync) {
-         // if sync flush, the process most likely is in failstate, so checkQueue stopped its work.
-         let msg: Buffer;
-         while (msg = this.queue.shift()) {
-            this.stream.write(msg);
-         }
-      } else {
-         return Promise.resolve().then(async () => {
-            const lock = await this.lock.getLock();
-            lock.release();
-            await this.checkQueue();
-         })
-      }
-   }
-
    private async write_to_file(data: Buffer) {
       try {
-         if (data.byteLength < maxFileSize && this.size + data.byteLength > maxFileSize) {
-            await this.initializeFile(true)
+         if (
+            data.byteLength < this.#maxFileSize &&
+            this.#size + data.byteLength > this.#maxFileSize
+         ) {
+            await this.initializeFile(true);
          }
-         this.size += data.byteLength;
-         this.stream.write(data);
+         this.#size += data.byteLength;
+         this.#stream.write(data);
       } catch (err) {
+         // TODO: Better error handling!
          console.error(err);
          this.initializeFile(false);
          this.write_to_file(data);
@@ -144,65 +223,71 @@ export class Files {
    }
 
    public write(data: Buffer) {
-      this.queue.push(data);
-      this.checkQueue()
+      this.#queue[this.#queueIdx++] = data;
+      this.#debounce.trigger();
    }
 }
 
-function fsUnlink(path) {
-   return new Promise((resolve, reject) => {
+function fsUnlink(path: string) {
+   if (fs.promises?.unlink) {
+      return fs.promises.unlink(path);
+   }
+   return new Promise<void>((resolve, reject) => {
       fs.unlink(path, (err) => {
          if (err) reject(err);
          else resolve();
-      })
-   })
+      });
+   });
 }
 
 function fsStat(path: string) {
+   if (fs.promises?.stat) {
+      return fs.promises.stat(path);
+   }
    return new Promise<fs.Stats>((resolve, reject) => {
       fs.stat(path, (err, stats) => {
          if (err) reject(err);
          else resolve(stats);
-      })
-   })
+      });
+   });
 }
 
 function fsMove(oldPath: string, newPath: string) {
-   return new Promise((resolve, reject) => {
+   return new Promise<void>((resolve, reject) => {
       let callback = (err?) => {
-         if (err) reject(err)
-         else resolve()
-      }
+         if (err) reject(err);
+         else resolve();
+      };
 
       fs.rename(oldPath, newPath, function (err) {
          if (err) {
-            if (err.code === 'EXDEV') {
+            if (err.code === "EXDEV") {
                copy();
             } else {
-               callback(err)
+               callback(err);
             }
             return;
          }
-         callback()
+         callback();
       });
 
       function copy() {
          fs.copyFile(oldPath, newPath, (err) => {
-            if (err) callback(err)
+            if (err) callback(err);
             else fs.unlink(oldPath, callback);
-         })
+         });
       }
-   })
+   });
 }
 
 function fsExists(path: string) {
    return new Promise<boolean>((resolve, reject) => {
-      fs.exists(path, resolve);
+      fs.access(path, (err) => resolve(!err));
    });
 }
 
 function fsMkDir(path: string) {
-   return new Promise((resolve, reject) => {
-      fs.mkdir(path, (err) => err ? reject(err) : resolve());
+   return new Promise<void>((resolve, reject) => {
+      fs.mkdir(path, (err) => (err ? reject(err) : resolve()));
    });
-}
+}

src/index.ts

@@ -1,284 +1,28 @@
-import * as util from "util";
-import * as fs from "fs";
-import { EventEmitter } from "events";
-import * as path from "path";
-import { Lock, Observable } from "@hibas123/utils";
-import { Adapter, LoggingTypes, Message } from "./types";
-import { ConsoleWriter } from "./consolewriter";
+export { FileAdapter } from "./filewriter";
+import { FileAdapter } from "./filewriter";
+import { LoggingBase } from "@hibas123/logging";
+import Logging from "@hibas123/logging";
 
-const OriginalErrorStackFunction = (<any>Error.prototype).prepareStackTrace
-
-export const Colors = {
-   Reset: "\x1b[0m",
-   Bright: "\x1b[1m",
-   Dim: "\x1b[2m",
-   Underscore: "\x1b[4m",
-   Blink: "\x1b[5m",
-   Reverse: "\x1b[7m",
-   Hidden: "\x1b[8m",
-
-   FgBlack: "\x1b[30m",
-   FgRed: "\x1b[31m",
-   FgGreen: "\x1b[32m",
-   FgYellow: "\x1b[33m",
-   FgBlue: "\x1b[34m",
-   FgMagenta: "\x1b[35m",
-   FgCyan: "\x1b[36m",
-   FgWhite: "\x1b[37m",
-
-   BgBlack: "\x1b[40m",
-   BgRed: "\x1b[41m",
-   BgGreen: "\x1b[42m",
-   BgYellow: "\x1b[43m",
-   BgBlue: "\x1b[44m",
-   BgMagenta: "\x1b[45m",
-   BgCyan: "\x1b[46m",
-   BgWhite: "\x1b[47m"
-}
-
-export interface LoggingBaseOptions {
-   /**
-    * Name will be prefixed on Console output and added to logfiles, if not specified here
-    */
-   name: string,
-   files: boolean | {
-      /**
-       * Filename/path of the logfile. Skip if generated with name
-       */
-      logfile: string;
-      /**
-       * Filename/path of the logfile. Skip if generated with name
-       */
-      errorfile: string;
-   }
-   /**
-    * Prints output to console
-    */
-   console: boolean;
-}
-
-
-export class LoggingBase {
-   private logFile: any;
-   private errorFile: any;
-   private adapter: Adapter[] = [];
-   private adapter_init: Promise<void>[] = [];
-
-   private messageObservable = new Observable<Message>();
-   private name: string;
-
-   constructor(options?: Partial<LoggingBaseOptions> | string) {
-      let opt: Partial<LoggingBaseOptions>;
-      if (!options) opt = {}
-      else if (typeof options === "string") {
-         opt = { name: options };
+LoggingBase.nativeFunctions = {
+   startTimer: () => {
+      if (process.hrtime.bigint) {
+         return process.hrtime.bigint();
       } else {
-         opt = options;
+         return process.hrtime();
       }
-
-      let config = {
-         name: undefined,
-         console: true,
-         files: true,
-         ...opt
-      };
-
-      if (typeof config.files === "boolean") {
-         if (config.files === true) {
-            let name = "";
-            if (config.name)
-               name = "." + config.name;
-            config.files = {
-               logfile: `./logs/all${name}.log`,
-               errorfile: `./logs/error${name}.log`
-            }
-         } else {
-            config.files = undefined;
-         }
-      }
-
-      if (config.name)
-         this.name = config.name;
-
-      for (let key in this) {
-         if (typeof this[key] === "function") this[key] = (<any>this[key]).bind(this);
-      }
-
-      if (typeof config.files !== "boolean" && config.files !== undefined && (config.files.logfile || config.files.errorfile)) {
-         const { LoggingFiles } = require("./filewriter");
-         if (config.files.logfile) {
-            this.addAdapter(new LoggingFiles(config.files.logfile));
-         }
-
-         if (config.files.errorfile) {
-            this.addAdapter(new LoggingFiles(config.files.errorfile, true));
-         }
-      }
-
-      if (config.console) {
-         this.addAdapter(new ConsoleWriter());
-      }
-   }
-
-   addAdapter(adapter: Adapter) {
-      this.adapter.push(adapter);
-      let prms = Promise.resolve(adapter.init(this.messageObservable.getPublicApi(), this.name));
-      this.adapter_init.push(prms);
-   }
-
-   flush(sync: true): void;
-   flush(sync: false): Promise<void>;
-   flush(sync: boolean): void | Promise<void> {
-      if (sync) {
-         this.adapter.forEach(elm => elm.flush(true));
+   },
+   endTimer: (start) => {
+      if (process.hrtime.bigint) {
+         return Number((process.hrtime.bigint() - start) / BigInt(1000)) / 1000;
       } else {
-         return Promise.all(this.adapter.map(elm => elm.flush(false))).then(() => { });
+         let diff = process.hrtime(start);
+         return diff[0] * 1000 + diff[1] / 1000000;
       }
-   }
+   },
+};
 
-   public waitForSetup() {
-      return Promise.all(this.adapter_init);
-   }
+export const DefaultFileAdapter = new FileAdapter("./logs/all.log");
 
-   public events: EventEmitter = new EventEmitter();
+Logging.addAdapter(DefaultFileAdapter);
 
-   debug(...message: any[]) {
-      this.message(LoggingTypes.Debug, message);
-   }
-
-   log(...message: any[]) {
-      this.message(LoggingTypes.Log, message);
-   }
-
-   warning(...message: any[]) {
-      this.message(LoggingTypes.Warning, message);
-   }
-
-   logWithCustomColors(type: LoggingTypes, colors: string, ...message: any[]) {
-      this.message(type, message, colors);
-   }
-
-   error(error: Error | string) {
-      if (!error) error = "Empty ERROR was passed, so no informations available";
-      if (typeof error === "string") {
-         let e = new Error()
-         this.message(LoggingTypes.Error, [error, "\n", e.stack]);
-      } else {
-         this.message(LoggingTypes.Error, [error.message, "\n", error.stack], undefined, getCallerFromExisting(error));
-      }
-   }
-
-   errorMessage(...message: any[]) {
-      this.message(LoggingTypes.Error, message);
-   }
-
-   private message(type: LoggingTypes, message: any[] | string, customColors?: string, caller?: { file: string, line: number }) {
-      let file_raw = caller || getCallerFile();
-      let file = `${file_raw.file}:${String(file_raw.line).padEnd(3, " ")}`;
-
-      let mb = "";
-      if (typeof message === "string") {
-         mb = message;
-      } else {
-         message.forEach((e, i) => {
-            if (typeof e !== "string") e = util.inspect(e, false, null);
-            if (e.endsWith("\n") || i === message.length - 1) {
-               mb += e;
-            } else {
-               mb += e + " ";
-            }
-         });
-      }
-
-      let lines = mb.split("\n");
-
-      let date = new Date().toISOString().replace(/T/, ' ').replace(/\..+/, '');
-      let prefix = `[ ${date} ][${LoggingTypes[type].toUpperCase().padEnd(5, " ")}][${file}]: `;
-
-      let formatted = lines.map(line => prefix + line);
-
-      let msg: Message = {
-         date: new Date(),
-         file,
-         name: this.name,
-         text: {
-            raw: lines,
-            formatted
-         },
-         type,
-         customColors
-      }
-
-      this.messageObservable.send(msg);
-   }
-}
-
-export let Logging: LoggingBase = undefined;
-if (process.env.LOGGING_NO_DEFAULT !== "true") {
-   Logging = new LoggingBase();
-}
 export default Logging;
-
-
-
-function getStack() {
-   // Save original Error.prepareStackTrace
-   let origPrepareStackTrace = (<any>Error).prepareStackTrace;
-
-   // Override with function that just returns `stack`
-   (<any>Error).prepareStackTrace = function (_, stack) {
-      return stack
-   }
-
-   // Create a new `Error`, which automatically gets `stack`
-   let err = new Error();
-
-   // Evaluate `err.stack`, which calls our new `Error.prepareStackTrace`
-   let stack: any[] = <any>err.stack;
-
-   // Restore original `Error.prepareStackTrace`
-   (<any>Error).prepareStackTrace = origPrepareStackTrace;
-
-   // Remove superfluous function call on stack
-   stack.shift(); // getStack --> Error
-
-   return stack
-}
-
-function getCallerFile() {
-   try {
-      let stack = getStack()
-
-      let current_file = stack.shift().getFileName();
-
-      while (stack.length) {
-         let caller_file = stack.shift();
-         const util = require("util")
-         if (current_file !== caller_file.getFileName())
-            return {
-               file: path.basename(caller_file.getFileName()),
-               line: caller_file.getLineNumber()
-            };
-      }
-   } catch (err) { }
-   return { file: undefined, line: 0 };
-}
-
-function getCallerFromExisting(err: Error): { file: string, line: number } {
-   if (!err || !err.stack) return { file: "NOFILE", line: 0 };
-   let lines = err.stack.split("\n");
-   let current = path.basename(__filename);
-   lines.shift();// removing first line
-   while (lines.length > 0) {
-      let line = lines.shift();
-      let matches = line.match(/[a-zA-Z_-]+[.][a-zA-Z_-]+[:][0-9]+/g)
-      if (matches && matches.length > 0) {
-         let [f, line] = matches[0].split(":")
-         if (f != current) {
-            return {
-               file: f, line: Number(line)
-            };
-         }
-      }
-   }
-}

src/test.ts

@@ -1,13 +1,17 @@
-import { Logging, LoggingBase } from "./index";
 import { randomBytes } from "crypto";
 import * as fs from "fs";
+import { LoggingBase } from "@hibas123/logging";
+import Logging, { DefaultFileAdapter, FileAdapter } from ".";
+
 const deleteFolderRecursive = function (path: string) {
    if (fs.existsSync(path)) {
       fs.readdirSync(path).forEach(function (file, index) {
          var curPath = path + "/" + file;
-         if (fs.lstatSync(curPath).isDirectory()) { // recurse
+         if (fs.lstatSync(curPath).isDirectory()) {
+            // recurse
             deleteFolderRecursive(curPath);
-         } else { // delete file
+         } else {
+            // delete file
             fs.unlinkSync(curPath);
          }
       });
@@ -15,61 +19,85 @@ const deleteFolderRecursive = function (path: string) {
    }
 };
 
-deleteFolderRecursive("./logs")
+deleteFolderRecursive("./logs");
 
-Logging.log("test")
+Logging.log("test");
 Logging.log("i", "am", { a: "an" }, 1000);
 Logging.error(new Error("fehler 001"));
 Logging.debug("Some Debug infos");
-Logging.errorMessage("i", "am", "an", "error");
+Logging.error("i", "am", "an", "error");
 
-Logging.log("\x1b[31m\x1b[31m\x1b[31m\x1b[31m\x1b[31m\x1b[31m TEST \x1b[31m\x1b[31m\x1b[31m")
+Logging.log(
+   "\x1b[31m\x1b[31m\x1b[31m\x1b[31m\x1b[31m\x1b[31m TEST \x1b[31m\x1b[31m\x1b[31m"
+);
 
-let err = new Error()
-if (typeof err.stack !== "string") console.log("Stacktrace invalid", err.stack)
+let err = new Error();
+if (typeof err.stack !== "string") console.log("Stacktrace invalid", err.stack);
 
 let cus = new LoggingBase({ name: "test" });
-cus.log("Hello from custom Logger")
+cus.log("Hello from custom Logger");
 
-let cus2 = new LoggingBase("test2");
-cus2.log("Hello from custom Logger 2")
+let cus2 = Logging.getChild("test2");
+cus2.log("Hello from custom Logger 2");
 
-let cus22 = new LoggingBase("test2");
-cus22.log("Hello from custom Logger 22")
-cus2.log("Hello from custom Logger 2")
-cus22.log("Hello from custom Logger 22")
-cus2.log("Hello from custom Logger 2")
-cus22.log("Hello from custom Logger 22")
-cus2.log("Hello from custom Logger 2")
-cus22.log("Hello from custom Logger 22")
-cus2.log("Hello from custom Logger 2")
-cus22.log("Hello from custom Logger 22")
-cus2.log("Hello from custom Logger 2")
+let cus22 = Logging.getChild("test2");
+cus22.log("Hello from custom Logger 22");
+cus2.log("Hello from custom Logger 2");
+cus22.log("Hello from custom Logger 22");
+cus2.log("Hello from custom Logger 2");
+cus22.log("Hello from custom Logger 22");
+cus2.log("Hello from custom Logger 2");
+cus22.log("Hello from custom Logger 22");
+cus2.log("Hello from custom Logger 2");
+cus22.log("Hello from custom Logger 22");
+cus2.log("Hello from custom Logger 2");
 
-const BenchmarkLogger = new LoggingBase({
-   console: false,
-   name: "bench"
-})
 async function benchmark(count: number, message_size: number) {
-   await BenchmarkLogger.waitForSetup();
-   const randData = randomBytes(message_size).toString("hex")
+   const BenchmarkLogger = new LoggingBase({
+      console: false,
+      name: "bench",
+   });
+
+   if (fs.existsSync("logs/benchmark")) {
+      fs.unlinkSync("logs/benchmark");
+   }
+
+   if (fs.existsSync("logs/benchmark.old")) {
+      fs.unlinkSync("logs/benchmark.old");
+   }
+
+   const BenchmarkFile = new FileAdapter("logs/benchmark");
+
+   BenchmarkLogger.addAdapter(BenchmarkFile);
+
+   const randData = randomBytes(message_size / 2).toString("hex");
    const t = process.hrtime();
    for (let i = 0; i < count; i++) {
-      BenchmarkLogger.log(randData)
+      BenchmarkLogger.log(randData);
    }
+   await BenchmarkFile.flush(false);
+   await BenchmarkLogger.close();
+
    const diff = process.hrtime(t);
    const NS_PER_SEC = 1e9;
-   await BenchmarkLogger.waitForSetup();
    const ns = diff[0] * NS_PER_SEC + diff[1];
-   console.log(`Benchmark took ${ns / 1000000}ms for ${count} messages with a size of ${message_size} characters`);
-   console.log(`This is equal to ${(ns / 1000000) / count} ms per message`)
+   console.log(
+      `Benchmark took ${
+         ns / 1000000
+      }ms for ${count} messages with a size of ${message_size} characters`
+   );
+   console.log(`This is equal to ${ns / 1000000 / count} ms per message`);
 }
 
-Logging.waitForSetup().then(async () => {
-   return;
-   console.log("Large data benchmark:")
-   await benchmark(7000, 50000);
+const benchTimer = Logging.time("benchmark");
+Promise.resolve().then(async () => {
+   console.log("Large data benchmark:");
+   await benchmark(70000, 50000);
 
-   console.log("Realdata data benchmark:")
-   await benchmark(100000, 100)
-});
+   console.log("Realdata data benchmark:");
+   await benchmark(100000, 100);
+   benchTimer.end();
+
+   const timer = Logging.time("Test Timer");
+   setTimeout(() => timer.end(), 1000);
+});

src/types.ts

@@ -1,27 +0,0 @@
-import {  ObservableInterface }from "@hibas123/utils";
-
-export enum LoggingTypes {
-   Log,
-   Warning,
-   Error,
-   Debug
-}
-
-export interface Message {
-    type: LoggingTypes;
-    name?:string;
-    text: {
-    	raw: string[],
-    	formatted: string[]
-    };
-    date: Date;
-    file: string;
-    customColors?:string;
-}
-
-export interface Adapter {
-    init(observable: ObservableInterface<Message>, name?: string): void | Promise<void>;
-
-    flush(sync: true): void;
-    flush(sync: false): void | Promise<void>;
-}

tsconfig.esm.json

@@ -0,0 +1,11 @@
+{
+   "extends": "./tsconfig.json",
+   "compilerOptions": {
+      "module": "ESNext",
+      "target": "ES2017",
+      "moduleResolution": "node",
+      "outDir": "esm"
+   },
+   "exclude": ["node_modules"],
+   "include": ["src"]
+}