fix upload

README.md

@@ -6,6 +6,12 @@
 
 ## get started
 
+1. 使用 SDK 需要浏览器支持HTML 5
+2. 请您到https://console.qcloud.com/cos 获取您的 AppId、Bucket、Region、SecretId 和 SecretKey
+3. 请您到https://console.qcloud.com/cos 针对您要操作的bucket进行跨域（CORS）设置，可以按照如下范例，修改允许的来源 Origin 和 Headers：
+
+    ![cors.png](./demo/cors.png)
+
 ```html
 <script src="dist/cos-js-sdk-v5.js"></script>
 <script>

demo/demo.js

@@ -1,28 +1,31 @@
+var getAuthorization = function (options, callback) {
+
+    // 方法一（推荐）
+    var method = (options.method || 'get').toLowerCase();
+    var pathname = options.pathname || '/';
+    var url = '../server/auth.php?method=' + method + '&pathname=' + pathname;
+    var xhr = new XMLHttpRequest();
+    xhr.open('GET', url, true);
+    xhr.onload = function (e) {
+        callback(e.target.responseText);
+    };
+    xhr.send();
+
+    // // 方法二（适用于前端调试）
+    // var authorization = COS.getAuthorization({
+    //     SecretId: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
+    //     SecretKey: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
+    //     method: (options.method || 'get').toLowerCase(),
+    //     pathname: options.pathname || '/',
+    // });
+    // callback(authorization);
+
+};
+
 var cos = new COS({
     AppId: config.AppId,
-    getAuthorization: function (options, callback) {
-
-        // 方法一（推荐）
-        var method = (options.method || 'get').toLowerCase();
-        var pathname = options.pathname || '/';
-        var url = '../server/auth.php?method=' + method + '&pathname=' + pathname;
-        var xhr = new XMLHttpRequest();
-        xhr.open('GET', url, true);
-        xhr.onload = function (e) {
-            callback(e.target.responseText);
-        };
-        xhr.send();
-
-        // // 方法二（适用于前端调试）
-        // var authorization = COS.getAuthorization({
-        //     SecretId: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
-        //     SecretKey: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
-        //     method: (options.method || 'get').toLowerCase(),
-        //     pathname: options.pathname || '/',
-        // });
-        // callback(authorization);
-
-    }
+    ChunkParallelLimit: 1,
+    getAuthorization: getAuthorization
 });
 
 var pre = document.querySelector('.result');
@@ -66,7 +69,7 @@ function getAuth() {
         AppId = arr[1];
     }
     var key = '1.png';
-    cos.getAuthorization({
+    getAuthorization({
         method: 'get',
         pathname: '/' + key
     }, function (auth) {
@@ -314,7 +317,7 @@ function deleteBucket() {
 function putObject() {
     // 创建测试文件
     var filename = '1mb.zip';
-    var blob = util.createFile({type: 'image/png', size: 1024 * 1024});
+    var blob = util.createFile({size: 1024 * 1024});
     // 调用方法
     cos.putObject({
         Bucket: config.Bucket, /* 必须 */
@@ -446,13 +449,11 @@ function abortUploadTask() {
 }
 
 function sliceUploadFile() {
-    var blob = util.createFile({type: 'image/png', size: 1024 * 1024 * 10});
+    var blob = util.createFile({size: 1024 * 1024 * 10});
     cos.sliceUploadFile({
         Bucket: config.Bucket, /* 必须 */
         Region: config.Region,
         Key: '10mb.zip', /* 必须 */
-        SliceSize: 1024 * 1024,  //1MB  /* 非必须 */
-        AsyncLimit: 3, /* 非必须 */
         Body: blob,
         onHashProgress: function (progressData) {
             console.log(JSON.stringify(progressData));
@@ -465,7 +466,7 @@ function sliceUploadFile() {
     });
 }
 
-getService();
+// getService();
 // getAuth();
 // putBucket();
 // getBucket();

demo/util.js

@@ -5,7 +5,9 @@ var util = {
         arr.forEach(function (char, i) {
             arr[i] = 0;
         });
-        var blob = new Blob([buffer], {type: options.type || 'image/png'});
+        var opt = {};
+        options.type && (opt.type = options.type);
+        var blob = new Blob([buffer], options);
         return blob;
     }
 };

package.json

@@ -4,8 +4,8 @@
   "description": "cos js sdk v5",
   "main": "index.js",
   "scripts": {
-    "dev": "webpack -w",
-    "build": "webpack"
+    "dev": "SET NODE_ENV=development&& webpack -w",
+    "build": "SET NODE_ENV=development&& webpack"
   },
   "repository": {
     "type": "git",

src/advance.js

@@ -87,7 +87,7 @@ function _sliceUploadFile (params, callback) {
                 Region: Region,
                 Key: Key,
                 StorageClass: StorageClass,
-                FilePath: FilePath,
+                Body: Body,
                 FileSize: FileSize,
                 SliceSize: SliceSize,
                 onHashProgress: onHashProgress,
@@ -541,11 +541,7 @@ function uploadSliceItem(params, callback) {
         ContentLength = end - start;
     }
 
-    var Body = fs.createReadStream(FilePath, {
-        start: start,
-        end: end - 1
-    });
-
+    var Body = util.fileSlice.call(FileBody, start, end);
     var ContentSha1 = UploadData.PartList[PartNumber - 1].ETag;
     Async.retry(sliceRetryTimes, function (tryCallback) {
         if (!self._isRunningTask(TaskId)) return;

src/base.js

@@ -940,7 +940,6 @@ function _putObject(params, callback) {
         Key: params.Key,
         headers: headers,
         body: Body,
-        inputStream: readStream,
         onProgress: onFileProgress
     }, function (err, data) {
         params.TaskId === TaskId && self.off('inner-kill-task', killTask);
@@ -1375,7 +1374,7 @@ function multipartUpload(params, callback) {
         Key: params.Key,
         action: action,
         headers: headers,
-        inputStream: params.Body || null,
+        body: params.Body || null,
         onProgress: params.onProgress
     }, function (err, data) {
         if (params.TaskId) self.off('inner-kill-task', killTask);
@@ -1814,6 +1813,7 @@ var API_MAP = {
     getObject: getObject,
     headObject: headObject,
     putObject: putObject,
+    _putObject: _putObject,
     deleteObject: deleteObject,
     getObjectAcl: getObjectAcl,
     putObjectAcl: putObjectAcl,

src/util.js

@@ -163,11 +163,9 @@ function clone(obj) {
     });
 }
 function extend(target, source) {
-    for (var method in source) {
-        if (!target[method]) {
-            target[method] = source[method];
-        }
-    }
+    each(source, function (val, key) {
+        target[key] = source[key];
+    });
     return target;
 }
 function isArray(arr) {
@@ -279,6 +277,7 @@ var apiWrapper = function (apiName, apiFn) {
 var fileSlice = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice;
 
 var util = {
+    fileSlice: fileSlice,
     apiWrapper: apiWrapper,
     getAuth: getAuth,
     xml2json: xml2json,

webpack.config.js

@@ -23,7 +23,16 @@ module.exports = {
     performance: {
         hints: false
     },
-    plugins: [
+};
+
+if (process.env.NODE_ENV === 'production') {
+    module.exports.output.filename = 'cos-js-sdk-v5.min.js';
+    module.exports.plugins = (module.exports.plugins || []).concat([
+        new webpack.DefinePlugin({
+            'process.env': {
+                NODE_ENV: '"production"'
+            }
+        }),
         new webpack.optimize.UglifyJsPlugin({
             sourceMap: true,
             compress: {
@@ -33,5 +42,5 @@ module.exports = {
         new webpack.LoaderOptionsPlugin({
             minimize: true
         })
-    ]
-};
+    ])
+}