Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 435be31347 | |||
| 2522635815 | |||
| e8fdca8236 | |||
| 67ae86d69b | |||
| 87db4d4755 | |||
| 0fb1e13ba0 | |||
| ff4401934c | |||
| ce3c8d012a | |||
| a86e8350ee | |||
| 7b4e17e4c4 | |||
| fa66820c76 | |||
| 49a2df8cd4 | |||
| ccf3fcb043 | |||
| 341ef37205 | |||
| 0eab2630ad | |||
| 2f59a9d02e | |||
| ce2f32dd45 | |||
| ce40b5b1e7 | |||
| 2500bcdcf1 |
26
index.html
26
index.html
@ -6,9 +6,31 @@
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<script type="module">
|
<script type="module">
|
||||||
import {PathEvent} from './dist/index.mjs';
|
import {ArgParser} from './dist/index.mjs';
|
||||||
|
|
||||||
console.log(PathEvent.has(['data/Inventory:n', 'logs:c'], `logs/client:n`));
|
const hostname = 'test';
|
||||||
|
const argParser = new ArgParser('botnet-manager.js', 'Connect & manage a network of servers to launch distributed attacks.', [
|
||||||
|
new ArgParser('copy', 'Copy file & dependencies to botnet', [
|
||||||
|
{name: 'file', desc: 'File to copy', default: false},
|
||||||
|
{name: 'control', desc: 'Copy to master server', flags: ['-c', '--control'], default: false},
|
||||||
|
{name: 'noDeps', desc: 'Skip copying dependencies', flags: ['-d', '--no-deps'], default: false},
|
||||||
|
{name: 'slave', desc: 'Copy to slave servers', flags: ['-s', '--slave'], default: false},
|
||||||
|
]),
|
||||||
|
new ArgParser('join', 'Connect server as a botnet slave', [
|
||||||
|
{name: 'device', desc: 'Device to connect, defaults to the current machine', optional: true, default: hostname}
|
||||||
|
]),
|
||||||
|
new ArgParser('kill', 'Kill any scripts running on the botnet'),
|
||||||
|
new ArgParser('leave', 'Disconnect worker node from swarm', [
|
||||||
|
{name: 'device', desc: 'Device to disconnect, defaults to the current machine', optional: true, default: hostname}
|
||||||
|
]),
|
||||||
|
new ArgParser('run', 'Copy & run script on the botnet', [
|
||||||
|
{name: 'script', desc: 'Script to copy & execute', type: 'string'},
|
||||||
|
{name: 'args', desc: 'Arguments for script. Forward the current target with: {{TARGET}}', optional: true, extras: true},
|
||||||
|
]),
|
||||||
|
new ArgParser('start', 'Start this server as the botnet manager'),
|
||||||
|
{name: 'silent', desc: 'Suppress program output', flags: ['-s', '--silent'], default: false},
|
||||||
|
]);
|
||||||
|
console.log(argParser.help({}));
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ztimson/utils",
|
"name": "@ztimson/utils",
|
||||||
"version": "0.21.6",
|
"version": "0.23.3",
|
||||||
"description": "Utility library",
|
"description": "Utility library",
|
||||||
"author": "Zak Timson",
|
"author": "Zak Timson",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
|||||||
140
src/arg-parser.ts
Normal file
140
src/arg-parser.ts
Normal file
@ -0,0 +1,140 @@
|
|||||||
|
export type Arg<T = any> = {
|
||||||
|
/** Argument/property name */
|
||||||
|
name: string;
|
||||||
|
/** Argument description for help page */
|
||||||
|
desc: string;
|
||||||
|
/** Available shorthands */
|
||||||
|
flags?: string[];
|
||||||
|
/** Argument is not required */
|
||||||
|
optional?: boolean;
|
||||||
|
/** Default value if argument is not used */
|
||||||
|
default?: T;
|
||||||
|
/** Collects any unmatched arguments */
|
||||||
|
extras?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class ArgParser {
|
||||||
|
commands: ArgParser[] = [];
|
||||||
|
args: Arg[] = [];
|
||||||
|
flags: Arg[] = [];
|
||||||
|
defaults!: {[key: string]: any};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a unix-like argument parser to extract flags from the argument list. Can also create help messages.
|
||||||
|
*
|
||||||
|
* @param {string} name Script name
|
||||||
|
* @param {string} desc Help description
|
||||||
|
* @param {(ArgParser | Arg[]} argList Array of CLI arguments
|
||||||
|
* @param {string[]} examples Additional examples to display
|
||||||
|
*/
|
||||||
|
constructor(public readonly name: string,
|
||||||
|
public readonly desc: string,
|
||||||
|
public readonly argList: (ArgParser | Arg)[] = [],
|
||||||
|
public readonly examples: string[] = []
|
||||||
|
) {
|
||||||
|
// Arguments
|
||||||
|
this.commands = argList.filter(arg => arg instanceof ArgParser);
|
||||||
|
this.args = <Arg[]>argList.filter(arg => !(arg instanceof ArgParser) && !arg.flags?.length);
|
||||||
|
this.flags = <Arg[]>[...argList.filter(arg => !(arg instanceof ArgParser) && arg.flags && arg.flags.length), ...this.flags];
|
||||||
|
this.defaults = argList.reduce((acc, arg: any) => ({...acc, [arg.name]: arg['extras'] ? [] : (arg.default ?? null)}), {});
|
||||||
|
|
||||||
|
// Examples
|
||||||
|
this.examples = <string[]>[
|
||||||
|
...examples,
|
||||||
|
`[OPTIONS] ${this.args.map(arg => (arg.optional ? `[${arg.name.toUpperCase()}]` : arg.name.toUpperCase()) + (arg.extras ? '...' : '')).join(' ')}`,
|
||||||
|
this.commands.length ? `[OPTIONS] COMMAND` : null,
|
||||||
|
`--help ${this.commands.length ? '[COMMAND]' : ''}`
|
||||||
|
].filter(e => !!e);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parse an array into an arguments dictionary using the configuration.
|
||||||
|
*
|
||||||
|
* @param {string[]} args Array of arguments to be parsed
|
||||||
|
* @returns {object} Dictionary of arguments with defaults applied
|
||||||
|
*/
|
||||||
|
parse(args: string[]) {
|
||||||
|
// Parse arguments
|
||||||
|
let extras = [], parsed: any = {...this.defaults, '_error': []}, queue = [...args];
|
||||||
|
while(queue.length) {
|
||||||
|
let arg = queue.splice(0, 1)[0];
|
||||||
|
if(arg[0] == '-') { // Flags
|
||||||
|
// Check for combined shorthand
|
||||||
|
if(arg[1] != '-' && arg.length > 2) {
|
||||||
|
queue = [...arg.substring(2).split('').map(a => `-${a}`), ...queue];
|
||||||
|
arg = `-${arg[1]}`;
|
||||||
|
}
|
||||||
|
// Find & add flag
|
||||||
|
const combined = arg.split('=');
|
||||||
|
const argDef = this.flags.find(flag => flag.flags?.includes(combined[0] || arg));
|
||||||
|
if(argDef == null) { // Not found, add to extras
|
||||||
|
extras.push(arg);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const value = argDef.default === false ? true :
|
||||||
|
argDef.default === true ? false :
|
||||||
|
queue.splice(queue.findIndex(q => q[0] != '-'), 1)[0] ||
|
||||||
|
argDef.default;
|
||||||
|
if(value == null) parsed['_error'].push(`Option missing value: ${argDef.name || combined[0]}`);
|
||||||
|
parsed[argDef.name] = value;
|
||||||
|
} else { // Command
|
||||||
|
const c = this.commands.find(command => command.name == arg);
|
||||||
|
if(!!c) {
|
||||||
|
const parsedCommand = c.parse(queue.splice(0, queue.length));
|
||||||
|
Object.keys(parsedCommand).forEach(key => {
|
||||||
|
if(parsed[key] != parsedCommand[key] && parsedCommand[key] == c.defaults[key])
|
||||||
|
delete parsedCommand[key];
|
||||||
|
});
|
||||||
|
parsed = {
|
||||||
|
...parsed,
|
||||||
|
...parsedCommand,
|
||||||
|
_command: c.name
|
||||||
|
};
|
||||||
|
} else extras.push(arg); // Not found, add to extras
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Arguments
|
||||||
|
this.args.filter(arg => !arg.extras).forEach(arg => {
|
||||||
|
if(!arg.optional && !extras.length) parsed['_error'].push(`Argument missing: ${arg.name.toUpperCase()}`);
|
||||||
|
if(extras.length) parsed[arg.name] = extras.splice(0, 1)[0];
|
||||||
|
});
|
||||||
|
// Extras
|
||||||
|
const extraKey = this.args.find(arg => arg.extras)?.name || '_extra';
|
||||||
|
parsed[extraKey] = extras;
|
||||||
|
return parsed;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create help message from the provided description & argument list.
|
||||||
|
*
|
||||||
|
* @returns {string} Help message
|
||||||
|
* @param opts Help options: command - display a commands help, message - override help description
|
||||||
|
*/
|
||||||
|
help(opts: {command?: string, message?: string} = {}): string {
|
||||||
|
const spacer = (text: string) => Array(24 - text.length || 1).fill(' ').join('');
|
||||||
|
|
||||||
|
// Help with specific command
|
||||||
|
if(opts.command) {
|
||||||
|
const argParser = this.commands.find(parser => parser.name == opts.command);
|
||||||
|
if(!argParser) throw new Error(`${opts.command.toUpperCase()} is not a command`)
|
||||||
|
return argParser.help({...opts, command: undefined});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Description
|
||||||
|
let msg = `\n\n${opts.message || this.desc}`;
|
||||||
|
// Examples
|
||||||
|
msg += '\n\nUsage:\t' + this.examples.map(ex => `run ${this.name} ${ex}`).join('\n\t\t');
|
||||||
|
// Arguments
|
||||||
|
if(this.args.length) msg += '\n\n\t\t' + this.args.map(arg =>
|
||||||
|
`${arg.name.toUpperCase()}${spacer(arg.name)}${arg.desc}`).join('\n\t\t');
|
||||||
|
// Flags
|
||||||
|
msg += '\n\nOptions:\n\t\t' + this.flags.map(flag => {
|
||||||
|
const flags = flag.flags?.join(', ') || '';
|
||||||
|
return `${flags}${spacer(flags)}${flag.desc}`;
|
||||||
|
}).join('\n\t\t');
|
||||||
|
// Commands
|
||||||
|
if(this.commands.length) msg += '\n\nCommands:\n\t\t' + this.commands.map(command =>
|
||||||
|
`${command.name}${spacer(command.name)}${command.desc}`).join('\n\t\t');
|
||||||
|
return `${msg}\n\n`;
|
||||||
|
}
|
||||||
|
}
|
||||||
52
src/csv.ts
52
src/csv.ts
@ -1,4 +1,41 @@
|
|||||||
import {dotNotation, flattenObj} from './objects.ts';
|
import {ASet} from './aset.ts';
|
||||||
|
import {dotNotation, flattenObj, JSONSanitize} from './objects.ts';
|
||||||
|
import {LETTER_LIST} from './string.ts';
|
||||||
|
|
||||||
|
export function fromCsv<T = any>(csv: string, hasHeaders=true): T[] {
|
||||||
|
const row = csv.split('\n');
|
||||||
|
let headers: any = hasHeaders ? row.splice(0, 1)[0] : null;
|
||||||
|
if(headers) headers = headers.match(/(?:[^,"']+|"[^"]*"|'[^']*')+/g);
|
||||||
|
return <T[]>row.map(r => {
|
||||||
|
function parseLine(line: string): (string | null)[] {
|
||||||
|
const parts = line.split(','), columns: string[] = [];
|
||||||
|
let quoted = false;
|
||||||
|
for(const p of parts) {
|
||||||
|
if(quoted) columns[columns.length - 1] = columns.at(-1) + ',' + p;
|
||||||
|
else columns.push(p);
|
||||||
|
if(/[^"]"$/g.test(p)) {
|
||||||
|
quoted = false;
|
||||||
|
} else if(/^"[^"]/g.test(p)) {
|
||||||
|
quoted = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return columns;
|
||||||
|
}
|
||||||
|
|
||||||
|
const props = parseLine(r);
|
||||||
|
const h = headers || (Array(props.length).fill(null).map((r, i) => {
|
||||||
|
let letter = '';
|
||||||
|
const first = i / 26;
|
||||||
|
if(first > 1) letter += LETTER_LIST[Math.floor(first - 1)];
|
||||||
|
letter += LETTER_LIST[i % 26];
|
||||||
|
return letter;
|
||||||
|
}));
|
||||||
|
return h.reduce((acc: any, h: any, i: number) => {
|
||||||
|
dotNotation(acc, h, props[i]);
|
||||||
|
return acc;
|
||||||
|
}, {});
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert an object to a CSV string
|
* Convert an object to a CSV string
|
||||||
@ -7,20 +44,13 @@ import {dotNotation, flattenObj} from './objects.ts';
|
|||||||
* @param {boolean} flatten Should nested object be flattened or treated as values
|
* @param {boolean} flatten Should nested object be flattened or treated as values
|
||||||
* @return {string} CSV string
|
* @return {string} CSV string
|
||||||
*/
|
*/
|
||||||
export function csv(target: any[], flatten=true) {
|
export function toCsv(target: any[], flatten=true) {
|
||||||
const headers = target.reduce((acc, row) => {
|
const headers = new ASet(target.reduce((acc, row) => [...acc, ...Object.keys(flatten ? flattenObj(row) : row)], []));
|
||||||
Object.keys(flatten ? flattenObj(row) : row)
|
|
||||||
.forEach(key => { if(!acc.includes(key)) acc.push(key); });
|
|
||||||
return acc;
|
|
||||||
}, []);
|
|
||||||
return [
|
return [
|
||||||
headers.join(','),
|
headers.join(','),
|
||||||
...target.map(row => headers.map((h: string) => {
|
...target.map(row => headers.map((h: string) => {
|
||||||
const value = dotNotation<any>(row, h);
|
const value = dotNotation<any>(row, h);
|
||||||
const type = typeof value;
|
return (typeof value == 'object' && value != null) ? '"' + JSONSanitize(value).replaceAll('"', '""') + '"' : value;
|
||||||
if(type == 'string' && value.includes(',')) return `"${value}"`;
|
|
||||||
if(type == 'object') return `"${JSON.stringify(value)}"`;
|
|
||||||
return value;
|
|
||||||
}).join(','))
|
}).join(','))
|
||||||
].join('\n');
|
].join('\n');
|
||||||
}
|
}
|
||||||
|
|||||||
15
src/files.ts
15
src/files.ts
@ -52,6 +52,21 @@ export function fileBrowser(options: {accept?: string, multiple?: boolean} = {})
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extract text from a file
|
||||||
|
*
|
||||||
|
* @param file File to extract text from
|
||||||
|
* @return {Promise<string | null>} File contents
|
||||||
|
*/
|
||||||
|
export function fileText(file: any): Promise<string | null> {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
const reader = new FileReader();
|
||||||
|
reader.onload = () => resolve(<string>reader.result);
|
||||||
|
reader.onerror = () => reject(reader.error);
|
||||||
|
reader.readAsText(file);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create timestamp intended for filenames from a date
|
* Create timestamp intended for filenames from a date
|
||||||
*
|
*
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
|
export * from './arg-parser';
|
||||||
export * from './array';
|
export * from './array';
|
||||||
export * from './aset';
|
export * from './aset';
|
||||||
export * from './cache';
|
export * from './cache';
|
||||||
@ -13,6 +14,7 @@ export * from './misc';
|
|||||||
export * from './objects';
|
export * from './objects';
|
||||||
export * from './path-events';
|
export * from './path-events';
|
||||||
export * from './promise-progress';
|
export * from './promise-progress';
|
||||||
|
export * from './search';
|
||||||
export * from './string';
|
export * from './string';
|
||||||
export * from './time';
|
export * from './time';
|
||||||
export * from './types';
|
export * from './types';
|
||||||
|
|||||||
@ -29,10 +29,10 @@ export function clean<T>(obj: T, undefinedOnly = false): Partial<T> {
|
|||||||
* Should be replaced by `structuredClone` once released.
|
* Should be replaced by `structuredClone` once released.
|
||||||
* @param {T} value Object to copy
|
* @param {T} value Object to copy
|
||||||
* @returns {T} Type
|
* @returns {T} Type
|
||||||
* @deprecated Please use `structuredClone`
|
|
||||||
*/
|
*/
|
||||||
export function deepCopy<T>(value: T): T {
|
export function deepCopy<T>(value: T): T {
|
||||||
return structuredClone(value);
|
try {return structuredClone(value); }
|
||||||
|
catch { return JSON.parse(JSONSanitize(value)); }
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -91,7 +91,6 @@ export function dotNotation<T>(obj: any, prop: string, set?: T): T | undefined {
|
|||||||
}, obj);
|
}, obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert object into URL encoded query string
|
* Convert object into URL encoded query string
|
||||||
*
|
*
|
||||||
@ -128,8 +127,9 @@ export function encodeQuery(data: any): string {
|
|||||||
export function flattenObj(obj: any, parent?: any, result: any = {}) {
|
export function flattenObj(obj: any, parent?: any, result: any = {}) {
|
||||||
if(typeof obj === "object" && !Array.isArray(obj)) {
|
if(typeof obj === "object" && !Array.isArray(obj)) {
|
||||||
for(const key of Object.keys(obj)) {
|
for(const key of Object.keys(obj)) {
|
||||||
const propName = parent ? parent + '.' + key : key;
|
const propName = parent ? `${parent}.${key}` : key;
|
||||||
if(typeof obj[key] === 'object') {
|
if(typeof obj[key] === 'object' && obj[key] != null && !Array.isArray(obj[key])) {
|
||||||
|
console.log(propName, );
|
||||||
flattenObj(obj[key], propName, result);
|
flattenObj(obj[key], propName, result);
|
||||||
} else {
|
} else {
|
||||||
result[propName] = obj[key];
|
result[propName] = obj[key];
|
||||||
@ -216,14 +216,25 @@ export function mixin(target: any, constructors: any[]) {
|
|||||||
/**
|
/**
|
||||||
* Parse JSON but return the original string if it fails
|
* Parse JSON but return the original string if it fails
|
||||||
*
|
*
|
||||||
* @param {string} json JSON string to parse
|
* @param {any} json JSON string to parse
|
||||||
* @return {string | T} Object if successful, original string otherwise
|
* @return {string | T} Object if successful, original string otherwise
|
||||||
*/
|
*/
|
||||||
export function JSONAttemptParse<T>(json: string): T | string {
|
export function JSONAttemptParse<T1, T2>(json: T2): T1 | T2 {
|
||||||
try { return JSON.parse(json); }
|
try { return JSON.parse(<any>json); }
|
||||||
catch { return json; }
|
catch { return json; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stringifies objects & skips primitives
|
||||||
|
*
|
||||||
|
* @param {any} obj Object to convert to serializable value
|
||||||
|
* @return {string | T} Serialized value
|
||||||
|
*/
|
||||||
|
export function JSONSerialize<T1>(obj: T1): T1 | string {
|
||||||
|
if(typeof obj == 'object' && obj != null) return JSONSanitize(obj);
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert an object to a JSON string avoiding any circular references.
|
* Convert an object to a JSON string avoiding any circular references.
|
||||||
*
|
*
|
||||||
@ -234,10 +245,8 @@ export function JSONAttemptParse<T>(json: string): T | string {
|
|||||||
export function JSONSanitize(obj: any, space?: number): string {
|
export function JSONSanitize(obj: any, space?: number): string {
|
||||||
let cache: any[] = [];
|
let cache: any[] = [];
|
||||||
return JSON.stringify(obj, (key, value) => {
|
return JSON.stringify(obj, (key, value) => {
|
||||||
if (typeof value === 'object' && value !== null) {
|
if(typeof value === 'object' && value !== null)
|
||||||
if (cache.includes(value)) return;
|
if(!cache.includes(value)) cache.push(value);
|
||||||
cache.push(value);
|
|
||||||
}
|
|
||||||
return value;
|
return value;
|
||||||
}, space);
|
}, space);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -25,7 +25,7 @@ export type Method = '*' | 'n' | 'c' | 'r' | 'u' | 'd' | 'x';
|
|||||||
* @param {string} args
|
* @param {string} args
|
||||||
* @return {PathEvent} Event object
|
* @return {PathEvent} Event object
|
||||||
*/
|
*/
|
||||||
export function PE(str: TemplateStringsArray, ...args: string[]) {
|
export function PE(str: TemplateStringsArray, ...args: any[]) {
|
||||||
const combined = [];
|
const combined = [];
|
||||||
for(let i = 0; i < str.length || i < args.length; i++) {
|
for(let i = 0; i < str.length || i < args.length; i++) {
|
||||||
if(str[i]) combined.push(str[i]);
|
if(str[i]) combined.push(str[i]);
|
||||||
@ -92,7 +92,7 @@ export class PathEvent {
|
|||||||
|
|
||||||
constructor(Event: string | PathEvent) {
|
constructor(Event: string | PathEvent) {
|
||||||
if(typeof Event == 'object') return Object.assign(this, Event);
|
if(typeof Event == 'object') return Object.assign(this, Event);
|
||||||
let [p, scope, method] = Event.split(':');
|
let [p, scope, method] = Event.replaceAll(/\/{2,}/g, '/').split(':');
|
||||||
if(!method) method = scope || '*';
|
if(!method) method = scope || '*';
|
||||||
if(p == '*' || !p && method == '*') {
|
if(p == '*' || !p && method == '*') {
|
||||||
p = '';
|
p = '';
|
||||||
|
|||||||
38
src/search.ts
Normal file
38
src/search.ts
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
import {dotNotation, JSONAttemptParse} from './objects';
|
||||||
|
|
||||||
|
export function search(rows: any[], search: string, regex?: boolean, transform: Function = (r: any) => r) {
|
||||||
|
if(!rows) return [];
|
||||||
|
return rows.filter(r => {
|
||||||
|
// Empty search
|
||||||
|
const value = transform(r);
|
||||||
|
if(!search) return true;
|
||||||
|
// Regex search
|
||||||
|
if(regex) {
|
||||||
|
return !!Object.values(value).filter((v: any) => {
|
||||||
|
try { return RegExp(search, 'gm').test(v.toString()); }
|
||||||
|
catch { return false; }
|
||||||
|
}).length
|
||||||
|
}
|
||||||
|
// Make sure at least one OR passes
|
||||||
|
const or = search.split('||').map(p => p.trim()).filter(p => !!p);
|
||||||
|
return -1 != or.findIndex(p => {
|
||||||
|
// Make sure all ANDs pass
|
||||||
|
const and = p.split('&&').map(p => p.trim()).filter(p => !!p);
|
||||||
|
return and.filter(p => {
|
||||||
|
// Boolean operator
|
||||||
|
const prop = /(\w+)\s*(==?|!=|>=|>|<=|<)\s*(\w+)/g.exec(p);
|
||||||
|
if(prop) {
|
||||||
|
const a = JSON.stringify(JSONAttemptParse(dotNotation<any>(value, prop[1])));
|
||||||
|
const operator = prop[2] == '=' ? '==' : prop[2];
|
||||||
|
const b = JSON.stringify(JSONAttemptParse(prop[3]));
|
||||||
|
return eval(`${a} ${operator} ${b}`);
|
||||||
|
}
|
||||||
|
// Case-sensitive
|
||||||
|
const v = Object.values(value).join('');
|
||||||
|
if(/[A-Z]/g.test(search)) return v.includes(p);
|
||||||
|
// Case-insensitive
|
||||||
|
return v.toLowerCase().includes(p);
|
||||||
|
}).length == and.length;
|
||||||
|
})
|
||||||
|
});
|
||||||
|
}
|
||||||
@ -1,24 +1,22 @@
|
|||||||
import {dotNotation, flattenObj} from './objects.ts';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* String of all letters
|
* String of all letters
|
||||||
*/
|
*/
|
||||||
const LETTER_LIST = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
|
export const LETTER_LIST = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* String of all numbers
|
* String of all numbers
|
||||||
*/
|
*/
|
||||||
const NUMBER_LIST = '0123456789';
|
export const NUMBER_LIST = '0123456789';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* String of all symbols
|
* String of all symbols
|
||||||
*/
|
*/
|
||||||
const SYMBOL_LIST = '~`!@#$%^&*()_-+={[}]|\\:;"\'<,>.?/';
|
export const SYMBOL_LIST = '~`!@#$%^&*()_-+={[}]|\\:;"\'<,>.?/';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* String of all letters, numbers & symbols
|
* String of all letters, numbers & symbols
|
||||||
*/
|
*/
|
||||||
const CHAR_LIST = LETTER_LIST + NUMBER_LIST + SYMBOL_LIST;
|
export const CHAR_LIST = LETTER_LIST + LETTER_LIST.toLowerCase() + NUMBER_LIST + SYMBOL_LIST;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert number of bytes into a human-readable size
|
* Convert number of bytes into a human-readable size
|
||||||
@ -44,7 +42,7 @@ export function formatBytes(bytes: number, decimals = 2) {
|
|||||||
export function formatPhoneNumber(number: string) {
|
export function formatPhoneNumber(number: string) {
|
||||||
const parts = /(\+?1)?.*?(\d{3}).*?(\d{3}).*?(\d{4})/g.exec(number);
|
const parts = /(\+?1)?.*?(\d{3}).*?(\d{3}).*?(\d{4})/g.exec(number);
|
||||||
if(!parts) throw new Error(`Number cannot be parsed: ${number}`);
|
if(!parts) throw new Error(`Number cannot be parsed: ${number}`);
|
||||||
return `${parts[1] ?? ''} (${parts[2]}) ${parts[3]}-${parts[4]}`.trim();
|
return `${parts[1] ? '+1' : ''} (${parts[2]}) ${parts[3]}-${parts[4]}`.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -60,6 +58,7 @@ export function formatPhoneNumber(number: string) {
|
|||||||
* @param {string} str - Value that will be injected to parent
|
* @param {string} str - Value that will be injected to parent
|
||||||
* @param {number} index - Position to inject string at
|
* @param {number} index - Position to inject string at
|
||||||
* @returns {string} - New string
|
* @returns {string} - New string
|
||||||
|
* @deprecated use `strSplice()`
|
||||||
*/
|
*/
|
||||||
export function insertAt(target: string, str: string, index: number): String {
|
export function insertAt(target: string, str: string, index: number): String {
|
||||||
return `${target.slice(0, index)}${str}${target.slice(index + 1)}`;
|
return `${target.slice(0, index)}${str}${target.slice(index + 1)}`;
|
||||||
@ -150,6 +149,21 @@ export function randomStringBuilder(length: number, letters = false, numbers = f
|
|||||||
}).join('');
|
}).join('');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Splice a string together (Similar to Array.splice)
|
||||||
|
*
|
||||||
|
* @param {string} str String that will be modified
|
||||||
|
* @param {number} start Start index of splice
|
||||||
|
* @param {number} deleteCount Number of characters to remove in splice
|
||||||
|
* @param {string} insert Insert new string into splice
|
||||||
|
* @return {string} Returned spliced string
|
||||||
|
*/
|
||||||
|
export function strSplice(str: string, start: number, deleteCount: number, insert = '') {
|
||||||
|
const before = str.slice(0, start);
|
||||||
|
const after = str.slice(start + deleteCount);
|
||||||
|
return before + insert + after;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Find all substrings that match a given pattern.
|
* Find all substrings that match a given pattern.
|
||||||
*
|
*
|
||||||
@ -195,6 +209,7 @@ export type ParsedUrl = {
|
|||||||
*
|
*
|
||||||
* @param {string} url URL string that will be parsed
|
* @param {string} url URL string that will be parsed
|
||||||
* @returns {RegExpExecArray} Parts of URL
|
* @returns {RegExpExecArray} Parts of URL
|
||||||
|
* @deprecated Use built-in URL object: `new URL('...')`;
|
||||||
*/
|
*/
|
||||||
export function parseUrl(url: string): ParsedUrl {
|
export function parseUrl(url: string): ParsedUrl {
|
||||||
const processed = new RegExp(
|
const processed = new RegExp(
|
||||||
|
|||||||
161
src/time.ts
161
src/time.ts
@ -21,19 +21,164 @@ export function adjustedInterval(cb: Function, ms: number) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return date formated highest to lowest: YYYY-MM-DD H:mm AM
|
* Format date
|
||||||
*
|
*
|
||||||
* @param {Date | number | string} date Date or timestamp to convert to string
|
* @param {Date | number | string} date Date or timestamp to convert to string
|
||||||
|
* @param {string} format How date string will be formatted, default: `YYYY-MM-DD H:mm A`
|
||||||
|
* @param tz Override timezone, can be either string or number
|
||||||
* @return {string} Formated date
|
* @return {string} Formated date
|
||||||
*/
|
*/
|
||||||
export function formatDate(date: Date | number | string): string {
|
export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:mm', tz?: string | number): string {
|
||||||
|
const timezones = [
|
||||||
|
['IDLW', -12],
|
||||||
|
['SST', -11],
|
||||||
|
['HST', -10],
|
||||||
|
['AKST', -9],
|
||||||
|
['PST', -8],
|
||||||
|
['MST', -7],
|
||||||
|
['CST', -6],
|
||||||
|
['EST', -5],
|
||||||
|
['AST', -4],
|
||||||
|
['BRT', -3],
|
||||||
|
['MAT', -2],
|
||||||
|
['AZOT', -1],
|
||||||
|
['UTC', 0],
|
||||||
|
['CET', 1],
|
||||||
|
['EET', 2],
|
||||||
|
['MSK', 3],
|
||||||
|
['AST', 4],
|
||||||
|
['PKT', 5],
|
||||||
|
['IST', 5.5],
|
||||||
|
['BST', 6],
|
||||||
|
['ICT', 7],
|
||||||
|
['CST', 8],
|
||||||
|
['JST', 9],
|
||||||
|
['AEST', 10],
|
||||||
|
['SBT', 11],
|
||||||
|
['FJT', 12],
|
||||||
|
['TOT', 13],
|
||||||
|
['LINT', 14]
|
||||||
|
];
|
||||||
|
|
||||||
|
function adjustTz(date: Date, gmt: number) {
|
||||||
|
const currentOffset = date.getTimezoneOffset();
|
||||||
|
const adjustedOffset = gmt * 60;
|
||||||
|
return new Date(date.getTime() + (adjustedOffset + currentOffset) * 60000);
|
||||||
|
}
|
||||||
|
|
||||||
|
function day(num: number): string {
|
||||||
|
switch(num) {
|
||||||
|
case(0): return 'Sunday';
|
||||||
|
case(1): return 'Monday';
|
||||||
|
case(2): return 'Tuesday';
|
||||||
|
case(3): return 'Wednesday';
|
||||||
|
case(4): return 'Thursday';
|
||||||
|
case(5): return 'Friday';
|
||||||
|
case(6): return 'Saturday';
|
||||||
|
default: return 'Unknown';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function doy(date: Date) {
|
||||||
|
const start = new Date(`${date.getFullYear()}-01-01 0:00:00`);
|
||||||
|
return Math.ceil((date.getTime() - start.getTime()) / (1000 * 60 * 60 * 24));
|
||||||
|
}
|
||||||
|
|
||||||
|
function month(num: number): string {
|
||||||
|
switch(num) {
|
||||||
|
case(0): return 'January';
|
||||||
|
case(1): return 'February';
|
||||||
|
case(2): return 'March';
|
||||||
|
case(3): return 'April';
|
||||||
|
case(4): return 'May';
|
||||||
|
case(5): return 'June';
|
||||||
|
case(6): return 'July';
|
||||||
|
case(7): return 'August';
|
||||||
|
case(8): return 'September';
|
||||||
|
case(9): return 'October';
|
||||||
|
case(10): return 'November';
|
||||||
|
case(11): return 'December';
|
||||||
|
default: return 'Unknown';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function suffix(num: number) {
|
||||||
|
let n = num.toString();
|
||||||
|
switch(n.at(-1)) {
|
||||||
|
case('1'): return num + 'st';
|
||||||
|
case('2'): return num + 'nd';
|
||||||
|
case('3'): return num + 'rd';
|
||||||
|
default: return num + 'th';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function tzOffset(offset: number) {
|
||||||
|
const hours = ~~(offset / 60);
|
||||||
|
const minutes = offset % 60;
|
||||||
|
return (offset > 0 ? '-' : '') + `${hours}:${minutes.toString().padStart(2, '0')}`;
|
||||||
|
}
|
||||||
|
|
||||||
if(typeof date == 'number' || typeof date == 'string') date = new Date(date);
|
if(typeof date == 'number' || typeof date == 'string') date = new Date(date);
|
||||||
let hours = date.getHours(), postfix = 'AM';
|
|
||||||
if(hours >= 12) {
|
// Handle timezones
|
||||||
if(hours > 12) hours -= 12;
|
let t!: [string, number];
|
||||||
postfix = 'PM';
|
if(tz == null) tz = -(date.getTimezoneOffset() / 60);
|
||||||
} else if(hours == 0) hours = 12;
|
t = <any>timezones.find(t => isNaN(<any>tz) ? t[0] == tz : t[1] == tz);
|
||||||
return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}, ${hours}:${date.getMinutes().toString().padStart(2, '0')} ${postfix}`;
|
if(!t) throw new Error(`Unknown timezone: ${tz}`);
|
||||||
|
date = adjustTz(date, t[1]);
|
||||||
|
|
||||||
|
return format
|
||||||
|
// Year
|
||||||
|
.replaceAll('YYYY', date.getFullYear().toString())
|
||||||
|
.replaceAll('YY', date.getFullYear().toString().slice(2))
|
||||||
|
// Month
|
||||||
|
.replaceAll('MMMM', month(date.getMonth()))
|
||||||
|
.replaceAll('MMM', month(date.getMonth()).slice(0, 3))
|
||||||
|
.replaceAll('MM', (date.getMonth() + 1).toString().padStart(2, '0'))
|
||||||
|
.replaceAll('M', (date.getMonth() + 1).toString())
|
||||||
|
// Day
|
||||||
|
.replaceAll('DDD', doy(date).toString())
|
||||||
|
.replaceAll('DD', date.getDate().toString().padStart(2, '0'))
|
||||||
|
.replaceAll('Do', suffix(date.getDate()))
|
||||||
|
.replaceAll('D', date.getDate().toString())
|
||||||
|
.replaceAll('dddd', day(date.getDay()))
|
||||||
|
.replaceAll('ddd', day(date.getDay()).slice(0, 2))
|
||||||
|
.replaceAll('dd', date.getDate().toString().padStart(2, '0'))
|
||||||
|
.replaceAll('d', date.getDay().toString())
|
||||||
|
// Hour
|
||||||
|
.replaceAll('HH', date.getHours().toString().padStart(2, '0'))
|
||||||
|
.replaceAll('H', date.getHours().toString())
|
||||||
|
.replaceAll('hh', (date.getHours() > 12 ? date.getHours() - 12 : date.getHours()).toString().padStart(2, '0'))
|
||||||
|
.replaceAll('h', (date.getHours() > 12 ? date.getHours() - 12 : date.getHours()).toString())
|
||||||
|
// Minute
|
||||||
|
.replaceAll('mm', date.getMinutes().toString().padStart(2, '0'))
|
||||||
|
.replaceAll('m', date.getMinutes().toString())
|
||||||
|
// Second
|
||||||
|
.replaceAll('ss', date.getSeconds().toString().padStart(2, '0'))
|
||||||
|
.replaceAll('s', date.getSeconds().toString())
|
||||||
|
// Millisecond
|
||||||
|
.replaceAll('SSS', date.getMilliseconds().toString().padEnd(3, '0'))
|
||||||
|
.replaceAll('SS', date.getMilliseconds().toString().slice(0, 1).padEnd(2, '0'))
|
||||||
|
.replaceAll('S', date.getMilliseconds().toString()[0])
|
||||||
|
// Period/Meridian (AM/PM)
|
||||||
|
.replaceAll('A', date.getHours() >= 12 ? 'PM' : 'AM')
|
||||||
|
.replaceAll('a', date.getHours() >= 12 ? 'pm' : 'am')
|
||||||
|
// Timezone
|
||||||
|
.replaceAll('ZZ', tzOffset(t[1] * 60).replace(':', ''))
|
||||||
|
.replaceAll('Z', tzOffset(t[1] * 60))
|
||||||
|
.replaceAll('z', typeof tz == 'string' ? tz : (<any>t)[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run a function immediately & repeat every x ms
|
||||||
|
*
|
||||||
|
* @param {() => any} fn Callback function
|
||||||
|
* @param {number} interval Repeat in ms
|
||||||
|
* @return {number} Clear Interval ID
|
||||||
|
*/
|
||||||
|
export function instantInterval(fn: () => any, interval: number) {
|
||||||
|
fn();
|
||||||
|
return setInterval(fn, interval);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -15,6 +15,6 @@
|
|||||||
*
|
*
|
||||||
* @return {Array<keyof T>} Available keys
|
* @return {Array<keyof T>} Available keys
|
||||||
*/
|
*/
|
||||||
export function tyoeKeys<T extends object>() {
|
export function typeKeys<T extends object>() {
|
||||||
return Object.keys(<T>{}) as Array<keyof T>;
|
return Object.keys(<T>{}) as Array<keyof T>;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user