getStats.js updated. Now returning arrays instead of strings.

alert(result.connectionType.remote.networkType instanceof Arrray); bytesSent/bytesReceived fixed: result.audio.bytesSent result.video.bytesSent
muaz-khan · Aug 13, 2017 · 336fa6d · 336fa6d
1 parent 184abf1
commit 336fa6d
Show file tree

Hide file tree

Showing 12 changed files with 328 additions and 155 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -49,6 +49,7 @@ module.exports = function(grunt) {
                     'dev/localcandidate.js',
                     'dev/remotecandidate.js',
                     'dev/dataSentReceived.js',
+                    'dev/ssrc.js',
                     'dev/tail.js'
                 ],
                 dest: 'getStats.js',

diff --git a/dev/dataSentReceived.js b/dev/dataSentReceived.js
@@ -1,10 +1,11 @@
 getStatsParser.dataSentReceived = function(result) {
-    var mediaType = result.googCodecName !== 'opus' ? 'video' : 'audio';
+    if (!result.googCodecName || (result.mediaType !== 'video' && result.mediaType !== 'audio')) return;
+
     if (!!result.bytesSent) {
-        getStatsResult[mediaType].bytesSent += parseInt(result.bytesSent);
+        getStatsResult[result.mediaType].bytesSent = parseInt(result.bytesSent);
     }
 
     if (!!result.bytesReceived) {
-        getStatsResult[mediaType].bytesReceived += parseInt(result.bytesReceived);
+        getStatsResult[result.mediaType].bytesReceived = parseInt(result.bytesReceived);
     }
 };
diff --git a/dev/globals.js b/dev/globals.js
@@ -7,35 +7,65 @@ if (typeof MediaStreamTrack === 'undefined') {
 var systemNetworkType = ((navigator.connection || {}).type || 'unknown').toString().toLowerCase();
 
 var getStatsResult = {
+    encryption: 'sha-256',
     audio: {
         send: {
-            tracks: []
+            tracks: [],
+            codecs: [],
+            availableBandwidth: 0,
+            streams: 0
         },
         recv: {
-            tracks: []
+            tracks: [],
+            codecs: [],
+            availableBandwidth: 0,
+            streams: 0
         },
         bytesSent: 0,
         bytesReceived: 0
     },
     video: {
         send: {
-            tracks: []
+            tracks: [],
+            codecs: [],
+            availableBandwidth: 0,
+            streams: 0
         },
         recv: {
-            tracks: []
+            tracks: [],
+            codecs: [],
+            availableBandwidth: 0,
+            streams: 0
         },
         bytesSent: 0,
         bytesReceived: 0
     },
     results: {},
-    connectionType: {},
     connectionType: {
-        local: {},
-        remote: {}
+        systemNetworkType: systemNetworkType,
+        systemIpAddress: '192.168.1.2',
+        local: {
+            candidateType: [],
+            transport: [],
+            ipAddress: [],
+            networkType: []
+        },
+        remote: {
+            candidateType: [],
+            transport: [],
+            ipAddress: [],
+            networkType: []
+        }
     },
     resolutions: {
-        send: {},
-        recv: {}
+        send: {
+            width: 0,
+            height: 0
+        },
+        recv: {
+            width: 0,
+            height: 0
+        }
     },
     internal: {
         audio: {

diff --git a/dev/googCandidatePair.js b/dev/googCandidatePair.js
@@ -15,29 +15,13 @@ getStatsParser.googCandidatePair = function(result) {
 
         var localCandidate = getStatsResult.internal.candidates[result.localCandidateId];
         if (localCandidate) {
-            if (localCandidate.networkType) {
-                getStatsResult.connectionType.local.networkType = localCandidate.networkType;
-            }
-
-            if (localCandidate.transport) {
-                getStatsResult.connectionType.local.transport = localCandidate.transport;
-            }
-
             if (localCandidate.ipAddress) {
                 getStatsResult.connectionType.systemIpAddress = localCandidate.ipAddress;
             }
         }
 
         var remoteCandidate = getStatsResult.internal.candidates[result.remoteCandidateId];
         if (remoteCandidate) {
-            if (remoteCandidate.networkType) {
-                getStatsResult.connectionType.remote.networkType = remoteCandidate.networkType;
-            }
-
-            if (remoteCandidate.transport) {
-                getStatsResult.connectionType.remote.transport = remoteCandidate.transport;
-            }
-
             if (remoteCandidate.ipAddress) {
                 getStatsResult.connectionType.systemIpAddress = remoteCandidate.ipAddress;
             }

diff --git a/dev/googCodecName.audio.js b/dev/googCodecName.audio.js
@@ -1,8 +1,16 @@
+var AUDIO_codecs = ['opus', 'isac', 'ilbc'];
+
 getStatsParser.checkAudioTracks = function(result) {
-    if (result.googCodecName !== 'opus') return;
+    if (!result.googCodecName || result.mediaType !== 'audio') return;
+
+    if (AUDIO_codecs.indexOf(result.googCodecName.toLowerCase()) === -1) return;
 
     var sendrecvType = result.id.split('_').pop();
 
+    if (getStatsResult.audio[sendrecvType].codecs.indexOf(result.googCodecName) === -1) {
+        getStatsResult.audio[sendrecvType].codecs.push(result.googCodecName);
+    }
+
     if (result.bytesSent) {
         var kilobytes = 0;
         if (!!result.bytesSent) {

diff --git a/dev/googCodecName.video.js b/dev/googCodecName.video.js
@@ -1,9 +1,18 @@
+var VIDEO_codecs = ['vp9', 'vp8', 'h264'];
+
 getStatsParser.checkVideoTracks = function(result) {
-    if (result.googCodecName !== 'VP8' && result.googCodecName !== 'VP9') return;
+    if (!result.googCodecName || result.mediaType !== 'video') return;
+
+    if (VIDEO_codecs.indexOf(result.googCodecName.toLowerCase()) === -1) return;
+
     // googCurrentDelayMs, googRenderDelayMs, googTargetDelayMs
     // transportId === 'Channel-audio-1'
     var sendrecvType = result.id.split('_').pop();
 
+    if (getStatsResult.video[sendrecvType].codecs.indexOf(result.googCodecName) === -1) {
+        getStatsResult.video[sendrecvType].codecs.push(result.googCodecName);
+    }
+
     if (!!result.bytesSent) {
         var kilobytes = 0;
         if (!getStatsResult.internal.video[sendrecvType].prevBytesSent) {

diff --git a/dev/localcandidate.js b/dev/localcandidate.js
@@ -1,20 +1,41 @@
+var LOCAL_candidateType = [];
+var LOCAL_transport = [];
+var LOCAL_ipAddress = [];
+var LOCAL_networkType = [];
+
 getStatsParser.localcandidate = function(result) {
     if (result.type !== 'localcandidate') return;
 
+    if (result.candidateType && LOCAL_candidateType.indexOf(result.candidateType) === -1) {
+        LOCAL_candidateType.push(result.candidateType);
+    }
+
+    if (result.transport && LOCAL_transport.indexOf(result.transport) === -1) {
+        LOCAL_transport.push(result.transport);
+    }
+
+    if (result.ipAddress && LOCAL_ipAddress.indexOf(result.ipAddress + ':' + result.portNumber) === -1) {
+        LOCAL_ipAddress.push(result.ipAddress + ':' + result.portNumber);
+    }
+
+    if (result.networkType && LOCAL_networkType.indexOf(result.networkType) === -1) {
+        LOCAL_networkType.push(result.networkType);
+    }
+
     getStatsResult.internal.candidates[result.id] = {
-        candidateType: result.candidateType,
-        ipAddress: result.ipAddress /* + ':' + result.portNumber */ ,
+        candidateType: LOCAL_candidateType,
+        ipAddress: LOCAL_ipAddress,
         portNumber: result.portNumber,
-        networkType: result.networkType,
+        networkType: LOCAL_networkType,
         priority: result.priority,
-        transport: result.transport,
+        transport: LOCAL_transport,
         timestamp: result.timestamp,
         id: result.id,
         type: result.type
     };
 
-    getStatsResult.connectionType.local.candidateType = result.candidateType;
-    getStatsResult.connectionType.local.ipAddress = result.ipAddress + ':' + result.portNumber;
-    getStatsResult.connectionType.local.networkType = getStatsResult.connectionType.local.networkType || result.networkType || systemNetworkType;
-    getStatsResult.connectionType.local.transport = result.transport;
+    getStatsResult.connectionType.local.candidateType = LOCAL_candidateType;
+    getStatsResult.connectionType.local.ipAddress = LOCAL_ipAddress;
+    getStatsResult.connectionType.local.networkType = LOCAL_networkType;
+    getStatsResult.connectionType.local.transport = LOCAL_transport;
 };
diff --git a/dev/remotecandidate.js b/dev/remotecandidate.js
@@ -1,20 +1,41 @@
+var REMOTE_candidateType = [];
+var REMOTE_transport = [];
+var REMOTE_ipAddress = [];
+var REMOTE_networkType = [];
+
 getStatsParser.remotecandidate = function(result) {
     if (result.type !== 'remotecandidate') return;
 
+    if (result.candidateType && REMOTE_candidateType.indexOf(result.candidateType) === -1) {
+        REMOTE_candidateType.push(result.candidateType);
+    }
+
+    if (result.transport && REMOTE_transport.indexOf(result.transport) === -1) {
+        REMOTE_transport.push(result.transport);
+    }
+
+    if (result.ipAddress && REMOTE_ipAddress.indexOf(result.ipAddress + ':' + result.portNumber) === -1) {
+        REMOTE_ipAddress.push(result.ipAddress + ':' + result.portNumber);
+    }
+
+    if (result.networkType && REMOTE_networkType.indexOf(result.networkType) === -1) {
+        REMOTE_networkType.push(result.networkType);
+    }
+
     getStatsResult.internal.candidates[result.id] = {
-        candidateType: result.candidateType,
-        ipAddress: result.ipAddress /* + ':' + result.portNumber */ ,
+        candidateType: REMOTE_candidateType,
+        ipAddress: REMOTE_ipAddress,
         portNumber: result.portNumber,
-        networkType: result.networkType,
+        networkType: REMOTE_networkType,
         priority: result.priority,
-        transport: result.transport,
+        transport: REMOTE_transport,
         timestamp: result.timestamp,
         id: result.id,
         type: result.type
     };
 
-    getStatsResult.connectionType.remote.candidateType = result.candidateType;
-    getStatsResult.connectionType.remote.ipAddress = result.ipAddress + ':' + result.portNumber;
-    getStatsResult.connectionType.remote.networkType = getStatsResult.connectionType.remote.networkType || result.networkType || systemNetworkType;
-    getStatsResult.connectionType.remote.transport = result.transport;
+    getStatsResult.connectionType.remote.candidateType = REMOTE_candidateType;
+    getStatsResult.connectionType.remote.ipAddress = REMOTE_ipAddress;
+    getStatsResult.connectionType.remote.networkType = REMOTE_networkType;
+    getStatsResult.connectionType.remote.transport = REMOTE_transport;
 };
diff --git a/dev/ssrc.js b/dev/ssrc.js
@@ -0,0 +1,22 @@
+var SSRC = {
+    audio: {
+        send: [],
+        recv: []
+    },
+    video: {
+        send: [],
+        recv: []
+    }
+};
+
+getStatsParser.ssrc = function(result) {
+    if (!result.googCodecName || (result.mediaType !== 'video' && result.mediaType !== 'audio')) return;
+    if (result.type !== 'ssrc') return;
+    var sendrecvType = result.id.split('_').pop();
+
+    if (SSRC[result.mediaType][sendrecvType].indexOf(result.ssrc) === -1) {
+        SSRC[result.mediaType][sendrecvType].push(result.ssrc)
+    }
+
+    getStatsResult[result.mediaType][sendrecvType].streams = SSRC[result.mediaType][sendrecvType].length;
+};