Upgrade to pion/webrtc@v3

Resolves #26

Author: Sean-Der

client.go

@@ -11,7 +11,7 @@ import (
 	"github.com/kr/pty"
 	"github.com/maxmcd/webtty/pkg/sd"
 	"github.com/mitchellh/colorstring"
-	"github.com/pion/webrtc/v2"
+	"github.com/pion/webrtc/v3"
 	"golang.org/x/crypto/ssh/terminal"
 )
 
@@ -133,14 +133,20 @@ func (cs *clientSession) run() (err error) {
 		return
 	}
 
+	// Create channel that is blocked until ICE Gathering is complete
+	gatherComplete := webrtc.GatheringCompletePromise(cs.pc)
+
 	err = cs.pc.SetLocalDescription(answer)
 	if err != nil {
 		log.Println(err)
 		return
 	}
 
+	// Block until ICE Gathering is complete
+	<-gatherComplete
+
 	answerSd := sd.SessionDescription{
-		Sdp:   answer.SDP,
+		Sdp:   cs.pc.LocalDescription().SDP,
 		Key:   cs.offer.Key,
 		Nonce: cs.offer.Nonce,
 	}

client_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/kr/pty"
-	"github.com/pion/webrtc/v2"
+	"github.com/pion/webrtc/v3"
 	"golang.org/x/crypto/ssh/terminal"
 )
 

go.mod

@@ -6,6 +6,6 @@ require (
 	github.com/btcsuite/btcutil v0.0.0-20190316010144-3ac1210f4b38
 	github.com/kr/pty v1.1.4
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db
-	github.com/pion/webrtc/v2 v2.1.18
-	golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413
+	github.com/pion/webrtc/v3 v3.0.1
+	golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
 )

go.sum

@@ -14,7 +14,7 @@ import (
 	"github.com/kr/pty"
 	"github.com/maxmcd/webtty/pkg/sd"
 	"github.com/mitchellh/colorstring"
-	"github.com/pion/webrtc/v2"
+	"github.com/pion/webrtc/v3"
 )
 
 type hostSession struct {
@@ -180,21 +180,34 @@ func (hs *hostSession) mustReadStdin() (string, error) {
 func (hs *hostSession) createOffer() (err error) {
 	hs.pc.OnDataChannel(hs.onDataChannel())
 
+	// Create unused DataChannel, the offer doesn't implictly have
+	// any media sections otherwise
+	if _, err = hs.pc.CreateDataChannel("offerer-channel", nil); err != nil {
+		log.Println(err)
+		return
+	}
+
 	// Create an offer to send to the browser
 	offer, err := hs.pc.CreateOffer(nil)
 	if err != nil {
 		log.Println(err)
 		return
 	}
 
+	// Create channel that is blocked until ICE Gathering is complete
+	gatherComplete := webrtc.GatheringCompletePromise(hs.pc)
+
 	err = hs.pc.SetLocalDescription(offer)
 	if err != nil {
 		log.Println(err)
 		return
 	}
 
+	// Block until ICE Gathering is complete
+	<-gatherComplete
+
 	hs.offer = sd.SessionDescription{
-		Sdp: offer.SDP,
+		Sdp: hs.pc.LocalDescription().SDP,
 	}
 	if hs.oneWay {
 		hs.offer.GenKeys()

host.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/kr/pty"
-	"github.com/pion/webrtc/v2"
+	"github.com/pion/webrtc/v3"
 )
 
 func TestHosttDataChannelOnMessage(t *testing.T) {

host_test.go

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/maxmcd/webtty/pkg/sd"
-	"github.com/pion/webrtc/v2"
+	"github.com/pion/webrtc/v3"
 	"golang.org/x/crypto/ssh/terminal"
 )