From bab5caee015ec7377104e394d464cc6da01f9925 Mon Sep 17 00:00:00 2001
From: aler9 <46489434+aler9@users.noreply.github.com>
Date: Tue, 20 Dec 2022 13:23:53 +0100
Subject: [PATCH] webrtc: fix connection in case of high latency

When latency is high, one side of the peer connection switched to the
"connected" state before the other one, and then closed the WebSocket
connection since it's useless after the peer connection has been
established. This caused the other side of the connection to detect a
WebSocket error and to exit.

The WebSocket connection must remain open, otherwise the
"connected" state is not set by both parts.
---
 internal/core/webrtc_conn.go    | 13 ++++++++++---
 internal/core/webrtc_index.html |  6 ++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/internal/core/webrtc_conn.go b/internal/core/webrtc_conn.go
index d1ac421c..96cc1f6b 100644
--- a/internal/core/webrtc_conn.go
+++ b/internal/core/webrtc_conn.go
@@ -30,6 +30,10 @@ import (
 	"github.com/aler9/rtsp-simple-server/internal/logger"
 )
 
+const (
+	handshakeDeadline = 10 * time.Second
+)
+
 type webRTCTrack struct {
 	media       *media.Media
 	format      format.Format
@@ -205,8 +209,8 @@ func (c *webRTCConn) runInner(ctx context.Context) error {
 	}
 
 	// maximum deadline to complete the handshake
-	c.wsconn.SetReadDeadline(time.Now().Add(10 * time.Second))
-	c.wsconn.SetWriteDeadline(time.Now().Add(10 * time.Second))
+	c.wsconn.SetReadDeadline(time.Now().Add(handshakeDeadline))
+	c.wsconn.SetWriteDeadline(time.Now().Add(handshakeDeadline))
 
 	err = c.writeICEServers(c.genICEServers())
 	if err != nil {
@@ -340,8 +344,11 @@ outer:
 		}
 	}
 
+	// do NOT close the WebSocket connection
+	// in order to allow the other side of the connection
+	// o switch to the "connected" state before WebSocket is closed.
+
 	c.log(logger.Info, "peer connection established")
-	c.wsconn.Close()
 
 	ringBuffer, _ := ringbuffer.New(uint64(c.readBufferCount))
 	defer ringBuffer.Close()
diff --git a/internal/core/webrtc_index.html b/internal/core/webrtc_index.html
index a99afa05..57403449 100644
--- a/internal/core/webrtc_index.html
+++ b/internal/core/webrtc_index.html
@@ -81,9 +81,11 @@ class Receiver {
             case "connected":
                 this.pc.onicecandidate = undefined;
                 this.ws.onmessage = undefined;
+                this.ws.onerror = undefined
                 this.ws.onclose = undefined;
-                this.ws.close();
-                this.ws = null;
+                // do not close the WebSocket connection
+                // in order to allow the other side of the connection
+                // to switch to the "connected" state before WebSocket is closed.
                 break;
 
             case "disconnected":