Messing around with http decoding

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.14.3",
+	"version": "0.14.10",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",
@@ -9,13 +9,13 @@
 		"type": "git",
 		"url": "https://git.zakscode.com/ztimson/js-utilities"
 	},
-	"main": "./dist/utils.cjs",
+	"main": "./dist/index.cjs",
-	"module": "./dist/utils.mjs",
+	"module": "./dist/index.mjs",
 	"types": "./dist/index.d.ts",
 	"exports": {
 		".": {
-			"import": "./dist/utils.mjs",
+			"import": "./dist/index.mjs",
-			"require": "./dist/utils.cjs",
+			"require": "./dist/index.cjs",
 			"types": "./dist/index.d.ts"
 		}
 	},

src/files.ts

@@ -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

@@ -6,12 +6,13 @@ 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;
+	decode?: boolean;
+	fragment?: string;
 	headers?: {[key: string | symbol]: string | null | undefined};
+	method?: 'GET' | 'POST' | 'PATCH' | 'DELETE';
+	query?: {key: string, value: string}[] | {[key: string]: string};
+	url?: string;
 	[key: string]: any;
 }
 
@@ -70,7 +71,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) => {
@@ -103,13 +104,14 @@ export class Http {
 					}
 				});
 
-				const data = new Response(stream);
+				resp.data = new Response(stream);
+				if(opts.decode !== false) {
 					const content = resp.headers.get('Content-Type')?.toLowerCase();
-				if(content?.includes('json')) resp.data = <T>await data.json();
+					if(content?.includes('application')) resp.data = <T>await resp.data.blob();
-				else if(content?.includes('text')) resp.data = <T>await data.text();
+					else if(content?.includes('form')) resp.data = <T>await resp.data.formData();
-				else if(content?.includes('form')) resp.data = <T>await data.formData();
+					else if(content?.includes('json')) resp.data = <T>await resp.data.json();
-				else if(content?.includes('application')) resp.data = <T>await data.blob();
+					else if(content?.includes('text')) resp.data = <T>await resp.data.text();
-				else resp.data = <any>null;
+				}
 
 				if(resp.ok) res(resp);
 				else rej(resp);

vite.config.ts

@@ -8,8 +8,8 @@ export default defineConfig({
 			entry: resolve(process.cwd(), 'src/index.ts'),
 			name: 'utils',
 			fileName: (module, entryName) => {
-				if(module == 'es') return 'utils.mjs';
+				if(module == 'es') return 'index.mjs';
-				if(module == 'umd') return 'utils.cjs';
+				if(module == 'umd') return 'index.cjs';
 			}
 		},
 		emptyOutDir: true,