chore(release): v1.3.1

Author: leeyeh

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "leancloud-storage",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "homepage": "https://github.com/leancloud/javascript-sdk",
   "authors": [
     "LeanCloud <[email protected]>"

changelog.md

@@ -1,7 +1,10 @@
+# 1.3.1  日期：2016 年 7 月 21 日
+* 修复多次调用 `AV.init` 抛出 `A promise was resolved even though it had already been resolved` 异常的问题
+
 # 1.3.0  日期：2016 年 7 月 20 日
 * 增加 `AV.Object.fetchAll()` 方法
 * 修复抛出的异常没有堆栈信息的问题
-* 修复在某些异常情况下，发出的请求不带域名的问题。
+* 修复在某些异常情况下，发出的请求不带域名的问题
 
 ## 1.2.1  日期：2016 年 6 月 30 日
 * 修复美国节点文件上传成功后 File 实例没有 id 的问题

dist/av-es6.js

@@ -8781,8 +8781,8 @@ _.extend(Promise.prototype, /** @lends AV.Promise.prototype */ {
    */
   resolve: function(result) {
     if (this._resolved || this._rejected) {
-      throw "A promise was resolved even though it had already been " +
-        (this._resolved ? "resolved" : "rejected") + ".";
+      throw new Error("A promise was resolved even though it had already been " +
+        (this._resolved ? "resolved" : "rejected") + ".");
     }
     this._resolved = true;
     this._result = arguments;
@@ -8821,8 +8821,8 @@ _.extend(Promise.prototype, /** @lends AV.Promise.prototype */ {
    */
   reject: function(error) {
     if (this._resolved || this._rejected) {
-      throw "A promise was rejected even though it had already been " +
-        (this._resolved ? "resolved" : "rejected") + ".";
+      throw new Promise("A promise was rejected even though it had already been " +
+        (this._resolved ? "resolved" : "rejected") + ".");
     }
     this._rejected = true;
     this._error = error;
@@ -10220,7 +10220,7 @@ const AVError = require('./error');
 const AV = require('./av');
 const _ = require('underscore');
 
-const getServerURLPromise = new AVPromise();
+let getServerURLPromise;
 
 // 服务器请求的节点 host
 const API_HOST = {
@@ -10459,6 +10459,7 @@ const refreshServerUrlByRouter = () => {
 };
 
 const setServerUrlByRegion = (region = 'cn') => {
+  getServerURLPromise = new AVPromise();
   // 如果用户在 init 之前设置了 APIServerURL，则跳过请求 router
   if (AV._config.APIServerURL) {
     getServerURLPromise.resolve();
@@ -10502,6 +10503,9 @@ const AVRequest = (route, className, objectId, method, dataObject = {}, sessionT
 
   checkRouter(route);
 
+  if (!getServerURLPromise) {
+    return AVPromise.error(new Error('Not initialized'));
+  }
   return getServerURLPromise.then(() => {
     const apiURL = createApiUrl(route, className, objectId, method, dataObject);
     return setHeaders(sessionToken).then(
@@ -13160,7 +13164,7 @@ module.exports = {
  * Each engineer has a duty to keep the code elegant
 **/
 
-module.exports = 'js1.3.0';
+module.exports = 'js1.3.1';
 
 },{}]},{},[28])(28)
 });

dist/av-min.js

@@ -8699,7 +8699,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
            */
           resolve: function resolve(result) {
             if (this._resolved || this._rejected) {
-              throw "A promise was resolved even though it had already been " + (this._resolved ? "resolved" : "rejected") + ".";
+              throw new Error("A promise was resolved even though it had already been " + (this._resolved ? "resolved" : "rejected") + ".");
             }
             this._resolved = true;
             this._result = arguments;
@@ -8738,7 +8738,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
            */
           reject: function reject(error) {
             if (this._resolved || this._rejected) {
-              throw "A promise was rejected even though it had already been " + (this._resolved ? "resolved" : "rejected") + ".";
+              throw new Promise("A promise was rejected even though it had already been " + (this._resolved ? "resolved" : "rejected") + ".");
             }
             this._rejected = true;
             this._error = error;
@@ -10122,7 +10122,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
         var AV = require('./av');
         var _ = require('underscore');
 
-        var getServerURLPromise = new AVPromise();
+        var getServerURLPromise = undefined;
 
         // 服务器请求的节点 host
         var API_HOST = {
@@ -10332,6 +10332,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
         var setServerUrlByRegion = function setServerUrlByRegion() {
           var region = arguments.length <= 0 || arguments[0] === undefined ? 'cn' : arguments[0];
 
+          getServerURLPromise = new AVPromise();
           // 如果用户在 init 之前设置了 APIServerURL，则跳过请求 router
           if (AV._config.APIServerURL) {
             getServerURLPromise.resolve();
@@ -10378,6 +10379,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 
           checkRouter(route);
 
+          if (!getServerURLPromise) {
+            return AVPromise.error(new Error('Not initialized'));
+          }
           return getServerURLPromise.then(function () {
             var apiURL = createApiUrl(route, className, objectId, method, dataObject);
             return setHeaders(sessionToken).then(function (headers) {
@@ -12957,6 +12961,6 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
        * Each engineer has a duty to keep the code elegant
       **/
 
-      module.exports = 'js1.3.0';
+      module.exports = 'js1.3.1';
     }, {}] }, {}, [28])(28);
 });

dist/av.js

@@ -311,7 +311,7 @@ _.extend(Promise.prototype, /** @lends AV.Promise.prototype */{
    */
   resolve: function resolve(result) {
     if (this._resolved || this._rejected) {
-      throw "A promise was resolved even though it had already been " + (this._resolved ? "resolved" : "rejected") + ".";
+      throw new Error("A promise was resolved even though it had already been " + (this._resolved ? "resolved" : "rejected") + ".");
     }
     this._resolved = true;
     this._result = arguments;
@@ -350,7 +350,7 @@ _.extend(Promise.prototype, /** @lends AV.Promise.prototype */{
    */
   reject: function reject(error) {
     if (this._resolved || this._rejected) {
-      throw "A promise was rejected even though it had already been " + (this._resolved ? "resolved" : "rejected") + ".";
+      throw new Promise("A promise was rejected even though it had already been " + (this._resolved ? "resolved" : "rejected") + ".");
     }
     this._rejected = true;
     this._error = error;

dist/node/promise.js

@@ -16,7 +16,7 @@ var AVError = require('./error');
 var AV = require('./av');
 var _ = require('underscore');
 
-var getServerURLPromise = new AVPromise();
+var getServerURLPromise = undefined;
 
 // 服务器请求的节点 host
 var API_HOST = {
@@ -226,6 +226,7 @@ var refreshServerUrlByRouter = function refreshServerUrlByRouter() {
 var setServerUrlByRegion = function setServerUrlByRegion() {
   var region = arguments.length <= 0 || arguments[0] === undefined ? 'cn' : arguments[0];
 
+  getServerURLPromise = new AVPromise();
   // 如果用户在 init 之前设置了 APIServerURL，则跳过请求 router
   if (AV._config.APIServerURL) {
     getServerURLPromise.resolve();
@@ -272,6 +273,9 @@ var AVRequest = function AVRequest(route, className, objectId, method) {
 
   checkRouter(route);
 
+  if (!getServerURLPromise) {
+    return AVPromise.error(new Error('Not initialized'));
+  }
   return getServerURLPromise.then(function () {
     var apiURL = createApiUrl(route, className, objectId, method, dataObject);
     return setHeaders(sessionToken).then(function (headers) {

dist/node/request.js

@@ -5,4 +5,4 @@
  * Each engineer has a duty to keep the code elegant
 **/
 
-module.exports = 'js1.3.0';
+module.exports = 'js1.3.1';

dist/node/version.js

@@ -1,6 +1,6 @@
 {
   "name": "leancloud-storage",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "main": "./dist/node/index.js",
   "description": "LeanCloud JavaScript SDK.",
   "repository": {

package.json

@@ -3,4 +3,4 @@
  * Each engineer has a duty to keep the code elegant
 **/
 
-module.exports = 'js1.3.0';
+module.exports = 'js1.3.1';