Add support RTSP over WebSocket

pkg/rtsp/client.go

@@ -2,10 +2,9 @@ package rtsp
 
 import (
 	"bufio"
-	"crypto/tls"
 	"errors"
 	"fmt"
-	"net"
+	"github.com/AlexxIT/go2rtc/pkg/tcp/websocket"
 	"net/http"
 	"net/url"
 	"strconv"
@@ -23,33 +22,18 @@ func NewClient(uri string) *Conn {
 }
 
 func (c *Conn) Dial() (err error) {
-	if c.URL, err = url.Parse(c.uri); err != nil {
-		return
+	if c.Transport == "" {
+		c.conn, err = Dial(c.uri)
+	} else {
+		c.conn, err = websocket.Dial(c.Transport)
 	}
 
-	if strings.IndexByte(c.URL.Host, ':') < 0 {
-		c.URL.Host += ":554"
-	}
-
-	c.conn, err = net.DialTimeout("tcp", c.URL.Host, time.Second*5)
 	if err != nil {
 		return
 	}
 
-	var tlsConf *tls.Config
-	switch c.URL.Scheme {
-	case "rtsps":
-		tlsConf = &tls.Config{ServerName: c.URL.Hostname()}
-	case "rtspx":
-		c.URL.Scheme = "rtsps"
-		tlsConf = &tls.Config{InsecureSkipVerify: true}
-	}
-	if tlsConf != nil {
-		tlsConn := tls.Client(c.conn, tlsConf)
-		if err = tlsConn.Handshake(); err != nil {
-			return err
-		}
-		c.conn = tlsConn
+	if c.URL, err = url.Parse(c.uri); err != nil {
+		return
 	}
 
 	// remove UserInfo from URL

pkg/rtsp/conn.go

@@ -24,6 +24,7 @@ type Conn struct {
 	Backchannel bool
 	PacketSize  uint16
 	SessionName string
+	Transport   string // custom transport support, ex. RTSP over WebSocket
 
 	Medias    []*core.Media
 	UserAgent string

pkg/rtsp/dial.go

@@ -0,0 +1,44 @@
+package rtsp
+
+import (
+	"crypto/tls"
+	"errors"
+	"net"
+	"net/url"
+	"strings"
+	"time"
+)
+
+func Dial(uri string) (net.Conn, error) {
+	u, err := url.Parse(uri)
+	if err != nil {
+		return nil, err
+	}
+
+	switch u.Scheme {
+	case "rtsp":
+		return dialTCP(u.Host, nil)
+	case "rtsps":
+		tlsConf := &tls.Config{ServerName: u.Hostname()}
+		return dialTCP(u.Host, tlsConf)
+	case "rtspx":
+		tlsConf := &tls.Config{InsecureSkipVerify: true}
+		return dialTCP(u.Host, tlsConf)
+	}
+
+	return nil, errors.New("unsupported scheme: " + u.Scheme)
+}
+
+func dialTCP(address string, tlsConf *tls.Config) (net.Conn, error) {
+	if strings.IndexByte(address, ':') < 0 {
+		address += ":554"
+	}
+
+	conn, err := net.DialTimeout("tcp", address, time.Second*5)
+	if tlsConf == nil || err != nil {
+		return conn, err
+	}
+
+	tlsConn := tls.Client(conn, tlsConf)
+	return tlsConn, tlsConn.Handshake()
+}