QBWEBSDK-187 one more time

Author: dimaspirit

js/modules/webrtc/qbWebRTCClient.js

@@ -135,6 +135,7 @@ WebRTCClient.prototype._onCallListener = function(userID, sessionID, extension)
     this.signalingProvider.sendMessage(userID, extension, SignalingConstants.SignalingType.REJECT);
   } else {
     var session = this.sessions[sessionID];
+
     if(!session){
       session = this._createAndStoreSession(sessionID, extension.callerID, extension.opponentsIDs, extension.callType);
 
@@ -154,15 +155,19 @@ WebRTCClient.prototype._onAcceptListener = function(userID, sessionID, extension
 
   var session = this.sessions[sessionID];
 
-  if(session || (session.state === WebRTCSession.State.ACTIVE || session.state === WebRTCSession.State.NEW)){
-    var extensionClone = JSON.parse(JSON.stringify(extension));
-    this._cleanupExtension(extensionClone);
+  if(session){
+    if(session.state === WebRTCSession.State.ACTIVE ) {
+      var extensionClone = JSON.parse(JSON.stringify(extension));
+      this._cleanupExtension(extensionClone);
 
-    if (typeof this.onAcceptCallListener === 'function'){
-      this.onAcceptCallListener(session, userID, extensionClone);
-    }
+      if (typeof this.onAcceptCallListener === 'function'){
+        this.onAcceptCallListener(session, userID, extensionClone);
+      }
 
-    session.processOnAccept(userID, extension);
+      session.processOnAccept(userID, extension);
+    } else {
+      Helpers.traceWarning("Ignore 'onAccept', the session( " + sessionID + " ) has invalid state.");
+    }
   }else{
     Helpers.traceError("Ignore 'onAccept', there is no information about session " + sessionID + " by some reason.");
   }
@@ -212,7 +217,11 @@ WebRTCClient.prototype._onIceCandidatesListener = function(userID, sessionID, ex
   var session = this.sessions[sessionID];
 
   if(session){
-    session.processOnIceCandidates(userID, extension);
+    if(session.state === WebRTCSession.State.ACTIVE) {
+      session.processOnIceCandidates(userID, extension);
+    } else {
+      Helpers.traceWarning('Ignore \'OnIceCandidates\', the session ( ' + sessionID + ' ) has invalid state.');
+    }
   }else{
     Helpers.traceError("Ignore 'OnIceCandidates', there is no information about session " + sessionID + " by some reason.");
   }

js/modules/webrtc/qbWebRTCHelpers.js

@@ -28,6 +28,12 @@ WebRTCHelpers = {
     }
   },
 
+  traceWarning: function(text) {
+    if (config.debug) {
+      console.warn('[QBWebRTC]:', text);
+    }
+  },
+
   traceError: function(text) {
     if (config.debug) {
       console.error('[QBWebRTC]:', text);

js/modules/webrtc/qbWebRTCSession.js

@@ -444,17 +444,17 @@ WebRTCSession.filter = function(id, filters) {
 //
 
 WebRTCSession.prototype.processOnCall = function(callerID, extension) {
-  var self = this;
+  var self = this,
+      oppIDs = self._uniqueOpponentsIDs();
 
-  this._clearWaitingOfferOrAnswerTimer();
+  self._clearWaitingOfferOrAnswerTimer();
 
-  var oppIDs = this._uniqueOpponentsIDs();
-    oppIDs.forEach(function(opID, i, arr) {
-
-    var peerConnection = self.peerConnections[opID];
-    if(peerConnection){
+  oppIDs.forEach(function(opID, i, arr) {
+    var pConn = self.peerConnections[opID];
+    
+    if(pConn){
       if(opID == callerID){
-        peerConnection.updateRemoteSDP(extension.sdp);
+        pConn.updateRemoteSDP(extension.sdp);
 
         // The group call logic starts here
         if(callerID != self.initiatorID && self.state === WebRTCSession.State.ACTIVE){
@@ -479,7 +479,6 @@ WebRTCSession.prototype.processOnCall = function(callerID, extension) {
       }
     }
   });
-
 };
 
 WebRTCSession.prototype.processOnAccept = function(userID, extension) {

js/qbStrophe.js

@@ -12,13 +12,22 @@ var Utils = require('./qbUtils');
 function Connection() {
   var protocol = config.chatProtocol.active === 1 ? config.chatProtocol.bosh : config.chatProtocol.websocket;
   var conn = new Strophe.Connection(protocol);
+
   if (config.chatProtocol.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]);
-    }} };
-    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]);
-    }} };
+    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]);
+        }
+      }
+    };
+    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]);
+        }
+      }
+    };
   } else {
     conn.xmlInput = function(data) {
       Utils.QBLog('[QBChat]', 'RECV:', data);

quickblox.min.js

@@ -244,7 +244,7 @@
                 app.currentSession = QB.webrtc.createNewSession(Object.keys(app.callees), QB.webrtc.CallType.VIDEO);
 
                 app.currentSession.getUserMedia(mediaParams, function(err, stream) {
-                    if (err || stream.getAudioTracks().length || stream.getVideoTracks().length) {
+                    if (err || !stream.getAudioTracks().length || !stream.getVideoTracks().length) {
                         ui.updateMsg({msg: 'device_not_found', obj: {name: app.caller.full_name}});
                         app.currentSession.stop({});
                     } else {