自动计算分片大小

tencentyun · Jan 16, 2018 · 6a8042e · 6a8042e
1 parent 4257d09
commit 6a8042e
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 10 deletions.
diff --git a/dist/cos-js-sdk-v5.js b/dist/cos-js-sdk-v5.js
@@ -2347,7 +2347,7 @@ util.extend(COS.prototype, base);
 util.extend(COS.prototype, advance);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '0.3.6';
+COS.version = '0.3.7';
 
 module.exports = COS;
 
@@ -9963,7 +9963,7 @@ function sliceUploadFile(params, callback) {
     var Region = params.Region;
     var Key = params.Key;
     var Body = params.Body;
-    var SliceSize = params.SliceSize || this.options.ChunkSize;
+    var ChunkSize = params.ChunkSize || params.SliceSize || this.options.ChunkSize;
     var AsyncLimit = params.AsyncLimit;
     var StorageClass = params.StorageClass || 'Standard';
     var FileSize;
@@ -10009,7 +10009,7 @@ function sliceUploadFile(params, callback) {
             Key: Key,
             Body: Body,
             FileSize: FileSize,
-            SliceSize: SliceSize,
+            SliceSize: ChunkSize,
             AsyncLimit: AsyncLimit,
             UploadData: UploadData,
             onProgress: onProgress
@@ -10034,7 +10034,7 @@ function sliceUploadFile(params, callback) {
                 StorageClass: StorageClass,
                 Body: Body,
                 FileSize: FileSize,
-                SliceSize: SliceSize,
+                SliceSize: ChunkSize,
                 onHashProgress: onHashProgress
             });
             getUploadIdAndPartList.call(self, _params, function (err, UploadData) {
@@ -10050,6 +10050,17 @@ function sliceUploadFile(params, callback) {
     // 获取上传文件大小
     FileSize = Body.size || params.ContentLength;
 
+    // 控制分片大小
+    (function () {
+        var SIZE = [1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 1024 * 2, 1024 * 4, 1024 * 8, 1024 * 10];
+        var AutoChunkSize = 1024 * 1024;
+        for (var i = 0; i < SIZE.length; i++) {
+            AutoChunkSize = SIZE[i] * 1024 * 1024;
+            if (FileSize / AutoChunkSize < 10000) break;
+        }
+        ChunkSize = Math.max(ChunkSize, AutoChunkSize);
+    })();
+
     if (FileSize === 0) {
         params.Body = '';
         self.putObject(params, callback);

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

diff --git a/src/advance.js b/src/advance.js
@@ -10,7 +10,7 @@ function sliceUploadFile(params, callback) {
     var Region = params.Region;
     var Key = params.Key;
     var Body = params.Body;
-    var SliceSize = params.SliceSize || this.options.ChunkSize;
+    var ChunkSize = params.ChunkSize || params.SliceSize || this.options.ChunkSize;
     var AsyncLimit = params.AsyncLimit;
     var StorageClass = params.StorageClass || 'Standard';
     var FileSize;
@@ -56,7 +56,7 @@ function sliceUploadFile(params, callback) {
             Key: Key,
             Body: Body,
             FileSize: FileSize,
-            SliceSize: SliceSize,
+            SliceSize: ChunkSize,
             AsyncLimit: AsyncLimit,
             UploadData: UploadData,
             onProgress: onProgress
@@ -81,7 +81,7 @@ function sliceUploadFile(params, callback) {
                 StorageClass: StorageClass,
                 Body: Body,
                 FileSize: FileSize,
-                SliceSize: SliceSize,
+                SliceSize: ChunkSize,
                 onHashProgress: onHashProgress,
             });
             getUploadIdAndPartList.call(self, _params, function (err, UploadData) {
@@ -97,6 +97,17 @@ function sliceUploadFile(params, callback) {
     // 获取上传文件大小
     FileSize = Body.size || params.ContentLength;
 
+    // 控制分片大小
+    (function () {
+        var SIZE = [1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 1024 * 2, 1024 * 4, 1024 * 8, 1024 * 10];
+        var AutoChunkSize = 1024 * 1024;
+        for (var i = 0; i < SIZE.length; i++) {
+            AutoChunkSize = SIZE[i] * 1024 * 1024;
+            if (FileSize / AutoChunkSize < 10000) break;
+        }
+        ChunkSize = Math.max(ChunkSize, AutoChunkSize);
+    })();
+
     if (FileSize === 0) {
         params.Body = '';
         self.putObject(params, callback);

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