awslabs
diff --git a/‎.github/workflows/master-publish-gh-pages-and-npm.yml‎
Lines changed: 2 additions & 0 deletions b/‎.github/workflows/master-publish-gh-pages-and-npm.yml‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎examples/answerer.js‎
Lines changed: 11 additions & 1 deletion b/‎examples/answerer.js‎
Lines changed: 11 additions & 1 deletion
diff --git a/‎examples/app.js‎
Lines changed: 8 additions & 0 deletions b/‎examples/app.js‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎examples/index.html‎
Lines changed: 21 additions & 0 deletions b/‎examples/index.html‎
Lines changed: 21 additions & 0 deletions
diff --git a/‎examples/master.js‎
Lines changed: 28 additions & 1 deletion b/‎examples/master.js‎
Lines changed: 28 additions & 1 deletion
diff --git a/‎examples/viewer.js‎
Lines changed: 37 additions & 2 deletions b/‎examples/viewer.js‎
Lines changed: 37 additions & 2 deletions
@@ -40,5 +40,7 @@ jobs:
                   rm -rf aws-sdk-build
             - name: Deploy to npm packages
               uses: JS-DevTools/npm-publish@v1
+              # Don't run this step for forks, only in the original repo
+              if: github.repository == 'awslabs/amazon-kinesis-video-streams-webrtc-sdk-js'
               with:
                   token: '${{ secrets.NPM_TOKEN }}'
@@ -127,7 +127,17 @@ class Answerer {
         // We receive this event when the remote peer adds a new track to the PeerConnection
         // https://webrtc.org/getting-started/remote-streams#adding_remote_tracks
         this._peerConnection.addEventListener('track', event => {
-            console.log(this._loggingPrefix, 'Received track from', this._remoteClientId || 'remote', 'with track id:', event?.streams[0]?.id ?? '[Error retrieving track ID]');
+            console.log(
+                this._loggingPrefix,
+                'Received',
+                event.track.kind || 'unknown',
+                'track from',
+                this._remoteClientId || 'remote',
+                'in mediaStream:',
+                event?.streams[0]?.id ?? '[Error retrieving stream ID]',
+                'with track id:',
+                event.track.id,
+            );
             this._onMediaStreamsUpdated(event.streams);
         });
 
 
@@ -120,6 +120,10 @@ function getFormValues() {
         mediaIngestionModeOverride: $('#ingest-media-manual-on').attr('data-selected') === 'true',
         signalingReconnect: $('#signaling-reconnect').is(':checked'),
         logAwsSdkCalls: $('#log-aws-sdk-calls').is(':checked'),
+        turnWithUdp: $('#turn-with-udp').is(':checked'),
+        turnsWithUdp: $('#turns-with-udp').is(':checked'),
+        turnsWithTcp: $('#turns-with-tcp').is(':checked'),
+        oneTurnServerSetOnly: $('#turn-one-set-only').is(':checked'),
     };
 }
 
@@ -563,6 +567,10 @@ const fields = [
     {field: 'signaling-reconnect', type: 'checkbox'},
     {field: 'log-aws-sdk-calls', type: 'checkbox'},
     {field: 'codec-filter-toggle', type: 'checkbox'},
+    {field: 'turn-with-udp', type: 'checkbox'},
+    {field: 'turns-with-udp', type: 'checkbox'},
+    {field: 'turns-with-tcp', type: 'checkbox'},
+    {field: 'turn-one-set-only', type: 'checkbox'},
 ];
 
 fields.forEach(({field, type, name}) => {
 
@@ -317,6 +317,27 @@ <h6>Audio Codecs Allowed</h6>
                         </div>
                     </div>
                 </div>
+                <p class="mt-3"><small>TURN connection options</small><span data-delay="{ &quot;hide&quot;: 1500 }" data-position="auto" tabindex="0" class="text-info ml-1" data-toggle="tooltip" data-html="true" title="
+                                <p>Filter options for the URLs from the GetIceServerConfig API call.</p>"><sup>&#9432;</sup></span></p>
+                <div class="mt-3 mb-3 container">
+                    <div class="form-check form-switch">
+                        <input class="form-check-input" type="checkbox" id="turn-with-udp" checked>
+                        <label class="form-check-label" for="turn-with-udp">TURN with UDP</label>
+                    </div>
+                    <div class="form-check form-switch">
+                        <input class="form-check-input" type="checkbox" id="turns-with-udp" checked>
+                        <label class="form-check-label" for="turns-with-udp">TURNS with UDP</label>
+                    </div>
+                    <div class="form-check form-switch">
+                        <input class="form-check-input" type="checkbox" id="turns-with-tcp" checked>
+                        <label class="form-check-label" for="turns-with-tcp">TURNS with TCP</label>
+                    </div>
+                    <div class="form-check form-switch">
+                        <input class="form-check-input" type="checkbox" id="turn-one-set-only" checked>
+                        <label class="form-check-label" for="turn-one-set-only">Use only one set of TURN servers<span data-delay="{ &quot;hide&quot;: 1500 }" data-position="auto" tabindex="0" class="text-info ml-1" data-toggle="tooltip" data-html="true" title="
+                            <p>GetIceServerConfig returns two sets of TURN servers, only use one of the sets.</p>"><sup>&#9432;</sup></span></label>
+                    </div>
+                </div>
                 <p class="mt-3"><small>Endpoint Override</small></p>
                 <div class="form-group">
                     <input type="text" class="form-control" id="endpoint" placeholder="Endpoint">
 
@@ -335,6 +335,10 @@ function onPeerConnectionFailed(remoteClientId, printLostConnectionLog = true, h
  * @param {boolean} formValues.sendSrflxCandidates - Send STUN candidates setting.
  * @param {boolean} formValues.sendRelayCandidates - Send TURN candidates setting.
  * @param {string} formValues.region - AWS region used to construct the STUN server URL.
+ * @param {boolean} formValues.turnWithUdp - If this particular TURN server should be used for the connection.
+ * @param {boolean} formValues.turnsWithUdp - If this particular TURN server should be used for the connection.
+ * @param {boolean} formValues.turnsWithTcp - If this particular TURN server should be used for the connection.
+ * @param {boolean} formValues.oneTurnServerSetOnly - If only one of the sets of TURN servers should be considered.
  * @returns {Promise<RTCIceServer[]>} List of ICE servers.
  */
 async function getIceServersWithCaching(formValues) {
@@ -356,7 +360,30 @@ async function getIceServersWithCaching(formValues) {
 
     // Add the TURN servers unless it is disabled
     if (!formValues.natTraversalDisabled && !formValues.forceSTUN && formValues.sendRelayCandidates) {
-        const [turnServers, turnServerExpiryTsMillis] = await master.channelHelper.fetchTurnServers();
+        let [turnServers, turnServerExpiryTsMillis] = await master.channelHelper.fetchTurnServers();
+
+        if (!formValues.turnWithUdp || !formValues.turnsWithUdp || !formValues.turnsWithTcp) {
+            turnServers = turnServers.map((config) => {
+                return {
+                    urls: config.urls.filter((url) => {
+                        if (url.startsWith('turn:') && url.endsWith('?transport=udp')) {
+                            return formValues.turnWithUdp;
+                        } else if (url.startsWith('turns:') && url.endsWith('?transport=udp')) {
+                            return formValues.turnsWithUdp;
+                        } else if (url.startsWith('turns:') && url.endsWith('?transport=tcp')) {
+                            return formValues.turnsWithTcp;
+                        }
+                    }),
+                    username: config.username,
+                    credential: config.credential,
+                };
+            });
+        }
+
+        if (formValues.oneTurnServerSetOnly) {
+            turnServers = [turnServers[Math.floor(Math.random() * turnServers.length)]];
+        }
+
         master.turnServerExpiryTs = turnServerExpiryTsMillis - iceServerRefreshGracePeriodSec * 1000;
         iceServers.push(...turnServers);
     }
 
@@ -455,13 +455,39 @@ async function startViewer(localView, remoteView, formValues, onStatsReport, rem
 
         // Don't add turn if user selects STUN only or NAT traversal disabled
         if (!formValues.natTraversalDisabled && !formValues.forceSTUN) {
+            let turnServers = [];
             getIceServerConfigResponse.IceServerList.forEach(iceServer =>
-                iceServers.push({
+                turnServers.push({
                     urls: iceServer.Uris,
                     username: iceServer.Username,
                     credential: iceServer.Password,
                 }),
             );
+
+            // Filter TURN servers
+            if (!formValues.turnWithUdp || !formValues.turnsWithUdp || !formValues.turnsWithTcp) {
+                turnServers = turnServers.map((config) => {
+                    return {
+                        urls: config.urls.filter((url) => {
+                            if (url.startsWith('turn:') && url.endsWith('?transport=udp')) {
+                                return formValues.turnWithUdp;
+                            } else if (url.startsWith('turns:') && url.endsWith('?transport=udp')) {
+                                return formValues.turnsWithUdp;
+                            } else if (url.startsWith('turns:') && url.endsWith('?transport=tcp')) {
+                                return formValues.turnsWithTcp;
+                            }
+                        }),
+                        username: config.username,
+                        credential: config.credential,
+                    };
+                });
+            }
+
+            if (formValues.oneTurnServerSetOnly) {
+                turnServers = [turnServers[Math.floor(Math.random() * turnServers.length)]];
+            }
+
+            iceServers.push(...turnServers);
         }
         console.log('[VIEWER] ICE servers:', iceServers);
 
@@ -774,7 +800,16 @@ async function startViewer(localView, remoteView, formValues, onStatsReport, rem
 
         // As remote tracks are received, add them to the remote view
         viewer.peerConnection.addEventListener('track', event => {
-            console.log('[VIEWER] Received remote track with id:', event?.streams[0]?.id ?? '[Error retrieving track ID]');
+            console.log(
+                '[VIEWER] Received',
+                event.track.kind || 'unknown',
+                'track from',
+                this._remoteClientId || 'remote',
+                'in mediaStream:',
+                event?.streams[0]?.id ?? '[Error retrieving stream ID]',
+                'with track id:',
+                event.track.id,
+            );
             if (remoteView.srcObject) {
                 return;
             }