Merge pull request #111 from livehigh/feat/putObject_base64&returnUploadId

Feat/put object base64&return upload

Author: carsonxu

demo/demo.js

@@ -923,6 +923,44 @@ function putObject() {
     });
 }
 
+// 简单上传 文件boby为base64
+function putObject_base64ToBlob() {
+    var base64Url = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAABRFBMVEUAAAAAo/8Ao/8Ao/8Ao/8ApP8Aov8Ao/8Abv8Abv8AyNwAyNwAo/8Ao/8Ao/8Abv8Ao/8AivgAo/8AyNwAbv8Abv8AydwApf8Abf8Ao/8AbP8Ao/8AyNwAydwAbv8AydwApP8Ao/8AyNwAo/8AyNwAydsAyNwAxd8Aov8AyNwAytsAo/8Abv8AyNwAbv8Av+MAo/8AytsAo/8Abv8AyNwAo/8Abv8AqfkAbv8Aov8Abv8AyNwAov8Abv8Ao/8Abv8Ao/8AydwAo/8Ao/8Ate8Ay9oAvOcAof8AveAAyNwAyNwAo/8AyNwAy9kAo/8AyNwAyNwAo/8AqP8Aaf8AyNwAbv0Abv8Abv8AaP8Ao/8Ao/8Ao/8Ao/8Abv8AyNwAgvcAaP8A0dkAo/8AyNwAav8Abv8Ao/8Abv8AyNwAy9sAvOUAtePdkYxjAAAAZnRSTlMAw/co8uAuJAn8+/Tt29R8DAX77+nZz87Jv6CTh3lxTklAPjouJRsL5tjAuLiyr62roaCakYp0XVtOQTMyLiohICAcGRP49vTv5+PJurawq6mnnJuYl4+OiIB7eXVvX15QSDgqHxNcw3l6AAABe0lEQVQ4y82P11oCQQxGIy5FUJpKk6aAhV6k92LvvXedDfj+92ZkYQHxnnMxu3/OfJMEJo6y++baXf5XVw22GVGcsRmq431mQZRYyIzRGgdXi+HwIv86NDBKisrRAtU1hSj9pkZ9jpo/9YKbRsmNNKCHDXI00BxfMMirKNpMcjQ5Lm4/YZArUXyBYUwg40nsdr5jb3LBe25VWpNeKa1GENsEnq52C80z1uW48estiKjb19G54QdCrScnKAU69U3KJ4jzrsBawDWPuOcBqMyRvlcb1Y+zjMUBVsivAKe4gXgEKiVjSh9wlunGMmwiOqFL3RI0cj+nkgp3jC1BELVFkGiZSuvkp3tZZWZ2sKCuDj185PXqfmwI7AAOUctHkJoOeXg3sxA4ES+l7CVvrYHMEmNp8GtR+wycPG0+1RrwWQUzl4CvgQmPP5Ddofl8tWkJVT7J+BIAaxEktrYZoRAUfXgOGYHfcOqw3WF/EdLccz5cMfvUCPb4QwUmhB8+v12HZPCkbgAAAABJRU5ErkJggg==';
+    var dataURLtoBlob = function (dataurl) {
+      var arr = dataurl.split(',');
+      var mime = arr[0].match(/:(.*?);/)[1];
+      var bstr = atob(arr[1]);
+      var n = bstr.length;
+      var u8arr = new Uint8Array(n);
+      while (n--) {
+          u8arr[n] = bstr.charCodeAt(n);
+      }
+      return new Blob([u8arr], { type: mime });
+     };
+    // 调用方法
+    cos.putObject({
+        Bucket: config.Bucket, // Bucket 格式：test-1250000000
+        Region: config.Region,
+        Key: 'base64_file.png', /* 必须 */
+        Body: dataURLtoBlob(base64Url),
+        onTaskReady: function (tid) {
+            logger.log('onTaskReady', tid);
+        },
+        onTaskStart: function (info) {
+            logger.log('onTaskStart', info);
+        },
+        onProgress: function (progressData) {
+            logger.log(JSON.stringify(progressData));
+        },
+        Headers: {
+            // 万象持久化接口，上传时持久化
+            // 'Pic-Operations': '{"is_pic_info": 1, "rules": [{"fileid": "test.jpg", "rule": "imageMogr2/thumbnail/!50p"}]}'
+        },
+    }, function (err, data) {
+        logger.log('putObject:', err || data);
+    });
+}
+
 function putObjectCopy() {
     cos.putObjectCopy({
         Bucket: config.Bucket, // Bucket 格式：test-1250000000
@@ -1647,6 +1685,7 @@ function CIExample4(){
         'abortUploadTask',
         'selectObjectContent',
         'putObject',
+        'putObject_base64ToBlob',
 
         'header-高级操作',
         'sliceUploadFile',
@@ -1671,6 +1710,7 @@ function CIExample4(){
     ];
     var labelMap = {
         putObject: '简单上传',
+        putObject_base64ToBlob: '简单上传：base64转blob',
         sliceUploadFile: '分片上传',
         sliceCopyFile: '分片复制',
         uploadFiles: '批量上传文件',

dist/cos-js-sdk-v5.js

@@ -2422,7 +2422,7 @@ base.init(COS, task);
 advance.init(COS, task);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '1.2.10';
+COS.version = '1.2.11';
 
 module.exports = COS;
 
@@ -8589,12 +8589,18 @@ function sliceUploadFile(params, callback) {
     // 上传过程中出现错误，返回错误
     ep.on('error', function (err) {
         if (!self._isRunningTask(TaskId)) return;
-        return callback(err);
+        var _err = util.extend({
+            UploadId: params.UploadData.uploadId || ''
+        }, err);
+        return callback(_err);
     });
 
     // 上传分块完成，开始 uploadSliceComplete 操作
     ep.on('upload_complete', function (UploadCompleteData) {
-        callback(null, UploadCompleteData);
+        var _UploadCompleteData = util.extend({
+            UploadId: params.UploadData.UploadId || ''
+        }, UploadCompleteData);
+        callback(null, _UploadCompleteData);
     });
 
     // 上传分块完成，开始 uploadSliceComplete 操作

dist/cos-js-sdk-v5.min.js

@@ -1,6 +1,6 @@
 {
   "name": "cos-js-sdk-v5",
-  "version": "1.2.11",
+  "version": "1.2.12",
   "description": "JavaScript SDK for [腾讯云对象存储](https://cloud.tencent.com/product/cos)",
   "main": "index.js",
   "types": "index.d.ts",

package.json

@@ -24,12 +24,18 @@ function sliceUploadFile(params, callback) {
     // 上传过程中出现错误，返回错误
     ep.on('error', function (err) {
         if (!self._isRunningTask(TaskId)) return;
-        return callback(err);
+        var _err = util.extend({
+          UploadId: params.UploadData.uploadId || ''
+        }, err);
+        return callback(_err);
     });
 
     // 上传分块完成，开始 uploadSliceComplete 操作
     ep.on('upload_complete', function (UploadCompleteData) {
-        callback(null, UploadCompleteData);
+        var _UploadCompleteData = util.extend({
+          UploadId: params.UploadData.UploadId || ''
+        }, UploadCompleteData);
+        callback(null, _UploadCompleteData);
     });
 
     // 上传分块完成，开始 uploadSliceComplete 操作

src/advance.js

@@ -64,6 +64,6 @@ base.init(COS, task);
 advance.init(COS, task);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '1.2.10';
+COS.version = '1.2.12';
 
 module.exports = COS;