Compare commits

..

16 Commits

Author SHA1 Message Date
9a0f32323e Fix HTTP empty responses
All checks were successful
Build / Build NPM Project (push) Successful in 37s
Build / Tag Version (push) Successful in 8s
Build / Publish Documentation (push) Successful in 34s
2025-04-13 10:16:50 -04:00
f952abc95a More zelous path fixing in the http client
All checks were successful
Build / Build NPM Project (push) Successful in 1m13s
Build / Tag Version (push) Successful in 14s
Build / Publish Documentation (push) Successful in 51s
2025-04-13 09:50:19 -04:00
21fc1378b8 Added more naming convention utilities
All checks were successful
Build / Build NPM Project (push) Successful in 42s
Build / Tag Version (push) Successful in 7s
Build / Publish Documentation (push) Successful in 38s
2025-04-08 19:02:42 -04:00
a03567eba3 toCSV comma fix
All checks were successful
Build / Build NPM Project (push) Successful in 1m15s
Build / Tag Version (push) Successful in 13s
Build / Publish Documentation (push) Successful in 50s
2025-04-06 21:37:01 -04:00
f9fc4fb7ff Better CSV handling
All checks were successful
Build / Build NPM Project (push) Successful in 38s
Build / Tag Version (push) Successful in 7s
Build / Publish Documentation (push) Successful in 35s
2025-03-24 23:01:57 -04:00
ff16f3bf9b Better CSV handling
All checks were successful
Build / Build NPM Project (push) Successful in 38s
Build / Tag Version (push) Successful in 8s
Build / Publish Documentation (push) Successful in 36s
2025-03-24 21:40:03 -04:00
e0085ecb6f Better CSV handling
All checks were successful
Build / Build NPM Project (push) Successful in 1m15s
Build / Tag Version (push) Successful in 16s
Build / Publish Documentation (push) Successful in 53s
2025-03-24 21:28:51 -04:00
1c2c18b65d Added camelCase function
All checks were successful
Build / Build NPM Project (push) Successful in 1m12s
Build / Tag Version (push) Successful in 12s
Build / Publish Documentation (push) Successful in 50s
2025-03-10 09:50:16 -04:00
cd5741d6ab Simplified timestampedFilename to use formatDate
All checks were successful
Build / Build NPM Project (push) Successful in 43s
Build / Tag Version (push) Successful in 7s
Build / Publish Documentation (push) Successful in 45s
2025-03-02 21:37:48 -05:00
5b9e0714ce Cache returns deep copies to prevent deletion mid-use
All checks were successful
Build / Build NPM Project (push) Successful in 1m13s
Build / Tag Version (push) Successful in 17s
Build / Publish Documentation (push) Successful in 54s
2025-02-27 08:36:30 -05:00
a3b34ef03f Fixed http no decode
All checks were successful
Build / Build NPM Project (push) Successful in 43s
Build / Tag Version (push) Successful in 8s
Build / Publish Documentation (push) Successful in 40s
2025-02-18 16:04:18 -05:00
f755d8f5b8 Fixed PathEvents filter
All checks were successful
Build / Build NPM Project (push) Successful in 38s
Build / Tag Version (push) Successful in 7s
Build / Publish Documentation (push) Successful in 35s
2025-02-04 22:17:31 -05:00
35c471eef4 Fixed PathEvents filter
All checks were successful
Build / Build NPM Project (push) Successful in 1m12s
Build / Tag Version (push) Successful in 12s
Build / Publish Documentation (push) Successful in 47s
2025-02-04 21:35:31 -05:00
fe9fdb9384 Fixed blackorwhite invalid argument crash
All checks were successful
Build / Build NPM Project (push) Successful in 38s
Build / Tag Version (push) Successful in 8s
Build / Publish Documentation (push) Successful in 40s
2025-02-03 14:20:18 -05:00
a5d7a35fdc Fixed formatDate
All checks were successful
Build / Build NPM Project (push) Successful in 42s
Build / Tag Version (push) Successful in 9s
Build / Publish Documentation (push) Successful in 38s
2025-01-08 14:21:14 -05:00
cb117273a7 Fixed path-event filter
All checks were successful
Build / Build NPM Project (push) Successful in 39s
Build / Tag Version (push) Successful in 8s
Build / Publish Documentation (push) Successful in 36s
2024-12-27 22:20:27 -05:00
10 changed files with 194 additions and 148 deletions

View File

@ -6,31 +6,10 @@
</head> </head>
<body> <body>
<script type="module"> <script type="module">
import {ArgParser} from './dist/index.mjs'; import {PathEvent} from './dist/index.mjs';
const hostname = 'test'; console.log(PathEvent.filter(['payments/ztimson:cr', 'logs/momentum:c', 'data/Testing:r'], 'data'));
const argParser = new ArgParser('botnet-manager.js', 'Connect & manage a network of servers to launch distributed attacks.', [ console.log(PathEvent.filter(['data/Submissions/Test:r'], 'data/Submissions/Test/test.html'));
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>

View File

@ -1,6 +1,6 @@
{ {
"name": "@ztimson/utils", "name": "@ztimson/utils",
"version": "0.23.6", "version": "0.23.22",
"description": "Utility library", "description": "Utility library",
"author": "Zak Timson", "author": "Zak Timson",
"license": "MIT", "license": "MIT",
@ -14,9 +14,9 @@
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",
"exports": { "exports": {
".": { ".": {
"types": "./dist/index.d.ts",
"import": "./dist/index.mjs", "import": "./dist/index.mjs",
"require": "./dist/index.cjs", "require": "./dist/index.cjs"
"types": "./dist/index.d.ts"
} }
}, },
"scripts": { "scripts": {
@ -34,7 +34,7 @@
"typedoc": "^0.26.7", "typedoc": "^0.26.7",
"typescript": "^5.3.3", "typescript": "^5.3.3",
"vite": "^5.0.12", "vite": "^5.0.12",
"vite-plugin-dts": "^3.7.2" "vite-plugin-dts": "^4.5.3"
}, },
"files": [ "files": [
"dist" "dist"

View File

@ -1,3 +1,5 @@
import {deepCopy} from './objects.ts';
export type CacheOptions = { export type CacheOptions = {
/** Delete keys automatically after x amount of seconds */ /** Delete keys automatically after x amount of seconds */
ttl?: number; ttl?: number;
@ -36,12 +38,12 @@ export class Cache<K extends string | number | symbol, T> {
} }
return new Proxy(this, { return new Proxy(this, {
get: (target: this, prop: string | symbol) => { get: (target: this, prop: string | symbol) => {
if (prop in target) return (target as any)[prop]; if(prop in target) return (target as any)[prop];
return target.store[prop as K]; return deepCopy(target.store[prop as K]);
}, },
set: (target: this, prop: string | symbol, value: any) => { set: (target: this, prop: string | symbol, value: any) => {
if (prop in target) (target as any)[prop] = value; if(prop in target) (target as any)[prop] = value;
else target.store[prop as K] = value; else this.set(prop as K, value);
return true; return true;
} }
}); });
@ -58,7 +60,7 @@ export class Cache<K extends string | number | symbol, T> {
* @return {T[]} Array of items * @return {T[]} Array of items
*/ */
all(): T[] { all(): T[] {
return Object.values(this.store); return deepCopy(Object.values(this.store));
} }
/** /**
@ -119,7 +121,7 @@ export class Cache<K extends string | number | symbol, T> {
* @return {T} Cached item * @return {T} Cached item
*/ */
get(key: K): T { get(key: K): T {
return this.store[key]; return deepCopy(this.store[key]);
} }
/** /**
@ -137,7 +139,7 @@ export class Cache<K extends string | number | symbol, T> {
* @return {Record<K, T>} * @return {Record<K, T>}
*/ */
map(): Record<K, T> { map(): Record<K, T> {
return structuredClone(this.store); return deepCopy(this.store);
} }
/** /**

View File

@ -4,7 +4,7 @@
* @return {"white" | "black"} Color with the most contrast * @return {"white" | "black"} Color with the most contrast
*/ */
export function blackOrWhite(background: string): 'white' | 'black' { export function blackOrWhite(background: string): 'white' | 'black' {
const exploded = background.match(background.length >= 6 ? /\w\w/g : /\w/g); const exploded = background?.match(background.length >= 6 ? /\w\w/g : /\w/g);
if(!exploded) return 'black'; if(!exploded) return 'black';
const [r, g, b] = exploded.map(hex => parseInt(hex, 16)); const [r, g, b] = exploded.map(hex => parseInt(hex, 16));
const luminance = (0.299 * r + 0.587 * g + 0.114 * b) / 255; const luminance = (0.299 * r + 0.587 * g + 0.114 * b) / 255;

View File

@ -1,32 +1,59 @@
import {makeArray} from './array.ts';
import {ASet} from './aset.ts'; import {ASet} from './aset.ts';
import {dotNotation, flattenObj, JSONSanitize} from './objects.ts'; import {dotNotation, flattenObj, JSONSanitize} from './objects.ts';
import {LETTER_LIST} from './string.ts'; import {LETTER_LIST} from './string.ts';
export function fromCsv<T = any>(csv: string, hasHeaders=true): T[] { /**
const row = csv.split('\n'); * Parse a CSV string into an array of objects
let headers: any = hasHeaders ? row.splice(0, 1)[0] : null; *
if(headers) headers = headers.match(/(?:[^,"']+|"[^"]*"|'[^']*')+/g); * @param csv String with CSV
return <T[]>row.map(r => { * @param hasHeaders First line of CSV contains headers
function parseLine(line: string): (string | null)[] { * @return {T[]} Array of parsed objects
const parts = line.split(','), columns: string[] = []; */
let quoted = false; export function fromCsv<T = any>(csv: string, hasHeaders = true): T[] {
for(const p of parts) { function parseLine(line: string): (string | null)[] {
if(quoted) columns[columns.length - 1] = columns.at(-1) + ',' + p; const columns: string[] = [];
else columns.push(p); let current = '', inQuotes = false;
if(/[^"]"$/g.test(p)) { for (let i = 0; i < line.length; i++) {
quoted = false; const char = line[i];
} else if(/^"[^"]/g.test(p)) { const nextChar = line[i + 1];
quoted = true; if (char === '"') {
} if (inQuotes && nextChar === '"') {
} current += '"'; // Handle escaped quotes
return columns; i++;
} else inQuotes = !inQuotes;
} else if (char === ',' && !inQuotes) {
columns.push(current.trim()); // Trim column values
current = '';
} else current += char;
} }
columns.push(current.trim()); // Trim last column value
return columns.map(col => col.replace(/^"|"$/g, '').replace(/""/g, '"'));
}
// Normalize line endings and split rows
const rows = [];
let currentRow = '', inQuotes = false;
for (const char of csv.replace(/\r\n/g, '\n')) { // Normalize \r\n to \n
if (char === '"') inQuotes = !inQuotes;
if (char === '\n' && !inQuotes) {
rows.push(currentRow.trim()); // Trim row
currentRow = '';
} else currentRow += char;
}
if (currentRow) rows.push(currentRow.trim()); // Trim last row
// Extract headers
let headers: any = hasHeaders ? rows.splice(0, 1)[0] : null;
if (headers) headers = headers.match(/(?:[^,"']+|"(?:[^"]|"")*"|'(?:[^']|'')*')+/g)?.map((h: any) => h.trim());
// Parse rows
return <T[]>rows.map(r => {
const props = parseLine(r); const props = parseLine(r);
const h = headers || (Array(props.length).fill(null).map((r, i) => { const h = headers || (Array(props.length).fill(null).map((_, i) => {
let letter = ''; let letter = '';
const first = i / 26; const first = i / 26;
if(first > 1) letter += LETTER_LIST[Math.floor(first - 1)]; if (first > 1) letter += LETTER_LIST[Math.floor(first - 1)];
letter += LETTER_LIST[i % 26]; letter += LETTER_LIST[i % 26];
return letter; return letter;
})); }));
@ -34,23 +61,28 @@ export function fromCsv<T = any>(csv: string, hasHeaders=true): T[] {
dotNotation(acc, h, props[i]); dotNotation(acc, h, props[i]);
return acc; return acc;
}, {}); }, {});
}) });
} }
/** /**
* Convert an object to a CSV string * Convert an array of objects to a CSV string
* *
* @param {any[]} target Array of objects to create CSV from * @param {any[]} target Array of objects to create CSV from
* @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 toCsv(target: any[], flatten=true) { export function toCsv(target: any, flatten=true) {
const headers = new ASet(target.reduce((acc, row) => [...acc, ...Object.keys(flatten ? flattenObj(row) : row)], [])); const t = makeArray(target);
const headers = new ASet(t.reduce((acc, row) => [...acc, ...Object.keys(flatten ? flattenObj(row) : row)], []));
return [ return [
headers.join(','), headers.join(','),
...target.map(row => headers.map((h: string) => { ...t.map(row => headers.map((h: string) => {
const value = dotNotation<any>(row, h); const value = dotNotation<any>(row, h);
return (typeof value == 'object' && value != null) ? '"' + JSONSanitize(value).replaceAll('"', '""') + '"' : value; if(value == null) return '';
if(typeof value == 'object') return `"${JSONSanitize(value).replaceAll('"', '""')}"`;
if(typeof value == 'string' && /[\n",]/g.test(value)) return `"${value.replaceAll('"', '""')}"`;
return value;
}).join(',')) }).join(','))
].join('\n'); ].join('\n');
} }

View File

@ -1,6 +1,7 @@
import {makeArray} from './array.ts'; import {makeArray} from './array.ts';
import {JSONAttemptParse} from './objects.ts'; import {JSONAttemptParse} from './objects.ts';
import {PromiseProgress} from './promise-progress'; import {PromiseProgress} from './promise-progress';
import {formatDate} from './time.ts';
/** /**
* Download blob as a file * Download blob as a file
@ -76,7 +77,7 @@ export function fileText(file: any): Promise<string | null> {
*/ */
export function timestampFilename(name?: string, date: Date | number | string = new Date()) { export function timestampFilename(name?: string, date: Date | number | string = new Date()) {
if(typeof date == 'number' || typeof date == 'string') date = new Date(date); if(typeof date == 'number' || typeof date == 'string') date = new Date(date);
const timestamp = `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}_${date.getHours().toString().padStart(2, '0')}-${date.getMinutes().toString().padStart(2, '0')}-${date.getSeconds().toString().padStart(2, '0')}`; const timestamp = formatDate('YYYY-MM-DD_HH:mm:ss', date);
return name ? name.replace('{{TIMESTAMP}}', timestamp) : timestamp; return name ? name.replace('{{TIMESTAMP}}', timestamp) : timestamp;
} }

View File

@ -22,6 +22,28 @@ export type HttpDefaults = {
url?: string; url?: string;
} }
class HttpResponse<T = any> extends Response {
data?: T
ok!: boolean;
redirected!: boolean;
type!: ResponseType;
url!: string;
constructor(resp: Response, stream: ReadableStream) {
const body = [204, 205, 304].includes(resp.status) ? null : stream;
super(body, {
headers: resp.headers,
status: resp.status,
statusText: resp.statusText,
});
this.ok = resp.ok;
this.redirected = resp.redirected;
this.type = resp.type;
this.url = resp.url;
}
}
export class Http { export class Http {
private static interceptors: {[key: string]: HttpInterceptor} = {}; private static interceptors: {[key: string]: HttpInterceptor} = {};
@ -54,8 +76,9 @@ export class Http {
request<T>(opts: HttpRequestOptions = {}): PromiseProgress<DecodedResponse<T>> { request<T>(opts: HttpRequestOptions = {}): PromiseProgress<DecodedResponse<T>> {
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 || '')).replace(/([^:]\/)\/+/g, '$1'); let url = opts.url?.startsWith('http') ? opts.url : (this.url || '') + (opts.url || '');
if(opts.fragment) url.includes('#') ? url.replace(/#.*(\?|\n)/g, (match, arg1) => `#${opts.fragment}${arg1}`) : url += '#' + opts.fragment; url = url.replaceAll(/([^:]\/)\/+/g, '$1');
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]}))
@ -101,18 +124,17 @@ export class Http {
push(); push();
}).catch((error: any) => controller.error(error)); }).catch((error: any) => controller.error(error));
} }
push(); push();
} }
}); });
resp.data = new Response(stream); resp = new HttpResponse<T>(resp, stream);
if(opts.decode == null || opts.decode) { if(opts.decode !== false) {
const content = resp.headers.get('Content-Type')?.toLowerCase(); const content = resp.headers.get('Content-Type')?.toLowerCase();
if(content?.includes('form')) resp.data = <T>await resp.data.formData(); if(content?.includes('form')) resp.data = <T>await resp.formData();
else if(content?.includes('json')) resp.data = <T>await resp.data.json(); else if(content?.includes('json')) resp.data = <T>await resp.json();
else if(content?.includes('text')) resp.data = <T>await resp.data.text(); else if(content?.includes('text')) resp.data = <T>await resp.text();
else if(content?.includes('application')) resp.data = <T>await resp.data.blob(); else if(content?.includes('application')) resp.data = <T>await resp.blob();
} }
if(resp.ok) res(resp); if(resp.ok) res(resp);

View File

@ -142,8 +142,9 @@ export class PathEvent {
const parsedFind = makeArray(filter).map(pe => new PathEvent(pe)); const parsedFind = makeArray(filter).map(pe => new PathEvent(pe));
return parsedTarget.filter(t => { return parsedTarget.filter(t => {
if(!t.fullPath && t.all) return true; if(!t.fullPath && t.all) return true;
return !!parsedFind.find(f => t.fullPath.startsWith(f.fullPath) return !!parsedFind.find(f =>
&& (f.all || t.all || t.methods.intersection(f.methods).length)); (t.fullPath.startsWith(f.fullPath) || f.fullPath.startsWith(t.fullPath)) &&
(f.all || t.all || t.methods.intersection(f.methods).length));
}); });
} }

View File

@ -18,6 +18,14 @@ export const SYMBOL_LIST = '~`!@#$%^&*()_-+={[}]|\\:;"\'<,>.?/';
*/ */
export const CHAR_LIST = LETTER_LIST + LETTER_LIST.toLowerCase() + NUMBER_LIST + SYMBOL_LIST; export const CHAR_LIST = LETTER_LIST + LETTER_LIST.toLowerCase() + NUMBER_LIST + SYMBOL_LIST;
/**
* Converts text to camelCase
*/
export function camelCase(str?: string) {
const text = pascalCase(str);
return text[0].toLowerCase() + text.slice(1);
}
/** /**
* Convert number of bytes into a human-readable size * Convert number of bytes into a human-readable size
* *
@ -64,6 +72,17 @@ 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)}`;
} }
/**
* Converts text to kebab-case
*/
export function kebabCase(str: string) {
if(!str) return '';
return str.replaceAll(/(^[^a-zA-Z]+|[^a-zA-Z0-9-_])/g, '')
.replaceAll(/([A-Z]|[0-9]+)/g, (...args) => `-${args[0].toLowerCase()}`)
.replaceAll(/([0-9])([a-z])/g, (...args) => `${args[1]}-${args[2]}`)
.replaceAll(/[^a-z0-9]+(\w?)/g, (...args) => `-${args[1] ?? ''}`).toLowerCase();
}
/** /**
* Add padding to string * Add padding to string
* *
@ -86,6 +105,18 @@ export function pad(text: any, length: number, char: string = ' ', start = true)
return text.toString().padEnd(length, char); return text.toString().padEnd(length, char);
} }
/**
* Convert text to PascalCase
* @param {string} str
* @return {string}
*/
export function pascalCase(str?: string) {
if(!str) return '';
const text = str.replaceAll(/(^[^a-zA-Z]+|[^a-zA-Z0-9-_])/g, '')
.replaceAll(/[^a-zA-Z0-9]+(\w?)/g, (...args) => args[1]?.toUpperCase() || '');
return text[0].toUpperCase() + text.slice(1);
}
/** /**
* Generate a random hexadecimal value * Generate a random hexadecimal value
* *
@ -149,6 +180,17 @@ export function randomStringBuilder(length: number, letters = false, numbers = f
}).join(''); }).join('');
} }
/**
* Converts text to snake_case
*/
export function snakeCase(str?: string) {
if(!str) return '';
return str.replaceAll(/(^[^a-zA-Z]+|[^a-zA-Z0-9-_])/g, '')
.replaceAll(/([A-Z]|[0-9]+)/g, (...args) => `_${args[0].toLowerCase()}`)
.replaceAll(/([0-9])([a-z])/g, (...args) => `${args[1]}_${args[2]}`)
.replaceAll(/[^a-z0-9]+(\w?)/g, (...args) => `_${args[1] ?? ''}`).toLowerCase();
}
/** /**
* Splice a string together (Similar to Array.splice) * Splice a string together (Similar to Array.splice)
* *

View File

@ -23,12 +23,12 @@ export function adjustedInterval(cb: Function, ms: number) {
/** /**
* Format date * Format date
* *
* @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 {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 * @param {Date | number | string} date Date or timestamp, defaults to now
* @param tz Set timezone offset
* @return {string} Formated date * @return {string} Formated date
*/ */
export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:mm', tz?: string | number): string { export function formatDate(format = 'YYYY-MM-DD H:mm', date: Date | number | string = new Date(), tz?: string | number): string {
const timezones = [ const timezones = [
['IDLW', -12], ['IDLW', -12],
['SST', -11], ['SST', -11],
@ -67,16 +67,7 @@ export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:
} }
function day(num: number): string { function day(num: number): string {
switch(num) { return ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][num] || 'Unknown';
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) { function doy(date: Date) {
@ -85,30 +76,16 @@ export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:
} }
function month(num: number): string { function month(num: number): string {
switch(num) { return ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'][num] || 'Unknown';
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) { function suffix(num: number) {
let n = num.toString(); if (num % 100 >= 11 && num % 100 <= 13) return `${num}th`;
switch(n.at(-1)) { switch (num % 10) {
case('1'): return num + 'st'; case 1: return `${num}st`;
case('2'): return num + 'nd'; case 2: return `${num}nd`;
case('3'): return num + 'rd'; case 3: return `${num}rd`;
default: return num + 'th'; default: return `${num}th`;
} }
} }
@ -127,46 +104,36 @@ export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:
if(!t) throw new Error(`Unknown timezone: ${tz}`); if(!t) throw new Error(`Unknown timezone: ${tz}`);
date = adjustTz(date, t[1]); date = adjustTz(date, t[1]);
return format // Token mapping
// Year const tokens: Record<string, string> = {
.replaceAll('YYYY', date.getFullYear().toString()) 'YYYY': date.getFullYear().toString(),
.replaceAll('YY', date.getFullYear().toString().slice(2)) 'YY': date.getFullYear().toString().slice(2),
// Month 'MMMM': month(date.getMonth()),
.replaceAll('MMMM', month(date.getMonth())) 'MMM': month(date.getMonth()).slice(0, 3),
.replaceAll('MMM', month(date.getMonth()).slice(0, 3)) 'MM': (date.getMonth() + 1).toString().padStart(2, '0'),
.replaceAll('MM', (date.getMonth() + 1).toString().padStart(2, '0')) 'M': (date.getMonth() + 1).toString(),
.replaceAll('M', (date.getMonth() + 1).toString()) 'DDD': doy(date).toString(),
// Day 'DD': date.getDate().toString().padStart(2, '0'),
.replaceAll('DDD', doy(date).toString()) 'Do': suffix(date.getDate()),
.replaceAll('DD', date.getDate().toString().padStart(2, '0')) 'D': date.getDate().toString(),
.replaceAll('Do', suffix(date.getDate())) 'dddd': day(date.getDay()),
.replaceAll('D', date.getDate().toString()) 'ddd': day(date.getDay()).slice(0, 3),
.replaceAll('dddd', day(date.getDay())) 'HH': date.getHours().toString().padStart(2, '0'),
.replaceAll('ddd', day(date.getDay()).slice(0, 2)) 'H': date.getHours().toString(),
.replaceAll('dd', date.getDate().toString().padStart(2, '0')) 'hh': (date.getHours() % 12 || 12).toString().padStart(2, '0'),
.replaceAll('d', date.getDay().toString()) 'h': (date.getHours() % 12 || 12).toString(),
// Hour 'mm': date.getMinutes().toString().padStart(2, '0'),
.replaceAll('HH', date.getHours().toString().padStart(2, '0')) 'm': date.getMinutes().toString(),
.replaceAll('H', date.getHours().toString()) 'ss': date.getSeconds().toString().padStart(2, '0'),
.replaceAll('hh', (date.getHours() > 12 ? date.getHours() - 12 : date.getHours()).toString().padStart(2, '0')) 's': date.getSeconds().toString(),
.replaceAll('h', (date.getHours() > 12 ? date.getHours() - 12 : date.getHours()).toString()) 'SSS': date.getMilliseconds().toString().padStart(3, '0'),
// Minute 'A': date.getHours() >= 12 ? 'PM' : 'AM',
.replaceAll('mm', date.getMinutes().toString().padStart(2, '0')) 'a': date.getHours() >= 12 ? 'pm' : 'am',
.replaceAll('m', date.getMinutes().toString()) 'ZZ': tzOffset(t[1] * 60).replace(':', ''),
// Second 'Z': tzOffset(t[1] * 60),
.replaceAll('ss', date.getSeconds().toString().padStart(2, '0')) 'z': typeof tz == 'string' ? tz : (<any>t)[0]
.replaceAll('s', date.getSeconds().toString()) };
// Millisecond return format.replace(/YYYY|YY|MMMM|MMM|MM|M|DDD|DD|Do|D|dddd|ddd|HH|H|hh|h|mm|m|ss|s|SSS|A|a|ZZ|Z|z/g, token => tokens[token]);
.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]);
} }
/** /**