Move to pion/ice@v2

Removed support for trickle ice

Resolves #1274

Author: Sean-Der

datachannel_ortc_test.go

@@ -118,12 +118,18 @@ func (s *testORTCStack) setSignal(sig *testORTCSignal, isOffer bool) error {
 }
 
 func (s *testORTCStack) getSignal() (*testORTCSignal, error) {
-	// Gather candidates
-	err := s.gatherer.Gather()
-	if err != nil {
+	gatherFinished := make(chan struct{})
+	s.gatherer.OnLocalCandidate(func(i *ICECandidate) {
+		if i == nil {
+			close(gatherFinished)
+		}
+	})
+
+	if err := s.gatherer.Gather(); err != nil {
 		return nil, err
 	}
 
+	<-gatherFinished
 	iceCandidates, err := s.gatherer.GetLocalCandidates()
 	if err != nil {
 		return nil, err

examples/broadcast/main.go

@@ -100,14 +100,22 @@ func main() {
 		panic(err)
 	}
 
+	// Create channel that is blocked until ICE Gathering is complete
+	gatherComplete := webrtc.GatheringCompletePromise(peerConnection)
+
 	// Sets the LocalDescription, and starts our UDP listeners
 	err = peerConnection.SetLocalDescription(answer)
 	if err != nil {
 		panic(err)
 	}
 
+	// Block until ICE Gathering is complete, disabling trickle ICE
+	// we do this because we only can exchange one signaling message
+	// in a production application you should exchange ICE Candidates via OnICECandidate
+	<-gatherComplete
+
 	// Get the LocalDescription and take it to base64 so we can paste in browser
-	fmt.Println(signal.Encode(answer))
+	fmt.Println(signal.Encode(*peerConnection.LocalDescription()))
 
 	localTrack := <-localTrackChan
 	for {
@@ -140,13 +148,21 @@ func main() {
 			panic(err)
 		}
 
+		// Create channel that is blocked until ICE Gathering is complete
+		gatherComplete = webrtc.GatheringCompletePromise(peerConnection)
+
 		// Sets the LocalDescription, and starts our UDP listeners
 		err = peerConnection.SetLocalDescription(answer)
 		if err != nil {
 			panic(err)
 		}
 
+		// Block until ICE Gathering is complete, disabling trickle ICE
+		// we do this because we only can exchange one signaling message
+		// in a production application you should exchange ICE Candidates via OnICECandidate
+		<-gatherComplete
+
 		// Get the LocalDescription and take it to base64 so we can paste in browser
-		fmt.Println(signal.Encode(answer))
+		fmt.Println(signal.Encode(*peerConnection.LocalDescription()))
 	}
 }

examples/custom-logger/main.go

@@ -67,6 +67,26 @@ func main() {
 		panic(err)
 	}
 
+	// Set ICE Candidate handler. As soon as a PeerConnection has gathered a candidate
+	// send it to the other peer
+	answerPeerConnection.OnICECandidate(func(i *webrtc.ICECandidate) {
+		if i != nil {
+			if iceErr := offerPeerConnection.AddICECandidate(i.ToJSON()); iceErr != nil {
+				panic(iceErr)
+			}
+		}
+	})
+
+	// Set ICE Candidate handler. As soon as a PeerConnection has gathered a candidate
+	// send it to the other peer
+	offerPeerConnection.OnICECandidate(func(i *webrtc.ICECandidate) {
+		if i != nil {
+			if iceErr := answerPeerConnection.AddICECandidate(i.ToJSON()); iceErr != nil {
+				panic(iceErr)
+			}
+		}
+	})
+
 	// Create an offer for the other PeerConnection
 	offer, err := offerPeerConnection.CreateOffer(nil)
 	if err != nil {
@@ -90,6 +110,11 @@ func main() {
 		panic(err)
 	}
 
+	// Set the answerer's LocalDescription
+	if err = answerPeerConnection.SetLocalDescription(answer); err != nil {
+		panic(err)
+	}
+
 	// SetRemoteDescription on original PeerConnection, this finishes our signaling
 	// bother PeerConnections should be able to communicate with each other now
 	if err = offerPeerConnection.SetRemoteDescription(answer); err != nil {

examples/data-channels-close/main.go

@@ -97,14 +97,22 @@ func main() {
 		panic(err)
 	}
 
+	// Create channel that is blocked until ICE Gathering is complete
+	gatherComplete := webrtc.GatheringCompletePromise(peerConnection)
+
 	// Sets the LocalDescription, and starts our UDP listeners
 	err = peerConnection.SetLocalDescription(answer)
 	if err != nil {
 		panic(err)
 	}
 
+	// Block until ICE Gathering is complete, disabling trickle ICE
+	// we do this because we only can exchange one signaling message
+	// in a production application you should exchange ICE Candidates via OnICECandidate
+	<-gatherComplete
+
 	// Output the answer in base64 so we can paste it in browser
-	fmt.Println(signal.Encode(answer))
+	fmt.Println(signal.Encode(*peerConnection.LocalDescription()))
 
 	// Block forever
 	select {}

examples/data-channels-create/README.md

@@ -23,8 +23,8 @@ Hit the 'Start Session' button in the browser. You should see `have-remote-offer
 Meanwhile text has appeared in the second text area of the jsfiddle. Copy the text and paste it into `data-channels-create` and hit ENTER.
 In the browser you'll now see `connected` as the connection is created. If everything worked you should see `New DataChannel data`.
 
-Now you can put whatever you want in the `Message` textarea, and when you hit `Send Message` it should appear in your browser!
+Now you can put whatever you want in the `Message` textarea, and when you hit `Send Message` it should appear in your terminal!
 
-You can also type in your terminal, and when you hit enter it will appear in your web browser.
+Pion WebRTC will send random messages every 5 seconds that will appear in your browser.
 
 Congrats, you have used Pion WebRTC! Now start building something cool

examples/data-channels-create/main.go

@@ -66,14 +66,22 @@ func main() {
 		panic(err)
 	}
 
+	// Create channel that is blocked until ICE Gathering is complete
+	gatherComplete := webrtc.GatheringCompletePromise(peerConnection)
+
 	// Sets the LocalDescription, and starts our UDP listeners
 	err = peerConnection.SetLocalDescription(offer)
 	if err != nil {
 		panic(err)
 	}
 
-	// Output the offer in base64 so we can paste it in browser
-	fmt.Println(signal.Encode(offer))
+	// Block until ICE Gathering is complete, disabling trickle ICE
+	// we do this because we only can exchange one signaling message
+	// in a production application you should exchange ICE Candidates via OnICECandidate
+	<-gatherComplete
+
+	// Output the answer in base64 so we can paste it in browser
+	fmt.Println(signal.Encode(*peerConnection.LocalDescription()))
 
 	// Wait for the answer to be pasted
 	answer := webrtc.SessionDescription{}

examples/data-channels-detach-create/main.go

@@ -76,14 +76,22 @@ func main() {
 		panic(err)
 	}
 
+	// Create channel that is blocked until ICE Gathering is complete
+	gatherComplete := webrtc.GatheringCompletePromise(peerConnection)
+
 	// Sets the LocalDescription, and starts our UDP listeners
 	err = peerConnection.SetLocalDescription(offer)
 	if err != nil {
 		panic(err)
 	}
 
+	// Block until ICE Gathering is complete, disabling trickle ICE
+	// we do this because we only can exchange one signaling message
+	// in a production application you should exchange ICE Candidates via OnICECandidate
+	<-gatherComplete
+
 	// Output the offer in base64 so we can paste it in browser
-	fmt.Println(signal.Encode(offer))
+	fmt.Println(signal.Encode(*peerConnection.LocalDescription()))
 
 	// Wait for the answer to be pasted
 	answer := webrtc.SessionDescription{}

examples/data-channels-detach/main.go

@@ -85,14 +85,22 @@ func main() {
 		panic(err)
 	}
 
+	// Create channel that is blocked until ICE Gathering is complete
+	gatherComplete := webrtc.GatheringCompletePromise(peerConnection)
+
 	// Sets the LocalDescription, and starts our UDP listeners
 	err = peerConnection.SetLocalDescription(answer)
 	if err != nil {
 		panic(err)
 	}
 
+	// Block until ICE Gathering is complete, disabling trickle ICE
+	// we do this because we only can exchange one signaling message
+	// in a production application you should exchange ICE Candidates via OnICECandidate
+	<-gatherComplete
+
 	// Output the answer in base64 so we can paste it in browser
-	fmt.Println(signal.Encode(answer))
+	fmt.Println(signal.Encode(*peerConnection.LocalDescription()))
 
 	// Block forever
 	select {}

examples/data-channels-flow-control/main.go

@@ -122,6 +122,22 @@ func main() {
 	offerPC := createOfferer()
 	answerPC := createAnswerer()
 
+	// Set ICE Candidate handler. As soon as a PeerConnection has gathered a candidate
+	// send it to the other peer
+	answerPC.OnICECandidate(func(i *webrtc.ICECandidate) {
+		if i != nil {
+			check(offerPC.AddICECandidate(i.ToJSON()))
+		}
+	})
+
+	// Set ICE Candidate handler. As soon as a PeerConnection has gathered a candidate
+	// send it to the other peer
+	offerPC.OnICECandidate(func(i *webrtc.ICECandidate) {
+		if i != nil {
+			check(answerPC.AddICECandidate(i.ToJSON()))
+		}
+	})
+
 	// Now, create an offer
 	offer, err := offerPC.CreateOffer(nil)
 	check(err)

examples/data-channels/README.md

@@ -24,8 +24,8 @@ Copy the text that `data-channels` just emitted and copy into second text area
 ### Hit 'Start Session' in jsfiddle
 Under Start Session you should see 'Checking' as it starts connecting. If everything worked you should see `New DataChannel foo 1`
 
-Now you can put whatever you want in the `Message` textarea, and when you hit `Send Message` it should appear in your browser!
+Now you can put whatever you want in the `Message` textarea, and when you hit `Send Message` it should appear in your terminal!
 
-You can also type in your terminal, and when you hit enter it will appear in your web browser.
+Pion WebRTC will send random messages every 5 seconds that will appear in your browser.
 
 Congrats, you have used Pion WebRTC! Now start building something cool