getObject 支持 onProgress

tencentyun · Jan 12, 2021 · b31690d · b31690d
1 parent 64d7877
commit b31690d
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 6 deletions.
diff --git a/demo/demo.js b/demo/demo.js
@@ -892,6 +892,9 @@ function getObject() {
         Bucket: config.Bucket, // Bucket 格式：test-1250000000
         Region: config.Region,
         Key: '1mb.zip',
+        onProgress: function (progressData) {
+            console.log(JSON.stringify(progressData));
+        }
     }, function (err, data) {
         logger.log(err || data);
     });

diff --git a/dist/cos-js-sdk-v5.js b/dist/cos-js-sdk-v5.js
@@ -2161,7 +2161,7 @@ base.init(COS, task);
 advance.init(COS, task);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '1.1.5';
+COS.version = '1.1.6';
 
 module.exports = COS;
 
@@ -6528,6 +6528,7 @@ function listObjectVersions(params, callback) {
  */
 function getObject(params, callback) {
     var reqParams = params.Query || {};
+    var onProgress = util.throttleOnProgress.call(this, 0, params.onProgress);
 
     reqParams['response-content-type'] = params['ResponseContentType'];
     reqParams['response-content-language'] = params['ResponseContentLanguage'];
@@ -6547,8 +6548,10 @@ function getObject(params, callback) {
         DataType: params.DataType,
         headers: params.Headers,
         qs: reqParams,
-        rawBody: true
+        rawBody: true,
+        onDownloadProgress: onProgress
     }, function (err, data) {
+        onProgress(null, true);
         if (err) {
             var statusCode = err.statusCode;
             if (params.Headers['If-Modified-Since'] && statusCode && statusCode === 304) {
@@ -7746,7 +7749,7 @@ function getAuthorizationAsync(params, callback) {
         if (formatAllow) {
             callback && callback(null, AuthData);
         } else {
-            callback && callback('authorization error');
+            callback && callback({ error: 'authorization error' });
         }
     };
 
@@ -8025,6 +8028,9 @@ function _submitRequest(params, callback) {
             params.onProgress({ loaded: loaded, total: contentLength });
         };
     }
+    if (params.onDownloadProgress) {
+        opt.onDownloadProgress = params.onDownloadProgress;
+    }
     if (params.DataType) {
         opt.dataType = params.DataType;
     }
@@ -8308,6 +8314,7 @@ var request = function (opt, callback) {
 
     // onprogress
     if (opt.onProgress && xhr.upload) xhr.upload.onprogress = opt.onProgress;
+    if (opt.onDownloadProgress) xhr.onprogress = opt.onDownloadProgress;
 
     // success 2xx/3xx/4xx
     xhr.onload = function () {

diff --git a/dist/cos-js-sdk-v5.min.js b/dist/cos-js-sdk-v5.min.js
diff --git a/lib/request.js b/lib/request.js
@@ -93,6 +93,7 @@ var request = function (opt, callback) {
 
     // onprogress
     if (opt.onProgress && xhr.upload) xhr.upload.onprogress = opt.onProgress;
+    if (opt.onDownloadProgress) xhr.onprogress = opt.onDownloadProgress;
 
     // success 2xx/3xx/4xx
     xhr.onload = function () {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cos-js-sdk-v5",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "JavaScript SDK for [腾讯云对象存储](https://cloud.tencent.com/product/cos)",
   "main": "index.js",
   "scripts": {

diff --git a/src/base.js b/src/base.js
@@ -1774,6 +1774,7 @@ function listObjectVersions(params, callback) {
  */
 function getObject(params, callback) {
     var reqParams = params.Query || {};
+    var onProgress = util.throttleOnProgress.call(this, 0, params.onProgress);
 
     reqParams['response-content-type'] = params['ResponseContentType'];
     reqParams['response-content-language'] = params['ResponseContentLanguage'];
@@ -1794,7 +1795,9 @@ function getObject(params, callback) {
         headers: params.Headers,
         qs: reqParams,
         rawBody: true,
+        onDownloadProgress: onProgress,
     }, function (err, data) {
+        onProgress(null, true);
         if (err) {
             var statusCode = err.statusCode;
             if (params.Headers['If-Modified-Since'] && statusCode && statusCode === 304) {
@@ -3295,6 +3298,9 @@ function _submitRequest(params, callback) {
             params.onProgress({loaded: loaded, total: contentLength});
         };
     }
+    if (params.onDownloadProgress) {
+        opt.onDownloadProgress = params.onDownloadProgress;
+    }
     if (params.DataType) {
         opt.dataType = params.DataType;
     }

diff --git a/src/cos.js b/src/cos.js
@@ -59,6 +59,6 @@ base.init(COS, task);
 advance.init(COS, task);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '1.1.5';
+COS.version = '1.1.6';
 
 module.exports = COS;