Changed XHR error handling

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.4.0",
+	"version": "0.10.4",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@ztimson/utils",
-			"version": "0.4.0",
+			"version": "0.10.4",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.12",

package.json

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

src/errors.ts

@@ -1,15 +1,3 @@
-import {XHR} from './xhr';
-
-XHR.addInterceptor((resp: Response, next: () => void) => {
-	if(resp.status == 200) return next();
-	if(resp.status == 400) throw new BadRequestError(resp.statusText);
-	if(resp.status == 401) throw new UnauthorizedError(resp.statusText);
-	if(resp.status == 403) throw new ForbiddenError(resp.statusText);
-	if(resp.status == 404) throw new NotFoundError(resp.statusText);
-	if(resp.status == 500) throw new InternalServerError(resp.statusText);
-	throw new CustomError(resp.statusText, resp.status);
-});
-
 export class CustomError extends Error {
 	static code = 500;
 

src/xhr.ts

@@ -1,3 +1,11 @@
+import {
+	BadRequestError,
+	CustomError,
+	ForbiddenError,
+	InternalServerError,
+	NotFoundError,
+	UnauthorizedError
+} from './errors.ts';
 import {clean} from './objects';
 
 export type Interceptor = (request: Response, next: () => void) => void;
@@ -67,10 +75,16 @@ export class XHR {
 				await new Promise<void>(res => fn(resp, () => res()));
 			}
 
-			if(!resp.ok) throw new Error(resp.statusText);
+			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);
 		});
 	}
 }