Add periodic logging for WebRTC ingestion mode

Author: Yuqi Huang

examples/answerer.js

@@ -97,7 +97,7 @@ class Answerer {
             // `candidate` will be the empty string if the event indicates that there are no further candidates
             // to come in this generation, or null if all ICE gathering on all transports is complete.
             // https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/icecandidate_event
-            if (candidate) {
+            if (candidate && candidate.candidate) {
                 console.log(this._loggingPrefix, 'Generated ICE candidate for', this._remoteClientId || 'remote');
                 console.debug(this._loggingPrefix, 'ICE candidate:', candidate);
 
@@ -110,6 +110,8 @@ class Answerer {
                         console.log(this._loggingPrefix, 'Not sending ICE candidate to', this._remoteClientId || 'remote');
                     }
                 }
+            } else if (candidate && !candidate.candidate) {
+                    //firefox special case, candidate with null candidate field
             } else {
                 console.log(this._loggingPrefix, 'All ICE candidates have been generated for', this._remoteClientId || 'remote');
 

examples/master.js

@@ -228,7 +228,10 @@ registerMasterSignalingClientCallbacks = (signalingClient, formValues, onStatsRe
         // If in WebRTC ingestion mode, retry if no connection was established within 30 seconds.
         // Note: This is an interim setting - the viewer application will retry after 30 seconds if the connection through the WebRTC Ingestion mode is not successful.
         if (master.channelHelper.isIngestionEnabled()) {
-            for (let i = 5; i <= 30; i += 5) {
+            const CHECK_INTERVAL_SECONDS = 5;
+            const RETRY_TIMEOUT_SECONDS = 30;
+            
+            for (let i = CHECK_INTERVAL_SECONDS; i <= RETRY_TIMEOUT_SECONDS; i += CHECK_INTERVAL_SECONDS) {
                 setTimeout(function () {
                     // check the state each 5 seconds
                     //enter retry if still connecting after 30 seconds
@@ -237,14 +240,14 @@ registerMasterSignalingClientCallbacks = (signalingClient, formValues, onStatsRe
                         answerer.getPeerConnection().connectionState !== 'failed' &&
                         answerer.getPeerConnection().connectionState !== 'closed'
                     ) {
-                        if (i < 30) {
+                        if (i < RETRY_TIMEOUT_SECONDS) {
                             console.log(`[${role}] Still connecting after ${i} seconds.`);
                         } else {
-                            console.error(`[${role}] Connection was not successful - Will retry after 30 seconds.`);
+                            console.error(`[${role}] Connection was not successful - Will retry after ${RETRY_TIMEOUT_SECONDS} seconds.`);
                             onPeerConnectionFailed(remoteClientId, false, false);
                         }
                     }
-                }, i* 1000);
+                }, i * 1000);
             }
         }
     });

examples/viewer.js

@@ -769,7 +769,7 @@ async function startViewer(localView, remoteView, formValues, onStatsReport, rem
 
         // Send any ICE candidates to the other peer
         viewer.peerConnection.addEventListener('icecandidate', ({ candidate }) => {
-            if (candidate) {
+            if (candidate && candidate.candidate) {
                 console.log('[VIEWER] Generated ICE candidate');
                 console.debug('ICE candidate:', candidate);
 
@@ -782,6 +782,8 @@ async function startViewer(localView, remoteView, formValues, onStatsReport, rem
                         console.log('[VIEWER] Not sending ICE candidate');
                     }
                 }
+            } else if (candidate && !candidate.candidate) {
+                //firefox special case, candidate with null candidate field
             } else {
                 console.log('[VIEWER] All ICE candidates have been generated');