分片大小参数容错

tencentyun · Apr 9, 2018 · ca65174 · ca65174
1 parent 39954e7
commit ca65174
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/dist/cos-js-sdk-v5.js b/dist/cos-js-sdk-v5.js
@@ -611,7 +611,7 @@ util.extend(COS.prototype, base);
 util.extend(COS.prototype, advance);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '0.4.2';
+COS.version = '0.4.3';
 
 module.exports = COS;
 
@@ -8100,7 +8100,7 @@ function sliceUploadFile(params, callback) {
             AutoChunkSize = SIZE[i] * 1024 * 1024;
             if (FileSize / AutoChunkSize < 10000) break;
         }
-        ChunkSize = Math.max(ChunkSize, AutoChunkSize);
+        params.ChunkSize = params.SliceSize = ChunkSize = Math.max(ChunkSize, AutoChunkSize);
     })();
 
     if (FileSize === 0) {
@@ -8385,7 +8385,7 @@ function uploadSliceList(params, cb) {
     var UploadData = params.UploadData;
     var FileSize = params.FileSize;
     var SliceSize = params.SliceSize;
-    var ChunkParallel = params.AsyncLimit || self.options.ChunkParallelLimit || 1;
+    var ChunkParallel = Math.min(params.AsyncLimit || self.options.ChunkParallelLimit || 1, 256);
     var Body = params.Body;
     var SliceCount = Math.ceil(FileSize / SliceSize);
     var FinishSize = 0;

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.4.2",
+  "version": "0.4.3",
   "description": "cos js sdk v5",
   "main": "index.js",
   "scripts": {

diff --git a/src/advance.js b/src/advance.js
@@ -114,7 +114,7 @@ function sliceUploadFile(params, callback) {
             AutoChunkSize = SIZE[i] * 1024 * 1024;
             if (FileSize / AutoChunkSize < 10000) break;
         }
-        ChunkSize = Math.max(ChunkSize, AutoChunkSize);
+        params.ChunkSize = params.SliceSize = ChunkSize = Math.max(ChunkSize, AutoChunkSize);
     })();
 
     if (FileSize === 0) {
@@ -398,7 +398,7 @@ function uploadSliceList(params, cb) {
     var UploadData = params.UploadData;
     var FileSize = params.FileSize;
     var SliceSize = params.SliceSize;
-    var ChunkParallel = params.AsyncLimit || self.options.ChunkParallelLimit || 1;
+    var ChunkParallel = Math.min(params.AsyncLimit || self.options.ChunkParallelLimit || 1, 256);
     var Body = params.Body;
     var SliceCount = Math.ceil(FileSize / SliceSize);
     var FinishSize = 0;

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