fix(File): add progress event listener before req.end (#356)

* chore(package): update qiniu and superagent

* fix(File): add progress event listener before req.end

Author: leeyeh

package.json

@@ -14,8 +14,8 @@
     "debug": "^2.2.0",
     "localstorage-memory": "^1.0.1",
     "md5": "^2.0.0",
-    "qiniu": "6.1.3",
-    "superagent": "^2.0.0-alpha.2",
+    "qiniu": "^6.1.11",
+    "superagent": "^2.0.0",
     "underscore": "^1.8.3"
   },
   "devDependencies": {

src/uploader/cos.js

@@ -19,23 +19,24 @@ module.exports = function upload(uploadInfo, data, file, saveOptions = {}) {
 
   const req = request('POST', uploadUrl)
     .field('fileContent', data)
-    .field('op', 'upload')
-    .end((err, res) => {
-      if (res) {
-        debug(res.status, res.body, res.text);
-      }
-      if (err) {
-        if (res) {
-          err.statusCode = res.status;
-          err.responseText = res.text;
-          err.response = res.body;
-        }
-        return promise.reject(err);
-      }
-      promise.resolve(file);
-    });
+    .field('op', 'upload');
   if (saveOptions.onprogress) {
     req.on('progress', saveOptions.onprogress);
   }
+  req.end((err, res) => {
+    if (res) {
+      debug(res.status, res.body, res.text);
+    }
+    if (err) {
+      if (res) {
+        err.statusCode = res.status;
+        err.responseText = res.text;
+        err.response = res.body;
+      }
+      return promise.reject(err);
+    }
+    promise.resolve(file);
+  });
+
   return promise;
 };

src/uploader/qiniu-browser.js

@@ -22,23 +22,24 @@ module.exports = function upload(uploadInfo, data, file, saveOptions = {}) {
     .field('file', data)
     .field('name', file.attributes.name)
     .field('key', file._qiniu_key)
-    .field('token', uptoken)
-    .end((err, res) => {
-      if (res) {
-        debug(res.status, res.body, res.text);
-      }
-      if (err) {
-        if (res) {
-          err.statusCode = res.status;
-          err.responseText = res.text;
-          err.response = res.body;
-        }
-        return promise.reject(err);
-      }
-      promise.resolve(file);
-    });
+    .field('token', uptoken);
   if (saveOptions.onprogress) {
     req.on('progress', saveOptions.onprogress);
   }
+  req.end((err, res) => {
+    if (res) {
+      debug(res.status, res.body, res.text);
+    }
+    if (err) {
+      if (res) {
+        err.statusCode = res.status;
+        err.responseText = res.text;
+        err.response = res.body;
+      }
+      return promise.reject(err);
+    }
+    promise.resolve(file);
+  });
+
   return promise;
 };

src/uploader/s3.js

@@ -14,20 +14,21 @@ module.exports = function upload(uploadInfo, data, file, saveOptions = {}) {
   // 海外节点，针对 S3 才会返回 upload_url
   const req = request('PUT', uploadInfo.upload_url)
     .set('Content-Type', file.attributes.metaData.mime_type)
-    .send(data)
-    .end((err, res) => {
-      if (err) {
-        if (res) {
-          err.statusCode = res.status;
-          err.responseText = res.text;
-          err.response = res.body;
-        }
-        return promise.reject(err);
-      }
-      promise.resolve(file);
-    });
+    .send(data);
   if (saveOptions.onprogress) {
     req.on('progress', saveOptions.onprogress);
   }
+  req.end((err, res) => {
+    if (err) {
+      if (res) {
+        err.statusCode = res.status;
+        err.responseText = res.text;
+        err.response = res.body;
+      }
+      return promise.reject(err);
+    }
+    promise.resolve(file);
+  });
+
   return promise;
 };