[feature] browser upload use browserify-wrapper .

Author: wangxiao

lib/browserify-wrapper/upload-browser.js

@@ -1,22 +1,65 @@
 'use strict';
 
-module.exports = function upload(file, AV) {
+module.exports = function upload(file, AV, saveOptions) {
   //use /files endpoint.
-  file._previousSave = file._source.then(function(base64, type) {
-    var data = {
-      base64: base64,
-      _ContentType: type,
-      ACL: file._acl,
-      mime_type: type,
-      metaData: file._metaData
-    };
-    return AV._request("files", file._name, null, 'POST', data);
+  var self = file;
+  var dataFormat;
+  self._previousSave = self._source.then(function(data, type) {
+    dataFormat = data;
+    return self._qiniuToken(type);
   }).then(function(response) {
-    file._name = response.name;
-    file._url = response.url;
-    file.id = response.objectId;
-    if(response.size)
-      file._metaData.size = response.size;
-    return file;
+    self._url = response.url;
+    self._bucket = response.bucket;
+    self.id = response.objectId;
+    //Get the uptoken to upload files to qiniu.
+    var uptoken = response.token;
+
+    var data = new FormData();
+    data.append("file", dataFormat, self._name);
+    data.append("key", self._qiniu_key);
+    data.append("token", uptoken);
+
+    var promise = new AV.Promise();
+    var handled = false;
+
+    var xhr = new AV.XMLHttpRequest();
+
+    xhr.upload.addEventListener('progress', function(e) {
+      if (e.lengthComputable) {
+        saveOptions.onProgress && saveOptions.onProgress(e);
+      }
+    }, false);
+
+    xhr.onreadystatechange = function() {
+      if (xhr.readyState === 4) {
+        if (handled) {
+          return;
+        }
+        handled = true;
+
+        delete self._qiniu_key;
+        if (xhr.status >= 200 && xhr.status < 300) {
+          var response;
+          try {
+            response = JSON.parse(xhr.responseText);
+          } catch (e) {
+            promise.reject(e);
+            self.destroy();
+          }
+          if (response) {
+            promise.resolve(self);
+          } else {
+            promise.reject(response);
+          }
+        } else {
+          promise.reject(xhr);
+          self.destroy();
+        }
+      }
+    };
+    xhr.open('POST', 'http://upload.qiniu.com', true);
+    xhr.send(data);
+
+    return promise;
   });
 };

lib/file.js

@@ -353,14 +353,13 @@ module.exports = function(AV) {
       this._source = AV.Promise.as(encodeBase64(data), guessedType);
       this._metaData.size = data.length;
     } else if (data && data.base64) {
-      this._source = AV.Promise.as(data.base64, guessedType);
-      this._isBase64 = true;
+      // 也可以是 dataURL，内部已做兼容
+      var dataBase64 = dataURItoBlob(data.base64, guessedType);
+      this._source = AV.Promise.as(dataBase64, guessedType);
     } else if (data && data.blob) {
       this._source = AV.Promise.as(data.blob, guessedType);
-      this._isBlob = true;
     } else if (typeof(File) !== "undefined" && data instanceof File) {
       this._source = AV.Promise.as(data, guessedType);
-      this._isFileObject = true;
     } else if(AV._isNode && global.Buffer.isBuffer(data)) {
       // use global.Buffer to prevent browserify pack Buffer module
       this._source = AV.Promise.as(data.toString('base64'), guessedType);
@@ -582,75 +581,8 @@ module.exports = function(AV) {
       var self = this;
       if (!self._previousSave) {
         if(self._source) {
-          if (self._isBlob || self._isFileObject || self._isBase64) {
-            // TODO: remove this code and use qiniu SDK
-            var dataFormat;
-            self._previousSave = self._source.then(function(data, type) {
-              if (self._isBase64) {
-                dataFormat = dataURItoBlob(data, type);
-              } else {
-                dataFormat = data;
-              }
-              return self._qiniuToken(type);
-            }).then(function(response) {
-              self._url = response.url;
-              self._bucket = response.bucket;
-              self.id = response.objectId;
-              //Get the uptoken to upload files to qiniu.
-              var uptoken = response.token;
-
-              var data = new FormData();
-              data.append("file", dataFormat, self._name);
-              data.append("key", self._qiniu_key);
-              data.append("token", uptoken);
-
-              var promise = new AV.Promise();
-              var handled = false;
-
-              var xhr = new AV.XMLHttpRequest();
-
-              xhr.upload.addEventListener('progress', function(e) {
-                if (e.lengthComputable) {
-                  saveOptions.onProgress && saveOptions.onProgress(e);
-                }
-              }, false);
-
-              xhr.onreadystatechange = function() {
-                if (xhr.readyState === 4) {
-                  if (handled) {
-                    return;
-                  }
-                  handled = true;
-
-                  delete self._qiniu_key;
-                  if (xhr.status >= 200 && xhr.status < 300) {
-                    var response;
-                    try {
-                      response = JSON.parse(xhr.responseText);
-                    } catch (e) {
-                      promise.reject(e);
-                      self.destroy();
-                    }
-                    if (response) {
-                      promise.resolve(self);
-                    } else {
-                      promise.reject(response);
-                    }
-                  } else {
-                    promise.reject(xhr);
-                    self.destroy();
-                  }
-                }
-              };
-              xhr.open('POST', 'http://upload.qiniu.com', true);
-              xhr.send(data);
-
-              return promise;
-            });
-          } else {
-            var upload = require('./browserify-wrapper/upload');
-            upload(self, AV);
-          }
+          var upload = require('./browserify-wrapper/upload');
+          upload(self, AV, saveOptions);
         } else if(self._url && self._metaData['__source'] == 'external') {
           //external link file.
           var data = {
@@ -664,8 +596,9 @@ module.exports = function(AV) {
             self._name = response.name;
             self._url = response.url;
             self.id = response.objectId;
-            if(response.size)
-                self._metaData.size = response.size;
+            if(response.size) {
+              self._metaData.size = response.size;
+            }
             return self;
           });
         }