SDK version updated to 2.12.9

QuickBlox · Aug 11, 2020 · 2b97209 · 2b97209
1 parent 26c5441
commit 2b97209
Show file tree

Hide file tree

Showing 7 changed files with 154 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ Check out our [API Reference](https://quickblox.github.io/quickblox-javascript-s
 ## Dependencies for browser
 
 ```html
-<script src="https://unpkg.com/quickblox@2.12.8/quickblox.min.js"></script>
+<script src="https://unpkg.com/quickblox@2.12.9/quickblox.min.js"></script>
 ```
 
 ## Bower and RequireJS

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "quickblox",
   "description": "QuickBlox JavaScript SDK",
-  "version": "2.12.8",
+  "version": "2.12.9",
   "homepage": "https://quickblox.com/developers/Javascript",
   "main": "src/qbMain.js",
   "license": "(Apache-2.0)",

diff --git a/quickblox.js b/quickblox.js
@@ -38202,7 +38202,7 @@ function ChatProxy(service) {
     this._isLogout = false;
 
     this._checkConnectionTimer = undefined;
-
+    this._pings = {};
     //
     this.helpers = new Helpers();
     //
@@ -38680,18 +38680,46 @@ function ChatProxy(service) {
     };
 
     this._onIQ = function(stanza) {
-        var stanzaId = chatUtils.getAttr(stanza, 'id'),
-            isLastActivity = stanzaId.indexOf('lastActivity') > -1;
+        var stanzaId = chatUtils.getAttr(stanza, 'id');
+        var isLastActivity = stanzaId.indexOf('lastActivity') > -1;
+        var isPong = stanzaId.indexOf('ping') > -1;
+        var ping = chatUtils.getElement(stanza, 'ping');
+        var type = chatUtils.getAttr(stanza, 'type');
+        var from = chatUtils.getAttr(stanza, 'from');
+        var userId = from ?
+            self.helpers.getIdFromNode(from) :
+            null;
 
         if (typeof self.onLastUserActivityListener === 'function' && isLastActivity) {
-            var from = chatUtils.getAttr(stanza, 'from'),
-                userId = self.helpers.getIdFromNode(from),
-                query = chatUtils.getElement(stanza, 'query'),
+            var query = chatUtils.getElement(stanza, 'query'),
                 error = chatUtils.getElement(stanza, 'error'),
                 seconds = error ? undefined : +chatUtils.getAttr(query, 'seconds');
 
             Utils.safeCallbackCall(self.onLastUserActivityListener, userId, seconds);
         }
+        if ((ping || isPong) && type) {
+            if (type === 'get' && ping) {
+                // pong
+                self.connection.send($iq({
+                    from: self.helpers.getUserCurrentJid(),
+                    id: stanzaId,
+                    to: chatUtils.getAttr(stanza, 'from'),
+                    type: 'result'
+                }));
+            } else {
+                var pingRequest = self._pings[stanzaId];
+                if (pingRequest) {
+                    if (pingRequest.callback) {
+                        pingRequest.callback(null);
+                    }
+                    if (pingRequest.interval) {
+                        clearInterval(pingRequest.interval);
+                    }
+                    self._pings[stanzaId] = undefined;
+                    delete self._pings[stanzaId];
+                }
+            }
+        }
 
         if (!Utils.getEnv().browser) {
             if (self.nodeStanzasCallbacks[stanzaId]) {
@@ -39321,6 +39349,44 @@ ChatProxy.prototype = {
         }
     },
 
+    ping: function (jid_or_user_id, callback) {
+        var self = this;
+        var id = this.helpers.getUniqueId('ping');
+        var to;
+        var _callback;
+        if ((typeof jid_or_user_id === 'string' ||
+            typeof jid_or_user_id === 'number') &&
+            typeof callback === 'function') {
+            to = this.helpers.jidOrUserId(jid_or_user_id);
+            _callback = callback;
+        } else {
+            if (typeof jid_or_user_id === 'function' && !callback) {
+                to = config.endpoints.chat;
+                _callback = jid_or_user_id;
+            } else {
+                throw new Error('Invalid arguments provided. Either userId/jid (number/string) and callback or only callback should be provided.');
+            }
+        }
+        var iqParams = {
+            from: this.helpers.getUserCurrentJid(),
+            id: id,
+            to: to,
+            type: 'get'
+        };
+        var stanza = $iq(iqParams).c('ping', { xmlns: "urn:xmpp:ping" });
+        var noAnswer = function () {
+            _callback('No answer');
+            self._pings[id] = undefined;
+            delete self._pings[id];
+        };
+        this.connection.send(stanza);
+        this._pings[id] = {
+            callback: _callback,
+            interval: setTimeout(noAnswer, config.pingTimeout * 1000)
+        };
+        return id;
+    },
+
     /**
      * Logout from the Chat. {@link https://quickblox.com/developers/Web_XMPP_Chat_Sample#Logout_from_Chat More info.}
      * @memberof QB.chat
@@ -45585,8 +45651,8 @@ module.exports = StreamManagement;
  */
 
 var config = {
-  version: '2.12.8',
-  buildNumber: '1086',
+  version: '2.12.9',
+  buildNumber: '1087',
   creds: {
     appId: '',
     authKey: '',
@@ -45606,6 +45672,7 @@ var config = {
     websocket: 'wss://chat.quickblox.com:5291',
     active: 2
   },
+  pingTimeout: 30,
   chatReconnectionTimeInterval: 5,
   webrtc: {
     answerTimeInterval: 60,

diff --git a/quickblox.min.js b/quickblox.min.js
diff --git a/src/modules/chat/qbChat.js b/src/modules/chat/qbChat.js
@@ -86,7 +86,7 @@ function ChatProxy(service) {
     this._isLogout = false;
 
     this._checkConnectionTimer = undefined;
-
+    this._pings = {};
     //
     this.helpers = new Helpers();
     //
@@ -564,18 +564,46 @@ function ChatProxy(service) {
     };
 
     this._onIQ = function(stanza) {
-        var stanzaId = chatUtils.getAttr(stanza, 'id'),
-            isLastActivity = stanzaId.indexOf('lastActivity') > -1;
+        var stanzaId = chatUtils.getAttr(stanza, 'id');
+        var isLastActivity = stanzaId.indexOf('lastActivity') > -1;
+        var isPong = stanzaId.indexOf('ping') > -1;
+        var ping = chatUtils.getElement(stanza, 'ping');
+        var type = chatUtils.getAttr(stanza, 'type');
+        var from = chatUtils.getAttr(stanza, 'from');
+        var userId = from ?
+            self.helpers.getIdFromNode(from) :
+            null;
 
         if (typeof self.onLastUserActivityListener === 'function' && isLastActivity) {
-            var from = chatUtils.getAttr(stanza, 'from'),
-                userId = self.helpers.getIdFromNode(from),
-                query = chatUtils.getElement(stanza, 'query'),
+            var query = chatUtils.getElement(stanza, 'query'),
                 error = chatUtils.getElement(stanza, 'error'),
                 seconds = error ? undefined : +chatUtils.getAttr(query, 'seconds');
 
             Utils.safeCallbackCall(self.onLastUserActivityListener, userId, seconds);
         }
+        if ((ping || isPong) && type) {
+            if (type === 'get' && ping) {
+                // pong
+                self.connection.send($iq({
+                    from: self.helpers.getUserCurrentJid(),
+                    id: stanzaId,
+                    to: chatUtils.getAttr(stanza, 'from'),
+                    type: 'result'
+                }));
+            } else {
+                var pingRequest = self._pings[stanzaId];
+                if (pingRequest) {
+                    if (pingRequest.callback) {
+                        pingRequest.callback(null);
+                    }
+                    if (pingRequest.interval) {
+                        clearInterval(pingRequest.interval);
+                    }
+                    self._pings[stanzaId] = undefined;
+                    delete self._pings[stanzaId];
+                }
+            }
+        }
 
         if (!Utils.getEnv().browser) {
             if (self.nodeStanzasCallbacks[stanzaId]) {
@@ -1205,6 +1233,44 @@ ChatProxy.prototype = {
         }
     },
 
+    ping: function (jid_or_user_id, callback) {
+        var self = this;
+        var id = this.helpers.getUniqueId('ping');
+        var to;
+        var _callback;
+        if ((typeof jid_or_user_id === 'string' ||
+            typeof jid_or_user_id === 'number') &&
+            typeof callback === 'function') {
+            to = this.helpers.jidOrUserId(jid_or_user_id);
+            _callback = callback;
+        } else {
+            if (typeof jid_or_user_id === 'function' && !callback) {
+                to = config.endpoints.chat;
+                _callback = jid_or_user_id;
+            } else {
+                throw new Error('Invalid arguments provided. Either userId/jid (number/string) and callback or only callback should be provided.');
+            }
+        }
+        var iqParams = {
+            from: this.helpers.getUserCurrentJid(),
+            id: id,
+            to: to,
+            type: 'get'
+        };
+        var stanza = $iq(iqParams).c('ping', { xmlns: "urn:xmpp:ping" });
+        var noAnswer = function () {
+            _callback('No answer');
+            self._pings[id] = undefined;
+            delete self._pings[id];
+        };
+        this.connection.send(stanza);
+        this._pings[id] = {
+            callback: _callback,
+            interval: setTimeout(noAnswer, config.pingTimeout * 1000)
+        };
+        return id;
+    },
+
     /**
      * Logout from the Chat. {@link https://quickblox.com/developers/Web_XMPP_Chat_Sample#Logout_from_Chat More info.}
      * @memberof QB.chat

diff --git a/src/qbConfig.js b/src/qbConfig.js
@@ -12,8 +12,8 @@
  */
 
 var config = {
-  version: '2.12.8',
-  buildNumber: '1086',
+  version: '2.12.9',
+  buildNumber: '1087',
   creds: {
     appId: '',
     authKey: '',
@@ -33,6 +33,7 @@ var config = {
     websocket: 'wss://chat.quickblox.com:5291',
     active: 2
   },
+  pingTimeout: 30,
   chatReconnectionTimeInterval: 5,
   webrtc: {
     answerTimeInterval: 60,