Merge branch 'cs-and-updates'

modules/statistics/CallStats.js

@@ -68,7 +68,7 @@ function initCallback (err, msg) {
 
     if(!fabricInitialized) {
         CallStats.initializeFailed = true;
-        console.log("callstats fabric not initilized", ret.message);
+        logger.log("callstats fabric not initilized", ret.message);
         return;
     }
 
@@ -144,9 +144,12 @@ var CallStats = _try_catch(function(jingleSession, Settings, options) {
         this.session = jingleSession;
         this.peerconnection = jingleSession.peerconnection.peerconnection;
 
-        this.userID = Settings.getCallStatsUserName();
+        this.userID = {
+            aliasName: Strophe.getResourceFromJid(jingleSession.room.myroomjid),
+            userName: Settings.getCallStatsUserName()
+        };
 
-        var location = window.location;
+        const location = window.location;
         // The confID is case sensitive!!!
         this.confID = location.hostname + "/" + options.roomName;
 
@@ -161,9 +164,9 @@ var CallStats = _try_catch(function(jingleSession, Settings, options) {
             initCallback.bind(this));
 
     } catch (e) {
-        // The callstats.io API failed to initialize (e.g. because its
-        // download failed to succeed in general or on time). Further
-        // attempts to utilize it cannot possibly succeed.
+        // The callstats.io API failed to initialize (e.g. because its download
+        // did not succeed in general or on time). Further attempts to utilize
+        // it cannot possibly succeed.
         GlobalOnErrorHandler.callErrorHandler(e);
         callStats = null;
         logger.error(e);
@@ -230,10 +233,8 @@ var reportType = {
 };
 
 CallStats.prototype.pcCallback = _try_catch(function (err, msg) {
-    if (!callStats) {
-        return;
-    }
-    logger.log("Monitoring status: "+ err + " msg: " + msg);
+    if (callStats && err !== 'success')
+        logger.error("Monitoring status: "+ err + " msg: " + msg);
 });
 
 /**
@@ -253,11 +254,9 @@ function (ssrc, isLocal, usageLabel, containerId) {
     if(!callStats) {
         return;
     }
+
     // 'focus' is default remote user ID for now
-    var callStatsId = 'focus';
-    if (isLocal) {
-        callStatsId = this.userID;
-    }
+    const callStatsId = isLocal ? this.userID : 'focus';
 
     _try_catch(function() {
         logger.debug(
@@ -267,8 +266,7 @@ function (ssrc, isLocal, usageLabel, containerId) {
             this.confID,
             ssrc,
             usageLabel,
-            containerId
-        );
+            containerId);
         if(CallStats.initialized) {
             callStats.associateMstWithUserID(
                 this.peerconnection,
@@ -276,17 +274,16 @@ function (ssrc, isLocal, usageLabel, containerId) {
                 this.confID,
                 ssrc,
                 usageLabel,
-                containerId
-            );
+                containerId);
         }
         else {
             CallStats.reportsQueue.push({
                 type: reportType.MST_WITH_USERID,
                 data: {
-                    callStatsId: callStatsId,
-                    ssrc: ssrc,
-                    usageLabel: usageLabel,
-                    containerId: containerId
+                    callStatsId,
+                    containerId,
+                    ssrc,
+                    usageLabel
                 }
             });
             CallStats._checkInitialize();
@@ -301,13 +298,12 @@ function (ssrc, isLocal, usageLabel, containerId) {
  * @param {CallStats} cs callstats instance related to the event
  */
 CallStats.sendMuteEvent = _try_catch(function (mute, type, cs) {
+    let event;
 
-    var event = null;
     if (type === "video") {
-        event = (mute? fabricEvent.videoPause : fabricEvent.videoResume);
-    }
-    else {
-        event = (mute? fabricEvent.audioMute : fabricEvent.audioUnmute);
+        event = mute ? fabricEvent.videoPause : fabricEvent.videoResume;
+    } else {
+        event = mute ? fabricEvent.audioMute : fabricEvent.audioUnmute;
     }
 
     CallStats._reportEvent.call(cs, event);
@@ -320,9 +316,9 @@ CallStats.sendMuteEvent = _try_catch(function (mute, type, cs) {
  * @param {CallStats} cs callstats instance related to the event
  */
 CallStats.sendScreenSharingEvent = _try_catch(function (start, cs) {
-
-    CallStats._reportEvent.call(cs,
-        start? fabricEvent.screenShareStart : fabricEvent.screenShareStop);
+    CallStats._reportEvent.call(
+        cs,
+        start ? fabricEvent.screenShareStart : fabricEvent.screenShareStop);
 });
 
 /**
@@ -330,9 +326,7 @@ CallStats.sendScreenSharingEvent = _try_catch(function (start, cs) {
  * @param {CallStats} cs callstats instance related to the event
  */
 CallStats.sendDominantSpeakerEvent = _try_catch(function (cs) {
-
-    CallStats._reportEvent.call(cs,
-        fabricEvent.dominantSpeaker);
+    CallStats._reportEvent.call(cs, fabricEvent.dominantSpeaker);
 });
 
 /**
@@ -341,7 +335,6 @@ CallStats.sendDominantSpeakerEvent = _try_catch(function (cs) {
  * @param {CallStats} cs callstats instance related to the event
  */
 CallStats.sendActiveDeviceListEvent = _try_catch(function (devicesData, cs) {
-
     CallStats._reportEvent.call(cs, fabricEvent.activeDeviceList, devicesData);
 });
 
@@ -412,10 +405,10 @@ function(overallFeedback, detailedFeedback) {
     if(!CallStats.feedbackEnabled) {
         return;
     }
+
     var feedbackString =    '{"userID":"' + this.userID + '"' +
                             ', "overall":' + overallFeedback +
                             ', "comment": "' + detailedFeedback + '"}';
-
     var feedbackJSON = JSON.parse(feedbackString);
 
     callStats.sendUserFeedback(this.confID, feedbackJSON);
@@ -518,8 +511,7 @@ CallStats.sendAddIceCandidateFailed = _try_catch(function (e, pc, cs) {
  * @param {CallStats} cs callstats instance related to the error (optional)
  */
 CallStats.sendApplicationLog = _try_catch(function (e, cs) {
-    CallStats._reportError
-        .call(cs, wrtcFuncNames.applicationLog, e, null);
+    CallStats._reportError.call(cs, wrtcFuncNames.applicationLog, e, null);
 });
 
 /**

modules/xmpp/strophe.jingle.js

@@ -139,7 +139,7 @@ class JingleConnectionPlugin extends ConnectionPlugin {
                     Statistics.analytics.sendEvent(
                         'xmpp.transport-replace.success',
                         {value: successTime});
-                }, (error) => {
+                }, error => {
                     GlobalOnErrorHandler.callErrorHandler(error);
                     logger.error('Transport replace failed', error);
                     sess.sendTransportReject();
@@ -191,7 +191,7 @@ class JingleConnectionPlugin extends ConnectionPlugin {
             $iq({type: 'get', to: this.connection.domain})
                 .c('services', {xmlns: 'urn:xmpp:extdisco:1'})
                 .c('service', {host: 'turn.' + this.connection.domain}),
-            (res) => {
+            res => {
                 let iceservers = [];
                 $(res).find('>services>service').each((idx, el) => {
                     el = $(el);
@@ -240,8 +240,8 @@ class JingleConnectionPlugin extends ConnectionPlugin {
                         }
                     }
                 });
-                self.ice_config.iceServers = iceservers;
-            }, (err) => {
+                this.ice_config.iceServers = iceservers;
+            }, err => {
                 logger.warn('getting turn credentials failed', err);
                 logger.warn('is mod_turncredentials or similar installed?');
             });
@@ -253,8 +253,8 @@ class JingleConnectionPlugin extends ConnectionPlugin {
      */
     getLog () {
         const data = {};
-        Object.keys(this.sessions).forEach((sid) => {
-            const session = self.sessions[sid];
+        Object.keys(this.sessions).forEach(sid => {
+            const session = this.sessions[sid];
             const pc = session.peerconnection;
             if (pc && pc.updateLog) {
                 // FIXME: should probably be a .dump call

package.json

@@ -25,7 +25,7 @@
     "sdp-interop": "0.1.11",
     "sdp-simulcast": "0.1.7",
     "sdp-transform": "1.5.*",
-    "socket.io-client": "1.3.6",
+    "socket.io-client": "1.4.5",
     "strophe": "^1.2.2",
     "strophejs-plugins": "^0.0.6"
   },