sliceUploadFile 触发 onProgress

tencentyun · Aug 1, 2018 · e373ab7 · e373ab7
1 parent f22eb49
commit e373ab7
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 18 deletions.
diff --git a/dist/cos-js-sdk-v5.js b/dist/cos-js-sdk-v5.js
@@ -1917,7 +1917,7 @@ util.extend(COS.prototype, base);
 util.extend(COS.prototype, advance);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '0.4.11';
+COS.version = '0.4.12';
 
 module.exports = COS;
 
@@ -10370,11 +10370,19 @@ function sliceUploadFile(params, callback) {
         }
         params.ChunkSize = params.SliceSize = ChunkSize = Math.max(ChunkSize, AutoChunkSize);
     })();
+    onProgress = util.throttleOnProgress.call(self, FileSize, params.onProgress);
 
     // 开始上传
     if (FileSize === 0) {
         params.Body = '';
-        self.putObject(params, callback);
+        self.putObject(params, function (err, data) {
+            if (err) {
+                onProgress(null, true);
+                return callback(err);
+            }
+            onProgress({ loaded: FileSize, total: FileSize }, true);
+            callback(null, data);
+        });
     } else {
         ep.emit('get_file_size_finish');
     }
@@ -11279,8 +11287,6 @@ function sliceCopyFile(params, callback) {
             params.PartList = list;
         })();
 
-        onProgress = util.throttleOnProgress.call(self, FileSize, params.onProgress);
-
         self.multipartInit({
             Bucket: Bucket,
             Region: Region,
@@ -11315,9 +11321,18 @@ function sliceCopyFile(params, callback) {
             return;
         }
 
+        onProgress = util.throttleOnProgress.call(self, FileSize, params.onProgress);
+
         // 开始上传
         if (FileSize <= CopySliceSize) {
-            self.putObjectCopy(params, callback);
+            self.putObjectCopy(params, function (err, data) {
+                if (err) {
+                    onProgress(null, true);
+                    return callback(err);
+                }
+                onProgress({ loaded: FileSize, total: FileSize }, true);
+                callback(err, data);
+            });
         } else {
             ep.emit('get_file_size_finish');
         }

diff --git a/dist/cos-js-sdk-v5.min.js b/dist/cos-js-sdk-v5.min.js
diff --git a/package.json b/package.json
@@ -1,14 +1,13 @@
 {
   "name": "cos-js-sdk-v5",
-  "version": "0.4.11",
+  "version": "0.4.12",
   "description": "cos js sdk v5",
   "main": "index.js",
   "scripts": {
     "dev": "SET NODE_ENV=development&& webpack -w",
     "build": "SET NODE_ENV=production&& webpack",
-    "auth.js": "node server/auth.js",
     "sts.js": "node server/sts.js",
-    "sts-post-object.js": "node server/sts-post-object.js"
+    "sts-auth.js": "node server/sts-auth.js"
   },
   "repository": {
     "type": "git",

diff --git a/src/advance.js b/src/advance.js
@@ -138,11 +138,19 @@ function sliceUploadFile(params, callback) {
         }
         params.ChunkSize = params.SliceSize = ChunkSize = Math.max(ChunkSize, AutoChunkSize);
     })();
+    onProgress = util.throttleOnProgress.call(self, FileSize, params.onProgress);
 
     // 开始上传
     if (FileSize === 0) {
         params.Body = '';
-        self.putObject(params, callback);
+        self.putObject(params, function (err, data) {
+            if (err) {
+                onProgress(null, true);
+                return callback(err);
+            }
+            onProgress({loaded: FileSize, total: FileSize}, true);
+            callback(null, data);
+        });
     } else {
         ep.emit('get_file_size_finish');
     }
@@ -970,13 +978,13 @@ function sliceCopyFile(params, callback) {
             Key: Key,
             UploadId: UploadData.UploadId,
             Parts: UploadData.PartList,
-        },function (err,data) {
+        },function (err, data) {
             if (err) {
                 onProgress(null, true);
                 return callback(err);
             }
             onProgress({loaded: FileSize, total: FileSize}, true);
-            callback(null,data);
+            callback(null, data);
         });
     });
 
@@ -1048,8 +1056,6 @@ function sliceCopyFile(params, callback) {
             params.PartList = list;
         })();
 
-        onProgress = util.throttleOnProgress.call(self, FileSize, params.onProgress);
-
         self.multipartInit({
             Bucket: Bucket,
             Region: Region,
@@ -1084,9 +1090,18 @@ function sliceCopyFile(params, callback) {
             return;
         }
 
+        onProgress = util.throttleOnProgress.call(self, FileSize, params.onProgress);
+
         // 开始上传
         if (FileSize <= CopySliceSize) {
-          self.putObjectCopy(params, callback);
+          self.putObjectCopy(params, function (err, data) {
+              if (err) {
+                  onProgress(null, true);
+                  return callback(err);
+              }
+              onProgress({loaded: FileSize, total: FileSize}, true);
+              callback(err, data);
+          });
         } else {
           ep.emit('get_file_size_finish');
         }

diff --git a/src/cos.js b/src/cos.js
@@ -44,6 +44,6 @@ util.extend(COS.prototype, base);
 util.extend(COS.prototype, advance);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '0.4.11';
+COS.version = '0.4.12';
 
 module.exports = COS;
diff --git a/test/test.js b/test/test.js
@@ -1,5 +1,5 @@
 var config = {
-    Bucket: 'test-1251902136',
+    Bucket: 'test-1250000000',
     Region: 'ap-guangzhou'
 };
 
@@ -388,7 +388,7 @@ it('abortUploadTask(),Level=file', function (assert) {
                     Key: filename,
                 }, function (err, data) {
                     assert.ok(data.successList.length >= 1, '成功舍弃单个文件下的所有分片任务');
-                    assert.ok(data.successList[0].Key === filename, '成功舍弃单个文件的所有分片任务');
+                    assert.ok(data.successList[0] && data.successList[0].Key === filename, '成功舍弃单个文件的所有分片任务');
                     done();
                 });
             }