Merge pull request #274 from leeyeh/fix-api-redirect

refactor(ajax): replace ajax.js with superagent to follow redirection

Author: wangxiao

README.md

@@ -34,8 +34,6 @@ JavaScript SDK for [LeanCloud](http://leancloud.cn/).
 │   └── ...
 ├── gulpfile.js
 ├── src
-│   ├── av-browser.js                  // 浏览器环境入口文件，将会被 browserify 编译
-│   ├── av-browser-core.js             // 浏览器环境入口文件，只包含核心依赖，将会被 browserify 编译
 │   ├── av.js                          // node.js 环境入口文件
 │   ├── browserify-wrapper             // 目录中为针对 node.js 与浏览器环境之间差异的不同实现
 │   └── ...

gulpfile.babel.js

@@ -61,7 +61,10 @@ gulp.task('clean-dist', () => {
 });
 
 gulp.task('browserify', ['clean-dist'], () => {
-  const bundle = browserify({entries: './src/av-browser.js'});
+  const bundle = browserify({
+    entries: './src/av.js',
+    standalone: 'AV'
+  });
   return bundle.bundle()
     .pipe(source('av-es6.js'))
     .pipe(gulp.dest('dist'));

package.json

@@ -11,18 +11,18 @@
     "test": "gulp test"
   },
   "dependencies": {
-    "form-data": "^1.0.0-rc4",
+    "debug": "^2.2.0",
     "localstorage-memory": "^1.0.1",
     "md5": "^2.0.0",
     "qiniu": "6.1.3",
+    "superagent": "^2.0.0-alpha.2",
     "underscore": "^1.8.3"
   },
   "devDependencies": {
     "babel-core": "^6.4.0",
     "babel-preset-es2015": "^6.3.13",
     "browser-sync": "^2.2.1",
     "browserify": "^11.0.1",
-    "debug": "^2.1.1",
     "expect.js": "0.2.0",
     "gulp": "^3.8.10",
     "gulp-babel": "^6.1.1",
@@ -49,16 +49,12 @@
   },
   "browser": {
     "react-native": false,
-    "./src/browserify-wrapper/ajax.js": "./src/browserify-wrapper/ajax-browser.js",
     "./src/uploader/qiniu.js": "./src/uploader/qiniu-browser.js",
     "./src/browserify-wrapper/localStorage.js": "./src/browserify-wrapper/localstorage-browser.js",
     "./src/browserify-wrapper/parse-base64.js": "./src/browserify-wrapper/parse-base64-browser.js",
-    "./src/uploader/cos.js": "./src/uploader/cos-browser.js",
-    "./dist/node/browserify-wrapper/ajax.js": "./dist/node/browserify-wrapper/ajax-browser.js",
     "./dist/node/uploader/qiniu.js": "./dist/node/uploader/qiniu-browser.js",
     "./dist/node/browserify-wrapper/localStorage.js": "./dist/node/browserify-wrapper/localstorage-browser.js",
-    "./dist/node/browserify-wrapper/parse-base64.js": "./dist/node/browserify-wrapper/parse-base64-browser.js",
-    "./dist/node/uploader/cos.js": "./dist/node/uploader/cos-browser.js"
+    "./dist/node/browserify-wrapper/parse-base64.js": "./dist/node/browserify-wrapper/parse-base64-browser.js"
   },
   "eslintConfig": {
     "env": {

src/ajax.js

@@ -0,0 +1,40 @@
+/**
+ * 每位工程师都有保持代码优雅的义务
+ * Each engineer has a duty to keep the code elegant
+**/
+
+'use strict';
+
+const request = require('superagent');
+const debug = require('debug')('ajax');
+
+const Promise = require('./promise');
+
+module.exports = function _ajax(method, resourceUrl, data, headers = {}, onprogress) {
+  debug(method, resourceUrl, data, headers);
+
+  var promise = new Promise();
+
+  const req = request(method, resourceUrl)
+    .set(headers)
+    .send(data)
+    .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(res.body, res.status, res);
+    });
+  if (onprogress) {
+    req.on('progress', onprogress);
+  }
+
+  return promise;
+};

src/av-browser.js

@@ -1,31 +1,40 @@
+/**
+ * 每位工程师都有保持代码优雅的义务
+ * Each engineer has a duty to keep the code elegant
+ **/
+
 'use strict';
-const FormData = require('form-data');
 
-const ajax = require('../browserify-wrapper/ajax.js');
+const request = require('superagent');
 const Promise = require('../promise');
-const debug = require('debug')('cos');
 
-module.exports =function upload(uploadInfo, data, file) {
+module.exports = function upload(uploadInfo, data, file, saveOptions = {}) {
   file.attributes.url = uploadInfo.url;
   file._bucket = uploadInfo.bucket;
   file.id = uploadInfo.objectId;
-  const uploadUrl = uploadInfo.upload_url;
-  const body = new Buffer(data, 'base64');
-  debug(uploadUrl, data);
-  const formData = new FormData();
-  formData.append('fileContent', body);
-  formData.append('op', 'upload');
+  const uploadUrl = uploadInfo.upload_url + "?sign=" + encodeURIComponent(uploadInfo.token);
 
   const promise = new Promise();
 
-  const request = formData.submit(uploadUrl, function(err, res) {
-    debug(err, res.statusCode);
-    if (err) {
-      promise.reject(err);
-    } else {
+  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);
-    }
-  });
-  request.setHeader('Authorization', uploadInfo.token);
+    });
+  if (saveOptions.onprogress) {
+    req.on('progress', saveOptions.onprogress);
+  }
   return promise;
 };

src/browserify-wrapper/ajax-browser.js

@@ -5,20 +5,39 @@
 
 'use strict';
 
-const ajax = require('../browserify-wrapper/ajax.js');
+const request = require('superagent');
+const Promise = require('../promise');
 
-module.exports = function upload(uploadInfo, data, file, saveOptions) {
-    file.attributes.url = uploadInfo.url;
-    file._bucket = uploadInfo.bucket;
-    file.id = uploadInfo.objectId;
-    //Get the uptoken to upload files to qiniu.
-    const uptoken = uploadInfo.token;
-    const formData = new FormData();
-    formData.append('file', data);
-    formData.append('name', file.attributes.name);
-    formData.append('key', file._qiniu_key);
-    formData.append('token', uptoken);
+module.exports = function upload(uploadInfo, data, file, saveOptions = {}) {
+  file.attributes.url = uploadInfo.url;
+  file._bucket = uploadInfo.bucket;
+  file.id = uploadInfo.objectId;
+  //Get the uptoken to upload files to qiniu.
+  const uptoken = uploadInfo.token;
 
-    return ajax('POST', 'https://up.qbox.me', formData, undefined, saveOptions.onProgress)
-      .then(() => file);
+  const promise = new Promise();
+
+  const req = request('POST', 'https://up.qbox.me')
+    .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);
+    });
+  if (saveOptions.onprogress) {
+    req.on('progress', saveOptions.onprogress);
+  }
+  return promise;
 };