优化代码

Author: carsonxu

sdk/cos.js

@@ -11,6 +11,7 @@ var defaultOptions = {
     AppId: '', // AppId 已废弃，请拼接到 Bucket 后传入，例如：test-1250000000
     SecretId: '',
     SecretKey: '',
+    XCosSecurityToken: '',
     FileParallelLimit: 3,
     ChunkParallelLimit: 3,
     ChunkRetryTimes: 3,
@@ -27,7 +28,6 @@ var defaultOptions = {
     Protocol: '',
     CompatibilityMode: false,
     ForcePathStyle: false,
-    XCosSecurityToken: '',
     UseRawKey: false,
     UploadCheckContentMd5: false,
     UploadIdCacheLimit: 500,

sdk/util.js

@@ -63,7 +63,7 @@ var getAuth = function (opt) {
             key = key.toLowerCase();
             key = camSafeUrlEncode(key);
             val = camSafeUrlEncode(val) || '';
-            list.push(key + '=' +  val)
+            list.push(key + '=' + val)
         }
         return list.join('&');
     };
@@ -188,20 +188,24 @@ var getFileMd5 = function (readStream, callback) {
         callback(null, hash);
     });
 };
+
 function clone(obj) {
     return map(obj, function (v) {
         return typeof v === 'object' ? clone(v) : v;
     });
 }
+
 function extend(target, source) {
     each(source, function (val, key) {
         target[key] = source[key];
     });
     return target;
 }
+
 function isArray(arr) {
     return arr instanceof Array;
 }
+
 function isInArray(arr, item) {
     var flag = false;
     for (var i = 0; i < arr.length; i++) {
@@ -212,13 +216,15 @@ function isInArray(arr, item) {
     }
     return flag;
 }
+
 function each(obj, fn) {
     for (var i in obj) {
         if (obj.hasOwnProperty(i)) {
             fn(obj[i], i);
         }
     }
 }
+
 function map(obj, fn) {
     var o = isArray(obj) ? [] : {};
     for (var i in obj) {
@@ -228,6 +234,7 @@ function map(obj, fn) {
     }
     return o;
 }
+
 function filter(obj, fn) {
     var iaArr = isArray(obj);
     var o = iaArr ? [] : {};
@@ -244,6 +251,7 @@ function filter(obj, fn) {
     }
     return o;
 }
+
 var binaryBase64 = function (str) {
     var i, len, char, arr = [];
     for (i = 0, len = str.length / 2; i < len; i++) {
@@ -417,6 +425,7 @@ var throttleOnProgress = function (total, onProgress) {
     var time0 = Date.now();
     var time1;
     var timer;
+
     function update() {
         timer = 0;
         if (onProgress && (typeof onProgress === 'function')) {
@@ -436,6 +445,7 @@ var throttleOnProgress = function (total, onProgress) {
             }
         }
     }
+
     return function (info, immediately) {
         if (info) {
             size1 = info.loaded;
@@ -453,61 +463,49 @@ var throttleOnProgress = function (total, onProgress) {
 
 var getFileSize = function (api, params, callback) {
     var size;
-    if (util.isBrowser) {
-        if (typeof params.Body === 'string') {
-            params.Body = new global.Blob([params.Body]);
-        }
-        if (params.Body instanceof global.File || params.Body instanceof global.Blob) {
-            size = params.Body.size;
+    if (api === 'sliceUploadFile') {
+        if (params.FilePath) {
+            fs.stat(params.FilePath, function (err, fileStats) {
+                if (err) {
+                    if (params.ContentLength !== undefined) {
+                        size = params.ContentLength;
+                    } else {
+                        callback(err);
+                        return;
+                    }
+                } else {
+                    params.FileStat = fileStats;
+                    params.FileStat.FilePath = params.FilePath;
+                    size = fileStats.isDirectory() ? 0 : fileStats.size;
+                }
+                params.ContentLength = size = size || 0;
+                callback(null, size);
+            });
+            return;
         } else {
-            callback({error: 'params body format error, Only allow File|Blob|String.'});
+            callback({error: 'missing param FilePath'});
             return;
         }
     } else {
-        if (api === 'sliceUploadFile') {
-            if (params.FilePath) {
-                fs.stat(params.FilePath, function (err, fileStats) {
-                    if (err) {
-                        if (params.ContentLength !== undefined) {
-                            size = params.ContentLength;
-                        } else {
-                            callback(err);
-                            return;
-                        }
-                    } else {
-                        params.FileStat = fileStats;
-                        params.FileStat.FilePath = params.FilePath;
-                        size = fileStats.isDirectory() ? 0 : fileStats.size;
-                    }
-                    params.ContentLength = size = size || 0;
-                    callback(null, size);
-                });
-                return;
-            } else {
-                callback({error: 'missing param FilePath'});
-                return;
+        if (params.Body !== undefined) {
+            if (typeof params.Body === 'string') {
+                params.Body = global.Buffer.from(params.Body);
             }
-        } else {
-            if (params.Body !== undefined) {
-                if (typeof params.Body === 'string') {
-                    params.Body = global.Buffer.from(params.Body);
-                }
-                if (params.Body instanceof global.Buffer) {
-                    size = params.Body.length;
-                } else if (typeof params.Body.pipe === 'function') {
-                    if (params.ContentLength === undefined) {
-                        size = undefined;
-                    } else {
-                        size = params.ContentLength;
-                    }
+            if (params.Body instanceof global.Buffer) {
+                size = params.Body.length;
+            } else if (typeof params.Body.pipe === 'function') {
+                if (params.ContentLength === undefined) {
+                    size = undefined;
                 } else {
-                    callback({error: 'params Body format error, Only allow Buffer|Stream|String.'});
-                    return;
+                    size = params.ContentLength;
                 }
             } else {
-                callback({error: 'missing param Body'});
+                callback({error: 'params Body format error, Only allow Buffer|Stream|String.'});
                 return;
             }
+        } else {
+            callback({error: 'missing param Body'});
+            return;
         }
     }
     params.ContentLength = size;
@@ -542,7 +540,8 @@ var util = {
 (function () {
     try {
         configStore = new ConfigStore('cos-nodejs-sdk-v5-storage');
-    } catch (e) {}
+    } catch (e) {
+    }
     var map = {};
     var update = function (key, val) {
         if (map.hasOwnProperty(key)) {