微信 PC webview 计算分片 md5 不复制分片 blob

tencentyun · Dec 26, 2018 · 170da58 · 170da58
1 parent 1c58e74
commit 170da58
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 38 deletions.
diff --git a/dist/cos-js-sdk-v5.js b/dist/cos-js-sdk-v5.js
@@ -570,7 +570,7 @@ var fileSliceNeedCopy = function () {
     };
     return check(navigator.userAgent);
 }();
-util.fileSlice = function (file, start, end, callback) {
+util.fileSlice = function (file, start, end, isUseToUpload, callback) {
     var blob;
     if (file.slice) {
         blob = file.slice(start, end);
@@ -579,9 +579,10 @@ util.fileSlice = function (file, start, end, callback) {
     } else if (file.webkitSlice) {
         blob = file.webkitSlice(start, end);
     }
-    if (fileSliceNeedCopy) {
+    if (isUseToUpload && fileSliceNeedCopy) {
         var reader = new FileReader();
         reader.onload = function (e) {
+            blob = null;
             callback(new Blob([reader.result]));
         };
         reader.readAsArrayBuffer(blob);
@@ -1978,7 +1979,7 @@ base.init(COS, task);
 advance.init(COS, task);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '0.5.4';
+COS.version = '0.5.5';
 
 module.exports = COS;
 
@@ -10878,7 +10879,7 @@ function getUploadIdAndPartList(params, callback) {
                 Size: ChunkSize
             });
         } else {
-            util.fileSlice(params.Body, start, end, function (chunkItem) {
+            util.fileSlice(params.Body, start, end, false, function (chunkItem) {
                 util.getFileMd5(chunkItem, function (err, md5) {
                     if (err) return callback(err);
                     var ETag = '"' + md5 + '"';
@@ -11282,7 +11283,7 @@ function uploadSliceItem(params, callback) {
     var PartItem = UploadData.PartList[PartNumber - 1];
     Async.retry(ChunkRetryTimes, function (tryCallback) {
         if (!self._isRunningTask(TaskId)) return;
-        util.fileSlice(FileBody, start, end, function (Body) {
+        util.fileSlice(FileBody, start, end, true, function (Body) {
             self.multipartUpload({
                 TaskId: TaskId,
                 Bucket: Bucket,

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.5.4",
+  "version": "0.5.5",
   "description": "JavaScript SDK for [腾讯云对象存储](https://cloud.tencent.com/document/product/436)",
   "main": "index.js",
   "scripts": {

diff --git a/src/advance.js b/src/advance.js
@@ -254,7 +254,7 @@ function getUploadIdAndPartList(params, callback) {
                 Size: ChunkSize
             });
         } else {
-            util.fileSlice(params.Body, start, end, function (chunkItem) {
+            util.fileSlice(params.Body, start, end, false, function (chunkItem) {
                 util.getFileMd5(chunkItem, function (err, md5) {
                     if (err) return callback(err);
                     var ETag = '"' + md5 + '"';
@@ -652,35 +652,35 @@ function uploadSliceItem(params, callback) {
         ContentLength = end - start;
     }
 
-        var PartItem = UploadData.PartList[PartNumber - 1];
-        Async.retry(ChunkRetryTimes, function (tryCallback) {
-            if (!self._isRunningTask(TaskId)) return;
-            util.fileSlice(FileBody, start, end, function (Body) {
-                self.multipartUpload({
-                    TaskId: TaskId,
-                    Bucket: Bucket,
-                    Region: Region,
-                    Key: Key,
-                    ContentLength: ContentLength,
-                    PartNumber: PartNumber,
-                    UploadId: UploadData.UploadId,
-                    ServerSideEncryption: ServerSideEncryption,
-                    Body: Body,
-                    onProgress: params.onProgress,
-                }, function (err, data) {
-                    if (!self._isRunningTask(TaskId)) return;
-                    if (err) {
-                        return tryCallback(err);
-                    } else {
-                        PartItem.Uploaded = true;
-                        return tryCallback(null, data);
-                    }
-                });
+    var PartItem = UploadData.PartList[PartNumber - 1];
+    Async.retry(ChunkRetryTimes, function (tryCallback) {
+        if (!self._isRunningTask(TaskId)) return;
+        util.fileSlice(FileBody, start, end, true, function (Body) {
+            self.multipartUpload({
+                TaskId: TaskId,
+                Bucket: Bucket,
+                Region: Region,
+                Key: Key,
+                ContentLength: ContentLength,
+                PartNumber: PartNumber,
+                UploadId: UploadData.UploadId,
+                ServerSideEncryption: ServerSideEncryption,
+                Body: Body,
+                onProgress: params.onProgress,
+            }, function (err, data) {
+                if (!self._isRunningTask(TaskId)) return;
+                if (err) {
+                    return tryCallback(err);
+                } else {
+                    PartItem.Uploaded = true;
+                    return tryCallback(null, data);
+                }
             });
-        }, function (err, data) {
-            if (!self._isRunningTask(TaskId)) return;
-            return callback(err, data);
         });
+    }, function (err, data) {
+        if (!self._isRunningTask(TaskId)) return;
+        return callback(err, data);
+    });
 }
 
 

diff --git a/src/cos.js b/src/cos.js
@@ -58,6 +58,6 @@ base.init(COS, task);
 advance.init(COS, task);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '0.5.4';
+COS.version = '0.5.5';
 
 module.exports = COS;
diff --git a/src/util.js b/src/util.js
@@ -505,7 +505,7 @@ var fileSliceNeedCopy = (function () {
     };
     return check(navigator.userAgent);
 })();
-util.fileSlice = function (file, start, end, callback) {
+util.fileSlice = function (file, start, end, isUseToUpload, callback) {
     var blob;
     if (file.slice) {
         blob = file.slice(start, end);
@@ -514,9 +514,10 @@ util.fileSlice = function (file, start, end, callback) {
     } else if (file.webkitSlice) {
         blob = file.webkitSlice(start, end);
     }
-    if (fileSliceNeedCopy) {
+    if (isUseToUpload && fileSliceNeedCopy) {
         var reader = new FileReader();
         reader.onload = function (e) {
+            blob = null;
             callback(new Blob([reader.result]));
         };
         reader.readAsArrayBuffer(blob);