@knime/hub-features 1.0.16 → 1.0.17

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @knime/hub-features
 
+## 1.0.17
+
+### Patch Changes
+
+- 9fa8163: bugfix/improvements in uploads: retry only on server error, reset placeholder skeleton on prepare upload error
+- Updated dependencies [9fa8163]
+  - @knime/components@1.11.1
+  - @knime/utils@1.1.3
+
 ## 1.0.16
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knime/hub-features",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "Vue components & composables for shared hub features",
   "homepage": "https://knime.github.io/webapps-common/",
   "license": "GPL 3 and Additional Permissions according to Sec. 7 (SEE the file LICENSE)",
@@ -27,9 +27,9 @@
     "consola": "3.2.3",
     "ofetch": "^1.4.1",
     "typescript": "^5.4.5",
-    "@knime/components": "1.11.0",
+    "@knime/components": "1.11.1",
     "@knime/styles": "1.1.1",
-    "@knime/utils": "1.1.2"
+    "@knime/utils": "1.1.3"
   },
   "peerDependencies": {
     "vue": "3.x"

package/src/useFileUpload/useFileUpload.ts

@@ -11,6 +11,8 @@ const DEFAULT_MAX_UPLOAD_QUEUE_SIZE = 10;
 
 const DEFAULT_API_BASE_URL = "/_/api";
 
+const DEFAULT_RETRY_DELAY_MS = 50;
+
 type UseFileUploadOptions = {
   /**
    * Max number of concurrent uploads allowed in the upload queue.
@@ -170,7 +172,7 @@ export const useFileUpload = (options: UseFileUploadOptions = {}) => {
 
     onFileUploadComplete: ({ uploadId, filePartIds }) => {
       promise
-        .retryPromise(() => completeUpload(uploadId, filePartIds))
+        .retryPromise({ fn: () => completeUpload(uploadId, filePartIds) })
         .then(() => {
           options.onFileUploadComplete?.(uploadId, filePartIds);
         })
@@ -207,20 +209,21 @@ export const useFileUpload = (options: UseFileUploadOptions = {}) => {
     totalFilesBeingPrepared: computed(() => prepareQueueSize.value),
 
     start: async (parentId: string, files: File[]) => {
+      const enqueableFiles = getEnqueueableFiles(files);
       try {
-        const enqueableFiles = getEnqueueableFiles(files);
-
         if (enqueableFiles.length === 0) {
           return;
         }
 
         prepareQueueSize.value += enqueableFiles.length;
 
-        const uploadPayload = await promise.retryPromise(() =>
-          prepareUpload(parentId, enqueableFiles),
-        );
-
-        prepareQueueSize.value -= enqueableFiles.length;
+        const uploadPayload = await promise.retryPromise({
+          fn: () => prepareUpload(parentId, enqueableFiles),
+          excludeError: (error: FetchError) =>
+            // eslint-disable-next-line no-magic-numbers
+            Boolean(error.statusCode && error.statusCode < 500),
+          retryDelayMS: DEFAULT_RETRY_DELAY_MS,
+        });
 
         useUploadManagerResult.start(parentId, uploadPayload);
       } catch (error) {
@@ -229,6 +232,9 @@ export const useFileUpload = (options: UseFileUploadOptions = {}) => {
         }
 
         throw error;
+      } finally {
+        // errors can only be thrown in the prepareUpload call, useUploadManagerResult.start does its own error handling
+        prepareQueueSize.value -= enqueableFiles.length;
       }
     },