@uppy/xhr-upload: allow custom error message in onAfterResponse

[Murderlon]

Closes #5570

[github-actions]

Diff output files

diff --git a/packages/@uppy/utils/lib/fetcher.js b/packages/@uppy/utils/lib/fetcher.js
index c273c2c..bcacbe2 100644
--- a/packages/@uppy/utils/lib/fetcher.js
+++ b/packages/@uppy/utils/lib/fetcher.js
@@ -28,6 +28,16 @@ export function fetcher(url, options) {
     }
     return new Promise(async (resolve, reject) => {
       const xhr = new XMLHttpRequest();
+      const onError = error => {
+        if (shouldRetry(xhr) && retryCount < retries) {
+          setTimeout(() => {
+            requestWithRetry(retryCount + 1).then(resolve, reject);
+          }, delay(retryCount));
+        } else {
+          timer.done();
+          reject(error);
+        }
+      };
       xhr.open(method, url, true);
       xhr.withCredentials = withCredentials;
       if (responseType) {
@@ -38,7 +48,13 @@ export function fetcher(url, options) {
         reject(new DOMException("Aborted", "AbortError"));
       });
       xhr.onload = async () => {
-        await onAfterResponse(xhr, retryCount);
+        try {
+          await onAfterResponse(xhr, retryCount);
+        } catch (err) {
+          err.request = xhr;
+          onError(err);
+          return;
+        }
         if (xhr.status >= 200 && xhr.status < 300) {
           timer.done();
           resolve(xhr);
@@ -51,16 +67,7 @@ export function fetcher(url, options) {
           reject(new NetworkError(xhr.statusText, xhr));
         }
       };
-      xhr.onerror = () => {
-        if (shouldRetry(xhr) && retryCount < retries) {
-          setTimeout(() => {
-            requestWithRetry(retryCount + 1).then(resolve, reject);
-          }, delay(retryCount));
-        } else {
-          timer.done();
-          reject(new NetworkError(xhr.statusText, xhr));
-        }
-      };
+      xhr.onerror = () => onError(new NetworkError(xhr.statusText, xhr));
       xhr.upload.onprogress = event => {
         timer.progress();
         onUploadProgress(event);
diff --git a/packages/@uppy/xhr-upload/lib/index.js b/packages/@uppy/xhr-upload/lib/index.js
index fd18a3d..323b88e 100644
--- a/packages/@uppy/xhr-upload/lib/index.js
+++ b/packages/@uppy/xhr-upload/lib/index.js
@@ -202,11 +202,9 @@ export default class XHRUpload extends BasePlugin {
           if (error.name === "AbortError") {
             return undefined;
           }
-          if (error instanceof NetworkError) {
-            const request = error.request;
-            for (const file of files) {
-              this.uppy.emit("upload-error", this.uppy.getFile(file.id), buildResponseError(request, error), request);
-            }
+          const request = error.request;
+          for (const file of files) {
+            this.uppy.emit("upload-error", this.uppy.getFile(file.id), buildResponseError(request, error), request);
           }
           throw error;
         }

[tagliala]

Thank you for the prompt response! I will test it as soon as possible

[Murderlon]

Not released yet but soon

[tagliala]

Confirmed working, thanks again. I will close the discussion and add information there

      onAfterResponse (response) {
        if (response.status !== 422) return

        throw new Error(JSON.parse(response.responseText).error)
      },