@uppy/xhr-upload: introduce hooks similar to tus

[Murderlon]

Closes #5049

[github-actions]

Diff output files

diff --git a/packages/@uppy/utils/lib/fetcher.js b/packages/@uppy/utils/lib/fetcher.js
index d0f29e3..c273c2c 100644
--- a/packages/@uppy/utils/lib/fetcher.js
+++ b/packages/@uppy/utils/lib/fetcher.js
@@ -12,7 +12,7 @@ export function fetcher(url, options) {
     onBeforeRequest = noop,
     onUploadProgress = noop,
     shouldRetry = () => true,
-    onAfterRequest = noop,
+    onAfterResponse = noop,
     onTimeout = noop,
     responseType,
     retries = 3,
@@ -38,7 +38,7 @@ export function fetcher(url, options) {
         reject(new DOMException("Aborted", "AbortError"));
       });
       xhr.onload = async () => {
-        await onAfterRequest(xhr, retryCount);
+        await onAfterResponse(xhr, retryCount);
         if (xhr.status >= 200 && xhr.status < 300) {
           timer.done();
           resolve(xhr);
diff --git a/packages/@uppy/xhr-upload/lib/index.js b/packages/@uppy/xhr-upload/lib/index.js
index 595495e..c593275 100644
--- a/packages/@uppy/xhr-upload/lib/index.js
+++ b/packages/@uppy/xhr-upload/lib/index.js
@@ -45,30 +45,12 @@ const defaultOptions = {
   fieldName: "file",
   method: "post",
   allowedMetaFields: true,
-  responseUrlFieldName: "url",
   bundle: false,
   headers: {},
   timeout: 30 * 1000,
   limit: 5,
   withCredentials: false,
   responseType: "",
-  getResponseData(responseText) {
-    let parsedResponse = {};
-    try {
-      parsedResponse = JSON.parse(responseText);
-    } catch {}
-    return parsedResponse;
-  },
-  getResponseError(_, response) {
-    let error = new Error("Upload error");
-    if (isNetworkError(response)) {
-      error = new NetworkError(error, response);
-    }
-    return error;
-  },
-  validateStatus(status) {
-    return status >= 200 && status < 300;
-  },
 };
 var _getFetcher = _classPrivateFieldLooseKey("getFetcher");
 var _uploadLocalFile = _classPrivateFieldLooseKey("uploadLocalFile");
@@ -155,6 +137,9 @@ export default class XHRUpload extends BasePlugin {
         try {
           const res = await fetcher(url, {
             ...options,
+            onBeforeRequest: this.opts.onBeforeRequest,
+            shouldRetry: this.opts.shouldRetry,
+            onAfterResponse: this.opts.onAfterResponse,
             onTimeout: timeout => {
               const seconds = Math.ceil(timeout / 1000);
               const error = new Error(this.i18n("uploadStalled", {
@@ -174,16 +159,12 @@ export default class XHRUpload extends BasePlugin {
               }
             },
           });
-          if (!this.opts.validateStatus(res.status, res.responseText, res)) {
-            throw new NetworkError(res.statusText, res);
-          }
-          const body = this.opts.getResponseData(res.responseText, res);
-          const uploadURL = body == null ? void 0 : body[this.opts.responseUrlFieldName];
+          const body = JSON.parse(res.responseText);
           for (const file of files) {
             this.uppy.emit("upload-success", file, {
               status: res.status,
               body,
-              uploadURL,
+              uploadURL: body.url,
             });
           }
           return res;
@@ -193,9 +174,8 @@ export default class XHRUpload extends BasePlugin {
           }
           if (error instanceof NetworkError) {
             const request = error.request;
-            const customError = buildResponseError(request, this.opts.getResponseError(request.responseText, request));
             for (const file of files) {
-              this.uppy.emit("upload-error", file, customError);
+              this.uppy.emit("upload-error", file, buildResponseError(request, error));
             }
           }
           throw error;

[Murderlon]

Linters failing because prettier is not enabled for markdown. Enabled here: #5133

[mifi]

why is this needed if body is already type asseted as B? shouldn't we change type Body so that it instead has url?

[Murderlon]

Because we do not know what B is, it's Record<string, unknown>. Maybe we should consider creating specific B generics per uploader, but that's outside of the scope of this PR.

[mifi]

Suggested change

	const uploadUrl = 'url' in body && typeof body.url === 'string' ? body.url : undefined;