upd：sliceUploadFile返回UploadId

tencentyun · Jun 3, 2021 · 54d100f · 54d100f
1 parent c20924e
commit 54d100f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 22 deletions.
diff --git a/dist/cos-js-sdk-v5.js b/dist/cos-js-sdk-v5.js
@@ -629,7 +629,7 @@ var apiWrapper = function (apiName, apiFn) {
     };
 };
 
-var throttleOnProgress = function (total, onProgress, uploadId) {
+var throttleOnProgress = function (total, onProgress) {
     var self = this;
     var size0 = 0;
     var size1 = 0;
@@ -651,11 +651,7 @@ var throttleOnProgress = function (total, onProgress, uploadId) {
             time0 = time1;
             size0 = size1;
             try {
-                var info = { loaded: size1, total: total, speed: speed, percent: percent };
-                if (uploadId) {
-                    info.uploadId = uploadId;
-                }
-                onProgress(info);
+                onProgress({ loaded: size1, total: total, speed: speed, percent: percent });
             } catch (e) {}
         }
     }
@@ -2426,7 +2422,7 @@ base.init(COS, task);
 advance.init(COS, task);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '1.2.10';
+COS.version = '1.2.11';
 
 module.exports = COS;
 
@@ -8593,12 +8589,18 @@ function sliceUploadFile(params, callback) {
     // 上传过程中出现错误，返回错误
     ep.on('error', function (err) {
         if (!self._isRunningTask(TaskId)) return;
-        return callback(err);
+        var _err = util.extend({
+            UploadId: params.uploadId || ''
+        }, err);
+        return callback(_err);
     });
 
     // 上传分块完成，开始 uploadSliceComplete 操作
     ep.on('upload_complete', function (UploadCompleteData) {
-        callback(null, UploadCompleteData);
+        var _UploadCompleteData = util.extend({
+            UploadId: params.UploadData.UploadId || ''
+        }, UploadCompleteData);
+        callback(null, _UploadCompleteData);
     });
 
     // 上传分块完成，开始 uploadSliceComplete 操作
@@ -8636,8 +8638,6 @@ function sliceUploadFile(params, callback) {
         uuid && session.saveUploadId.call(self, uuid, UploadData.UploadId, self.options.UploadIdCacheLimit); // 缓存 UploadId
         session.setUsing(UploadData.UploadId); // 标记 UploadId 为正在使用
 
-        onProgress = util.throttleOnProgress.call(self, FileSize, params.onProgress, UploadData.UploadId);
-
         // 获取 UploadId
         onProgress(null, true); // 任务状态开始 uploading
         uploadSliceList.call(self, {
@@ -8665,6 +8665,8 @@ function sliceUploadFile(params, callback) {
     // 开始获取文件 UploadId，里面会视情况计算 ETag，并比对，保证文件一致性，也优化上传
     ep.on('get_file_size_finish', function () {
 
+        onProgress = util.throttleOnProgress.call(self, FileSize, params.onProgress);
+
         if (params.UploadData.UploadId) {
             ep.emit('get_upload_data_finish', params.UploadData);
         } else {

diff --git a/dist/cos-js-sdk-v5.min.js b/dist/cos-js-sdk-v5.min.js
diff --git a/src/advance.js b/src/advance.js
@@ -24,12 +24,18 @@ function sliceUploadFile(params, callback) {
     // 上传过程中出现错误，返回错误
     ep.on('error', function (err) {
         if (!self._isRunningTask(TaskId)) return;
-        return callback(err);
+        var _err = util.extend({
+          UploadId: params.uploadId || ''
+        }, err);
+        return callback(_err);
     });
 
     // 上传分块完成，开始 uploadSliceComplete 操作
     ep.on('upload_complete', function (UploadCompleteData) {
-        callback(null, UploadCompleteData);
+        var _UploadCompleteData = util.extend({
+          UploadId: params.UploadData.UploadId || ''
+        }, UploadCompleteData);
+        callback(null, _UploadCompleteData);
     });
 
     // 上传分块完成，开始 uploadSliceComplete 操作
@@ -67,8 +73,6 @@ function sliceUploadFile(params, callback) {
         uuid && session.saveUploadId.call(self, uuid, UploadData.UploadId, self.options.UploadIdCacheLimit); // 缓存 UploadId
         session.setUsing(UploadData.UploadId); // 标记 UploadId 为正在使用
 
-        onProgress = util.throttleOnProgress.call(self, FileSize, params.onProgress, UploadData.UploadId);
-
         // 获取 UploadId
         onProgress(null, true); // 任务状态开始 uploading
         uploadSliceList.call(self, {
@@ -96,6 +100,8 @@ function sliceUploadFile(params, callback) {
     // 开始获取文件 UploadId，里面会视情况计算 ETag，并比对，保证文件一致性，也优化上传
     ep.on('get_file_size_finish', function () {
 
+        onProgress = util.throttleOnProgress.call(self, FileSize, params.onProgress);
+
         if (params.UploadData.UploadId) {
             ep.emit('get_upload_data_finish', params.UploadData);
         } else {

diff --git a/src/util.js b/src/util.js
@@ -567,7 +567,7 @@ var apiWrapper = function (apiName, apiFn) {
     }
 };
 
-var throttleOnProgress = function (total, onProgress, uploadId) {
+var throttleOnProgress = function (total, onProgress) {
     var self = this;
     var size0 = 0;
     var size1 = 0;
@@ -589,11 +589,7 @@ var throttleOnProgress = function (total, onProgress, uploadId) {
             time0 = time1;
             size0 = size1;
             try {
-                var info = { loaded: size1, total: total, speed: speed, percent: percent };
-                if (uploadId) {
-                  info.uploadId = uploadId;
-                }
-                onProgress(info);
+                onProgress({ loaded: size1, total: total, speed: speed, percent: percent });
             } catch (e) {
             }
         }