Pion v3

conn.go

@@ -19,7 +19,7 @@ import (
 	ma "github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr-net"
 	"github.com/pion/datachannel"
-	"github.com/pion/webrtc/v2"
+	"github.com/pion/webrtc/v3"
 )
 
 type connConfig struct {
@@ -97,12 +97,15 @@ func dial(ctx context.Context, config *connConfig) (*Conn, error) {
 		return nil, err
 	}
 
+	// Complete ICE Gathering for single-shot signaling.
+	gatherComplete := webrtc.GatheringCompletePromise(pc)
 	err = pc.SetLocalDescription(offer)
 	if err != nil {
 		return nil, err
 	}
+	<-gatherComplete
 
-	offerEnc, err := encodeSignal(offer)
+	offerEnc, err := encodeSignal(*pc.LocalDescription())
 	if err != nil {
 		return nil, err
 	}
@@ -188,13 +191,13 @@ func (c *Conn) IsClosed() bool {
 }
 
 // OpenStream creates a new stream.
-func (c *Conn) OpenStream() (smux.MuxedStream, error) {
+func (c *Conn) OpenStream(ctx context.Context) (smux.MuxedStream, error) {
 	muxed, err := c.getMuxed()
 	if err != nil {
 		return nil, err
 	}
 	if muxed != nil {
-		return muxed.OpenStream()
+		return muxed.OpenStream(ctx)
 	}
 
 	rawDC := c.checkInitChannel()

examples/libp2p-echo/go.mod

@@ -5,12 +5,19 @@ go 1.12
 replace github.com/libp2p/go-libp2p-webrtc-direct => ../../
 
 require (
-	github.com/ipfs/go-log v0.0.1
-	github.com/libp2p/go-libp2p v0.1.1
-	github.com/libp2p/go-libp2p-core v0.0.3
-	github.com/libp2p/go-libp2p-mplex v0.2.1
-	github.com/libp2p/go-libp2p-webrtc-direct v0.0.0-00010101000000-000000000000
-	github.com/multiformats/go-multiaddr v0.0.4
-	github.com/pion/webrtc/v2 v2.0.16
-	github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc
+	github.com/ipfs/go-log v1.0.5
+	github.com/ipfs/go-log/v2 v2.1.3
+	github.com/koron/go-ssdp v0.0.2 // indirect
+	github.com/libp2p/go-conn-security-multistream v0.2.1
+	github.com/libp2p/go-libp2p v0.13.0
+	github.com/libp2p/go-libp2p-core v0.8.5
+	github.com/libp2p/go-libp2p-mplex v0.4.1
+	github.com/libp2p/go-libp2p-transport-upgrader v0.4.2
+	github.com/libp2p/go-libp2p-webrtc-direct v0.0.0-20201219114432-56b02029fbb8
+	github.com/multiformats/go-multiaddr v0.3.1
+	github.com/onsi/ginkgo v1.14.2 // indirect
+	github.com/onsi/gomega v1.10.3 // indirect
+	github.com/pion/webrtc/v3 v3.0.16
+	github.com/whyrusleeping/go-logging v0.0.1
+	golang.org/x/text v0.3.5 // indirect
 )

examples/libp2p-echo/main.go

@@ -23,7 +23,7 @@ import (
 
 	mplex "github.com/libp2p/go-libp2p-mplex"
 	direct "github.com/libp2p/go-libp2p-webrtc-direct"
-	"github.com/pion/webrtc/v2"
+	"github.com/pion/webrtc/v3"
 )
 
 // makeBasicHost creates a LibP2P host with a random peer ID listening on the
@@ -89,7 +89,7 @@ func main() {
 	// LibP2P code uses golog to log messages. They log with different
 	// string IDs (i.e. "swarm"). We can control the verbosity level for
 	// all loggers with:
-	golog.SetAllLoggers(gologging.INFO) // Change to DEBUG for extra info
+	golog.SetAllLoggers(golog.LogLevel(gologging.INFO)) // Change to DEBUG for extra info
 
 	// Parse options from the command line
 	listenF := flag.Int("l", 0, "wait for incoming connections")

examples/standalone/go.mod

@@ -5,9 +5,9 @@ go 1.12
 replace github.com/libp2p/go-libp2p-webrtc-direct => ../../
 
 require (
-	github.com/libp2p/go-libp2p-core v0.0.3
-	github.com/libp2p/go-libp2p-mplex v0.2.1
+	github.com/libp2p/go-libp2p-core v0.8.5
+	github.com/libp2p/go-libp2p-mplex v0.4.1
 	github.com/libp2p/go-libp2p-webrtc-direct v0.0.0-00010101000000-000000000000
-	github.com/multiformats/go-multiaddr v0.0.4
-	github.com/pion/webrtc/v2 v2.0.16
+	github.com/multiformats/go-multiaddr v0.3.1
+	github.com/pion/webrtc/v3 v3.0.16
 )

examples/standalone/main.go

@@ -4,14 +4,13 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"io/ioutil"
-
 	smux "github.com/libp2p/go-libp2p-core/mux"
 	tpt "github.com/libp2p/go-libp2p-core/transport"
 	mplex "github.com/libp2p/go-libp2p-mplex"
 	direct "github.com/libp2p/go-libp2p-webrtc-direct"
 	ma "github.com/multiformats/go-multiaddr"
-	"github.com/pion/webrtc/v2"
+	"github.com/pion/webrtc/v3"
+	"io/ioutil"
 )
 
 const listenFlag = "listen"
@@ -51,7 +50,7 @@ func main() {
 		defer c.Close()
 		fmt.Println("[dialer] Opened connection")
 
-		s, err := c.OpenStream()
+		s, err := c.OpenStream(context.Background())
 		check(err)
 		fmt.Println("[dialer] Opened stream")
 

examples/wasm/go.mod

@@ -5,9 +5,10 @@ go 1.12
 replace github.com/libp2p/go-libp2p-webrtc-direct => ../../
 
 require (
-	github.com/libp2p/go-libp2p-core v0.0.3
-	github.com/libp2p/go-libp2p-mplex v0.2.1
+	github.com/libp2p/go-libp2p-core v0.8.5
+	github.com/libp2p/go-libp2p-mplex v0.4.1
 	github.com/libp2p/go-libp2p-webrtc-direct v0.0.0-00010101000000-000000000000
-	github.com/multiformats/go-multiaddr v0.0.4
-	github.com/pion/webrtc/v2 v2.0.16
+	github.com/multiformats/go-multiaddr v0.3.1
+	github.com/pion/webrtc/v3 v3.0.16
+	github.com/shurcooL/go-goon v0.0.0-20210110234559-7585751d9a17 // indirect
 )