内存复制

修复sps pps vps为空

README.md

@@ -13,12 +13,15 @@ ListenAddr  = ":554"
 BufferLength  = 2048
 AutoPull     = false
 RemoteAddr   = "rtsp://localhost/${streamPath}"
+[[RTSP.AutoPullList]]
+URL = "rtsp://admin:admin@192.168.1.212:554/cam/realmonitor?channel=1&subtype=1"
+StreamPath = "live/rtsp"
 ```
 - ListenAddr 是监听端口，可以将rtsp流推到Monibuca中
 - BufferLength是指解析拉取的rtp包的缓冲大小
 - AutoPull是指当有用户订阅一个新流的时候自动向远程拉流转发
 - RemoteAddr 指远程拉流地址，其中${streamPath}是占位符，实际使用流路径替换。
-
+- AutoPullList 是一个数组，如果配置了该数组，则会在程序启动时自动启动拉流，StreamPath一定要是唯一的，不能重复
 
 ## 使用方法(拉流转发)
 ```go

client.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"bytes"
 	"crypto/md5"
+	"encoding/base64"
 	"encoding/binary"
 	"errors"
 	"fmt"
@@ -15,20 +16,24 @@ import (
 	"strings"
 	"time"
 
-	. "github.com/Monibuca/engine/v2"
+	. "github.com/Monibuca/engine/v3"
+	. "github.com/Monibuca/utils/v3"
 )
 
 // PullStream 从外部拉流
 func (rtsp *RTSP) PullStream(streamPath string, rtspUrl string) (err error) {
-	if result := rtsp.Publisher.Publish(streamPath); result {
-		rtsp.Stream.Type = "RTSP"
-		rtsp.RTSPInfo.StreamInfo = &rtsp.Stream.StreamInfo
+	rtsp.Stream = &Stream{
+		StreamPath: streamPath,
+		Type:       "RTSP Pull",
+	}
+	if result := rtsp.Publish(); result {
 		rtsp.TransType = TRANS_TYPE_TCP
 		rtsp.vRTPChannel = 0
 		rtsp.vRTPControlChannel = 1
 		rtsp.aRTPChannel = 2
 		rtsp.aRTPControlChannel = 3
 		rtsp.URL = rtspUrl
+		rtsp.UDPServer = &UDPServer{Session: rtsp}
 		if err = rtsp.requestStream(); err != nil {
 			Println(err)
 			rtsp.Close()
@@ -77,6 +82,19 @@ func DigestAuth(authLine string, method string, URL string) (string, error) {
 	Authorization := fmt.Sprintf("Digest username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"%s\", response=\"%s\"", username, realm, nonce, l.String(), response)
 	return Authorization, nil
 }
+
+// auth Basic验证
+func BasicAuth(authLine string, method string, URL string) (string, error) {
+	l, err := url.Parse(URL)
+	if err != nil {
+		return "", fmt.Errorf("Url parse error:%v,%v", URL, err)
+	}
+	username := l.User.Username()
+	password, _ := l.User.Password()
+	userAndpass := []byte(username + ":" + password)
+	Authorization := fmt.Sprintf("Basic %s", base64.StdEncoding.EncodeToString(userAndpass))
+	return Authorization, nil
+}
 func (client *RTSP) checkAuth(method string, resp *Response) (string, error) {
 	if resp.StatusCode == 401 {
 		// need auth.
@@ -90,8 +108,7 @@ func (client *RTSP) checkAuth(method string, resp *Response) (string, error) {
 					client.authLine = authLine
 					return DigestAuth(authLine, method, client.URL)
 				} else if strings.IndexAny(authLine, "Basic") == 0 {
-					// not support yet
-					// TODO..
+					return BasicAuth(authLine, method, client.URL)
 				}
 			}
 			return "", fmt.Errorf("auth error")
@@ -101,9 +118,7 @@ func (client *RTSP) checkAuth(method string, resp *Response) (string, error) {
 				client.authLine = authLine
 				return DigestAuth(authLine, method, client.URL)
 			} else if strings.IndexAny(authLine, "Basic") == 0 {
-				// not support yet
-				// TODO..
-				return "", fmt.Errorf("not support Basic auth yet")
+				return BasicAuth(authLine, method, client.URL)
 			}
 		}
 	}
@@ -143,7 +158,7 @@ func (client *RTSP) requestStream() (err error) {
 	client.connRW = bufio.NewReadWriter(bufio.NewReaderSize(&timeoutConn, networkBuffer), bufio.NewWriterSize(&timeoutConn, networkBuffer))
 
 	headers := make(map[string]string)
-	headers["Require"] = "implicit-play"
+	//headers["Require"] = "implicit-play"
 	// An OPTIONS request returns the request types the server will accept.
 	resp, err := client.Request("OPTIONS", headers)
 	if err != nil {
@@ -188,73 +203,53 @@ func (client *RTSP) requestStream() (err error) {
 	}
 	client.SDPRaw = resp.Body
 	client.SDPMap = ParseSDP(client.SDPRaw)
+	client.VSdp, client.HasVideo = client.SDPMap["video"]
+	client.ASdp, client.HasAudio = client.SDPMap["audio"]
 	session := ""
-	if videoInfo, ok := client.SDPMap["video"]; ok {
-		client.VControl = videoInfo.Control
-		client.VCodec = videoInfo.Codec
-		client.SPS = videoInfo.SpropParameterSets[0]
-		client.PPS = videoInfo.SpropParameterSets[1]
-		var _url = ""
-		if strings.Index(strings.ToLower(client.VControl), "rtsp://") == 0 {
-			_url = client.VControl
-		} else {
-			_url = strings.TrimRight(client.URL, "/") + "/" + strings.TrimLeft(client.VControl, "/")
-		}
+	otherChannel := 4
+	for t, sdpInfo := range client.SDPMap {
 		headers = make(map[string]string)
-		if client.TransType == TRANS_TYPE_TCP {
-			headers["Transport"] = fmt.Sprintf("RTP/AVP/TCP;unicast;interleaved=%d-%d", client.vRTPChannel, client.vRTPControlChannel)
-		} else {
-			if client.UDPServer == nil {
-				client.UDPServer = &UDPServer{Session: client}
-			}
-			//RTP/AVP;unicast;client_port=64864-64865
-			err = client.UDPServer.SetupVideo()
-			if err != nil {
-				Printf("Setup video err.%v", err)
-				return err
-			}
-			headers["Transport"] = fmt.Sprintf("RTP/AVP/UDP;unicast;client_port=%d-%d", client.UDPServer.VPort, client.UDPServer.VControlPort)
-			client.Conn.timeout = 0 //	UDP ignore timeout
-		}
 		if session != "" {
 			headers["Session"] = session
 		}
-		Printf("Parse DESCRIBE response, VIDEO VControl:%s, VCode:%s, url:%s,Session:%s,vRTPChannel:%d,vRTPControlChannel:%d", client.VControl, client.VCodec, _url, session, client.vRTPChannel, client.vRTPControlChannel)
-		if resp, err = client.RequestWithPath("SETUP", _url, headers, true); err != nil {
-			return err
+		var _url = sdpInfo.Control
+		if !strings.HasPrefix(strings.ToLower(sdpInfo.Control), "rtsp://") {
+			_url = strings.TrimRight(client.URL, "/") + "/" + strings.TrimLeft(sdpInfo.Control, "/")
 		}
-		session, _ = resp.Header["Session"].(string)
-		session = strings.Split(session, ";")[0]
-	}
-	if audioInfo, ok := client.SDPMap["audio"]; ok {
-		client.AControl = audioInfo.Control
-		client.ACodec = audioInfo.Codec
-		client.AudioSpecificConfig = audioInfo.Config
-		var _url = ""
-		if strings.Index(strings.ToLower(client.AControl), "rtsp://") == 0 {
-			_url = client.AControl
-		} else {
-			_url = strings.TrimRight(client.URL, "/") + "/" + strings.TrimLeft(client.AControl, "/")
-		}
-		headers = make(map[string]string)
-		if client.TransType == TRANS_TYPE_TCP {
-			headers["Transport"] = fmt.Sprintf("RTP/AVP/TCP;unicast;interleaved=%d-%d", client.aRTPChannel, client.aRTPControlChannel)
-		} else {
-			if client.UDPServer == nil {
-				client.UDPServer = &UDPServer{Session: client}
+		switch t {
+		case "video":
+			client.setVideoTrack()
+			if client.TransType == TRANS_TYPE_TCP {
+				headers["Transport"] = fmt.Sprintf("RTP/AVP/TCP;unicast;interleaved=%d-%d", client.vRTPChannel, client.vRTPControlChannel)
+			} else {
+				//RTP/AVP;unicast;client_port=64864-64865
+				if err = client.UDPServer.SetupVideo(); err != nil {
+					Printf("Setup video err.%v", err)
+					return err
+				}
+				headers["Transport"] = fmt.Sprintf("RTP/AVP/UDP;unicast;client_port=%d-%d", client.UDPServer.VPort, client.UDPServer.VControlPort)
+				client.Conn.timeout = 0 //	UDP ignore timeout
 			}
-			err = client.UDPServer.SetupAudio()
-			if err != nil {
-				Printf("Setup audio err.%v", err)
-				return err
+		case "audio":
+			client.setAudioTrack()
+			if client.TransType == TRANS_TYPE_TCP {
+				headers["Transport"] = fmt.Sprintf("RTP/AVP/TCP;unicast;interleaved=%d-%d", client.aRTPChannel, client.aRTPControlChannel)
+			} else {
+				if err = client.UDPServer.SetupAudio(); err != nil {
+					Printf("Setup audio err.%v", err)
+					return err
+				}
+				headers["Transport"] = fmt.Sprintf("RTP/AVP/UDP;unicast;client_port=%d-%d", client.UDPServer.APort, client.UDPServer.AControlPort)
+				client.Conn.timeout = 0 //	UDP ignore timeout
+			}
+		default:
+			if client.TransType == TRANS_TYPE_TCP {
+				headers["Transport"] = fmt.Sprintf("RTP/AVP/TCP;unicast;interleaved=%d-%d", otherChannel, otherChannel+1)
+				otherChannel += 2
+			} else {
+				//TODO: UDP support
 			}
-			headers["Transport"] = fmt.Sprintf("RTP/AVP/UDP;unicast;client_port=%d-%d", client.UDPServer.APort, client.UDPServer.AControlPort)
-			client.Conn.timeout = 0 //	UDP ignore timeout
 		}
-		if session != "" {
-			headers["Session"] = session
-		}
-		Printf("Parse DESCRIBE response, AUDIO AControl:%s, ACodec:%s, url:%s,Session:%s, aRTPChannel:%d,aRTPControlChannel:%d", client.AControl, client.ACodec, _url, session, client.aRTPChannel, client.aRTPControlChannel)
 		if resp, err = client.RequestWithPath("SETUP", _url, headers, true); err != nil {
 			return err
 		}
@@ -264,27 +259,51 @@ func (client *RTSP) requestStream() (err error) {
 	headers = make(map[string]string)
 	if session != "" {
 		headers["Session"] = session
+		client.Session = session
 	}
 	resp, err = client.Request("PLAY", headers)
 	return err
 }
 
 func (client *RTSP) startStream() {
-	//startTime := time.Now()
+	startTime := time.Now()
 	//loggerTime := time.Now().Add(-10 * time.Second)
-	defer client.Stop()
+	defer func() {
+		if client.Err() == nil && config.Reconnect {
+			Printf("reconnecting:%s", client.URL)
+			client.RTSPClientInfo = RTSPClientInfo{}
+			if err := client.requestStream(); err != nil {
+				t := time.NewTicker(time.Second * 5)
+				for {
+					Printf("reconnecting:%s in 5 seconds", client.URL)
+					select {
+					case <-client.Done():
+						client.Stop()
+						return
+					case <-t.C:
+						if err = client.requestStream(); err == nil {
+							go client.startStream()
+							return
+						}
+					}
+				}
+			} else {
+				go client.startStream()
+			}
+		} else {
+			client.Stop()
+		}
+	}()
 	for client.Err() == nil {
-		//if client.OptionIntervalMillis > 0 {
-		//	if time.Since(startTime) > time.Duration(client.OptionIntervalMillis)*time.Millisecond {
-		//		startTime = time.Now()
-		//		headers := make(map[string]string)
-		//		headers["Require"] = "implicit-play"
-		//		// An OPTIONS request returns the request types the server will accept.
-		//		if err := client.RequestNoResp("OPTIONS", headers); err != nil {
-		//			// ignore...
-		//		}
-		//	}
-		//}
+		if time.Since(startTime) > time.Minute {
+			startTime = time.Now()
+			headers := make(map[string]string)
+			headers["Require"] = "implicit-play"
+			// An OPTIONS request returns the request types the server will accept.
+			if err := client.RequestNoResp("GET_PARAMETER", headers); err != nil {
+				// ignore...
+			}
+		}
 		b, err := client.connRW.ReadByte()
 		if err != nil {
 			Printf("client.connRW.ReadByte err:%v", err)
@@ -307,37 +326,20 @@ func (client *RTSP) startStream() {
 				Printf("io.ReadFull err:%v", err)
 				return
 			}
-			rtpBuf := content
-			var pack *RTPPack
+			
 			switch channel {
 			case client.aRTPChannel:
-				pack = &RTPPack{
-					Type:   RTP_TYPE_AUDIO,
-					Buffer: rtpBuf,
-				}
+				client.RtpAudio.Push(content)
 			case client.aRTPControlChannel:
-				pack = &RTPPack{
-					Type:   RTP_TYPE_AUDIOCONTROL,
-					Buffer: rtpBuf,
-				}
+
 			case client.vRTPChannel:
-				pack = &RTPPack{
-					Type:   RTP_TYPE_VIDEO,
-					Buffer: rtpBuf,
-				}
+				client.RtpVideo.Push(content)
 			case client.vRTPControlChannel:
-				pack = &RTPPack{
-					Type:   RTP_TYPE_VIDEOCONTROL,
-					Buffer: rtpBuf,
-				}
+
 			default:
 				Printf("unknow rtp pack type, channel:%v", channel)
 				continue
 			}
-			if pack == nil {
-				Printf("session tcp got nil rtp pack")
-				continue
-			}
 
 			//if client.debugLogEnable {
 			//	rtp := ParseRTP(pack.Buffer)
@@ -357,7 +359,6 @@ func (client *RTSP) startStream() {
 			//}
 
 			client.InBytes += int(length + 4)
-			client.handleRTP(pack)
 
 		default: // rtsp
 			builder := bytes.Buffer{}

go.mod

@@ -1,14 +1,11 @@
-module github.com/Monibuca/plugin-rtsp
+module github.com/Monibuca/plugin-rtsp/v3
 
-go 1.13
+go 1.16
 
 require (
-	github.com/Monibuca/engine/v2 v2.0.0
-	github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee // indirect
-	github.com/gobwas/pool v0.2.0 // indirect
-	github.com/gobwas/ws v1.0.3 // indirect
-	github.com/jinzhu/gorm v1.9.12 // indirect
-	github.com/pixelbender/go-sdp v1.0.0
-	github.com/reactivex/rxgo v1.0.0 // indirect
-	github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf
+	github.com/Monibuca/engine/v3 v3.0.0-beta5
+	github.com/Monibuca/utils/v3 v3.0.0-beta
+	github.com/pion/rtp v1.6.5
+	github.com/teris-io/shortid v0.0.0-20201117134242-e59966efd125
+	golang.org/x/sys v0.0.0-20210611083646-a4fc73990273 // indirect
 )

go.sum

@@ -1,88 +1,32 @@
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/EasyDarwin/EasyDarwin v8.1.0+incompatible h1:Rr8dRbZtcJhiJvGx5Vs7IENM6RUUwGkZiIj5+WrNhm8=
-github.com/EasyDarwin/EasyDarwin v8.1.0+incompatible/go.mod h1:xnmC+Q2+wugEDpQGxivSFNYPOhmNlIQHBfl0hMeriSU=
-github.com/Monibuca/engine v1.2.1 h1:TJmC6eZA1lR1MScWgempZLiEZD4T6aY/nn/rlQ9UdK8=
-github.com/Monibuca/engine v1.2.1/go.mod h1:WbDkXENLjcPjyjCR1Mix1GA+uAlwORkv/+8aMVrDX2g=
-github.com/Monibuca/engine v1.2.2 h1:hNjsrZpOmui8lYhgCJ5ltJU8g/k0Rrdysx2tHNGGnbI=
-github.com/Monibuca/engine/v2 v2.0.0 h1:8FjaScrtN8QdbcxO9zZYABMC0Re3I1O1T4p94zAXYb0=
-github.com/Monibuca/engine/v2 v2.0.0/go.mod h1:34EYjjV15G6myuHOKaJkO7y5tJ1Arq/NfC9Weacr2mc=
-github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=
-github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM=
-github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
-github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y=
-github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
-github.com/falconray0704/gortmp v0.0.0-20170613085150-e3f9bb02c7c8 h1:Bkx+0neYCcHW7BUeVCbR2GOn47NesdImh8nHHOKccD4=
-github.com/falconray0704/gortmp v0.0.0-20170613085150-e3f9bb02c7c8/go.mod h1:/JBZajtCDe9Z4j84v5QWo4PLn1K6jcBHh6qXN/bm/vw=
+github.com/Monibuca/engine/v3 v3.0.0-beta5 h1:b27ZQDfvf5dBMZbCSIUXItUwVIFs95fpkAV4xjN7BNE=
+github.com/Monibuca/engine/v3 v3.0.0-beta5/go.mod h1:SMgnlwih4pBA/HkTLjKXZFYkv3ukRzFjv65CARRLVIk=
+github.com/Monibuca/utils/v3 v3.0.0-beta h1:z4p/BSH5J9Ja/gwoDmj1RyN+b0q28Nmn/fqXiwq2hGY=
+github.com/Monibuca/utils/v3 v3.0.0-beta/go.mod h1:mQYP/OMox1tkWP6Qut7pBfARr1TXSRkK662dexQl6kI=
 github.com/funny/slab v0.0.0-20180511031532-b1fad5e5d478 h1:Db9StoJ6RZN3YttC0Pm0I4Y5izITRYch3RMbT59BYN0=
 github.com/funny/slab v0.0.0-20180511031532-b1fad5e5d478/go.mod h1:0j1+svBH8ABEIPdUP0AIg4qedsybnXGJBakCEw8cfoo=
 github.com/funny/utest v0.0.0-20161029064919-43870a374500 h1:Z0r1CZnoIWFB/Uiwh1BU5FYmuFe6L5NPi6XWQEmsTRg=
 github.com/funny/utest v0.0.0-20161029064919-43870a374500/go.mod h1:mUn39tBov9jKnTWV1RlOYoNzxdBFHiSzXWdY1FoNGGg=
-github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
-github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
-github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
-github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
-github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
-github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
-github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
-github.com/gobwas/ws v1.0.3 h1:ZOigqf7iBxkA4jdQ3am7ATzdlOFp9YzA6NmuvEEZc9g=
-github.com/gobwas/ws v1.0.3/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
-github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
-github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/jinzhu/gorm v1.9.12 h1:Drgk1clyWT9t9ERbzHza6Mj/8FY/CqMyVzOiHviMo6Q=
-github.com/jinzhu/gorm v1.9.12/go.mod h1:vhTjlKSJUTWNtcbQtrMBFCxy7eXTzeCAzfL5fBZT/Qs=
-github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
-github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M=
-github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=
-github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/logrusorgru/aurora v0.0.0-20200102142835-e9ef32dff381 h1:bqDmpDG49ZRnB5PcgP0RXtQvnMSgIF14M7CBd2shtXs=
-github.com/logrusorgru/aurora v0.0.0-20200102142835-e9ef32dff381/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
-github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
-github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8=
+github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
+github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
+github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-sqlite3 v2.0.1+incompatible h1:xQ15muvnzGBHpIpdrNi1DA5x0+TcBZzsIDwmw9uTHzw=
-github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/pixelbender/go-sdp v1.0.0 h1:hLP2ALBN4sLpgp2r3EDcFUSN3AyOkg1jonuWEJniotY=
-github.com/pixelbender/go-sdp v1.0.0/go.mod h1:6IBlz9+BrUHoFTea7gcp4S54khtOhjCW/nVDLhmZBAs=
+github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
+github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
+github.com/pion/rtp v1.6.5 h1:o2cZf8OascA5HF/b0PAbTxRKvOWxTQxWYt7SlToxFGI=
+github.com/pion/rtp v1.6.5/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/reactivex/rxgo v1.0.0 h1:qpT8/kVwAJDSeGsqx4oUXxgk3UCtAq/EreBGWYRxEcA=
-github.com/reactivex/rxgo v1.0.0/go.mod h1:/S1ygE20oE1BvZGIwd3fXx/m6s6pOX5G6zmXg9ninlQ=
-github.com/shirou/gopsutil v2.20.1+incompatible h1:oIq9Cq4i84Hk8uQAUOG3eNdI/29hBawGrD5YRl6JRDY=
-github.com/shirou/gopsutil v2.20.1+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf h1:Z2X3Os7oRzpdJ75iPqWZc0HeJWFYNCvKsfpQwFpRNTA=
-github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf/go.mod h1:M8agBzgqHIhgj7wEn9/0hJUZcrvt9VY+Ln+S1I5Mha0=
-github.com/zhangpeihao/goamf v0.0.0-20140409082417-3ff2c19514a8/go.mod h1:RZd/IqzNpFANwOB9rVmsnAYpo/6KesK4PqrN1a5cRgg=
-github.com/zhangpeihao/log v0.0.0-20170117094621-62e921e41859/go.mod h1:OAvmouyIV28taMw4SC4+hSnouObQqQkTQNOhU3Zowl0=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd h1:GGJVjV8waZKRHrgwvtH66z9ZGVurTD1MT0n1Bb+q4aM=
-golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+github.com/q191201771/naza v0.19.1 h1:4KLcxT2CHztO+7miPRtBG3FFgadSQYQw1gPPPKN7rnY=
+github.com/q191201771/naza v0.19.1/go.mod h1:5LeGupZZFtYP1g/S203n9vXoUNVdlRnPIfM6rExjqt0=
+github.com/teris-io/shortid v0.0.0-20201117134242-e59966efd125 h1:3SNcvBmEPE1YlB1JpVZouslJpI3GBNoiqW7+wb0Rz7w=
+github.com/teris-io/shortid v0.0.0-20201117134242-e59966efd125/go.mod h1:M8agBzgqHIhgj7wEn9/0hJUZcrvt9VY+Ln+S1I5Mha0=
+golang.org/x/sync v0.0.0-20201207232520-09787c993a3a h1:DcqTD9SDLc+1P/r1EmRBwnVsrOwW+kk2vWf9n+1sGhs=
+golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+golang.org/x/sys v0.0.0-20210611083646-a4fc73990273 h1:faDu4veV+8pcThn4fewv6TVlNCezafGoC1gM/mxQLbQ=
+golang.org/x/sys v0.0.0-20210611083646-a4fc73990273/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

main.go

@@ -2,33 +2,34 @@ package rtsp
 
 import (
 	"bufio"
-	"bytes"
 	"fmt"
 	"log"
 	"net"
 	"net/http"
-	"strings"
 	"sync"
 	"time"
 
-	. "github.com/Monibuca/engine/v2"
-	. "github.com/Monibuca/engine/v2/avformat"
-	"github.com/Monibuca/engine/v2/util"
+	. "github.com/Monibuca/engine/v3"
+	. "github.com/Monibuca/utils/v3"
 	"github.com/teris-io/shortid"
 )
 
-var collection = sync.Map{}
+var collection sync.Map
 var config = struct {
-	ListenAddr string
-	AutoPull   bool
-	RemoteAddr string
-	Timeout    int
-}{":554", false, "rtsp://localhost/${streamPath}", 0}
+	ListenAddr   string
+	AutoPull     bool
+	RemoteAddr   string
+	Timeout      int
+	Reconnect    bool
+	AutoPullList []*struct {
+		URL        string
+		StreamPath string
+	}
+}{":554", false, "rtsp://localhost/${streamPath}", 0, false, nil}
 
 func init() {
 	InstallPlugin(&PluginConfig{
 		Name:   "RTSP",
-		Type:   PLUGIN_PUBLISHER | PLUGIN_HOOK,
 		Config: &config,
 		Run:    runPlugin,
 		HotConfig: map[string]func(interface{}){
@@ -39,26 +40,22 @@ func init() {
 	})
 }
 func runPlugin() {
-	OnSubscribeHooks.AddHook(func(s *Subscriber) {
-		if config.AutoPull && s.Publisher == nil {
-			new(RTSP).PullStream(s.StreamPath, strings.Replace(config.RemoteAddr, "${streamPath}", s.StreamPath, -1))
-		}
-	})
-	http.HandleFunc("/rtsp/list", func(w http.ResponseWriter, r *http.Request) {
-		sse := util.NewSSE(w, r.Context())
+
+	http.HandleFunc("/api/rtsp/list", func(w http.ResponseWriter, r *http.Request) {
+		sse := NewSSE(w, r.Context())
 		var err error
 		for tick := time.NewTicker(time.Second); err == nil; <-tick.C {
-			var info []*RTSPInfo
+			var info []*RTSP
 			collection.Range(func(key, value interface{}) bool {
 				rtsp := value.(*RTSP)
-				pinfo := &rtsp.RTSPInfo
-				info = append(info, pinfo)
+				info = append(info, rtsp)
 				return true
 			})
 			err = sse.WriteJSON(info)
 		}
 	})
-	http.HandleFunc("/rtsp/pull", func(w http.ResponseWriter, r *http.Request) {
+	http.HandleFunc("/api/rtsp/pull", func(w http.ResponseWriter, r *http.Request) {
+		CORS(w, r)
 		targetURL := r.URL.Query().Get("target")
 		streamPath := r.URL.Query().Get("streamPath")
 		if err := new(RTSP).PullStream(streamPath, targetURL); err == nil {
@@ -67,9 +64,22 @@ func runPlugin() {
 			w.Write([]byte(fmt.Sprintf(`{"code":1,"msg":"%s"}`, err.Error())))
 		}
 	})
-	if config.ListenAddr != "" {
-		log.Fatal(ListenRtsp(config.ListenAddr))
+	if len(config.AutoPullList) > 0 {
+		for _, info := range config.AutoPullList {
+			if err := new(RTSP).PullStream(info.StreamPath, info.URL); err != nil {
+				Println(err)
+			}
+		}
 	}
+	if config.ListenAddr != "" {
+		go log.Fatal(ListenRtsp(config.ListenAddr))
+	}
+	// AddHook(HOOK_SUBSCRIBE, func(value interface{}) {
+	// 	s := value.(*Subscriber)
+	// 	if config.AutoPull && s.Publisher == nil {
+	// 		new(RTSP).PullStream(s.StreamPath, strings.Replace(config.RemoteAddr, "${streamPath}", s.StreamPath, -1))
+	// 	}
+	// })
 }
 
 func ListenRtsp(addr string) error {
@@ -118,56 +128,82 @@ func ListenRtsp(addr string) error {
 }
 
 type RTSP struct {
-	Publisher
-	RTSPInfo
+	*Stream
+	URL      string
+	SDPRaw   string
+	InBytes  int
+	OutBytes int
 	RTSPClientInfo
 	ID        string
-	Conn      *RichConn
+	Conn      *RichConn `json:"-"`
 	connRW    *bufio.ReadWriter
 	connWLock sync.RWMutex
 	Type      SessionType
 	TransType TransType
 
-	SDPMap   map[string]*SDPInfo
-	nonce    string
-	closeOld bool
-	AControl string
-	VControl string
-	ACodec   string
-	VCodec   string
-	avcsent  bool
-	aacsent  bool
-	Timeout  int
-	// stats info
-	fuBuffer []byte
+	SDPMap  map[string]*SDPInfo
+	nonce   string
+	ASdp    *SDPInfo
+	VSdp    *SDPInfo
+	Timeout int
 	//tcp channels
-	aRTPChannel         int
-	aRTPControlChannel  int
-	vRTPChannel         int
-	vRTPControlChannel  int
-	UDPServer           *UDPServer
-	UDPClient           *UDPClient
-	SPS                 []byte
-	PPS                 []byte
-	AudioSpecificConfig []byte
-	Auth                func(string) string
+	aRTPChannel        int
+	aRTPControlChannel int
+	vRTPChannel        int
+	vRTPControlChannel int
+	UDPServer          *UDPServer          `json:"-"`
+	UDPClient          *UDPClient          `json:"-"`
+	Auth               func(string) string `json:"-"`
+	HasVideo           bool
+	HasAudio           bool
+	RtpAudio           *RTPAudio
+	RtpVideo           *RTPVideo
 }
+
+func (rtsp *RTSP) setVideoTrack() {
+	if rtsp.VSdp.Codec == "H264" {
+		rtsp.RtpVideo = rtsp.NewRTPVideo(7)
+		if len(rtsp.VSdp.SpropParameterSets) > 1 {
+			rtsp.RtpVideo.PushNalu(0, 0, rtsp.VSdp.SpropParameterSets...)
+		}
+	} else if rtsp.VSdp.Codec == "H265" {
+		rtsp.RtpVideo = rtsp.NewRTPVideo(12)
+		if len(rtsp.VSdp.VPS) > 0 {
+			rtsp.RtpVideo.PushNalu(0, 0, rtsp.VSdp.VPS, rtsp.VSdp.SPS, rtsp.VSdp.PPS)
+		}
+	}
+}
+func (rtsp *RTSP) setAudioTrack() {
+	var at *RTPAudio
+	if len(rtsp.ASdp.Control) > 0 {
+		at = rtsp.NewRTPAudio(0)
+		at.SetASC(rtsp.ASdp.Config)
+	} else {
+		switch rtsp.ASdp.Codec {
+		case "AAC":
+			at = rtsp.NewRTPAudio(10)
+		case "PCMA":
+			at = rtsp.NewRTPAudio(7)
+			at.SoundRate = rtsp.ASdp.TimeScale
+			at.SoundSize = 16
+		case "PCMU":
+			at = rtsp.NewRTPAudio(8)
+			at.SoundRate = rtsp.ASdp.TimeScale
+			at.SoundSize = 16
+		default:
+			Printf("rtsp audio codec not support:%s", rtsp.ASdp.Codec)
+			return
+		}
+	}
+	rtsp.RtpAudio = at
+}
+
 type RTSPClientInfo struct {
 	Agent    string
 	Session  string
 	authLine string
 	Seq      int
 }
-type RTSPInfo struct {
-	URL       string
-	SyncCount int64
-	SDPRaw    string
-	InBytes   int
-	OutBytes  int
-
-	StreamInfo *StreamInfo
-}
-
 type RichConn struct {
 	net.Conn
 	timeout time.Duration
@@ -192,115 +228,3 @@ func (conn *RichConn) Write(b []byte) (n int, err error) {
 	}
 	return conn.Conn.Write(b)
 }
-func (rtsp *RTSP) handleNALU(nalType byte, payload []byte, ts int64) {
-	rtsp.SyncCount++
-	vl := len(payload)
-	switch nalType {
-	// case NALU_SPS:
-	// 	r := bytes.NewBuffer([]byte{})
-	// 	r.Write(RTMP_AVC_HEAD)
-	// 	util.BigEndian.PutUint16(spsHead[1:], uint16(vl))
-	// 	r.Write(spsHead)
-	// 	r.Write(payload)
-	// case NALU_PPS:
-	// 	r := bytes.NewBuffer([]byte{})
-	// 	util.BigEndian.PutUint16(ppsHead[1:], uint16(vl))
-	// 	r.Write(ppsHead)
-	// 	r.Write(payload)
-	// 	rtsp.PushVideo(0, r.Bytes())
-	// avcsent = true
-	case NALU_IDR_Picture:
-		if !rtsp.avcsent {
-			r := bytes.NewBuffer([]byte{})
-			r.Write(RTMP_AVC_HEAD)
-			spsHead := []byte{0xE1, 0, 0}
-			util.BigEndian.PutUint16(spsHead[1:], uint16(len(rtsp.SPS)))
-			r.Write(spsHead)
-			r.Write(rtsp.SPS)
-			ppsHead := []byte{0x01, 0, 0}
-			util.BigEndian.PutUint16(ppsHead[1:], uint16(len(rtsp.PPS)))
-			r.Write(ppsHead)
-			r.Write(rtsp.PPS)
-			rtsp.PushVideo(0, r.Bytes())
-			rtsp.avcsent = true
-		}
-		r := bytes.NewBuffer([]byte{})
-		iframeHead := []byte{0x17, 0x01, 0, 0, 0}
-		util.BigEndian.PutUint24(iframeHead[2:], 0)
-		r.Write(iframeHead)
-		nalLength := []byte{0, 0, 0, 0}
-		util.BigEndian.PutUint32(nalLength, uint32(vl))
-		r.Write(nalLength)
-		r.Write(payload)
-		rtsp.PushVideo(uint32(ts), r.Bytes())
-	case NALU_Non_IDR_Picture:
-		r := bytes.NewBuffer([]byte{})
-		pframeHead := []byte{0x27, 0x01, 0, 0, 0}
-		util.BigEndian.PutUint24(pframeHead[2:], 0)
-		r.Write(pframeHead)
-		nalLength := []byte{0, 0, 0, 0}
-		util.BigEndian.PutUint32(nalLength, uint32(vl))
-		r.Write(nalLength)
-		r.Write(payload)
-		rtsp.PushVideo(uint32(ts), r.Bytes())
-	}
-}
-func (rtsp *RTSP) handleRTP(pack *RTPPack) {
-	data := pack.Buffer
-	switch pack.Type {
-	case RTP_TYPE_AUDIO:
-		if !rtsp.aacsent {
-			rtsp.PushAudio(0, append([]byte{0xAF, 0x00}, rtsp.AudioSpecificConfig...))
-			rtsp.aacsent = true
-		}
-		cc := data[0] & 0xF
-		rtphdr := 12 + cc*4
-		payload := data[rtphdr:]
-		auHeaderLen := (int16(payload[0]) << 8) + int16(payload[1])
-		auHeaderLen = auHeaderLen >> 3
-		auHeaderCount := int(auHeaderLen / 2)
-		var auLenArray []int
-		for iIndex := 0; iIndex < int(auHeaderCount); iIndex++ {
-			auHeaderInfo := (int16(payload[2+2*iIndex]) << 8) + int16(payload[2+2*iIndex+1])
-			auLen := auHeaderInfo >> 3
-			auLenArray = append(auLenArray, int(auLen))
-		}
-		startOffset := 2 + 2*auHeaderCount
-		for _, auLen := range auLenArray {
-			endOffset := startOffset + auLen
-			addHead := []byte{0xAF, 0x01}
-			rtsp.PushAudio(0, append(addHead, payload[startOffset:endOffset]...))
-			startOffset = startOffset + auLen
-		}
-	case RTP_TYPE_VIDEO:
-		cc := data[0] & 0xF
-		//rtp header
-		rtphdr := 12 + cc*4
-
-		//packet time
-		ts := (int64(data[4]) << 24) + (int64(data[5]) << 16) + (int64(data[6]) << 8) + (int64(data[7]))
-
-		//packet number
-		//packno := (int64(data[6]) << 8) + int64(data[7])
-		data = data[rtphdr:]
-		nalType := data[0] & 0x1F
-
-		if nalType >= 1 && nalType <= 23 {
-			rtsp.handleNALU(nalType, data, ts)
-		} else if nalType == 28 {
-			isStart := data[1]&0x80 != 0
-			isEnd := data[1]&0x40 != 0
-			nalType := data[1] & 0x1F
-			//nri := (data[1]&0x60)>>5
-			nal := data[0]&0xE0 | data[1]&0x1F
-			if isStart {
-				rtsp.fuBuffer = []byte{0}
-			}
-			rtsp.fuBuffer = append(rtsp.fuBuffer, data[2:]...)
-			if isEnd {
-				rtsp.fuBuffer[0] = nal
-				rtsp.handleNALU(nalType, rtsp.fuBuffer, ts)
-			}
-		}
-	}
-}

sdp-parser.go

@@ -15,6 +15,9 @@ type SDPInfo struct {
 	Rtpmap             int
 	Config             []byte
 	SpropParameterSets [][]byte
+	VPS                []byte
+	PPS                []byte
+	SPS                []byte
 	PayloadType        int
 	SizeLength         int
 	IndexLength        int
@@ -31,17 +34,13 @@ func ParseSDP(sdpRaw string) map[string]*SDPInfo {
 			switch typeval[0] {
 			case "m":
 				if len(fields) > 0 {
-					switch fields[0] {
-					case "audio", "video":
-						sdpMap[fields[0]] = &SDPInfo{AVType: fields[0]}
-						info = sdpMap[fields[0]]
-						mfields := strings.Split(fields[1], " ")
-						if len(mfields) >= 3 {
-							info.PayloadType, _ = strconv.Atoi(mfields[2])
-						}
+					info = &SDPInfo{AVType: fields[0]}
+					sdpMap[info.AVType] = info
+					mfields := strings.Split(fields[1], " ")
+					if len(mfields) >= 3 {
+						info.PayloadType, _ = strconv.Atoi(mfields[2])
 					}
 				}
-
 			case "a":
 				if info != nil {
 					for _, field := range fields {
@@ -58,14 +57,13 @@ func ParseSDP(sdpRaw string) map[string]*SDPInfo {
 						}
 						keyval = strings.Split(field, "/")
 						if len(keyval) >= 2 {
-							key := keyval[0]
-							switch key {
+							switch keyval[0] {
+							case "H264", "H265", "PCMA", "PCMU":
+								info.Codec = keyval[0]
+							case "HEVC":
+								info.Codec = "H265"
 							case "MPEG4-GENERIC":
-								info.Codec = "aac"
-							case "H264":
-								info.Codec = "h264"
-							case "H265":
-								info.Codec = "h265"
+								info.Codec = "AAC"
 							}
 							if i, err := strconv.Atoi(keyval[1]); err == nil {
 								info.TimeScale = i
@@ -85,6 +83,12 @@ func ParseSDP(sdpRaw string) map[string]*SDPInfo {
 										info.SizeLength, _ = strconv.Atoi(val)
 									case "indexlength":
 										info.IndexLength, _ = strconv.Atoi(val)
+									case "sprop-vps":
+										info.VPS, _ = base64.StdEncoding.DecodeString(val)
+									case "sprop-sps":
+										info.SPS, _ = base64.StdEncoding.DecodeString(val)
+									case "sprop-pps":
+										info.PPS, _ = base64.StdEncoding.DecodeString(val)
 									case "sprop-parameter-sets":
 										fields := strings.Split(val, ",")
 										for _, field := range fields {

session.go

@@ -12,15 +12,16 @@ import (
 	"strings"
 	"time"
 
-	. "github.com/Monibuca/engine/v2"
+	. "github.com/Monibuca/engine/v3"
+	. "github.com/Monibuca/utils/v3"
+	"github.com/pion/rtp"
 	"github.com/teris-io/shortid"
 )
 
 type RTPPack struct {
-	Type   RTPType
-	Buffer []byte
+	Type RTPType
+	rtp.Packet
 }
-
 type SessionType int
 
 const (
@@ -47,20 +48,6 @@ const (
 	RTP_TYPE_VIDEOCONTROL
 )
 
-func (rt RTPType) String() string {
-	switch rt {
-	case RTP_TYPE_AUDIO:
-		return "audio"
-	case RTP_TYPE_VIDEO:
-		return "video"
-	case RTP_TYPE_AUDIOCONTROL:
-		return "audio control"
-	case RTP_TYPE_VIDEOCONTROL:
-		return "video control"
-	}
-	return "unknow"
-}
-
 type TransType int
 
 const (
@@ -98,9 +85,7 @@ func (session *RTSP) Stop() {
 		session.UDPServer.Stop()
 		session.UDPServer = nil
 	}
-	if session.Running() {
-		session.Cancel()
-	}
+	session.Close()
 	if session.Stream != nil {
 		collection.Delete(session.StreamPath)
 	}
@@ -133,48 +118,34 @@ func (session *RTSP) AcceptPush() {
 				Println(err)
 				return
 			}
-			var pack *RTPPack
+
+			// t := pack.Timestamp / 90
 			switch channel {
 			case session.aRTPChannel:
-				pack = &RTPPack{
-					Type:   RTP_TYPE_AUDIO,
-					Buffer: rtpBytes,
-				}
-				elapsed := time.Now().Sub(timer)
+				// pack.Type = RTP_TYPE_AUDIO
+				elapsed := time.Since(timer)
 				if elapsed >= 30*time.Second {
 					Println("Recv an audio RTP package")
 					timer = time.Now()
 				}
+				session.RtpAudio.Push(rtpBytes)
 			case session.aRTPControlChannel:
-				pack = &RTPPack{
-					Type:   RTP_TYPE_AUDIOCONTROL,
-					Buffer: rtpBytes,
-				}
+				// pack.Type = RTP_TYPE_AUDIOCONTROL
 			case session.vRTPChannel:
-				pack = &RTPPack{
-					Type:   RTP_TYPE_VIDEO,
-					Buffer: rtpBytes,
-				}
-				elapsed := time.Now().Sub(timer)
+				// pack.Type = RTP_TYPE_VIDEO
+				elapsed := time.Since(timer)
 				if elapsed >= 30*time.Second {
 					Println("Recv an video RTP package")
 					timer = time.Now()
 				}
+				session.RtpVideo.Push(rtpBytes)
 			case session.vRTPControlChannel:
-				pack = &RTPPack{
-					Type:   RTP_TYPE_VIDEOCONTROL,
-					Buffer: rtpBytes,
-				}
+				// pack.Type = RTP_TYPE_VIDEOCONTROL
 			default:
-				Printf("unknow rtp pack type, %v", pack.Type)
-				continue
-			}
-			if pack == nil {
-				Printf("session tcp got nil rtp pack")
+				//	Printf("unknow rtp pack type, %v", pack.Type)
 				continue
 			}
 			session.InBytes += rtpLen + 4
-			session.handleRTP(pack)
 		} else { // rtsp cmd
 			reqBuf := bytes.NewBuffer(nil)
 			reqBuf.WriteByte(buf1)
@@ -356,23 +327,21 @@ func (session *RTSP) handleRequest(req *Request) {
 
 		session.SDPRaw = req.Body
 		session.SDPMap = ParseSDP(req.Body)
-		sdp, ok := session.SDPMap["audio"]
-		if ok {
-			session.AControl = sdp.Control
-			session.ACodec = sdp.Codec
-			session.AudioSpecificConfig = sdp.Config
-			Printf("audio codec[%s]\n", session.ACodec)
+		stream := &Stream{
+			StreamPath: streamPath,
+			Type:       "RTSP",
 		}
-		if sdp, ok = session.SDPMap["video"]; ok {
-			session.VControl = sdp.Control
-			session.VCodec = sdp.Codec
-			session.SPS = sdp.SpropParameterSets[0]
-			session.PPS = sdp.SpropParameterSets[1]
-			Printf("video codec[%s]\n", session.VCodec)
-		}
-		if session.Publisher.Publish(streamPath) {
+		session.Stream = stream
+		if session.Publish() {
+			if session.ASdp, session.HasAudio = session.SDPMap["audio"]; session.HasAudio {
+				session.setAudioTrack()
+				Printf("audio codec[%s]\n", session.ASdp.Codec)
+			}
+			if session.VSdp, session.HasVideo = session.SDPMap["video"]; session.HasVideo {
+				session.setVideoTrack()
+				Printf("video codec[%s]\n", session.VSdp.Codec)
+			}
 			session.Stream.Type = "RTSP"
-			session.RTSPInfo.StreamInfo = &session.Stream.StreamInfo
 			collection.Store(streamPath, session)
 		}
 	case "DESCRIBE":
@@ -417,36 +386,38 @@ func (session *RTSP) handleRequest(req *Request) {
 		//	res.Status = "Error Status"
 		//	return
 		//}
-		vPath := ""
-		if strings.Index(strings.ToLower(session.VControl), "rtsp://") == 0 {
-			vControlUrl, err := url.Parse(session.VControl)
-			if err != nil {
-				res.StatusCode = 500
-				res.Status = "Invalid VControl"
-				return
+		var vPath, aPath string
+		if session.HasVideo {
+			if strings.Index(strings.ToLower(session.VSdp.Control), "rtsp://") == 0 {
+				vControlUrl, err := url.Parse(session.VSdp.Control)
+				if err != nil {
+					res.StatusCode = 500
+					res.Status = "Invalid VControl"
+					return
+				}
+				if vControlUrl.Port() == "" {
+					vControlUrl.Host = fmt.Sprintf("%s:554", vControlUrl.Host)
+				}
+				vPath = vControlUrl.String()
+			} else {
+				vPath = session.VSdp.Control
 			}
-			if vControlUrl.Port() == "" {
-				vControlUrl.Host = fmt.Sprintf("%s:554", vControlUrl.Host)
-			}
-			vPath = vControlUrl.String()
-		} else {
-			vPath = session.VControl
 		}
-
-		aPath := ""
-		if strings.Index(strings.ToLower(session.AControl), "rtsp://") == 0 {
-			aControlUrl, err := url.Parse(session.AControl)
-			if err != nil {
-				res.StatusCode = 500
-				res.Status = "Invalid AControl"
-				return
+		if session.HasAudio {
+			if strings.Index(strings.ToLower(session.ASdp.Control), "rtsp://") == 0 {
+				aControlUrl, err := url.Parse(session.ASdp.Control)
+				if err != nil {
+					res.StatusCode = 500
+					res.Status = "Invalid AControl"
+					return
+				}
+				if aControlUrl.Port() == "" {
+					aControlUrl.Host = fmt.Sprintf("%s:554", aControlUrl.Host)
+				}
+				aPath = aControlUrl.String()
+			} else {
+				aPath = session.ASdp.Control
 			}
-			if aControlUrl.Port() == "" {
-				aControlUrl.Host = fmt.Sprintf("%s:554", aControlUrl.Host)
-			}
-			aPath = aControlUrl.String()
-		} else {
-			aPath = session.AControl
 		}
 
 		mtcp := regexp.MustCompile("interleaved=(\\d+)(-(\\d+))?")
@@ -577,7 +548,7 @@ func (session *RTSP) SendRTP(pack *RTPPack) (err error) {
 			return
 		}
 		err = session.UDPClient.SendRTP(pack)
-		session.OutBytes += len(pack.Buffer)
+		session.OutBytes += len(pack.Raw)
 		return
 	}
 	switch pack.Type {
@@ -588,12 +559,12 @@ func (session *RTSP) SendRTP(pack *RTPPack) (err error) {
 		session.connWLock.Lock()
 		session.connRW.Write(bufChannel)
 		bufLen := make([]byte, 2)
-		binary.BigEndian.PutUint16(bufLen, uint16(len(pack.Buffer)))
+		binary.BigEndian.PutUint16(bufLen, uint16(len(pack.Raw)))
 		session.connRW.Write(bufLen)
-		session.connRW.Write(pack.Buffer)
+		session.connRW.Write(pack.Raw)
 		session.connRW.Flush()
 		session.connWLock.Unlock()
-		session.OutBytes += len(pack.Buffer) + 4
+		session.OutBytes += len(pack.Raw) + 4
 	case RTP_TYPE_AUDIOCONTROL:
 		bufChannel := make([]byte, 2)
 		bufChannel[0] = 0x24
@@ -601,12 +572,12 @@ func (session *RTSP) SendRTP(pack *RTPPack) (err error) {
 		session.connWLock.Lock()
 		session.connRW.Write(bufChannel)
 		bufLen := make([]byte, 2)
-		binary.BigEndian.PutUint16(bufLen, uint16(len(pack.Buffer)))
+		binary.BigEndian.PutUint16(bufLen, uint16(len(pack.Raw)))
 		session.connRW.Write(bufLen)
-		session.connRW.Write(pack.Buffer)
+		session.connRW.Write(pack.Raw)
 		session.connRW.Flush()
 		session.connWLock.Unlock()
-		session.OutBytes += len(pack.Buffer) + 4
+		session.OutBytes += len(pack.Raw) + 4
 	case RTP_TYPE_VIDEO:
 		bufChannel := make([]byte, 2)
 		bufChannel[0] = 0x24
@@ -614,12 +585,12 @@ func (session *RTSP) SendRTP(pack *RTPPack) (err error) {
 		session.connWLock.Lock()
 		session.connRW.Write(bufChannel)
 		bufLen := make([]byte, 2)
-		binary.BigEndian.PutUint16(bufLen, uint16(len(pack.Buffer)))
+		binary.BigEndian.PutUint16(bufLen, uint16(len(pack.Raw)))
 		session.connRW.Write(bufLen)
-		session.connRW.Write(pack.Buffer)
+		session.connRW.Write(pack.Raw)
 		session.connRW.Flush()
 		session.connWLock.Unlock()
-		session.OutBytes += len(pack.Buffer) + 4
+		session.OutBytes += len(pack.Raw) + 4
 	case RTP_TYPE_VIDEOCONTROL:
 		bufChannel := make([]byte, 2)
 		bufChannel[0] = 0x24
@@ -627,12 +598,12 @@ func (session *RTSP) SendRTP(pack *RTPPack) (err error) {
 		session.connWLock.Lock()
 		session.connRW.Write(bufChannel)
 		bufLen := make([]byte, 2)
-		binary.BigEndian.PutUint16(bufLen, uint16(len(pack.Buffer)))
+		binary.BigEndian.PutUint16(bufLen, uint16(len(pack.Raw)))
 		session.connRW.Write(bufLen)
-		session.connRW.Write(pack.Buffer)
+		session.connRW.Write(pack.Raw)
 		session.connRW.Flush()
 		session.connWLock.Unlock()
-		session.OutBytes += len(pack.Buffer) + 4
+		session.OutBytes += len(pack.Raw) + 4
 	default:
 		err = fmt.Errorf("session tcp send rtp got unkown pack type[%v]", pack.Type)
 	}

udp-client.go

@@ -4,7 +4,8 @@ import (
 	"fmt"
 	"net"
 	"strings"
-	. "github.com/Monibuca/engine/v2"
+
+	. "github.com/Monibuca/utils/v3"
 )
 
 type UDPClient struct {
@@ -151,7 +152,7 @@ func (c *UDPClient) SendRTP(pack *RTPPack) (err error) {
 		return
 	}
 
-	if _, err = conn.Write(pack.Buffer);err != nil {
+	if _, err = conn.Write(pack.Raw); err != nil {
 		err = fmt.Errorf("udp client write bytes error, %v", err)
 		return
 	}

udp-server.go

@@ -6,13 +6,12 @@ import (
 	"strconv"
 	"strings"
 	"sync"
-	"time"
 
-	. "github.com/Monibuca/engine/v2"
+	. "github.com/Monibuca/utils/v3"
 )
 
 type UDPServer struct {
-	Session    *RTSP
+	Session *RTSP
 	UDPClient
 	sync.Mutex
 }
@@ -25,14 +24,6 @@ func (s *UDPServer) AddInputBytes(bytes int) {
 	panic(fmt.Errorf("session and RTSPClient both nil"))
 }
 
-func (s *UDPServer) HandleRTP(pack *RTPPack) {
-	s.Lock()
-	defer s.Unlock()
-	if s.Session != nil {
-		s.Session.handleRTP(pack)
-	}
-}
-
 func (s *UDPServer) Stop() {
 	if s.Stoped {
 		return
@@ -82,22 +73,17 @@ func (s *UDPServer) SetupAudio() (err error) {
 		bufUDP := make([]byte, UDP_BUF_SIZE)
 		Printf("udp server start listen audio port[%d]", s.APort)
 		defer Printf("udp server stop listen audio port[%d]", s.APort)
-		timer := time.Unix(0, 0)
+		// timer := time.Unix(0, 0)
 		for !s.Stoped {
 			if n, _, err := s.AConn.ReadFromUDP(bufUDP); err == nil {
-				elapsed := time.Now().Sub(timer)
-				if elapsed >= 30*time.Second {
-					Printf("Package recv from AConn.len:%d\n", n)
-					timer = time.Now()
-				}
-				rtpBytes := make([]byte, n)
+				// elapsed := time.Now().Sub(timer)
+				// if elapsed >= 30*time.Second {
+				// 	Printf("Package recv from AConn.len:%d\n", n)
+				// 	timer = time.Now()
+				// }
 				s.AddInputBytes(n)
-				copy(rtpBytes, bufUDP)
-				pack := &RTPPack{
-					Type:   RTP_TYPE_AUDIO,
-					Buffer: rtpBytes,
-				}
-				s.HandleRTP(pack)
+				var bytes []byte
+				s.Session.RtpAudio.Push(append(bytes, bufUDP[:n]...))
 			} else {
 				Println("udp server read audio pack error", err)
 				continue
@@ -131,14 +117,12 @@ func (s *UDPServer) SetupAudio() (err error) {
 		for !s.Stoped {
 			if n, _, err := s.AControlConn.ReadFromUDP(bufUDP); err == nil {
 				//Printf("Package recv from AControlConn.len:%d\n", n)
-				rtpBytes := make([]byte, n)
 				s.AddInputBytes(n)
-				copy(rtpBytes, bufUDP)
-				pack := &RTPPack{
-					Type:   RTP_TYPE_AUDIOCONTROL,
-					Buffer: rtpBytes,
-				}
-				s.HandleRTP(pack)
+				// pack := RTPPack{
+				// 	Type: RTP_TYPE_AUDIOCONTROL,
+				// }
+				// pack.Unmarshal(bufUDP[:n])
+				// s.HandleRTP(pack)
 			} else {
 				Println("udp server read audio control pack error", err)
 				continue
@@ -174,22 +158,17 @@ func (s *UDPServer) SetupVideo() (err error) {
 		bufUDP := make([]byte, UDP_BUF_SIZE)
 		Printf("udp server start listen video port[%d]", s.VPort)
 		defer Printf("udp server stop listen video port[%d]", s.VPort)
-		timer := time.Unix(0, 0)
+		// timer := time.Unix(0, 0)
 		for !s.Stoped {
 			if n, _, err := s.VConn.ReadFromUDP(bufUDP); err == nil {
-				elapsed := time.Now().Sub(timer)
-				if elapsed >= 30*time.Second {
-					Printf("Package recv from VConn.len:%d\n", n)
-					timer = time.Now()
-				}
-				rtpBytes := make([]byte, n)
+				// elapsed := time.Now().Sub(timer)
+				// if elapsed >= 30*time.Second {
+				// 	Printf("Package recv from VConn.len:%d\n", n)
+				// 	timer = time.Now()
+				// }
 				s.AddInputBytes(n)
-				copy(rtpBytes, bufUDP)
-				pack := &RTPPack{
-					Type:   RTP_TYPE_VIDEO,
-					Buffer: rtpBytes,
-				}
-				s.HandleRTP(pack)
+				var bytes []byte
+				s.Session.RtpVideo.Push(append(bytes, bufUDP[:n]...))
 			} else {
 				Println("udp server read video pack error", err)
 				continue
@@ -224,14 +203,12 @@ func (s *UDPServer) SetupVideo() (err error) {
 		for !s.Stoped {
 			if n, _, err := s.VControlConn.ReadFromUDP(bufUDP); err == nil {
 				//Printf("Package recv from VControlConn.len:%d\n", n)
-				rtpBytes := make([]byte, n)
 				s.AddInputBytes(n)
-				copy(rtpBytes, bufUDP)
-				pack := &RTPPack{
-					Type:   RTP_TYPE_VIDEOCONTROL,
-					Buffer: rtpBytes,
-				}
-				s.HandleRTP(pack)
+				// pack := RTPPack{
+				// 	Type: RTP_TYPE_VIDEOCONTROL,
+				// }
+				// pack.Unmarshal(bufUDP[:n])
+				// s.HandleRTP(pack)
 			} else {
 				Println("udp server read video control pack error", err)
 				continue

ui/dist/demo.html

@@ -1,19 +0,0 @@
-<meta charset="utf-8">
-<title>plugin-rtsp demo</title>
-<script src="https://unpkg.com/vue"></script>
-<script src="./plugin-rtsp.umd.js"></script>
-
-<link rel="stylesheet" href="./plugin-rtsp.css">
-
-
-<div id="app">
-  <demo></demo>
-</div>
-
-<script>
-new Vue({
-  components: {
-    demo: plugin-rtsp
-  }
-}).$mount('#app')
-</script>

ui/dist/plugin-rtsp.common.js

@@ -1,437 +0,0 @@
-module.exports =
-/******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__webpack_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__webpack_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __webpack_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__webpack_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "";
-/******/
-/******/
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = "fb15");
-/******/ })
-/************************************************************************/
-/******/ ({
-
-/***/ "034f":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("85ec");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
- /* unused harmony default export */ var _unused_webpack_default_export = (_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a); 
-
-/***/ }),
-
-/***/ "85ec":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-
-/***/ "f6fd":
-/***/ (function(module, exports) {
-
-// document.currentScript polyfill by Adam Miller
-
-// MIT license
-
-(function(document){
-  var currentScript = "currentScript",
-      scripts = document.getElementsByTagName('script'); // Live NodeList collection
-
-  // If browser needs currentScript polyfill, add get currentScript() to the document object
-  if (!(currentScript in document)) {
-    Object.defineProperty(document, currentScript, {
-      get: function(){
-
-        // IE 6-10 supports script readyState
-        // IE 10+ support stack trace
-        try { throw new Error(); }
-        catch (err) {
-
-          // Find the second match for the "at" string to get file src url from stack.
-          // Specifically works with the format of stack traces in IE.
-          var i, res = ((/.*at [^\(]*\((.*):.+:.+\)$/ig).exec(err.stack) || [false])[1];
-
-          // For all scripts on the page, if src matches or if ready state is interactive, return the script tag
-          for(i in scripts){
-            if(scripts[i].src == res || scripts[i].readyState == "interactive"){
-              return scripts[i];
-            }
-          }
-
-          // If no match, return null
-          return null;
-        }
-      }
-    });
-  }
-})(document);
-
-
-/***/ }),
-
-/***/ "fb15":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-// ESM COMPAT FLAG
-__webpack_require__.r(__webpack_exports__);
-
-// CONCATENATED MODULE: ./node_modules/@vue/cli-service/lib/commands/build/setPublicPath.js
-// This file is imported into lib/wc client bundles.
-
-if (typeof window !== 'undefined') {
-  if (true) {
-    __webpack_require__("f6fd")
-  }
-
-  var i
-  if ((i = window.document.currentScript) && (i = i.src.match(/(.+\/)[^/]+\.js(\?.*)?$/))) {
-    __webpack_require__.p = i[1] // eslint-disable-line
-  }
-}
-
-// Indicate to webpack that this file can be concatenated
-/* harmony default export */ var setPublicPath = (null);
-
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"29918b3a-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/App.vue?vue&type=template&id=de44c72c&
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('mu-data-table',{attrs:{"data":_vm.Streams,"columns":_vm.columns},scopedSlots:_vm._u([{key:"default",fn:function(ref){
-var item = ref.row;
-return [_c('td',[_vm._v(_vm._s(item.StreamInfo.StreamPath))]),_c('td',[_c('StartTime',{attrs:{"value":item.StreamInfo.StartTime}})],1),_c('td',[_vm._v(_vm._s(_vm.unitFormat(item.InBytes)))]),_c('td',[_vm._v(_vm._s(_vm.unitFormat(item.OutBytes)))]),_c('td',[_c('mu-button',{attrs:{"flat":""},on:{"click":function($event){return _vm.showHeader(item)}}},[_vm._v("头信息")]),_c('mu-button',{attrs:{"flat":""},on:{"click":function($event){return _vm.stop(item)}}},[_vm._v("中止")])],1)]}}])}),_c('mu-dialog',{attrs:{"title":"拉流转发","width":"360","open":_vm.openPull},on:{"update:open":function($event){_vm.openPull=$event}}},[_c('mu-text-field',{attrs:{"label":"rtsp url","label-float":"","help-text":"Please enter URL of rtsp..."},model:{value:(_vm.remoteAddr),callback:function ($$v) {_vm.remoteAddr=$$v},expression:"remoteAddr"}}),_c('mu-text-field',{attrs:{"label":"streamPath","label-float":"","help-text":"Please enter streamPath to publish."},model:{value:(_vm.streamPath),callback:function ($$v) {_vm.streamPath=$$v},expression:"streamPath"}}),_c('mu-button',{attrs:{"slot":"actions","flat":"","color":"primary"},on:{"click":_vm.addPull},slot:"actions"},[_vm._v("确定")])],1)],1)}
-var staticRenderFns = []
-
-
-// CONCATENATED MODULE: ./src/App.vue?vue&type=template&id=de44c72c&
-
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/App.vue?vue&type=script&lang=js&
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-
-let listES = null;
-/* harmony default export */ var Appvue_type_script_lang_js_ = ({
-  data() {
-    return {
-      currentStream: null,
-      Streams: null,
-      remoteAddr: "",
-      streamPath: "",
-      openPull: false,
-      columns: [
-        "StreamPath",
-        "开始时间",
-        "总接收",
-        "总发送",
-        "操作"
-      ].map(title => ({ title }))
-    };
-  },
-
-  methods: {
-    fetchlist() {
-      listES = new EventSource(this.apiHost + "/rtsp/list");
-      listES.onmessage = evt => {
-        if (!evt.data) return;
-        this.Streams = JSON.parse(evt.data) || [];
-        this.Streams.sort((a, b) =>
-          a.StreamInfo.StreamPath > b.StreamInfo.StreamPath ? 1 : -1
-        );
-      };
-    },
-    showHeader(item) {
-      this.$Modal.info({
-        title: "RTSP SDPRaw",
-        width: "1000px",
-        scrollable: true,
-        content: item.SDPRaw
-      });
-    },
-    addPull() {
-      this.openPull = false;
-      this.ajax
-        .getJSON(this.apiHost + "/rtsp/pull", {
-          target: this.remoteAddr,
-          streamPath: this.streamPath
-        })
-        .then(x => {
-          if (x.code == 0) {
-            this.$toast.success("已启动拉流");
-          } else {
-            this.$toast.error(x.msg);
-          }
-        });
-    },
-    stop(item) {
-      this.ajax
-        .get(this.apiHost + "/api/stop", {
-          stream: item.StreamInfo.StreamPath
-        })
-        .then(x => {
-          if (x == "success") {
-            this.$toast.success("已停止拉流");
-          } else {
-            this.$toast.error(x.msg);
-          }
-        });
-    }
-  },
-  mounted() {
-    this.fetchlist();
-    let _this = this;
-    this.$parent.titleOps = [
-      {
-        template: '<m-button @click="onClick">拉流转发</m-button>',
-        methods: {
-          onClick() {
-            _this.openPull = true;
-          }
-        }
-      }
-    ];
-  },
-  destroyed() {
-    listES.close();
-  }
-});
-
-// CONCATENATED MODULE: ./src/App.vue?vue&type=script&lang=js&
- /* harmony default export */ var src_Appvue_type_script_lang_js_ = (Appvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./src/App.vue?vue&type=style&index=0&lang=css&
-var Appvue_type_style_index_0_lang_css_ = __webpack_require__("034f");
-
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
-/* globals __VUE_SSR_CONTEXT__ */
-
-// IMPORTANT: Do NOT use ES2015 features in this file (except for modules).
-// This module is a runtime utility for cleaner component module output and will
-// be included in the final webpack user bundle.
-
-function normalizeComponent (
-  scriptExports,
-  render,
-  staticRenderFns,
-  functionalTemplate,
-  injectStyles,
-  scopeId,
-  moduleIdentifier, /* server only */
-  shadowMode /* vue-cli only */
-) {
-  // Vue.extend constructor export interop
-  var options = typeof scriptExports === 'function'
-    ? scriptExports.options
-    : scriptExports
-
-  // render functions
-  if (render) {
-    options.render = render
-    options.staticRenderFns = staticRenderFns
-    options._compiled = true
-  }
-
-  // functional template
-  if (functionalTemplate) {
-    options.functional = true
-  }
-
-  // scopedId
-  if (scopeId) {
-    options._scopeId = 'data-v-' + scopeId
-  }
-
-  var hook
-  if (moduleIdentifier) { // server build
-    hook = function (context) {
-      // 2.3 injection
-      context =
-        context || // cached call
-        (this.$vnode && this.$vnode.ssrContext) || // stateful
-        (this.parent && this.parent.$vnode && this.parent.$vnode.ssrContext) // functional
-      // 2.2 with runInNewContext: true
-      if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') {
-        context = __VUE_SSR_CONTEXT__
-      }
-      // inject component styles
-      if (injectStyles) {
-        injectStyles.call(this, context)
-      }
-      // register component module identifier for async chunk inferrence
-      if (context && context._registeredComponents) {
-        context._registeredComponents.add(moduleIdentifier)
-      }
-    }
-    // used by ssr in case component is cached and beforeCreate
-    // never gets called
-    options._ssrRegister = hook
-  } else if (injectStyles) {
-    hook = shadowMode
-      ? function () { injectStyles.call(this, this.$root.$options.shadowRoot) }
-      : injectStyles
-  }
-
-  if (hook) {
-    if (options.functional) {
-      // for template-only hot-reload because in that case the render fn doesn't
-      // go through the normalizer
-      options._injectStyles = hook
-      // register for functional component in vue file
-      var originalRender = options.render
-      options.render = function renderWithStyleInjection (h, context) {
-        hook.call(context)
-        return originalRender(h, context)
-      }
-    } else {
-      // inject component registration as beforeCreate hook
-      var existing = options.beforeCreate
-      options.beforeCreate = existing
-        ? [].concat(existing, hook)
-        : [hook]
-    }
-  }
-
-  return {
-    exports: scriptExports,
-    options: options
-  }
-}
-
-// CONCATENATED MODULE: ./src/App.vue
-
-
-
-
-
-
-/* normalize component */
-
-var component = normalizeComponent(
-  src_Appvue_type_script_lang_js_,
-  render,
-  staticRenderFns,
-  false,
-  null,
-  null,
-  null
-  
-)
-
-/* harmony default export */ var App = (component.exports);
-// CONCATENATED MODULE: ./node_modules/@vue/cli-service/lib/commands/build/entry-lib.js
-
-
-/* harmony default export */ var entry_lib = __webpack_exports__["default"] = (App);
-
-
-
-/***/ })
-
-/******/ })["default"];
-//# sourceMappingURL=plugin-rtsp.common.js.map

ui/dist/plugin-rtsp.css

@@ -1 +0,0 @@
-.empty{color:#eb5e46;width:100%;min-height:500px;display:flex;justify-content:center;align-items:center}.layout{padding-bottom:30px;display:flex;flex-wrap:wrap}.ts-info{width:300px}.hls-info{width:350px;display:flex;flex-direction:column}

ui/dist/plugin-rtsp.umd.js

@@ -1,447 +0,0 @@
-(function webpackUniversalModuleDefinition(root, factory) {
-	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory();
-	else if(typeof define === 'function' && define.amd)
-		define([], factory);
-	else if(typeof exports === 'object')
-		exports["plugin-rtsp"] = factory();
-	else
-		root["plugin-rtsp"] = factory();
-})((typeof self !== 'undefined' ? self : this), function() {
-return /******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__webpack_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__webpack_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __webpack_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__webpack_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "";
-/******/
-/******/
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = "fb15");
-/******/ })
-/************************************************************************/
-/******/ ({
-
-/***/ "034f":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("85ec");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
- /* unused harmony default export */ var _unused_webpack_default_export = (_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a); 
-
-/***/ }),
-
-/***/ "85ec":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-
-/***/ "f6fd":
-/***/ (function(module, exports) {
-
-// document.currentScript polyfill by Adam Miller
-
-// MIT license
-
-(function(document){
-  var currentScript = "currentScript",
-      scripts = document.getElementsByTagName('script'); // Live NodeList collection
-
-  // If browser needs currentScript polyfill, add get currentScript() to the document object
-  if (!(currentScript in document)) {
-    Object.defineProperty(document, currentScript, {
-      get: function(){
-
-        // IE 6-10 supports script readyState
-        // IE 10+ support stack trace
-        try { throw new Error(); }
-        catch (err) {
-
-          // Find the second match for the "at" string to get file src url from stack.
-          // Specifically works with the format of stack traces in IE.
-          var i, res = ((/.*at [^\(]*\((.*):.+:.+\)$/ig).exec(err.stack) || [false])[1];
-
-          // For all scripts on the page, if src matches or if ready state is interactive, return the script tag
-          for(i in scripts){
-            if(scripts[i].src == res || scripts[i].readyState == "interactive"){
-              return scripts[i];
-            }
-          }
-
-          // If no match, return null
-          return null;
-        }
-      }
-    });
-  }
-})(document);
-
-
-/***/ }),
-
-/***/ "fb15":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-// ESM COMPAT FLAG
-__webpack_require__.r(__webpack_exports__);
-
-// CONCATENATED MODULE: ./node_modules/@vue/cli-service/lib/commands/build/setPublicPath.js
-// This file is imported into lib/wc client bundles.
-
-if (typeof window !== 'undefined') {
-  if (true) {
-    __webpack_require__("f6fd")
-  }
-
-  var i
-  if ((i = window.document.currentScript) && (i = i.src.match(/(.+\/)[^/]+\.js(\?.*)?$/))) {
-    __webpack_require__.p = i[1] // eslint-disable-line
-  }
-}
-
-// Indicate to webpack that this file can be concatenated
-/* harmony default export */ var setPublicPath = (null);
-
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"29918b3a-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/App.vue?vue&type=template&id=de44c72c&
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('mu-data-table',{attrs:{"data":_vm.Streams,"columns":_vm.columns},scopedSlots:_vm._u([{key:"default",fn:function(ref){
-var item = ref.row;
-return [_c('td',[_vm._v(_vm._s(item.StreamInfo.StreamPath))]),_c('td',[_c('StartTime',{attrs:{"value":item.StreamInfo.StartTime}})],1),_c('td',[_vm._v(_vm._s(_vm.unitFormat(item.InBytes)))]),_c('td',[_vm._v(_vm._s(_vm.unitFormat(item.OutBytes)))]),_c('td',[_c('mu-button',{attrs:{"flat":""},on:{"click":function($event){return _vm.showHeader(item)}}},[_vm._v("头信息")]),_c('mu-button',{attrs:{"flat":""},on:{"click":function($event){return _vm.stop(item)}}},[_vm._v("中止")])],1)]}}])}),_c('mu-dialog',{attrs:{"title":"拉流转发","width":"360","open":_vm.openPull},on:{"update:open":function($event){_vm.openPull=$event}}},[_c('mu-text-field',{attrs:{"label":"rtsp url","label-float":"","help-text":"Please enter URL of rtsp..."},model:{value:(_vm.remoteAddr),callback:function ($$v) {_vm.remoteAddr=$$v},expression:"remoteAddr"}}),_c('mu-text-field',{attrs:{"label":"streamPath","label-float":"","help-text":"Please enter streamPath to publish."},model:{value:(_vm.streamPath),callback:function ($$v) {_vm.streamPath=$$v},expression:"streamPath"}}),_c('mu-button',{attrs:{"slot":"actions","flat":"","color":"primary"},on:{"click":_vm.addPull},slot:"actions"},[_vm._v("确定")])],1)],1)}
-var staticRenderFns = []
-
-
-// CONCATENATED MODULE: ./src/App.vue?vue&type=template&id=de44c72c&
-
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/App.vue?vue&type=script&lang=js&
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-
-let listES = null;
-/* harmony default export */ var Appvue_type_script_lang_js_ = ({
-  data() {
-    return {
-      currentStream: null,
-      Streams: null,
-      remoteAddr: "",
-      streamPath: "",
-      openPull: false,
-      columns: [
-        "StreamPath",
-        "开始时间",
-        "总接收",
-        "总发送",
-        "操作"
-      ].map(title => ({ title }))
-    };
-  },
-
-  methods: {
-    fetchlist() {
-      listES = new EventSource(this.apiHost + "/rtsp/list");
-      listES.onmessage = evt => {
-        if (!evt.data) return;
-        this.Streams = JSON.parse(evt.data) || [];
-        this.Streams.sort((a, b) =>
-          a.StreamInfo.StreamPath > b.StreamInfo.StreamPath ? 1 : -1
-        );
-      };
-    },
-    showHeader(item) {
-      this.$Modal.info({
-        title: "RTSP SDPRaw",
-        width: "1000px",
-        scrollable: true,
-        content: item.SDPRaw
-      });
-    },
-    addPull() {
-      this.openPull = false;
-      this.ajax
-        .getJSON(this.apiHost + "/rtsp/pull", {
-          target: this.remoteAddr,
-          streamPath: this.streamPath
-        })
-        .then(x => {
-          if (x.code == 0) {
-            this.$toast.success("已启动拉流");
-          } else {
-            this.$toast.error(x.msg);
-          }
-        });
-    },
-    stop(item) {
-      this.ajax
-        .get(this.apiHost + "/api/stop", {
-          stream: item.StreamInfo.StreamPath
-        })
-        .then(x => {
-          if (x == "success") {
-            this.$toast.success("已停止拉流");
-          } else {
-            this.$toast.error(x.msg);
-          }
-        });
-    }
-  },
-  mounted() {
-    this.fetchlist();
-    let _this = this;
-    this.$parent.titleOps = [
-      {
-        template: '<m-button @click="onClick">拉流转发</m-button>',
-        methods: {
-          onClick() {
-            _this.openPull = true;
-          }
-        }
-      }
-    ];
-  },
-  destroyed() {
-    listES.close();
-  }
-});
-
-// CONCATENATED MODULE: ./src/App.vue?vue&type=script&lang=js&
- /* harmony default export */ var src_Appvue_type_script_lang_js_ = (Appvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./src/App.vue?vue&type=style&index=0&lang=css&
-var Appvue_type_style_index_0_lang_css_ = __webpack_require__("034f");
-
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
-/* globals __VUE_SSR_CONTEXT__ */
-
-// IMPORTANT: Do NOT use ES2015 features in this file (except for modules).
-// This module is a runtime utility for cleaner component module output and will
-// be included in the final webpack user bundle.
-
-function normalizeComponent (
-  scriptExports,
-  render,
-  staticRenderFns,
-  functionalTemplate,
-  injectStyles,
-  scopeId,
-  moduleIdentifier, /* server only */
-  shadowMode /* vue-cli only */
-) {
-  // Vue.extend constructor export interop
-  var options = typeof scriptExports === 'function'
-    ? scriptExports.options
-    : scriptExports
-
-  // render functions
-  if (render) {
-    options.render = render
-    options.staticRenderFns = staticRenderFns
-    options._compiled = true
-  }
-
-  // functional template
-  if (functionalTemplate) {
-    options.functional = true
-  }
-
-  // scopedId
-  if (scopeId) {
-    options._scopeId = 'data-v-' + scopeId
-  }
-
-  var hook
-  if (moduleIdentifier) { // server build
-    hook = function (context) {
-      // 2.3 injection
-      context =
-        context || // cached call
-        (this.$vnode && this.$vnode.ssrContext) || // stateful
-        (this.parent && this.parent.$vnode && this.parent.$vnode.ssrContext) // functional
-      // 2.2 with runInNewContext: true
-      if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') {
-        context = __VUE_SSR_CONTEXT__
-      }
-      // inject component styles
-      if (injectStyles) {
-        injectStyles.call(this, context)
-      }
-      // register component module identifier for async chunk inferrence
-      if (context && context._registeredComponents) {
-        context._registeredComponents.add(moduleIdentifier)
-      }
-    }
-    // used by ssr in case component is cached and beforeCreate
-    // never gets called
-    options._ssrRegister = hook
-  } else if (injectStyles) {
-    hook = shadowMode
-      ? function () { injectStyles.call(this, this.$root.$options.shadowRoot) }
-      : injectStyles
-  }
-
-  if (hook) {
-    if (options.functional) {
-      // for template-only hot-reload because in that case the render fn doesn't
-      // go through the normalizer
-      options._injectStyles = hook
-      // register for functional component in vue file
-      var originalRender = options.render
-      options.render = function renderWithStyleInjection (h, context) {
-        hook.call(context)
-        return originalRender(h, context)
-      }
-    } else {
-      // inject component registration as beforeCreate hook
-      var existing = options.beforeCreate
-      options.beforeCreate = existing
-        ? [].concat(existing, hook)
-        : [hook]
-    }
-  }
-
-  return {
-    exports: scriptExports,
-    options: options
-  }
-}
-
-// CONCATENATED MODULE: ./src/App.vue
-
-
-
-
-
-
-/* normalize component */
-
-var component = normalizeComponent(
-  src_Appvue_type_script_lang_js_,
-  render,
-  staticRenderFns,
-  false,
-  null,
-  null,
-  null
-  
-)
-
-/* harmony default export */ var App = (component.exports);
-// CONCATENATED MODULE: ./node_modules/@vue/cli-service/lib/commands/build/entry-lib.js
-
-
-/* harmony default export */ var entry_lib = __webpack_exports__["default"] = (App);
-
-
-
-/***/ })
-
-/******/ })["default"];
-});
-//# sourceMappingURL=plugin-rtsp.umd.js.map

ui/dist/plugin-rtsp.umd.min.js

@@ -1,2 +0,0 @@
-(function(t,e){"object"===typeof exports&&"object"===typeof module?module.exports=e():"function"===typeof define&&define.amd?define([],e):"object"===typeof exports?exports["plugin-rtsp"]=e():t["plugin-rtsp"]=e()})("undefined"!==typeof self?self:this,(function(){return function(t){var e={};function r(n){if(e[n])return e[n].exports;var o=e[n]={i:n,l:!1,exports:{}};return t[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}return r.m=t,r.c=e,r.d=function(t,e,n){r.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:n})},r.r=function(t){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},r.t=function(t,e){if(1&e&&(t=r(t)),8&e)return t;if(4&e&&"object"===typeof t&&t&&t.__esModule)return t;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var o in t)r.d(n,o,function(e){return t[e]}.bind(null,o));return n},r.n=function(t){var e=t&&t.__esModule?function(){return t["default"]}:function(){return t};return r.d(e,"a",e),e},r.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},r.p="",r(r.s="fb15")}({"034f":function(t,e,r){"use strict";var n=r("85ec"),o=r.n(n);o.a},"85ec":function(t,e,r){},f6fd:function(t,e){(function(t){var e="currentScript",r=t.getElementsByTagName("script");e in t||Object.defineProperty(t,e,{get:function(){try{throw new Error}catch(n){var t,e=(/.*at [^\(]*\((.*):.+:.+\)$/gi.exec(n.stack)||[!1])[1];for(t in r)if(r[t].src==e||"interactive"==r[t].readyState)return r[t];return null}}})})(document)},fb15:function(t,e,r){"use strict";var n;(r.r(e),"undefined"!==typeof window)&&(r("f6fd"),(n=window.document.currentScript)&&(n=n.src.match(/(.+\/)[^/]+\.js(\?.*)?$/))&&(r.p=n[1]));var o=function(){var t=this,e=t.$createElement,r=t._self._c||e;return r("div",[r("mu-data-table",{attrs:{data:t.Streams,columns:t.columns},scopedSlots:t._u([{key:"default",fn:function(e){var n=e.row;return[r("td",[t._v(t._s(n.StreamInfo.StreamPath))]),r("td",[r("StartTime",{attrs:{value:n.StreamInfo.StartTime}})],1),r("td",[t._v(t._s(t.unitFormat(n.InBytes)))]),r("td",[t._v(t._s(t.unitFormat(n.OutBytes)))]),r("td",[r("mu-button",{attrs:{flat:""},on:{click:function(e){return t.showHeader(n)}}},[t._v("头信息")]),r("mu-button",{attrs:{flat:""},on:{click:function(e){return t.stop(n)}}},[t._v("中止")])],1)]}}])}),r("mu-dialog",{attrs:{title:"拉流转发",width:"360",open:t.openPull},on:{"update:open":function(e){t.openPull=e}}},[r("mu-text-field",{attrs:{label:"rtsp url","label-float":"","help-text":"Please enter URL of rtsp..."},model:{value:t.remoteAddr,callback:function(e){t.remoteAddr=e},expression:"remoteAddr"}}),r("mu-text-field",{attrs:{label:"streamPath","label-float":"","help-text":"Please enter streamPath to publish."},model:{value:t.streamPath,callback:function(e){t.streamPath=e},expression:"streamPath"}}),r("mu-button",{attrs:{slot:"actions",flat:"",color:"primary"},on:{click:t.addPull},slot:"actions"},[t._v("确定")])],1)],1)},a=[];let s=null;var i={data(){return{currentStream:null,Streams:null,remoteAddr:"",streamPath:"",openPull:!1,columns:["StreamPath","开始时间","总接收","总发送","操作"].map(t=>({title:t}))}},methods:{fetchlist(){s=new EventSource(this.apiHost+"/rtsp/list"),s.onmessage=t=>{t.data&&(this.Streams=JSON.parse(t.data)||[],this.Streams.sort((t,e)=>t.StreamInfo.StreamPath>e.StreamInfo.StreamPath?1:-1))}},showHeader(t){this.$Modal.info({title:"RTSP SDPRaw",width:"1000px",scrollable:!0,content:t.SDPRaw})},addPull(){this.openPull=!1,this.ajax.getJSON(this.apiHost+"/rtsp/pull",{target:this.remoteAddr,streamPath:this.streamPath}).then(t=>{0==t.code?this.$toast.success("已启动拉流"):this.$toast.error(t.msg)})},stop(t){this.ajax.get(this.apiHost+"/api/stop",{stream:t.StreamInfo.StreamPath}).then(t=>{"success"==t?this.$toast.success("已停止拉流"):this.$toast.error(t.msg)})}},mounted(){this.fetchlist();let t=this;this.$parent.titleOps=[{template:'<m-button @click="onClick">拉流转发</m-button>',methods:{onClick(){t.openPull=!0}}}]},destroyed(){s.close()}},l=i;r("034f");function u(t,e,r,n,o,a,s,i){var l,u="function"===typeof t?t.options:t;if(e&&(u.render=e,u.staticRenderFns=r,u._compiled=!0),n&&(u.functional=!0),a&&(u._scopeId="data-v-"+a),s?(l=function(t){t=t||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext,t||"undefined"===typeof __VUE_SSR_CONTEXT__||(t=__VUE_SSR_CONTEXT__),o&&o.call(this,t),t&&t._registeredComponents&&t._registeredComponents.add(s)},u._ssrRegister=l):o&&(l=i?function(){o.call(this,this.$root.$options.shadowRoot)}:o),l)if(u.functional){u._injectStyles=l;var c=u.render;u.render=function(t,e){return l.call(e),c(t,e)}}else{var f=u.beforeCreate;u.beforeCreate=f?[].concat(f,l):[l]}return{exports:t,options:u}}var c=u(l,o,a,!1,null,null,null),f=c.exports;e["default"]=f}})["default"]}));
-//# sourceMappingURL=plugin-rtsp.umd.min.js.map

ui/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "dashboard",
-  "version": "1.0.0",
-  "description": "dashboard of rtsp plugin for monibuca",
-  "main": "index.js",
-  "scripts": {
-    "build": "vue-cli-service build --target lib --name plugin-rtsp"
-  },
-  "author": "dexter",
-  "license": "ISC",
-  "devDependencies": {
-    "@vue/cli-service": "^4.2.3",
-    "vue-template-compiler": "^2.6.11"
-  }
-}

ui/src/App.vue

@@ -1,147 +0,0 @@
-<template>
-  <div>
-    <mu-data-table :data="Streams" :columns="columns">
-      <template #default="{row:item}">
-        <td>{{item.StreamInfo.StreamPath}}</td>
-        <td>
-          <StartTime :value="item.StreamInfo.StartTime"></StartTime>
-        </td>
-        <td>{{unitFormat(item.InBytes)}}</td>
-        <td>{{unitFormat(item.OutBytes)}}</td>
-        <td>
-          <mu-button flat @click="showHeader(item)">头信息</mu-button>
-          <mu-button flat @click="stop(item)">中止</mu-button>
-        </td>
-      </template>
-    </mu-data-table>
-    <mu-dialog title="拉流转发" width="360" :open.sync="openPull">
-      <mu-text-field
-        v-model="remoteAddr"
-        label="rtsp url"
-        label-float
-        help-text="Please enter URL of rtsp..."
-      ></mu-text-field>
-      <mu-text-field
-        v-model="streamPath"
-        label="streamPath"
-        label-float
-        help-text="Please enter streamPath to publish."
-      ></mu-text-field>
-      <mu-button slot="actions" flat color="primary" @click="addPull">确定</mu-button>
-    </mu-dialog>
-  </div>
-</template>
-
-<script>
-let listES = null;
-export default {
-  data() {
-    return {
-      currentStream: null,
-      Streams: null,
-      remoteAddr: "",
-      streamPath: "",
-      openPull: false,
-      columns: [
-        "StreamPath",
-        "开始时间",
-        "总接收",
-        "总发送",
-        "操作"
-      ].map(title => ({ title }))
-    };
-  },
-
-  methods: {
-    fetchlist() {
-      listES = new EventSource(this.apiHost + "/rtsp/list");
-      listES.onmessage = evt => {
-        if (!evt.data) return;
-        this.Streams = JSON.parse(evt.data) || [];
-        this.Streams.sort((a, b) =>
-          a.StreamInfo.StreamPath > b.StreamInfo.StreamPath ? 1 : -1
-        );
-      };
-    },
-    showHeader(item) {
-      this.$Modal.info({
-        title: "RTSP SDPRaw",
-        width: "1000px",
-        scrollable: true,
-        content: item.SDPRaw
-      });
-    },
-    addPull() {
-      this.openPull = false;
-      this.ajax
-        .getJSON(this.apiHost + "/rtsp/pull", {
-          target: this.remoteAddr,
-          streamPath: this.streamPath
-        })
-        .then(x => {
-          if (x.code == 0) {
-            this.$toast.success("已启动拉流");
-          } else {
-            this.$toast.error(x.msg);
-          }
-        });
-    },
-    stop(item) {
-      this.ajax
-        .get(this.apiHost + "/api/stop", {
-          stream: item.StreamInfo.StreamPath
-        })
-        .then(x => {
-          if (x == "success") {
-            this.$toast.success("已停止拉流");
-          } else {
-            this.$toast.error(x.msg);
-          }
-        });
-    }
-  },
-  mounted() {
-    this.fetchlist();
-    let _this = this;
-    this.$parent.titleOps = [
-      {
-        template: '<m-button @click="onClick">拉流转发</m-button>',
-        methods: {
-          onClick() {
-            _this.openPull = true;
-          }
-        }
-      }
-    ];
-  },
-  destroyed() {
-    listES.close();
-  }
-};
-</script>
-
-<style>
-.empty {
-  color: #eb5e46;
-  width: 100%;
-  min-height: 500px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.layout {
-  padding-bottom: 30px;
-  display: flex;
-  flex-wrap: wrap;
-}
-.ts-info {
-  width: 300px;
-}
-
-.hls-info {
-  width: 350px;
-  display: flex;
-  flex-direction: column;
-}
-</style>