Improved http

.github/workflows/build.yaml

@@ -9,34 +9,19 @@ jobs:
   build:
     name: Build NPM Project
     runs-on: ubuntu-latest
-    container:
+    container: node:20-alpine
-      image: node
-      volumes:
-        - '/mnt/swarm/gitea/runner/cache:/cache'
     steps:
       -   name: Clone Repository
           uses: ztimson/actions/clone@develop
 
-      -   name: Restore node_modules
+      -   name: Install & Build
-          uses: ztimson/actions/cache/restore@develop
+          run: |
-          with:
+            npm i
-            key: node_modules
+            npm run build
-
-      -   name: Install Dependencies
-          run: npm i
-
-      -   name: Build Project
-          run: npm run build
 
       -   name: Test
           run: npm run test:coverage
 
-      -   name: Cache node_modules
-          uses: ztimson/actions/cache@develop
-          with:
-            key: node_modules
-            pattern: node_modules
-
       -   name: Upload to Registry
           uses: ztimson/actions/npm/publish@develop
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.11.2",
+	"version": "0.14.3",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",
@@ -14,8 +14,9 @@
 	"types": "./dist/index.d.ts",
 	"exports": {
 		".": {
+			"import": "./dist/utils.mjs",
 			"require": "./dist/utils.cjs",
-			"import": "./dist/utils.mjs"
+			"types": "./dist/index.d.ts"
 		}
 	},
 	"scripts": {

src/download.ts

@@ -1,8 +0,0 @@
-export function download(href: any, name: string) {
-	const a = document.createElement('a');
-	a.href = href;
-	a.download = name;
-	document.body.appendChild(a);
-	a.click();
-	document.body.removeChild(a);
-}

src/files.ts

@@ -0,0 +1,54 @@
+import {PromiseProgress} from './promise-progress';
+
+export function download(href: any, name: string) {
+	const a = document.createElement('a');
+	a.href = href;
+	a.download = name;
+	document.body.appendChild(a);
+	a.click();
+	document.body.removeChild(a);
+}
+
+export function downloadBlob(blob: Blob, name: string) {
+	const url = URL.createObjectURL(blob);
+	download(url, name);
+	URL.revokeObjectURL(url);
+}
+
+export function fileBrowser(options: {accept?: string, multiple?: boolean} = {}): Promise<File[]> {
+	return new Promise(res => {
+		const input = document.createElement('input');
+		input.type = 'file';
+		input.accept = options.accept || '*';
+		input.style.display='none';
+		input.multiple = !!options.multiple;
+		input.onblur = input.onchange = async () => {
+			res(Array.from(<any>input.files));
+			input.remove();
+		}
+		document.body.appendChild(input);
+		input.click();
+	});
+}
+
+export function uploadWithProgress<T>(options: {
+	url: string;
+	files: File[];
+	headers?: {[key: string]: string};
+	withCredentials?: boolean;
+}): PromiseProgress<T> {
+	return new PromiseProgress<T>((res, rej, prog) => {
+		const xhr = new XMLHttpRequest();
+		const formData = new FormData();
+		options.files.forEach(f => formData.append('file', f));
+
+		xhr.withCredentials = !!options.withCredentials
+		Object.entries(options.headers || {}).forEach(([key, value]) => xhr.setRequestHeader(key, value));
+		xhr.upload.addEventListener('progress', (event) => event.lengthComputable ? prog(event.loaded / event.total) : null);
+		xhr.upload.addEventListener('load', (resp) => res(<any>resp));
+		xhr.upload.addEventListener('error', (err) => rej(err));
+
+		xhr.open('POST', options.url);
+		xhr.send(formData);
+	});
+}

src/http.ts

@@ -0,0 +1,119 @@
+import {clean} from './objects';
+import {PromiseProgress} from './promise-progress';
+
+export type DecodedResponse<T> = Response & {data: T | null}
+
+export type HttpInterceptor = (response: Response, next: () => void) => void;
+
+export type HttpRequestOptions = {
+	url?: string;
+	fragment?: string;
+	query?: {key: string, value: string}[] | {[key: string]: string};
+	method?: 'GET' | 'POST' | 'PATCH' | 'DELETE';
+	body?: any;
+	headers?: {[key: string | symbol]: string | null | undefined};
+	[key: string]: any;
+}
+
+export type HttpDefaults = {
+	headers?: {[key: string | symbol]: string | null | undefined};
+	interceptors?: HttpInterceptor[];
+	url?: string;
+}
+
+export class Http {
+	private static interceptors: {[key: string]: HttpInterceptor} = {};
+
+	static headers: {[key: string]: string | null | undefined} = {};
+
+	private interceptors: {[key: string]: HttpInterceptor} = {}
+
+	headers: {[key: string]: string | null | undefined} = {}
+	url!: string | null;
+
+	constructor(defaults: HttpDefaults = {}) {
+		this.url = defaults.url ?? null;
+		this.headers = defaults.headers || {};
+		if(defaults.interceptors) {
+			defaults.interceptors.forEach(i => Http.addInterceptor(i));
+		}
+	}
+
+	static addInterceptor(fn: HttpInterceptor): () => void {
+		const key = Object.keys(Http.interceptors).length.toString();
+		Http.interceptors[key] = fn;
+		return () => { Http.interceptors[key] = <any>null; }
+	}
+
+	addInterceptor(fn: HttpInterceptor): () => void {
+		const key = Object.keys(this.interceptors).length.toString();
+		this.interceptors[key] = fn;
+		return () => { this.interceptors[key] = <any>null; }
+	}
+
+	request<T>(opts: HttpRequestOptions = {}): PromiseProgress<DecodedResponse<T>>  {
+		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');
+		if(opts.fragment) url.includes('#') ? url.replace(/#.*(\?|\n)/g, (match, arg1) => `#${opts.fragment}${arg1}`) : url += '#' + opts.fragment;
+		if(opts.query) {
+			const q = Array.isArray(opts.query) ? opts.query :
+				Object.keys(opts.query).map(k => ({key: k, value: (<any>opts.query)[k]}))
+			url += (url.includes('?') ? '&' : '?') + q.map(q => `${q.key}=${q.value}`).join('&');
+		}
+
+		// Prep headers
+		const headers = <any>clean({
+			'Content-Type': !opts.body ? undefined : (opts.body instanceof FormData ? 'multipart/form-data' : 'application/json'),
+			...Http.headers,
+			...this.headers,
+			...opts.headers
+		});
+
+		if(typeof opts.body == 'object' && opts.body != null && headers['Content-Type'] == 'application/json')
+			opts.body = JSON.stringify(opts.json);
+
+		// Send request
+		return new PromiseProgress((res, rej, prog) => {
+			fetch(url, {
+				headers,
+				method: opts.method || (opts.body ? 'POST' : 'GET'),
+				body: opts.body
+			}).then(async (resp: any) => {
+				for(let fn of [...Object.values(Http.interceptors), ...Object.values(this.interceptors)]) {
+					await new Promise<void>(res => fn(resp, () => res()));
+				}
+
+				const contentLength = resp.headers.get('Content-Length');
+				const total = contentLength ? parseInt(contentLength, 10) : 0;
+				let loaded = 0;
+
+				const reader = resp.body?.getReader();
+				const stream = new ReadableStream({
+					start(controller) {
+						function push() {
+							reader?.read().then((event: any) => {
+								if(event.done) return controller.close();
+								loaded += event.value.byteLength;
+								prog(loaded / total);
+								controller.enqueue(event.value);
+								push();
+							}).catch((error: any) => controller.error(error));
+						}
+						push();
+					}
+				});
+
+				const data = new Response(stream);
+				const content = resp.headers.get('Content-Type')?.toLowerCase();
+				if(content?.includes('json')) resp.data = <T>await data.json();
+				else if(content?.includes('text')) resp.data = <T>await data.text();
+				else if(content?.includes('form')) resp.data = <T>await data.formData();
+				else if(content?.includes('application')) resp.data = <T>await data.blob();
+				else resp.data = <any>null;
+
+				if(resp.ok) res(resp);
+				else rej(resp);
+			})
+		});
+	}
+}

src/index.ts

@@ -1,8 +1,9 @@
 export * from './array';
 export * from './aset';
-export * from './download';
+export * from './files';
 export * from './emitter';
 export * from './errors';
+export * from './http';
 export * from './logger';
 export * from './math';
 export * from './misc';
@@ -10,4 +11,3 @@ export * from './objects';
 export * from './promise-progress';
 export * from './string';
 export * from './time';
-export * from './xhr';

src/objects.ts

@@ -35,6 +35,27 @@ export function deepCopy<T>(value: T): T {
 	return JSON.parse(JSON.stringify(value));
 }
 
+/**
+ * Merge any number of objects into the target
+ *
+ * @param target Destination of all properties
+ * @param sources Objects that will copied into target
+ * @return {any} The des
+ */
+export function deepMerge<T>(target: any, ...sources: any[]): T {
+	sources.forEach(s => {
+		for(const key in s) {
+			if(s[key] && typeof s[key] == 'object' && !Array.isArray(s[key])) {
+				if(!target[key]) target[key] = {};
+				deepMerge(target[key], s[key]);
+			} else {
+				target[key] = s[key];
+			}
+		}
+	});
+	return target;
+}
+
 /**
  * Get/set a property of an object using dot notation
  *

src/promise-progress.ts

@@ -15,12 +15,38 @@ export class PromiseProgress<T> extends Promise<T> {
 		super((resolve, reject) => executor(
 			(value: T) => resolve(value),
 			(reason: any) => reject(reason),
-			(progress: number) => this.progress = progress
+			(progress: number) => this.progress = progress,
 		));
 	}
 
+	static from<T>(promise: Promise<T>): PromiseProgress<T> {
+		if(promise instanceof PromiseProgress) return promise;
+		return new PromiseProgress<T>((res, rej) => promise
+			.then((...args) => res(...args))
+			.catch((...args) => rej(...args)));
+	}
+
+	private from(promise: Promise<T>): PromiseProgress<T> {
+		const newPromise = PromiseProgress.from(promise);
+		this.onProgress(p => newPromise.progress = p);
+		return newPromise;
+	}
+
 	onProgress(callback: ProgressCallback) {
 		this.listeners.push(callback);
 		return this;
 	}
+
+	then(res?: (v: T) => any, rej?: (err: any) => any): PromiseProgress<any> {
+		const resp = super.then(res, rej);
+		return this.from(resp);
+	}
+
+	catch(rej?: (err: any) => any): PromiseProgress<any> {
+		return this.from(super.catch(rej));
+	}
+
+	finally(res?: () => any): PromiseProgress<any> {
+		return this.from(super.finally(res));
+	}
 }

src/xhr.ts

@@ -1,90 +0,0 @@
-import {clean} from './objects';
-
-export type Interceptor = (request: Response, next: () => void) => void;
-
-export type RequestOptions = {
-	url?: string;
-	fragment?: string;
-	query?: {key: string, value: string}[] | {[key: string]: string};
-	method?: 'GET' | 'POST' | 'PATCH' | 'DELETE';
-	body?: any;
-	headers?: {[key: string | symbol]: string | null | undefined};
-	skipConverting?: boolean;
-	[key: string]: any;
-}
-
-export type XhrOptions = {
-	headers?: {[key: string | symbol]: string | null | undefined};
-	interceptors?: Interceptor[];
-	url?: string;
-}
-
-export class XHR {
-	private static interceptors: {[key: string]: Interceptor} = {};
-
-	static headers: {[key: string]: string | null | undefined} = {};
-
-	private interceptors: {[key: string]: Interceptor} = {}
-
-	headers: {[key: string]: string | null | undefined} = {}
-
-	constructor(public readonly opts: XhrOptions = {}) {
-		this.headers = opts.headers || {};
-		if(opts.interceptors) {
-			opts.interceptors.forEach(i => XHR.addInterceptor(i));
-		}
-	}
-
-	static addInterceptor(fn: Interceptor): () => void {
-		const key = Object.keys(XHR.interceptors).length.toString();
-		XHR.interceptors[key] = fn;
-		return () => { XHR.interceptors[key] = <any>null; }
-	}
-
-	addInterceptor(fn: Interceptor): () => void {
-		const key = Object.keys(this.interceptors).length.toString();
-		this.interceptors[key] = fn;
-		return () => { this.interceptors[key] = <any>null; }
-	}
-
-	async request<T>(opts: RequestOptions = {}): Promise<T>  {
-		if(!this.opts.url && !opts.url) throw new Error('URL needs to be set');
-		let url = (opts.url?.startsWith('http') ? opts.url : (this.opts.url || '') + (opts.url || '')).replace(/([^:]\/)\/+/g, '$1');
-		if(opts.fragment) url.includes('#') ? url.replace(/#.*(\?|\n)/g, (match, arg1) => `#${opts.fragment}${arg1}`) : url += '#' + opts.fragment;
-		if(opts.query) {
-			const q = Array.isArray(opts.query) ? opts.query :
-				Object.keys(opts.query).map(k => ({key: k, value: (<any>opts.query)[k]}))
-			url += (url.includes('?') ? '&' : '?') + q.map(q => `${q.key}=${q.value}`).join('&');
-		}
-
-		// Prep headers
-		const headers = <any>clean({
-			'Content-Type': (opts.body && !(opts.body instanceof FormData)) ? 'application/json' : undefined,
-			...XHR.headers,
-			...this.headers,
-			...opts.headers
-		});
-
-		// Send request
-		return fetch(url, {
-			headers,
-			method: opts.method || (opts.body ? 'POST' : 'GET'),
-			body: (headers['Content-Type']?.startsWith('application/json') && opts.body) ? JSON.stringify(opts.body) : opts.body
-		}).then(async resp => {
-			for(let fn of [...Object.values(XHR.interceptors), ...Object.values(this.interceptors)]) {
-				await new Promise<void>(res => fn(resp, () => res()));
-			}
-
-			const decode = async () => {
-				if(!opts.skipConverting && resp.headers.get('Content-Type')?.startsWith('application/json')) return await resp.json();
-				if(!opts.skipConverting && resp.headers.get('Content-Type')?.startsWith('text/plain')) return await <any>resp.text();
-				return resp;
-			}
-
-			const payload = await decode();
-			if(resp.ok) return payload;
-			const text = resp.statusText || (typeof payload == 'string' ? payload : null);
-			throw (text ? new Error(text) : payload);
-		});
-	}
-}