fix: race condition on file upload/download state

Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
fluidd-core · May 31, 2024 · 9ae83b6 · 9ae83b6
1 parent df59f78
commit 9ae83b6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/src/mixins/files.ts b/src/mixins/files.ts
@@ -91,6 +91,10 @@ export default class FilesMixin extends Vue {
         ...options,
         signal: abortController.signal,
         onDownloadProgress: (event: AxiosProgressEvent) => {
+          if (abortController.signal.aborted) {
+            return
+          }
+
           const progress = event.progress ?? (
             size > 0
               ? event.loaded / size
@@ -112,6 +116,8 @@ export default class FilesMixin extends Vue {
         }
       })
 
+      abortController.abort()
+
       return response
     } finally {
       this.$store.dispatch('files/removeFileDownload')
@@ -192,6 +198,10 @@ export default class FilesMixin extends Vue {
         ...options,
         signal: abortController.signal,
         onUploadProgress: (event: AxiosProgressEvent) => {
+          if (abortController.signal.aborted) {
+            return
+          }
+
           this.$store.dispatch('files/updateFileUpload', {
             filepath,
             loaded: event.loaded,
@@ -201,6 +211,8 @@ export default class FilesMixin extends Vue {
         }
       })
 
+      abortController.abort()
+
       return response
     } finally {
       this.$store.dispatch('files/removeFileUpload', filepath)

diff --git a/src/store/files/mutations.ts b/src/store/files/mutations.ts
@@ -112,16 +112,9 @@ export const mutations: MutationTree<FilesState> = {
   },
 
   setUpdateFileDownload (state, payload) {
-    if (
-      !state.download ||
-      state.download === null
-    ) {
-      state.download = payload
-    } else {
-      state.download = {
-        ...state.download,
-        ...payload
-      }
+    state.download = {
+      ...state.download,
+      ...payload
     }
   },