优化进度反馈

Author: carsonxu

sdk/advance.js

@@ -139,18 +139,16 @@ 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 = '';
+        params.ContentLength = 0;
         params._OnlyUploadNotAddTask = true;
         self.putObject(params, function (err, data) {
             if (err) {
-                onProgress(null, true);
                 return callback(err);
             }
-            onProgress({loaded: FileSize, total: FileSize}, true);
             callback(null, data);
         });
     } else {

sdk/base.js

@@ -1073,10 +1073,12 @@ function getObject(params, callback) {
             return callback(err);
         }
         var result = {};
-        if (BodyType === 'buffer') {
-            result.Body = Buffer.from(data.body);
-        } else if (BodyType === 'string') {
-            result.Body = data.body;
+        if (data.body) {
+            if (BodyType === 'buffer') {
+                result.Body = Buffer.from(data.body);
+            } else if (BodyType === 'string') {
+                result.Body = data.body;
+            }
         }
         if (data.headers && data.headers.etag) {
             result.ETag = data.headers && data.headers.etag;

sdk/task.js

@@ -17,7 +17,7 @@ var initTask = function (cos) {
         originApiMap[api] = cos[api];
         cos[api] = function (params, callback) {
             if (params._OnlyUploadNotAddTask) {
-                originApiMap[api](params, callback);
+                originApiMap[api].call(cos, params, callback);
             } else {
                 cos._addTask(api, params, callback);
             }

sdk/util.js

@@ -409,6 +409,7 @@ var throttleOnProgress = function (total, onProgress) {
     var time0 = Date.now();
     var time1;
     var timer;
+    var preInfo = {};
     function update() {
         timer = 0;
         if (onProgress && (typeof onProgress === 'function')) {
@@ -423,7 +424,14 @@ var throttleOnProgress = function (total, onProgress) {
             time0 = time1;
             size0 = size1;
             try {
-                onProgress({loaded: size1, total: total, speed: speed, percent: percent});
+                var curInfo = {loaded: size1, total: total, speed: speed, percent: percent};
+                if (curInfo.loaded !== preInfo.loaded ||
+                    curInfo.total !== preInfo.total ||
+                    curInfo.speed !== preInfo.speed ||
+                    curInfo.percent !== preInfo.percent) {
+                    onProgress(curInfo);
+                }
+                preInfo = curInfo;
             } catch (e) {
             }
         }