Jul 22, 2021 · Jul 22, 2021 · Jul 22, 2021
diff --git a/wsnet/dial.go b/wsnet/dial.go
 // so it's better to buffer and process than fail.
 pendingCandidates = []webrtc.ICECandidateInit{}
 )

 go func() {
 defer close(errCh)
 defer func() {
 _ = d.conn.Close()
 }()
 err := waitForConnectionOpen(ctx, d.rtc)
 if err != nil {
 if errors.Is(err, context.DeadlineExceeded) {
 _ = d.conn.Close()
 }
 errCh <- err
 return
 }
diff --git a/wsnet/dial_test.go b/wsnet/dial_test.go
 "net"
 "strconv"
 "testing"
 "time"

 "cdr.dev/slog/sloggers/slogtest"
 "github.com/pion/ice/v2"
 }

 func TestDial(t *testing.T) {
 t.Run("Timeout", func(t *testing.T) {
 t.Parallel()

 connectAddr, _ := createDumbBroker(t)

 ctx, cancelFunc := context.WithTimeout(context.Background(), time.Millisecond*50)
 defer cancelFunc()
 dialer, err := DialWebsocket(ctx, connectAddr, nil, nil)
 require.True(t, errors.Is(err, context.DeadlineExceeded))
 require.Error(t, dialer.conn.Close(), "already wrote close")
 })

 t.Run("Ping", func(t *testing.T) {
 t.Parallel()

diff --git a/wsnet/rtc.go b/wsnet/rtc.go
 })
 <-ctx.Done()
 if ctx.Err() == context.DeadlineExceeded {
 returnctx.Err()
 returncontext.DeadlineExceeded
 }
 return nil
 }
diff --git a/wsnet/wsnet_test.go b/wsnet/wsnet_test.go
 mut.Lock()
 defer mut.Unlock()
 if sess == nil {
 t.Error("listen not called")
 // We discard inbound to emulate a pubsub where we don't know if anyone
 // is listening on the other side.
 _, _ = io.Copy(io.Discard, nc)
 return
 }
 oc, err := sess.Open()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -147,14 +147,16 @@ func (d *Dialer) negotiate(ctx context.Context) (err error) {
		// so it's better to buffer and process than fail.
		pendingCandidates = []webrtc.ICECandidateInit{}
		)

		go func() {
		defer close(errCh)
		defer func() {
		_ = d.conn.Close()
		}()
		err := waitForConnectionOpen(ctx, d.rtc)
		if err != nil {
		if errors.Is(err, context.DeadlineExceeded) {
		_ = d.conn.Close()
		}
		errCh <- err
		return
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,6 +9,7 @@ import (
		"net"
		"strconv"
		"testing"
		"time"

		"cdr.dev/slog/sloggers/slogtest"
		"github.com/pion/ice/v2"
Expand DownExpand Up		@@ -51,6 +52,18 @@ func ExampleDial_basic() {
		}

		func TestDial(t *testing.T) {
		t.Run("Timeout", func(t *testing.T) {
		t.Parallel()

		connectAddr, _ := createDumbBroker(t)

		ctx, cancelFunc := context.WithTimeout(context.Background(), time.Millisecond*50)
		defer cancelFunc()
		dialer, err := DialWebsocket(ctx, connectAddr, nil, nil)
		require.True(t, errors.Is(err, context.DeadlineExceeded))
		require.Error(t, dialer.conn.Close(), "already wrote close")
		})

		t.Run("Ping", func(t *testing.T) {
		t.Parallel()

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -256,7 +256,7 @@ func waitForConnectionOpen(ctx context.Context, conn *webrtc.PeerConnection) err
		})
		<-ctx.Done()
		if ctx.Err() == context.DeadlineExceeded {
		returnctx.Err()
		returncontext.DeadlineExceeded
		}
		return nil
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -68,7 +68,9 @@ func createDumbBroker(t testing.TB) (connectAddr string, listenAddr string) {
		mut.Lock()
		defer mut.Unlock()
		if sess == nil {
		t.Error("listen not called")
		// We discard inbound to emulate a pubsub where we don't know if anyone
		// is listening on the other side.
		_, _ = io.Copy(io.Discard, nc)
kylecarbs marked this conversation as resolved. Show resolvedHide resolved
		return
		}
		oc, err := sess.Open()
Expand Down