Remove non-WHIP/WHEP compliant ICE Server Configuration

Author: Sean-Der

.env.development

@@ -35,14 +35,10 @@
 # FRONTEND_PATH="./web/build"
 
 # ################
-# TURN/STUN
+# STUN
 # ################
 
 # STUN_SERVERS="192.168.1.101:3478|192.168.1.101:3478"
-# TURN_SERVERS="192.168.1.123:3478|192.168.1.321:3478"
-# TURN_SERVERS_INTERNAL="10.100.0.10:3478"
-# STUN_SERVERS_INTERNAL="10.100.0.10:3478"
-# TURN_SERVER_AUTH_SECRET="YouSecret"
 
 # ################
 # DEBUGGING

README.md

@@ -258,15 +258,13 @@ The frontend can be configured by passing these URL Parameters.
 | `TCP_MUX_FORCE`                      | Forces WebRTC traffic to use TCP only.                                   |
 | `APPEND_CANDIDATE`                   | Appends ICE candidates not generated by the agent.                       |
 
-### STUN/TURN Servers
-
-| Variable                  | Description                                                                                                                       |
-| ------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
-| `STUN_SERVERS`            | List of public STUN servers separated by `\|`.                                                                                    |
-| `STUN_SERVERS_INTERNAL`   | List of internal STUN servers used by the backend in case it has trouble connecting to the public STUN server. Separated by `\|`. |
-| `TURN_SERVERS`            | List of public TURN servers separated by `\|`.                                                                                    |
-| `TURN_SERVERS_INTERNAL`   | List of internal TURN servers used by the backend in case it has trouble connecting to the public TURN server. Separated by `\|`. |
-| `TURN_SERVER_AUTH_SECRET` | Shared secret for TURN server authentication.                                                                                     |
+### STUN Servers
+
+| Variable       | Description                                            |
+| -------------- | ------------------------------------------------------ |
+| `STUN_SERVERS` | List of STUN servers separated by `\|`.               |
+
+These values are parsed by the Go backend and applied to WHIP/WHEP `PeerConnection` configuration server-side. Clients do not fetch ICE server configuration from an API endpoint.
 
 ### Debugging
 

internal/environment/variables.go

@@ -38,12 +38,8 @@ const (
 	NAT1To1IP                = "NAT_1_TO_1_IP"
 	NATICECandidateType      = "NAT_ICE_CANDIDATE_TYPE"
 
-	// TURN/STUN
-	STUNServers          = "STUN_SERVERS"
-	TURNServers          = "TURN_SERVERS"
-	TURNServersInternal  = "TURN_SERVERS_INTERNAL"
-	STUNServersInternal  = "STUN_SERVERS_INTERNAL"
-	TURNServerAuthSecret = "TURN_SERVER_AUTH_SECRET"
+	// STUN
+	STUNServers = "STUN_SERVERS"
 
 	// PEERCONNECTION
 	AppendCandidate = "APPEND_CANDIDATE"

internal/server/authorization/ice_connection_helpers.go

@@ -24,7 +24,6 @@ func GetServeMuxHandler() http.HandlerFunc {
 	serverMux.HandleFunc("/api/whep", corsHandler(WHEPHandler))
 	serverMux.HandleFunc("/api/whep/", corsHandler(WHEPHandler))
 	serverMux.HandleFunc("/api/sse/", corsHandler(sseHandler))
-	serverMux.HandleFunc("/api/ice-servers", corsHandler(clientICEHandler))
 
 	// WHIP session endpoints
 	serverMux.HandleFunc("/api/whip", corsHandler(whipHandlers.WHIPHandler))

internal/server/handlers/client_ice.go

@@ -5,44 +5,17 @@ import (
 	"strings"
 
 	"github.com/glimesh/broadcast-box/internal/environment"
-	"github.com/glimesh/broadcast-box/internal/server/authorization"
 	"github.com/pion/webrtc/v4"
 )
 
 func GetPeerConnectionConfig() webrtc.Configuration {
 	config := webrtc.Configuration{}
-	if stunServers := os.Getenv(environment.STUNServersInternal); stunServers != "" {
+	if stunServers := os.Getenv(environment.STUNServers); stunServers != "" {
 		for stunServer := range strings.SplitSeq(stunServers, "|") {
 			config.ICEServers = append(config.ICEServers, webrtc.ICEServer{
 				URLs: []string{"stun:" + stunServer},
 			})
 		}
-	} else if stunServers := os.Getenv(environment.STUNServers); stunServers != "" {
-		for stunServer := range strings.SplitSeq(stunServers, "|") {
-			config.ICEServers = append(config.ICEServers, webrtc.ICEServer{
-				URLs: []string{"stun:" + stunServer},
-			})
-		}
-	}
-
-	username, credential := authorization.GetTURNCredentials()
-
-	if turnServers := os.Getenv(environment.TURNServersInternal); turnServers != "" {
-		for turnServer := range strings.SplitSeq(turnServers, "|") {
-			config.ICEServers = append(config.ICEServers, webrtc.ICEServer{
-				URLs:       []string{"turn:" + turnServer},
-				Username:   username,
-				Credential: credential,
-			})
-		}
-	} else if turnServers := os.Getenv(environment.TURNServers); turnServers != "" {
-		for turnServer := range strings.SplitSeq(turnServers, "|") {
-			config.ICEServers = append(config.ICEServers, webrtc.ICEServer{
-				URLs:       []string{"turn:" + turnServer},
-				Username:   username,
-				Credential: credential,
-			})
-		}
 	}
 
 	return config

internal/server/handlers/routes.go

@@ -40,26 +40,8 @@ function BrowserBroadcaster() {
 
 	const endStream = () => navigate('/')
 
-	interface ICEComponentServer {
-		urls: string;
-		username?: string;
-		credential?: string
-	}
-
 	useEffect(() => {
-		// Fetch ICE-Servers
-		fetch(`/api/ice-servers`, {
-			method: 'GET',
-		}).then(r => r.json())
-			.then((result: ICEComponentServer[]) => {
-				peerConnectionRef.current = new RTCPeerConnection({
-					iceServers: result.map(r => ({
-						urls: r.urls,
-						username: r.username,
-						credential: r.credential,
-					}))
-				});
-			})
+		peerConnectionRef.current = new RTCPeerConnection();
 
 		return () => peerConnectionRef.current?.close()
 	}, [])

internal/webrtc/peerconnection/get_configuration.go

@@ -166,17 +166,7 @@ export async function PeerConnectionSetup(props: SetupPeerConnectionProps): Prom
 }
 
 async function createPeerConnection(): Promise<RTCPeerConnection> {
-	return await fetch(`/api/ice-servers`, {
-		method: 'GET',
-	}).then(r => r.json())
-		.then((result) => {
-			return new RTCPeerConnection({
-				iceServers: result
-			});
-		}).catch(() => {
-			console.error("Error calling Ice-Servers endpoint. Ignoring STUN/TURN configuration")
-			return new RTCPeerConnection();
-		})
+	return new RTCPeerConnection();
 }
 
 export function waitForIceGatheringComplete(peerConnection: RTCPeerConnection) {