Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
55b871f4c1 | |||
fb077775b6 | |||
2d2b2b8216 | |||
b473ade178 | |||
b3223661dd | |||
c36af83918 |
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ztimson/utils",
|
"name": "@ztimson/utils",
|
||||||
"version": "0.26.14",
|
"version": "0.26.20",
|
||||||
"description": "Utility library",
|
"description": "Utility library",
|
||||||
"author": "Zak Timson",
|
"author": "Zak Timson",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
13
src/cache.ts
13
src/cache.ts
@ -22,8 +22,10 @@ export class Cache<K extends string | number | symbol, T> {
|
|||||||
[key: string | number | symbol]: CachedValue<T> | any;
|
[key: string | number | symbol]: CachedValue<T> | any;
|
||||||
/** Whether cache is complete */
|
/** Whether cache is complete */
|
||||||
complete = false;
|
complete = false;
|
||||||
|
|
||||||
|
private _loading!: Function;
|
||||||
/** Await initial loading */
|
/** Await initial loading */
|
||||||
loading!: Promise<void>;
|
loading = new Promise<void>(r => this._loading = r);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create new cache
|
* Create new cache
|
||||||
@ -31,9 +33,6 @@ 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 = {}) {
|
||||||
let done!: Function;
|
|
||||||
this.loading = new Promise(r => done = r);
|
|
||||||
|
|
||||||
// Persistent storage
|
// Persistent storage
|
||||||
if(this.options.persistentStorage != null) {
|
if(this.options.persistentStorage != null) {
|
||||||
if(typeof this.options.persistentStorage == 'string')
|
if(typeof this.options.persistentStorage == 'string')
|
||||||
@ -45,13 +44,15 @@ export class Cache<K extends string | number | symbol, T> {
|
|||||||
const table: Table<any, any> = await persists.storage.createTable({name: persists.key, key: this.key});
|
const table: Table<any, any> = await persists.storage.createTable({name: persists.key, key: this.key});
|
||||||
const rows = await table.getAll();
|
const rows = await table.getAll();
|
||||||
Object.assign(this.store, rows.reduce((acc, row) => ({...acc, [this.getKey(row)]: row}), {}));
|
Object.assign(this.store, rows.reduce((acc, row) => ({...acc, [this.getKey(row)]: row}), {}));
|
||||||
done();
|
this._loading();
|
||||||
})();
|
})();
|
||||||
} else if((<any>this.options.persistentStorage?.storage)?.getItem != undefined) {
|
} else if((<any>this.options.persistentStorage?.storage)?.getItem != undefined) {
|
||||||
const stored = (<Storage>this.options.persistentStorage.storage).getItem(this.options.persistentStorage.key);
|
const stored = (<Storage>this.options.persistentStorage.storage).getItem(this.options.persistentStorage.key);
|
||||||
if(stored != null) try { Object.assign(this.store, JSON.parse(stored)); } catch { }
|
if(stored != null) try { Object.assign(this.store, JSON.parse(stored)); } catch { }
|
||||||
done();
|
this._loading();
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
this._loading();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle index lookups
|
// Handle index lookups
|
||||||
|
@ -78,7 +78,7 @@ export class Http {
|
|||||||
if(!this.url && !opts.url) throw new Error('URL needs to be set');
|
if(!this.url && !opts.url) throw new Error('URL needs to be set');
|
||||||
let url = opts.url?.startsWith('http') ? opts.url : (this.url || '') + (opts.url || '');
|
let url = opts.url?.startsWith('http') ? opts.url : (this.url || '') + (opts.url || '');
|
||||||
url = url.replaceAll(/([^:]\/)\/+/g, '$1');
|
url = url.replaceAll(/([^:]\/)\/+/g, '$1');
|
||||||
if(opts.fragment) url.includes('#') ? url.replace(/#.*(\?|\n)/g, (match, arg1) => `#${opts.fragment}${arg1}`) : `${url}#${opts.fragment}`;
|
if(opts.fragment) url.includes('#') ? url.replace(/#.*([?\n])/g, (match, arg1) => `#${opts.fragment}${arg1}`) : `${url}#${opts.fragment}`;
|
||||||
if(opts.query) {
|
if(opts.query) {
|
||||||
const q = Array.isArray(opts.query) ? opts.query :
|
const q = Array.isArray(opts.query) ? opts.query :
|
||||||
Object.keys(opts.query).map(k => ({key: k, value: (<any>opts.query)[k]}))
|
Object.keys(opts.query).map(k => ({key: k, value: (<any>opts.query)[k]}))
|
||||||
|
@ -13,8 +13,8 @@ export function search(rows: any[], search: string, regex?: boolean, transform:
|
|||||||
if(!rows) return [];
|
if(!rows) return [];
|
||||||
return rows.filter(r => {
|
return rows.filter(r => {
|
||||||
// Empty search
|
// Empty search
|
||||||
const value = transform(r);
|
|
||||||
if(!search) return true;
|
if(!search) return true;
|
||||||
|
const value = transform(r);
|
||||||
// Regex search
|
// Regex search
|
||||||
if(regex) {
|
if(regex) {
|
||||||
return !!Object.values(value).filter((v: any) => {
|
return !!Object.values(value).filter((v: any) => {
|
||||||
@ -22,7 +22,7 @@ export function search(rows: any[], search: string, regex?: boolean, transform:
|
|||||||
catch { return false; }
|
catch { return false; }
|
||||||
}).length
|
}).length
|
||||||
} else {
|
} else {
|
||||||
return logicTest(r, search);
|
return logicTest(value, search);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -43,6 +43,24 @@ export function formatBytes(bytes: number, decimals = 2) {
|
|||||||
return parseFloat((bytes / Math.pow(k, i)).toFixed(decimals)) + ' ' + sizes[i];
|
return parseFloat((bytes / Math.pow(k, i)).toFixed(decimals)) + ' ' + sizes[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convert milliseconds to human-readable duration
|
||||||
|
* @param {string} ms milliseconds
|
||||||
|
* @param {boolean} short Use unit initial instead of word
|
||||||
|
* @return {string} formated duration
|
||||||
|
*/
|
||||||
|
export function formatMs(ms: number, short = false): string {
|
||||||
|
if (isNaN(ms) || ms < 0) return "Invalid input";
|
||||||
|
const seconds = ms / 1000;
|
||||||
|
const minutes = seconds / 60;
|
||||||
|
const hours = minutes / 60;
|
||||||
|
const days = hours / 24;
|
||||||
|
if (days >= 1) return `${days.toFixed(1)} ${short ? 'd' : 'days'}`;
|
||||||
|
else if (hours >= 1) return `${hours.toFixed(1)} ${short ? 'h' : 'hours'}`;
|
||||||
|
else if (minutes >= 1) return `${minutes.toFixed(1)} ${short ? 'm' : 'minutes'}`;
|
||||||
|
else return `${seconds.toFixed(1)} ${short ? 's' : 'seconds'}`;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Extract numbers from a string & create a formated phone number: +1 (123) 456-7890
|
* Extract numbers from a string & create a formated phone number: +1 (123) 456-7890
|
||||||
*
|
*
|
||||||
|
Reference in New Issue
Block a user