修复 Location 错误

Author: carsonxu

demo/demo.js

@@ -37,6 +37,7 @@ function getObjectUrl() {
         Region: config.Region,
         Key: '1mb.zip',
         Expires: 60,
+        Sign: true,
     }, function (err, data) {
         console.log(err || data);
     });
@@ -46,7 +47,7 @@ function getObjectUrl() {
 function putBucket() {
     cos.putBucket({
         Bucket: 'testnew-' + config.Bucket.substr(config.Bucket.indexOf('-') + 1),
-        Region: config.Region
+        Region: 'ap-guangzhou'
     }, function (err, data) {
         console.log(err || data);
     });
@@ -346,8 +347,8 @@ function deleteBucketReplication() {
 
 function deleteBucket() {
     cos.deleteBucket({
-        Bucket: 'testnew',
-        Region: config.Region
+        Bucket: 'testnew-' + config.Bucket.substr(config.Bucket.indexOf('-') + 1),
+        Region: 'ap-guangzhou'
     }, function (err, data) {
         console.log(err || data);
     });

package.json

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

sdk/advance.js

@@ -473,10 +473,7 @@ function uploadSliceItem(params, callback) {
         ContentLength = end - start;
     }
 
-    var Body = fs.createReadStream(FilePath, {
-        start: start,
-        end: end - 1
-    });
+    var Body = fs.createReadStream(FilePath, {start: start, end: end - 1});
     var PartItem = UploadData.PartList[PartNumber - 1];
     var ContentSha1 = PartItem.ETag;
     Async.retry(sliceRetryTimes, function (tryCallback) {

sdk/base.js

@@ -187,7 +187,8 @@ function putBucket(params, callback) {
             domain: self.options.Domain,
             bucket: params.Bucket,
             region: params.Region,
-            appId: appId
+            appId: appId,
+            isLocation: true,
         });
         callback(null, {
             Location: url,
@@ -1143,7 +1144,15 @@ function putObject(params, callback) {
             return callback(err);
         }
         if (data && data.headers && data.headers['etag']) {
+            var url = getUrl({
+                domain: self.options.Domain,
+                bucket: params.Bucket,
+                region: params.Region,
+                appId: params.AppId,
+                object: params.Key,
+            });
             return callback(null, {
+                Location: url,
                 ETag: data.headers['etag'],
                 statusCode: data.statusCode,
                 headers: data.headers,
@@ -1618,6 +1627,7 @@ function multipartUpload(params, callback) {
  *     @return  {Object}  data.CompleteMultipartUpload  完成分块上传后的文件信息，包括Location, Bucket, Key 和 ETag
  */
 function multipartComplete(params, callback) {
+    var self = this;
     var headers = {};
 
     headers['Content-Type'] = 'application/xml';
@@ -1659,7 +1669,16 @@ function multipartComplete(params, callback) {
         if (err) {
             return callback(err);
         }
+        var url = getUrl({
+            domain: self.options.Domain,
+            bucket: params.Bucket,
+            region: params.Region,
+            appId: params.AppId,
+            object: params.Key,
+            isLocation: true,
+        });
         var result = util.extend(data.CompleteMultipartUploadResult, {
+            Location: url,
             statusCode: data.statusCode,
             headers: data.headers,
         });
@@ -1848,6 +1867,10 @@ function getObjectUrl(params, callback) {
         appId: params.AppId || self.options.AppId || '',
         object: params.Key,
     });
+    if (params.Sign !== undefined && !params.Sign) {
+        callback(null, {Url: url});
+        return url;
+    }
     var authorization = getAuthorizationAsync.call(this, {
         Method: params.Method || 'get',
         Key: params.Key,
@@ -1951,6 +1974,9 @@ function getUrl(params) {
     if (action) {
         url += action;
     }
+    if (params.isLocation) {
+        url = url.replace(/^https?:\/\//, '');
+    }
     return url;
 }
 

test/test.js

@@ -143,7 +143,7 @@ describe('putBucket()', function () {
             Bucket: NewBucket,
             Region: config.Region
         }, function (err, data) {
-            assert.equal('http://' + NewBucket + '.cos.' + config.Region + '.myqcloud.com', data.Location);
+            assert.equal(NewBucket + '.cos.' + config.Region + '.myqcloud.com', data.Location);
             cos.headBucket({
                 Bucket: NewBucket,
                 Region: config.Region