Jul 26, 2021 · Jul 22, 2021 · Jul 22, 2021 · Jul 22, 2021 · Jul 22, 2021 · Jul 22, 2021
diff --git a/wsnet/dial_test.go b/wsnet/dial_test.go
 closeTurn()

 list := l.(*listener)

 for i := 0; i < 15; i++ {
 time.Sleep(time.Second)

 assert.Eventually(t, func() bool {
 list.connClosersMut.Lock()
 size := len(list.connClosers)
 list.connClosersMut.Unlock()
 if size == 0 {
 break
 }
 }

 list.connClosersMut.Lock()
 assert.Equal(t, 0, len(list.connClosers))
 list.connClosersMut.Unlock()
 defer list.connClosersMut.Unlock()
 return len(list.connClosers) == 0
 }, time.Second*15, time.Second)
 })
 }

diff --git a/wsnet/listen.go b/wsnet/listen.go
 }
 rtc.OnConnectionStateChange(func(pcs webrtc.PeerConnectionState) {
 l.log.Info(ctx, "connection state change", slog.F("state", pcs.String()))
 if pcs == webrtc.PeerConnectionStateConnecting {
 switch pcs {
 case webrtc.PeerConnectionStateConnected:
 return
 }
 if pcs == webrtc.PeerConnectionStateConnected {
 case webrtc.PeerConnectionStateConnecting:
 // Safe to close the negotiating WebSocket.
 _ = conn.Close()
 return
Original file line number	Diff line number	Diff line change
Expand Up		@@ -297,21 +297,11 @@ func TestDial(t *testing.T) {
		closeTurn()

		list := l.(*listener)

		for i := 0; i < 15; i++ {
		time.Sleep(time.Second)

		assert.Eventually(t, func() bool {
		list.connClosersMut.Lock()
		size := len(list.connClosers)
		list.connClosersMut.Unlock()
		if size == 0 {
		break
		}
		}

		list.connClosersMut.Lock()
		assert.Equal(t, 0, len(list.connClosers))
		list.connClosersMut.Unlock()
		defer list.connClosersMut.Unlock()
		return len(list.connClosers) == 0
		}, time.Second*15, time.Second)
		})
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -256,10 +256,10 @@ func (l *listener) negotiate(ctx context.Context, conn net.Conn) {
		}
		rtc.OnConnectionStateChange(func(pcs webrtc.PeerConnectionState) {
		l.log.Info(ctx, "connection state change", slog.F("state", pcs.String()))
		if pcs == webrtc.PeerConnectionStateConnecting {
		switch pcs {
		case webrtc.PeerConnectionStateConnected:
		return
		}
		if pcs == webrtc.PeerConnectionStateConnected {
		case webrtc.PeerConnectionStateConnecting:
		// Safe to close the negotiating WebSocket.
		_ = conn.Close()
kylecarbs marked this conversation as resolved. Show resolvedHide resolved
		return
Expand Down