Fixed upload headers

package.json

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

src/files.ts

@@ -1,4 +1,4 @@
-import {PromiseProgress} from './promise-progress.ts';
+import {PromiseProgress} from './promise-progress';
 
 export function download(href: any, name: string) {
 	const a = document.createElement('a');
@@ -43,12 +43,12 @@ export function uploadWithProgress<T>(options: {
 		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);
+		Object.entries(options.headers || {}).forEach(([key, value]) => xhr.setRequestHeader(key, value));
 		xhr.send(formData);
 	});
 }

src/http.ts

@@ -1,7 +1,7 @@
 import {clean} from './objects';
 import {PromiseProgress} from './promise-progress';
 
-export type DecodedResponse<T> = Response & {data?: T}
+export type DecodedResponse<T> = Response & {data: T | null}
 
 export type HttpInterceptor = (response: Response, next: () => void) => void;
 
@@ -70,7 +70,7 @@ export class Http {
 		});
 
 		if(typeof opts.body == 'object' && opts.body != null && headers['Content-Type'] == 'application/json')
-			opts.body = JSON.stringify(opts.json);
+			opts.body = JSON.stringify(opts.body);
 
 		// Send request
 		return new PromiseProgress((res, rej, prog) => {
@@ -78,14 +78,11 @@ export class Http {
 				headers,
 				method: opts.method || (opts.body ? 'POST' : 'GET'),
 				body: opts.body
-			}).then(async (resp: DecodedResponse<T>) => {
+			}).then(async (resp: any) => {
-				console.log('done!');
 				for(let fn of [...Object.values(Http.interceptors), ...Object.values(this.interceptors)]) {
 					await new Promise<void>(res => fn(resp, () => res()));
 				}
 
-				if(!resp.ok) rej(resp);
-
 				const contentLength = resp.headers.get('Content-Length');
 				const total = contentLength ? parseInt(contentLength, 10) : 0;
 				let loaded = 0;
@@ -94,28 +91,28 @@ export class Http {
 				const stream = new ReadableStream({
 					start(controller) {
 						function push() {
-							reader?.read().then(({done, value}) => {
+							reader?.read().then((event: any) => {
-								if(done) return controller.close();
+								if(event.done) return controller.close();
-								loaded += value.byteLength;
+								loaded += event.value.byteLength;
 								prog(loaded / total);
-								controller.enqueue(value);
+								controller.enqueue(event.value);
 								push();
-							}).catch(error => {
+							}).catch((error: any) => controller.error(error));
-								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();
-				res(resp);
+				else resp.data = <any>null;
+
+				if(resp.ok) res(resp);
+				else rej(resp);
 			})
 		});
 	}