Changed logger events

package.json

@@ -1,9 +1,10 @@
 {
 	"name": "@ztimson/js-utilities",
-	"version": "0.0.0",
+	"version": "0.2.1",
 	"description": "JavaScript Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",
+	"private": false,
 	"repository": {
 		"type": "git",
 		"url": "https://git.zakscode.com/ztimson/js-utilities"

src/emitter.ts

@@ -1,28 +1,60 @@
-export type Listener<T> = (event: T) => any;
+export type Listener = (...args: any[]) => any;
+export type TypedEvents = {[k in string | symbol]: Listener} & {'*': (event: string, ...args: any[]) => any};
 
-export class Emitter<T> {
+export class TypedEmitter<T extends TypedEvents = TypedEvents> {
-	private listeners: {[key: string]: Listener<T>} = {};
+	private static listeners: {[key: string]: Listener[]} = {};
 
-	constructor() { }
+	private listeners: { [key in keyof T]?: Listener[] } = {};
 
-	emit(e: T) {
+	static emit(event: any, ...args: any[]) {
-		Object.values(this.listeners).forEach(l => l(e));
+		(this.listeners['*'] || []).forEach(l => l(event, ...args));
+		(this.listeners[event.toString()] || []).forEach(l => l(...args));
+	};
+
+	static off(event: any, listener: Listener) {
+		const e = event.toString();
+		this.listeners[e] = (this.listeners[e] || []).filter(l => l === listener);
 	}
 
-	listen(fn: Listener<T>): () => {};
+	static on(event: any, listener: Listener) {
-	listen(key: string, fn: Listener<T>): () => {};
+		const e = event.toString();
-	listen(keyOrFn: string | Listener<T>, fn?: Listener<T>): () => {} {
+		if(!this.listeners[e]) this.listeners[e] = [];
-		const func: any = fn ? fn : keyOrFn;
+		this.listeners[e]?.push(listener);
-		const key: string = typeof keyOrFn == 'string' ? keyOrFn :
+		return () => this.off(event, listener);
-			`_${Object.keys(this.listeners).length.toString()}`;
-		this.listeners[<any>key] = func;
-		return () => delete this.listeners[<any>key];
 	}
 
-	once(fn: Listener<T>) {
+	static once(event: any, listener?: Listener): Promise<any> {
-		const stop = this.listen(e => {
+		return new Promise(res => {
-			fn(e);
+			const unsubscribe = this.on(event, <any>((...args: any) => {
-			stop();
+				res(args.length == 1 ? args[0] : args);
+				if(listener) listener(...args);
+				unsubscribe();
+			}));
+		});
+	}
+
+	emit<K extends keyof T>(event: K, ...args: Parameters<T[K]>) {
+		(this.listeners['*'] || []).forEach(l => l(event, ...args));
+		(this.listeners[event] || []).forEach(l => l(...args));
+	};
+
+	off<K extends keyof T = string>(event: K, listener: T[K]) {
+		this.listeners[event] = (this.listeners[event] || []).filter(l => l === listener);
+	}
+
+	on<K extends keyof T = string>(event: K, listener: T[K]) {
+		if(!this.listeners[event]) this.listeners[event] = [];
+		this.listeners[event]?.push(listener);
+		return () => this.off(event, listener);
+	}
+
+	once<K extends keyof T = string>(event: K, listener?: T[K]): Promise<any> {
+		return new Promise(res => {
+			const unsubscribe = this.on(event, <any>((...args: any) => {
+				res(args.length == 1 ? args[0] : args);
+				if(listener) listener(...args);
+				unsubscribe();
+			}));
 		});
 	}
 }

src/logger.ts

@@ -1,3 +1,5 @@
+import {TypedEmitter, TypedEvents} from './emitter';
+
 export const CliEffects = {
 	CLEAR: "\x1b[0m",
 	BRIGHT: "\x1b[1m",
@@ -9,15 +11,22 @@ export const CliEffects = {
 }
 
 export const CliForeground = {
-	BLACK: "\x1b[30m",
+	BLACK: '\x1b[30m',
-	RED: "\x1b[31m",
+	RED: '\x1b[31m',
-	GREEN: "\x1b[32m",
+	GREEN: '\x1b[32m',
-	YELLOW: "\x1b[33m",
+	YELLOW: '\x1b[33m',
-	BLUE: "\x1b[34m",
+	BLUE: '\x1b[34m',
-	MAGENTA: "\x1b[35m",
+	MAGENTA: '\x1b[35m',
-	CYAN: "\x1b[36m",
+	CYAN: '\x1b[36m',
-	WHITE: "\x1b[37m",
+	LIGHT_GREY: '\x1b[37m',
-	GREY: "\x1b[90m",
+	GREY: '\x1b[90m',
+	LIGHT_RED: '\x1b[91m',
+	LIGHT_GREEN: '\x1b[92m',
+	LIGHT_YELLOW: '\x1b[93m',
+	LIGHT_BLUE: '\x1b[94m',
+	LIGHT_MAGENTA: '\x1b[95m',
+	LIGHT_CYAN: '\x1b[96m',
+	WHITE: '\x1b[97m',
 }
 
 export const CliBackground = {
@@ -32,34 +41,68 @@ export const CliBackground = {
 	GREY: "\x1b[100m",
 }
 
-export class Logger {
+export enum LOG_LEVEL {
-	constructor(public readonly namespace: string) { }
+	VERBOSE,
+	INFO,
+	WARN,
+	ERROR
+}
+
+export type LoggerEvents = TypedEvents & {
+	'VERBOSE': (...args: any[]) => any;
+	'INFO': (...args: any[]) => any;
+	'WARN': (...args: any[]) => any;
+	'ERROR': (...args: any[]) => any;
+};
+
+export class Logger extends TypedEmitter<LoggerEvents> {
+	static LOG_LEVEL: LOG_LEVEL = LOG_LEVEL.INFO;
+
+	constructor(public readonly namespace: string) {
+		super();
+	}
 
 	private format(...text: string[]): string {
 		return `${new Date().toISOString()} [${this.namespace}] ${text.join(' ')}`;
 	}
 
 	debug(...args: string[]) {
-		console.log(CliForeground.MAGENTA + this.format(...args) + CliEffects.CLEAR);
+		if(LOG_LEVEL.VERBOSE >= Logger.LOG_LEVEL) {
+			const str = this.format(...args);
+			Logger.emit(LOG_LEVEL.VERBOSE, str);
+			console.debug(CliForeground.LIGHT_GREY + str + CliEffects.CLEAR);
+		}
 	}
 
 	error(...args: string[]) {
-		console.log(CliForeground.RED + this.format(...args) + CliEffects.CLEAR);
+		if(LOG_LEVEL.ERROR >= Logger.LOG_LEVEL) {
+			const str = this.format(...args);
+			Logger.emit(LOG_LEVEL.ERROR, str);
+			console.error(CliForeground.RED + str + CliEffects.CLEAR);
+		}
 	}
 
 	info(...args: string[]) {
-		console.log(CliForeground.CYAN + this.format(...args) + CliEffects.CLEAR);
+		if(LOG_LEVEL.INFO >= Logger.LOG_LEVEL) {
+			const str = this.format(...args);
+			Logger.emit(LOG_LEVEL.INFO, str);
+			console.info(CliForeground.CYAN + str + CliEffects.CLEAR);
+		}
 	}
 
 	log(...args: string[]) {
-		console.log(CliEffects.CLEAR + this.format(...args));
+		if(LOG_LEVEL.INFO >= Logger.LOG_LEVEL) {
+			const str = this.format(...args);
+			Logger.emit(LOG_LEVEL.INFO, str);
+			console.log(CliEffects.CLEAR + str);
+		}
 	}
 
 	warn(...args: string[]) {
-		console.log(CliForeground.YELLOW + this.format(...args) + CliEffects.CLEAR);
+		if(LOG_LEVEL.WARN >= Logger.LOG_LEVEL) {
-	}
+			const str = this.format(...args);
-
+			Logger.emit(LOG_LEVEL.WARN, str);
-	verbose(...args: string[]) {
+			console.warn(CliForeground.YELLOW + str + CliEffects.CLEAR);
-		console.log(CliForeground.WHITE + this.format(...args) + CliEffects.CLEAR);
+		}
 	}
 }

src/xhr.ts

@@ -45,7 +45,7 @@ export class XHR<T> {
 		return fetch(`${this.baseUrl}${href || ''}`.replace(/([^:]\/)\/+/g, '$1'), {
 			headers,
 			method: opts.method || (body ? 'POST' : 'GET'),
-			body: (headers['Content-Type'].startsWith('application/json') && body) ? JSON.stringify(body) : body
+			body: (headers['Content-Type']?.startsWith('application/json') && body) ? JSON.stringify(body) : body
 		}).then(async resp => {
 			for(let fn of this.getInterceptors()) {
 				const wait = new Promise(res =>