分片上传支持 x-cos-meta 传递给 complete 接口

tencentyun · Dec 1, 2020 · 893dde3 · 893dde3
1 parent e38e060
commit 893dde3
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 8 deletions.
diff --git a/dist/cos-js-sdk-v5.js b/dist/cos-js-sdk-v5.js
@@ -2161,7 +2161,7 @@ base.init(COS, task);
 advance.init(COS, task);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '1.1.1';
+COS.version = '1.1.2';
 
 module.exports = COS;
 
@@ -8362,12 +8362,17 @@ function sliceUploadFile(params, callback) {
 
     // 上传分块完成，开始 uploadSliceComplete 操作
     ep.on('upload_slice_complete', function (UploadData) {
+        var metaHeaders = {};
+        util.each(params.Headers, function (val, k) {
+            if (k.toLowerCase().indexOf('x-cos-meta-') === 0) metaHeaders[k] = val;
+        });
         uploadSliceComplete.call(self, {
             Bucket: Bucket,
             Region: Region,
             Key: Key,
             UploadId: UploadData.UploadId,
-            SliceList: UploadData.SliceList
+            SliceList: UploadData.SliceList,
+            Headers: metaHeaders
         }, function (err, data) {
             if (!self._isRunningTask(TaskId)) return;
             session.removeUsing(UploadData.UploadId);
@@ -8955,6 +8960,7 @@ function uploadSliceComplete(params, callback) {
     var SliceList = params.SliceList;
     var self = this;
     var ChunkRetryTimes = this.options.ChunkRetryTimes + 1;
+    var Headers = params.Headers;
     var Parts = SliceList.map(function (item) {
         return {
             PartNumber: item.PartNumber,
@@ -8968,7 +8974,8 @@ function uploadSliceComplete(params, callback) {
             Region: Region,
             Key: Key,
             UploadId: UploadId,
-            Parts: Parts
+            Parts: Parts,
+            Headers: Headers
         }, tryCallback);
     }, function (err, data) {
         callback(err, data);
@@ -9233,6 +9240,10 @@ function sliceCopyFile(params, callback) {
 
     // 分片复制完成，开始 multipartComplete 操作
     ep.on('copy_slice_complete', function (UploadData) {
+        var metaHeaders = {};
+        util.each(params.Headers, function (val, k) {
+            if (k.toLowerCase().indexOf('x-cos-meta-') === 0) metaHeaders[k] = val;
+        });
         self.multipartComplete({
             Bucket: Bucket,
             Region: Region,

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

diff --git a/src/advance.js b/src/advance.js
@@ -34,12 +34,17 @@ function sliceUploadFile(params, callback) {
 
     // 上传分块完成，开始 uploadSliceComplete 操作
     ep.on('upload_slice_complete', function (UploadData) {
+        var metaHeaders = {};
+        util.each(params.Headers, function (val, k) {
+            if (k.toLowerCase().indexOf('x-cos-meta-') === 0) metaHeaders[k] = val;
+        });
         uploadSliceComplete.call(self, {
             Bucket: Bucket,
             Region: Region,
             Key: Key,
             UploadId: UploadData.UploadId,
             SliceList: UploadData.SliceList,
+            Headers: metaHeaders,
         }, function (err, data) {
             if (!self._isRunningTask(TaskId)) return;
             session.removeUsing(UploadData.UploadId);
@@ -627,6 +632,7 @@ function uploadSliceComplete(params, callback) {
     var SliceList = params.SliceList;
     var self = this;
     var ChunkRetryTimes = this.options.ChunkRetryTimes + 1;
+    var Headers = params.Headers;
     var Parts = SliceList.map(function (item) {
         return {
             PartNumber: item.PartNumber,
@@ -640,7 +646,8 @@ function uploadSliceComplete(params, callback) {
             Region: Region,
             Key: Key,
             UploadId: UploadId,
-            Parts: Parts
+            Parts: Parts,
+            Headers: Headers,
         }, tryCallback);
     }, function (err, data) {
         callback(err, data);
@@ -905,7 +912,10 @@ function sliceCopyFile(params, callback) {
     var onProgress;
 
     // 分片复制完成，开始 multipartComplete 操作
-    ep.on('copy_slice_complete', function (UploadData) {
+    ep.on('copy_slice_complete', function (UploadData) {var metaHeaders = {};
+        util.each(params.Headers, function (val, k) {
+            if (k.toLowerCase().indexOf('x-cos-meta-') === 0) metaHeaders[k] = val;
+        });
         self.multipartComplete({
             Bucket: Bucket,
             Region: Region,

diff --git a/src/cos.js b/src/cos.js
@@ -59,6 +59,6 @@ base.init(COS, task);
 advance.init(COS, task);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '1.1.1';
+COS.version = '1.1.2';
 
 module.exports = COS;