Limit concurrent downloads & uploads (#2313)

Author: bexsoft

models/environment_constants.go

@@ -99,7 +99,9 @@ import {
 
 import {
   makeid,
+  removeTrace,
   storeCallForObjectWithID,
+  storeFormDataWithID,
 } from "../../../../ObjectBrowser/transferManager";
 import {
   cancelObjectInList,
@@ -777,12 +779,15 @@ const ListObjects = () => {
       `${bucketName}-${object.name}-${new Date().getTime()}-${Math.random()}`
     );
 
+    const ID = makeid(8);
+
     const downloadCall = download(
       bucketName,
       encodeURLString(object.name),
       object.version_id,
       object.size,
       null,
+      ID,
       (progress) => {
         dispatch(
           updateProgress({
@@ -801,7 +806,6 @@ const ListObjects = () => {
         dispatch(cancelObjectInList(identityDownload));
       }
     );
-    const ID = makeid(8);
     storeCallForObjectWithID(ID, downloadCall);
     dispatch(
       setNewObject({
@@ -818,8 +822,6 @@ const ListObjects = () => {
         errorMessage: "",
       })
     );
-
-    downloadCall.send();
   };
 
   const openPath = (idElement: string) => {
@@ -865,6 +867,7 @@ const ListObjects = () => {
             const fileWebkitRelativePath = get(file, "webkitRelativePath", "");
 
             let relativeFolderPath = folderPath;
+            const ID = makeid(8);
 
             // File was uploaded via drag & drop
             if (filePath !== "") {
@@ -924,6 +927,8 @@ const ListObjects = () => {
               if (xhr.status >= 200 && xhr.status < 300) {
                 dispatch(completeObject(identity));
                 resolve({ status: xhr.status });
+
+                removeTrace(ID);
               } else {
                 // reject promise if there was a server error
                 if (errorMessages[xhr.status]) {
@@ -936,13 +941,16 @@ const ListObjects = () => {
                     errorMessage = "something went wrong";
                   }
                 }
+
                 dispatch(
                   failObject({
                     instanceID: identity,
                     msg: errorMessage,
                   })
                 );
                 reject({ status: xhr.status, message: errorMessage });
+
+                removeTrace(ID);
               }
             };
 
@@ -990,7 +998,6 @@ const ListObjects = () => {
             const formData = new FormData();
             if (file.size !== undefined) {
               formData.append(file.size.toString(), blobFile, fileName);
-              const ID = makeid(8);
               storeCallForObjectWithID(ID, xhr);
               dispatch(
                 setNewObject({
@@ -1008,7 +1015,8 @@ const ListObjects = () => {
                 })
               );
 
-              xhr.send(formData);
+              storeFormDataWithID(ID, formData);
+              storeCallForObjectWithID(ID, xhr);
             }
           });
         };

models/session_response.go

@@ -302,12 +302,15 @@ const ObjectDetailPanel = ({
       return;
     }
 
+    const ID = makeid(8);
+
     const downloadCall = download(
       bucketName,
       internalPaths,
       object.version_id,
       parseInt(object.size || "0"),
       null,
+      ID,
       (progress) => {
         dispatch(
           updateProgress({
@@ -326,7 +329,7 @@ const ObjectDetailPanel = ({
         dispatch(cancelObjectInList(identityDownload));
       }
     );
-    const ID = makeid(8);
+
     storeCallForObjectWithID(ID, downloadCall);
     dispatch(
       setNewObject({
@@ -343,8 +346,6 @@ const ObjectDetailPanel = ({
         errorMessage: "",
       })
     );
-
-    downloadCall.send();
   };
 
   const closeDeleteModal = (closeAndReload: boolean) => {

portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx

@@ -256,12 +256,15 @@ const VersionsNavigator = ({
       `${bucketName}-${object.name}-${new Date().getTime()}-${Math.random()}`
     );
 
+    const ID = makeid(8);
+
     const downloadCall = download(
       bucketName,
       internalPaths,
       object.version_id,
       parseInt(object.size || "0"),
       null,
+      ID,
       (progress) => {
         dispatch(
           updateProgress({
@@ -280,7 +283,7 @@ const VersionsNavigator = ({
         dispatch(cancelObjectInList(identityDownload));
       }
     );
-    const ID = makeid(8);
+
     storeCallForObjectWithID(ID, downloadCall);
     dispatch(
       setNewObject({
@@ -297,8 +300,6 @@ const VersionsNavigator = ({
         errorMessage: "",
       })
     );
-
-    downloadCall.send();
   };
 
   const onShareItem = (item: IFileInfo) => {

portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ObjectDetailPanel.tsx

@@ -17,13 +17,15 @@
 import { BucketObjectItem } from "./ListObjects/types";
 import { IAllowResources } from "../../../types";
 import { encodeURLString } from "../../../../../common/utils";
+import { removeTrace } from "../../../ObjectBrowser/transferManager";
 
 export const download = (
   bucketName: string,
   objectPath: string,
   versionID: any,
   fileSize: number,
   overrideFileName: string | null = null,
+  id: string,
   progressCallback: (progress: number) => void,
   completeCallback: () => void,
   errorCallback: (msg: string) => void,
@@ -74,6 +76,8 @@ export const download = (
           completeCallback();
         }
 
+        removeTrace(id);
+
         var link = document.createElement("a");
         link.href = window.URL.createObjectURL(req.response);
         link.download = filename;
@@ -104,7 +108,6 @@ export const download = (
       abortCallback();
     }
   };
-  //req.send();
 
   return req;
 };

portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/VersionsNavigator.tsx

@@ -170,7 +170,6 @@ const ObjectHandled = ({
           <button
             onClick={() => {
               if (!objectToDisplay.done) {
-                console.log("//abort");
                 const call = callForObjectID(objectToDisplay.ID);
                 if (call) {
                   call.abort();