Merge branch 'master' into dev/strictSign

Author: livehigh

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cos-nodejs-sdk-v5",
-  "version": "2.16.0-beta.4",
+  "version": "2.16.0-beta.5",
   "description": "cos nodejs sdk v5",
   "main": "index.js",
   "types": "index.d.ts",

sdk/advance.js

@@ -1617,9 +1617,11 @@ function downloadFile(params, callback) {
 
                 // 只校验文件大小和 crc64 是否有变更
                 var changed;
-                if (chunkHeaders['x-cos-hash-crc64ecma'] !== head.crc64ecma)
+                if (chunkHeaders['x-cos-hash-crc64ecma'] && head.crc64ecma && chunkHeaders['x-cos-hash-crc64ecma'] !== head.crc64ecma) {
                   changed = 'download error, x-cos-hash-crc64ecma has changed.';
-                else if (totalSize !== head.size) changed = 'download error, Last-Modified has changed.';
+                } else if (totalSize !== head.size) {
+                  changed = 'download error, Last-Modified has changed.';
+                }
                 // else if (data.ETag !== head.ETag) error = 'download error, ETag has changed.';
                 // else if (chunkHeaders['last-modified'] !== head.mtime) error = 'download error, Last-Modified has changed.';
 

test/test.js

@@ -6181,8 +6181,7 @@ group('getObject() 手动关闭合并 Key 校验', function () {
       },
       function (err, data) {
         console.log('getObject Body1', err || data);
-        assert.ok(data.Body.toString().includes('ListBucketResult'));
-        // assert.ok(err);
+        assert.ok(err);
         done();
       }
     );
@@ -6200,8 +6199,7 @@ group('getObject() 手动关闭合并 Key 校验', function () {
       },
       function (err, data) {
         console.log('getObject Body3', err || data);
-        assert.ok(data.Body.toString().includes('ListBucketResult'));
-        // assert.ok(err);
+        assert.ok(err);
         done();
       }
     );