Handle logging objects

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.20.0",
+	"version": "0.20.9",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",

src/cache.ts

@@ -25,7 +25,7 @@ export class Cache<K extends string | number | symbol, T> {
 	 * @param options
 	 */
 	constructor(public readonly key?: keyof T, public readonly options: CacheOptions = {}) {
-		if(options.storageKey && !options.storage)
+		if(options.storageKey && !options.storage && typeof(Storage) !== 'undefined')
 			options.storage = localStorage;
 		if(options.storageKey && options.storage) {
 			const stored = options.storage.getItem(options.storageKey);
@@ -87,6 +87,13 @@ export class Cache<K extends string | number | symbol, T> {
 		return this;
 	}
 
+	/**
+	 * Remove all keys from cache
+	 */
+	clear() {
+		this.store = <Record<K, T>>{};
+	}
+
 	/**
 	 * Delete an item from the cache
 	 *
@@ -95,7 +102,7 @@ export class Cache<K extends string | number | symbol, T> {
 	delete(key: K) {
 		delete this.store[key];
 		if(this.options.storageKey && this.options.storage)
-			this.options.storage.setItem(this.options.storageKey, JSON.stringify(this.cache));
+			this.options.storage.setItem(this.options.storageKey, JSON.stringify(this.store));
 	}
 
 	/**
@@ -144,7 +151,7 @@ export class Cache<K extends string | number | symbol, T> {
 	set(key: K, value: T, ttl = this.options.ttl): this {
 		this.store[key] = value;
 		if(this.options.storageKey && this.options.storage)
-			this.options.storage.setItem(this.options.storageKey, JSON.stringify(this.cache));
+			this.options.storage.setItem(this.options.storageKey, JSON.stringify(this.store));
 		if(ttl) setTimeout(() => {
 			this.complete = false;
 			this.delete(key);

src/http.ts

@@ -75,47 +75,52 @@ export class Http {
 
 		// Send request
 		return new PromiseProgress((res, rej, prog) => {
-			fetch(url, {
-				headers,
-				method: opts.method || (opts.body ? 'POST' : 'GET'),
-				body: opts.body
-			}).then(async (resp: any) => {
-				for(let fn of [...Object.values(Http.interceptors), ...Object.values(this.interceptors)]) {
-					await new Promise<void>(res => fn(resp, () => res()));
-				}
-
-				const contentLength = resp.headers.get('Content-Length');
-				const total = contentLength ? parseInt(contentLength, 10) : 0;
-				let loaded = 0;
-
-				const reader = resp.body?.getReader();
-				const stream = new ReadableStream({
-					start(controller) {
-						function push() {
-							reader?.read().then((event: any) => {
-								if(event.done) return controller.close();
-								loaded += event.value.byteLength;
-								prog(loaded / total);
-								controller.enqueue(event.value);
-								push();
-							}).catch((error: any) => controller.error(error));
-						}
-						push();
+			try {
+				fetch(url, {
+					headers,
+					method: opts.method || (opts.body ? 'POST' : 'GET'),
+					body: opts.body
+				}).then(async (resp: any) => {
+					for(let fn of [...Object.values(Http.interceptors), ...Object.values(this.interceptors)]) {
+						await new Promise<void>(res => fn(resp, () => res()));
 					}
-				});
 
-				resp.data = new Response(stream);
-				if(opts.decode == null || opts.decode) {
-					const content = resp.headers.get('Content-Type')?.toLowerCase();
-					if(content?.includes('form')) resp.data = <T>await resp.data.formData();
-					else if(content?.includes('json')) resp.data = <T>await resp.data.json();
-					else if(content?.includes('text')) resp.data = <T>await resp.data.text();
-					else if(content?.includes('application')) resp.data = <T>await resp.data.blob();
-				}
+					const contentLength = resp.headers.get('Content-Length');
+					const total = contentLength ? parseInt(contentLength, 10) : 0;
+					let loaded = 0;
 
-				if(resp.ok) res(resp);
-				else rej(resp);
-			})
+					const reader = resp.body?.getReader();
+					const stream = new ReadableStream({
+						start(controller) {
+							function push() {
+								reader?.read().then((event: any) => {
+									if(event.done) return controller.close();
+									loaded += event.value.byteLength;
+									prog(loaded / total);
+									controller.enqueue(event.value);
+									push();
+								}).catch((error: any) => controller.error(error));
+							}
+
+							push();
+						}
+					});
+
+					resp.data = new Response(stream);
+					if(opts.decode == null || opts.decode) {
+						const content = resp.headers.get('Content-Type')?.toLowerCase();
+						if(content?.includes('form')) resp.data = <T>await resp.data.formData();
+						else if(content?.includes('json')) resp.data = <T>await resp.data.json();
+						else if(content?.includes('text')) resp.data = <T>await resp.data.text();
+						else if(content?.includes('application')) resp.data = <T>await resp.data.blob();
+					}
+
+					if(resp.ok) res(resp);
+					else rej(resp);
+				}).catch(err => rej(err));
+			} catch(err) {
+				rej(err);
+			}
 		});
 	}
 }

src/logger.ts

@@ -1,4 +1,5 @@
 import {TypedEmitter, TypedEvents} from './emitter';
+import {JSONSanitize} from './objects.ts';
 
 export const CliEffects = {
 	CLEAR: "\x1b[0m",
@@ -75,7 +76,7 @@ export class Logger extends TypedEmitter<LoggerEvents> {
 	private format(...text: string[]): string {
 		const now = new Date();
 		const timestamp = `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()} ${this.pad(now.getHours().toString(), 2, '0')}:${this.pad(now.getMinutes().toString(), 2, '0')}:${this.pad(now.getSeconds().toString(), 2, '0')}.${this.pad(now.getMilliseconds().toString(), 3, '0', true)}`;
-		return `${timestamp}${this.namespace ? ` [${this.namespace}]` : ''} ${text.join(' ')}`;
+		return `${timestamp}${this.namespace ? ` [${this.namespace}]` : ''} ${text.map(JSONSanitize).join(' ')}`;
 	}
 
 	debug(...args: string[]) {

src/path-events.ts

@@ -52,6 +52,8 @@ export function PES(str: TemplateStringsArray, ...args: any[]) {
 	return PathEvent.toString(paths, <any>methods?.split(''));
 }
 
+export class PathError extends Error { }
+
 /**
  * A  event broken down into its core components for easy processing
  * Event Structure: `module/path/name:property:method`
@@ -172,7 +174,7 @@ export class PathEvent {
 	 * @param has Target must have at least one of these path
 	 */
 	static hasFatal(target: string | PathEvent | (string | PathEvent)[], ...has: (string | PathEvent)[]): void {
-		if(!PathEvent.has(target, ...has)) throw new Error(`Requires one of: ${makeArray(has).join(', ')}`);
+		if(!PathEvent.has(target, ...has)) throw new PathError(`Requires one of: ${makeArray(has).join(', ')}`);
 	}
 
 	/**
@@ -182,7 +184,7 @@ export class PathEvent {
 	 * @param has Target must have all these paths
 	 */
 	static hasAllFatal(target: string | PathEvent | (string | PathEvent)[], ...has: (string | PathEvent)[]): void {
-		if(!PathEvent.hasAll(target, ...has)) throw new Error(`Requires all: ${makeArray(has).join(', ')}`);
+		if(!PathEvent.hasAll(target, ...has)) throw new PathError(`Requires all: ${makeArray(has).join(', ')}`);
 	}
 
 	/**