优化接口返回值

tencentyun · Nov 5, 2017 · 8f009f9 · 8f009f9
1 parent 525ccae
commit 8f009f9
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 11 deletions.
diff --git a/dist/cos-js-sdk-v5.js b/dist/cos-js-sdk-v5.js
@@ -2324,7 +2324,7 @@ util.extend(COS.prototype, base);
 util.extend(COS.prototype, advance);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '0.2.0';
+COS.version = '0.2.1';
 
 module.exports = window.COS = COS;
 
@@ -3792,7 +3792,17 @@ function getBucketCors(params, callback) {
         action: '/?cors'
     }, function (err, data) {
         if (err) {
-            return callback(err);
+            if (err.statusCode === 404 && err.error && err.error.Code === 'NoSuchCORSConfiguration') {
+                var result = {
+                    CORSRules: [],
+                    statusCode: err.statusCode
+                };
+                err.headers && (result.headers = err.headers);
+                callback(null, result);
+            } else {
+                callback(err);
+            }
+            return;
         }
         var CORSConfiguration = data.CORSConfiguration || {};
         var CORSRules = CORSConfiguration.CORSRules || CORSConfiguration.CORSRule || [];
@@ -4143,7 +4153,17 @@ function getBucketLifecycle(params, callback) {
         action: '/?lifecycle'
     }, function (err, data) {
         if (err) {
-            return callback(err);
+            if (err.statusCode === 404 && err.error && err.error.Code === 'NoSuchLifecycleConfiguration') {
+                var result = {
+                    Rules: [],
+                    statusCode: err.statusCode
+                };
+                err.headers && (result.headers = err.headers);
+                callback(null, result);
+            } else {
+                callback(err);
+            }
+            return;
         }
         var Rules = [];
         try {
@@ -9666,7 +9686,6 @@ function sliceUploadFile(params, callback) {
 
     var onProgress = params.onProgress;
     var onHashProgress = params.onHashProgress;
-    StorageClass = null;
 
     // 上传过程中出现错误，返回错误
     ep.on('error', function (err) {

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,6 +1,6 @@
 {
   "name": "cos-js-sdk-v5",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "cos js sdk v5",
   "main": "index.js",
   "scripts": {

diff --git a/src/advance.js b/src/advance.js
@@ -20,7 +20,6 @@ function sliceUploadFile(params, callback) {
 
     var onProgress = params.onProgress;
     var onHashProgress = params.onHashProgress;
-    StorageClass = null;
 
     // 上传过程中出现错误，返回错误
     ep.on('error', function (err) {

diff --git a/src/base.js b/src/base.js
@@ -242,7 +242,17 @@ function getBucketCors(params, callback) {
         action: '/?cors',
     }, function (err, data) {
         if (err) {
-            return callback(err);
+            if (err.statusCode === 404 && err.error && err.error.Code === 'NoSuchCORSConfiguration') {
+                var result  = {
+                    CORSRules: [],
+                    statusCode: err.statusCode,
+                };
+                err.headers && (result.headers = err.headers);
+                callback(null, result);
+            } else {
+                callback(err);
+            }
+            return;
         }
         var CORSConfiguration = data.CORSConfiguration || {};
         var CORSRules = CORSConfiguration.CORSRules || CORSConfiguration.CORSRule || [];
@@ -596,7 +606,17 @@ function getBucketLifecycle(params, callback) {
         action: '/?lifecycle',
     }, function (err, data) {
         if (err) {
-            return callback(err);
+            if (err.statusCode === 404 && err.error && err.error.Code === 'NoSuchLifecycleConfiguration') {
+                var result  = {
+                    Rules: [],
+                    statusCode: err.statusCode,
+                };
+                err.headers && (result.headers = err.headers);
+                callback(null, result);
+            } else {
+                callback(err);
+            }
+            return;
         }
         var Rules = [];
         try {

diff --git a/src/cos.js b/src/cos.js
@@ -30,6 +30,6 @@ util.extend(COS.prototype, base);
 util.extend(COS.prototype, advance);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '0.2.0';
+COS.version = '0.2.1';
 
 module.exports = window.COS = COS;