@uppy/xhr-upload: refactor to use fetcher (#5074)

* @uppy/utils: add fetcher * Improve callbacks * Refactor local file uploads * Refactor bundle upload * Pass timeout to timeout handler * Remove unused nanoid * Apply feedback * Prettier unrelated files --------- Co-authored-by: Antoine du Hamel <antoine@transloadit.com>
transloadit · Apr 29, 2024 · daae9aa · daae9aa
1 parent 1b179a6
commit daae9aa
Show file tree

Hide file tree

Showing 5 changed files with 138 additions and 261 deletions.
diff --git a/packages/@uppy/utils/src/ProgressTimeout.ts b/packages/@uppy/utils/src/ProgressTimeout.ts
@@ -15,10 +15,11 @@ class ProgressTimeout {
 
   constructor(
     timeout: number,
-    timeoutHandler: Parameters<typeof setTimeout>[0],
+    // eslint-disable-next-line no-shadow
+    timeoutHandler: (timeout: number) => void,
   ) {
     this.#timeout = timeout
-    this.#onTimedOut = timeoutHandler
+    this.#onTimedOut = () => timeoutHandler(timeout)
   }
 
   progress(): void {

diff --git a/packages/@uppy/utils/src/fetcher.ts b/packages/@uppy/utils/src/fetcher.ts
@@ -44,7 +44,7 @@ export type FetcherOptions = {
   ) => void | Promise<void>
 
   /** Called when no XMLHttpRequest upload progress events have been received for `timeout` ms. */
-  onTimeout?: () => void
+  onTimeout?: (timeout: number) => void
 
   /** Signal to abort the upload. */
   signal?: AbortSignal

diff --git a/packages/@uppy/xhr-upload/package.json b/packages/@uppy/xhr-upload/package.json
@@ -26,8 +26,7 @@
   },
   "dependencies": {
     "@uppy/companion-client": "workspace:^",
-    "@uppy/utils": "workspace:^",
-    "nanoid": "^4.0.0"
+    "@uppy/utils": "workspace:^"
   },
   "devDependencies": {
     "nock": "^13.1.0",