feat: optimized multipartUpload progress close #1139 (#1141)

* feat: optimized multipartUpload progress close #1139 * feat: optimized multipartUpload progress close #1139 #1141 * feat: optimized multipartUpload progress * feat: optimized multipartUpload progress
ali-sdk · Jul 26, 2022 · 12fcfd1 · 12fcfd1
1 parent 014ecba
commit 12fcfd1
Show file tree

Hide file tree

Showing 6 changed files with 200 additions and 150 deletions.
diff --git a/.gitignore b/.gitignore
@@ -43,3 +43,4 @@ package-lock.json
 /example/public/index.js
 
 es
+.eslintcache
diff --git a/lib/browser/managed-upload.js b/lib/browser/managed-upload.js
@@ -5,9 +5,7 @@ const mime = require('mime');
 const copy = require('copy-to');
 const { isBlob } = require('../common/utils/isBlob');
 const { isFile } = require('../common/utils/isFile');
-const { isArray } = require('../common/utils/isArray');
 const { isBuffer } = require('../common/utils/isBuffer');
-const { retry } = require('../common/utils/retry');
 
 const proto = exports;
 
@@ -160,7 +158,7 @@ proto._resumeMultipart = async function _resumeMultipart(checkpoint, options) {
             });
 
             if (options.progress) {
-              await options.progress(doneParts.length / numParts, checkpoint, result.res);
+              await options.progress(doneParts.length / (numParts + 1), checkpoint, result.res);
             }
 
             resolve({

diff --git a/lib/common/multipart.js b/lib/common/multipart.js
@@ -205,6 +205,10 @@ proto.completeMultipartUpload = async function completeMultipartUpload(name, upl
   params.successStatuses = [200];
   const result = await this.request(params);
 
+  if (options.progress) {
+    await options.progress(1, null, result.res);
+  }
+
   const ret = {
     res: result.res,
     bucket: params.bucket,

diff --git a/lib/managed-upload.js b/lib/managed-upload.js
@@ -167,7 +167,7 @@ proto._resumeMultipart = async function _resumeMultipart(checkpoint, options) {
               checkpoint.doneParts = doneParts;
 
               if (options.progress) {
-                await options.progress(doneParts.length / numParts, checkpoint, result.res);
+                await options.progress(doneParts.length / (numParts + 1), checkpoint, result.res);
               }
             }
           }
@@ -208,12 +208,17 @@ proto._resumeMultipart = async function _resumeMultipart(checkpoint, options) {
     }
   } else {
     // upload in parallel
-    const jobErr = await this._parallel(todo, parallel,
+    const jobErr = await this._parallel(
+      todo,
+      parallel,
       value => new Promise((resolve, reject) => {
-        uploadPartJob(that, value).then(() => {
-          resolve();
-        }).catch(reject);
-      }));
+        uploadPartJob(that, value)
+          .then(() => {
+            resolve();
+          })
+          .catch(reject);
+      })
+    );
 
     const abortEvent = jobErr.find(err => err.name === 'abort');
     if (abortEvent) throw abortEvent;

diff --git a/test/browser/browser.test.js b/test/browser/browser.test.js
@@ -1329,7 +1329,7 @@ describe('browser', () => {
         });
         sinon.restore();
         assert.equal(result.res.status, 200);
-        assert.equal(progress, 12);
+        assert.equal(progress, 13);
 
         const object = await store.get(name);
         assert.equal(object.res.status, 200);
@@ -1362,7 +1362,7 @@ describe('browser', () => {
         });
         sinon.restore();
         assert.equal(result.res.status, 200);
-        assert.equal(progress, 12);
+        assert.equal(progress, 13);
 
         const object = await store.get(name);
         assert.equal(object.res.status, 200);