Simplified timestampedFilename to use formatDate

Cache returns deep copies to prevent deletion mid-use
Fixed http no decode
2025-03-02 21:37:48 -05:00 · 2025-02-27 08:36:30 -05:00 · 2025-02-18 16:04:18 -05:00 · 2025-02-04 22:17:31 -05:00 · 2025-02-04 21:35:31 -05:00 · 2025-02-03 14:20:18 -05:00
8 changed files with 82 additions and 117 deletions
--- a/index.html
+++ b/index.html
@ -6,31 +6,10 @@
 	</head>
 	<body>
 		<script type="module">
-			import {ArgParser} from './dist/index.mjs';
+			import {PathEvent} from './dist/index.mjs';

-			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({}));
+			console.log(PathEvent.filter(['payments/ztimson:cr', 'logs/momentum:c', 'data/Testing:r'], 'data'));
+			console.log(PathEvent.filter(['data/Submissions/Test:r'], 'data/Submissions/Test/test.html'));
 		</script>
 	</body>
 </html>
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.23.6",
+	"version": "0.23.14",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",
--- a/src/cache.ts
+++ b/src/cache.ts
@ -1,3 +1,5 @@
+import {deepCopy} from './objects.ts';
+
 export type CacheOptions = {
 	/** Delete keys automatically after x amount of seconds */
 	ttl?: number;
@ -37,11 +39,11 @@ export class Cache<K extends string | number | symbol, T> {
 		return new Proxy(this, {
 			get: (target: this, prop: string | symbol) => {
 				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) => {
 				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;
 			}
 		});
@ -58,7 +60,7 @@ export class Cache<K extends string | number | symbol, T> {
 	 * @return {T[]} Array of items
 	 */
 	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
 	 */
 	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>}
 	 */
 	map(): Record<K, T> {
-		return structuredClone(this.store);
+		return deepCopy(this.store);
 	}

 	/**
--- a/src/color.ts
+++ b/src/color.ts
@ -4,7 +4,7 @@
 * @return {"white" | "black"} Color with the most contrast
 */
 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';
 	const [r, g, b] = exploded.map(hex => parseInt(hex, 16));
 	const luminance = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
--- a/src/files.ts
+++ b/src/files.ts
@ -1,6 +1,7 @@
 import {makeArray} from './array.ts';
 import {JSONAttemptParse} from './objects.ts';
 import {PromiseProgress} from './promise-progress';
+import {formatDate} from './time.ts';

 /**
 * 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()) {
 	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;
 }

--- a/src/http.ts
+++ b/src/http.ts
@ -22,6 +22,22 @@ export type HttpDefaults = {
 	url?: string;
 }

+class HttpResponse<T = any> extends Response {
+	data?: T
+	ok!: boolean;
+	redirected!: boolean;
+	type!: ResponseType;
+	url!: string;
+
+	constructor(resp: Response, stream: ReadableStream) {
+		super(stream, {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 {
 	private static interceptors: {[key: string]: HttpInterceptor} = {};

@ -101,18 +117,17 @@ export class Http {
 									push();
 								}).catch((error: any) => controller.error(error));
 							}
-
 							push();
 						}
 					});

-					resp.data = new Response(stream);
-					if(opts.decode == null || opts.decode) {
+					resp = new HttpResponse<T>(resp, stream);
+					if(opts.decode !== false) {
 						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(content?.includes('form')) resp.data = <T>await resp.formData();
+						else if(content?.includes('json')) resp.data = <T>await resp.json();
+						else if(content?.includes('text')) resp.data = <T>await resp.text();
+						else if(content?.includes('application')) resp.data = <T>await resp.blob();
 					}

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

--- a/src/time.ts
+++ b/src/time.ts
@ -23,12 +23,12 @@ export function adjustedInterval(cb: Function, ms: number) {
 /**
 * 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 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
 */
-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 = [
 		['IDLW', -12],
 		['SST', -11],
@ -67,16 +67,7 @@ export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:
 	}

 	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';
-		}
+		return ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][num] || 'Unknown';
 	}

 	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 {
-		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';
-		}
+		return ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'][num] || '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';
+		if (num % 100 >= 11 && num % 100 <= 13) return `${num}th`;
+		switch (num % 10) {
+			case 1: return `${num}st`;
+			case 2: return `${num}nd`;
+			case 3: return `${num}rd`;
+			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}`);
 	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]);
+	// Token mapping
+	const tokens: Record<string, string> = {
+		'YYYY': date.getFullYear().toString(),
+		'YY': date.getFullYear().toString().slice(2),
+		'MMMM': month(date.getMonth()),
+		'MMM': month(date.getMonth()).slice(0, 3),
+		'MM': (date.getMonth() + 1).toString().padStart(2, '0'),
+		'M': (date.getMonth() + 1).toString(),
+		'DDD': doy(date).toString(),
+		'DD': date.getDate().toString().padStart(2, '0'),
+		'Do': suffix(date.getDate()),
+		'D': date.getDate().toString(),
+		'dddd': day(date.getDay()),
+		'ddd': day(date.getDay()).slice(0, 3),
+		'HH': date.getHours().toString().padStart(2, '0'),
+		'H': date.getHours().toString(),
+		'hh': (date.getHours() % 12 || 12).toString().padStart(2, '0'),
+		'h': (date.getHours() % 12 || 12).toString(),
+		'mm': date.getMinutes().toString().padStart(2, '0'),
+		'm': date.getMinutes().toString(),
+		'ss': date.getSeconds().toString().padStart(2, '0'),
+		's': date.getSeconds().toString(),
+		'SSS': date.getMilliseconds().toString().padStart(3, '0'),
+		'A': date.getHours() >= 12 ? 'PM' : 'AM',
+		'a': date.getHours() >= 12 ? 'pm' : 'am',
+		'ZZ': tzOffset(t[1] * 60).replace(':', ''),
+		'Z': tzOffset(t[1] * 60),
+		'z': typeof tz == 'string' ? tz : (<any>t)[0]
+	};
+	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]);
 }

 /**
Author	SHA1	Message	Date
ztimson	cd5741d6ab	Simplified timestampedFilename to use formatDate All checks were successful Build / Build NPM Project (push) Successful in 43s Details Build / Tag Version (push) Successful in 7s Details Build / Publish Documentation (push) Successful in 45s Details	2025-03-02 21:37:48 -05:00
ztimson	5b9e0714ce	Cache returns deep copies to prevent deletion mid-use All checks were successful Build / Build NPM Project (push) Successful in 1m13s Details Build / Tag Version (push) Successful in 17s Details Build / Publish Documentation (push) Successful in 54s Details	2025-02-27 08:36:30 -05:00
ztimson	a3b34ef03f	Fixed http no decode All checks were successful Build / Build NPM Project (push) Successful in 43s Details Build / Tag Version (push) Successful in 8s Details Build / Publish Documentation (push) Successful in 40s Details	2025-02-18 16:04:18 -05:00
ztimson	f755d8f5b8	Fixed PathEvents filter All checks were successful Build / Build NPM Project (push) Successful in 38s Details Build / Tag Version (push) Successful in 7s Details Build / Publish Documentation (push) Successful in 35s Details	2025-02-04 22:17:31 -05:00
ztimson	35c471eef4	Fixed PathEvents filter All checks were successful Build / Build NPM Project (push) Successful in 1m12s Details Build / Tag Version (push) Successful in 12s Details Build / Publish Documentation (push) Successful in 47s Details	2025-02-04 21:35:31 -05:00
ztimson	fe9fdb9384	Fixed blackorwhite invalid argument crash All checks were successful Build / Build NPM Project (push) Successful in 38s Details Build / Tag Version (push) Successful in 8s Details Build / Publish Documentation (push) Successful in 40s Details	2025-02-03 14:20:18 -05:00
ztimson	a5d7a35fdc	Fixed formatDate All checks were successful Build / Build NPM Project (push) Successful in 42s Details Build / Tag Version (push) Successful in 9s Details Build / Publish Documentation (push) Successful in 38s Details	2025-01-08 14:21:14 -05:00
ztimson	cb117273a7	Fixed path-event filter All checks were successful Build / Build NPM Project (push) Successful in 39s Details Build / Tag Version (push) Successful in 8s Details Build / Publish Documentation (push) Successful in 36s Details	2024-12-27 22:20:27 -05:00