@knime/utils 1.1.2 → 1.1.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @knime/utils
 
+## 1.1.3
+
+### Patch Changes
+
+- 9fa8163: bugfix/improvements in uploads: retry only on server error, reset placeholder skeleton on prepare upload error
+
 ## 1.1.2
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knime/utils",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Internal utility functions and constants shared across @knime packages.",
   "homepage": "https://knime.github.io/webapps-common/",
   "license": "GPL 3 and Additional Permissions according to Sec. 7 (SEE the file LICENSE)",

package/src/promise/retryPromise.ts

@@ -1,8 +1,8 @@
 /* eslint-disable func-style */
 import sleep from "../sleep";
 
-const DEFAULT_RETRY_DELAY_MS = 0;
-const DEFAULT_RETRY_COUNT = 5;
+export const DEFAULT_RETRY_DELAY_MS = 0;
+export const DEFAULT_RETRY_COUNT = 5;
 
 /**
  * Helper to add retry capability to an async function
@@ -11,12 +11,17 @@ const DEFAULT_RETRY_COUNT = 5;
  * @param retryDelayMS delay in-between retries in millisecs. defaults to 0
  * @param excludeError predicate fn to exclude specific errors from causing a retry
  */
-export async function retryPromise<T>(
-  fn: () => Promise<T>,
+export async function retryPromise<T>({
+  fn,
   retryCount = DEFAULT_RETRY_COUNT,
   retryDelayMS = DEFAULT_RETRY_DELAY_MS,
-  excludeError?: (error: Error) => boolean,
-) {
+  excludeError,
+}: {
+  fn: () => Promise<T>;
+  retryCount?: number;
+  retryDelayMS?: number;
+  excludeError?: (error: Error) => boolean;
+}) {
   try {
     return await fn();
   } catch (error) {
@@ -28,7 +33,12 @@ export async function retryPromise<T>(
       await sleep(retryDelayMS);
 
       // eslint-disable-next-line no-return-await
-      return await retryPromise(fn, retryCount - 1, retryDelayMS);
+      return await retryPromise({
+        fn,
+        retryCount: retryCount - 1,
+        retryDelayMS,
+        excludeError,
+      });
     }
 
     throw error;

package/src/uploadManager/index.ts

@@ -261,11 +261,11 @@ export const createUploadManager = (config: UploaderManagerConfig) => {
       const chunk = file.slice(start, end);
 
       try {
-        const { method, url } = await retryPromise(
-          () => getUploadFilePartUrl(uploadId, chunkIndex + 1),
-          DEFAULT_RETRY_COUNT,
-          DEFAULT_RETRY_DELAY_MS,
-        );
+        const { method, url } = await retryPromise({
+          fn: () => getUploadFilePartUrl(uploadId, chunkIndex + 1),
+          retryCount: DEFAULT_RETRY_COUNT,
+          retryDelayMS: DEFAULT_RETRY_DELAY_MS,
+        });
 
         consola.trace("File part upload url resolved", { method, url });
 
@@ -279,8 +279,8 @@ export const createUploadManager = (config: UploaderManagerConfig) => {
         };
 
         const filePartResponse = await runAbortablePromise(() =>
-          retryPromise(
-            () =>
+          retryPromise({
+            fn: () =>
               uploadChunkWithProgress({
                 method,
                 url,
@@ -289,9 +289,9 @@ export const createUploadManager = (config: UploaderManagerConfig) => {
                 onProgress: onChunkUploadProgress,
                 abortSignal: abortController.signal,
               }),
-            DEFAULT_RETRY_COUNT,
-            DEFAULT_RETRY_DELAY_MS,
-          ),
+            retryCount: DEFAULT_RETRY_COUNT,
+            retryDelayMS: DEFAULT_RETRY_DELAY_MS,
+          }),
         );
 
         consola.trace(