quickblox 2.19.0 → 2.19.2

package/src/modules/chat/qbChat.js

@@ -39,7 +39,7 @@ function ChatProxy(service) {
      */
     if (Utils.getEnv().browser) {
         // strophe js
-        self.connection = Connection(self.onLogListener);
+        self.connection = Connection(self._OnLogListener.bind(this));
 
         /** Add extension methods to track handlers for removal on reconnect */
         self.connection.XHandlerReferences = [];
@@ -295,7 +295,6 @@ function ChatProxy(service) {
      * @memberOf QB.chat
      **/
 
-
     this._onMessage = function (stanza) {
         var from = chatUtils.getAttr(stanza, 'from'),
             to = chatUtils.getAttr(stanza, 'to'),
@@ -418,12 +417,12 @@ function ChatProxy(service) {
         }
 
         // MUC presences go here
-        if (xXMLNS && xXMLNS == "http://jabber.org/protocol/muc#user") {
+        if (xXMLNS && xXMLNS == 'http://jabber.org/protocol/muc#user') {
             dialogId = self.helpers.getDialogIdFromNode(from);
             userId = self.helpers.getUserIdFromRoomJid(from);
 
             // KICK from dialog event
-            if (status && statusCode == "301") {
+            if (status && statusCode == '301') {
                 if (typeof self.onKickOccupant === 'function') {
                     var actorElement = chatUtils.getElement(chatUtils.getElement(x, 'item'), 'actor');
                     var initiatorUserJid = chatUtils.getAttr(actorElement, 'jid');
@@ -701,6 +700,13 @@ function ChatProxy(service) {
  ----------------------------------------------------------------------------- */
 ChatProxy.prototype = {
 
+    _OnLogListener: function (message) {
+        var self = this;
+        if (typeof self.onLogListener === 'function') {
+            Utils.safeCallbackCall(self.onLogListener, message);
+        }
+    },
+
     /**
      * self.connection to the chat. {@link https://quickblox.com/developers/Web_XMPP_Chat_Sample#Login_to_Chat More info.}
      * @memberof QB.chat
@@ -751,6 +757,7 @@ ChatProxy.prototype = {
         /** Connect for browser env. */
         if (Utils.getEnv().browser) {
             Utils.QBLog('[QBChat]', '!!---Browser env - connected--!!');
+
             self.connection.connect(userJid, params.password, function (status, condition, elem) {
                 Utils.QBLog('[QBChat]', 'self.connection.connect called with status ' + status);
                 Utils.QBLog('[QBChat]', 'self.connection.connect called with condition ' + condition);
@@ -1070,7 +1077,7 @@ ChatProxy.prototype = {
                 self._isConnecting = false;
 
                 // reconnect to chat and enable check connection
-                self._establishConnection(params);
+                self._establishConnection(params,'NODE:DISCONNECTED');
             });
 
             self.Client.on('error', function () {
@@ -1152,39 +1159,39 @@ ChatProxy.prototype = {
         }
     },
 
-    _establishConnection: function (params) {
+    _establishConnection: function (params, description) {
         var self = this;
-        Utils.QBLog('[QBChat]', '_establishConnection called');
+        Utils.QBLog('[QBChat]', '_establishConnection called in ' + description);
         if (typeof self.onLogListener === 'function') {
             Utils.safeCallbackCall(self.onLogListener,
-                '[QBChat]' + '_establishConnection called');
+                '[QBChat]' + '_establishConnection called in ' + description);
         }
         if (self._isLogout || self._checkConnectionTimer) {
             Utils.QBLog('[QBChat]', '_establishConnection return');
             if (typeof self.onLogListener === 'function') {
                 Utils.safeCallbackCall(self.onLogListener,
-                    '[QBChat]' + ' _establishConnection return with self._isLogout: '+
-                    self._isLogout+' and self._checkConnectionTimer ' +self._checkConnectionTimer?'set up':'undefined');
+                    '[QBChat]' + 'BREAK _establishConnection RETURN with self._isLogout: '+
+                    self._isLogout?self._isLogout:'undefined'+' and self._checkConnectionTimer ' +self._checkConnectionTimer?self._checkConnectionTimer:'undefined');
             }
             return;
         }
 
         var _connect = function () {
-            Utils.QBLog('[QBChat]', 'call _connect() in _establishConnection ');
+            Utils.QBLog('[QBChat]', 'call _connect() in _establishConnection in '+description);
             if (typeof self.onLogListener === 'function') {
                 Utils.safeCallbackCall(self.onLogListener,
-                    '[QBChat]' + ' call _connect() in _establishConnection ');
+                    '[QBChat]' + ' call _connect() in _establishConnection in '+description);
             }
             if (!self.isConnected && !self._isConnecting && !self._sessionHasExpired) {
-                Utils.QBLog('[QBChat]', ' start execute connect() in _establishConnection ');
+                Utils.QBLog('[QBChat]', ' start EXECUTE connect() in _establishConnection ');
                 if (typeof self.onLogListener === 'function') {
                     Utils.safeCallbackCall(self.onLogListener,
-                        '[QBChat]' + ' with statuses (!self.isConnected && !self._isConnecting && !self._sessionHasExpired):  '+' self.isConnected: '+self.isConnected+' self._isConnecting: '+self._isConnecting+' self._sessionHasExpired: '+self._sessionHasExpired);
+                        '[QBChat]' + ' start EXECUTE connect() in _establishConnection  in '+description+' self.isConnected: '+self.isConnected+' self._isConnecting: '+self._isConnecting+' self._sessionHasExpired: '+self._sessionHasExpired);
                 }
                 self.connect(params);
                 if (typeof self.onLogListener === 'function') {
                     Utils.safeCallbackCall(self.onLogListener,
-                        '[QBChat]' + 'call _connect() in _establishConnection is executed');
+                        '[QBChat]' + 'call _connect() in _establishConnection in '+description+' is executed');
                 }
             } else {
                 Utils.QBLog('[QBChat]', 'stop timer in _establishConnection ');
@@ -1192,7 +1199,7 @@ ChatProxy.prototype = {
                 self._checkConnectionTimer = undefined;
                 if (typeof self.onLogListener === 'function') {
                     Utils.safeCallbackCall(self.onLogListener,
-                        '[QBChat]' + 'stop timer in _establishConnection ');
+                        '[QBChat]' + 'stop timer in _establishConnection in '+description);
                 }
             }
         };
@@ -1211,6 +1218,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 = {};
@@ -1218,7 +1230,7 @@ ChatProxy.prototype = {
 
         if (Utils.getEnv().browser) {
             this.connection.flush();
-            this.connection.disconnect();
+            this.connection.disconnect('call Qb.chat.reconnect');//artik should be added reasone = 'reconnect from SDK'
         } else {
             this.Client.end();
         }
@@ -1595,6 +1607,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;
@@ -1605,7 +1622,7 @@ ChatProxy.prototype = {
 
         if (Utils.getEnv().browser) {
             this.connection.flush();
-            this.connection.disconnect();
+            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,8 +12,8 @@
  */
 
 var config = {
-  version: '2.19.0',
-  buildNumber: '1163',
+  version: '2.19.2',
+  buildNumber: '1164',
   creds: {
     'appId': 0,
     'authKey': '',

package/src/qbStrophe.js

@@ -12,17 +12,19 @@ require('strophe.js');
 var config = require('./qbConfig');
 var chatPRTCL = config.chatProtocol;
 var Utils = require('./qbUtils');
-var QBChatModules = require('./modules/chat/qbChat');
 
 function Connection(onLogListenerCallback) {
     var protocol = chatPRTCL.active === 1 ? chatPRTCL.bosh : chatPRTCL.websocket;
     var conn = new Strophe.Connection(protocol);
-    var onLogListener = config.debug? onLogListenerCallback || QBChatModules.onLogListener : null;
+    var onLogListener = config.debug ? onLogListenerCallback  : null;
     var safeCallbackCall = function(message, data) {
-        onLogListener = config.debug? onLogListenerCallback || QBChatModules.onLogListener : null;
+        onLogListener =  config.debug ? onLogListenerCallback  : null;
         if (onLogListener && typeof onLogListener === 'function') {
+            var id = data && data.id? data.id : '';
+            var innerHTML = data && data.innerHTML? data.innerHTML : '';
+            var outerHTML = data && data.outerHTML? data.outerHTML : '';
             Utils.safeCallbackCall(onLogListener,
-                '[QBChat][QBStrophe]' +  message + data);
+                '[QBChat][QBStrophe]' +  message + ' id:'+id+' innerHTML: '+innerHTML+' outerHTML: '+outerHTML+JSON.stringify(data));
         }
     };