From 83c7283a76f7d46056356932126c49e632748619 Mon Sep 17 00:00:00 2001
From: Ryan Zhao <ryanzhaors@qq.com>
Date: Fri, 11 Feb 2022 11:32:21 +1100
Subject: [PATCH] remove redundant turn servers and reduce turn servers
 connections to 2

---
 SessionMessagingKit/Calls/TurnServerInfo.swift | 9 +++++++--
 SessionMessagingKit/Calls/WebRTCSession.swift  | 5 ++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/SessionMessagingKit/Calls/TurnServerInfo.swift b/SessionMessagingKit/Calls/TurnServerInfo.swift
index 9b1a47032..fe51837c2 100644
--- a/SessionMessagingKit/Calls/TurnServerInfo.swift
+++ b/SessionMessagingKit/Calls/TurnServerInfo.swift
@@ -8,7 +8,7 @@ struct TurnServerInfo {
     let username: String
     let urls: [String]
 
-    init?(attributes: JSON) {
+    init?(attributes: JSON, random: Int? = nil) {
         if let passwordAttribute = (attributes["password"] as? String) {
             password = passwordAttribute
         } else {
@@ -22,7 +22,12 @@ struct TurnServerInfo {
         }
 
         if let urlsAttribute = attributes["urls"] as? [String] {
-            urls = urlsAttribute
+            if let random = random {
+                urls = Array(urlsAttribute.shuffled()[0..<random])
+            } else {
+                urls = urlsAttribute
+            }
+            
         } else {
             return nil
         }
diff --git a/SessionMessagingKit/Calls/WebRTCSession.swift b/SessionMessagingKit/Calls/WebRTCSession.swift
index 0e1dfa06e..aa5b0239e 100644
--- a/SessionMessagingKit/Calls/WebRTCSession.swift
+++ b/SessionMessagingKit/Calls/WebRTCSession.swift
@@ -22,7 +22,7 @@ public final class WebRTCSession : NSObject, RTCPeerConnectionDelegate {
         let url = Bundle.main.url(forResource: "Session-Turn-Server", withExtension: nil)!
         let data = try! Data(contentsOf: url)
         let json = try! JSONSerialization.jsonObject(with: data, options: [ .fragmentsAllowed ]) as! JSON
-        return TurnServerInfo(attributes: json)
+        return TurnServerInfo(attributes: json, random: 2)
     }()
     
     internal lazy var factory: RTCPeerConnectionFactory = {
@@ -36,9 +36,8 @@ public final class WebRTCSession : NSObject, RTCPeerConnectionDelegate {
     /// remote peer, maintain and monitor the connection, and close the connection once it's no longer needed.
     internal lazy var peerConnection: RTCPeerConnection = {
         let configuration = RTCConfiguration()
-        configuration.iceServers = [ RTCIceServer(urlStrings: ["stun:freyr.getsession.org:5349"]), RTCIceServer(urlStrings: ["turn:freyr.getsession.org"], username: "session", credential: "session") ]
         if let defaultICEServer = defaultICEServer {
-            configuration.iceServers.append(RTCIceServer(urlStrings: defaultICEServer.urls, username: defaultICEServer.username, credential: defaultICEServer.password))
+            configuration.iceServers = [ RTCIceServer(urlStrings: defaultICEServer.urls, username: defaultICEServer.username, credential: defaultICEServer.password) ]
         }
         configuration.sdpSemantics = .unifiedPlan
         let constraints = RTCMediaConstraints(mandatoryConstraints: [:], optionalConstraints: [:])