quickblox 2.17.9-logger → 2.17.11-logger

package/src/modules/chat/qbChat.js

@@ -1221,6 +1221,11 @@ ChatProxy.prototype = {
 
     reconnect: function () {
         Utils.QBLog('[QBChat]', 'Call reconnect ');
+        if (typeof this.onLogListener === 'function') {
+            Utils.safeCallbackCall(this.onLogListener,
+                '[QBChat]' +'[SDK v'+config.version+']' + ' Call reconnect ' +
+                chatUtils.getLocalTime());
+        }
         clearInterval(this._checkConnectionTimer);
         this._checkConnectionTimer = undefined;
         this.muc.joinedRooms = {};
@@ -1228,7 +1233,7 @@ ChatProxy.prototype = {
 
         if (Utils.getEnv().browser) {
             this.connection.flush();
-            this.connection.disconnect('reconnect from SDK');//artik should be added reasone = 'reconnect from SDK'
+            this.connection.disconnect('call Qb.chat.reconnect');//artik should be added reasone = 'reconnect from SDK'
         } else {
             this.Client.end();
         }
@@ -1605,6 +1610,11 @@ ChatProxy.prototype = {
      * */
     disconnect: function () {
         Utils.QBLog('[QBChat]', 'Call disconnect ');
+        if (typeof this.onLogListener === 'function') {
+            Utils.safeCallbackCall(this.onLogListener,
+                '[QBChat]' +'[SDK v'+config.version+']' + ' Call disconnect ' +
+                chatUtils.getLocalTime());
+        }
         clearInterval(this._checkConnectionTimer);
         clearInterval(this._checkExpiredSessionTimer);
         this._checkConnectionTimer = undefined;
@@ -1615,7 +1625,7 @@ ChatProxy.prototype = {
 
         if (Utils.getEnv().browser) {
             this.connection.flush();
-            this.connection.disconnect('disconnect from SDK');//artik should add reason = 'disconnect from SDK'
+            this.connection.disconnect('call QB.chat.disconnect');//artik should add reason = 'disconnect from SDK'
             if (this._checkConnectionPingTimer !== undefined) {
                 Utils.QBLog('[QBChat]', 'Stop ping');
                 clearInterval(this._checkConnectionPingTimer);

package/src/qbConfig.js

@@ -12,7 +12,7 @@
  */
 
 var config = {
-  version: '2.17.9-logger',
+  version: '2.17.11-logger',
   buildNumber: '1161',
   creds: {
     'appId': 0,

package/src/qbStrophe.js

@@ -13,73 +13,64 @@ require('./libs/strophe/strophe.umd.js');
 var config = require('./qbConfig');
 var chatPRTCL = config.chatProtocol;
 var Utils = require('./qbUtils');
-var QBChatModules = require('./modules/chat/qbChat');
+var QBModules = require('./qbMain');
 
 function Connection(onLogListenerCallback) {
-  var protocol = chatPRTCL.active === 1 ? chatPRTCL.bosh : chatPRTCL.websocket;
-  var conn = new Strophe.Connection(protocol);
-  var onLogListener = onLogListenerCallback || QBChatModules.onLogListener;
-
-  if (chatPRTCL.active === 1) {
-    conn.xmlInput = function(data) {
-      if (data.childNodes[0]) {
-        for (var i = 0, len = data.childNodes.length; i < len; i++) {
-          Utils.QBLog('[QBChat]', 'RECV:', data.childNodes[i]);
-            if (onLogListener && typeof onLogListener === 'function') {
-                Utils.safeCallbackCall(onLogListener,
-                    '[QBChat][QBStrophe]' +  'RECV:' + data.childNodes[i]);
-            }
-        }
-      }
-    };
-    conn.xmlOutput = function(data) {
-      if (data.childNodes[0]) {
-        for (var i = 0, len = data.childNodes.length; i < len; i++) {
-          Utils.QBLog('[QBChat]', 'SENT:', data.childNodes[i]);
-            if (onLogListener && typeof onLogListener === 'function') {
-                Utils.safeCallbackCall(onLogListener,
-                    '[QBChat][QBStrophe]' +  'SENT:' + data.childNodes[i]);
-            }
-        }
-      }
-    };
-  } else {
-    conn.xmlInput = function(data) {
-      Utils.QBLog('[QBChat]', 'RECV:', data);
+    var protocol = chatPRTCL.active === 1 ? chatPRTCL.bosh : chatPRTCL.websocket;
+    var conn = new Strophe.Connection(protocol);
+    var onLogListener = config.debug? onLogListenerCallback || QBModules.chat.onLogListener : null;
+    var safeCallbackCall = function(message, data) {
+        onLogListener = onLogListenerCallback || QBModules.chat.onLogListener;
         if (onLogListener && typeof onLogListener === 'function') {
             Utils.safeCallbackCall(onLogListener,
-                '[QBChat][QBStrophe]' +  'RECV:' + data);
+                '[QBChat][QBStrophe]' +  message + data);
         }
-        try {
-            let parser = new DOMParser();
-            let xmlDoc = parser.parseFromString(data, 'text/xml');
+    };
 
-            let errorElem = xmlDoc.getElementsByTagName('error');
-            if (errorElem.length > 0) {
-                let conditionElem = errorElem[0].getElementsByTagName('condition');
-                if (conditionElem.length > 0) {
-                    let disconnectCondition = conditionElem[0].textContent;
-                    console.log('Disconnect condition:', disconnectCondition);
-                    if (onLogListener && typeof onLogListener === 'function') {
-                        Utils.safeCallbackCall(onLogListener,
-                            '[QBChat][QBStrophe]' +  'DISCONNECTED CONDITION: ' + disconnectCondition);
-                    }
+    if (chatPRTCL.active === 1) {
+        conn.xmlInput = function(data) {
+            if (data.childNodes[0]) {
+                for (var i = 0, len = data.childNodes.length; i < len; i++) {
+                    Utils.QBLog('[QBChat]', 'RECV:', data.childNodes[i]);
+                    safeCallbackCall('RECV:', data.childNodes[i]);
                 }
             }
-        } catch (e) {
-            console.error('Error parsing XML input:', e);
-        }
-    };
-    conn.xmlOutput = function(data) {
-      Utils.QBLog('[QBChat]', 'SENT:', data);
-        if (onLogListener && typeof onLogListener === 'function') {
-            Utils.safeCallbackCall(onLogListener,
-                '[QBChat][QBStrophe]' +  'SENT:' + data);
-        }
-    };
-  }
+        };
+        conn.xmlOutput = function(data) {
+            if (data.childNodes[0]) {
+                for (var i = 0, len = data.childNodes.length; i < len; i++) {
+                    Utils.QBLog('[QBChat]', 'SENT:', data.childNodes[i]);
+                    safeCallbackCall('SENT', data.childNodes[i]);
+                }
+            }
+        };
+    } else {
+        conn.xmlInput = function(data) {
+            Utils.QBLog('[QBChat]', 'RECV:', data);
+            safeCallbackCall('RECV:', data);
 
-  return conn;
+            try {
+                let parser = new DOMParser();
+                let xmlDoc = parser.parseFromString(data, 'text/xml');
+                let errorElem = xmlDoc.getElementsByTagName('error');
+                if (errorElem.length > 0) {
+                    let conditionElem = errorElem[0].getElementsByTagName('condition');
+                    if (conditionElem.length > 0) {
+                        let disconnectCondition = conditionElem[0].textContent;
+                        console.log('Disconnect condition:', disconnectCondition);
+                        safeCallbackCall('DISCONNECTED CONDITION:', disconnectCondition);
+                    }
+                }
+            } catch (e) {
+                console.error('Error parsing XML input:', e);
+            }
+        };
+        conn.xmlOutput = function(data) {
+            Utils.QBLog('[QBChat]', 'SENT:', data);
+            safeCallbackCall('SENT', data);
+        };
+    }
+    return conn;
 }
 
 module.exports = Connection;