Compare commits
14 Commits
Author | SHA1 | Date | |
---|---|---|---|
2dce1ad9ac | |||
cebfd2c508 | |||
7c5cf3535d | |||
847b493772 | |||
b1005227ab | |||
3a389de72e | |||
151465aa65 | |||
b103b6f786 | |||
3b486310de | |||
8699fb49ff | |||
fdb29e7984 | |||
274c22bb83 | |||
b21f462d35 | |||
0f10aebfd2 |
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ztimson/utils",
|
"name": "@ztimson/utils",
|
||||||
"version": "0.20.1",
|
"version": "0.20.12",
|
||||||
"description": "Utility library",
|
"description": "Utility library",
|
||||||
"author": "Zak Timson",
|
"author": "Zak Timson",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
@ -25,7 +25,7 @@ export class Cache<K extends string | number | symbol, T> {
|
|||||||
* @param options
|
* @param options
|
||||||
*/
|
*/
|
||||||
constructor(public readonly key?: keyof T, public readonly options: CacheOptions = {}) {
|
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;
|
options.storage = localStorage;
|
||||||
if(options.storageKey && options.storage) {
|
if(options.storageKey && options.storage) {
|
||||||
const stored = options.storage.getItem(options.storageKey);
|
const stored = options.storage.getItem(options.storageKey);
|
||||||
@ -87,6 +87,13 @@ export class Cache<K extends string | number | symbol, T> {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Remove all keys from cache
|
||||||
|
*/
|
||||||
|
clear() {
|
||||||
|
this.store = <Record<K, T>>{};
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Delete an item from the cache
|
* Delete an item from the cache
|
||||||
*
|
*
|
||||||
|
@ -75,6 +75,7 @@ export class Http {
|
|||||||
|
|
||||||
// Send request
|
// Send request
|
||||||
return new PromiseProgress((res, rej, prog) => {
|
return new PromiseProgress((res, rej, prog) => {
|
||||||
|
try {
|
||||||
fetch(url, {
|
fetch(url, {
|
||||||
headers,
|
headers,
|
||||||
method: opts.method || (opts.body ? 'POST' : 'GET'),
|
method: opts.method || (opts.body ? 'POST' : 'GET'),
|
||||||
@ -100,6 +101,7 @@ export class Http {
|
|||||||
push();
|
push();
|
||||||
}).catch((error: any) => controller.error(error));
|
}).catch((error: any) => controller.error(error));
|
||||||
}
|
}
|
||||||
|
|
||||||
push();
|
push();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -115,7 +117,10 @@ export class Http {
|
|||||||
|
|
||||||
if(resp.ok) res(resp);
|
if(resp.ok) res(resp);
|
||||||
else rej(resp);
|
else rej(resp);
|
||||||
})
|
}).catch(err => rej(err));
|
||||||
|
} catch(err) {
|
||||||
|
rej(err);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
import {TypedEmitter, TypedEvents} from './emitter';
|
import {TypedEmitter, TypedEvents} from './emitter';
|
||||||
|
import {JSONSanitize} from './objects.ts';
|
||||||
|
|
||||||
export const CliEffects = {
|
export const CliEffects = {
|
||||||
CLEAR: "\x1b[0m",
|
CLEAR: "\x1b[0m",
|
||||||
@ -64,49 +65,41 @@ export class Logger extends TypedEmitter<LoggerEvents> {
|
|||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
|
||||||
private pad(text: any, length: number, char: string, end = false) {
|
protected format(...text: any[]): string {
|
||||||
const t = text.toString();
|
|
||||||
const l = length - t.length;
|
|
||||||
if(l <= 0) return t;
|
|
||||||
const padding = Array(~~(l / char.length)).fill(char).join('');
|
|
||||||
return !end ? padding + t : t + padding;
|
|
||||||
}
|
|
||||||
|
|
||||||
private format(...text: string[]): string {
|
|
||||||
const now = new Date();
|
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)}`;
|
const timestamp = `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()} ${now.getHours().toString().padStart(2, '0')}:${now.getMinutes().toString().padStart(2, '0')}:${now.getSeconds().toString().padStart(2, '0')}.${now.getMilliseconds().toString().padEnd(3, '0')}`;
|
||||||
return `${timestamp}${this.namespace ? ` [${this.namespace}]` : ''} ${text.join(' ')}`;
|
return `${timestamp}${this.namespace ? ` [${this.namespace}]` : ''} ${text.map(t => typeof t == 'string' ? t : JSONSanitize(t, 2)).join(' ')}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
debug(...args: string[]) {
|
debug(...args: any[]) {
|
||||||
if(Logger.LOG_LEVEL < LOG_LEVEL.DEBUG) return;
|
if(Logger.LOG_LEVEL < LOG_LEVEL.DEBUG) return;
|
||||||
const str = this.format(...args);
|
const str = this.format(...args);
|
||||||
Logger.emit(LOG_LEVEL.DEBUG, str);
|
Logger.emit(LOG_LEVEL.DEBUG, str);
|
||||||
console.debug(CliForeground.LIGHT_GREY + str + CliEffects.CLEAR);
|
console.debug(CliForeground.LIGHT_GREY + str + CliEffects.CLEAR);
|
||||||
}
|
}
|
||||||
|
|
||||||
log(...args: string[]) {
|
log(...args: any[]) {
|
||||||
if(Logger.LOG_LEVEL < LOG_LEVEL.LOG) return;
|
if(Logger.LOG_LEVEL < LOG_LEVEL.LOG) return;
|
||||||
const str = this.format(...args);
|
const str = this.format(...args);
|
||||||
Logger.emit(LOG_LEVEL.LOG, str);
|
Logger.emit(LOG_LEVEL.LOG, str);
|
||||||
console.log(CliEffects.CLEAR + str);
|
console.log(CliEffects.CLEAR + str);
|
||||||
}
|
}
|
||||||
|
|
||||||
info(...args: string[]) {
|
info(...args: any[]) {
|
||||||
if(Logger.LOG_LEVEL < LOG_LEVEL.INFO) return;
|
if(Logger.LOG_LEVEL < LOG_LEVEL.INFO) return;
|
||||||
const str = this.format(...args);
|
const str = this.format(...args);
|
||||||
Logger.emit(LOG_LEVEL.INFO, str);
|
Logger.emit(LOG_LEVEL.INFO, str);
|
||||||
console.info(CliForeground.BLUE + str + CliEffects.CLEAR);
|
console.info(CliForeground.BLUE + str + CliEffects.CLEAR);
|
||||||
}
|
}
|
||||||
|
|
||||||
warn(...args: string[]) {
|
warn(...args: any[]) {
|
||||||
if(Logger.LOG_LEVEL < LOG_LEVEL.WARN) return;
|
if(Logger.LOG_LEVEL < LOG_LEVEL.WARN) return;
|
||||||
const str = this.format(...args);
|
const str = this.format(...args);
|
||||||
Logger.emit(LOG_LEVEL.WARN, str);
|
Logger.emit(LOG_LEVEL.WARN, str);
|
||||||
console.warn(CliForeground.YELLOW + str + CliEffects.CLEAR);
|
console.warn(CliForeground.YELLOW + str + CliEffects.CLEAR);
|
||||||
}
|
}
|
||||||
|
|
||||||
error(...args: string[]) {
|
error(...args: any[]) {
|
||||||
if(Logger.LOG_LEVEL < LOG_LEVEL.ERROR) return;
|
if(Logger.LOG_LEVEL < LOG_LEVEL.ERROR) return;
|
||||||
const str = this.format(...args);
|
const str = this.format(...args);
|
||||||
Logger.emit(LOG_LEVEL.ERROR, str);
|
Logger.emit(LOG_LEVEL.ERROR, str);
|
||||||
|
@ -52,6 +52,8 @@ export function PES(str: TemplateStringsArray, ...args: any[]) {
|
|||||||
return PathEvent.toString(paths, <any>methods?.split(''));
|
return PathEvent.toString(paths, <any>methods?.split(''));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class PathError extends Error { }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A event broken down into its core components for easy processing
|
* A event broken down into its core components for easy processing
|
||||||
* Event Structure: `module/path/name:property:method`
|
* 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
|
* @param has Target must have at least one of these path
|
||||||
*/
|
*/
|
||||||
static hasFatal(target: string | PathEvent | (string | PathEvent)[], ...has: (string | PathEvent)[]): void {
|
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
|
* @param has Target must have all these paths
|
||||||
*/
|
*/
|
||||||
static hasAllFatal(target: string | PathEvent | (string | PathEvent)[], ...has: (string | PathEvent)[]): void {
|
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(', ')}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user