Fixed file upload types

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.5.0",
+	"version": "0.8.2",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",

src/download.ts

@@ -0,0 +1,53 @@
+import {TypedEmitter, TypedEvents} from './emitter';
+
+export type DownloadEvents = TypedEvents & {
+	complete: (blob: Blob) => any;
+	failed: (error: Error) => any;
+	progress: (progress: number) => any;
+}
+
+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);
+}
+
+/**
+ * Download a URL using fetch so progress can be tracked. Uses Typed Emitter to emit a "progress" &
+ * "complete" event.
+ *
+ * @param {string} url
+ * @param {string} downloadName
+ * @return {TypedEmitter<DownloadEvents>}
+ */
+export function downloadProgress(url: string, downloadName?: string) {
+	const progress = new TypedEmitter<DownloadEvents>();
+	fetch(url).then(response => {
+		if(!response.ok) return progress.emit('failed', new Error(response.statusText));
+		const contentLength = response.headers.get('Content-Length') || '0';
+		const total = parseInt(contentLength, 10);
+		let chunks: any[] = [], loaded = 0;
+		const reader = response.body?.getReader();
+		reader?.read().then(function processResult(result) {
+			if(result.done) {
+				const blob = new Blob(chunks);
+				if(downloadName) {
+					const url = URL.createObjectURL(blob);
+					download(url, downloadName);
+					URL.revokeObjectURL(url);
+				}
+				progress.emit('complete', blob);
+			} else {
+				const chunk = result.value;
+				chunks.push(chunk);
+				loaded += chunk.length;
+				progress.emit('progress', loaded / total);
+				reader.read().then(processResult);
+			}
+		});
+	}).catch(err => progress.emit('failed', err));
+	return progress;
+}

src/index.ts

@@ -1,5 +1,6 @@
 export * from './array';
 export * from './aset';
+export * from './download';
 export * from './emitter';
 export * from './errors';
 export * from './logger';
@@ -7,4 +8,5 @@ export * from './misc';
 export * from './objects';
 export * from './string';
 export * from './time';
+export * from './upload';
 export * from './xhr';

src/upload.ts

@@ -0,0 +1,30 @@
+import {TypedEmitter, TypedEvents} from './emitter';
+
+export type UploadEvents = TypedEvents & {
+	complete: () => any;
+	failed: (err: Error) => any;
+	progress: (progress: number) => any;
+}
+
+export function uploadProgress(files : File | File[], url: string) {
+	const xhr = new XMLHttpRequest();
+	const progress = new TypedEmitter<UploadEvents>();
+	const formData = new FormData();
+	(Array.isArray(files) ? files : [files])
+		.forEach(f => formData.append('file', f));
+
+	xhr.upload.addEventListener("progress", (event) => {
+		if(event.lengthComputable) progress.emit('progress', event.loaded / event.total);
+	});
+
+	xhr.onreadystatechange = () => {
+		if (xhr.readyState === 4) {
+			if(xhr.status >= 200 && xhr.status < 300) progress.emit('complete');
+			else progress.emit('failed', new Error(xhr.responseText));
+		}
+	};
+
+	xhr.open("POST", url, true);
+	xhr.send(formData);
+	return progress;
+}

src/xhr.ts

@@ -1,3 +1,4 @@
+import {TypedEmitter, TypedEvents} from './emitter.ts';
 import {clean} from './objects';
 
 export type Interceptor = (request: Response, next: () => void) => void;
@@ -45,14 +46,6 @@ export class XHR {
 		return () => { this.interceptors[key] = <any>null; }
 	}
 
-	download(opts: RequestOptions & {url: string}) {
-		this.request<Response>({...opts, skipConverting: true}).then(async resp => {
-			const blob = await resp.blob();
-			download(URL.createObjectURL(blob), <string>opts.url.split('/').pop());
-			URL.revokeObjectURL(opts.url);
-		});
-	}
-
 	async request<T>(opts: RequestOptions = {}): Promise<T>  {
 		if(!this.opts.url && !opts.url) throw new Error('URL needs to be set');
 		const url = (opts.url?.startsWith('http') ? opts.url : (this.opts.url || '') + (opts.url || '')).replace(/([^:]\/)\/+/g, '$1');
@@ -82,12 +75,3 @@ export class XHR {
 		});
 	}
 }
-
-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);
-}