quickblox 2.14.0 → 2.15.0

package/src/modules/webrtc/qbWebRTCSignalingProcessor.js

@@ -9,12 +9,11 @@ require('strophe.js');
 
 var SignalingConstants = require('./qbWebRTCSignalingConstants');
 
-function WebRTCSignalingProcessor(service, delegate, connection) {
+function WebRTCSignalingProcessor(service, delegate) {
     var self = this;
 
     self.service = service;
     self.delegate = delegate;
-    self.connection = connection;
 
     this._onMessage = function(from, extraParams, delay, userId) {
 
@@ -66,84 +65,90 @@ function WebRTCSignalingProcessor(service, delegate, connection) {
         }
     };
 
+    /**
+     * Convert XML into JS object
+     * @param {Element} extraParams 
+     * @returns {Object}
+     */
     this._getExtension = function(extraParams) {
         if (!extraParams) {
-            return null;
+            return {};
         }
 
-        var extension = {}, iceCandidates = [], opponents = [],
-            candidate, opponent, items, childrenNodes;
-
-        for (var i = 0, len = extraParams.childNodes.length; i < len; i++) {
-            if (extraParams.childNodes[i].tagName === 'iceCandidates') {
+        var extension = {},
+            iceCandidates = [],
+            opponents = [];
 
+        extraParams.childNodes.forEach(function (childNode) {
+            if (childNode.nodeName === 'iceCandidates') {
                 /** iceCandidates */
-                items = extraParams.childNodes[i].childNodes;
-
-                for (var j = 0, len2 = items.length; j < len2; j++) {
-                    candidate = {};
-                    childrenNodes = items[j].childNodes;
-
-                    for (var k = 0, len3 = childrenNodes.length; k < len3; k++) {
-                        candidate[childrenNodes[k].tagName] = childrenNodes[k].textContent;
-                    }
-
+                childNode.childNodes.forEach(function (candidateNode) {
+                    var candidate = {};
+                    candidateNode.childNodes.forEach(function (node) {
+                        candidate[node.nodeName] = node.textContent;
+                    });
                     iceCandidates.push(candidate);
-                }
+                });
 
-            } else if (extraParams.childNodes[i].tagName === 'opponentsIDs') {
+            } else if (childNode.nodeName === 'opponentsIDs') {
                 /** opponentsIDs */
-                items = extraParams.childNodes[i].childNodes;
-
-                for (var v = 0, len2v = items.length; v < len2v; v++) {
-                    opponent = items[v].textContent;
-                    opponents.push(parseInt(opponent));
-                }
+                childNode.childNodes.forEach(function (opponentNode) {
+                    var opponentId = opponentNode.textContent;
+                    opponents.push(parseInt(opponentId));
+                });
             } else {
-                if (extraParams.childNodes[i].childNodes.length > 1) {
-                    var nodeTextContentSize = extraParams.childNodes[i].textContent.length;
-
-                    if (nodeTextContentSize > 4096) {
-                        var wholeNodeContent = "";
-
-                        for (var t=0; t<extraParams.childNodes[i].childNodes.length; ++t) {
-                            wholeNodeContent += extraParams.childNodes[i].childNodes[t].textContent;
-                        }
-                        extension[extraParams.childNodes[i].tagName] = wholeNodeContent;
-                    } else {
-                        extension = self._XMLtoJS(extension, extraParams.childNodes[i].tagName, extraParams.childNodes[i]);
-                    }
+                if (childNode.childNodes.length > 1) {
+                    extension = self._XMLtoJS(
+                        extension,
+                        childNode.nodeName,
+                        childNode
+                    );
                 } else {
-                    if (extraParams.childNodes[i].tagName === 'userInfo') {
-                        extension = self._XMLtoJS(extension, extraParams.childNodes[i].tagName, extraParams.childNodes[i]);
+                    if (childNode.nodeName === 'userInfo') {
+                        extension = self._XMLtoJS(
+                            extension,
+                            childNode.nodeName,
+                            childNode
+                        );
                     } else {
-                        extension[extraParams.childNodes[i].tagName] = extraParams.childNodes[i].textContent;
+                        extension[childNode.nodeName] = childNode.textContent;
                     }
                 }
             }
-        }
-        if (iceCandidates.length > 0){
+        });
+
+        if (iceCandidates.length > 0) {
             extension.iceCandidates = iceCandidates;
         }
-        if (opponents.length > 0){
+        if (opponents.length > 0) {
             extension.opponentsIDs = opponents;
         }
 
         return extension;
     };
 
-    // TODO: the magic
-    this._XMLtoJS = function(extension, title, obj) {
+    /**
+     * 
+     * @param {Object} extension 
+     * @param {string} title 
+     * @param {Element} element 
+     * @returns {Object}
+     */
+    this._XMLtoJS = function(extension, title, element) {
         var self = this;
         extension[title] = {};
 
-        for (var i = 0, len = obj.childNodes.length; i < len; i++) {
-            if (obj.childNodes[i].childNodes.length > 1) {
-                extension[title] = self._XMLtoJS(extension[title], obj.childNodes[i].tagName, obj.childNodes[i]);
+        element.childNodes.forEach(function (childNode) {
+            if (childNode.childNodes.length > 1) {
+                extension[title] = self._XMLtoJS(
+                    extension[title],
+                    childNode.nodeName,
+                    childNode
+                );
             } else {
-                extension[title][obj.childNodes[i].tagName] = obj.childNodes[i].textContent;
+                extension[title][childNode.nodeName] = childNode.textContent;
             }
-        }
+        });
         return extension;
     };
 }

package/src/modules/webrtc/qbWebRTCSignalingProvider.js

@@ -15,22 +15,21 @@ var SignalingConstants = require('./qbWebRTCSignalingConstants');
 var Utils = require('../../qbUtils');
 var config = require('../../qbConfig');
 
-function WebRTCSignalingProvider(service, connection) {
+function WebRTCSignalingProvider(service, chat) {
     this.service = service;
-    this.connection = connection;
+    this.chat = chat;
 }
 
-WebRTCSignalingProvider.prototype.sendCandidate = function(userId, iceCandidates, ext) {
+WebRTCSignalingProvider.prototype.sendCandidate = function (userId, iceCandidates, ext) {
     var extension = ext || {};
     extension.iceCandidates = iceCandidates;
 
     this.sendMessage(userId, extension, SignalingConstants.SignalingType.CANDIDATE);
 };
 
-WebRTCSignalingProvider.prototype.sendMessage = function(userId, ext, signalingType) {
+WebRTCSignalingProvider.prototype.sendMessage = function (userId, ext, signalingType) {
     var extension = ext || {},
-        self = this,
-        msg, params;
+        self = this;
 
     /** basic parameters */
     extension.moduleIdentifier = SignalingConstants.MODULE_ID;
@@ -46,23 +45,23 @@ WebRTCSignalingProvider.prototype.sendMessage = function(userId, ext, signalingT
         delete extension.userInfo;
     }
 
-    params = {
+    var params = {
         to: Helpers.getUserJid(userId, config.creds.appId),
         type: 'headline',
         id: Utils.getBsonObjectId()
     };
 
-    msg = $msg(params).c('extraParams', {
+    var msg = $msg(params).c('extraParams', {
         xmlns: Strophe.NS.CLIENT
     });
 
-    Object.keys(extension).forEach(function(field) {
+    Object.keys(extension).forEach(function (field) {
         if (field === 'iceCandidates') {
             /** iceCandidates */
-            msg = msg.c('iceCandidates');
-            extension[field].forEach(function(candidate) {
-                msg = msg.c('iceCandidate');
-                Object.keys(candidate).forEach(function(key) {
+            msg.c('iceCandidates');
+            extension[field].forEach(function (candidate) {
+                msg.c('iceCandidate');
+                Object.keys(candidate).forEach(function (key) {
                     msg.c(key).t(candidate[key]).up();
                 });
                 msg.up();
@@ -70,9 +69,9 @@ WebRTCSignalingProvider.prototype.sendMessage = function(userId, ext, signalingT
             msg.up();
         } else if (field === 'opponentsIDs') {
             /** opponentsIDs */
-            msg = msg.c('opponentsIDs');
-            extension[field].forEach(function(opponentId) {
-                msg = msg.c('opponentID').t(opponentId).up();
+            msg.c('opponentsIDs');
+            extension[field].forEach(function (opponentId) {
+                msg.c('opponentID').t(opponentId).up();
             });
             msg.up();
         } else if (typeof extension[field] === 'object') {
@@ -82,14 +81,19 @@ WebRTCSignalingProvider.prototype.sendMessage = function(userId, ext, signalingT
         }
     });
 
-    this.connection.send(msg);
+    this.chat.connection.send(msg);
 };
 
-/** TODO: the magic */
-WebRTCSignalingProvider.prototype._JStoXML = function(title, obj, msg) {
+/**
+ * 
+ * @param {string} title 
+ * @param {Object} obj 
+ * @param {Strophe.Builder} msg 
+ */
+WebRTCSignalingProvider.prototype._JStoXML = function (title, obj, msg) {
     var self = this;
     msg.c(title);
-    Object.keys(obj).forEach(function(field) {
+    Object.keys(obj).forEach(function (field) {
         if (typeof obj[field] === 'object')
             self._JStoXML(field, obj[field], msg);
         else

package/src/qbConfig.js

@@ -12,8 +12,8 @@
  */
 
 var config = {
-  version: '2.14.0',
-  buildNumber: '1135',
+  version: '2.15.0',
+  buildNumber: '1137',
   creds: {
     'appId': 0,
     'authKey': '',
@@ -21,7 +21,7 @@ var config = {
     'accountKey': ''
   },
   endpoints: {
-    api: 'apistage6.quickblox.com/',
+    api: 'api.quickblox.com',
     chat: 'chat.quickblox.com',
     muc: 'muc.chat.quickblox.com'
   },
@@ -73,7 +73,7 @@ var config = {
   },
   timeout: null,
   debug: {
-    mode: 1,
+    mode: 0,
     file: null
   },
   addISOTime: false,
@@ -108,23 +108,22 @@ config.set = function(options) {
   });
 };
 
-/*
-* 17.08.22 artan: waiting for backend fix, look at tasks:
-* [CROS-815] - Update sessionExpirationDate on each request
-* [SR-1322] - Set param Access-Control-Expose-Headerson server side
- */
 config.updateSessionExpirationDate = function (tokenExpirationDate, headerHasToken = false) {
   var connectionTimeLag = 1; // minute
-  var newDate = new Date(tokenExpirationDate);
-  newDate.setMinutes ( newDate.getMinutes() - connectionTimeLag);
-  // TODO: need to check in [CROS-815]
-  if (!headerHasToken) {
-    console.log('in date: ', newDate);
+  var newDate;
+  if (headerHasToken) {
+    var d = tokenExpirationDate.replaceAll('-','/');
+    newDate = new Date(d);
+    newDate.setMinutes ( newDate.getMinutes() - connectionTimeLag);
+  }
+  else {
+    newDate = new Date(tokenExpirationDate);
+    newDate.setMinutes ( newDate.getMinutes() - connectionTimeLag);
     newDate.setMinutes ( newDate.getMinutes() + config.liveSessionInterval );
-    console.log('out date: ', newDate);
   }
   config.qbTokenExpirationDate = newDate;
-  console.log('updateSessionExpirationDate ... Set value: ', tokenExpirationDate);
+  console.log('updateSessionExpirationDate ... Set value: ', config.qbTokenExpirationDate);
 };
 
+
 module.exports = config;

package/src/qbMain.js

@@ -28,24 +28,12 @@ QuickBlox.prototype = {
     _getOS: Utils.getOS.bind(Utils),
 
     /**
-     * Init QuickBlox SDK with User Account data for start session with token.
      * @memberof QB
-     * @param {Number} appId - Application ID (from your admin panel).
-     * @param {String | Number} accountKey - Account key (from your admin panel).
+     * @param {Number | String} appIdOrToken - Application ID (from your admin panel) or Session Token.
+     * @param {String | Number} authKeyOrAppId - Authorization key or Application ID. You need to set up Application ID if you use session token as appIdOrToken parameter.
+     * @param {String} authSecret - Authorization secret key (from your admin panel).
      * @param {Object} configMap - Settings object for QuickBlox SDK.
      */
-    initWithAppId: function(appId, accountKey, configMap) {
-        if (typeof appId !== 'number') {
-            throw new Error('Type of appId must be a number');
-        }
-        if (appId === '' || appId === undefined || appId === null ||
-            accountKey === '' || accountKey === undefined || accountKey === null) {
-            throw new Error('Cannot init QuickBlox without app credentials (app ID, auth key)');
-        } else {
-            this.init('', appId, null, accountKey, configMap);
-        }
-    },
-
     init: function(appIdOrToken, authKeyOrAppId, authSecret, accountKey, configMap) {
         if (typeof accountKey === 'string' && accountKey.length) {
             if (configMap && typeof configMap === 'object') {
@@ -93,8 +81,7 @@ QuickBlox.prototype = {
             /** add WebRTC API if API is avaible */
             if( Utils.isWebRTCAvailble() ) {
                 var WebRTCClient = require('./modules/webrtc/qbWebRTCClient');
-                this.webrtc = new WebRTCClient(this.service, this.chat.connection);
-                this.chat.webrtcSignalingProcessor = this.webrtc.signalingProcessor;
+                this.webrtc = new WebRTCClient(this.service, this.chat);
             } else {
                 this.webrtc = false;
             }
@@ -145,6 +132,26 @@ QuickBlox.prototype = {
         }
     },
 
+    /**
+     * Init QuickBlox SDK with User Account data for start session with token.
+     * @memberof QB
+     * @param {Number} appId - Application ID (from your admin panel).
+     * @param {String | Number} accountKey - Account key (from your admin panel).
+     * @param {Object} configMap - Settings object for QuickBlox SDK.
+     */
+    initWithAppId: function(appId, accountKey, configMap) {
+        //добавить проверку типа параметров
+        if (typeof appId !== 'number') {
+            throw new Error('Type of appId must be a number');
+        }
+        if (appId === '' || appId === undefined || appId === null ||
+            accountKey === '' || accountKey === undefined || accountKey === null) {
+            throw new Error('Cannot init QuickBlox without app credentials (app ID, auth key)');
+        } else {
+            this.init('', appId, null, accountKey, configMap);
+        }
+    },
+
     /**
      * Return current session
      * @memberof QB
@@ -183,6 +190,9 @@ QuickBlox.prototype = {
             if (typeof callback === 'function') {
                 try{
                     this.auth.getSession(callback);
+                    // TODO: pay attention on it, if we decide to remove application_id from QB.init:
+                    // artan 06-09-2022
+                    // should set  value application_id from session model into config.creds.appId
                 }
                 catch(er){
                     callback(er, null);

package/src/qbProxy.js

@@ -141,7 +141,6 @@ ServiceProxy.prototype = {
                 qbResponse = response;
 
                 if (qbRequest.method === 'GET' || qbRequest.method === 'POST'){
-                    // TODO: need to check in [CROS-815]
                     var qbTokenExpirationDate = qbResponse.headers.get('qb-token-expirationdate');
                     var headerHasToken  = !(qbTokenExpirationDate === null ||
                         typeof qbTokenExpirationDate === 'undefined');
@@ -164,8 +163,6 @@ ServiceProxy.prototype = {
             }).then(function(body) {
             _requestCallback(null, qbResponse, body);
         }, function(error) {
-                // TODO: review in [CROS-815]
-            console.log('Error: ', error);
             _requestCallback(error);
         });
 

package/src/qbUtils.js

@@ -321,6 +321,7 @@ var Utils = {
         }
         return merged;
     }
+
 };
 
 module.exports = Utils;