Merge pull request #247 from wangxiao/master

更新 dist 中的代码为最新，供部分用户尝鲜使用。

Author: wangxiao

dist/av-es6.js

@@ -1,3 +1,8 @@
+/**
+ * 每位工程师都有保持代码优雅的义务
+ * Each engineer has a duty to keep the code elegant
+**/
+
 'use strict';
 
 var _ = require('underscore');

dist/av-min.js

@@ -1,3 +1,8 @@
+/**
+ * 每位工程师都有保持代码优雅的义务
+ * Each engineer has a duty to keep the code elegant
+**/
+
 'use strict';
 
 var AV = require('./av');

dist/av.js

@@ -7,18 +7,24 @@
  * The AVOS Cloud JavaScript SDK is freely distributable under the MIT license.
  */
 
+/**
+ * 每位工程师都有保持代码优雅的义务
+ * Each engineer has a duty to keep the code elegant
+**/
+
 'use strict';
 
 var AV = module.exports = {};
 AV._ = require('underscore');
 AV.version = require('./version');
 AV.Promise = require('./promise');
 AV.localStorage = require('./localstorage');
+
 // 挂载所有内部配置项
 AV._config = AV._config || {};
 
 // 以下模块为了兼容原有代码，使用这种加载方式。
-require('./utils')(AV);
+require('./utils').init(AV);
 require('./error')(AV);
 require('./event')(AV);
 require('./geopoint')(AV);

dist/node/acl.js

@@ -1,21 +1,49 @@
-"use strict";
+/**
+ * 每位工程师都有保持代码优雅的义务
+ * Each engineer has a duty to keep the code elegant
+**/
 
-var Promise = require('../promise');
+'use strict';
 
-module.exports = function _ajax(method, url, data, success, error) {
+var AVPromise = require('../promise');
+var md5 = require('md5');
+
+// 计算 X-LC-Sign 的签名方法
+var sign = function sign(key, isMasterKey) {
+  var now = new Date().getTime();
+  var signature = md5(now + key);
+  if (isMasterKey) {
+    return signature + ',' + now + ',master';
+  } else {
+    return signature + ',' + now;
+  }
+};
+
+var ajax = function ajax(method, url, data, success, error) {
+  var AV = global.AV;
+
+  var promise = new AVPromise();
   var options = {
     success: success,
     error: error
   };
 
-  if (useXDomainRequest()) {
-    return ajaxIE8(method, url, data)._thenRunCallbacks(options);
+  var appId = AV.applicationId;
+  var appKey = AV.applicationKey;
+  var masterKey = AV.masterKey;
+
+  // 清理原来多余的数据（如果不清理，会污染数据表）
+  if (data) {
+    delete data._ApplicationId;
+    delete data._ApplicationKey;
+    delete data._ApplicationProduction;
+    delete data._MasterKey;
+    delete data._ClientVersion;
+    delete data._InstallationId;
   }
 
-  var promise = new Promise();
   var handled = false;
-
-  var xhr = new XMLHttpRequest();
+  var xhr = new global.XMLHttpRequest();
   xhr.onreadystatechange = function () {
     if (xhr.readyState === 4) {
       if (handled) {
@@ -24,7 +52,7 @@ module.exports = function _ajax(method, url, data, success, error) {
       handled = true;
 
       if (xhr.status >= 200 && xhr.status < 300) {
-        var response;
+        var response = undefined;
         try {
           response = JSON.parse(xhr.responseText);
         } catch (e) {
@@ -40,50 +68,35 @@ module.exports = function _ajax(method, url, data, success, error) {
       }
     }
   };
-  xhr.open(method, url, true);
-  xhr.setRequestHeader("Content-Type", "text/plain"); // avoid pre-flight.
-  xhr.send(data);
-  return promise._thenRunCallbacks(options);
-};
 
-function useXDomainRequest() {
-  if (typeof XDomainRequest !== "undefined") {
-    // We're in IE 8+.
-    if ('withCredentials' in new XMLHttpRequest()) {
-      // We're in IE 10+.
-      return false;
+  if (method.toLowerCase() === 'get') {
+    var i = 0;
+    for (var k in data) {
+      if (i === 0) {
+        url = url + '?';
+      } else {
+        url = url + '&';
+      }
+      url = url + k + '=' + encodeURIComponent(JSON.stringify(data[k]));
+      i++;
     }
-    return true;
   }
-  return false;
-}
 
-function ajaxIE8(method, url, data) {
-  var promise = new Promise();
-  var xdr = new XDomainRequest();
-  xdr.onload = function () {
-    var response;
-    try {
-      response = JSON.parse(xdr.responseText);
-    } catch (e) {
-      promise.reject(e);
-    }
-    if (response) {
-      promise.resolve(response);
-    }
-  };
-  xdr.onerror = xdr.ontimeout = function () {
-    // Let's fake a real error message.
-    var fakeResponse = {
-      responseText: JSON.stringify({
-        code: AV.Error.X_DOMAIN_REQUEST,
-        error: "IE's XDomainRequest does not supply error info."
-      })
-    };
-    promise.reject(xdr);
-  };
-  xdr.onprogress = function () {};
-  xdr.open(method, url);
-  xdr.send(data);
-  return promise;
-}
+  xhr.open(method, url, true);
+  xhr.setRequestHeader('X-LC-Id', appId);
+
+  var signature = undefined;
+  if (masterKey) {
+    signature = sign(masterKey, true);
+  } else {
+    signature = sign(appKey);
+  }
+
+  xhr.setRequestHeader('X-LC-Sign', signature);
+  xhr.setRequestHeader('X-LC-UA', 'LC-Web-' + AV.version);
+  xhr.setRequestHeader('Content-Type', 'application/json;charset=UTF-8');
+  xhr.send(JSON.stringify(data));
+  return promise._thenRunCallbacks(options);
+};
+
+module.exports = ajax;

dist/node/av-browser.js

@@ -1,17 +1,28 @@
+/**
+ * 每位工程师都有保持代码优雅的义务
+ * Each engineer has a duty to keep the code elegant
+**/
+
 'use strict';
 
 var http = require('http');
 var https = require('https');
 var url = require('url');
 
 var Promise = require('../promise');
-var AV_VERSION = require('../version');
 
 // `keepAlive` option only work on Node.js 0.12+
 var httpAgent = new http.Agent({ keepAlive: true });
 var httpsAgent = new https.Agent({ keepAlive: true });
 
 module.exports = function _ajax(method, resourceUrl, data, success, error) {
+  if (method.toLowerCase() !== 'post') {
+    data = data || {};
+    data._method = method;
+    method = 'post';
+  }
+  data = JSON.stringify(data);
+
   var parsedUrl = url.parse(resourceUrl);
   var promise = new Promise();
 
@@ -32,7 +43,7 @@ module.exports = function _ajax(method, resourceUrl, data, success, error) {
     agent: transportAgent,
     headers: {
       'Content-Type': 'text/plain',
-      'User-Agent': 'AV/' + AV_VERSION + ' (Node.js' + process.version + ')'
+      'User-Agent': 'AV/' + AV.version + ' (Node.js' + process.version + ')'
     }
   });
 

dist/node/av.js

@@ -1,3 +1,8 @@
+/**
+ * 每位工程师都有保持代码优雅的义务
+ * Each engineer has a duty to keep the code elegant
+**/
+
 'use strict';
 
 var Storage = require('localstorage-memory');

dist/node/browserify-wrapper/ajax-browser.js

@@ -1,3 +1,8 @@
+/**
+ * 每位工程师都有保持代码优雅的义务
+ * Each engineer has a duty to keep the code elegant
+**/
+
 'use strict';
 
 var _ = require('underscore');