rollback

fix: replace client wait
Update dependencies and add audio format support
2025-09-27 03:56:08 +08:00 · 2023-11-13 17:28:29 +08:00 · 2023-11-12 12:07:14 +08:00 · 2023-11-03 14:12:05 +08:00 · 2023-10-27 09:52:19 +08:00 · 2023-10-25 10:22:29 +08:00
9 changed files with 586 additions and 385 deletions
--- a/README.en.md
+++ b/README.en.md
@@ -0,0 +1,70 @@
+_[简体中文](https://github.com/Monibuca/plugin-rtsp) | English_
+# RTSP Plugin
+
+The RTSP plugin provides the ability to push and pull the RTSP protocol and also to push and pull the RTSP protocol to remote servers.
+
+## Plugin address
+
+https://github.com/Monibuca/plugin-rtsp
+
+## Plugin introduction
+
+```go
+import (
+    _ "m7s.live/plugin/rtsp/v4"
+)
+```
+
+## Push and Pull address form
+
+```
+rtsp://localhost/live/test
+```
+- `localhost` is the m7s server domain name or IP address, and the default port `554` can be omitted, otherwise it is required to be written.
+- `live` represents `appName`
+- `test` represents `streamName`
+- `live/test` in m7s will serve as the stream identity.
+
+For example, push stream to m7s through ffmpeg
+
+```bash
+ffmpeg -i [video source] -c:v h264 -c:a aac -f rtsp rtsp://localhost/live/test
+```
+
+This will create a stream named `live/test` inside m7s.
+
+If the `live/test` stream already exists in m7s, then you can use the RTSP protocol to play it.
+
+```bash
+ffplay rtsp://localhost/live/test
+```
+
+## Configuration
+
+```yaml
+rtsp:
+    publish: # Refer to the global configuration format
+    subscribe: # Refer to the global configuration format
+    pull: # Format reference document https://m7s.live/guide/config.html#%E6%8F%92%E4%BB%B6%E9%85%8D%E7%BD%AE
+    push: # Format reference document https://m7s.live/guide/config.html#%E6%8F%92%E4%BB%B6%E9%85%8D%E7%BD%AE
+    listenaddr: :554
+    udpaddr: :8000
+    rtcpaddr: :8001
+    readbuffercount: 2048
+    writebuffercount: 2048
+```
+:::tip Configuration override
+publish and subscribe, any section not configured will use global configuration.
+:::
+
+## API
+
+### `rtsp/api/list`
+Get all RTSP streams
+
+### `rtsp/api/pull?target=[RTSP address]&streamPath=[Stream identity]&save=[0|1|2]`
+Pull the RTSP to m7s from a remote server
+- save meaning: 0, do not save; 1, save to pullonstart; 2, save to pullonsub
+- The RTSP address needs to be urlencoded to prevent special characters from affecting parsing
+### `rtsp/api/push?target=[RTSP address]&streamPath=[Stream identity]`
+Push local streams to remote servers
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+_[English](https://github.com/Monibuca/plugin-rtsp/blob/v4/README.en.md) | 简体中文_
 # RTSP插件
 rtsp插件提供rtsp协议的推拉流能力，以及向远程服务器推拉rtsp协议的能力。
 ## 插件地址
@@ -24,7 +25,7 @@ rtsp://localhost/live/test
 例如通过ffmpeg向m7s进行推流

 ```bash
-ffmpeg -i [视频源] -c:v h264 -f rtsp rtsp://localhost/live/test
+ffmpeg -i [视频源] -c:v h264 -c:a aac -f rtsp rtsp://localhost/live/test
 ```

 会在m7s内部形成一个名为live/test的流
@@ -35,35 +36,19 @@ ffmpeg -i [视频源] -c:v h264 -f rtsp rtsp://localhost/live/test
 ffplay rtsp://localhost/live/test
 ```

-
 ## 配置

 ```yaml
 rtsp:
-    publish:
-        pubaudio: true
-        pubvideo: true
-        kickexist: false
-        publishtimeout: 10
-        waitclosetimeout: 0
-    subscribe:
-        subaudio: true
-        subvideo: true
-        iframeonly: false
-        waittimeout: 10
-    pull:
-        repull: 0
-        pullonstart: false
-        pullonsubscribe: false
-        pulllist: {}
-    push:
-        repush: 0
-        pushlist: {}
+    publish: # 参考全局配置格式
+    subscribe: # 参考全局配置格式
+    pull: # 格式参考文档 https://m7s.live/guide/config.html#%E6%8F%92%E4%BB%B6%E9%85%8D%E7%BD%AE
+    push: # 格式参考文档 https://m7s.live/guide/config.html#%E6%8F%92%E4%BB%B6%E9%85%8D%E7%BD%AE
    listenaddr: :554
    udpaddr: :8000
    rtcpaddr: :8001
-    readbuffersize: 2048
-    pullprotocol: 'auto'
+    readbuffercount: 2048 # 读取缓存队列大小
+    writebuffercount: 2048 # 写出缓存队列大小
 ```
 :::tip 配置覆盖
 publish
@@ -75,8 +60,9 @@ subscribe
 ### `rtsp/api/list`
 获取所有rtsp流

-### `rtsp/api/pull?target=[RTSP地址]&streamPath=[流标识]`
+### `rtsp/api/pull?target=[RTSP地址]&streamPath=[流标识]&save=[0|1|2]`
 从远程拉取rtsp到m7s中
-
+- save含义：0、不保存；1、保存到pullonstart；2、保存到pullonsub
+- RTSP地址需要进行urlencode 防止其中的特殊字符影响解析
 ### `rtsp/api/push?target=[RTSP地址]&streamPath=[流标识]`
 将本地的流推送到远端
--- a/client.go
+++ b/client.go
@@ -1,101 +1,123 @@
 package rtsp

 import (
-	"github.com/aler9/gortsplib"
-	"github.com/aler9/gortsplib/pkg/url"
+	"context"
+	"net"
+
+	"github.com/bluenviron/gortsplib/v4"
+	"github.com/bluenviron/gortsplib/v4/pkg/base"
+	"github.com/bluenviron/gortsplib/v4/pkg/url"
 	"go.uber.org/zap"
 	"m7s.live/engine/v4"
 )

+type RTSPClient struct {
+	*gortsplib.Client `json:"-" yaml:"-"`
+	gortsplib.Transport
+	DialContext func(ctx context.Context, network, address string) (net.Conn, error) `json:"-" yaml:"-"`
+}
 type RTSPPuller struct {
 	RTSPPublisher
 	engine.Puller
-	*gortsplib.Client `json:"-"`
-	gortsplib.Transport
+	RTSPClient
+}
+
+func (p *RTSPClient) Close() error {
+	if p.Client != nil {
+		p.Client.Close()
+	}
+	return nil
+}
+
+func (p *RTSPClient) Disconnect() {
+	if p.Client != nil {
+		p.Client.Close()
+	}
 }

 func (p *RTSPPuller) Connect() error {
-	switch rtspConfig.PullProtocol {
-	case "tcp", "TCP":
-		p.Transport = gortsplib.TransportTCP
-	case "udp", "UDP":
-		p.Transport = gortsplib.TransportUDP
-	default:
-		if p.Transport == gortsplib.TransportTCP {
-			p.Transport = gortsplib.TransportUDP
-		} else {
-			p.Transport = gortsplib.TransportTCP
-		}
-	}
-	p.Client = &gortsplib.Client{
-		OnPacketRTP: func(ctx *gortsplib.ClientOnPacketRTPCtx) {
-			if p.RTSPPublisher.Tracks[ctx.TrackID] != nil {
-				p.RTSPPublisher.Tracks[ctx.TrackID].WriteRTPPack(ctx.Packet)
-			}
-		},
-		ReadBufferCount: rtspConfig.ReadBufferSize,
-		Transport:       &p.Transport,
+	client := &gortsplib.Client{
+		DialContext: p.DialContext,
+
+		AnyPortEnable: true,
 	}
+	p.Transport = gortsplib.TransportTCP
+	client.Transport = &p.Transport
 	// parse URL
 	u, err := url.Parse(p.RemoteURL)
 	if err != nil {
 		return err
 	}
 	// connect to the server
-	if err = p.Client.Start(u.Scheme, u.Host); err != nil {
+	if err = client.Start(u.Scheme, u.Host); err != nil {
 		return err
 	}
+	p.Client = client
+	p.SetIO(p)
 	return nil
 }

-func (p *RTSPPuller) Pull() {
+func (p *RTSPPuller) Pull() (err error) {
 	u, _ := url.Parse(p.RemoteURL)
-	if _, err := p.Options(u); err != nil {
-		p.Error("Options", zap.Error(err))
-		return
+	var res *base.Response
+	if rtspConfig.SendOptions {
+		if res, err = p.Options(u); err != nil {
+			p.Error("Options", zap.Error(err))
+			return
+		}
 	}
+	p.Debug("Options", zap.Any("res", res))
 	// find published tracks
-	tracks, baseURL, _, err := p.Describe(u)
+	session, res, err := p.Describe(u)
 	if err != nil {
 		p.Error("Describe", zap.Error(err))
-		return
+		return err
 	}
-	p.tracks = tracks
-	p.SetTracks()
-	if err = p.SetupAndPlay(tracks, baseURL); err != nil {
+	p.Debug("Describe", zap.Any("res", res))
+	p.session = session
+	err = p.SetTracks()
+	if err != nil {
+		p.Error("SetTracks", zap.Error(err))
+		return err
+	}
+	if err = p.SetupAll(session.BaseURL, session.Medias); err != nil {
 		p.Error("SetupAndPlay", zap.Error(err))
-		return
+		return err
 	}
-	p.Wait()
+	p.OnPacketRTPAny(p.OnPacket)
+	res, err = p.Play(nil)
+	p.Debug("Play", zap.Any("res", res))
+	if err != nil {
+		p.Error("Play", zap.Error(err))
+		return err
+	}
+	return p.Wait()
 }

 type RTSPPusher struct {
 	RTSPSubscriber
 	engine.Pusher
-	*gortsplib.Client
-	gortsplib.Transport
+	RTSPClient
 }

 func (p *RTSPPusher) OnEvent(event any) {
 	switch v := event.(type) {
 	case engine.VideoRTP:
-		p.Client.WritePacketRTP(p.videoTrackId, &v.Packet)
+		p.Client.WritePacketRTP(p.videoTrack, v.Packet)
 	case engine.AudioRTP:
-		p.Client.WritePacketRTP(p.audioTrackId, &v.Packet)
+		p.Client.WritePacketRTP(p.audioTrack, v.Packet)
 	default:
 		p.RTSPSubscriber.OnEvent(event)
 	}
 }
+
 func (p *RTSPPusher) Connect() error {
-	if p.Transport == gortsplib.TransportTCP {
-		p.Transport = gortsplib.TransportUDP
-	} else {
-		p.Transport = gortsplib.TransportTCP
-	}
 	p.Client = &gortsplib.Client{
-		ReadBufferCount: rtspConfig.ReadBufferSize,
-		Transport:       &p.Transport,
+		DialContext:    p.DialContext,
+		WriteQueueSize: rtspConfig.WriteBufferCount,
 	}
+	p.Transport = gortsplib.TransportTCP
+	p.Client.Transport = &p.Transport
 	// parse URL
 	u, err := url.Parse(p.RemoteURL)
 	if err != nil {
@@ -107,37 +129,40 @@ func (p *RTSPPusher) Connect() error {
 		p.Error("Client.Start", zap.Error(err))
 		return err
 	}
-	_, err = p.Client.Options(u)
+	p.SetIO(p)
+	if rtspConfig.SendOptions {
+		_, err = p.Client.Options(u)
+	}
 	return err
 }
+
 func (p *RTSPPusher) Push() (err error) {
 	var u *url.URL
 	u, err = url.Parse(p.RemoteURL)
-	defer func() {
-		if err != nil {
-			p.Close()
-		}
-	}()
 	// startTime := time.Now()
 	// for len(p.tracks) < 2 {
 	// 	if time.Sleep(time.Second); time.Since(startTime) > time.Second*10 {
 	// 		return fmt.Errorf("timeout")
 	// 	}
 	// }
-	if _, err = p.Announce(u, p.tracks); err != nil {
+	var res *base.Response
+	if res, err = p.Announce(u, p.session); err != nil {
 		p.Error("Announce", zap.Error(err))
 		return
+	} else {
+		p.Debug("Announce", zap.Any("res", res))
 	}
-	for _, track := range p.tracks {
-		_, err = p.Setup(track, u, 0, 0)
-		if err != nil {
-			p.Error("Setup", zap.Error(err))
-			return
-		}
+	err = p.SetupAll(u, p.session.Medias)
+	if err != nil {
+		p.Error("Setup", zap.Error(err))
+		return
 	}
-	if _, err = p.Record(); err != nil {
+
+	if res, err = p.Record(); err != nil {
 		p.Error("Record", zap.Error(err))
 		return
+	} else {
+		p.Debug("Record", zap.Any("res", res))
 	}
 	p.PlayRTP()
 	return
--- a/go.mod
+++ b/go.mod
@@ -3,46 +3,47 @@ module m7s.live/plugin/rtsp/v4
 go 1.18

 require (
-	github.com/aler9/gortsplib v0.0.0-20221115222755-87d5a512b129
-	go.uber.org/zap v1.23.0
-	m7s.live/engine/v4 v4.8.4
+	github.com/bluenviron/gortsplib/v4 v4.3.0
+	github.com/bluenviron/mediacommon v1.5.0
+	github.com/pion/rtp v1.8.2
+	go.uber.org/zap v1.24.0
+	m7s.live/engine/v4 v4.13.12
 )

 require (
 	github.com/cnotch/ipchub v1.1.0 // indirect
-	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/denisbrodbeck/machineid v1.0.1 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/golang/mock v1.6.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/kr/text v0.2.0 // indirect
-	github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
-	github.com/lucas-clemente/quic-go v0.29.2 // indirect
-	github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
-	github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
-	github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
-	github.com/onsi/ginkgo v1.16.4 // indirect
+	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
+	github.com/google/uuid v1.4.0 // indirect
+	github.com/logrusorgru/aurora/v4 v4.0.0 // indirect
+	github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect
+	github.com/mcuadros/go-defaults v1.2.0 // indirect
+	github.com/onsi/ginkgo/v2 v2.9.5 // indirect
 	github.com/pion/randutil v0.1.0 // indirect
 	github.com/pion/rtcp v1.2.10 // indirect
-	github.com/pion/rtp v1.7.13 // indirect
 	github.com/pion/sdp/v3 v3.0.6 // indirect
-	github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
-	github.com/q191201771/naza v0.30.8 // indirect
-	github.com/shirou/gopsutil/v3 v3.22.10 // indirect
+	github.com/pion/webrtc/v3 v3.2.14 // indirect
+	github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
+	github.com/q191201771/naza v0.30.11 // indirect
+	github.com/quic-go/qtls-go1-20 v0.3.1 // indirect
+	github.com/quic-go/quic-go v0.37.4 // indirect
+	github.com/shirou/gopsutil/v3 v3.23.7 // indirect
+	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/tklauser/go-sysconf v0.3.11 // indirect
 	github.com/tklauser/numcpus v0.6.0 // indirect
-	github.com/yusufpapurcu/wmi v1.2.2 // indirect
+	github.com/yapingcat/gomedia v0.0.0-20230727105416-c491e66c9d2a // indirect
+	github.com/yusufpapurcu/wmi v1.2.3 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
-	go.uber.org/multierr v1.8.0 // indirect
-	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
-	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
-	golang.org/x/net v0.2.0 // indirect
-	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.2.0 // indirect
-	golang.org/x/tools v0.1.10 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect
+	golang.org/x/mod v0.10.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sync v0.2.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/tools v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,12 @@
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/aler9/gortsplib v0.0.0-20221115222755-87d5a512b129 h1:CG96FPsxizdlpsRIsjU2xQR6G3QC0sPK+f+AeVEr0Tg=
-github.com/aler9/gortsplib v0.0.0-20221115222755-87d5a512b129/go.mod h1:BOWNZ/QBkY/eVcRqUzJbPFEsRJshwxaxBT01K260Jeo=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
+github.com/bluenviron/gortsplib/v4 v4.3.0 h1:wYtXickYP9zkCxbBIt2WEseQPX0wROB+K0DAew4Ls7g=
+github.com/bluenviron/gortsplib/v4 v4.3.0/go.mod h1:4XBcXsbK4MDFqnraexSDeKj++ZzrSd81CVplSpSNqKk=
+github.com/bluenviron/mediacommon v1.5.0 h1:lS0YKNo22ZOyCsYcLh3jn3TgUALqYw0f7RVwalC09vI=
+github.com/bluenviron/mediacommon v1.5.0/go.mod h1:Ij/kE1LEucSjryNBVTyPL/gBI0d6/Css3f5PyrM957w=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/cnotch/apirouter v0.0.0-20200731232942-89e243a791f3/go.mod h1:5deJPLON/x/s2dLOQfuKS0lenhOIT4xX0pvtN/OEIuY=
 github.com/cnotch/ipchub v1.1.0 h1:hH0lh2mU3AZXPiqMwA0pdtqrwo7PFIMRGush9OobMUs=
 github.com/cnotch/ipchub v1.1.0/go.mod h1:2PbeBs2q2VxxTVCn1eYCDwpAWuVXbq1+N0FU7GimOH4=
@@ -10,18 +15,20 @@ github.com/cnotch/queue v0.0.0-20200326024423-6e88bdbf2ad4/go.mod h1:zOssjAlNusO
 github.com/cnotch/queue v0.0.0-20201224060551-4191569ce8f6/go.mod h1:zOssjAlNusOxvtaqT+EMA+Iyi8rrtKr4/XfzN1Fgoeg=
 github.com/cnotch/scheduler v0.0.0-20200522024700-1d2da93eefc5/go.mod h1:F4GE3SZkJZ8an1Y0ZCqvSM3jeozNuKzoC67erG1PhIo=
 github.com/cnotch/xlog v0.0.0-20201208005456-cfda439cd3a0/go.mod h1:RW9oHsR79ffl3sR3yMGgxYupMn2btzdtJUwoxFPUE5E=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/denisbrodbeck/machineid v1.0.1 h1:geKr9qtkB876mXguW2X6TU4ZynleN6ezuMSRhl4D7AQ=
+github.com/denisbrodbeck/machineid v1.0.1/go.mod h1:dJUwb7PTidGDeYyUBmXZ2GphQBbjJCrnectwCyxcUSI=
 github.com/emitter-io/address v1.0.0/go.mod h1:GfZb5+S/o8694B1GMGK2imUYQyn2skszMvGNA5D84Ug=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -30,124 +37,180 @@ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:x
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
+github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/kelindar/process v0.0.0-20170730150328-69a29e249ec3/go.mod h1:+lTCLnZFXOkqwD8sLPl6u4erAc0cP8wFegQHfipz7KE=
 github.com/kelindar/rate v1.0.0/go.mod h1:AjT4G+hTItNwt30lucEGZIz8y7Uk5zPho6vurIZ+1Es=
 github.com/kelindar/tcp v1.0.0/go.mod h1:JB5hj1cshLU60XrLij2BBxW3JQ4hOye8vqbyvuKb52k=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-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/lucas-clemente/quic-go v0.29.2 h1:O8Mt0O6LpvEW+wfC40vZdcw0DngwYzoxq5xULZNzSI8=
-github.com/lucas-clemente/quic-go v0.29.2/go.mod h1:g6/h9YMmLuU54tL1gW25uIi3VlBp3uv+sBihplIuskE=
+github.com/logrusorgru/aurora/v4 v4.0.0 h1:sRjfPpun/63iADiSvGGjgA1cAYegEWMPCJdUpJYn9JA=
+github.com/logrusorgru/aurora/v4 v4.0.0/go.mod h1:lP0iIa2nrnT/qoFXcOZSrZQpJ1o6n2CUf/hyHi2Q4ZQ=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
-github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c h1:VtwQ41oftZwlMnOEbMWQtSEUgU64U4s+GHk7hZK+jtY=
-github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c/go.mod h1:JKx41uQRwqlTZabZc+kILPrO/3jlKnQ2Z8b7YiVw5cE=
-github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDAl7TTQf5h7TI=
-github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
-github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE=
-github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
+github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a h1:N9zuLhTvBSRt0gWSiJswwQ2HqDmtX/ZCDJURnKUt1Ik=
+github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a/go.mod h1:JKx41uQRwqlTZabZc+kILPrO/3jlKnQ2Z8b7YiVw5cE=
+github.com/mcuadros/go-defaults v1.2.0 h1:FODb8WSf0uGaY8elWJAkoLL0Ri6AlZ1bFlenk56oZtc=
+github.com/mcuadros/go-defaults v1.2.0/go.mod h1:WEZtHEVIGYVDqkKSWBdWKUVdRyKlMfulPaGDWIVeCWY=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
+github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak=
+github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
+github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
+github.com/pion/datachannel v1.5.5/go.mod h1:iMz+lECmfdCMqFRhXhcA/219B0SQlbpoR2V118yimL0=
+github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s=
+github.com/pion/ice/v2 v2.3.9/go.mod h1:lT3kv5uUIlHfXHU/ZRD7uKD/ufM202+eTa3C/umgGf4=
+github.com/pion/interceptor v0.1.17/go.mod h1:SY8kpmfVBvrbUzvj2bsXz7OJt5JvmVNZ+4Kjq7FcwrI=
+github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
+github.com/pion/mdns v0.0.7/go.mod h1:4iP2UbeFhLI/vWju/bw6ZfwjJzk0z8DNValjGxR/dD8=
 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/rtcp v1.2.10 h1:nkr3uj+8Sp97zyItdN60tE/S6vk4al5CPRR6Gejsdjc=
 github.com/pion/rtcp v1.2.10/go.mod h1:ztfEwXZNLGyF1oQDttz/ZKIBaeeg/oWbRYqzBM9TL1I=
 github.com/pion/rtp v1.6.2/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
-github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA=
 github.com/pion/rtp v1.7.13/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
+github.com/pion/rtp v1.8.0/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU=
+github.com/pion/rtp v1.8.2 h1:oKMM0K1/QYQ5b5qH+ikqDSZRipP5mIxPJcgcvw5sH0w=
+github.com/pion/rtp v1.8.2/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU=
+github.com/pion/sctp v1.8.5/go.mod h1:SUFFfDpViyKejTAdwD1d/HQsCu+V/40cCs2nZIvC3s0=
+github.com/pion/sctp v1.8.7/go.mod h1:g1Ul+ARqZq5JEmoFy87Q/4CePtKnTJ1QCL9dBBdN6AU=
 github.com/pion/sdp/v3 v3.0.6 h1:WuDLhtuFUUVpTfus9ILC4HRyHsW6TdugjEX/QY9OiUw=
 github.com/pion/sdp/v3 v3.0.6/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw=
+github.com/pion/srtp/v2 v2.0.16/go.mod h1:NCLCV+U+NpxQ+vXhfOETet4OgKioIgrFjZmIM3ldJYE=
+github.com/pion/stun v0.6.1/go.mod h1:/hO7APkX4hZKu/D0f2lHzNyvdkTGtIy3NDmLR7kSz/8=
+github.com/pion/transport v0.14.1/go.mod h1:4tGmbk00NeYA3rUa9+n+dzCCoKkcy3YlYb99Jn2fNnI=
+github.com/pion/transport/v2 v2.0.0/go.mod h1:HS2MEBJTwD+1ZI2eSXSvHJx/HnzQqRy2/LXxt6eVMHc=
+github.com/pion/transport/v2 v2.1.0/go.mod h1:AdSw4YBZVDkZm8fpoz+fclXyQwANWmZAlDuQdctTThQ=
+github.com/pion/transport/v2 v2.2.0/go.mod h1:AdSw4YBZVDkZm8fpoz+fclXyQwANWmZAlDuQdctTThQ=
+github.com/pion/transport/v2 v2.2.1/go.mod h1:cXXWavvCnFF6McHTft3DWS9iic2Mftcz1Aq29pGcU5g=
+github.com/pion/turn/v2 v2.1.2/go.mod h1:1kjnPkBcex3dhCU2Am+AAmxDcGhLX3WnMfmkNpvSTQU=
+github.com/pion/webrtc/v3 v3.2.14 h1:GlqnBnnLlcYYA/LOwqLLU1plZYwx0Y/e/57bZ2tzQcU=
+github.com/pion/webrtc/v3 v3.2.14/go.mod h1:r1mtixc2MH847mmQTPwlEvGge7D18C2T5qp8jI9Lm44=
 github.com/pixelbender/go-sdp v1.1.0/go.mod h1:6IBlz9+BrUHoFTea7gcp4S54khtOhjCW/nVDLhmZBAs=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 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/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkBTKvR5gQLgA3e0hqjkY9u1wm+iOL45VN/qI=
-github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/q191201771/naza v0.30.8 h1:Lhh29o65C4PmTDj2l+eKfsw9dddpgWZk4bFICtcnSaA=
-github.com/q191201771/naza v0.30.8/go.mod h1:n+dpJjQSh90PxBwxBNuifOwQttywvSIN5TkWSSYCeBk=
-github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
-github.com/shirou/gopsutil/v3 v3.22.10 h1:4KMHdfBRYXGF9skjDWiL4RA2N+E8dRdodU/bOZpPoVg=
-github.com/shirou/gopsutil/v3 v3.22.10/go.mod h1:QNza6r4YQoydyCfo6rH0blGfKahgibh4dQmV5xdFkQk=
+github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b h1:0LFwY6Q3gMACTjAbMZBjXAqTOzOwFaj2Ld6cjeQ7Rig=
+github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
+github.com/q191201771/naza v0.30.11 h1:az4PkAAFMA2szF6eoVJXrnProgLHV41n3IRuQSaO6mQ=
+github.com/q191201771/naza v0.30.11/go.mod h1:n+dpJjQSh90PxBwxBNuifOwQttywvSIN5TkWSSYCeBk=
+github.com/quic-go/qtls-go1-20 v0.3.1 h1:O4BLOM3hwfVF3AcktIylQXyl7Yi2iBNVy5QsV+ySxbg=
+github.com/quic-go/qtls-go1-20 v0.3.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
+github.com/quic-go/quic-go v0.37.4 h1:ke8B73yMCWGq9MfrCCAw0Uzdm7GaViC3i39dsIdDlH4=
+github.com/quic-go/quic-go v0.37.4/go.mod h1:YsbH1r4mSHPJcLF4k4zruUkLBqctEMBDR6VPvcYjIsU=
+github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
+github.com/shirou/gopsutil/v3 v3.23.7 h1:C+fHO8hfIppoJ1WdsVm1RoI0RwXoNdfTK7yWXV0wVj4=
+github.com/shirou/gopsutil/v3 v3.23.7/go.mod h1:c4gnmoRC0hQuaLqvxnx1//VXQ0Ms/X9UnJF8pddY5z4=
+github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
+github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
+github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
+github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
 github.com/sqs/goreturns v0.0.0-20181028201513-538ac6014518/go.mod h1:CKI4AZ4XmGV240rTHfO0hfE83S6/a3/Q1siZJ/vXf7A=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
 github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
-github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
 github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms=
 github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4=
+github.com/yapingcat/gomedia v0.0.0-20230727105416-c491e66c9d2a h1:x60q0A7QmoUTzixNz7zVTdEA9JC0oYqm8S51PdbTWgs=
+github.com/yapingcat/gomedia v0.0.0-20230727105416-c491e66c9d2a/go.mod h1:WSZ59bidJOO40JSJmLqlkBJrjZCtjbKKkygEMfzY/kc=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
-github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw=
+github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
-go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
-go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
-go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY=
-go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
+go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
+golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
+golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
+golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/exp v0.0.0-20221205204356-47842c84f3db h1:D/cFflL63o2KSLJIwjlcIt8PR064j/xsmdEJL/YvY/o=
+golang.org/x/exp v0.0.0-20221205204356-47842c84f3db/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
-golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
+golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
-golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
+golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
+golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
+golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 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=
@@ -156,54 +219,87 @@ golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
+golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo=
+golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20=
-golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
+golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-m7s.live/engine/v4 v4.8.4 h1:yV8S1w6PqAle6xhcOnVpla84m+rE5e0z74OUAAsVv1A=
-m7s.live/engine/v4 v4.8.4/go.mod h1:Knz1H4ZhJDooORkHOuHGNquSyA4txJFgVCng5rTEAm8=
+m7s.live/engine/v4 v4.13.12 h1:GYdIPlvwkS57DbZGvQxgMJIKL+hyYZpOv/8qNjGbY6E=
+m7s.live/engine/v4 v4.13.12/go.mod h1:cRR/WOZbPSAQfYxIHuCkj1YMg+C54CYlFpOJ88q+OG4=
--- a/main.go
+++ b/main.go
@@ -2,10 +2,10 @@ package rtsp

 import (
 	"net/http"
+	"strconv"
 	"sync"
-	"time"

-	"github.com/aler9/gortsplib"
+	"github.com/bluenviron/gortsplib/v4"
 	"go.uber.org/zap"
 	. "m7s.live/engine/v4"
 	"m7s.live/engine/v4/config"
@@ -17,18 +17,19 @@ type RTSPConfig struct {
 	config.Subscribe
 	config.Pull
 	config.Push
-	ListenAddr     string
-	UDPAddr        string
-	RTCPAddr       string
-	ReadBufferSize int
-	PullProtocol   string //tcp、udp、 auto（default）
+	ListenAddr       string `default:":554"`
+	UDPAddr          string `default:":8000"`
+	RTCPAddr         string `default:":8001"`
+	WriteBufferCount int    `default:"2048"`
+	SendOptions      bool   `default:"true"`
 	sync.Map
+	server *gortsplib.Server
 }

 func (conf *RTSPConfig) OnEvent(event any) {
 	switch v := event.(type) {
 	case FirstConfig:
-		s := &gortsplib.Server{
+		conf.server = &gortsplib.Server{
 			Handler:           conf,
 			RTSPAddress:       conf.ListenAddr,
 			UDPRTPAddress:     conf.UDPAddr,
@@ -36,78 +37,66 @@ func (conf *RTSPConfig) OnEvent(event any) {
 			MulticastIPRange:  "224.1.0.0/16",
 			MulticastRTPPort:  8002,
 			MulticastRTCPPort: 8003,
+			WriteQueueSize:    conf.WriteBufferCount,
 		}
-		if err := s.Start(); err != nil {
+		if err := conf.server.Start(); err != nil {
 			RTSPPlugin.Error("server start", zap.Error(err))
-			v["enable"] = false
+			RTSPPlugin.Disabled = true
 		}
-		if conf.PullOnStart {
-			for streamPath, url := range conf.PullList {
-				if err := RTSPPlugin.Pull(streamPath, url, new(RTSPPuller), false); err != nil {
-					RTSPPlugin.Error("pull", zap.String("streamPath", streamPath), zap.String("url", url), zap.Error(err))
-				}
+		for streamPath, url := range conf.PullOnStart {
+			if err := RTSPPlugin.Pull(streamPath, url, new(RTSPPuller), 0); err != nil {
+				RTSPPlugin.Error("pull", zap.String("streamPath", streamPath), zap.String("url", url), zap.Error(err))
 			}
 		}
 	case SEpublish:
-		for streamPath, url := range conf.PushList {
-			if streamPath == v.Stream.Path {
-				if err := RTSPPlugin.Push(streamPath, url, new(RTSPPusher), false); err != nil {
-					RTSPPlugin.Error("push", zap.String("streamPath", streamPath), zap.String("url", url), zap.Error(err))
-				}
+		if remoteURL := conf.CheckPush(v.Target.Path); remoteURL != "" {
+			if err := RTSPPlugin.Push(v.Target.Path, remoteURL, new(RTSPPusher), false); err != nil {
+				RTSPPlugin.Error("push", zap.String("streamPath", v.Target.Path), zap.String("url", remoteURL), zap.Error(err))
 			}
 		}
-	case *Stream: //按需拉流
-		if conf.PullOnSubscribe {
-			for streamPath, url := range conf.PullList {
-				if streamPath == v.Path {
-					if err := RTSPPlugin.Pull(streamPath, url, new(RTSPPuller), false); err != nil {
-						RTSPPlugin.Error("pull", zap.String("streamPath", streamPath), zap.String("url", url), zap.Error(err))
-					}
-					break
-				}
+	case InvitePublish: //按需拉流
+		if remoteURL := conf.CheckPullOnSub(v.Target); remoteURL != "" {
+			if err := RTSPPlugin.Pull(v.Target, remoteURL, new(RTSPPuller), 0); err != nil {
+				RTSPPlugin.Error("pull", zap.String("streamPath", v.Target), zap.String("url", remoteURL), zap.Error(err))
 			}
 		}
 	}
 }

-var rtspConfig = &RTSPConfig{
-	ListenAddr:     ":554",
-	UDPAddr:        ":8000",
-	RTCPAddr:       ":8001",
-	ReadBufferSize: 2048,
-}
+var rtspConfig = &RTSPConfig{}
 var RTSPPlugin = InstallPlugin(rtspConfig)

 func filterStreams() (ss []*Stream) {
-	Streams.RLock()
-	defer Streams.RUnlock()
-	for _, s := range Streams.Map {
+	Streams.Range(func(key string, s *Stream) {
 		switch s.Publisher.(type) {
 		case *RTSPPublisher, *RTSPPuller:
 			ss = append(ss, s)
 		}
-	}
+	})
 	return
 }

 func (*RTSPConfig) API_list(w http.ResponseWriter, r *http.Request) {
-	util.ReturnJson(filterStreams, time.Second, w, r)
+	util.ReturnFetchValue(filterStreams, w, r)
 }

 func (*RTSPConfig) API_Pull(rw http.ResponseWriter, r *http.Request) {
-	err := RTSPPlugin.Pull(r.URL.Query().Get("streamPath"), r.URL.Query().Get("target"), new(RTSPPuller), r.URL.Query().Has("save"))
+	query := r.URL.Query()
+	save, _ := strconv.Atoi(query.Get("save"))
+	err := RTSPPlugin.Pull(query.Get("streamPath"), query.Get("target"), new(RTSPPuller), save)
 	if err != nil {
-		http.Error(rw, err.Error(), http.StatusBadRequest)
+		util.ReturnError(util.APIErrorQueryParse, err.Error(), rw, r)
 	} else {
-		rw.Write([]byte("ok"))
+		util.ReturnOK(rw, r)
 	}
 }

 func (*RTSPConfig) API_Push(rw http.ResponseWriter, r *http.Request) {
-	err := RTSPPlugin.Push(r.URL.Query().Get("streamPath"), r.URL.Query().Get("target"), new(RTSPPusher), r.URL.Query().Has("save"))
+	query := r.URL.Query()
+	err := RTSPPlugin.Push(query.Get("streamPath"), query.Get("target"), new(RTSPPusher), query.Has("save"))
 	if err != nil {
-		http.Error(rw, err.Error(), http.StatusBadRequest)
+		util.ReturnError(util.APIErrorQueryParse, err.Error(), rw, r)
 	} else {
-		rw.Write([]byte("ok"))
+		util.ReturnOK(rw, r)
 	}
 }
--- a/publisher.go
+++ b/publisher.go
@@ -1,14 +1,13 @@
 package rtsp

 import (
-	"encoding/base64"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"strconv"
 	"strings"

-	"github.com/aler9/gortsplib"
+	"github.com/bluenviron/gortsplib/v4/pkg/description"
+	"github.com/bluenviron/gortsplib/v4/pkg/format"
+	"github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio"
+	"github.com/pion/rtp"
+	"go.uber.org/zap"
 	. "m7s.live/engine/v4"
 	"m7s.live/engine/v4/common"
 	. "m7s.live/engine/v4/track"
@@ -16,122 +15,105 @@ import (

 type RTSPPublisher struct {
 	Publisher
-	Tracks []common.AVTrack `json:"-"`
+	Tracks map[*description.Media]common.AVTrack `json:"-" yaml:"-"`
 	RTSPIO
 }

 func (p *RTSPPublisher) SetTracks() error {
-	p.Tracks = make([]common.AVTrack, len(p.tracks))
-	for trackId, track := range p.tracks {
-		md := track.MediaDescription()
-		v, ok := md.Attribute("rtpmap")
-		if !ok {
-			return errors.New("rtpmap attribute not found")
+	p.Tracks = make(map[*description.Media]common.AVTrack, len(p.session.Medias))
+	defer func() {
+		for _, track := range p.Tracks {
+			p.Info("set track", zap.String("name", track.GetName()))
 		}
-		v = strings.TrimSpace(v)
-		vals := strings.Split(v, " ")
-		if len(vals) != 2 {
-			continue
-		}
-		fmtp := make(map[string]string)
-		if v, ok = md.Attribute("fmtp"); ok {
-			if tmp := strings.SplitN(v, " ", 2); len(tmp) == 2 {
-				for _, kv := range strings.Split(tmp[1], ";") {
-					kv = strings.Trim(kv, " ")
-
-					if len(kv) == 0 {
-						continue
+	}()
+	for _, track := range p.session.Medias {
+		for _, forma := range track.Formats {
+			switch f := forma.(type) {
+			case *format.H264:
+				vt := p.VideoTrack
+				if vt == nil {
+					vt = NewH264(p.Stream, f.PayloadType())
+					p.VideoTrack = vt
+				}
+				p.Tracks[track] = p.VideoTrack
+				if len(f.SPS) > 0 {
+					vt.WriteSliceBytes(f.SPS)
+				}
+				if len(f.PPS) > 0 {
+					vt.WriteSliceBytes(f.PPS)
+				}
+			case *format.H265:
+				vt := p.VideoTrack
+				if vt == nil {
+					vt = NewH265(p.Stream, f.PayloadType())
+					p.VideoTrack = vt
+				}
+				p.Tracks[track] = p.VideoTrack
+				if len(f.VPS) > 0 {
+					vt.WriteSliceBytes(f.VPS)
+				}
+				if len(f.SPS) > 0 {
+					vt.WriteSliceBytes(f.SPS)
+				}
+				if len(f.PPS) > 0 {
+					vt.WriteSliceBytes(f.PPS)
+				}
+			case *format.MPEG4Audio:
+				at := p.AudioTrack
+				if at == nil {
+					at := NewAAC(p.Stream, f.PayloadType(), uint32(f.Config.SampleRate))
+					at.IndexDeltaLength = f.IndexDeltaLength
+					at.IndexLength = f.IndexLength
+					at.SizeLength = f.SizeLength
+					if f.Config.Type == mpeg4audio.ObjectTypeAACLC {
+						at.Mode = 1
 					}
-					tmp := strings.SplitN(kv, "=", 2)
-					if len(tmp) == 2 {
-						fmtp[strings.TrimSpace(tmp[0])] = tmp[1]
-					}
-				}
-			}
-		}
-		timeScale := 0
-		keyval := strings.Split(vals[1], "/")
-		if i, err := strconv.Atoi(keyval[1]); err == nil {
-			timeScale = i
-		}
-		if len(keyval) >= 2 {
-			switch strings.ToLower(keyval[0]) {
-			case "h264":
-				vt := NewH264(p.Stream)
-				if payloadType, err := strconv.Atoi(vals[0]); err == nil {
-					vt.DecoderConfiguration.PayloadType = byte(payloadType)
-				}
-				p.Tracks[trackId] = vt
-				t := track.(*gortsplib.TrackH264)
-				if len(t.SPS) > 0 {
-					vt.WriteSlice(common.NALUSlice{t.SPS})
-				}
-				if len(t.PPS) > 0 {
-					vt.WriteSlice(common.NALUSlice{t.PPS})
-				}
-			case "h265", "hevc":
-				vt := NewH265(p.Stream)
-				if payloadType, err := strconv.Atoi(vals[0]); err == nil {
-					vt.DecoderConfiguration.PayloadType = byte(payloadType)
-				}
-				p.Tracks[trackId] = vt
-				if v, ok := fmtp["sprop-vps"]; ok {
-					vps, _ := base64.StdEncoding.DecodeString(v)
-					vt.WriteSlice(common.NALUSlice{vps})
-				}
-				if v, ok := fmtp["sprop-sps"]; ok {
-					sps, _ := base64.StdEncoding.DecodeString(v)
-					vt.WriteSlice(common.NALUSlice{sps})
-				}
-				if v, ok := fmtp["sprop-pps"]; ok {
-					pps, _ := base64.StdEncoding.DecodeString(v)
-					vt.WriteSlice(common.NALUSlice{pps})
-				}
-			case "pcma":
-				at := NewG711(p.Stream, true)
-				if payloadType, err := strconv.Atoi(vals[0]); err == nil {
-					at.DecoderConfiguration.PayloadType = byte(payloadType)
-				}
-				p.Tracks[trackId] = at
-				at.SampleRate = uint32(timeScale)
-				if len(keyval) >= 3 {
-					x, _ := strconv.Atoi(keyval[2])
-					at.Channels = byte(x)
-				} else {
-					at.Channels = 1
-				}
-				at.AVCCHead = []byte{(byte(at.CodecID) << 4) | (1 << 1)}
-			case "pcmu":
-				at := NewG711(p.Stream, false)
-				if payloadType, err := strconv.Atoi(vals[0]); err == nil {
-					at.DecoderConfiguration.PayloadType = byte(payloadType)
-				}
-				p.Tracks[trackId] = at
-				at.SampleRate = uint32(timeScale)
-				if len(keyval) >= 3 {
-					x, _ := strconv.Atoi(keyval[2])
-					at.Channels = byte(x)
-				} else {
-					at.Channels = 1
-				}
-				at.AVCCHead = []byte{(byte(at.CodecID) << 4) | (1 << 1)}
-			case "mpeg4-generic":
-				at := NewAAC(p.Stream)
-				if payloadType, err := strconv.Atoi(vals[0]); err == nil {
-					at.DecoderConfiguration.PayloadType = byte(payloadType)
-				}
-				p.Tracks[trackId] = at
-				if config, ok := fmtp["config"]; ok {
-					asc, _ := hex.DecodeString(config)
+					at.Channels = uint8(f.Config.ChannelCount)
+					asc, _ := f.Config.Marshal()
 					// 复用AVCC写入逻辑，解析出AAC的配置信息
-					at.WriteAVCC(0, append([]byte{0xAF, 0}, asc...))
-				} else {
-					RTSPPlugin.Warn("aac no config")
+					at.WriteSequenceHead(append([]byte{0xAF, 0x00}, asc...))
+					p.AudioTrack = at
 				}
+				p.Tracks[track] = p.AudioTrack
+			case *format.G711:
+				at := p.AudioTrack
+				if at == nil {
+					at := NewG711(p.Stream, !f.MULaw, f.PayloadType(), uint32(f.ClockRate()))
+					p.AudioTrack = at
+				}
+				p.Tracks[track] = p.AudioTrack
 			default:
-				return fmt.Errorf("unsupport codec:%s", keyval[0])
+				rtpMap := strings.ToLower(forma.RTPMap())
+				if strings.Contains(rtpMap, "pcm") {
+					isMulaw := false
+					if strings.Contains(rtpMap, "pcmu") {
+						isMulaw = true
+					}
+					at := p.AudioTrack
+					if at == nil {
+						at := NewG711(p.Stream, !isMulaw, f.PayloadType(), uint32(f.ClockRate()))
+						p.AudioTrack = at
+					}
+					p.Tracks[track] = p.AudioTrack
+				} else {
+					p.Warn("unknown format", zap.Any("format", f.FMTP()))
+				}
 			}
 		}
 	}
+	if p.VideoTrack == nil {
+		p.Config.PubVideo = false
+		p.Info("no video track")
+	}
+	if p.AudioTrack == nil {
+		p.Config.PubAudio = false
+		p.Info("no audio track")
+	}
 	return nil
 }
+
+func (p *RTSPPublisher) OnPacket(m *description.Media, f format.Format, pack *rtp.Packet) {
+	if t, ok := p.Tracks[m]; ok {
+		t.WriteRTPPack(pack)
+	}
+}
--- a/server.go
+++ b/server.go
@@ -1,16 +1,20 @@
 package rtsp

 import (
-	"github.com/aler9/gortsplib"
-	"github.com/aler9/gortsplib/pkg/base"
+	"github.com/bluenviron/gortsplib/v4"
+	"github.com/bluenviron/gortsplib/v4/pkg/base"
+	"github.com/bluenviron/gortsplib/v4/pkg/description"
+	"go.uber.org/zap"
 	. "m7s.live/engine/v4"
 )

 type RTSPIO struct {
-	tracks       gortsplib.Tracks
-	stream       *gortsplib.ServerStream
-	audioTrackId int
-	videoTrackId int
+	server     *gortsplib.Server
+	session    *description.Session
+	tracks     []*description.Media
+	stream     *gortsplib.ServerStream
+	audioTrack *description.Media
+	videoTrack *description.Media
 }

 func (conf *RTSPConfig) OnConnOpen(ctx *gortsplib.ServerHandlerOnConnOpenCtx) {
@@ -20,7 +24,7 @@ func (conf *RTSPConfig) OnConnOpen(ctx *gortsplib.ServerHandlerOnConnOpenCtx) {
 func (conf *RTSPConfig) OnConnClose(ctx *gortsplib.ServerHandlerOnConnCloseCtx) {
 	RTSPPlugin.Debug("conn closed")
 	if p, ok := conf.LoadAndDelete(ctx.Conn); ok {
-		p.(IIO).Stop()
+		p.(IIO).Stop(zap.String("conn", "closed"))
 	}
 }

@@ -30,17 +34,21 @@ func (conf *RTSPConfig) OnSessionOpen(ctx *gortsplib.ServerHandlerOnSessionOpenC

 func (conf *RTSPConfig) OnSessionClose(ctx *gortsplib.ServerHandlerOnSessionCloseCtx) {
 	RTSPPlugin.Debug("session closed")
-	if p, ok := conf.LoadAndDelete(ctx.Session); ok {
-		p.(IIO).Stop()
-	}
+	conf.Delete(ctx.Session)
 }

 // called after receiving a DESCRIBE request.
 func (conf *RTSPConfig) OnDescribe(ctx *gortsplib.ServerHandlerOnDescribeCtx) (*base.Response, *gortsplib.ServerStream, error) {
-	RTSPPlugin.Debug("describe request")
+	RTSPPlugin.Debug("describe request", zap.String("sdp", string(ctx.Request.Body)))
 	var suber RTSPSubscriber
+	suber.server = conf.server
+	suber.RemoteAddr = ctx.Conn.NetConn().RemoteAddr().String()
 	suber.SetIO(ctx.Conn.NetConn())
-	if err := RTSPPlugin.Subscribe(ctx.Path, &suber); err == nil {
+	streamPath := ctx.Path
+	if ctx.Query != "" {
+		streamPath = streamPath + "?" + ctx.Query
+	}
+	if err := RTSPPlugin.Subscribe(streamPath, &suber); err == nil {
 		RTSPPlugin.Debug("describe replay ok")
 		conf.Store(ctx.Conn, &suber)
 		return &base.Response{
@@ -84,16 +92,20 @@ func (conf *RTSPConfig) OnPlay(ctx *gortsplib.ServerHandlerOnPlayCtx) (*base.Res
 	return &resp, nil
 }
 func (conf *RTSPConfig) OnRecord(ctx *gortsplib.ServerHandlerOnRecordCtx) (*base.Response, error) {
+	if p, ok := conf.Load(ctx.Session); ok {
+		ctx.Session.OnPacketRTPAny(p.(*RTSPPublisher).OnPacket)
+	}
 	return &base.Response{
 		StatusCode: base.StatusOK,
 	}, nil
 }
 func (conf *RTSPConfig) OnAnnounce(ctx *gortsplib.ServerHandlerOnAnnounceCtx) (*base.Response, error) {
+	RTSPPlugin.Debug("annouce request", zap.String("sdp", string(ctx.Request.Body)))
 	p := &RTSPPublisher{}
 	p.SetIO(ctx.Conn.NetConn())
 	if err := RTSPPlugin.Publish(ctx.Path, p); err == nil {
-		p.tracks = ctx.Tracks
-		p.stream = gortsplib.NewServerStream(ctx.Tracks)
+		p.session = ctx.Description
+		p.stream = gortsplib.NewServerStream(conf.server, ctx.Description)
 		if err = p.SetTracks(); err != nil {
 			return nil, err
 		}
@@ -108,14 +120,3 @@ func (conf *RTSPConfig) OnAnnounce(ctx *gortsplib.ServerHandlerOnAnnounceCtx) (*
 		StatusCode: base.StatusOK,
 	}, nil
 }
-
-func (conf *RTSPConfig) OnPacketRTP(ctx *gortsplib.ServerHandlerOnPacketRTPCtx) {
-	if p, ok := conf.Load(ctx.Session); ok {
-		switch v := p.(type) {
-		case *RTSPPublisher:
-			if v.Tracks[ctx.TrackID] != nil {
-				v.Tracks[ctx.TrackID].WriteRTPPack(ctx.Packet)
-			}
-		}
-	}
-}
--- a/subscriber.go
+++ b/subscriber.go
@@ -1,8 +1,12 @@
 package rtsp

 import (
-	"github.com/aler9/gortsplib"
-	"github.com/aler9/gortsplib/pkg/mpeg4audio"
+	"fmt"
+
+	"github.com/bluenviron/gortsplib/v4"
+	"github.com/bluenviron/gortsplib/v4/pkg/description"
+	"github.com/bluenviron/gortsplib/v4/pkg/format"
+	"github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio"
 	. "m7s.live/engine/v4"
 	"m7s.live/engine/v4/codec"
 	"m7s.live/engine/v4/track"
@@ -16,46 +20,93 @@ type RTSPSubscriber struct {
 func (s *RTSPSubscriber) OnEvent(event any) {
 	switch v := event.(type) {
 	case *track.Video:
+		if s.Video != nil {
+			return
+		}
 		switch v.CodecID {
 		case codec.CodecID_H264:
-			extra := v.DecoderConfiguration.Raw
-			vtrack := &gortsplib.TrackH264{
-				PayloadType: v.DecoderConfiguration.PayloadType, SPS: extra[0], PPS: extra[1],
+			video := &description.Media{
+				Type: description.MediaTypeVideo,
+				Formats: []format.Format{&format.H264{
+					PacketizationMode: 1,
+					PayloadTyp:        v.PayloadType,
+					SPS:               v.ParamaterSets[0],
+					PPS:               v.ParamaterSets[1],
+				}},
 			}
-			s.videoTrackId = len(s.tracks)
-			s.tracks = append(s.tracks, vtrack)
+			s.videoTrack = video
+			s.tracks = append(s.tracks, video)
 		case codec.CodecID_H265:
-			vtrack := &gortsplib.TrackH265{
-				PayloadType: v.DecoderConfiguration.PayloadType, VPS: v.DecoderConfiguration.Raw[0], SPS: v.DecoderConfiguration.Raw[1], PPS: v.DecoderConfiguration.Raw[2],
+			video := &description.Media{
+				Type: description.MediaTypeVideo,
+				Formats: []format.Format{&format.H265{
+					PayloadTyp: v.PayloadType,
+					VPS:        v.ParamaterSets[0],
+					SPS:        v.ParamaterSets[1],
+					PPS:        v.ParamaterSets[2],
+				}},
 			}
-			s.videoTrackId = len(s.tracks)
-			s.tracks = append(s.tracks, vtrack)
+			s.videoTrack = video
+			s.tracks = append(s.tracks, video)
 		}
 		s.AddTrack(v)
 	case *track.Audio:
+		if s.Audio != nil {
+			return
+		}
 		switch v.CodecID {
 		case codec.CodecID_AAC:
-			var mpegConf mpeg4audio.Config
-			mpegConf.Unmarshal(v.DecoderConfiguration.Raw)
-			atrack := &gortsplib.TrackMPEG4Audio{
-				PayloadType: v.DecoderConfiguration.PayloadType, Config: &mpegConf, SizeLength: 13, IndexLength: 3, IndexDeltaLength: 3,
+			audio := &description.Media{
+				Type: description.MediaTypeAudio,
+				Formats: []format.Format{&format.MPEG4Audio{
+					PayloadTyp: v.PayloadType,
+					Config: &mpeg4audio.Config{
+						Type:         mpeg4audio.ObjectTypeAACLC,
+						SampleRate:   int(v.SampleRate),
+						ChannelCount: int(v.Channels),
+					},
+					SizeLength:       v.SizeLength,
+					IndexLength:      v.IndexLength,
+					IndexDeltaLength: v.IndexDeltaLength,
+				}},
 			}
-			s.audioTrackId = len(s.tracks)
-			s.tracks = append(s.tracks, atrack)
+			s.audioTrack = audio
+			s.tracks = append(s.tracks, audio)
 		case codec.CodecID_PCMA:
-			s.audioTrackId = len(s.tracks)
-			s.tracks = append(s.tracks, &gortsplib.TrackPCMA{})
+			audio := &description.Media{
+				Type: description.MediaTypeAudio,
+				Formats: []format.Format{&format.Generic{
+					PayloadTyp: v.PayloadType,
+					ClockRat:   int(v.SampleRate),
+					RTPMa:      fmt.Sprintf("PCMA/%d", v.SampleRate),
+				}},
+			}
+			s.audioTrack = audio
+			s.tracks = append(s.tracks, audio)
 		case codec.CodecID_PCMU:
-			s.audioTrackId = len(s.tracks)
-			s.tracks = append(s.tracks, &gortsplib.TrackPCMU{})
+			audio := &description.Media{
+				Type: description.MediaTypeAudio,
+				Formats: []format.Format{&format.Generic{
+					PayloadTyp: v.PayloadType,
+					ClockRat:   int(v.SampleRate),
+					RTPMa:      fmt.Sprintf("PCMU/%d", v.SampleRate),
+				}},
+			}
+			s.audioTrack = audio
+			s.tracks = append(s.tracks, audio)
 		}
 		s.AddTrack(v)
 	case ISubscriber:
-		s.stream = gortsplib.NewServerStream(s.tracks)
+		s.session = &description.Session{
+			Medias: s.tracks,
+		}
+		if s.server != nil {
+			s.stream = gortsplib.NewServerStream(s.server, s.session)
+		}
 	case VideoRTP:
-		s.stream.WritePacketRTP(s.videoTrackId, &v.Packet)
+		s.stream.WritePacketRTP(s.videoTrack, v.Packet)
 	case AudioRTP:
-		s.stream.WritePacketRTP(s.audioTrackId, &v.Packet)
+		s.stream.WritePacketRTP(s.audioTrack, v.Packet)
 	default:
 		s.Subscriber.OnEvent(event)
 	}
Author	SHA1	Message	Date
langhuihui	c794c0514f	rollback	2023-11-13 17:28:29 +08:00
langhuihui	e65f970097	fix: replace client wait	2023-11-12 12:07:14 +08:00
langhuihui	855038c132	Update dependencies and add audio format support	2023-11-03 14:12:05 +08:00
langhuihui	2a62472b1d	feat: push use tcp default	2023-10-27 09:52:19 +08:00
langhuihui	3e4dcdf649	feat: add sendoptions config to avoid send options	2023-10-25 10:22:29 +08:00
langhuihui	9ac21a130e	fix: auto close client	2023-10-25 08:57:33 +08:00
langhuihui	c13d8c659d	feat: update gortsplib to v4	2023-10-23 14:20:15 +08:00
langhuihui	c4700713a8	feat: remove pull protocol config	2023-10-11 17:01:09 +08:00
langhuihui	62409f14b5	chore: update engine version	2023-09-20 19:24:26 +08:00
langhuihui	df9c5a69cc	fix: memory leak	2023-09-15 14:23:59 +08:00
dexter	4a5ba9b834	Merge pull request #44 from umaYnit/v4 fix: 修复错误的流地址导致的Disconnect时panic	2023-08-31 08:42:12 +08:00
Ynit	5df8f237de	fix: 修复错误的流地址导致的Disconnect时panic	2023-08-31 00:12:07 +08:00
langhuihui	9936b2ca20	fix: upgrade gortsplib	2023-08-25 15:00:57 +08:00
langhuihui	943ba46f70	chore: fit engine udpate	2023-08-14 10:04:37 +08:00
langhuihui	035c3647eb	docs: update readme	2023-08-06 18:05:06 +08:00
langhuihui	17874da782	docs: udpate readme	2023-08-06 15:26:50 +08:00
langhuihui	24b63ca07c	feat: add stop reason, pull protocol default is tcp now	2023-08-06 15:15:26 +08:00
dexter	eb91dd1cee	Merge pull request #42 from Monibuca/rtsp-pcma Update publisher.go	2023-07-24 13:45:37 +08:00
banshan	e5d0d7d5d6	Update publisher.go ffmpeg rtsp pcma 推流	2023-07-24 13:43:44 +08:00
langhuihui	311b8732a8	fit engine update	2023-06-16 22:42:43 +08:00
langhuihui	351ff9fa0c	refactor: remove some stupid code	2023-05-25 14:15:09 +08:00
langhuihui	9defe4eec3	fit engine update	2023-05-23 20:58:59 +08:00
langhuihui	8e84bb637a	适配引擎修改	2023-04-24 14:13:46 +08:00
langhuihui	dc62df1861	更新readme	2023-04-23 13:00:11 +08:00
langhuihui	1ad45bfbc1	gortsplib升级到v3.2.1 增加默认缓存大小，解决高码率推拉流问题增加英文文档	2023-04-23 11:26:02 +08:00
langhuihui	a4773b4044	使用内置的协议自动选择机制	2023-04-15 08:48:44 +08:00
dexter	225bb482d5	适配引擎修改	2023-03-28 19:48:59 +08:00
dexter	ea5ea6f48a	SizeLength、IndexLength、IndexDeltaLength	2023-03-03 22:06:38 +08:00
dexter	beda2dd9e0	适配引擎修改	2023-02-26 10:38:53 +08:00
dexter	344ab6f463	移除clockrate	2023-02-20 00:19:39 +08:00
dexter	d5e73d11db	Merge pull request #32 from Monibuca/dependabot/go_modules/golang.org/x/net-0.7.0 Bump golang.org/x/net from 0.2.0 to 0.7.0	2023-02-19 10:22:56 +08:00
dependabot[bot]	12350b8af0	Bump golang.org/x/net from 0.2.0 to 0.7.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.2.0 to 0.7.0. - [Release notes](https://github.com/golang/net/releases) - [Commits](https://github.com/golang/net/compare/v0.2.0...v0.7.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-02-18 03:22:09 +00:00
dexter	3b671606b6	添加时钟频率配置	2023-02-08 14:19:36 +08:00
dexter	70321ccd1f	更新依赖库aler9 到2.1.0	2023-02-03 21:36:33 +08:00
dexter	5ddbd7a852	优化代码	2023-02-02 12:08:16 +08:00
dexter	f32f44db40	适配引擎升级	2023-02-01 11:00:36 +08:00
dexter	b44efd9749	推拉在异常时对连接关闭	2023-01-18 21:20:06 +08:00
dexter	7f4bfe4c78	使用rtsp拉流时将参数传入订阅者	2023-01-02 21:12:45 +08:00
dexter	187335d311	适配engine v4.9.5	2022-12-31 22:18:50 +08:00
dexter	1f3f4bfb0e	适配引擎4.9.3	2022-12-19 09:06:17 +08:00
dexter	3cbf22576b	🐛 FIX: 关闭流后断开rtsp拉流或者推流连接	2022-11-23 09:22:23 +08:00