Pass timeout to timeout handler

transloadit · Apr 16, 2024 · 037aeca · 037aeca
1 parent 79c2bd6
commit 037aeca
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 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/src/index.ts b/packages/@uppy/xhr-upload/src/index.ts
@@ -214,8 +214,8 @@ export default class XHRUpload<
         try {
           const res = await fetcher(url, {
             ...options,
-            onTimeout: () => {
-              const seconds = Math.ceil(options.timeout! / 1000)
+            onTimeout: (timeout) => {
+              const seconds = Math.ceil(timeout / 1000)
               const error = new Error(this.i18n('uploadStalled', { seconds }))
               this.uppy.emit('upload-stalled', error, files)
             },