修复立即返回的 Bug

Author: carsonxu

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cos-nodejs-sdk-v5",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "description": "cos nodejs sdk v5",
   "main": "index.js",
   "scripts": {

sdk/util.js

@@ -403,60 +403,61 @@ var apiWrapper = function (apiName, apiFn) {
             callback && callback(formatResult(err), formatResult(data));
         };
 
-        if (apiName !== 'getService' && apiName !== 'abortUploadTask') {
-            // 判断参数是否完整
-            var missingResult;
-            if (missingResult = hasMissingParams(apiName, params)) {
-                _callback({error: 'missing param ' + missingResult});
-                return;
-            }
-            // 判断 region 格式
-            if (params.Region) {
-                if (params.Region.indexOf('cos.') > -1) {
-                    _callback({error: 'param Region should not be start with "cos."'});
-                    return;
-                } else if (!/^([a-z\d-]+)$/.test(params.Region)) {
-                    _callback({error: 'Region format error.'});
-                    return;
+        var checkParams = function () {
+            if (apiName !== 'getService' && apiName !== 'abortUploadTask') {
+                // 判断参数是否完整
+                var missingResult = hasMissingParams(apiName, params)
+                if (missingResult) {
+                    return 'missing param ' + missingResult;
                 }
                 // 判断 region 格式
-                if (!self.options.CompatibilityMode && params.Region.indexOf('-') === -1 && params.Region !== 'yfb' && params.Region !== 'default') {
-                    console.warn('warning: param Region format error, find help here: https://cloud.tencent.com/document/product/436/6224');
+                if (params.Region) {
+                    if (params.Region.indexOf('cos.') > -1) {
+                        return 'param Region should not be start with "cos."';
+                    } else if (!/^([a-z\d-]+)$/.test(params.Region)) {
+                        return 'Region format error.';
+                    }
+                    // 判断 region 格式
+                    if (!self.options.CompatibilityMode && params.Region.indexOf('-') === -1 && params.Region !== 'yfb' && params.Region !== 'default') {
+                        console.warn('warning: param Region format error, find help here: https://cloud.tencent.com/document/product/436/6224');
+                    }
                 }
-            }
-            // 兼容不带 AppId 的 Bucket
-            if (params.Bucket) {
-                if (!/^([a-z\d-]+)-(\d+)$/.test(params.Bucket)) {
+                // 兼容不带 AppId 的 Bucket
+                if (params.Bucket) {
+                    if (!/^([a-z\d-]+)-(\d+)$/.test(params.Bucket)) {
+                        if (params.AppId) {
+                            params.Bucket = params.Bucket + '-' + params.AppId;
+                        } else if (self.options.AppId) {
+                            params.Bucket = params.Bucket + '-' + self.options.AppId;
+                        } else {
+                            return 'Bucket should format as "test-1250000000".';
+                        }
+                    }
                     if (params.AppId) {
-                        params.Bucket = params.Bucket + '-' + params.AppId;
-                    } else if (self.options.AppId) {
-                        params.Bucket = params.Bucket + '-' + self.options.AppId;
-                    } else {
-                        _callback({error: 'Bucket should format as "test-1250000000".'});
-                        return;
+                        console.warn('warning: AppId has been deprecated, Please put it at the end of parameter Bucket(E.g Bucket:"test-1250000000" ).');
+                        delete params.AppId;
                     }
                 }
-                if (params.AppId) {
-                    console.warn('warning: AppId has been deprecated, Please put it at the end of parameter Bucket(E.g Bucket:"test-1250000000" ).');
-                    delete params.AppId;
+                // 如果 Key 是 / 开头，强制去掉第一个 /
+                if (!self.options.UseRawKey && params.Key && params.Key.substr(0, 1) === '/') {
+                    params.Key = params.Key.substr(1);
                 }
             }
-            // 如果 Key 是 / 开头，强制去掉第一个 /
-            if (!self.options.UseRawKey && params.Key && params.Key.substr(0, 1) === '/') {
-                params.Key = params.Key.substr(1);
-            }
-        }
+        };
 
+        var errMsg = checkParams();
         var isSync = apiName === 'getAuth' || apiName === 'getV4Auth' || apiName === 'getObjectUrl';
         var Promise = global.Promise;
         if (!isSync && Promise && !callback) {
             return new Promise(function (resolve, reject) {
                 callback = function (err, data) {
                     err ? reject(err) : resolve(data);
                 };
+                if (errMsg) return _callback({error: errMsg});
                 apiFn.call(self, params, _callback);
             });
         } else {
+            if (errMsg) return _callback({error: errMsg});
             var res = apiFn.call(self, params, _callback);
             if (isSync) return res;
         }

test/test.js

@@ -2909,13 +2909,6 @@ group('getBucketAccelerate', function () {
 });
 
 group('Promise', function () {
-    test('getService callback', function (done, assert) {
-        var res = cos.getService(function (err, data) {
-            assert.ok(!err && data);
-            done();
-        });
-        assert.ok(!res);
-    });
 
     test('Promise() getService', function (done, assert) {
         cos.getService().then(function (data) {
@@ -2962,15 +2955,26 @@ group('Promise', function () {
         });
     });
 
+    test('headBucket callback', function (done, assert) {
+        var res = cos.headBucket({
+            Bucket: config.Bucket,
+            Region: config.Region,
+        }, function (err, data) {
+            assert.ok(!err && data);
+            done();
+        });
+        assert.ok(!res);
+    });
+
     test('Promise() headBucket error', function (done, assert) {
         cos.headBucket({
-            Bucket: Date.now() + '-' + config.Bucket,
-            Region: config.Region,
+            Bucket: config.Bucket,
+            Region: config.Region + '/',
         }).then(function (data) {
             assert.ok(!data);
             done();
         }).catch(function (err) {
-            assert.ok(err && err.statusCode === 404);
+            assert.ok(err && err.error === 'Region format error.');
             done();
         });
     });