Added JSONAttemptParse & fixed uploadProgress response

package.json

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

src/files.ts

@@ -1,3 +1,4 @@
+import {deepCopy, JSONAttemptParse} from './objects.ts';
 import {PromiseProgress} from './promise-progress';
 
 export function download(href: any, name: string) {
@@ -42,10 +43,11 @@ export function uploadWithProgress<T>(options: {
 		const formData = new FormData();
 		options.files.forEach(f => formData.append('file', f));
 
-		xhr.withCredentials = !!options.withCredentials
+		xhr.withCredentials = !!options.withCredentials;
 		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.addEventListener('loadend', () => res(<T>JSONAttemptParse(xhr.responseText)));
+		xhr.addEventListener('error', () => rej(JSONAttemptParse(xhr.responseText)));
+		xhr.addEventListener('timeout', () => rej({error: 'Request timed out'}));
 
 		xhr.open('POST', options.url);
 		Object.entries(options.headers || {}).forEach(([key, value]) => xhr.setRequestHeader(key, value));

src/http.ts

@@ -104,19 +104,13 @@ export class Http {
 					}
 				});
 
-				const data = new Response(stream);
-				resp.body = data.body;
-				resp.blob = data.blob;
-				resp.formData = data.formData;
-				resp.json = data.json;
-				resp.text = data.text;
-
-				if(opts.decode !== false) {
+				resp.data = new Response(stream);
+				if(opts.decode == null || opts.decode) {
 					const content = resp.headers.get('Content-Type')?.toLowerCase();
-					if(content?.includes('application')) resp.data = <T>await data.blob();
-					else if(content?.includes('form')) resp.data = <T>await data.formData();
-					else if(content?.includes('json')) resp.data = <T>await data.json();
-					else if(content?.includes('text')) resp.data = <T>await data.text();
+					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(resp.ok) res(resp);

src/misc.ts

@@ -1,17 +1,5 @@
 import {md5} from './string';
 
-/**
- * Convert data into a form encoded format.
- *
- * @param {any} data - data to convert
- * @returns {string} - Ecodeded form data
- */
-export function formEncode(data: any): string {
-	return Object.entries(data).map(([key, value]) =>
-		encodeURIComponent(key) + '=' + encodeURIComponent(<any>value)
-	).join('&');
-}
-
 /**
  * Get profile image from Gravatar
  *

src/objects.ts

@@ -119,6 +119,17 @@ export function flattenObj(obj: any, parent?: any, result: any = {}) {
 	}
 }
 
+/**
+ * Convert object to FormData
+ * @param target - Object to convert
+ * @return {FormData} - Form object
+ */
+export function formData(target: any): FormData {
+	const data = new FormData();
+	Object.entries(target).forEach(([key, value]) => data.append(key, <any>value));
+	return data;
+}
+
 /**
  * Check that an object has the following values
  *
@@ -175,7 +186,12 @@ export function mixin(target: any, constructors: any[]) {
 	});
 }
 
-export function sanitizedJSON(obj: any, space?: number) {
+export function JSONAttemptParse<T>(json: string): T | string {
+	try { return JSON.parse(json); }
+	catch { return json; }
+}
+
+export function JSONSanitized(obj: any, space?: number) {
 	let cache: any[] = [];
 	return JSON.parse(JSON.stringify(obj, (key, value) => {
 		if (typeof value === 'object' && value !== null) {
@@ -185,3 +201,15 @@ export function sanitizedJSON(obj: any, space?: number) {
 		return value;
 	}, space));
 }
+
+/**
+ * Convert object into URL encoded string
+ *
+ * @param {any} data - data to convert
+ * @returns {string} - Encoded form data
+ */
+export function urlEncode(data: any): string {
+	return Object.entries(data).map(([key, value]) =>
+		encodeURIComponent(key) + '=' + encodeURIComponent(<any>value)
+	).join('&');
+}