修改最大分片大小

Author: carsonxu

package.json

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

sdk/advance.js

@@ -5,6 +5,7 @@ var util = require('./util');
 
 // 文件分块上传全过程，暴露的分块上传接口
 function sliceUploadFile(params, callback) {
+    var self = this;
     var ep = new EventProxy();
     var TaskId = params.TaskId;
     var Bucket = params.Bucket;
@@ -16,7 +17,6 @@ function sliceUploadFile(params, callback) {
     var StorageClass = params.StorageClass || 'Standard';
     var ServerSideEncryption = params.ServerSideEncryption;
     var FileSize;
-    var self = this;
 
     var onProgress;
     var onHashProgress = params.onHashProgress;
@@ -135,7 +135,7 @@ function sliceUploadFile(params, callback) {
         var AutoChunkSize = 1024 * 1024;
         for (var i = 0; i < SIZE.length; i++) {
             AutoChunkSize = SIZE[i] * 1024 * 1024;
-            if (FileSize / AutoChunkSize <= 1024) break;
+            if (FileSize / AutoChunkSize <= self.options.MaxPartNumber) break;
         }
         params.ChunkSize = params.SliceSize = ChunkSize = Math.max(ChunkSize, AutoChunkSize);
     })();
@@ -1040,7 +1040,7 @@ function sliceCopyFile(params, callback) {
             var AutoChunkSize = 1024 * 1024;
             for (var i = 0; i < SIZE.length; i++) {
                 AutoChunkSize = SIZE[i] * 1024 * 1024;
-                if (FileSize / AutoChunkSize <= 1024) break;
+                if (FileSize / AutoChunkSize <= self.options.MaxPartNumber) break;
             }
             params.ChunkSize = ChunkSize = Math.max(ChunkSize, AutoChunkSize);
 

sdk/cos.js

@@ -19,6 +19,7 @@ var defaultOptions = {
     CopyChunkParallelLimit: 20,
     CopyChunkSize: 1024 * 1024 * 10,
     CopySliceSize: 1024 * 1024 * 10,
+    MaxPartNumber: 10000,
     ProgressInterval: 1000,
     UploadQueueSize: 10000,
     Domain: '',
@@ -44,6 +45,7 @@ var COS = function (options) {
     this.options.CopyChunkParallelLimit = Math.max(1, this.options.CopyChunkParallelLimit);
     this.options.CopyChunkSize = Math.max(1024 * 1024, this.options.CopyChunkSize);
     this.options.CopySliceSize = Math.max(0, this.options.CopySliceSize);
+    this.options.MaxPartNumber = Math.max(1024, Math.min(10000, this.options.MaxPartNumber));
     if (this.options.AppId) {
         console.warn('warning: AppId has been deprecated, Please put it at the end of parameter Bucket(E.g: "test-1250000000").');
     }

test/test.js

@@ -1373,7 +1373,7 @@ group('BucketCors', function () {
     var CORSRules = [{
         "AllowedOrigins": ["*"],
         "AllowedMethods": ["GET", "POST", "PUT", "DELETE", "HEAD"],
-        "AllowedHeaders": ["*"],
+        "AllowedHeaders": ["*", 'test-' + Date.now().toString(36)],
         "ExposeHeaders": ["ETag", "Content-Length", "x-cos-acl", "x-cos-version-id", "x-cos-request-id", "x-cos-delete-marker", "x-cos-server-side-encryption"],
         "MaxAgeSeconds": "5"
     }];
@@ -1408,8 +1408,7 @@ group('BucketCors', function () {
         });
     });
     test('putBucketCors(),getBucketCors()', function (done, assert) {
-        CORSRules[0].AllowedHeaders[CORSRules[0].AllowedHeaders.length - 1] =
-            'test-' + Date.now().toString(36);
+        CORSRules[0].AllowedHeaders[1] = 'test-' + Date.now().toString(36);
         cos.putBucketCors({
             Bucket: config.Bucket,
             Region: config.Region,
@@ -1430,8 +1429,7 @@ group('BucketCors', function () {
         });
     });
     test('putBucketCors() old', function (done, assert) {
-        var testVal = 'test-' + Date.now().toString(36);
-        CORSRules[0].AllowedHeaders.push(testVal);
+        CORSRules[0].AllowedHeaders[1] = 'test-' + Date.now().toString(36);
         cos.putBucketCors({
             Bucket: config.Bucket,
             Region: config.Region,
@@ -1452,8 +1450,7 @@ group('BucketCors', function () {
         });
     });
     test('putBucketCors() old', function (done, assert) {
-        CORSRules[0].AllowedHeaders[CORSRules[0].AllowedHeaders.length - 1] =
-            'test-' + Date.now().toString(36);
+        CORSRules[0].AllowedHeaders[1] = 'test-' + Date.now().toString(36);
         cos.putBucketCors({
             Bucket: config.Bucket,
             Region: config.Region,