v 1.0.6

UsefulWeb · Jan 27, 2019 · b218b10 · b218b10
1 parent f0a727c
commit b218b10
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -147,6 +147,26 @@ crm.Lead.findById( 123 )
 .then( lead => lead.remove());
 ```
 
+## Переподключение
+
+Переподключение к порталу в случае истечения сессии происходит автоматически.
+Также доступны настройки:
+
+```javascript
+const crm = new AmoCRM({
+    domain: 'domain',
+    auth: {
+        login: 'mylogin',
+        hash: 'mytesthash',
+    },
+    reconnection: {
+        disabled: true, // по умолчанию false,
+        checkDelay: 500, // кол-во мс, как часто проверять сессию на предмет истечения. По умолчанию: 60 * 1000
+        accuracyTime: 1000 // за какое кол-во мс до истечения сессии необходимо переподключиться. По умолчанию: 60 * 1000
+    }
+});
+```
+
 ## Работа с событиями
 
 В настоящий момент доступны следующие события:

diff --git a/dist/base/AmoConnection.js b/dist/base/AmoConnection.js
@@ -31,6 +31,7 @@ var AmoConnection = function (_EventResource) {
     _this._request = request;
     _this._options = options;
     _this._isConnected = false;
+    _this._reconnectOptions = Object.assign({ disabled: false }, options.reconnection);
     return _this;
   }
 
@@ -81,7 +82,9 @@ var AmoConnection = function (_EventResource) {
           login = _options.login,
           password = _options.password,
           hash = _options.hash,
-          reconnection = _options.reconnection,
+          reconnection = this._reconnectOptions,
+          checkDelay = reconnection.checkDelay,
+          accuracyTime = reconnection.accuracyTime,
           data = {
         USER_LOGIN: login
       };
@@ -102,8 +105,8 @@ var AmoConnection = function (_EventResource) {
           saveCookies: true
         }
       }).then(function (data) {
-        if (reconnection) {
-          _this3.reconnectAt(_this3._request.expires, reconnection.checkDelay);
+        if (!reconnection.disabled) {
+          _this3.reconnectAt(_this3._request.expires, checkDelay, accuracyTime);
         }
 
         _this3._isConnected = data.response.auth === true;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amocrm-js",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "JS Library for AmoCRM",
   "main": "dist/AmoCRM.js",
   "directories": {

diff --git a/src/base/AmoConnection.js b/src/base/AmoConnection.js
@@ -18,6 +18,7 @@ class AmoConnection extends EventResource {
     this._request = request;
     this._options = options;
     this._isConnected = false;
+    this._reconnectOptions = Object.assign({ disabled: false }, options.reconnection );
   }
 
   get connected() {
@@ -57,7 +58,9 @@ class AmoConnection extends EventResource {
     if ( this._isConnected ) {
       return Promise.resolve( true );
     }
-    const { login, password, hash, reconnection } = this._options,
+    const { login, password, hash } = this._options,
+      reconnection = this._reconnectOptions,
+      { checkDelay, accuracyTime } = reconnection,
       data = {
         USER_LOGIN: login
       };
@@ -78,8 +81,8 @@ class AmoConnection extends EventResource {
       }
     })
       .then( data => {
-        if ( reconnection ) {
-          this.reconnectAt( this._request.expires, reconnection.checkDelay );
+        if ( !reconnection.disabled ) {
+          this.reconnectAt( this._request.expires, checkDelay, accuracyTime );
         }
 
         this._isConnected = data.response.auth === true;